diff --git a/.cirrus.yml b/.cirrus.yml
new file mode 100644
index 000000000..0a04ad6cd
--- /dev/null
+++ b/.cirrus.yml
@@ -0,0 +1,26 @@
+task:
+  name: freebsd-build
+  freebsd_instance:
+    image_family: freebsd-12-2
+
+  prepare_script:
+    - pkg install -yq git cmake jpeg-turbo mysql80-client ffmpeg libvncserver libjwt catch p5-DBI p5-DBD-mysql p5-Date-Manip p5-Test-LWP-UserAgent p5-Sys-Mmap
+
+  configure_script:
+    - git submodule update --init --recursive
+    - mkdir build
+    - cd build
+    - cmake --version
+    - cmake ../ -DBUILD_MAN=0 -DBUILD_TEST_SUITE=1 -DENABLE_WERROR=1
+
+  build_script:
+    - cd build
+    - make -j3
+
+  install_script:
+    - cd build
+    - make install
+
+  test_script:
+    - cd build/tests
+    - ./tests "~[notCI]"
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 000000000..8785e55b2
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,2 @@
+# Reindent CMakeLists
+6c9983155c65848a3e67976445cd20fb4fbfe108
\ No newline at end of file
diff --git a/.github/codeql/codeql-config.yml b/.github/codeql/codeql-config.yml
new file mode 100644
index 000000000..603000225
--- /dev/null
+++ b/.github/codeql/codeql-config.yml
@@ -0,0 +1,2 @@
+paths-ignore:
+  - dep/
diff --git a/.github/workflows/ci-xenial.yml b/.github/workflows/ci-xenial.yml
new file mode 100644
index 000000000..4ea605267
--- /dev/null
+++ b/.github/workflows/ci-xenial.yml
@@ -0,0 +1,25 @@
+name: CI Xenial
+
+on:
+  push:
+    branches:
+      - '*'
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-16.04
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: recursive
+      - name: Install dependencies
+        run: sudo apt-get update && sudo apt-get install libavdevice-dev libcurl4-gnutls-dev libvlc-dev libvncserver-dev libdate-manip-perl libdbd-mysql-perl libsys-mmap-perl libpolkit-gobject-1-dev
+      - name: Prepare
+        run: mkdir build
+      - name: Configure
+        run: cd build && cmake --version && cmake .. -DBUILD_MAN=0 -DENABLE_WERROR=1
+      - name: Build
+        run: cd build && make -j3 | grep --line-buffered -Ev '^(cp lib\/|Installing.+\.pm)' && (exit ${PIPESTATUS[0]})
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
new file mode 100644
index 000000000..8b071a662
--- /dev/null
+++ b/.github/workflows/codeql-analysis.yml
@@ -0,0 +1,79 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+name: "CodeQL"
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [master]
+  schedule:
+    - cron: '0 3 * * 5'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        # Override automatic language detection by changing the below list
+        # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
+        language: ['cpp', 'javascript']
+        # Learn more...
+        # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with:
+        # We must fetch at least the immediate parents so that if this is
+        # a pull request then we can checkout the head.
+        fetch-depth: 2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        config-file: ./.github/codeql/codeql-config.yml
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file. 
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    - name: Clean install dependencies and build
+      run: |
+        git submodule init
+        git submodule update --init --recursive
+        sudo apt-get update
+        sudo apt-get install libavdevice-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev  libjwt-gnutls-dev
+        sudo apt-get install libbz2-dev libgcrypt20-dev libcurl4-gnutls-dev libjpeg-turbo8-dev libturbojpeg0-dev
+        sudo apt-get install default-libmysqlclient-dev libpcre3-dev libpolkit-gobject-1-dev libv4l-dev libvlc-dev
+        sudo apt-get install libdate-manip-perl libdbd-mysql-perl libphp-serialization-perl libsys-mmap-perl
+        sudo apt-get install libwww-perl libdata-uuid-perl libssl-dev libcrypt-eksblowfish-perl libdata-entropy-perl
+        
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl- 
+   
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1
diff --git a/.gitignore b/.gitignore
index 152802d29..e617d937c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -120,15 +120,10 @@ src/CMakeFiles/
 src/cmake_install.cmake
 src/libzm.a
 src/nph-zms
-src/zm_config_data.h
-src/zm_config_defines.h
-src/zma
 src/zmc
 src/zmf
 src/zms
 src/zmu
-src/zoneminder-zma.8
-src/zoneminder-zma.8.gz
 src/zoneminder-zmc.8
 src/zoneminder-zmc.8.gz
 src/zoneminder-zmf.8
@@ -157,4 +152,6 @@ web/undef.log
 zm.conf
 zmconfgen.pl
 zmlinkcontent.sh
+zm_config_data.h
+zm_config_defines.h
 **/.DS_Store
diff --git a/.gitmodules b/.gitmodules
index eb0e282a2..fd07ba226 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,10 @@
 [submodule "web/api/app/Plugin/Crud"]
 	path = web/api/app/Plugin/Crud
-	url = https://github.com/ZoneMinder/crud.git
+	url = https://github.com/FriendsOfCake/crud.git
 	branch = 3.0
 [submodule "web/api/app/Plugin/CakePHP-Enum-Behavior"]
 	path = web/api/app/Plugin/CakePHP-Enum-Behavior
-	url = https://github.com/ZoneMinder/CakePHP-Enum-Behavior.git
+	Url = https://github.com/ZoneMinder/CakePHP-Enum-Behavior.git
+[submodule "dep/RtspServer"]
+	path = dep/RtspServer
+	url = https://github.com/ZoneMinder/RtspServer
diff --git a/.travis.yml b/.travis.yml
index da05d8970..c370e9318 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,16 +33,7 @@ install:
 
 env:
   - SMPFLAGS=-j4 OS=eslint DIST=eslint
-  - SMPFLAGS=-j4 OS=el DIST=7 DOCKER_REPO=knnniggett/packpack
-  - SMPFLAGS=-j4 OS=el DIST=8 DOCKER_REPO=knnniggett/packpack
-  - SMPFLAGS=-j4 OS=fedora DIST=31 DOCKER_REPO=knnniggett/packpack
-  - SMPFLAGS=-j4 OS=fedora DIST=32 DOCKER_REPO=knnniggett/packpack
-  - SMPFLAGS=-j4 OS=fedora DIST=33 DOCKER_REPO=knnniggett/packpack
-  - SMPFLAGS=-j4 OS=ubuntu DIST=xenial DOCKER_REPO=iconzm/packpack
   - SMPFLAGS=-j4 OS=ubuntu DIST=bionic DOCKER_REPO=iconzm/packpack
-  - SMPFLAGS=-j4 OS=ubuntu DIST=focal DOCKER_REPO=iconzm/packpack
-  - SMPFLAGS=-j4 OS=debian DIST=stretch DOCKER_REPO=iconzm/packpack
-  - SMPFLAGS=-j4 OS=debian DIST=buster DOCKER_REPO=iconzm/packpack
 
 compiler:
 - gcc
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 98457b7c3..700c80a20 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,287 +2,266 @@
 # Created by mastertheknife (Kfir Itzhak)
 # For more information and installation, see the INSTALL file
 #
-cmake_minimum_required (VERSION 2.8.7)
-project (zoneminder)
-file (STRINGS "version" zoneminder_VERSION)
+cmake_minimum_required(VERSION 3.5.0)
+project(zoneminder)
+file(STRINGS "version" zoneminder_VERSION)
 # make API version a minor of ZM version
 set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
 
 # Make sure the submodules are there
-if( NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/Lib/CrudControllerTrait.php" )
-message( SEND_ERROR "The git submodules are not available. Please run
-git submodule update --init --recursive")
-endif( NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/Lib/CrudControllerTrait.php" )
+if(NOT EXISTS "${CMAKE_SOURCE_DIR}/web/api/app/Plugin/Crud/Lib/CrudControllerTrait.php")
+  message(SEND_ERROR "The git submodules are not available. Please run git submodule update --init --recursive")
+endif()
 
 # CMake does not allow out-of-source build if CMakeCache.exists 
 # in the source folder. Abort and notify the user
-if(
-    (NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) 
-    AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
-        message(FATAL_ERROR " You are attempting to do an out-of-source build, 
-            but a cmake cache file for an in-source build exists. Please delete 
-            the file CMakeCache.txt from the source folder to proceed.")
-endif(
-    (NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) 
-    AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
+if((NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR)) AND (EXISTS "${CMAKE_SOURCE_DIR}/CMakeCache.txt"))
+  message(FATAL_ERROR " You are attempting to do an out-of-source build,
+    but a cmake cache file for an in-source build exists. Please delete
+    the file CMakeCache.txt from the source folder to proceed.")
+endif()
 
 # Default build type. To change the build type, 
 # use the CMAKE_BUILD_TYPE configuration option.
 if(NOT CMAKE_BUILD_TYPE)
-	set(CMAKE_BUILD_TYPE 
-            Release CACHE STRING "Build type: Release or Debug" FORCE)
-endif(NOT CMAKE_BUILD_TYPE)
+  set(CMAKE_BUILD_TYPE Release CACHE STRING "Build type: Release or Debug" FORCE)
+endif()
 
 # Can assist in troubleshooting
 #set(CMAKE_VERBOSE_MAKEFILE ON)
 #set(CMAKE_INSTALL_ALWAYS ON)
 
-# Host OS Check
-set(HOST_OS "")
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-	set(HOST_OS "linux")
-endif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-if(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
-	set(HOST_OS "solaris")
-	set(SOLARIS 1)
-endif(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
-if(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
-	set(HOST_OS "BSD")
-	set(BSD 1)
-endif(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
-if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-	set(HOST_OS "darwin")
-endif(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-if(NOT HOST_OS)
-	message(FATAL_ERROR 
-            "ZoneMinder was unable to deterimine the host OS. Please report this. Value of CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
-endif(NOT HOST_OS)
-
-set (CMAKE_CXX_STANDARD 11)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 # Default CLFAGS and CXXFLAGS:
-set(CMAKE_C_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
-set(CMAKE_CXX_FLAGS_RELEASE "-Wall -D__STDC_CONSTANT_MACROS -O2")
-set(CMAKE_C_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
-set(CMAKE_CXX_FLAGS_DEBUG "-Wall -D__STDC_CONSTANT_MACROS -g")
-set(CMAKE_C_FLAGS_OPTIMISED "-Wall -D__STDC_CONSTANT_MACROS -O3")
-set(CMAKE_CXX_FLAGS_OPTIMISED "-Wall -D__STDC_CONSTANT_MACROS -O3")
+set(CMAKE_C_FLAGS_RELEASE "-O2")
+set(CMAKE_CXX_FLAGS_RELEASE "-O2")
+set(CMAKE_C_FLAGS_DEBUG "-g")
+set(CMAKE_CXX_FLAGS_DEBUG "-g")
+set(CMAKE_C_FLAGS_OPTIMISED "-O3")
+set(CMAKE_CXX_FLAGS_OPTIMISED "-O3")
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/Modules/")
 
+include(ConfigureBaseTargets)
+include(CheckPlatform)
+
 # GCC below 6.0 doesn't support __target__("fpu=neon") attribute, required for compiling ARM Neon code, otherwise compilation fails.
 # Must use -mfpu=neon compiler flag instead, but only do that for processors that support neon, otherwise strip the neon code alltogether,
 # because passing -fmpu=neon is unsafe to processors that don't support neon
 
 # Arm neon support only tested on Linux. If your arm hardware is running a non-Linux distro and is using gcc then contact us.
-IF (CMAKE_SYSTEM_NAME MATCHES "Linux")
-    string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ZM_SYSTEM_PROC)
-    IF((ZM_SYSTEM_PROC STREQUAL "") OR (ZM_SYSTEM_PROC STREQUAL "unknown"))
-        execute_process(COMMAND uname -m OUTPUT_VARIABLE ZM_SYSTEM_PROC ERROR_VARIABLE ZM_SYSTEM_PROC_ERR)
-
-        # maybe make the following error checks fatal
-        IF(ZM_SYSTEM_PROC_ERR)
-            message(WARNING "\nAn error occurred while attempting to determine the system processor:\n${ZM_SYSTEM_PROC_ERR}")
-        ENDIF(ZM_SYSTEM_PROC_ERR)
-        IF(NOT ZM_SYSTEM_PROC)
-           message(WARNING "\nUnable to determine the system processor. This may cause a build failure.\n")
-        ENDIF(ZM_SYSTEM_PROC)
-
-    ENDIF((ZM_SYSTEM_PROC STREQUAL "") OR (ZM_SYSTEM_PROC STREQUAL "unknown"))
-
-    IF(ZM_SYSTEM_PROC MATCHES "^arm")
-	    IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
-                EXEC_PROGRAM(grep ARGS " neon " "/proc/cpuinfo" OUTPUT_VARIABLE neonoutput RETURN_VALUE neonresult)
-		    IF(neonresult EQUAL 0)
-                        set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpu=neon")
-                        set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpu=neon")
-                        set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -mfpu=neon")
-                        set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mfpu=neon")
-		    ELSE(neonresult EQUAL 0)
-                        add_definitions(-DZM_STRIP_NEON=1)
-                        message(STATUS "ARM Neon is not available on this processor. Neon functions will be absent")
-                    ENDIF(neonresult EQUAL 0)
-            ENDIF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
-    ENDIF(ZM_SYSTEM_PROC MATCHES "^arm")
-ENDIF (CMAKE_SYSTEM_NAME MATCHES "Linux")
+if(ZM_SYSTEM_PROC MATCHES "^arm")
+  if(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.0)
+    exec_program(grep ARGS " neon " "/proc/cpuinfo" OUTPUT_VARIABLE neonoutput RETURN_VALUE neonresult)
+    if(neonresult EQUAL 0)
+      set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -mfpu=neon")
+      set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mfpu=neon")
+      set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -mfpu=neon")
+      set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mfpu=neon")
+    else()
+      add_definitions(-DZM_STRIP_NEON=1)
+      message(STATUS "ARM Neon is not available on this processor. Neon functions will be absent")
+    endif()
+  endif()
+endif()
 
 # Modules that we need:
-include (GNUInstallDirs)
-include (CheckIncludeFile)
-include (CheckIncludeFiles)
-include (CheckFunctionExists)
-include (CheckPrototypeDefinition_fixed)
-include (CheckTypeSize)
-include (CheckStructHasMember)
-include (CheckSendfile)
+include(GNUInstallDirs)
+include(CheckIncludeFile)
+include(CheckIncludeFiles)
+include(CheckFunctionExists)
+include(CheckPrototypeDefinition_fixed)
+include(CheckTypeSize)
+include(CheckStructHasMember)
+include(CheckSendfile)
 
 # Configuration options
-mark_as_advanced( 
-    FORCE ZM_EXTRA_LIBS 
-    ZM_MYSQL_ENGINE 
-    ZM_NO_MMAP 
-    CMAKE_INSTALL_FULL_BINDIR 
-    ZM_PERL_MM_PARMS 
-    ZM_PERL_SEARCH_PATH 
-    ZM_TARGET_DISTRO 
-    ZM_PATH_MAP
-    ZM_PATH_ARP 
-    ZM_CONFIG_DIR
-    ZM_CONFIG_SUBDIR
-    ZM_SYSTEMD
-    ZM_MANPAGE_DEST_PREFIX)
+mark_as_advanced(
+  FORCE ZM_EXTRA_LIBS
+  ZM_MYSQL_ENGINE
+  ZM_NO_MMAP
+  CMAKE_INSTALL_FULL_BINDIR
+  ZM_PERL_MM_PARMS
+  ZM_PERL_SEARCH_PATH
+  ZM_TARGET_DISTRO
+  ZM_PATH_MAP
+  ZM_PATH_ARP
+  ZM_CONFIG_DIR
+  ZM_CONFIG_SUBDIR
+  ZM_SYSTEMD
+  ZM_MANPAGE_DEST_PREFIX)
 
-set(ZM_RUNDIR "/var/run/zm" CACHE PATH 
-    "Location of transient process files, default: /var/run/zm")
-set(ZM_SOCKDIR "/var/run/zm" CACHE PATH 
-    "Location of Unix domain socket files, default /var/run/zm")
-set(ZM_TMPDIR "/var/tmp/zm" CACHE PATH 
-    "Location of temporary files, default: /tmp/zm")
-set(ZM_LOGDIR "/var/log/zm" CACHE PATH 
-    "Location of generated log files, default: /var/log/zm")
-set(ZM_WEBDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/www" CACHE PATH 
-    "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
-set(ZM_CGIDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH 
-    "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
-set(ZM_CACHEDIR "/var/cache/zoneminder" CACHE PATH 
-    "Location of the web server cache busting files, default: /var/cache/zoneminder")
-set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH 
-    "Location of dynamic content (events and images), default: /var/lib/zoneminder")
-set(ZM_DB_HOST "localhost" CACHE STRING 
-    "Hostname where ZoneMinder database located, default: localhost")
-set(ZM_DB_NAME "zm" CACHE STRING 
-    "Name of ZoneMinder database, default: zm")
-set(ZM_DB_USER "zmuser" CACHE STRING 
-    "Name of ZoneMinder database user, default: zmuser")
-set(ZM_DB_PASS "zmpass" CACHE STRING 
-    "Password of ZoneMinder database user, default: zmpass")
-set(ZM_WEB_USER "" CACHE STRING 
-    "The user apache or the local web server runs on. Leave empty for automatic detection. 
+option(ENABLE_WERROR "Fail the build if a compiler warning is emitted" 0)
+option(BUILD_TEST_SUITE "Build the test suite" 0)
+option(BUILD_MAN "Build man pages" 1)
+option(ASAN "DEBUGGING: Build with AddressSanitizer (ASan) support" 0)
+option(TSAN "DEBUGGING: Build with ThreadSanitizer (TSan) support" 0)
+
+if(ASAN AND TSAN)
+  message(FATAL_ERROR "ASAN and TSAN options are mutually exclusive")
+endif()
+
+set(ZM_RUNDIR "/var/run/zm" CACHE PATH
+  "Location of transient process files, default: /var/run/zm")
+set(ZM_SOCKDIR "/var/run/zm" CACHE PATH
+  "Location of Unix domain socket files, default /var/run/zm")
+set(ZM_TMPDIR "/var/tmp/zm" CACHE PATH
+  "Location of temporary files, default: /tmp/zm")
+set(ZM_LOGDIR "/var/log/zm" CACHE PATH
+  "Location of generated log files, default: /var/log/zm")
+set(ZM_WEBDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/www" CACHE PATH
+  "Location of the web files, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/www")
+set(ZM_CGIDIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/zoneminder/cgi-bin" CACHE PATH
+  "Location of the cgi-bin files, default: <prefix>/${CMAKE_INSTALL_LIBEXECDIR}/zoneminder/cgi-bin")
+set(ZM_CACHEDIR "/var/cache/zoneminder" CACHE PATH
+  "Location of the web server cache busting files, default: /var/cache/zoneminder")
+set(ZM_CONTENTDIR "/var/lib/zoneminder" CACHE PATH
+  "Location of dynamic content (events and images), default: /var/lib/zoneminder")
+set(ZM_FONTDIR "${CMAKE_INSTALL_FULL_DATADIR}/zoneminder/fonts" CACHE PATH
+  "Location of the font files used for timestamping, default: <prefix>/${CMAKE_INSTALL_DATADIR}/zoneminder/fonts")
+
+set(ZM_DB_HOST "localhost" CACHE STRING
+  "Hostname where ZoneMinder database located, default: localhost")
+set(ZM_DB_NAME "zm" CACHE STRING
+  "Name of ZoneMinder database, default: zm")
+set(ZM_DB_USER "zmuser" CACHE STRING
+  "Name of ZoneMinder database user, default: zmuser")
+set(ZM_DB_PASS "zmpass" CACHE STRING
+  "Password of ZoneMinder database user, default: zmpass")
+set(ZM_WEB_USER "" CACHE STRING
+  "The user apache or the local web server runs on. Leave empty for automatic detection.
      If that fails, you can use this variable to force")
-set(ZM_WEB_GROUP "" CACHE STRING 
-    "The group apache or the local web server runs on, 
+set(ZM_WEB_GROUP "" CACHE STRING
+  "The group apache or the local web server runs on,
     Leave empty to be the same as the web user")
-set(ZM_DIR_EVENTS "${ZM_CONTENTDIR}/events" CACHE PATH 
-    "Location where events are recorded to, default: ZM_CONTENTDIR/events")
+set(ZM_DIR_EVENTS "${ZM_CONTENTDIR}/events" CACHE PATH
+  "Location where events are recorded to, default: ZM_CONTENTDIR/events")
 set(ZM_DIR_SOUNDS "sounds" CACHE PATH
-    "Location to look for optional sound files, default: sounds")
+  "Location to look for optional sound files, default: sounds")
 set(ZM_PATH_ZMS "/cgi-bin/nph-zms" CACHE PATH
-    "Web url to zms streaming server, default: /cgi-bin/nph-zms")
+  "Web url to zms streaming server, default: /cgi-bin/nph-zms")
 set(ZM_PATH_SHUTDOWN "/sbin/shutdown" CACHE PATH
-    "Path to shutdown binary, default: /sbin/shutdown")
+  "Path to shutdown binary, default: /sbin/shutdown")
 
 # Advanced
 set(ZM_PATH_MAP "/dev/shm" CACHE PATH
-    "Location to save mapped memory files, default: /dev/shm")
+  "Location to save mapped memory files, default: /dev/shm")
 set(ZM_PATH_ARP "" CACHE PATH
-    "Full path to compatible arp binary. Leave empty for automatic detection.")
-set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH 
-    "Location of ZoneMinder configuration, default system config directory")
-set(ZM_CONFIG_SUBDIR "${ZM_CONFIG_DIR}/conf.d" CACHE PATH 
-    "Location of ZoneMinder configuration subfolder, default: ZM_CONFIG_DIR/conf.d")
-set(ZM_EXTRA_LIBS "" CACHE STRING 
-    "A list of optional libraries, separated by semicolons, e.g. ssl;theora")
-set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING 
-    "MySQL engine to use with database, default: InnoDB")
-set(ZM_NO_MMAP "OFF" CACHE BOOL 
-    "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you 
+  "Full path to compatible arp binary. Leave empty for automatic detection.")
+set(ZM_CONFIG_DIR "/${CMAKE_INSTALL_SYSCONFDIR}" CACHE PATH
+  "Location of ZoneMinder configuration, default system config directory")
+set(ZM_CONFIG_SUBDIR "${ZM_CONFIG_DIR}/conf.d" CACHE PATH
+  "Location of ZoneMinder configuration subfolder, default: ZM_CONFIG_DIR/conf.d")
+set(ZM_EXTRA_LIBS "" CACHE STRING
+  "A list of optional libraries, separated by semicolons, e.g. ssl;theora")
+set(ZM_MYSQL_ENGINE "InnoDB" CACHE STRING
+  "MySQL engine to use with database, default: InnoDB")
+set(ZM_NO_MMAP "OFF" CACHE BOOL
+  "Set to ON to not use mmap shared memory. Shouldn't be enabled unless you
     experience problems with the shared memory. default: OFF")
-set(ZM_NO_LIBVLC "OFF" CACHE BOOL 
-"Set to ON to skip libvlc checks and force building ZM without libvlc. default: OFF")
-set(ZM_NO_LIBVNC "OFF" CACHE BOOL 
-"Set to ON to skip libvnc checks and force building ZM without libvnc. default: OFF")
-set(ZM_NO_CURL "OFF" CACHE BOOL 
-    "Set to ON to skip cURL checks and force building ZM without cURL. default: OFF")
-set(ZM_NO_X10 "OFF" CACHE BOOL 
-    "Set to ON to build ZoneMinder without X10 support. default: OFF")
-set(ZM_ONVIF "ON" CACHE BOOL 
-    "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not 
+set(ZM_NO_LIBVLC "OFF" CACHE BOOL
+  "Set to ON to skip libvlc checks and force building ZM without libvlc. default: OFF")
+set(ZM_NO_LIBVNC "OFF" CACHE BOOL
+  "Set to ON to skip libvnc checks and force building ZM without libvnc. default: OFF")
+set(ZM_NO_CURL "OFF" CACHE BOOL
+  "Set to ON to skip cURL checks and force building ZM without cURL. default: OFF")
+set(ZM_NO_X10 "OFF" CACHE BOOL
+  "Set to ON to build ZoneMinder without X10 support. default: OFF")
+set(ZM_ONVIF "ON" CACHE BOOL
+  "Set to ON to enable basic ONVIF support. This is EXPERIMENTAL and may not
     work with all cameras claiming to be ONVIF compliant. default: ON")
-set(ZM_PERL_MM_PARMS INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 CACHE STRING 
-	"By default, ZoneMinder's Perl modules are installed into the Vendor folders, 
+set(ZM_NO_RTSPSERVER "OFF" CACHE BOOL
+  "Set to ON to skip building ZM with rtsp server support. default: OFF")
+set(ZM_PERL_MM_PARMS INSTALLDIRS=vendor NO_PACKLIST=1 NO_PERLLOCAL=1 CACHE STRING
+  "By default, ZoneMinder's Perl modules are installed into the Vendor folders,
 	as defined by your installation of Perl. You can change that here. Consult Perl's 
 	MakeMaker documentation for a definition of acceptable parameters. If you set this 
 	to something that causes the modules to be installed outside Perl's normal search 
 	path, then you will also need to set ZM_PERL_SEARCH_PATH accordingly.")
-set(ZM_PERL_SEARCH_PATH "" CACHE PATH 
-	"Use to add a folder to your Perl's search path. This will need to be set in cases 
+set(ZM_PERL_SEARCH_PATH "" CACHE PATH
+  "Use to add a folder to your Perl's search path. This will need to be set in cases
 	where ZM_PERL_MM_PARMS has been modified such that ZoneMinder's Perl modules are 
 	installed outside Perl's default search path.")
-set(ZM_TARGET_DISTRO "" CACHE STRING 
-    "Build ZoneMinder for a specific distribution.  Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD")
-set(ZM_SYSTEMD "OFF" CACHE BOOL 
-    "Set to ON to force building ZM with systemd support. default: OFF")
-set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH 
-	"Relative path used to install ZoneMinder's Man pages into a
-         non-standard folder. Most Linux users will not need to change this.
-         BSD users may need to set this.")
+set(ZM_TARGET_DISTRO "" CACHE STRING
+  "Build ZoneMinder for a specific distribution.  Currently, valid names are: fc27, fc26, el7, OS13, FreeBSD")
+set(ZM_SYSTEMD "OFF" CACHE BOOL
+  "Set to ON to force building ZM with systemd support. default: OFF")
+set(ZM_MANPAGE_DEST_PREFIX "share/man" CACHE PATH
+  "Relative path used to install ZoneMinder's Man pages into a
+    non-standard folder. Most Linux users will not need to change this.
+    BSD users may need to set this.")
 
 # Reassign some variables if a target distro has been specified
 if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
-	set(ZM_RUNDIR "/var/run/zoneminder")
-	set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
-	set(ZM_TMPDIR "/var/lib/zoneminder/temp")
-	set(ZM_LOGDIR "/var/log/zoneminder")
-	set(ZM_CONFIG_DIR "/etc/zm")
-        set(ZM_CONFIG_SUBDIR "/etc/zm/conf.d")
-	set(ZM_WEBDIR "/usr/share/zoneminder/www")
-	set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
-	set(ZM_DIR_EVENTS "/var/lib/zoneminder/events")
-	set(ZM_PATH_ZMS "/cgi-bin-zm/nph-zms")
+  set(ZM_RUNDIR "/var/run/zoneminder")
+  set(ZM_SOCKDIR "/var/lib/zoneminder/sock")
+  set(ZM_TMPDIR "/var/lib/zoneminder/temp")
+  set(ZM_LOGDIR "/var/log/zoneminder")
+  set(ZM_CONFIG_DIR "/etc/zm")
+  set(ZM_CONFIG_SUBDIR "/etc/zm/conf.d")
+  set(ZM_WEBDIR "/usr/share/zoneminder/www")
+  set(ZM_CGIDIR "/usr/libexec/zoneminder/cgi-bin")
+  set(ZM_DIR_EVENTS "/var/lib/zoneminder/events")
+  set(ZM_PATH_ZMS "/cgi-bin-zm/nph-zms")
 elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
-	set(ZM_RUNDIR "/var/run/zoneminder")
-	set(ZM_TMPDIR "/var/run/zoneminder")
-	set(ZM_CONTENTDIR "/var/run/zoneminder")
-	set(ZM_LOGDIR "/var/log/zoneminder")
-	set(ZM_WEB_USER "wwwrun")
-	set(ZM_WEB_GROUP "www")
-	set(ZM_WEBDIR "/srv/www/htdocs/zoneminder")
-	set(ZM_CGIDIR "/srv/www/cgi-bin")
+  set(ZM_RUNDIR "/var/run/zoneminder")
+  set(ZM_TMPDIR "/var/run/zoneminder")
+  set(ZM_CONTENTDIR "/var/run/zoneminder")
+  set(ZM_LOGDIR "/var/log/zoneminder")
+  set(ZM_WEB_USER "wwwrun")
+  set(ZM_WEB_GROUP "www")
+  set(ZM_WEBDIR "/srv/www/htdocs/zoneminder")
+  set(ZM_CGIDIR "/srv/www/cgi-bin")
 elseif(ZM_TARGET_DISTRO STREQUAL "FreeBSD")
-	set(ZM_RUNDIR "/var/run/zm")
-        set(ZM_SOCKDIR "/var/run/zm")
-	set(ZM_TMPDIR "/var/tmp/zm")
-        set(ZM_CONTENTDIR "/usr/local/var/lib/zoneminder")
-        set(ZM_WEB_USER "www")
-        set(ZM_WEB_GROUP "www")
-        set(ZM_CONFIG_DIR "/usr/local/etc/zm")
-        set(ZM_CONFIG_SUBDIR "/usr/local/etc/zm/conf.d")
-        set(ZM_WEBDIR "/usr/local/share/zoneminder/www")
-        set(ZM_CGIDIR "/usr/local/libexec/zoneminder/cgi-bin")
-        set(ZM_PERL_MM_PARMS "INSTALLDIRS=site")
-endif((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
+  set(ZM_RUNDIR "/var/run/zm")
+  set(ZM_SOCKDIR "/var/run/zm")
+  set(ZM_TMPDIR "/var/tmp/zm")
+  set(ZM_CONTENTDIR "/usr/local/var/lib/zoneminder")
+  set(ZM_WEB_USER "www")
+  set(ZM_WEB_GROUP "www")
+  set(ZM_CONFIG_DIR "/usr/local/etc/zm")
+  set(ZM_CONFIG_SUBDIR "/usr/local/etc/zm/conf.d")
+  set(ZM_WEBDIR "/usr/local/share/zoneminder/www")
+  set(ZM_CGIDIR "/usr/local/libexec/zoneminder/cgi-bin")
+  set(ZM_PERL_MM_PARMS "INSTALLDIRS=site")
+endif()
+
+if(BUILD_MAN)
+  message(STATUS "Building man pages: Yes (default)")
+  set(ZM_PERL_MM_PARMS_FULL ${ZM_PERL_MM_PARMS})
+else()
+  message(STATUS "Building man pages: No")
+  list(APPEND ZM_PERL_MM_PARMS_FULL ${ZM_PERL_MM_PARMS}
+    "INSTALLMAN1DIR=none"
+    "INSTALLMAN3DIR=none")
+endif()
 
 # Required for certain checks to work
-set(CMAKE_EXTRA_INCLUDE_FILES 
-    ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h
-    )
-# Required for including headers from the this folder
-include_directories("${CMAKE_BINARY_DIR}")
+set(CMAKE_EXTRA_INCLUDE_FILES ${CMAKE_EXTRA_INCLUDE_FILES} stdio.h stdlib.h math.h signal.h)
 # This is required to enable searching in lib64 (if exists), do not change
 set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS ON)
 
 # Set the systemd flag if systemd is autodetected or ZM_SYSTEMD has been set
 if(ZM_SYSTEMD OR (IS_DIRECTORY /usr/lib/systemd/system) OR (IS_DIRECTORY /lib/systemd/system))
-    set(WITH_SYSTEMD 1)
-endif(ZM_SYSTEMD OR (IS_DIRECTORY /usr/lib/systemd/system) OR (IS_DIRECTORY /lib/systemd/system))
+  set(WITH_SYSTEMD 1)
+endif()
 
 # System checks
 check_include_file("libv4l1-videodev.h" HAVE_LIBV4L1_VIDEODEV_H)
 if(NOT HAVE_LIBV4L1_VIDEODEV_H)
-	check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
-endif(NOT HAVE_LIBV4L1_VIDEODEV_H)
+  check_include_file("linux/videodev.h" HAVE_LINUX_VIDEODEV_H)
+endif()
 check_include_file("linux/videodev2.h" HAVE_LINUX_VIDEODEV2_H)
 check_include_file("execinfo.h" HAVE_EXECINFO_H)
-if (HAVE_EXECINFO_H)
+if(HAVE_EXECINFO_H)
   check_function_exists("backtrace" HAVE_DECL_BACKTRACE)
-  if (NOT HAVE_DECL_BACKTRACE)
-    find_library (EXECINFO_LIBRARY NAMES execinfo)
-    if (EXECINFO_LIBRARY)
-        list(APPEND ZM_BIN_LIBS "-lexecinfo")
-    endif (EXECINFO_LIBRARY)
-  endif (NOT HAVE_DECL_BACKTRACE)
+  if(NOT HAVE_DECL_BACKTRACE)
+    find_library(EXECINFO_LIBRARY NAMES execinfo)
+    if(EXECINFO_LIBRARY)
+      list(APPEND ZM_BIN_LIBS "-lexecinfo")
+    endif()
+  endif()
   check_function_exists("backtrace_symbols" HAVE_DECL_BACKTRACE_SYMBOLS)
-endif (HAVE_EXECINFO_H)
+endif()
 check_include_file("ucontext.h" HAVE_UCONTEXT_H)
 check_include_file("sys/sendfile.h" HAVE_SYS_SENDFILE_H)
 check_include_file("sys/syscall.h" HAVE_SYS_SYSCALL_H)
@@ -294,326 +273,269 @@ check_type_size("ucontext_t" HAVE_UCONTEXT_T)
 
 # *** LIBRARY CHECKS ***
 
-if (UNIX)
-    include (CheckLibraryExists)
-    CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
-    if(NOT HAVE_CLOCK_GETTIME)
-        message(FATAL_ERROR "clock_gettime not found")
-    else(NOT HAVE_CLOCK_GETTIME)
-        list(APPEND ZM_BIN_LIBS "-lrt")
-    endif(NOT HAVE_CLOCK_GETTIME)
-endif(UNIX)
+if(UNIX)
+  include(CheckLibraryExists)
+  CHECK_LIBRARY_EXISTS(rt clock_gettime "time.h" HAVE_CLOCK_GETTIME)
+  if(NOT HAVE_CLOCK_GETTIME)
+    message(FATAL_ERROR "clock_gettime not found")
+  else()
+    list(APPEND ZM_BIN_LIBS "-lrt")
+  endif()
+endif()
 
 # zlib
 find_package(ZLIB)
 if(ZLIB_FOUND)
-	set(HAVE_LIBZLIB 1)
-	list(APPEND ZM_BIN_LIBS "${ZLIB_LIBRARIES}")
-	include_directories("${ZLIB_INCLUDE_DIR}")
-	set(CMAKE_REQUIRED_INCLUDES "${ZLIB_INCLUDE_DIR}")
-	check_include_file("zlib.h" HAVE_ZLIB_H)
-	set(optlibsfound "${optlibsfound} zlib")
-else(ZLIB_FOUND)
-	set(optlibsnotfound "${optlibsnotfound} zlib")
-endif(ZLIB_FOUND)
+  set(HAVE_LIBZLIB 1)
+  list(APPEND ZM_BIN_LIBS "${ZLIB_LIBRARIES}")
+  include_directories("${ZLIB_INCLUDE_DIR}")
+  set(CMAKE_REQUIRED_INCLUDES "${ZLIB_INCLUDE_DIR}")
+  check_include_file("zlib.h" HAVE_ZLIB_H)
+  set(optlibsfound "${optlibsfound} zlib")
+else()
+  set(optlibsnotfound "${optlibsnotfound} zlib")
+endif()
 
 # Do not check for cURL if ZM_NO_CURL is on
 if(NOT ZM_NO_CURL)
-	# cURL
-	find_package(CURL)
-	if(CURL_FOUND)
-		set(HAVE_LIBCURL 1)
-		#list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
-		include_directories(${CURL_INCLUDE_DIRS})
-		set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
-		check_include_file("curl/curl.h" HAVE_CURL_CURL_H)
-		set(optlibsfound "${optlibsfound} cURL")
-	else(CURL_FOUND)
-		set(optlibsnotfound "${optlibsnotfound} cURL")
-	endif(CURL_FOUND)
-endif(NOT ZM_NO_CURL)
+  # cURL
+  find_package(CURL)
+  if(CURL_FOUND)
+    set(HAVE_LIBCURL 1)
+    #list(APPEND ZM_BIN_LIBS ${CURL_LIBRARIES})
+    include_directories(${CURL_INCLUDE_DIRS})
+    set(CMAKE_REQUIRED_INCLUDES ${CURL_INCLUDE_DIRS})
+    check_include_file("curl/curl.h" HAVE_CURL_CURL_H)
+    set(optlibsfound "${optlibsfound} cURL")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} cURL")
+  endif()
+endif()
 
 # jpeg
 find_package(JPEG)
 if(JPEG_FOUND)
-	set(HAVE_LIBJPEG 1)
-	list(APPEND ZM_BIN_LIBS "${JPEG_LIBRARIES}")
-	#link_directories(${JPEG_LIBRARY})
-	include_directories("${JPEG_INCLUDE_DIR}")
-	set(CMAKE_REQUIRED_INCLUDES "${JPEG_INCLUDE_DIR}")
-	check_include_files("stdio.h;jpeglib.h" HAVE_JPEGLIB_H)
-	if(NOT HAVE_JPEGLIB_H)
-		message(FATAL_ERROR 
-                    "ZoneMinder requires libjpeg headers - check that libjpeg development packages are installed")
-	endif(NOT HAVE_JPEGLIB_H)
-else(JPEG_FOUND)
-	message(FATAL_ERROR 
-            "ZoneMinder requires jpeg but it was not found on your system")
-endif(JPEG_FOUND)
+  set(HAVE_LIBJPEG 1)
+  list(APPEND ZM_BIN_LIBS "${JPEG_LIBRARIES}")
+  #link_directories(${JPEG_LIBRARY})
+  include_directories("${JPEG_INCLUDE_DIR}")
+  set(CMAKE_REQUIRED_INCLUDES "${JPEG_INCLUDE_DIR}")
+  check_include_files("stdio.h;jpeglib.h" HAVE_JPEGLIB_H)
+  if(NOT HAVE_JPEGLIB_H)
+    message(FATAL_ERROR
+      "ZoneMinder requires libjpeg headers - check that libjpeg development packages are installed")
+  endif()
+else()
+  message(FATAL_ERROR
+    "ZoneMinder requires jpeg but it was not found on your system")
+endif()
 
 # LIBJWT
 find_package(LibJWT)
 if(LIBJWT_FOUND)
-	set(HAVE_LIBJWT 1)
-	set(optlibsfound "${optlibsfound} LIBJWT")
-	list(APPEND ZM_BIN_LIBS "${LIBJWT_LIBRARY}")
-else(LIBJWT_FOUND)
-	set(optlibsnotfound "${optlibsnotfound} LIBJWT")
-endif(LIBJWT_FOUND)
+  set(HAVE_LIBJWT 1)
+  set(optlibsfound "${optlibsfound} LIBJWT")
+  list(APPEND ZM_BIN_LIBS "${LIBJWT_LIBRARY}")
+else()
+  set(optlibsnotfound "${optlibsnotfound} LIBJWT")
+endif()
 
 # gnutls (using find_library and find_path)
 if(HAVE_LIBJWT)
-	find_library(GNUTLS_LIBRARIES gnutls)
-	if(GNUTLS_LIBRARIES)
-		set(HAVE_LIBGNUTLS 1)
-		list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
-		find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
-		if(GNUTLS_INCLUDE_DIR)
-			include_directories("${GNUTLS_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-		endif(GNUTLS_INCLUDE_DIR)
-		mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
-		check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
-		set(optlibsfound "${optlibsfound} GnuTLS")
-	else(GNUTLS_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} GnuTLS")
-	endif(GNUTLS_LIBRARIES)
-endif(HAVE_LIBJWT)
+  find_library(GNUTLS_LIBRARIES gnutls)
+  if(GNUTLS_LIBRARIES)
+    set(HAVE_LIBGNUTLS 1)
+    list(APPEND ZM_BIN_LIBS "${GNUTLS_LIBRARIES}")
+    find_path(GNUTLS_INCLUDE_DIR gnutls/gnutls.h)
+    if(GNUTLS_INCLUDE_DIR)
+      include_directories("${GNUTLS_INCLUDE_DIR}")
+      set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
+    endif()
+    mark_as_advanced(FORCE GNUTLS_LIBRARIES GNUTLS_INCLUDE_DIR)
+    check_include_file("gnutls/gnutls.h" HAVE_GNUTLS_GNUTLS_H)
+    set(optlibsfound "${optlibsfound} GnuTLS")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} GnuTLS")
+  endif()
+endif()
 
 # OpenSSL
 if(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
-    find_package(OpenSSL)
-    if(OPENSSL_FOUND)
-        set(HAVE_LIBOPENSSL 1)
-        set(HAVE_LIBCRYPTO 1)
-        list(APPEND ZM_BIN_LIBS "${OPENSSL_LIBRARIES}")
-        include_directories("${OPENSSL_INCLUDE_DIR}")
-        set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-        check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
-        set(optlibsfound "${optlibsfound} OpenSSL")
-    else(OPENSSL_FOUND)
-        set(optlibsnotfound "${optlibsnotfound} OpenSSL")
-    endif(OPENSSL_FOUND)
-endif(NOT HAVE_LIBGNUTLS OR NOT HAVE_LIBJWT)
+  find_package(OpenSSL)
+  if(OPENSSL_FOUND)
+    set(HAVE_LIBOPENSSL 1)
+    set(HAVE_LIBCRYPTO 1)
+    list(APPEND ZM_BIN_LIBS "${OPENSSL_LIBRARIES}")
+    include_directories("${OPENSSL_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+    check_include_file("openssl/md5.h" HAVE_OPENSSL_MD5_H)
+    set(optlibsfound "${optlibsfound} OpenSSL")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} OpenSSL")
+  endif()
+endif()
 
 # pthread (using find_library and find_path)
 find_library(PTHREAD_LIBRARIES pthread)
 if(PTHREAD_LIBRARIES)
-	set(HAVE_LIBPTHREAD 1)
-	list(APPEND ZM_BIN_LIBS "${PTHREAD_LIBRARIES}")
-	find_path(PTHREAD_INCLUDE_DIR pthread.h)
-	if(PTHREAD_INCLUDE_DIR)
-		include_directories("${PTHREAD_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${PTHREAD_INCLUDE_DIR}")
-	endif(PTHREAD_INCLUDE_DIR)
-	mark_as_advanced(FORCE PTHREAD_LIBRARIES PTHREAD_INCLUDE_DIR)
-	check_include_file("pthread.h" HAVE_PTHREAD_H)
-	if(NOT HAVE_PTHREAD_H)
-		message(FATAL_ERROR 
-                    "ZoneMinder requires pthread headers - check that pthread development packages are installed")
-	endif(NOT HAVE_PTHREAD_H)
-else(PTHREAD_LIBRARIES)
-	message(FATAL_ERROR 
-            "ZoneMinder requires pthread but it was not found on your system")
-endif(PTHREAD_LIBRARIES)
+  set(HAVE_LIBPTHREAD 1)
+  list(APPEND ZM_BIN_LIBS "${PTHREAD_LIBRARIES}")
+  find_path(PTHREAD_INCLUDE_DIR pthread.h)
+  if(PTHREAD_INCLUDE_DIR)
+    include_directories("${PTHREAD_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${PTHREAD_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE PTHREAD_LIBRARIES PTHREAD_INCLUDE_DIR)
+  check_include_file("pthread.h" HAVE_PTHREAD_H)
+  if(NOT HAVE_PTHREAD_H)
+    message(FATAL_ERROR "ZoneMinder requires pthread headers - check that pthread development packages are installed")
+  endif()
+else()
+  message(FATAL_ERROR "ZoneMinder requires pthread but it was not found on your system")
+endif()
 
 # pcre (using find_library and find_path)
 find_library(PCRE_LIBRARIES pcre)
 if(PCRE_LIBRARIES)
-	set(HAVE_LIBPCRE 1)
-	list(APPEND ZM_BIN_LIBS "${PCRE_LIBRARIES}")
-	find_path(PCRE_INCLUDE_DIR pcre.h)
-	if(PCRE_INCLUDE_DIR)
-		include_directories("${PCRE_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${PCRE_INCLUDE_DIR}")
-	endif(PCRE_INCLUDE_DIR)
-	mark_as_advanced(FORCE PCRE_LIBRARIES PCRE_INCLUDE_DIR)
-	check_include_file("pcre.h" HAVE_PCRE_H)
-	set(optlibsfound "${optlibsfound} PCRE")
-else(PCRE_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} PCRE")
-endif(PCRE_LIBRARIES)
+  set(HAVE_LIBPCRE 1)
+  list(APPEND ZM_BIN_LIBS "${PCRE_LIBRARIES}")
+  find_path(PCRE_INCLUDE_DIR pcre.h)
+  if(PCRE_INCLUDE_DIR)
+    include_directories("${PCRE_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${PCRE_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE PCRE_LIBRARIES PCRE_INCLUDE_DIR)
+  check_include_file("pcre.h" HAVE_PCRE_H)
+  set(optlibsfound "${optlibsfound} PCRE")
+else()
+  set(optlibsnotfound "${optlibsnotfound} PCRE")
+endif()
 
 # gcrypt (using find_library and find_path)
 find_library(GCRYPT_LIBRARIES gcrypt)
 if(GCRYPT_LIBRARIES)
-	set(HAVE_LIBGCRYPT 1)
-	list(APPEND ZM_BIN_LIBS "${GCRYPT_LIBRARIES}")
-	find_path(GCRYPT_INCLUDE_DIR gcrypt.h)
-	if(GCRYPT_INCLUDE_DIR)
-		include_directories("${GCRYPT_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${GCRYPT_INCLUDE_DIR}")
-	endif(GCRYPT_INCLUDE_DIR)
-	mark_as_advanced(FORCE GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR)
-	check_include_file("gcrypt.h" HAVE_GCRYPT_H)
-	set(optlibsfound "${optlibsfound} GCrypt")
-else(GCRYPT_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} GCrypt")
-endif(GCRYPT_LIBRARIES)
+  set(HAVE_LIBGCRYPT 1)
+  list(APPEND ZM_BIN_LIBS "${GCRYPT_LIBRARIES}")
+  find_path(GCRYPT_INCLUDE_DIR gcrypt.h)
+  if(GCRYPT_INCLUDE_DIR)
+    include_directories("${GCRYPT_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${GCRYPT_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIR)
+  check_include_file("gcrypt.h" HAVE_GCRYPT_H)
+  set(optlibsfound "${optlibsfound} GCrypt")
+else()
+  set(optlibsnotfound "${optlibsnotfound} GCrypt")
+endif()
 
 # mysqlclient (using find_library and find_path)
 find_library(MYSQLCLIENT_LIBRARIES mysqlclient PATH_SUFFIXES mysql)
 if(MYSQLCLIENT_LIBRARIES)
-	set(HAVE_LIBMYSQLCLIENT 1)
-	list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
-	find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h PATH_SUFFIXES mysql)
-	if(MYSQLCLIENT_INCLUDE_DIR)
-		include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
-	endif(MYSQLCLIENT_INCLUDE_DIR)
-	mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
-	check_include_file("mysql.h" HAVE_MYSQL_H)
-	if(NOT HAVE_MYSQL_H)
-		message(FATAL_ERROR 
-                    "ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
-	endif(NOT HAVE_MYSQL_H)
-else(MYSQLCLIENT_LIBRARIES)
-	message(FATAL_ERROR 
-            "ZoneMinder requires mysqlclient but it was not found on your system")
-endif(MYSQLCLIENT_LIBRARIES)
-
-# x264 (using find_library and find_path)
-find_library(X264_LIBRARIES x264)
-if(X264_LIBRARIES)
-	set(HAVE_LIBX264 1)
-	list(APPEND ZM_BIN_LIBS "${X264_LIBRARIES}")
-	find_path(X264_INCLUDE_DIR x264.h)
-	if(X264_INCLUDE_DIR)
-		include_directories("${X264_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${X264_INCLUDE_DIR}")
-	endif(X264_INCLUDE_DIR)
-	mark_as_advanced(FORCE X264_LIBRARIES X264_INCLUDE_DIR)
-	check_include_files("stdint.h;x264.h" HAVE_X264_H)
-	set(optlibsfound "${optlibsfound} x264")
-else(X264_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} x264")
-endif(X264_LIBRARIES)
-
-# mp4v2 (using find_library and find_path)
-find_library(MP4V2_LIBRARIES mp4v2)
-if(MP4V2_LIBRARIES)
-	set(HAVE_LIBMP4V2 1)
-	list(APPEND ZM_BIN_LIBS "${MP4V2_LIBRARIES}")
-
-        # mp4v2/mp4v2.h
-	find_path(MP4V2_INCLUDE_DIR mp4v2/mp4v2.h)
-	if(MP4V2_INCLUDE_DIR)
-		include_directories("${MP4V2_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
-		check_include_file("mp4v2/mp4v2.h" HAVE_MP4V2_MP4V2_H)
-	endif(MP4V2_INCLUDE_DIR)
-
-        # mp4v2.h
-	find_path(MP4V2_INCLUDE_DIR mp4v2.h)
-	if(MP4V2_INCLUDE_DIR)
-		include_directories("${MP4V2_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
-		check_include_file("mp4v2.h" HAVE_MP4V2_H)
-	endif(MP4V2_INCLUDE_DIR)
-
-	# mp4.h
-	find_path(MP4V2_INCLUDE_DIR mp4.h)
-	if(MP4V2_INCLUDE_DIR)
-		include_directories("${MP4V2_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${MP4V2_INCLUDE_DIR}")
-		check_include_file("mp4.h" HAVE_MP4_H)
-	endif(MP4V2_INCLUDE_DIR)
-
-	mark_as_advanced(FORCE MP4V2_LIBRARIES MP4V2_INCLUDE_DIR)
-	set(optlibsfound "${optlibsfound} mp4v2")
-else(MP4V2_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} mp4v2")
-endif(MP4V2_LIBRARIES)
+  set(HAVE_LIBMYSQLCLIENT 1)
+  list(APPEND ZM_BIN_LIBS "${MYSQLCLIENT_LIBRARIES}")
+  find_path(MYSQLCLIENT_INCLUDE_DIR mysql.h PATH_SUFFIXES mysql)
+  if(MYSQLCLIENT_INCLUDE_DIR)
+    include_directories("${MYSQLCLIENT_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${MYSQLCLIENT_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE MYSQLCLIENT_LIBRARIES MYSQLCLIENT_INCLUDE_DIR)
+  check_include_file("mysql.h" HAVE_MYSQL_H)
+  if(NOT HAVE_MYSQL_H)
+    message(FATAL_ERROR "ZoneMinder requires MySQL headers - check that MySQL development packages are installed")
+  endif()
+else()
+  message(FATAL_ERROR "ZoneMinder requires mysqlclient but it was not found on your system")
+endif()
 
 set(PATH_FFMPEG "")
 set(OPT_FFMPEG "no")
 # avformat (using find_library and find_path)
 find_library(AVFORMAT_LIBRARIES avformat)
 if(AVFORMAT_LIBRARIES)
-	set(HAVE_LIBAVFORMAT 1)
-	list(APPEND ZM_BIN_LIBS "${AVFORMAT_LIBRARIES}")
-	find_path(AVFORMAT_INCLUDE_DIR "libavformat/avformat.h" /usr/include/ffmpeg)
-	if(AVFORMAT_INCLUDE_DIR)
-		include_directories("${AVFORMAT_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${AVFORMAT_INCLUDE_DIR}")
-	endif(AVFORMAT_INCLUDE_DIR)
-	mark_as_advanced(FORCE AVFORMAT_LIBRARIES AVFORMAT_INCLUDE_DIR)
-	check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
-	set(optlibsfound "${optlibsfound} AVFormat")
-else(AVFORMAT_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} AVFormat")
-endif(AVFORMAT_LIBRARIES)
+  set(HAVE_LIBAVFORMAT 1)
+  list(APPEND ZM_BIN_LIBS "${AVFORMAT_LIBRARIES}")
+  find_path(AVFORMAT_INCLUDE_DIR "libavformat/avformat.h" /usr/include/ffmpeg)
+  if(AVFORMAT_INCLUDE_DIR)
+    include_directories("${AVFORMAT_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${AVFORMAT_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE AVFORMAT_LIBRARIES AVFORMAT_INCLUDE_DIR)
+  check_include_file("libavformat/avformat.h" HAVE_LIBAVFORMAT_AVFORMAT_H)
+  set(optlibsfound "${optlibsfound} AVFormat")
+else()
+  set(optlibsnotfound "${optlibsnotfound} AVFormat")
+endif()
 
 # avcodec (using find_library and find_path)
 find_library(AVCODEC_LIBRARIES avcodec)
 if(AVCODEC_LIBRARIES)
-	set(HAVE_LIBAVCODEC 1)
-	list(APPEND ZM_BIN_LIBS "${AVCODEC_LIBRARIES}")
-	find_path(AVCODEC_INCLUDE_DIR "libavcodec/avcodec.h" /usr/include/ffmpeg)
-	if(AVCODEC_INCLUDE_DIR)
-		include_directories("${AVCODEC_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${AVCODEC_INCLUDE_DIR}")
-	endif(AVCODEC_INCLUDE_DIR)
-	mark_as_advanced(FORCE AVCODEC_LIBRARIES AVCODEC_INCLUDE_DIR)
-	check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
-	set(optlibsfound "${optlibsfound} AVCodec")
-else(AVCODEC_LIBRARIES)
+  set(HAVE_LIBAVCODEC 1)
+  list(APPEND ZM_BIN_LIBS "${AVCODEC_LIBRARIES}")
+  find_path(AVCODEC_INCLUDE_DIR "libavcodec/avcodec.h" /usr/include/ffmpeg)
+  if(AVCODEC_INCLUDE_DIR)
+    include_directories("${AVCODEC_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${AVCODEC_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE AVCODEC_LIBRARIES AVCODEC_INCLUDE_DIR)
+  check_include_file("libavcodec/avcodec.h" HAVE_LIBAVCODEC_AVCODEC_H)
+  set(optlibsfound "${optlibsfound} AVCodec")
+else()
   message(WARNING "\nWhile it should be possible to build ZM without AVCODEC the result will pretty useless.")
-	set(optlibsnotfound "${optlibsnotfound} AVCodec")
-endif(AVCODEC_LIBRARIES)
+  set(optlibsnotfound "${optlibsnotfound} AVCodec")
+endif()
 
 # avdevice (using find_library and find_path)
 find_library(AVDEVICE_LIBRARIES avdevice)
 if(AVDEVICE_LIBRARIES)
-	set(HAVE_LIBAVDEVICE 1)
-	list(APPEND ZM_BIN_LIBS "${AVDEVICE_LIBRARIES}")
-	find_path(AVDEVICE_INCLUDE_DIR "libavdevice/avdevice.h" /usr/include/ffmpeg)
-	if(AVDEVICE_INCLUDE_DIR)
-		include_directories("${AVDEVICE_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${AVDEVICE_INCLUDE_DIR}")
-	endif(AVDEVICE_INCLUDE_DIR)
-	mark_as_advanced(FORCE AVDEVICE_LIBRARIES AVDEVICE_INCLUDE_DIR)
-	check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
-	set(optlibsfound "${optlibsfound} AVDevice")
-else(AVDEVICE_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} AVDevice")
-endif(AVDEVICE_LIBRARIES)
+  set(HAVE_LIBAVDEVICE 1)
+  list(APPEND ZM_BIN_LIBS "${AVDEVICE_LIBRARIES}")
+  find_path(AVDEVICE_INCLUDE_DIR "libavdevice/avdevice.h" /usr/include/ffmpeg)
+  if(AVDEVICE_INCLUDE_DIR)
+    include_directories("${AVDEVICE_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${AVDEVICE_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE AVDEVICE_LIBRARIES AVDEVICE_INCLUDE_DIR)
+  check_include_file("libavdevice/avdevice.h" HAVE_LIBAVDEVICE_AVDEVICE_H)
+  set(optlibsfound "${optlibsfound} AVDevice")
+else()
+  set(optlibsnotfound "${optlibsnotfound} AVDevice")
+endif()
 
 # avutil (using find_library and find_path)
 find_library(AVUTIL_LIBRARIES avutil)
 if(AVUTIL_LIBRARIES)
-	set(HAVE_LIBAVUTIL 1)
-	list(APPEND ZM_BIN_LIBS "${AVUTIL_LIBRARIES}")
-	find_path(AVUTIL_INCLUDE_DIR "libavutil/avutil.h" /usr/include/ffmpeg)
-	if(AVUTIL_INCLUDE_DIR)
-		include_directories("${AVUTIL_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${AVUTIL_INCLUDE_DIR}")
-	endif(AVUTIL_INCLUDE_DIR)
-	mark_as_advanced(FORCE AVUTIL_LIBRARIES AVUTIL_INCLUDE_DIR)
-	check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
-	check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
-	check_include_file("libavutil/hwcontext.h" HAVE_LIBAVUTIL_HWCONTEXT_H)
-	set(optlibsfound "${optlibsfound} AVUtil")
-else(AVUTIL_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} AVUtil")
-endif(AVUTIL_LIBRARIES)
+  set(HAVE_LIBAVUTIL 1)
+  list(APPEND ZM_BIN_LIBS "${AVUTIL_LIBRARIES}")
+  find_path(AVUTIL_INCLUDE_DIR "libavutil/avutil.h" /usr/include/ffmpeg)
+  if(AVUTIL_INCLUDE_DIR)
+    include_directories("${AVUTIL_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${AVUTIL_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE AVUTIL_LIBRARIES AVUTIL_INCLUDE_DIR)
+  check_include_file("libavutil/avutil.h" HAVE_LIBAVUTIL_AVUTIL_H)
+  check_include_file("libavutil/mathematics.h" HAVE_LIBAVUTIL_MATHEMATICS_H)
+  check_include_file("libavutil/hwcontext.h" HAVE_LIBAVUTIL_HWCONTEXT_H)
+  set(optlibsfound "${optlibsfound} AVUtil")
+else()
+  set(optlibsnotfound "${optlibsnotfound} AVUtil")
+endif()
 
 # swscale (using find_library and find_path)
 find_library(SWSCALE_LIBRARIES swscale)
 if(SWSCALE_LIBRARIES)
-	set(HAVE_LIBSWSCALE 1)
-	list(APPEND ZM_BIN_LIBS "${SWSCALE_LIBRARIES}")
-	find_path(SWSCALE_INCLUDE_DIR "libswscale/swscale.h" /usr/include/ffmpeg)
-	if(SWSCALE_INCLUDE_DIR)
-		include_directories("${SWSCALE_INCLUDE_DIR}")
-		set(CMAKE_REQUIRED_INCLUDES "${SWSCALE_INCLUDE_DIR}")
-	endif(SWSCALE_INCLUDE_DIR)
-	mark_as_advanced(FORCE SWSCALE_LIBRARIES SWSCALE_INCLUDE_DIR)
-	check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
-	set(optlibsfound "${optlibsfound} SWScale")
-else(SWSCALE_LIBRARIES)
-	set(optlibsnotfound "${optlibsnotfound} SWScale")
-endif(SWSCALE_LIBRARIES)
+  set(HAVE_LIBSWSCALE 1)
+  list(APPEND ZM_BIN_LIBS "${SWSCALE_LIBRARIES}")
+  find_path(SWSCALE_INCLUDE_DIR "libswscale/swscale.h" /usr/include/ffmpeg)
+  if(SWSCALE_INCLUDE_DIR)
+    include_directories("${SWSCALE_INCLUDE_DIR}")
+    set(CMAKE_REQUIRED_INCLUDES "${SWSCALE_INCLUDE_DIR}")
+  endif()
+  mark_as_advanced(FORCE SWSCALE_LIBRARIES SWSCALE_INCLUDE_DIR)
+  check_include_file("libswscale/swscale.h" HAVE_LIBSWSCALE_SWSCALE_H)
+  set(optlibsfound "${optlibsfound} SWScale")
+else()
+  set(optlibsnotfound "${optlibsnotfound} SWScale")
+endif()
 
 # SWresample (using find_library and find_path)
 find_library(SWRESAMPLE_LIBRARIES swresample)
@@ -624,11 +546,11 @@ if(SWRESAMPLE_LIBRARIES)
   if(SWRESAMPLE_INCLUDE_DIR)
     include_directories("${SWRESAMPLE_INCLUDE_DIR}")
     set(CMAKE_REQUIRED_INCLUDES "${SWRESAMPLE_INCLUDE_DIR}")
-  endif(SWRESAMPLE_INCLUDE_DIR)
+  endif()
   mark_as_advanced(FORCE SWRESAMPLE_LIBRARIES SWRESAMPLE_INCLUDE_DIR)
   check_include_file("libswresample/swresample.h" HAVE_LIBSWRESAMPLE_SWRESAMPLE_H)
   set(optlibsfound "${optlibsfound} SWResample")
-else(SWRESAMPLE_LIBRARIES)
+else()
   set(optlibsnotfound "${optlibsnotfound} SWResample")
 
   # AVresample (using find_library and find_path)
@@ -640,79 +562,84 @@ else(SWRESAMPLE_LIBRARIES)
     if(AVRESAMPLE_INCLUDE_DIR)
       include_directories("${AVRESAMPLE_INCLUDE_DIR}")
       set(CMAKE_REQUIRED_INCLUDES "${AVRESAMPLE_INCLUDE_DIR}")
-    endif(AVRESAMPLE_INCLUDE_DIR)
+    endif()
     mark_as_advanced(FORCE AVRESAMPLE_LIBRARIES AVRESAMPLE_INCLUDE_DIR)
     check_include_file("libavresample/avresample.h" HAVE_LIBAVRESAMPLE_AVRESAMPLE_H)
     set(optlibsfound "${optlibsfound} AVResample")
-  else(AVRESAMPLE_LIBRARIES)
+  else()
     set(optlibsnotfound "${optlibsnotfound} AVResample")
-  endif(AVRESAMPLE_LIBRARIES)
-
-endif(SWRESAMPLE_LIBRARIES)
+  endif()
+endif()
 
 # Find the path to the ffmpeg executable
-find_program(FFMPEG_EXECUTABLE 
-	NAMES ffmpeg avconv
-	PATH_SUFFIXES ffmpeg)
+find_program(FFMPEG_EXECUTABLE
+  NAMES ffmpeg avconv
+  PATH_SUFFIXES ffmpeg)
 if(FFMPEG_EXECUTABLE)
-	set(PATH_FFMPEG "${FFMPEG_EXECUTABLE}")
-	set(OPT_FFMPEG "yes")
-	mark_as_advanced(FFMPEG_EXECUTABLE)
-endif(FFMPEG_EXECUTABLE)
+  set(PATH_FFMPEG "${FFMPEG_EXECUTABLE}")
+  set(OPT_FFMPEG "yes")
+  mark_as_advanced(FFMPEG_EXECUTABLE)
+endif()
 
 # Do not check for libvlc if ZM_NO_LIBVLC is on
 if(NOT ZM_NO_LIBVLC)
-	# libvlc (using find_library and find_path)
-	find_library(LIBVLC_LIBRARIES vlc)
-	if(LIBVLC_LIBRARIES)
-		set(HAVE_LIBVLC 1)
-		#list(APPEND ZM_BIN_LIBS "${LIBVLC_LIBRARIES}")
-		find_path(LIBVLC_INCLUDE_DIR "vlc/vlc.h")
-		if(LIBVLC_INCLUDE_DIR)
-			include_directories("${LIBVLC_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${LIBVLC_INCLUDE_DIR}")
-		endif(LIBVLC_INCLUDE_DIR)
-		mark_as_advanced(FORCE LIBVLC_LIBRARIES LIBVLC_INCLUDE_DIR)
-		check_include_file("vlc/vlc.h" HAVE_VLC_VLC_H)
-		set(optlibsfound "${optlibsfound} libVLC")
-	else(LIBVLC_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} libVLC")
-	endif(LIBVLC_LIBRARIES)
-endif(NOT ZM_NO_LIBVLC)
+  # libvlc (using find_library and find_path)
+  find_library(LIBVLC_LIBRARIES vlc)
+  if(LIBVLC_LIBRARIES)
+    set(HAVE_LIBVLC 1)
+    #list(APPEND ZM_BIN_LIBS "${LIBVLC_LIBRARIES}")
+    find_path(LIBVLC_INCLUDE_DIR "vlc/vlc.h")
+    if(LIBVLC_INCLUDE_DIR)
+      include_directories("${LIBVLC_INCLUDE_DIR}")
+      set(CMAKE_REQUIRED_INCLUDES "${LIBVLC_INCLUDE_DIR}")
+    endif()
+    mark_as_advanced(FORCE LIBVLC_LIBRARIES LIBVLC_INCLUDE_DIR)
+    check_include_file("vlc/vlc.h" HAVE_VLC_VLC_H)
+    set(optlibsfound "${optlibsfound} libVLC")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} libVLC")
+  endif()
+endif()
 
 if(NOT ZM_NO_LIBVNC)
-	# libvncclient (using find_library and find_path)
-	find_library(LIBVNC_LIBRARIES vncclient)
-	if(LIBVNC_LIBRARIES)
-		set(HAVE_LIBVNC 1)
-		#list(APPEND ZM_BIN_LIBS "${LIBVNC_LIBRARIES}")
-		find_path(LIBVNC_INCLUDE_DIR "rfb/rfb.h")
-		if(LIBVNC_INCLUDE_DIR)
-			include_directories("${LIBVNC_INCLUDE_DIR}")
-			set(CMAKE_REQUIRED_INCLUDES "${LIBVNC_INCLUDE_DIR}")
-		endif(LIBVNC_INCLUDE_DIR)
-		mark_as_advanced(FORCE LIBVNC_LIBRARIES LIBVNC_INCLUDE_DIR)
-		check_include_file("rfb/rfb.h" HAVE_RFB_RFB_H)
-		set(optlibsfound "${optlibsfound} libVNC")
-	else(LIBVNC_LIBRARIES)
-		set(optlibsnotfound "${optlibsnotfound} libVNC")
-	endif(LIBVNC_LIBRARIES)
-endif(NOT ZM_NO_LIBVNC)
+  # libvncclient (using find_library and find_path)
+  find_library(LIBVNC_LIBRARIES vncclient)
+  if(LIBVNC_LIBRARIES)
+    set(HAVE_LIBVNC 1)
+    #list(APPEND ZM_BIN_LIBS "${LIBVNC_LIBRARIES}")
+    find_path(LIBVNC_INCLUDE_DIR "rfb/rfb.h")
+    if(LIBVNC_INCLUDE_DIR)
+      include_directories("${LIBVNC_INCLUDE_DIR}")
+      set(CMAKE_REQUIRED_INCLUDES "${LIBVNC_INCLUDE_DIR}")
+    endif()
+    mark_as_advanced(FORCE LIBVNC_LIBRARIES LIBVNC_INCLUDE_DIR)
+    check_include_file("rfb/rfb.h" HAVE_RFB_RFB_H)
+    set(optlibsfound "${optlibsfound} libVNC")
+  else()
+    set(optlibsnotfound "${optlibsnotfound} libVNC")
+  endif()
+endif()
 
 #find_package(Boost 1.36.0)
 #if(Boost_FOUND)
-  #include_directories(${Boost_INCLUDE_DIRS})
-  ##set(CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIRS}")
-  #list(APPEND ZM_BIN_LIBS "${Boost_LIBRARIES}")
+#include_directories(${Boost_INCLUDE_DIRS})
+##set(CMAKE_REQUIRED_INCLUDES "${Boost_INCLUDE_DIRS}")
+#list(APPEND ZM_BIN_LIBS "${Boost_LIBRARIES}")
 #endif()
+
+if(NOT ZM_NO_RTSPSERVER)
+  set(HAVE_RTSP_SERVER 1)
+else()
+  set(HAVE_RTSP_SERVER 0)
+endif()
+
 #
 # *** END OF LIBRARY CHECKS ***
 
 # Check for gnutls or crypto
 if((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
-	message(FATAL_ERROR 
-            "ZoneMinder requires crypto or gnutls but none were found on your system")
-endif((NOT HAVE_LIBCRYPTO) AND (NOT HAVE_LIBGNUTLS))
+  message(FATAL_ERROR "ZoneMinder requires crypto or gnutls but none were found on your system")
+endif()
 
 # Check for V4L header files and enable ZM_HAS_V4L, ZM_HAS_V4L1, ZM_HAS_V4L2 accordingly
 # Setting to zeros first is required because ZM uses #define for these
@@ -720,150 +647,144 @@ set(ZM_HAS_V4L 0)
 set(ZM_HAS_V4L1 0)
 set(ZM_HAS_V4L2 0)
 if(HAVE_LINUX_VIDEODEV_H OR HAVE_LIBV4L1_VIDEODEV_H)
-	set(ZM_HAS_V4L 1)
-	set(ZM_HAS_V4L1 1)
-endif(HAVE_LINUX_VIDEODEV_H OR HAVE_LIBV4L1_VIDEODEV_H)
+  set(ZM_HAS_V4L 1)
+  set(ZM_HAS_V4L1 1)
+endif()
 if(HAVE_LINUX_VIDEODEV2_H)
-	set(ZM_HAS_V4L 1)
-	set(ZM_HAS_V4L2 1)
-endif(HAVE_LINUX_VIDEODEV2_H)
-if((NOT HAVE_LINUX_VIDEODEV_H) 
-    AND (NOT HAVE_LIBV4L1_VIDEODEV_H) 
-    AND (NOT HAVE_LINUX_VIDEODEV2_H))
-	message(AUTHOR_WARNING 
-            "Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
-endif((NOT HAVE_LINUX_VIDEODEV_H) 
-    AND (NOT HAVE_LIBV4L1_VIDEODEV_H) 
-    AND (NOT HAVE_LINUX_VIDEODEV2_H))
+  set(ZM_HAS_V4L 1)
+  set(ZM_HAS_V4L2 1)
+endif()
+if((NOT HAVE_LINUX_VIDEODEV_H)
+  AND (NOT HAVE_LIBV4L1_VIDEODEV_H)
+  AND (NOT HAVE_LINUX_VIDEODEV2_H))
+  message(AUTHOR_WARNING "Video 4 Linux headers weren't found - Analog and USB camera support will not be available")
+endif()
 # Check for PCRE and enable ZM_PCRE accordingly
 set(ZM_PCRE 0)
 if(HAVE_LIBPCRE AND HAVE_PCRE_H)
-	set(ZM_PCRE 1)
-endif(HAVE_LIBPCRE AND HAVE_PCRE_H)
+  set(ZM_PCRE 1)
+endif()
 # Check for mmap and enable in all components
 set(ZM_MEM_MAPPED 0)
 set(ENABLE_MMAP no)
 if(NOT ZM_NO_MMAP)
-	set(ZM_MEM_MAPPED 1)
-	set(ENABLE_MMAP yes)
-	set(ZM_MMAP_PERLPACKAGE "Sys::Mmap")
-endif(NOT ZM_NO_MMAP)
+  set(ZM_MEM_MAPPED 1)
+  set(ENABLE_MMAP yes)
+  set(ZM_MMAP_PERLPACKAGE "Sys::Mmap")
+endif()
 
 # Check for the ONVIF flag and enable ZM_HAS_ONVIF accordingly
 set(ZM_HAS_ONVIF 0)
 if(ZM_ONVIF)
-	set(ZM_HAS_ONVIF 1)
-endif(ZM_ONVIF)
+  set(ZM_HAS_ONVIF 1)
+endif()
 
 # Check for authentication functions
 if(HAVE_OPENSSL_MD5_H)
-	set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
-	set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
-	check_prototype_definition(
-            MD5 
-            "unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)" "NULL" "openssl/md5.h" 
-            HAVE_MD5_OPENSSL)
-endif(HAVE_OPENSSL_MD5_H)
+  set(CMAKE_REQUIRED_LIBRARIES "${OPENSSL_LIBRARIES}")
+  set(CMAKE_REQUIRED_INCLUDES "${OPENSSL_INCLUDE_DIR}")
+  check_prototype_definition(
+    MD5
+    "unsigned char *MD5(const unsigned char *d, size_t n, unsigned char *md)" "NULL" "openssl/md5.h"
+    HAVE_MD5_OPENSSL)
+endif()
 
 if(HAVE_GNUTLS_GNUTLS_H)
-	set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
-	set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
-	check_prototype_definition(
-            gnutls_fingerprint 
-            "int gnutls_fingerprint (gnutls_digest_algorithm_t algo, const gnutls_datum_t * data, void *result, size_t * result_size)" "0" "stdlib.h;gnutls/gnutls.h" 
-            HAVE_DECL_GNUTLS_FINGERPRINT)
-endif(HAVE_GNUTLS_GNUTLS_H)
+  set(CMAKE_REQUIRED_LIBRARIES "${GNUTLS_LIBRARIES}")
+  set(CMAKE_REQUIRED_INCLUDES "${GNUTLS_INCLUDE_DIR}")
+  check_prototype_definition(
+    gnutls_fingerprint
+    "int gnutls_fingerprint (gnutls_digest_algorithm_t algo, const gnutls_datum_t * data, void *result, size_t * result_size)" "0" "stdlib.h;gnutls/gnutls.h"
+    HAVE_DECL_GNUTLS_FINGERPRINT)
+endif()
 
 if(NOT HAVE_DECL_GNUTLS_FINGERPRINT AND HAVE_MD5_OPENSSL)
-	set(HAVE_DECL_MD5 1)
-endif(NOT HAVE_DECL_GNUTLS_FINGERPRINT AND HAVE_MD5_OPENSSL)
+  set(HAVE_DECL_MD5 1)
+endif()
 
 if((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
-	message(AUTHOR_WARNING 
-        "ZoneMinder requires a working MD5 function for hashed authentication but 
-        none were found - hashed authentication will not be available")
-endif((NOT HAVE_MD5_OPENSSL) AND (NOT HAVE_DECL_GNUTLS_FINGERPRINT))
+  message(AUTHOR_WARNING
+    "ZoneMinder requires a working MD5 function for hashed authentication but
+     none were found - hashed authentication will not be available")
+endif()
 
 # Dirty fix for zm_user only using openssl's md5 if gnutls and gcrypt are not available.
 # This needs to be fixed in zm_user.[h,cpp] but such fix will also require changes to configure.ac
 if(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
-	set(HAVE_GCRYPT_H 0)
-	set(HAVE_GNUTLS_OPENSSL_H 0)
-endif(HAVE_LIBCRYPTO AND HAVE_OPENSSL_MD5_H AND HAVE_MD5_OPENSSL)
+  set(HAVE_GCRYPT_H 0)
+  set(HAVE_GNUTLS_OPENSSL_H 0)
+endif()
 
 # Check for Perl
 find_package(Perl)
 if(NOT PERL_FOUND)
-	message(FATAL_ERROR 
-            "ZoneMinder requires Perl 5.6.0 or newer but it was not found on your system")
-endif(NOT PERL_FOUND)
+  message(FATAL_ERROR "ZoneMinder requires Perl 5.6.0 or newer but it was not found on your system")
+endif()
 
 # Checking for perl modules requires FindPerlModules.cmake
 # Check all required modules at once
 # TODO: Add checking for the optional modules
 find_package(
-    PerlModules COMPONENTS Sys::Syslog DBI DBD::mysql 
-    Getopt::Long Time::HiRes Date::Manip LWP::UserAgent 
-    ExtUtils::MakeMaker ${ZM_MMAP_PERLPACKAGE})
+  PerlModules COMPONENTS Sys::Syslog DBI DBD::mysql
+  Getopt::Long Time::HiRes Date::Manip LWP::UserAgent
+  ExtUtils::MakeMaker ${ZM_MMAP_PERLPACKAGE})
 if(NOT PERLMODULES_FOUND)
-	message(FATAL_ERROR 
-            "Not all required perl modules were found on your system")
-endif(NOT PERLMODULES_FOUND)
+  message(WARNING "Not all required perl modules were found on your system")
+endif()
 
 # Attempt to check which user apache (or other web server) runs on by 
 # searching for a user beginning with apache or www and then cutting the user 
 # from the first matching user line
 if(ZM_WEB_USER STREQUAL "")
-	# Check for a user matching ^apache and cut the username from the 
-        # userline in the first match
-	file(STRINGS "/etc/passwd" userline_apache REGEX "^apache")
-	file(STRINGS "/etc/passwd" userline_www REGEX "^www")
-	if(NOT (userline_apache STREQUAL ""))
-		execute_process(
-                    COMMAND echo ${userline_apache} 
-                    COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER 
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-	elseif(NOT (userline_www STREQUAL ""))
-		execute_process(
-                    COMMAND echo ${userline_www} 
-                    COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER 
-                    OUTPUT_STRIP_TRAILING_WHITESPACE)
-	endif(NOT (userline_apache STREQUAL ""))
-	message(STATUS "Detected web server user: ${ZM_WEB_USER}")
-endif(ZM_WEB_USER STREQUAL "")
+  # Check for a user matching ^apache and cut the username from the
+  # userline in the first match
+  file(STRINGS "/etc/passwd" userline_apache REGEX "^apache")
+  file(STRINGS "/etc/passwd" userline_www REGEX "^www")
+  if(NOT (userline_apache STREQUAL ""))
+    execute_process(
+      COMMAND echo ${userline_apache}
+      COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  elseif(NOT (userline_www STREQUAL ""))
+    execute_process(
+      COMMAND echo ${userline_www}
+      COMMAND cut -d: -f1 OUTPUT_VARIABLE ZM_WEB_USER
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  endif()
+  message(STATUS "Detected web server user: ${ZM_WEB_USER}")
+endif()
 # Check if webgroup contains anything. If not, use the web user as the web group
 if(NOT ZM_WEB_GROUP)
-	set(ZM_WEB_GROUP ${ZM_WEB_USER})
-endif(NOT ZM_WEB_GROUP)
+  set(ZM_WEB_GROUP ${ZM_WEB_USER})
+endif()
 message(STATUS "Using web user: ${ZM_WEB_USER}")
 message(STATUS "Using web group: ${ZM_WEB_GROUP}")
 
 if(WITH_SYSTEMD)
-    # Check for polkit
-    find_package(Polkit)
-    if(NOT POLKIT_FOUND)
-	    message(FATAL_ERROR 
-                "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
-    endif(NOT POLKIT_FOUND)
-endif(WITH_SYSTEMD)
+  # Check for polkit
+  find_package(Polkit)
+  if(NOT POLKIT_FOUND)
+    message(WARNING "Running ZoneMinder requires polkit. Building ZoneMinder requires the polkit development package.")
+  endif()
+endif()
 
 # Find the path to an arp compatible executable
 if(ZM_PATH_ARP STREQUAL "")
-    find_program(ARP_EXECUTABLE arp)
+  find_program(ARP_EXECUTABLE arp)
+  if(ARP_EXECUTABLE)
+    set(ZM_PATH_ARP "${ARP_EXECUTABLE}")
+    mark_as_advanced(ARP_EXECUTABLE)
+  else()
+    find_program(ARP_EXECUTABLE ip)
     if(ARP_EXECUTABLE)
-        set(ZM_PATH_ARP "${ARP_EXECUTABLE}")
-        mark_as_advanced(ARP_EXECUTABLE)
-    else(ARP_EXECUTABLE)
-        find_program(ARP_EXECUTABLE ip)
-            if(ARP_EXECUTABLE)
-                set(ZM_PATH_ARP "${ARP_EXECUTABLE} neigh")
-                mark_as_advanced(ARP_EXECUTABLE)
-            endif(ARP_EXECUTABLE)
-    endif(ARP_EXECUTABLE)
-    if(ARP_EXECUTABLE-NOTFOUND)
-        message(WARNING "Unable to find a compatible arp binary. Monitor probe will not function." )
-    endif(ARP_EXECUTABLE-NOTFOUND)
-endif(ZM_PATH_ARP STREQUAL "")
+      set(ZM_PATH_ARP "${ARP_EXECUTABLE} neigh")
+      mark_as_advanced(ARP_EXECUTABLE)
+    endif()
+  endif()
+  if(ARP_EXECUTABLE-NOTFOUND)
+    message(WARNING "Unable to find a compatible arp binary. Monitor probe will not function.")
+  endif()
+endif()
 
 # Some variables that zm expects
 set(ZM_PID "${ZM_RUNDIR}/zm.pid")
@@ -880,15 +801,15 @@ set(WEB_USER "${ZM_WEB_USER}")
 set(WEB_GROUP "${ZM_WEB_GROUP}")
 set(ZM_DB_TYPE "mysql")
 if(ZM_PERL_SEARCH_PATH)
-	set(EXTRA_PERL_LIB "use lib '${ZM_PERL_SEARCH_PATH}'; # Include custom perl install path")
-else(ZM_PERL_SEARCH_PATH)
-	set(EXTRA_PERL_LIB "# Include from system perl paths only")
-endif(ZM_PERL_SEARCH_PATH)
+  set(EXTRA_PERL_LIB "use lib '${ZM_PERL_SEARCH_PATH}'; # Include custom perl install path")
+else()
+  set(EXTRA_PERL_LIB "# Include from system perl paths only")
+endif()
 
 # If this is an out-of-source build, copy the files we need to the binary directory
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf.d" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/conf.d" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
+endif()
 
 # Generate files from the .in files
 configure_file(zm.conf.in "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" @ONLY)
@@ -901,26 +822,31 @@ configure_file(zmlinkcontent.sh.in "${CMAKE_CURRENT_BINARY_DIR}/zmlinkcontent.sh
 include(Pod2Man)
 
 # Process subdirectories
-
-# build a bcrypt static library
-set(BUILD_SHARED_LIBS_SAVED "${BUILD_SHARED_LIBS}")
-set(BUILD_SHARED_LIBS OFF)
-add_subdirectory(src/libbcrypt EXCLUDE_FROM_ALL)
-set(BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS_SAVED}")
-
+add_subdirectory(dep)
 add_subdirectory(src)
 add_subdirectory(scripts)
 add_subdirectory(db)
+add_subdirectory(fonts)
 add_subdirectory(web)
 add_subdirectory(misc)
 add_subdirectory(onvif)
 
+if(BUILD_TEST_SUITE)
+  message("Building unit tests: Yes")
+  find_package(Catch2 REQUIRED)
+
+  include(CTest)
+  add_subdirectory(tests)
+else()
+  message("Building unit tests: No (default)")
+endif()
+
 # Process distro subdirectories
 if((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
-	add_subdirectory(distros/redhat)
-elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
-	add_subdirectory(distros/opensuse)
-endif((ZM_TARGET_DISTRO MATCHES "^el") OR (ZM_TARGET_DISTRO MATCHES "^fc"))
+  add_subdirectory(distros/redhat)
+elseif()
+  add_subdirectory(distros/opensuse)
+endif()
 
 # Print optional libraries detection status
 message(STATUS "Optional libraries found:${optlibsfound}")
@@ -928,14 +854,12 @@ message(STATUS "Optional libraries not found:${optlibsnotfound}")
 
 # Run ZM configuration generator
 message(STATUS "Running ZoneMinder configuration generator")
-execute_process(COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/zmconfgen.pl RESULT_VARIABLE zmconfgen_result)
-if(zmconfgen_result EQUAL 0)
-	message(STATUS 
-            "ZoneMinder configuration generator completed successfully")
-else(zmconfgen_result EQUAL 0)
-	message(FATAL_ERROR 
-            "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
-endif(zmconfgen_result EQUAL 0)
+execute_process(COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/zmconfgen.pl RESULT_VARIABLE ZMCONFGEN_RESULT)
+if(ZMCONFGEN_RESULT EQUAL 0)
+  message(STATUS "ZoneMinder configuration generator completed successfully")
+else()
+  message(FATAL_ERROR "ZoneMinder configuration generator failed. Exit code: ${zmconfgen_result}")
+endif()
 
 # Install zm.conf
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm.conf" DESTINATION "${ZM_CONFIG_DIR}")
@@ -943,17 +867,17 @@ install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/conf.d/" DESTINATION "${ZM_CONFIG
 
 # Uninstall target
 configure_file(
-    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
-    "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
-    IMMEDIATE @ONLY)
+  "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake"
+  IMMEDIATE @ONLY)
 add_custom_target(uninstall
-    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake)
+  COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake/cmake_uninstall.cmake)
 
 # Configure CCache if available
 find_program(CCACHE_FOUND ccache)
 if(CCACHE_FOUND)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
-        set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
-endif(CCACHE_FOUND)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+  set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+endif()
 
 install(DIRECTORY icons DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/")
diff --git a/README.md b/README.md
index ab946c04c..20cce499c 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ This is the recommended method to install ZoneMinder onto your system. ZoneMinde
 - OpenSuse via [third party repository](http://www.zoneminder.com/wiki/index.php/Installing_using_ZoneMinder_RPMs_for_SuSE)
 - Mageia from their default repository
 - Arch via the [AUR](https://aur.archlinux.org/packages/zoneminder/)
-- Gentoo from their [default repository](https://packages.gentoo.org/packages/www-misc/zoneminder)
+- Gentoo via [Portage Overlays](http://gpo.zugaina.org/www-misc/zoneminder)
 
 If a repository that hosts ZoneMinder packages is not available for your distro, then you are encouraged to build your own package, rather than build from source.  While each distro is different in ways that set it apart from all the others, they are often similar enough to allow you to adapt another distro's package building instructions to your own.
 
@@ -70,18 +70,19 @@ Docker is a system to run applications inside isolated containers. ZoneMinder, a
 Dockerfile contained in this repository. However, there is still work needed to ensure that the main ZM features work 
 properly and are documented. 
 
-## Contribution Model and  Development
+## Contribution Model and Development
 
 * Source hosted at [GitHub](https://github.com/ZoneMinder/ZoneMinder/)
-* Report issues/questions/feature requests on [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
+* Report issues at [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
+* Questions/feature requests in [Slack](https://zoneminder-chat.slack.com/) or [forums](https://forums.zoneminder.com)
 
 Pull requests are very welcome!  If you would like to contribute, please follow
 the following steps.  While step 3 is optional, it is preferred.
 
 1. Fork the repo
 2. Open an issue at our [GitHub Issues Tracker](https://github.com/ZoneMinder/ZoneMinder/issues).
-   Describe the bug that you've found, or the feature which you're asking for.
-   Jot down the issue number (e.g. 456)
+   Follow the issue template to describe the bug or security issue you found. Please note feature
+   requests or questions should be posted in our user forum or Slack channel.
 3. Create your feature branch (`git checkout -b 456-my-new-feature`)
 4. Commit your changes (`git commit -am 'Added some feature'`)
    It is preferred that you 'commit early and often' instead of bunching all
diff --git a/cmake/Modules/CheckPlatform.cmake b/cmake/Modules/CheckPlatform.cmake
new file mode 100644
index 000000000..6d88efe32
--- /dev/null
+++ b/cmake/Modules/CheckPlatform.cmake
@@ -0,0 +1,44 @@
+set(HOST_OS "")
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+  set(HOST_OS "linux")
+endif()
+if(${CMAKE_SYSTEM_NAME} MATCHES ".*(SunOS|Solaris).*")
+  set(HOST_OS "solaris")
+  set(SOLARIS 1)
+endif()
+if(${CMAKE_SYSTEM_NAME} MATCHES ".*BSD.*")
+  set(HOST_OS "BSD")
+  set(BSD 1)
+endif()
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
+  set(HOST_OS "darwin")
+endif()
+if(NOT HOST_OS)
+  message(FATAL_ERROR
+    "ZoneMinder was unable to deterimine the host OS. Please report this.
+    Value of CMAKE_SYSTEM_NAME: ${CMAKE_SYSTEM_NAME}")
+endif()
+
+if(CMAKE_SYSTEM_NAME MATCHES "Linux")
+  string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" ZM_SYSTEM_PROC)
+  if((ZM_SYSTEM_PROC STREQUAL "") OR (ZM_SYSTEM_PROC STREQUAL "unknown"))
+    execute_process(COMMAND uname -m OUTPUT_VARIABLE ZM_SYSTEM_PROC ERROR_VARIABLE ZM_SYSTEM_PROC_ERR)
+
+    # maybe make the following error checks fatal
+    if(ZM_SYSTEM_PROC_ERR)
+      message(WARNING "\nAn error occurred while attempting to determine the system processor:\n${ZM_SYSTEM_PROC_ERR}")
+    endif()
+    if(NOT ZM_SYSTEM_PROC)
+      message(WARNING "\nUnable to determine the system processor. This may cause a build failure.\n")
+    endif()
+  endif()
+endif()
+
+message(STATUS "Detected compiler: ${CMAKE_C_COMPILER}")
+if(CMAKE_C_COMPILER MATCHES "gcc" OR CMAKE_C_COMPILER_ID STREQUAL "GNU")
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/gcc/settings.cmake)
+elseif(CMAKE_C_COMPILER MATCHES "clang" OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+  include(${CMAKE_SOURCE_DIR}/cmake/compiler/clang/settings.cmake)
+else()
+  message(FATAL_ERROR "No supported compiler found")
+endif()
diff --git a/cmake/Modules/ConfigureBaseTargets.cmake b/cmake/Modules/ConfigureBaseTargets.cmake
new file mode 100644
index 000000000..ed86d35fc
--- /dev/null
+++ b/cmake/Modules/ConfigureBaseTargets.cmake
@@ -0,0 +1,50 @@
+add_library(zm-compile-option-interface INTERFACE)
+
+# Use -std=c++11 instead of -std=gnu++11
+set(CMAKE_CXX_EXTENSIONS OFF)
+
+add_library(zm-feature-interface INTERFACE)
+
+# The cxx_std_* feature flags were only introduced in CMake 3.8
+# Use to old way to specify the required standard level for older CMake versions.
+# Remove this once we raise the required CMake version.
+if(${CMAKE_VERSION} VERSION_LESS 3.8.0)
+  set(CMAKE_CXX_STANDARD 11)
+else()
+  target_compile_features(zm-feature-interface
+    INTERFACE
+      cxx_std_11)
+endif()
+
+# Interface to set warning levels on targets.
+# It gets populated in the compiler specific script.
+add_library(zm-warning-interface INTERFACE)
+
+# Interface which disables all warnings on the target.
+add_library(zm-no-warning-interface INTERFACE)
+target_compile_options(zm-no-warning-interface
+  INTERFACE
+    -w)
+
+# An interface used by all other interfaces.
+add_library(zm-default-interface INTERFACE)
+target_link_libraries(zm-default-interface
+  INTERFACE
+    zm-compile-option-interface
+    zm-feature-interface)
+
+# An interface which provides the flags and definitions
+# used by the non-dependency targets.
+add_library(zm-core-interface INTERFACE)
+target_link_libraries(zm-core-interface
+  INTERFACE
+    zm-default-interface
+    zm-warning-interface)
+
+# An interface which provides the flags and definitions
+# used by the external dependency targets.
+add_library(zm-dependency-interface INTERFACE)
+target_link_libraries(zm-dependency-interface
+  INTERFACE
+    zm-default-interface
+    zm-no-warning-interface)
diff --git a/cmake/compiler/clang/settings.cmake b/cmake/compiler/clang/settings.cmake
new file mode 100644
index 000000000..6c5419a94
--- /dev/null
+++ b/cmake/compiler/clang/settings.cmake
@@ -0,0 +1,42 @@
+target_compile_options(zm-warning-interface
+  INTERFACE
+    -Wall
+    -Wextra
+    -Wimplicit-fallthrough
+    -Wno-unused-parameter)
+
+if(ENABLE_WERROR)
+  target_compile_options(zm-warning-interface
+    INTERFACE
+      -Werror)
+endif()
+
+if(ASAN)
+  target_compile_options(zm-compile-option-interface
+    INTERFACE
+      -fno-omit-frame-pointer
+      -fsanitize=address
+      -fsanitize-recover=address
+      -fsanitize-address-use-after-scope)
+
+  target_link_options(zm-compile-option-interface
+    INTERFACE
+      -fno-omit-frame-pointer
+      -fsanitize=address
+      -fsanitize-recover=address
+      -fsanitize-address-use-after-scope)
+
+  message(STATUS "Clang: Enabled AddressSanitizer (ASan)")
+endif()
+
+if(TSAN)
+  target_compile_options(zm-compile-option-interface
+    INTERFACE
+      -fsanitize=thread)
+
+  target_link_options(zm-compile-option-interface
+    INTERFACE
+      -fsanitize=thread)
+
+  message(STATUS "Clang: Enabled ThreadSanitizer (TSan)")
+endif()
diff --git a/cmake/compiler/gcc/settings.cmake b/cmake/compiler/gcc/settings.cmake
new file mode 100644
index 000000000..097270d51
--- /dev/null
+++ b/cmake/compiler/gcc/settings.cmake
@@ -0,0 +1,46 @@
+target_compile_options(zm-warning-interface
+  INTERFACE
+    -Wall
+    $<$<VERSION_GREATER:$<CXX_COMPILER_VERSION>,5.0>:-Wconditionally-supported>
+    -Wextra
+    -Wformat-security
+    -Wno-cast-function-type
+    $<$<VERSION_LESS:$<CXX_COMPILER_VERSION>,11>:-Wno-clobbered>
+    -Wno-unused-parameter
+    -Woverloaded-virtual)
+
+if(ENABLE_WERROR)
+  target_compile_options(zm-warning-interface
+    INTERFACE
+      -Werror)
+endif()
+
+if(ASAN)
+  target_compile_options(zm-compile-option-interface
+    INTERFACE
+      -fno-omit-frame-pointer
+      -fsanitize=address
+      -fsanitize-recover=address
+      -fsanitize-address-use-after-scope)
+
+  target_link_options(zm-compile-option-interface
+    INTERFACE
+      -fno-omit-frame-pointer
+      -fsanitize=address
+      -fsanitize-recover=address
+      -fsanitize-address-use-after-scope)
+
+  message(STATUS "GCC: Enabled AddressSanitizer (ASan)")
+endif()
+
+if(TSAN)
+  target_compile_options(zm-compile-option-interface
+    INTERFACE
+      -fsanitize=thread)
+
+  target_link_options(zm-compile-option-interface
+    INTERFACE
+      -fsanitize=thread)
+
+  message(STATUS "GCC: Enabled ThreadSanitizer (TSan)")
+endif()
diff --git a/db/CMakeLists.txt b/db/CMakeLists.txt
index ed215d35f..18f440fc8 100644
--- a/db/CMakeLists.txt
+++ b/db/CMakeLists.txt
@@ -3,6 +3,7 @@
 # Create files from the .in files
 configure_file(zm_create.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" @ONLY)
 configure_file(zm_update-1.31.30.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.31.30.sql" @ONLY)
+configure_file(zm_update-1.35.24.sql.in "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.35.24.sql" @ONLY)
 
 # Glob all database upgrade scripts
 file(GLOB dbfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "zm_update-*.sql")
@@ -12,6 +13,8 @@ install(FILES ${dbfileslist} DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db
 
 # install zm_update-1.31.30.sql
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.31.30.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
+# install zm_update-1.35.24.sql
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_update-1.35.24.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
 
 # install zm_create.sql
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zm_create.sql" DESTINATION "${CMAKE_INSTALL_DATADIR}/zoneminder/db")
diff --git a/db/triggers.sql b/db/triggers.sql
index 87c8465b4..58f09bcbf 100644
--- a/db/triggers.sql
+++ b/db/triggers.sql
@@ -3,10 +3,10 @@ delimiter //
 DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
 CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
 FOR EACH ROW BEGIN
-  UPDATE Monitors SET
+  UPDATE Event_Summaries SET
   HourEvents = GREATEST(COALESCE(HourEvents,1)-1,0),
   HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=OLD.MonitorId;
+  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
 END; 
 //
 
@@ -20,10 +20,10 @@ FOR EACH ROW
     set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
     IF ( diff ) THEN
       IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Event_Summaries SET HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+        UPDATE Event_Summaries SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
       ELSE
-        UPDATE Monitors SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Event_Summaries SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Event_Summaries.MonitorId=NEW.MonitorId;
       END IF;
     END IF;
   END;
@@ -32,10 +32,10 @@ FOR EACH ROW
 DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
 CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
 FOR EACH ROW BEGIN
-  UPDATE Monitors SET
+  UPDATE Event_Summaries SET
   DayEvents = GREATEST(COALESCE(DayEvents,1)-1,0),
   DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=OLD.MonitorId;
+  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
 END;
 //
 
@@ -48,10 +48,10 @@ FOR EACH ROW
     set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
     IF ( diff ) THEN
       IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Event_Summaries SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+        UPDATE Event_Summaries SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
       ELSE
-        UPDATE Monitors SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Event_Summaries SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
       END IF;
     END IF;
   END;
@@ -61,10 +61,10 @@ FOR EACH ROW
 DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
 CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
 FOR EACH ROW BEGIN
-  UPDATE Monitors SET
+  UPDATE Event_Summaries SET
   WeekEvents = GREATEST(COALESCE(WeekEvents,1)-1,0),
   WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=OLD.MonitorId;
+  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
 END;
 //
 
@@ -77,10 +77,10 @@ FOR EACH ROW
     set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
     IF ( diff ) THEN
       IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Event_Summaries SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+        UPDATE Event_Summaries SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
       ELSE
-        UPDATE Monitors SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Event_Summaries SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
       END IF;
     END IF;
   END;
@@ -89,10 +89,10 @@ FOR EACH ROW
 DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
 CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
 FOR EACH ROW BEGIN
-  UPDATE Monitors SET
+  UPDATE Event_Summaries SET
   MonthEvents = GREATEST(COALESCE(MonthEvents,1)-1,0),
   MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-  WHERE Id=OLD.MonitorId;
+  WHERE Event_Summaries.MonitorId=OLD.MonitorId;
 END;
 //
 
@@ -105,10 +105,10 @@ FOR EACH ROW
     set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
     IF ( diff ) THEN
       IF ( NEW.MonitorID != OLD.MonitorID ) THEN
-        UPDATE Monitors SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace),0) WHERE Monitors.Id=OLD.MonitorId;
-        UPDATE Monitors SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Event_Summaries SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace),0) WHERE Event_Summaries.MonitorId=OLD.MonitorId;
+        UPDATE Event_Summaries SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
       ELSE
-        UPDATE Monitors SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Monitors.Id=NEW.MonitorId;
+        UPDATE Event_Summaries SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Event_Summaries.MonitorId=NEW.MonitorId;
       END IF;
     END IF;
   END;
@@ -126,14 +126,14 @@ BEGIN
   set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
   IF ( NEW.StorageId = OLD.StorageID ) THEN
     IF ( diff ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) + diff,0) WHERE Id = OLD.StorageId;
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) + diff,0) WHERE Storage.Id = OLD.StorageId;
     END IF;
   ELSE
     IF ( NEW.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Id = NEW.StorageId;
+      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Storage.Id = NEW.StorageId;
     END IF;
     IF ( OLD.DiskSpace ) THEN
-      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - OLD.DiskSpace,0) WHERE Id = OLD.StorageId;
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - OLD.DiskSpace,0) WHERE Storage.Id = OLD.StorageId;
     END IF;
   END IF;
 
@@ -145,20 +145,21 @@ BEGIN
   IF ( NEW.Archived != OLD.Archived ) THEN
     IF ( NEW.Archived ) THEN
       INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
-      UPDATE Monitors SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Id=NEW.MonitorId;
+      INSERT INTO Event_Summaries (MonitorId,ArchivedEvents,ArchivedEventDiskSpace) VALUES (NEW.MonitorId,1,NEW.DiskSpace) ON DUPLICATE KEY
+        UPDATE ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0);
     ELSEIF ( OLD.Archived ) THEN
       DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-      UPDATE Monitors
+      UPDATE Event_Summaries
         SET
           ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,0)-1,0),
           ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-        WHERE Id=OLD.MonitorId;
+        WHERE Event_Summaries.MonitorId=OLD.MonitorId;
     ELSE
       IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
         UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
-        UPDATE Monitors SET
+        UPDATE Event_Summaries SET
           ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-          WHERE Id=OLD.MonitorId;
+          WHERE Event_Summaries.MonitorId=OLD.MonitorId;
       END IF;
     END IF;
   ELSEIF ( NEW.Archived AND diff ) THEN
@@ -166,10 +167,10 @@ BEGIN
   END IF;
 
   IF ( diff ) THEN
-    UPDATE Monitors
+    UPDATE Event_Summaries
       SET
         TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
-      WHERE Id=OLD.MonitorId;
+      WHERE Event_Summaries.MonitorId=OLD.MonitorId;
   END IF;
 
 END;
@@ -185,17 +186,17 @@ CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
 FOR EACH ROW
   BEGIN
 
-  INSERT INTO Events_Hour (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Day (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Week (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  INSERT INTO Events_Month (EventId,MonitorId,StartTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartTime,0);
-  UPDATE Monitors SET
+  INSERT INTO Events_Hour (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  INSERT INTO Events_Day (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  INSERT INTO Events_Week (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  INSERT INTO Events_Month (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  INSERT INTO Event_Summaries (MonitorId,HourEvents,DayEvents,WeekEvents,MonthEvents,TotalEvents) VALUES (NEW.MonitorId,1,1,1,1,1) ON DUPLICATE KEY
+  UPDATE 
   HourEvents = COALESCE(HourEvents,0)+1,
   DayEvents = COALESCE(DayEvents,0)+1,
   WeekEvents = COALESCE(WeekEvents,0)+1,
   MonthEvents = COALESCE(MonthEvents,0)+1,
-  TotalEvents = COALESCE(TotalEvents,0)+1
-  WHERE Id=NEW.MonitorId;
+  TotalEvents = COALESCE(TotalEvents,0)+1;
 END;
 //
 
@@ -205,7 +206,7 @@ CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
 FOR EACH ROW
 BEGIN
   IF ( OLD.DiskSpace ) THEN
-    UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Id = OLD.StorageId;
+    UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Storage.Id = OLD.StorageId;
   END IF;
   DELETE FROM Events_Hour WHERE EventId=OLD.Id;
   DELETE FROM Events_Day WHERE EventId=OLD.Id;
@@ -213,17 +214,17 @@ BEGIN
   DELETE FROM Events_Month WHERE EventId=OLD.Id;
   IF ( OLD.Archived ) THEN
     DELETE FROM Events_Archived WHERE EventId=OLD.Id;
-    UPDATE Monitors SET
+    UPDATE Event_Summaries SET
       ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,1) - 1,0),
       ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0),
       TotalEvents = GREATEST(COALESCE(TotalEvents,1) - 1,0),
       TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
-      WHERE Id=OLD.MonitorId;
+      WHERE Event_Summaries.MonitorId=OLD.MonitorId;
   ELSE
-    UPDATE Monitors SET
+    UPDATE Event_Summaries SET
     TotalEvents = GREATEST(COALESCE(TotalEvents,1)-1,0),
     TotalEventDiskSpace=GREATEST(COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
-    WHERE Id=OLD.MonitorId;
+    WHERE Event_Summaries.MonitorId=OLD.MonitorId;
   END IF;
 END;
 
@@ -233,14 +234,14 @@ DROP TRIGGER IF EXISTS Zone_Insert_Trigger//
 CREATE TRIGGER Zone_Insert_Trigger AFTER INSERT ON Zones
 FOR EACH ROW
   BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Id=NEW.MonitorID;
+    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=NEW.MonitorId) WHERE Monitors.Id=NEW.MonitorID;
   END
 //
 DROP TRIGGER IF EXISTS Zone_Delete_Trigger//
 CREATE TRIGGER Zone_Delete_Trigger AFTER DELETE ON Zones
 FOR EACH ROW
   BEGIN
-    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Id=OLD.MonitorID;
+    UPDATE Monitors SET ZoneCount=(SELECT COUNT(*) FROM Zones WHERE MonitorId=OLD.MonitorId) WHERE Monitors.Id=OLD.MonitorID;
   END
 //
 
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index af4e37136..fdad3f7ac 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -189,8 +189,8 @@ CREATE TABLE `Events` (
   `SecondaryStorageId`	smallint(5) unsigned default 0,
   `Name` varchar(64) NOT NULL default '',
   `Cause` varchar(32) NOT NULL default '',
-  `StartTime` datetime default NULL,
-  `EndTime` datetime default NULL,
+  `StartDateTime` datetime default NULL,
+  `EndDateTime` datetime default NULL,
   `Width` smallint(5) unsigned NOT NULL default '0',
   `Height` smallint(5) unsigned NOT NULL default '0',
   `Length` decimal(10,2) NOT NULL default '0.00',
@@ -216,52 +216,52 @@ CREATE TABLE `Events` (
   PRIMARY KEY (`Id`),
   KEY `Events_MonitorId_idx` (`MonitorId`),
   KEY `Events_StorageId_idx` (`StorageId`),
-  KEY `Events_StartTime_idx` (`StartTime`),
-  KEY `Events_EndTime_DiskSpace` (`EndTime`,`DiskSpace`)
+  KEY `Events_StartDateTime_idx` (`StartDateTime`),
+  KEY `Events_EndDateTime_DiskSpace` (`EndDateTime`,`DiskSpace`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 DROP TABLE IF EXISTS `Events_Hour`;
 CREATE TABLE `Events_Hour` (
   `EventId` BIGINT unsigned NOT NULL,
   `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
+  `StartDateTime` datetime default NULL,
   `DiskSpace`   bigint default NULL,
   PRIMARY KEY (`EventId`),
   KEY `Events_Hour_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Hour_StartTime_idx` (`StartTime`)
+  KEY `Events_Hour_StartDateTime_idx` (`StartDateTime`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 DROP TABLE IF EXISTS `Events_Day`;
 CREATE TABLE `Events_Day` (
   `EventId` BIGINT unsigned NOT NULL,
   `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
+  `StartDateTime` datetime default NULL,
   `DiskSpace`   bigint default NULL,
   PRIMARY KEY (`EventId`),
   KEY `Events_Day_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Day_StartTime_idx` (`StartTime`)
+  KEY `Events_Day_StartDateTime_idx` (`StartDateTime`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 DROP TABLE IF EXISTS `Events_Week`;
 CREATE TABLE `Events_Week` (
   `EventId` BIGINT unsigned NOT NULL,
   `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
+  `StartDateTime` datetime default NULL,
   `DiskSpace`   bigint default NULL,
   PRIMARY KEY (`EventId`),
   KEY `Events_Week_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Week_StartTime_idx` (`StartTime`)
+  KEY `Events_Week_StartDateTime_idx` (`StartDateTime`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 DROP TABLE IF EXISTS `Events_Month`;
 CREATE TABLE `Events_Month` (
   `EventId` BIGINT unsigned NOT NULL,
   `MonitorId` int(10) unsigned NOT NULL,
-  `StartTime` datetime default NULL,
+  `StartDateTime` datetime default NULL,
   `DiskSpace`   bigint default NULL,
   PRIMARY KEY (`EventId`),
   KEY `Events_Month_MonitorId_idx` (`MonitorId`),
-  KEY `Events_Month_StartTime_idx` (`StartTime`)
+  KEY `Events_Month_StartDateTime_idx` (`StartDateTime`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
 
@@ -285,6 +285,7 @@ CREATE TABLE `Filters` (
   `UserId`  int(10) unsigned,
   `Query_json` text NOT NULL,
   `AutoArchive` tinyint(3) unsigned NOT NULL default '0',
+  `AutoUnarchive` tinyint(3) unsigned NOT NULL default '0',
   `AutoVideo` tinyint(3) unsigned NOT NULL default '0',
   `AutoUpload` tinyint(3) unsigned NOT NULL default '0',
   `AutoEmail` tinyint(3) unsigned NOT NULL default '0',
@@ -302,6 +303,7 @@ CREATE TABLE `Filters` (
   `UpdateDiskSpace` tinyint(3) unsigned NOT NULL default '0',
   `Background` tinyint(1) unsigned NOT NULL default '0',
   `Concurrent` tinyint(1) unsigned NOT NULL default '0',
+  `LockRows` tinyint(1) unsigned NOT NULL default '0',
   PRIMARY KEY (`Id`),
   KEY `Name` (`Name`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@@ -314,6 +316,7 @@ DROP TABLE IF EXISTS `Frames`;
 CREATE TABLE `Frames` (
   `Id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT,
   `EventId` BIGINT UNSIGNED NOT NULL default '0',
+  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
   `FrameId` int(10) unsigned NOT NULL default '0',
   `Type` enum('Normal','Bulk','Alarm') NOT NULL default 'Normal',
   `TimeStamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
@@ -334,6 +337,7 @@ CREATE TABLE `Groups` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `Name` varchar(64) NOT NULL default '',
   `ParentId` int(10) unsigned,
+  FOREIGN KEY (`ParentId`) REFERENCES `Groups` (`Id`) ON DELETE CASCADE,
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
@@ -345,7 +349,9 @@ DROP TABLE IF EXISTS `Groups_Monitors`;
 CREATE TABLE `Groups_Monitors` (
     `Id` INT(10) unsigned NOT NULL auto_increment,
     `GroupId` int(10) unsigned NOT NULL,
+    FOREIGN KEY (`GroupId`) REFERENCES `Groups` (`Id`) ON DELETE CASCADE,
     `MonitorId` int(10) unsigned NOT NULL,
+    FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE,
     PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
@@ -446,6 +452,7 @@ CREATE TABLE `Monitors` (
   `Type` enum('Local','Remote','File','Ffmpeg','Libvlc','cURL','WebSite','NVSocket','VNC') NOT NULL default 'Local',
   `Function` enum('None','Monitor','Modect','Record','Mocord','Nodect') NOT NULL default 'Monitor',
   `Enabled` tinyint(3) unsigned NOT NULL default '1',
+  `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1',
   `LinkedMonitors` varchar(255),
   `Triggers` set('X10') NOT NULL default '',
   `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '',
@@ -463,6 +470,7 @@ CREATE TABLE `Monitors` (
   `Port` varchar(8) NOT NULL default '',
   `SubPath` varchar(64) NOT NULL default '',
   `Path` varchar(255),
+  `SecondPath` varchar(255),
   `Options` varchar(255),
   `User` varchar(64),
   `Pass` varchar(64),
@@ -476,7 +484,8 @@ CREATE TABLE `Monitors` (
   `DecoderHWAccelDevice`  varchar(255),
   `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' ,
   `VideoWriter` TINYINT NOT NULL DEFAULT '0',
-  `OutputCodec`     enum('h264','mjpeg','mpeg1','mpeg2'),
+  `OutputCodec` int(10) unsigned NOT NULL default 0,
+  `Encoder`     varchar(32),
   `OutputContainer` enum('auto','mp4','mkv'),
   `EncoderParameters` TEXT,
   `RecordAudio` TINYINT NOT NULL DEFAULT '0',
@@ -490,11 +499,12 @@ CREATE TABLE `Monitors` (
   `LabelX` smallint(5) unsigned NOT NULL default '0',
   `LabelY` smallint(5) unsigned NOT NULL default '0',
   `LabelSize` smallint(5) unsigned NOT NULL DEFAULT '1',
-  `ImageBufferCount` smallint(5) unsigned NOT NULL default '100',
-  `WarmupCount` smallint(5) unsigned NOT NULL default '25',
+  `ImageBufferCount` smallint(5) unsigned NOT NULL default '3',
+  `MaxImageBufferCount` smallint(5) unsigned NOT NULL default '0',
+  `WarmupCount` smallint(5) unsigned NOT NULL default '0',
   `PreEventCount` smallint(5) unsigned NOT NULL default '10',
   `PostEventCount` smallint(5) unsigned NOT NULL default '10',
-  `StreamReplayBuffer` int(10) unsigned NOT NULL default '1000',
+  `StreamReplayBuffer` int(10) unsigned NOT NULL default '0',
   `AlarmFrameCount` smallint(5) unsigned NOT NULL default '1',
   `SectionLength` int(10) unsigned NOT NULL default '600',
   `MinSectionLength` int(10) unsigned NOT NULL default '10',
@@ -516,6 +526,7 @@ CREATE TABLE `Monitors` (
   `TrackDelay` smallint(5) unsigned,
   `ReturnLocation` tinyint(3) NOT NULL default '-1',
   `ReturnDelay` smallint(5) unsigned,
+  `ModectDuringPTZ` tinyint(3) unsigned NOT NULL default '0',
   `DefaultRate` smallint(5) unsigned NOT NULL default '100',
   `DefaultScale` smallint(5) unsigned NOT NULL default '100',
   `DefaultCodec` enum('auto','MP4','MJPEG') NOT NULL default 'auto',
@@ -524,20 +535,13 @@ CREATE TABLE `Monitors` (
   `WebColour` varchar(32) NOT NULL default 'red',
   `Exif` tinyint(1) unsigned NOT NULL default '0',
   `Sequence` smallint(5) unsigned default NULL,
-  `TotalEvents` int(10) default NULL,
-  `TotalEventDiskSpace` bigint default NULL,
-  `HourEvents` int(10) default NULL,
-  `HourEventDiskSpace` bigint default NULL,
-  `DayEvents` int(10) default NULL,
-  `DayEventDiskSpace` bigint default NULL,
-  `WeekEvents` int(10) default NULL,
-  `WeekEventDiskSpace` bigint default NULL,
-  `MonthEvents` int(10) default NULL,
-  `MonthEventDiskSpace` bigint default NULL,
-  `ArchivedEvents` int(10) default NULL,
-  `ArchivedEventDiskSpace` bigint default NULL,
   `ZoneCount` TINYINT NOT NULL DEFAULT 0,
   `Refresh` int(10) unsigned default NULL,
+  `Latitude`  DECIMAL(10,8),
+  `Longitude`  DECIMAL(10,8),
+  `RTSPServer`  BOOLEAN NOT NULL DEFAULT FALSE,
+  `RTSPStreamName`  varchar(255) NOT NULL default '',
+  `Importance`  enum('Not','Less','Normal'),
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
@@ -551,7 +555,26 @@ CREATE TABLE `Monitor_Status` (
   `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
   `CaptureBandwidth`  INT NOT NULL default 0,
   PRIMARY KEY (`MonitorId`)
-) ENGINE=MEMORY;
+) ENGINE=@ZM_MYSQL_ENGINE@;
+
+DROP TABLE IF EXISTS `Event_Summaries`;
+CREATE TABLE `Event_Summaries` (
+  `MonitorId` int(10) unsigned NOT NULL,
+  `TotalEvents` int(10) default NULL,
+  `TotalEventDiskSpace` bigint default NULL,
+  `HourEvents` int(10) default NULL,
+  `HourEventDiskSpace` bigint default NULL,
+  `DayEvents` int(10) default NULL,
+  `DayEventDiskSpace` bigint default NULL,
+  `WeekEvents` int(10) default NULL,
+  `WeekEventDiskSpace` bigint default NULL,
+  `MonthEvents` int(10) default NULL,
+  `MonthEventDiskSpace` bigint default NULL,
+  `ArchivedEvents` int(10) default NULL,
+  `ArchivedEventDiskSpace` bigint default NULL,
+  PRIMARY KEY (`MonitorId`)
+) ENGINE=@ZM_MYSQL_ENGINE@;
+
 --
 -- Table structure for table `States`
 -- PP - Added IsActive to track custom run states
@@ -607,8 +630,11 @@ DROP TABLE IF EXISTS `Stats`;
 CREATE TABLE `Stats` (
   `Id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `MonitorId` int(10) unsigned NOT NULL default '0',
+  FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE,
   `ZoneId` int(10) unsigned NOT NULL default '0',
+  FOREIGN KEY (`ZoneId`) REFERENCES `Zones` (`Id`) ON DELETE CASCADE,
   `EventId` BIGINT UNSIGNED NOT NULL,
+  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
   `FrameId` int(10) unsigned NOT NULL default '0',
   `PixelDiff` tinyint(3) unsigned NOT NULL default '0',
   `AlarmPixels` int(10) unsigned NOT NULL default '0',
@@ -658,11 +684,13 @@ CREATE TABLE `Users` (
   `Monitors` enum('None','View','Edit') NOT NULL default 'None',
   `Groups` enum('None','View','Edit') NOT NULL default 'None',
   `Devices` enum('None','View','Edit') NOT NULL default 'None',
+  `Snapshots` enum('None','View','Edit') NOT NULL default 'None',
   `System` enum('None','View','Edit') NOT NULL default 'None',
   `MaxBandwidth` varchar(16),
   `MonitorIds` text,
   `TokenMinExpiry`   BIGINT UNSIGNED NOT NULL DEFAULT 0,
   `APIEnabled`  tinyint(3) UNSIGNED NOT NULL default 1,
+  `HomeView`  varchar(64) NOT NULL DEFAULT '',
   PRIMARY KEY (`Id`),
   UNIQUE KEY `UC_Username` (`Username`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
@@ -703,6 +731,7 @@ DROP TABLE IF EXISTS `Zones`;
 CREATE TABLE `Zones` (
   `Id` int(10) unsigned NOT NULL auto_increment,
   `MonitorId` int(10) unsigned NOT NULL default '0',
+  FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE,
   `Name` varchar(64) NOT NULL default '',
   `Type` enum('Active','Inclusive','Exclusive','Preclusive','Inactive','Privacy') NOT NULL default 'Active',
   `Units` enum('Pixels','Percent') NOT NULL default 'Pixels',
@@ -764,7 +793,42 @@ insert into Storage VALUES (NULL, '@ZM_DIR_EVENTS@', 'Default', 'local', NULL, N
 --
 -- Create a default admin user.
 --
-insert into Users VALUES (NULL,'admin','$2b$12$NHZsm6AM2f2LQVROriz79ul3D6DnmFiZC.ZK5eqbF.ZWfwH9bqUJ6','',1,'View','Edit','Edit','Edit','Edit','Edit','Edit','','',0,1);
+INSERT INTO `Users` (
+  `Username`,
+  `Password`,
+  `Language`,
+  `Enabled`,
+  `Stream`,
+  `Events`,
+  `Control`,
+  `Monitors`,
+  `Groups`,
+  `Devices`,
+  `Snapshots`,
+  `System`,
+  `MaxBandwidth`,
+  `MonitorIds`,
+  `TokenMinExpiry`,
+  `APIEnabled`,
+  `HomeView`
+  ) VALUES (
+    'admin',
+    '$2b$12$NHZsm6AM2f2LQVROriz79ul3D6DnmFiZC.ZK5eqbF.ZWfwH9bqUJ6',
+    '' /* Language */,
+    1 /* Enabled */,
+    'View' /* Stream */,
+    'Edit' /* Events */,
+    'Edit' /* Control */,
+    'Edit' /* Monitors */,
+    'Edit' /* Groups */,
+    'Edit' /* Devices */,
+    'Edit' /* Snapshots */,
+    'Edit' /* System */,
+    '' /* Max Bandwidth */,
+    '' /* MonitorIds */,
+    0 /* TokenMinExpiry */,
+    0 /* Api Endabled */,
+    '' /* Homeview */);
 
 --
 -- Add a sample filter to purge the oldest 100 events when the disk is 95% full
@@ -797,7 +861,7 @@ INSERT INTO `Filters`
   VALUES
   (
     'PurgeWhenFull',
-    '{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}',
+    '{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}],"limit":100,"sort_asc":1}',
     0/*AutoArchive*/,
     0/*AutoVideo*/,
     0/*AutoUpload*/,
@@ -841,7 +905,7 @@ INSERT INTO `Filters`
   )
 VALUES (
   'Update DiskSpace',
-  '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}',
+  '{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}]}',
   0/*AutoArchive*/,
   0/*AutoVideo*/,
   0/*AutoUpload*/,
@@ -863,24 +927,24 @@ VALUES (
 --
 -- Add in some sample control protocol definitions
 --
-INSERT INTO Controls VALUES (NULL,'Pelco-D','Local','PelcoD',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO Controls VALUES (NULL,'Pelco-P','Local','PelcoP',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO Controls VALUES (NULL,'Sony VISCA','Local','Visca',1,1,0,0,1,0,0,0,1,0,16384,10,4000,1,1,6,1,1,1,0,1,0,1536,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,3,1,1,1,1,0,1,1,0,1,-15578,15578,100,10000,1,1,50,1,254,1,-7789,7789,100,5000,1,1,50,1,254,0,0);
-INSERT INTO Controls VALUES (NULL,'Axis API v2','Remote','AxisV2',0,0,0,0,1,0,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,1,1,1,1,1,0,1,0,1,-360,360,1,90,0,NULL,NULL,0,NULL,1,-360,360,1,90,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO Controls VALUES (NULL,'Panasonic IP','Remote','PanasonicIP',0,0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO Controls VALUES (NULL,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO Controls VALUES (NULL,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
-INSERT INTO Controls VALUES (NULL,'Pelco-D','Ffmpeg','PelcoD',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO Controls VALUES (NULL,'Pelco-P','Ffmpeg','PelcoP',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
-INSERT INTO Controls VALUES (NULL,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,0,0,0,1,0,0,0,1,1,10,1,10,1,1,63,1,1,0,0,1,1,63,1,63,1,1,63,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,1,360,1,360,1,1,63,0,0,1,1,90,1,90,1,1,63,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'Foscam FI8608W','Ffmpeg','FI8608W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,128,0,0,1,0,0,0,0,1,1,128,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'Foscam FI8908W','Remote','FI8908W',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'Foscam FI9821W','Ffmpeg','FI9821W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,100,1,1,0,0,1,0,100,0,100,1,0,100,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,100,0,100,1,0,100,1,16,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'Loftek Sentinel','Remote','LoftekSentinel',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'Toshiba IK-WB11A','Remote','Toshiba_IK_WB11A',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'WanscamPT','Remote','Wanscam',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
-INSERT INTO Controls VALUES (NULL,'3S Domo N5071', 'Remote', '3S', 0, 0, 1, 0,1, 0, 1, 1, 0, 0, 9999, 0, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 20, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 1, 9999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 64, 1, 0, 1, 1, 0, 0, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 0, 0);
-INSERT INTO Controls VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Pelco-D','Local','PelcoD',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Pelco-P','Local','PelcoP',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Sony VISCA','Local','Visca',1,1,0,0,1,0,0,0,1,0,16384,10,4000,1,1,6,1,1,1,0,1,0,1536,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,3,1,1,1,1,0,1,1,0,1,-15578,15578,100,10000,1,1,50,1,254,1,-7789,7789,100,5000,1,1,50,1,254,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Axis API v2','Remote','AxisV2',0,0,0,0,1,0,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,1,1,0,1,0,0,9999,10,2500,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,12,1,1,1,1,1,0,1,0,1,-360,360,1,90,0,NULL,NULL,0,NULL,1,-360,360,1,90,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Panasonic IP','Remote','PanasonicIP',0,0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Neu-Fusion NCS370','Remote','Ncs370',0,0,0,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,24,1,0,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO `Controls` VALUES (NULL,'AirLink SkyIPCam 7xx','Remote','SkyIPCam7xx',0,0,1,0,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,8,1,1,1,0,1,0,1,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,1,NULL,NULL,NULL,NULL,0,NULL,NULL,0,NULL,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Pelco-D','Ffmpeg','PelcoD',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Pelco-P','Ffmpeg','PelcoP',1,1,0,0,1,1,0,0,1,NULL,NULL,NULL,NULL,1,0,3,1,1,0,0,1,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,0,0,0,0,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,1,0,1,0,NULL,NULL,NULL,NULL,0,NULL,NULL,1,20,1,1,1,1,0,0,0,1,1,NULL,NULL,NULL,NULL,1,0,63,1,254,1,NULL,NULL,NULL,NULL,1,0,63,1,254,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Foscam FI8620','Ffmpeg','FI8620_Y2k',0,0,0,0,1,0,0,0,1,1,10,1,10,1,1,63,1,1,0,0,1,1,63,1,63,1,1,63,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,1,360,1,360,1,1,63,0,0,1,1,90,1,90,1,1,63,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Foscam FI8608W','Ffmpeg','FI8608W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,255,1,8,0,1,1,1,0,0,0,1,1,0,0,0,0,1,1,128,0,0,1,0,0,0,0,1,1,128,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Foscam FI8908W','Remote','FI8908W',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Foscam FI9821W','Ffmpeg','FI9821W_Y2k',1,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,1,1,0,0,1,0,0,0,0,1,0,100,1,1,0,0,1,0,100,0,100,1,0,100,0,0,0,0,0,0,0,0,0,0,0,0,1,1,0,0,1,0,100,0,100,1,0,100,1,16,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Loftek Sentinel','Remote','LoftekSentinel',0,0,1,0,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,0,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'Toshiba IK-WB11A','Remote','Toshiba_IK_WB11A',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,10,0,1,1,0,1,0,1,0,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'WanscamPT','Remote','Wanscam',1,1,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,16,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
+INSERT INTO `Controls` VALUES (NULL,'3S Domo N5071', 'Remote', '3S', 0, 0, 1, 0,1, 0, 1, 1, 0, 0, 9999, 0, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 20, 9999, 0, 0, 0, 1, 1, 1, 1, 0, 0, 9999, 1, 9999, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 64, 1, 0, 1, 1, 0, 0, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 1, -180, 180, 40, 100, 1, 40, 100, 0, 0, 0, 0);
+INSERT INTO `Controls` VALUES (NULL,'ONVIF Camera','Ffmpeg','onvif',0,0,1,1,1,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,255,16,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,1,0,0,0,6,1,1,0,0,0,1,10,1,1,1,1,1,0,1,1,1,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Foscam 9831W','Ffmpeg','FI9831W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,16,1,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,0,0,0,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'Foscam FI8918W','Ffmpeg','FI8918W',0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,1,0,0,0,1,1,0,360,0,360,1,0,4,0,0,1,0,90,0,90,1,0,4,0,0,0,0);
 INSERT INTO `Controls` VALUES (NULL,'SunEyes SP-P1802SWPTZ','Libvlc','SPP1802SWPTZ',0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,1,8,0,1,1,0,0,0,0,1,1,0,0,0,0,1,0,64,0,0,1,0,0,0,0,1,0,64,0,0,0,0);
@@ -1024,6 +1088,33 @@ INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('3 Wide', '{ "default":{
 INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('4 Wide', '{ "default":{"float":"left", "width":"24.5%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
 INSERT INTO MontageLayouts (`Name`,`Positions`) VALUES ('5 Wide', '{ "default":{"float":"left", "width":"19%","left":"0px","right":"0px","top":"0px","bottom":"0px"} }' );
 
+CREATE TABLE Sessions (
+  id char(32) not null,
+  access INT(10) UNSIGNED DEFAULT NULL,
+  data text,
+  PRIMARY KEY(id)
+) ENGINE=InnoDB;
+
+CREATE TABLE Snapshots (
+  `Id` int(10) unsigned NOT NULL auto_increment,
+  `Name`  VARCHAR(64),
+  `Description` TEXT,
+  `CreatedBy`   int(10),
+  `CreatedOn`   datetime default NULL,
+  PRIMARY KEY(Id)
+) ENGINE=InnoDB;
+
+CREATE TABLE Snapshot_Events (
+  `Id` int(10) unsigned NOT NULL auto_increment,
+  `SnapshotId` int(10) unsigned NOT NULL,
+  FOREIGN KEY (`SnapshotId`) REFERENCES `Snapshots` (`Id`) ON DELETE CASCADE,
+  `EventId`    bigint unsigned NOT NULL,
+  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
+  KEY `Snapshot_Events_SnapshotId_idx` (`SnapshotId`),
+  PRIMARY KEY(Id)
+) ENGINE=InnoDB;
+
+
 -- We generally don't alter triggers, we drop and re-create them, so let's keep them in a separate file that we can just source in update scripts.
 source @PKGDATADIR@/db/triggers.sql
 --
diff --git a/db/zm_update-1.31.13.sql b/db/zm_update-1.31.13.sql
index dd63b347a..150264027 100644
--- a/db/zm_update-1.31.13.sql
+++ b/db/zm_update-1.31.13.sql
@@ -13,6 +13,8 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
+UPDATE `Events` SET `SaveJPEGs`=(SELECT `SaveJPEGs` FROM `Monitors` WHERE Monitors.Id = MonitorId)  WHERE `SaveJPEGs` IS NULL;
+
 SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
      AND table_name = 'Storage'
diff --git a/db/zm_update-1.31.38.sql b/db/zm_update-1.31.38.sql
index 0ca0be6ea..12fd3e96d 100644
--- a/db/zm_update-1.31.38.sql
+++ b/db/zm_update-1.31.38.sql
@@ -176,8 +176,10 @@ BEGIN
           WHERE Id=OLD.MonitorId;
       END IF;
     END IF;
-  ELSEIF ( NEW.Archived AND diff ) THEN
-    UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+  ELSE
+    IF ( NEW.Archived AND diff ) THEN
+      UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+    END IF;
   END IF;
 
   IF ( diff ) THEN
@@ -185,7 +187,6 @@ BEGIN
   END IF;
 
 END;
-
 //
 
 delimiter ;
diff --git a/db/zm_update-1.31.40.sql b/db/zm_update-1.31.40.sql
index 79fc3836c..50ffed736 100644
--- a/db/zm_update-1.31.40.sql
+++ b/db/zm_update-1.31.40.sql
@@ -10,3 +10,18 @@ SET @s = (SELECT IF(
 
 PREPARE stmt FROM @s;
 EXECUTE stmt;
+
+
+ALTER TABLE `Monitors` MODIFY `OutputCodec`     INT UNSIGNED default 0;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'Encoder'
+    ) > 0,
+"SELECT 'Column Encoder already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Encoder`     enum('auto','h264','h264_omx','mjpeg','mpeg1','mpeg2')  AFTER `OutputCodec`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.31.5.sql b/db/zm_update-1.31.5.sql
index 859487e88..d315c8e84 100644
--- a/db/zm_update-1.31.5.sql
+++ b/db/zm_update-1.31.5.sql
@@ -10,7 +10,7 @@ SET @s = (SELECT IF(
     AND column_name = 'ParentId'
     ) > 0,
 "SELECT 'Column GroupId exists in Groups'",
-"ALTER TABLE Groups ADD `ParentId` int(10) unsigned AFTER `Name`"
+"ALTER TABLE `Groups` ADD `ParentId` int(10) unsigned AFTER `Name`"
 ));
 
 PREPARE stmt FROM @s;
diff --git a/db/zm_update-1.31.7.sql b/db/zm_update-1.31.7.sql
index 1221d9adb..0afd76ce5 100644
--- a/db/zm_update-1.31.7.sql
+++ b/db/zm_update-1.31.7.sql
@@ -3,7 +3,7 @@ SET @s = (SELECT IF(
       AND table_name = 'Groups'
       AND column_name = 'MonitorIds'
     ) > 0,
-    "ALTER TABLE Groups MODIFY `MonitorIds` text NOT NULL",
+    "ALTER TABLE `Groups` MODIFY `MonitorIds` text NOT NULL",
     "SELECT 'Groups no longer has MonitorIds'"
     ));
 
diff --git a/db/zm_update-1.35.10.sql b/db/zm_update-1.35.10.sql
index 341c5e162..81c768b57 100644
--- a/db/zm_update-1.35.10.sql
+++ b/db/zm_update-1.35.10.sql
@@ -1,46 +1,14 @@
+--
+-- Add AutoUnarchive action to Filters
+--
+
 SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ManufacturerId'
+     AND table_name = 'Filters'
+     AND column_name = 'AutoUnarchive'
     ) > 0,
-"SELECT 'Column ManufacturerId already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ManufacturerId`  int(10) unsigned AFTER `StorageId`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ManufacturerId'
-    ) > 0,
-"SELECT 'FOREIGN KEY for ManufacturerId already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ManufacturerId`) REFERENCES `Manufacturers` (Id)"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF( 
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ModelId'
-    ) > 0,
-"SELECT 'Column ModelId already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD `ModelId`  int(10) unsigned AFTER `ManufacturerId`"
-));
-
-PREPARE stmt FROM @s;
-EXECUTE stmt;
-
-SET @s = (SELECT IF(
-    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
-     AND table_name = 'Monitors'
-     AND column_name = 'ModelId'
-    ) > 0,
-"SELECT 'FOREIGN KEY for ModelId already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
+"SELECT 'Column AutoUunarchive already exists in Filters'",
+"ALTER TABLE Filters ADD `AutoUnarchive` tinyint(3) unsigned NOT NULL default '0' AFTER `AutoArchive`"
 ));
 
 PREPARE stmt FROM @s;
diff --git a/db/zm_update-1.35.11.sql b/db/zm_update-1.35.11.sql
new file mode 100644
index 000000000..5e4338d76
--- /dev/null
+++ b/db/zm_update-1.35.11.sql
@@ -0,0 +1,92 @@
+/* Change Id type to BIGINT. */
+set @exist := (SELECT count(*) FROM INFORMATION_SCHEMA.COLUMNS    WHERE table_name = 'Events' AND COLUMN_NAME = 'Id' and DATA_TYPE='bigint');
+
+set @sqlstmt := if( @exist = 0, "ALTER TABLE Events MODIFY Id bigint unsigned NOT NULL auto_increment", "SELECT 'Events.Id is already BIGINT'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+/* Add FOREIGN KEYS After deleting lost records */
+set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Frames' and column_name='EventId' and referenced_table_name='Events' and referenced_column_name='Id');
+
+set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
+set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY EventId in Frames already exists'", @sqlstmt);
+set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for EventId to Frames'", @sqlstmt);
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Frames'", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "DELETE FROM Frames WHERE EventId NOT IN (SELECT Id FROM Events)", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "ALTER TABLE Frames ADD FOREIGN KEY (EventId) REFERENCES Events (Id) ON DELETE CASCADE", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+
+set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Stats' and column_name='EventId' and referenced_table_name='Events' and referenced_column_name='Id');
+set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
+set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY EventId in Stats already exists'", @sqlstmt);
+set @sqlstmt := if( @exist = 0, "SELECT 'Adding FOREIGN KEY for EventId to Stats'", @sqlstmt);
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Stats'", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "DELETE FROM Stats WHERE EventId NOT IN (SELECT Id FROM Events);", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+set @sqlstmt := if( @exist = 0, "ALTER TABLE Stats ADD FOREIGN KEY (EventId) REFERENCES Events (Id) ON DELETE CASCADE", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+
+set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Stats' and column_name='MonitorId' and referenced_table_name='Monitors' and referenced_column_name='Id');
+set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
+set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY for MonitorId in Stats already exists'", @sql_stmt);
+set @sqlstmt := if( @exist = 0, "SELECT 'Adding FOREIGN KEY for MonitorId to Stats'", @sqlstmt);
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Stats'", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "DELETE FROM Stats WHERE MonitorId NOT IN (SELECT Id FROM Monitors);", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+set @sqlstmt := if( @exist = 0, "ALTER TABLE Stats ADD FOREIGN KEY (MonitorId) REFERENCES Monitors (Id) ON DELETE CASCADE", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Stats' and column_name='ZoneId' and referenced_table_name='Zones' and referenced_column_name='Id');
+set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
+set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY for ZoneId in Stats already exists'", @sqlstmt);
+set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for ZoneId to Stats'", @sqlstmt);
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Stats'", "SELECT 'Ok'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "DELETE FROM Stats WHERE ZoneId NOT IN (SELECT Id FROM Zones);", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "ALTER TABLE Stats ADD FOREIGN KEY (ZoneId) REFERENCES Zones (Id) ON DELETE CASCADE", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+SELECT 'Adding foreign key for MonitorId to Zones';
+set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Zones' and column_name='MonitorId' and referenced_table_name='Monitors' and referenced_column_name='Id');
+set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
+set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY for MonitorId in Zones already exists'", @sqlstmnt);
+set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for MonitorId in Zones'", @sqlstmnt);
+
+/*"SELECT 'FOREIGN KEY for MonitorId in Zones does not already exist'");*/
+set @badzones := (select count(*) FROM Zones WHERE MonitorId NOT IN (SELECT Id FROM Monitors));
+set @sqlstmt := if ( @badzones > 0, "SELECT 'You have Zones with no Monitor record in the Monitors table. Please delete them manually'", "ALTER TABLE Zones ADD FOREIGN KEY (MonitorId) REFERENCES Monitors (Id)");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.12.sql b/db/zm_update-1.35.12.sql
new file mode 100644
index 000000000..b8c54f713
--- /dev/null
+++ b/db/zm_update-1.35.12.sql
@@ -0,0 +1,18 @@
+--
+-- Update Filters table to have a LockRows Column
+--
+
+SELECT 'Checking for LockRows in Filters';
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Filters'
+  AND table_schema = DATABASE()
+  AND column_name = 'LockRows'
+  ) > 0,
+"SELECT 'Column LockRows already exists in Filters'",
+"ALTER TABLE Filters ADD COLUMN `LockRows` tinyint(1) unsigned NOT NULL default '0' AFTER `Concurrent`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.13.sql b/db/zm_update-1.35.13.sql
new file mode 100644
index 000000000..2911aaf65
--- /dev/null
+++ b/db/zm_update-1.35.13.sql
@@ -0,0 +1,101 @@
+/* DateTime is invalid and it being set here will cause warnings because it isn't in the dropdown set of values in Filter edit. */
+UPDATE Config SET Value='StartDateTime' WHERE Name='ZM_WEB_EVENT_SORT_FIELD' AND Value='DateTime';
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Events'
+     AND column_name = 'StartDateTime'
+    ) > 0,
+"SELECT 'Column StartDateTime already exists in Events'",
+"ALTER TABLE Events CHANGE StartTime StartDateTime datetime default NULL"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Events'
+    AND column_name = 'EndDateTime'
+    ) > 0,
+    "SELECT 'Column EndDateTime already exists in Events'",
+    "ALTER TABLE Events CHANGE EndTime EndDateTime datetime default NULL"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Events_Hour'
+    AND column_name = 'StartDateTime'
+    ) > 0,
+    "SELECT 'Column StartDateTime already exists in Events_Hour'",
+    "ALTER TABLE Events_Hour CHANGE StartTime StartDateTime datetime default NULL"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Events_Day'
+    AND column_name = 'StartDateTime'
+    ) > 0,
+    "SELECT 'Column StartDateTime already exists in Events_Day'",
+    "ALTER TABLE Events_Day CHANGE StartTime StartDateTime datetime default NULL"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Events_Week'
+    AND column_name = 'StartDateTime'
+    ) > 0,
+    "SELECT 'Column StartDateTime already exists in Events_Week'",
+    "ALTER TABLE Events_Week CHANGE StartTime StartDateTime datetime default NULL"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Events_Month'
+    AND column_name = 'StartDateTime'
+    ) > 0,
+    "SELECT 'Column StartDateTime already exists in Events_Month'",
+    "ALTER TABLE Events_Month CHANGE StartTime StartDateTime datetime default NULL"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+delimiter //
+
+DROP TRIGGER IF EXISTS event_insert_trigger//
+
+/* The assumption is that when an Event is inserted, it has no size yet, so don't bother updating the DiskSpace, just the count.
+ * The DiskSpace will get update in the Event Update Trigger
+ */
+CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
+FOR EACH ROW
+  BEGIN
+
+  INSERT INTO Events_Hour (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  INSERT INTO Events_Day (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  INSERT INTO Events_Week (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  INSERT INTO Events_Month (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  UPDATE Monitors SET
+  HourEvents = COALESCE(HourEvents,0)+1,
+  DayEvents = COALESCE(DayEvents,0)+1,
+  WeekEvents = COALESCE(WeekEvents,0)+1,
+  MonthEvents = COALESCE(MonthEvents,0)+1,
+  TotalEvents = COALESCE(TotalEvents,0)+1
+  WHERE Id=NEW.MonitorId;
+END;
+//
+
+delimiter ;
diff --git a/db/zm_update-1.35.14.sql b/db/zm_update-1.35.14.sql
new file mode 100644
index 000000000..daa8239ff
--- /dev/null
+++ b/db/zm_update-1.35.14.sql
@@ -0,0 +1,574 @@
+SELECT 'This update may make changes that require SUPER privileges. If you see an error message saying:
+
+ERROR 1419 (HY000) at line 298: You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)
+
+You will have to either run this update as root manually using something like (on ubuntu/debian)
+
+sudo mysql --defaults-file=/etc/mysql/debian.cnf zm < /usr/share/zoneminder/db/zm_update-1.35.14.sql
+
+OR
+
+sudo mysql --defaults-file=/etc/mysql/debian.cnf "set global log_bin_trust_function_creators=1;"
+sudo zmupdate.pl
+';
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'TotalEvents'
+    ) > 0,
+"SELECT 'Column TotalEvents already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `TotalEvents` INT(10) AFTER `CaptureBandwidth`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'TotalEvents'
+    ) > 0,
+"SELECT 'Column TotalEvents is already removed from Monitors'",
+"ALTER TABLE `Monitors` DROP `TotalEvents`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'TotalEventDiskSpace'
+    ) > 0,
+"SELECT 'Column TotalEventDiskSpace already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `TotalEventDiskSpace` BIGINT AFTER `TotalEvents`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'TotalEventDiskSpace'
+    ) > 0,
+"SELECT 'Column TotalEventDiskSpace is already removed from Monitors'",
+"ALTER TABLE `Monitors` DROP `TotalEventDiskSpace`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'HourEvents'
+    ) > 0,
+"SELECT 'Column HourEvents already exists in Monitors'",
+"ALTER TABLE `Monitor_Status` ADD `HourEvents` INT(10) AFTER `TotalEventDiskSpace`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'HourEvents'
+    ) > 0,
+"ALTER TABLE `Monitors` DROP `HourEvents`",
+"SELECT 'Column HourEvents is already removed from Monitors'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'HourEventDiskSpace'
+    ) > 0,
+"SELECT 'Column HourEventDiskSpace already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `HourEventDiskSpace` BIGINT AFTER `HourEvents`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'HourEventDiskSpace'
+    ) > 0,
+"ALTER TABLE `Monitors` DROP `HourEventDiskSpace`",
+"SELECT 'Column HourEventDiskSpace is already removed from Monitors'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'DayEvents'
+    ) > 0,
+"SELECT 'Column DayEvents already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `DayEvents` INT(10) AFTER `HourEventDiskSpace`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'DayEvents'
+    ) > 0,
+"ALTER TABLE `Monitors` DROP `DayEvents`",
+"SELECT 'Column DayEvents is already removed from Monitors'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'DayEventDiskSpace'
+    ) > 0,
+"SELECT 'Column DayEventDiskSpace already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `DayEventDiskSpace` BIGINT AFTER `DayEvents`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'DayEventDiskSpace'
+    ) > 0,
+"ALTER TABLE `Monitors` DROP `DayEventDiskSpace`",
+"SELECT 'Column DayEventDiskSpace is already removed from Monitors'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'WeekEvents'
+    ) > 0,
+"SELECT 'Column WeekEvents already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `WeekEvents` INT(10) AFTER `DayEventDiskSpace`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'WeekEvents'
+    ) > 0,
+"ALTER TABLE `Monitors` DROP `WeekEvents`",
+"SELECT 'Column WeekEvents is already removed from Monitors'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'WeekEventDiskSpace'
+    ) > 0,
+"SELECT 'Column WeekEventDiskSpace already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `WeekEventDiskSpace` BIGINT AFTER `WeekEvents`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'WeekEventDiskSpace'
+    ) > 0,
+"ALTER TABLE `Monitors` DROP `WeekEventDiskSpace`",
+"SELECT 'Column WeekEventDiskSpace is already removed from Monitors'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'MonthEvents'
+    ) > 0,
+"SELECT 'Column MonthEvents already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `MonthEvents` INT(10) AFTER `WeekEventDiskSpace`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'MonthEvents'
+    ) > 0,
+"ALTER TABLE `Monitors` DROP `MonthEvents`",
+"SELECT 'Column MonthEvents is already removed from Monitors'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'MonthEventDiskSpace'
+    ) > 0,
+"SELECT 'Column MonthEventDiskSpace already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `MonthEventDiskSpace` BIGINT AFTER `MonthEvents`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'MonthEventDiskSpace'
+    ) > 0,
+"ALTER TABLE `Monitors` DROP `MonthEventDiskSpace`",
+"SELECT 'Column MonthEventDiskSpace is already removed from Monitors'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'ArchivedEvents'
+    ) > 0,
+"SELECT 'Column ArchivedEvents already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `ArchivedEvents` INT(10) AFTER `MonthEventDiskSpace`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ArchivedEvents'
+    ) > 0,
+"ALTER TABLE `Monitors` DROP `ArchivedEvents`",
+"SELECT 'Column ArchivedEvents is already removed from Monitors'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'ArchivedEventDiskSpace'
+    ) > 0,
+"SELECT 'Column ArchivedEventDiskSpace already exists in Monitor_Status'",
+"ALTER TABLE `Monitor_Status` ADD `ArchivedEventDiskSpace` BIGINT AFTER `ArchivedEvents`"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ArchivedEventDiskSpace'
+    ) > 0,
+"ALTER TABLE `Monitors` DROP `ArchivedEventDiskSpace`",
+"SELECT 'Column ArchivedEventDiskSpace is already removed from Monitors'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE Monitor_Status INNER JOIN (
+  SELECT  MonitorId,
+    COUNT(Id) AS TotalEvents,
+    SUM(DiskSpace) AS TotalEventDiskSpace,
+    SUM(IF(Archived,1,0)) AS ArchivedEvents,
+    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
+    FROM Events GROUP BY MonitorId
+    ) AS E ON E.MonitorId=Monitor_Status.MonitorId SET
+    Monitor_Status.TotalEvents = E.TotalEvents,
+    Monitor_Status.TotalEventDiskSpace = E.TotalEventDiskSpace,
+    Monitor_Status.ArchivedEvents = E.ArchivedEvents,
+    Monitor_Status.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
+    Monitor_Status.HourEvents = E.HourEvents,
+    Monitor_Status.HourEventDiskSpace = E.HourEventDiskSpace,
+    Monitor_Status.DayEvents = E.DayEvents,
+    Monitor_Status.DayEventDiskSpace = E.DayEventDiskSpace,
+    Monitor_Status.WeekEvents = E.WeekEvents,
+    Monitor_Status.WeekEventDiskSpace = E.WeekEventDiskSpace,
+    Monitor_Status.MonthEvents = E.MonthEvents,
+    Monitor_Status.MonthEventDiskSpace = E.MonthEventDiskSpace;
+
+
+delimiter //
+DROP TRIGGER IF EXISTS Events_Hour_delete_trigger//
+CREATE TRIGGER Events_Hour_delete_trigger BEFORE DELETE ON Events_Hour
+FOR EACH ROW BEGIN
+  UPDATE Monitor_Status SET
+  HourEvents = GREATEST(COALESCE(HourEvents,1)-1,0),
+  HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
+  WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+END; 
+//
+
+DROP TRIGGER IF EXISTS Events_Hour_update_trigger//
+
+CREATE TRIGGER Events_Hour_update_trigger AFTER UPDATE ON Events_Hour
+FOR EACH ROW
+  BEGIN
+    declare diff BIGINT default 0;
+
+    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
+    IF ( diff ) THEN
+      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
+        UPDATE Monitor_Status SET HourEventDiskSpace=GREATEST(COALESCE(HourEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+        UPDATE Monitor_Status SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
+      ELSE
+        UPDATE Monitor_Status SET HourEventDiskSpace=COALESCE(HourEventDiskSpace,0)+diff WHERE Monitor_Status.MonitorId=NEW.MonitorId;
+      END IF;
+    END IF;
+  END;
+//
+
+DROP TRIGGER IF EXISTS Events_Day_delete_trigger//
+CREATE TRIGGER Events_Day_delete_trigger BEFORE DELETE ON Events_Day
+FOR EACH ROW BEGIN
+  UPDATE Monitor_Status SET
+  DayEvents = GREATEST(COALESCE(DayEvents,1)-1,0),
+  DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
+  WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+END;
+//
+
+DROP TRIGGER IF EXISTS Events_Day_update_trigger;
+CREATE TRIGGER Events_Day_update_trigger AFTER UPDATE ON Events_Day
+FOR EACH ROW
+  BEGIN
+    declare diff BIGINT default 0;
+
+    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
+    IF ( diff ) THEN
+      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
+        UPDATE Monitor_Status SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+        UPDATE Monitor_Status SET DayEventDiskSpace=COALESCE(DayEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
+      ELSE
+        UPDATE Monitor_Status SET DayEventDiskSpace=GREATEST(COALESCE(DayEventDiskSpace,0)+diff,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
+      END IF;
+    END IF;
+  END;
+  //
+
+
+DROP TRIGGER IF EXISTS Events_Week_delete_trigger//
+CREATE TRIGGER Events_Week_delete_trigger BEFORE DELETE ON Events_Week
+FOR EACH ROW BEGIN
+  UPDATE Monitor_Status SET
+  WeekEvents = GREATEST(COALESCE(WeekEvents,1)-1,0),
+  WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
+  WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+END;
+//
+
+DROP TRIGGER IF EXISTS Events_Week_update_trigger;
+CREATE TRIGGER Events_Week_update_trigger AFTER UPDATE ON Events_Week
+FOR EACH ROW
+  BEGIN
+    declare diff BIGINT default 0;
+
+    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
+    IF ( diff ) THEN
+      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
+        UPDATE Monitor_Status SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0) WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+        UPDATE Monitor_Status SET WeekEventDiskSpace=COALESCE(WeekEventDiskSpace,0)+COALESCE(NEW.DiskSpace,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
+      ELSE
+        UPDATE Monitor_Status SET WeekEventDiskSpace=GREATEST(COALESCE(WeekEventDiskSpace,0)+diff,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
+      END IF;
+    END IF;
+  END;
+  //
+
+DROP TRIGGER IF EXISTS Events_Month_delete_trigger//
+CREATE TRIGGER Events_Month_delete_trigger BEFORE DELETE ON Events_Month
+FOR EACH ROW BEGIN
+  UPDATE Monitor_Status SET
+  MonthEvents = GREATEST(COALESCE(MonthEvents,1)-1,0),
+  MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
+  WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+END;
+//
+
+DROP TRIGGER IF EXISTS Events_Month_update_trigger;
+CREATE TRIGGER Events_Month_update_trigger AFTER UPDATE ON Events_Month
+FOR EACH ROW
+  BEGIN
+    declare diff BIGINT default 0;
+
+    set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
+    IF ( diff ) THEN
+      IF ( NEW.MonitorID != OLD.MonitorID ) THEN
+        UPDATE Monitor_Status SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)-COALESCE(OLD.DiskSpace),0) WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+        UPDATE Monitor_Status SET MonthEventDiskSpace=COALESCE(MonthEventDiskSpace,0)+COALESCE(NEW.DiskSpace) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
+      ELSE
+        UPDATE Monitor_Status SET MonthEventDiskSpace=GREATEST(COALESCE(MonthEventDiskSpace,0)+diff,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
+      END IF;
+    END IF;
+  END;
+  //
+
+drop procedure if exists update_storage_stats//
+
+drop trigger if exists event_update_trigger//
+
+CREATE TRIGGER event_update_trigger AFTER UPDATE ON Events 
+FOR EACH ROW
+BEGIN
+  declare diff BIGINT default 0;
+
+  set diff = COALESCE(NEW.DiskSpace,0) - COALESCE(OLD.DiskSpace,0);
+  IF ( NEW.StorageId = OLD.StorageID ) THEN
+    IF ( diff ) THEN
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) + diff,0) WHERE Storage.Id = OLD.StorageId;
+    END IF;
+  ELSE
+    IF ( NEW.DiskSpace ) THEN
+      UPDATE Storage SET DiskSpace = COALESCE(DiskSpace,0) + NEW.DiskSpace WHERE Storage.Id = NEW.StorageId;
+    END IF;
+    IF ( OLD.DiskSpace ) THEN
+      UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - OLD.DiskSpace,0) WHERE Storage.Id = OLD.StorageId;
+    END IF;
+  END IF;
+
+  UPDATE Events_Hour SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+  UPDATE Events_Day SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+  UPDATE Events_Week SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+  UPDATE Events_Month SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+
+  IF ( NEW.Archived != OLD.Archived ) THEN
+    IF ( NEW.Archived ) THEN
+      INSERT INTO Events_Archived (EventId,MonitorId,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.DiskSpace);
+      UPDATE Monitor_Status SET ArchivedEvents = COALESCE(ArchivedEvents,0)+1, ArchivedEventDiskSpace = COALESCE(ArchivedEventDiskSpace,0) + COALESCE(NEW.DiskSpace,0) WHERE Monitor_Status.MonitorId=NEW.MonitorId;
+    ELSEIF ( OLD.Archived ) THEN
+      DELETE FROM Events_Archived WHERE EventId=OLD.Id;
+      UPDATE Monitor_Status
+        SET
+          ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,0)-1,0),
+          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
+        WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+    ELSE
+      IF ( OLD.DiskSpace != NEW.DiskSpace ) THEN
+        UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+        UPDATE Monitor_Status SET
+          ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
+          WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+      END IF;
+    END IF;
+  ELSEIF ( NEW.Archived AND diff ) THEN
+    UPDATE Events_Archived SET DiskSpace=NEW.DiskSpace WHERE EventId=NEW.Id;
+  END IF;
+
+  IF ( diff ) THEN
+    UPDATE Monitor_Status
+      SET
+        TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0) + COALESCE(NEW.DiskSpace,0),0)
+      WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+  END IF;
+
+END;
+
+//
+
+DROP TRIGGER IF EXISTS event_insert_trigger//
+
+/* The assumption is that when an Event is inserted, it has no size yet, so don't bother updating the DiskSpace, just the count.
+ * The DiskSpace will get update in the Event Update Trigger
+ */
+CREATE TRIGGER event_insert_trigger AFTER INSERT ON Events
+FOR EACH ROW
+  BEGIN
+
+  INSERT INTO Events_Hour (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  INSERT INTO Events_Day (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  INSERT INTO Events_Week (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  INSERT INTO Events_Month (EventId,MonitorId,StartDateTime,DiskSpace) VALUES (NEW.Id,NEW.MonitorId,NEW.StartDateTime,0);
+  UPDATE Monitor_Status SET
+  HourEvents = COALESCE(HourEvents,0)+1,
+  DayEvents = COALESCE(DayEvents,0)+1,
+  WeekEvents = COALESCE(WeekEvents,0)+1,
+  MonthEvents = COALESCE(MonthEvents,0)+1,
+  TotalEvents = COALESCE(TotalEvents,0)+1
+  WHERE Monitor_Status.MonitorId=NEW.MonitorId;
+END;
+//
+
+DROP TRIGGER IF EXISTS event_delete_trigger//
+
+CREATE TRIGGER event_delete_trigger BEFORE DELETE ON Events
+FOR EACH ROW
+BEGIN
+  IF ( OLD.DiskSpace ) THEN
+    UPDATE Storage SET DiskSpace = GREATEST(COALESCE(DiskSpace,0) - COALESCE(OLD.DiskSpace,0),0) WHERE Storage.Id = OLD.StorageId;
+  END IF;
+  DELETE FROM Events_Hour WHERE EventId=OLD.Id;
+  DELETE FROM Events_Day WHERE EventId=OLD.Id;
+  DELETE FROM Events_Week WHERE EventId=OLD.Id;
+  DELETE FROM Events_Month WHERE EventId=OLD.Id;
+  IF ( OLD.Archived ) THEN
+    DELETE FROM Events_Archived WHERE EventId=OLD.Id;
+    UPDATE Monitor_Status SET
+      ArchivedEvents = GREATEST(COALESCE(ArchivedEvents,1) - 1,0),
+      ArchivedEventDiskSpace = GREATEST(COALESCE(ArchivedEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0),
+      TotalEvents = GREATEST(COALESCE(TotalEvents,1) - 1,0),
+      TotalEventDiskSpace = GREATEST(COALESCE(TotalEventDiskSpace,0) - COALESCE(OLD.DiskSpace,0),0)
+      WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+  ELSE
+    UPDATE Monitor_Status SET
+    TotalEvents = GREATEST(COALESCE(TotalEvents,1)-1,0),
+    TotalEventDiskSpace=GREATEST(COALESCE(TotalEventDiskSpace,0)-COALESCE(OLD.DiskSpace,0),0)
+    WHERE Monitor_Status.MonitorId=OLD.MonitorId;
+  END IF;
+END;
+
+//
+
+DELIMITER ;
+
+REPLACE INTO Events_Hour SELECT Id,MonitorId,StartDateTime,DiskSpace FROM Events WHERE StartDateTime > DATE_SUB(NOW(),  INTERVAL 1 hour);
+REPLACE INTO Events_Day SELECT Id,MonitorId,StartDateTime,DiskSpace FROM Events WHERE StartDateTime > DATE_SUB(NOW(),  INTERVAL 1 day);
+REPLACE INTO Events_Week SELECT Id,MonitorId,StartDateTime,DiskSpace FROM Events WHERE StartDateTime > DATE_SUB(NOW(),  INTERVAL 1 week);
+REPLACE INTO Events_Month SELECT Id,MonitorId,StartDateTime,DiskSpace FROM Events WHERE StartDateTime > DATE_SUB(NOW(),  INTERVAL 1 month);
+REPLACE INTO Events_Archived SELECT Id,MonitorId,DiskSpace FROM Events WHERE Archived=1;
+
+UPDATE Monitor_Status INNER JOIN (
+  SELECT  MonitorId,
+    COUNT(Id) AS TotalEvents,
+    SUM(DiskSpace) AS TotalEventDiskSpace,
+    SUM(IF(Archived,1,0)) AS ArchivedEvents,
+    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace
+    FROM Events GROUP BY MonitorId
+    ) AS E ON E.MonitorId=Monitor_Status.MonitorId SET
+    Monitor_Status.TotalEvents = E.TotalEvents,
+    Monitor_Status.TotalEventDiskSpace = E.TotalEventDiskSpace,
+    Monitor_Status.ArchivedEvents = E.ArchivedEvents,
+    Monitor_Status.ArchivedEventDiskSpace = E.ArchivedEventDiskSpace,
+    Monitor_Status.HourEvents = E.HourEvents,
+    Monitor_Status.HourEventDiskSpace = E.HourEventDiskSpace,
+    Monitor_Status.DayEvents = E.DayEvents,
+    Monitor_Status.DayEventDiskSpace = E.DayEventDiskSpace,
+    Monitor_Status.WeekEvents = E.WeekEvents,
+    Monitor_Status.WeekEventDiskSpace = E.WeekEventDiskSpace,
+    Monitor_Status.MonthEvents = E.MonthEvents,
+    Monitor_Status.MonthEventDiskSpace = E.MonthEventDiskSpace;
diff --git a/db/zm_update-1.35.15.sql b/db/zm_update-1.35.15.sql
new file mode 100644
index 000000000..65f4e5426
--- /dev/null
+++ b/db/zm_update-1.35.15.sql
@@ -0,0 +1,70 @@
+/*
+Add the EndTime IS NOT NULL term to the Update Disk Space Filter.
+This will only work if they havn't modified the stock filter 
+ */
+UPDATE Filters SET Query_json='{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}]}' WHERE Query_json='{"terms":[{"attr":"DiskSpace","op":"IS","val":"NULL"}]}';
+
+/*
+Add the EndTime IS NOT NULL term to the Purge When Full Filter. 
+This will only work if they havn't modified the stock filter .
+This is important to prevent SQL Errors inserting into Frames table if PurgeWhenFull deletes in-progress events.
+ */
+UPDATE Filters SET Query_json='{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="},{"cnj":"and","obr":"0","attr":"EndDateTime","op":"IS NOT","val":"NULL","cbr":"0"}],"limit":100,"sort_asc":1}' WHERE Query_json='{"sort_field":"Id","terms":[{"val":0,"attr":"Archived","op":"="},{"cnj":"and","val":95,"attr":"DiskPercent","op":">="}],"limit":100,"sort_asc":1}';
+
+/* Add FOREIGN KEYS After deleting lost records */
+set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Groups_Monitors' and column_name='GroupId' and referenced_table_name='Groups' and referenced_column_name='Id');
+
+set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
+set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY GroupId in Groups_Monitors already exists'", @sqlstmt);
+set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for GroupId to Groups_Monitors'", @sqlstmt);
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Groups_Monitors'", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "DELETE FROM `Groups_Monitors` WHERE `GroupId` NOT IN (SELECT `Id` FROM `Groups`)", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "ALTER TABLE `Groups_Monitors` ADD FOREIGN KEY (`GroupId`) REFERENCES `Groups` (`Id`) ON DELETE CASCADE", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+/* Add FOREIGN KEYS After deleting lost records */
+set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Groups_Monitors' and column_name='MonitorId' and referenced_table_name='Monitors' and referenced_column_name='Id');
+
+set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
+set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY MonitorId in Groups_Monitors already exists'", @sqlstmt);
+set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for MonitorId to Groups_Monitors'", @sqlstmt);
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Groups_Monitors'", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "DELETE FROM `Groups_Monitors` WHERE `MonitorId` NOT IN (SELECT `Id` FROM `Monitors`)", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "ALTER TABLE `Groups_Monitors` ADD FOREIGN KEY (`MonitorId`) REFERENCES `Monitors` (`Id`) ON DELETE CASCADE", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+/* Add FOREIGN KEYS After deleting lost records */
+set @exist := (select count(*) FROM information_schema.key_column_usage where table_name='Groups' and column_name='ParentId' and referenced_table_name='Groups' and referenced_column_name='Id');
+
+set @sqlstmt := if( @exist > 1, "SELECT 'You have more than 1 FOREIGN KEY. Please do manual cleanup'", "SELECT 'Ok'");
+set @sqlstmt := if( @exist = 1, "SELECT 'FOREIGN KEY ParentId in Groups already exists'", @sqlstmt);
+set @sqlstmt := if( @exist = 0, "SELECT 'Adding foreign key for ParentId to Groups'", @sqlstmt);
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
+set @sqlstmt := if( @exist = 0, "SELECT 'Deleting unlinked Groups'", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "UPDATE `Groups` SET `ParentId` = NULL WHERE (ParentId IS NOT NULL) and ParentId NOT IN (SELECT * FROM(SELECT Id FROM `Groups`)tblTmp)", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+set @sqlstmt := if( @exist = 0, "ALTER TABLE `Groups` ADD FOREIGN KEY (ParentId) REFERENCES `Groups` (Id) ON DELETE CASCADE", "SELECT '.'");
+PREPARE stmt FROM @sqlstmt;
+EXECUTE stmt;
+
diff --git a/db/zm_update-1.35.16.sql b/db/zm_update-1.35.16.sql
new file mode 100644
index 000000000..50c952bca
--- /dev/null
+++ b/db/zm_update-1.35.16.sql
@@ -0,0 +1,12 @@
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Monitors'
+      AND column_name = 'DecodingEnabled'
+    ) > 0,
+    "SELECT 'Column DecodingEnabled already exists in Monitors'",
+    "ALTER TABLE Monitors ADD `DecodingEnabled` tinyint(3) unsigned NOT NULL default '1' AFTER `Enabled`"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.17.sql b/db/zm_update-1.35.17.sql
new file mode 100644
index 000000000..ec4745b8a
--- /dev/null
+++ b/db/zm_update-1.35.17.sql
@@ -0,0 +1,14 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'Encoder'
+    ) > 0,
+"SELECT 'Column Encoder already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Encoder`     enum('auto','h264','libx264','h264_omx','h264_vaapi','mjpeg','mpeg1','mpeg2')  AFTER `OutputCodec`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+ALTER TABLE `Monitors` MODIFY `Encoder`     enum('auto','h264','libx264', 'h264_omx', 'h264_vaapi', 'mjpeg','mpeg1','mpeg2');
+
+ALTER TABLE `Monitors` MODIFY `OutputCodec`     INT UNSIGNED default 0;
diff --git a/db/zm_update-1.35.18.sql b/db/zm_update-1.35.18.sql
new file mode 100644
index 000000000..a46cb5895
--- /dev/null
+++ b/db/zm_update-1.35.18.sql
@@ -0,0 +1,11 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'RTSPServer'
+    ) > 0,
+"SELECT 'Column RTSPServer already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `RTSPServer`  BOOLEAN NOT NULL DEFAULT FALSE AFTER `Longitude`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.19.sql b/db/zm_update-1.35.19.sql
new file mode 100644
index 000000000..8772491db
--- /dev/null
+++ b/db/zm_update-1.35.19.sql
@@ -0,0 +1,11 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'RTSPStreamName'
+    ) > 0,
+"SELECT 'Column RTSPStreamName already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `RTSPStreamName` varchar(255) NOT NULL default '' AFTER `RTSPServer`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.20.sql b/db/zm_update-1.35.20.sql
new file mode 100644
index 000000000..275515dbf
--- /dev/null
+++ b/db/zm_update-1.35.20.sql
@@ -0,0 +1,15 @@
+--
+-- Add SecondPath to Monitors
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'SecondPath'
+    ) > 0,
+"SELECT 'Column SecondPath already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `SecondPath` VARCHAR(255) AFTER `Path`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.21.sql b/db/zm_update-1.35.21.sql
new file mode 100644
index 000000000..d3d80e08c
--- /dev/null
+++ b/db/zm_update-1.35.21.sql
@@ -0,0 +1,56 @@
+--
+-- Add HomeView to Users
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Users'
+     AND column_name = 'HomeView'
+    ) > 0,
+"SELECT 'Column HomeView already exists in Users'",
+"ALTER TABLE `Users` ADD `HomeView`  varchar(64) NOT NULL DEFAULT '' AFTER `APIEnabled`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+      FROM INFORMATION_SCHEMA.TABLES
+      WHERE table_name = 'Snapshots'
+      AND table_schema = DATABASE()
+    ) > 0,
+    "SELECT 'Snapshots table exists'",
+    "CREATE TABLE Snapshots (
+  `Id` int(10) unsigned NOT NULL auto_increment,
+  `Name`  VARCHAR(64),
+  `Description` TEXT,
+  `CreatedBy`   int(10),
+  `CreatedOn`   datetime default NULL,
+  PRIMARY KEY(Id)
+) ENGINE=InnoDB;"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+      FROM INFORMATION_SCHEMA.TABLES
+      WHERE table_name = 'Snapshot_Events'
+      AND table_schema = DATABASE()
+    ) > 0,
+    "SELECT 'Snapshot_Events table exists'",
+    "CREATE TABLE Snapshot_Events (
+  `Id` int(10) unsigned NOT NULL auto_increment,
+  `SnapshotId` int(10) unsigned NOT NULL,
+  FOREIGN KEY (`SnapshotId`) REFERENCES `Snapshots` (`Id`) ON DELETE CASCADE,
+  `EventId`    bigint unsigned NOT NULL,
+  FOREIGN KEY (`EventId`) REFERENCES `Events` (`Id`) ON DELETE CASCADE,
+  KEY `Snapshot_Events_SnapshotId_idx` (`SnapshotId`),
+  PRIMARY KEY(Id)
+) ENGINE=InnoDB;"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.22.sql b/db/zm_update-1.35.22.sql
new file mode 100644
index 000000000..2e4fe3a93
--- /dev/null
+++ b/db/zm_update-1.35.22.sql
@@ -0,0 +1,19 @@
+--
+-- Add MaxImageBufferCount, set it to ImageBufferCount if that was large and set ImageBufferCount to 3
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'MaxImageBufferCount'
+    ) > 0,
+"SELECT 'Column MaxImageBufferCount already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `MaxImageBufferCount` smallint(5) unsigned NOT NULL default '0' AFTER `ImageBufferCount`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE `Monitors` SET MaxImageBufferCount=ImageBufferCount WHERE ImageBufferCount >= 20;
+UPDATE `Monitors` SET ImageBufferCount = 3;
+
diff --git a/db/zm_update-1.35.23.sql b/db/zm_update-1.35.23.sql
new file mode 100644
index 000000000..22172a707
--- /dev/null
+++ b/db/zm_update-1.35.23.sql
@@ -0,0 +1,2 @@
+
+UPDATE `Controls` SET `Protocol`='FoscamCGI' where `Protocol`='onvif';
diff --git a/db/zm_update-1.35.24.sql.in b/db/zm_update-1.35.24.sql.in
new file mode 100644
index 000000000..5dc117cab
--- /dev/null
+++ b/db/zm_update-1.35.24.sql.in
@@ -0,0 +1,69 @@
+SELECT 'This update may make changes that require SUPER privileges. If you see an error message saying:
+
+ERROR 1419 (HY000) at line 298: You do not have the SUPER privilege and binary logging is enabled (you *might* want to use the less safe log_bin_trust_function_creators variable)
+
+You will have to either run this update as root manually using something like (on ubuntu/debian)
+
+sudo mysql --defaults-file=/etc/mysql/debian.cnf zm < /usr/share/zoneminder/db/zm_update-1.35.24.sql
+
+OR
+
+sudo mysql --defaults-file=/etc/mysql/debian.cnf "set global log_bin_trust_function_creators=1;"
+sudo zmupdate.pl
+
+OR
+
+Turn off binary logging in your mysql server by adding this to your mysql config.
+[mysqld]
+skip-log-bin
+
+';
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+      AND table_name = 'Event_Summaries'
+    ) > 0
+    ,
+    "SELECT 'Event_Summaries Already exists'",
+    "
+    CREATE TABLE `Event_Summaries` (
+  `MonitorId` int(10) unsigned NOT NULL,
+  `TotalEvents` int(10) default NULL,
+  `TotalEventDiskSpace` bigint default NULL,
+  `HourEvents` int(10) default NULL,
+  `HourEventDiskSpace` bigint default NULL,
+  `DayEvents` int(10) default NULL,
+  `DayEventDiskSpace` bigint default NULL,
+  `WeekEvents` int(10) default NULL,
+  `WeekEventDiskSpace` bigint default NULL,
+  `MonthEvents` int(10) default NULL,
+  `MonthEventDiskSpace` bigint default NULL,
+  `ArchivedEvents` int(10) default NULL,
+  `ArchivedEventDiskSpace` bigint default NULL,
+  PRIMARY KEY (`MonitorId`)
+) ENGINE=InnoDb;
+"
+    ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+DELETE FROM Event_Summaries;
+
+REPLACE INTO Event_Summaries
+  SELECT  MonitorId,
+    COUNT(Id) AS TotalEvents,
+    SUM(DiskSpace) AS TotalEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),1,0)) AS HourEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 hour),DiskSpace,0)) AS HourEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),1,0)) AS DayEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 day),DiskSpace,0)) AS DayEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),1,0)) AS WeekEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 week),DiskSpace,0)) AS WeekEventDiskSpace,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),1,0)) AS MonthEvents,
+    SUM(IF(StartDateTime > DATE_SUB(NOW(), INTERVAL 1 month),DiskSpace,0)) AS MonthEventDiskSpace,
+    SUM(IF(Archived,1,0)) AS ArchivedEvents,
+    SUM(IF(Archived,DiskSpace,0)) AS ArchivedEventDiskSpace
+    FROM Events GROUP BY MonitorId;
+   
+source @PKGDATADIR@/db/triggers.sql
diff --git a/db/zm_update-1.35.25.sql b/db/zm_update-1.35.25.sql
new file mode 100644
index 000000000..387ef09b0
--- /dev/null
+++ b/db/zm_update-1.35.25.sql
@@ -0,0 +1,144 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'TotalEvents'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `TotalEvents`",
+"SELECT 'Column TotalEvents already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'TotalEventDiskSpace'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `TotalEventDiskSpace`",
+"SELECT 'Column TotalEventDiskSpace already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'HourEvents'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `HourEvents`",
+"SELECT 'Column HourEvents already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'HourEventDiskSpace'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `HourEventDiskSpace`",
+"SELECT 'Column HourEventDiskSpace already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'DayEvents'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `DayEvents`",
+"SELECT 'Column DayEvents already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'DayEvents'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `DayEventDiskSpace`",
+"SELECT 'Column DayEventDiskSpace already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'WeekEvents'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `WeekEvents`",
+"SELECT 'Column WeekEvents already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'WeekEventDiskSpace'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `WeekEventDiskSpace`",
+"SELECT 'Column WeekEventDiskSpace already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'MonthEvents'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `MonthEvents`",
+"SELECT 'Column MonthEvents already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'MonthEventDiskSpace'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `MonthEventDiskSpace`",
+"SELECT 'Column MonthEventDiskSpace already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'ArchivedEvents'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `ArchivedEvents`",
+"SELECT 'Column ArchivedEvents already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitor_Status'
+     AND column_name = 'ArchivedEventDiskSpace'
+    ) > 0,
+"ALTER TABLE `Monitor_Status` DROP `ArchivedEventDiskSpace`",
+"SELECT 'Column ArchivedEventDiskSpace already removed from Monitor_Status'"
+));
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'Importance'
+    ) > 0,
+"SELECT 'Column Importance already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Importance`  enum('Not','Less','Normal') AFTER `RTSPStreamName`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
diff --git a/db/zm_update-1.35.26.sql b/db/zm_update-1.35.26.sql
new file mode 100644
index 000000000..123f8b56a
--- /dev/null
+++ b/db/zm_update-1.35.26.sql
@@ -0,0 +1,17 @@
+--
+-- Add Snapshot permission to Users
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Users'
+     AND column_name = 'Snapshots'
+    ) > 0,
+"SELECT 'Column Snapshots already exists in Users'",
+"ALTER TABLE `Users` ADD `Snapshots` enum('None','View','Edit') NOT NULL default 'None' AFTER `Devices`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+UPDATE `Users` SET `Snapshots` = `Events`;
diff --git a/db/zm_update-1.35.27.sql b/db/zm_update-1.35.27.sql
new file mode 100644
index 000000000..8efef50e5
--- /dev/null
+++ b/db/zm_update-1.35.27.sql
@@ -0,0 +1,15 @@
+--
+-- Add ModectDuringPTZ
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModectDuringPTZ'
+    ) > 0,
+"SELECT 'Column ModectDuringPTZ already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ModectDuringPTZ` tinyint(3) unsigned NOT NULL default '0' AFTER `ReturnDelay`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.28.sql b/db/zm_update-1.35.28.sql
new file mode 100644
index 000000000..a281507dc
--- /dev/null
+++ b/db/zm_update-1.35.28.sql
@@ -0,0 +1 @@
+ALTER TABLE `Monitors` MODIFY `Encoder`     varchar(32);
diff --git a/db/zm_update-1.35.29.sql b/db/zm_update-1.35.29.sql
new file mode 100644
index 000000000..9030e5863
--- /dev/null
+++ b/db/zm_update-1.35.29.sql
@@ -0,0 +1,61 @@
+<<<<<<< HEAD
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'Column ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ManufacturerId`  int(10) unsigned AFTER `StorageId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ManufacturerId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ManufacturerId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ManufacturerId`) REFERENCES `Manufacturers` (Id)"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF( 
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'Column ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `ModelId`  int(10) unsigned AFTER `ManufacturerId`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'ModelId'
+    ) > 0,
+"SELECT 'FOREIGN KEY for ModelId already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD FOREIGN KEY  (`ModelId`) REFERENCES `Models` (Id)"
+=======
+--
+-- Add AutoUnarchive action to Filters
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Filters'
+     AND column_name = 'AutoUnarchive'
+    ) > 0,
+"SELECT 'Column AutoUunarchive already exists in Filters'",
+"ALTER TABLE Filters ADD `AutoUnarchive` tinyint(3) unsigned NOT NULL default '0' AFTER `AutoArchive`"
+>>>>>>> master
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.7.sql b/db/zm_update-1.35.7.sql
new file mode 100644
index 000000000..84c3dbb1e
--- /dev/null
+++ b/db/zm_update-1.35.7.sql
@@ -0,0 +1,23 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'Latitude'
+    ) > 0,
+"SELECT 'Column Latitude already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Latitude`  DECIMAL(10,8) AFTER `Refresh`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'Longitude'
+    ) > 0,
+"SELECT 'Column Longitude already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Longitude`  DECIMAL(10,8) AFTER `Latitude`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/db/zm_update-1.35.8.sql b/db/zm_update-1.35.8.sql
new file mode 100644
index 000000000..1549903ab
--- /dev/null
+++ b/db/zm_update-1.35.8.sql
@@ -0,0 +1,12 @@
+/* The MEMORY TABLE TYPE IS BAD! Switch to regular InnoDB */
+
+DROP TABLE IF EXISTS `Monitor_Status`;
+CREATE TABLE `Monitor_Status` (
+  `MonitorId` int(10) unsigned NOT NULL,
+  `Status`  enum('Unknown','NotRunning','Running','Connected','Signal') NOT NULL default 'Unknown',
+  `CaptureFPS`  DECIMAL(10,2) NOT NULL default 0,
+  `AnalysisFPS`  DECIMAL(5,2) NOT NULL default 0,
+  `CaptureBandwidth`  INT NOT NULL default 0,
+  PRIMARY KEY (`MonitorId`)
+) ENGINE=InnoDB;
+
diff --git a/db/zm_update-1.35.9.sql b/db/zm_update-1.35.9.sql
new file mode 100644
index 000000000..b5f807225
--- /dev/null
+++ b/db/zm_update-1.35.9.sql
@@ -0,0 +1,21 @@
+--
+-- This adds Sessions Table
+--
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*)
+      FROM INFORMATION_SCHEMA.TABLES
+      WHERE table_name = 'Sessions'
+      AND table_schema = DATABASE()
+    ) > 0,
+    "SELECT 'Sessions table exists'",
+    "CREATE TABLE Sessions (
+  id char(32) not null,
+  access INT(10) UNSIGNED DEFAULT NULL,
+  data text,
+  PRIMARY KEY(id)
+) ENGINE=InnoDB;"
+  ));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt
new file mode 100644
index 000000000..792048adf
--- /dev/null
+++ b/dep/CMakeLists.txt
@@ -0,0 +1,4 @@
+add_subdirectory(jwt-cpp)
+add_subdirectory(libbcrypt)
+add_subdirectory(RtspServer)
+add_subdirectory(span-lite)
diff --git a/dep/RtspServer b/dep/RtspServer
new file mode 160000
index 000000000..cd7fd49be
--- /dev/null
+++ b/dep/RtspServer
@@ -0,0 +1 @@
+Subproject commit cd7fd49becad6010a1b8466bfebbd93999a39878
diff --git a/dep/jwt-cpp/CMakeLists.txt b/dep/jwt-cpp/CMakeLists.txt
new file mode 100644
index 000000000..81ddc84a1
--- /dev/null
+++ b/dep/jwt-cpp/CMakeLists.txt
@@ -0,0 +1,6 @@
+add_library(jwt-cpp INTERFACE)
+add_library(jwt-cpp::jwt-cpp ALIAS jwt-cpp)
+
+target_include_directories(jwt-cpp
+  INTERFACE
+    ${CMAKE_CURRENT_SOURCE_DIR}/include)
diff --git a/src/jwt-cpp/Doxyfile b/dep/jwt-cpp/Doxyfile
similarity index 99%
rename from src/jwt-cpp/Doxyfile
rename to dep/jwt-cpp/Doxyfile
index e3303d2b9..0e912fd79 100644
--- a/src/jwt-cpp/Doxyfile
+++ b/dep/jwt-cpp/Doxyfile
@@ -38,7 +38,7 @@ PROJECT_NAME           = "JWT-C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         =
+PROJECT_NUMBER         = 0.5.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a
@@ -889,7 +889,7 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = *nlohmann*, *picojson*
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -900,13 +900,13 @@ EXCLUDE_PATTERNS       =
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories use the pattern */test/*
 
-EXCLUDE_SYMBOLS        =
+EXCLUDE_SYMBOLS        = jwt::details
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or directories
 # that contain example code fragments that are included (see the \include
 # command).
 
-EXAMPLE_PATH           =
+EXAMPLE_PATH           = example
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
@@ -1666,7 +1666,7 @@ EXTRA_SEARCH_MAPPINGS  =
 # If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output.
 # The default value is: YES.
 
-GENERATE_LATEX         = YES
+GENERATE_LATEX         = NO
 
 # The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
 # relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
diff --git a/src/jwt-cpp/LICENSE b/dep/jwt-cpp/LICENSE
similarity index 100%
rename from src/jwt-cpp/LICENSE
rename to dep/jwt-cpp/LICENSE
diff --git a/dep/jwt-cpp/README.md b/dep/jwt-cpp/README.md
new file mode 100644
index 000000000..5e3903262
--- /dev/null
+++ b/dep/jwt-cpp/README.md
@@ -0,0 +1,208 @@
+# ![logo](https://raw.githubusercontent.com/Thalhammer/jwt-cpp/master/.github/logo.svg)
+
+[![License Badge](https://img.shields.io/github/license/Thalhammer/jwt-cpp)](https://github.com/Thalhammer/jwt-cpp/blob/master/LICENSE)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/5f7055e294744901991fd0a1620b231d)](https://app.codacy.com/app/Thalhammer/jwt-cpp?utm_source=github.com&utm_medium=referral&utm_content=Thalhammer/jwt-cpp&utm_campaign=Badge_Grade_Settings)
+[![Linux Badge][Linux]][Cross-Platform]
+[![MacOS Badge][MacOS]][Cross-Platform]
+[![Windows Badge][Windows]][Cross-Platform]
+[![Coverage Status](https://coveralls.io/repos/github/Thalhammer/jwt-cpp/badge.svg?branch=master)](https://coveralls.io/github/Thalhammer/jwt-cpp?branch=master)
+[![Documentation Badge](https://img.shields.io/badge/Documentation-master-blue)](https://thalhammer.github.io/jwt-cpp/)
+[![GitHub release (latest SemVer including pre-releases)](https://img.shields.io/github/v/release/Thalhammer/jwt-cpp?include_prereleases)](https://github.com/Thalhammer/jwt-cpp/releases)
+[![Stars Badge](https://img.shields.io/github/stars/Thalhammer/jwt-cpp)](https://github.com/Thalhammer/jwt-cpp/stargazers)
+
+[Linux]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/cross-platform/ubuntu-latest/shields.json
+[MacOS]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/cross-platform/macos-latest/shields.json
+[Windows]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/cross-platform/windows-latest/shields.json
+[Cross-Platform]: https://github.com/Thalhammer/jwt-cpp/actions?query=workflow%3A%22Cross-Platform+CI%22
+
+A header only library for creating and validating [JSON Web Tokens](https://tools.ietf.org/html/rfc7519) in C++11. For a great introduction, [read this](https://jwt.io/introduction/).
+
+## Signature algorithms
+
+jwt-cpp supports all the algorithms defined by the specifications. The modular design allows to easily add additional algorithms without any problems. If you need any feel free to create a pull request or [open an issue](https://github.com/Thalhammer/jwt-cpp/issues/new).
+
+For completeness, here is a list of all supported algorithms:
+
+| HMSC  | RSA   | ECDSA | PSS   | EdDSA   |
+| ----- | ----- | ----- | ----- | ------- |
+| HS256 | RS256 | ES256 | PS256 | Ed25519 |
+| HS384 | RS384 | ES384 | PS384 | Ed448   |
+| HS512 | RS512 | ES512 | PS512 |         |
+
+## SSL Compatibility
+
+In the name of flexibility and extensibility, jwt-cpp supports both [OpenSSL](https://github.com/openssl/openssl) and [LibreSSL](https://github.com/libressl-portable/portable). These are the version which are, or have been, tested:
+
+| OpenSSL        | LibreSSL        |
+| -------------- | --------------- |
+| [1.0.2][1.0.2] | ![3.1.5][3.1]   |
+| 1.1.0          | ![3.2.3][3.2]   |
+| [1.1.1][1.1.1] | ![3.3.1][3.3]   |
+
+[1.0.2]: https://travis-ci.com/github/Thalhammer/jwt-cpp
+[1.1.1]: https://github.com/Thalhammer/jwt-cpp/actions?query=workflow%3A%22Coverage+CI%22
+[3.1]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/libressl/3.1.5/shields.json
+[3.2]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/libressl/3.2.3/shields.json
+[3.3]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/Thalhammer/jwt-cpp/badges/libressl/3.3.1/shields.json
+
+## Overview
+
+There is no hard dependency on a JSON library. Instead, there's a generic `jwt::basic_claim` which is templated around type traits, which described the semantic [JSON types](https://json-schema.org/understanding-json-schema/reference/type.html) for a value, object, array, string, number, integer and boolean, as well as methods to translate between them.
+
+```cpp
+jwt::basic_claim<my_favorite_json_library_traits> claim(json::object({{"json", true},{"example", 0}}));
+```
+
+This allows for complete freedom when picking which libraries you want to use. For more information, [see below](#providing-your-own-json-traits-your-traits).
+
+In order to maintain compatibility, [picojson](https://github.com/kazuho/picojson) is still used to provide a specialized `jwt::claim` along with all helpers. Defining `JWT_DISABLE_PICOJSON` will remove this optional dependency.
+
+As for the base64 requirements of JWTs, this libary provides `base.h` with all the required implentation; However base64 implementations are very common, with varying degrees of performance. When providing your own base64 implementation, you can define `JWT_DISABLE_BASE64` to remove the jwt-cpp implementation.
+
+### Getting Started
+
+Simple example of decoding a token and printing all [claims](https://tools.ietf.org/html/rfc7519#section-4) ([try it out](https://github.com/Thalhammer/jwt-cpp/tree/master/example/print-claims.cpp)):
+
+```cpp
+#include <jwt-cpp/jwt.h>
+#include <iostream>
+
+int main() {
+    std::string token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.AbIJTDMFc7yUa5MhvcP03nJPyCPzZtQcGEp-zWfOkEE";
+    auto decoded = jwt::decode(token);
+
+    for(auto& e : decoded.get_payload_claims())
+        std::cout << e.first << " = " << e.second << std::endl;
+}
+```
+
+In order to verify a token you first build a verifier and use it to verify a decoded token.
+
+```cpp
+auto verifier = jwt::verify()
+    .allow_algorithm(jwt::algorithm::hs256{ "secret" })
+    .with_issuer("auth0");
+
+verifier.verify(decoded_token);
+```
+
+The created verifier is stateless so you can reuse it for different tokens.
+
+Creating a token (and signing) is equally as easy.
+
+```cpp
+auto token = jwt::create()
+    .set_issuer("auth0")
+    .set_type("JWS")
+    .set_payload_claim("sample", jwt::claim(std::string("test")))
+    .sign(jwt::algorithm::hs256{"secret"});
+```
+
+Here is a simple example of creating a token that will expire in one hour:
+
+```cpp
+auto token = jwt::create()
+    .set_issuer("auth0")
+    .set_issued_at(std::chrono::system_clock::now())
+    .set_expires_at(std::chrono::system_clock::now() + std::chrono::seconds{3600})
+    .sign(jwt::algorithm::hs256{"secret"});
+```
+
+> To see more examples working with RSA public and private keys, visit our [examples](https://github.com/Thalhammer/jwt-cpp/tree/master/example)!
+
+### Providing your own JSON Traits
+
+There are several key items that need to be provided to a `jwt::basic_claim` in order for it to be interoptable with you JSON library of choice.
+
+* type specifications
+* conversion from generic "value type" to a specific type
+* serialization and parsing
+
+If ever you are not sure, the traits are heavily checked against static asserts to make sure you provide everything that's required.
+
+> :warning: Not all JSON libraries are a like, you may need to extent certain types such that it can be used by jwt-cpp. See this [example](https://github.com/Thalhammer/jwt-cpp/blob/ac3de9e69bc698a464dacb256a1b50512843f092/tests/jsoncons/JsonconsTest.cpp).
+
+```cpp
+struct my_favorite_json_library_traits {
+    // Type Specifications
+    using value_type = json; // The generic "value type" implementation, most libraries have one
+    using object_type = json::object_t; // The "map type" string to value
+    using array_type = json::array_t; // The "list type" array of values
+    using string_type = std::string; // The "list of chars", must be a narrow char
+    using number_type = double; // The "percision type"
+    using integer_type = int64_t; // The "integral type"
+    using boolean_type = bool; // The "boolean type"
+
+    // Translation between the implementation notion of type, to the jwt::json::type equivilant
+    static jwt::json::type get_type(const value_type &val) {
+        using jwt::json::type;
+
+        if (val.type() == json::value_t::object)
+            return type::object;
+        if (val.type() == json::value_t::array)
+            return type::array;
+        if (val.type() == json::value_t::string)
+            return type::string;
+        if (val.type() == json::value_t::number_float)
+            return type::number;
+        if (val.type() == json::value_t::number_integer)
+            return type::integer;
+        if (val.type() == json::value_t::boolean)
+            return type::boolean;
+
+        throw std::logic_error("invalid type");
+    }
+
+    // Conversion from generic value to specific type
+    static object_type as_object(const value_type &val);
+    static array_type as_array(const value_type &val);
+    static string_type as_string(const value_type &val);
+    static number_type as_number(const value_type &val);
+    static integer_type as_int(const value_type &val);
+    static boolean_type as_bool(const value_type &val);
+
+    // serilization and parsing
+    static bool parse(value_type &val, string_type str);
+    static string_type serialize(const value_type &val); // with no extra whitespace, padding or indentation
+};
+```
+
+## Contributing
+
+If you have an improvement or found a bug feel free to [open an issue](https://github.com/Thalhammer/jwt-cpp/issues/new) or add the change and create a pull request. If you file a bug please make sure to include as much information about your environment (compiler version, etc.) as possible to help reproduce the issue. If you add a new feature please make sure to also include test cases for it.
+
+## Dependencies
+
+In order to use jwt-cpp you need the following tools.
+
+* libcrypto (openssl or compatible)
+* libssl-dev (for the header files)
+* a compiler supporting at least c++11
+* basic stl support
+
+In order to build the test cases you also need
+
+* gtest
+* pthread
+
+## Troubleshooting
+
+### Expired tokens
+
+If you are generating tokens that seem to immediately expire, you are likely not using UTC. Specifically,
+if you use `get_time` to get the current time, it likely uses localtime, while this library uses UTC,
+which may be why your token is immediately expiring. Please see example above on the right way to use current time.
+
+### Missing \_HMAC and \_EVP_sha256 symbols on Mac
+
+There seems to exists a problem with the included openssl library of MacOS. Make sure you link to one provided by brew.
+See [here](https://github.com/Thalhammer/jwt-cpp/issues/6) for more details.
+
+### Building on windows fails with syntax errors
+
+The header `<Windows.h>`, which is often included in windowsprojects, defines macros for MIN and MAX which screw up std::numeric_limits.
+See [here](https://github.com/Thalhammer/jwt-cpp/issues/5) for more details. To fix this do one of the following things:
+
+* define NOMINMAX, which suppresses this behaviour
+* include this library before you include windows.h
+* place `#undef max` and `#undef min` before you include this library
diff --git a/dep/jwt-cpp/include/jwt-cpp/base.h b/dep/jwt-cpp/include/jwt-cpp/base.h
new file mode 100644
index 000000000..c447113c9
--- /dev/null
+++ b/dep/jwt-cpp/include/jwt-cpp/base.h
@@ -0,0 +1,208 @@
+#ifndef JWT_CPP_BASE_H
+#define JWT_CPP_BASE_H
+
+#include <array>
+#include <stdexcept>
+#include <string>
+
+#ifdef __has_cpp_attribute
+#if __has_cpp_attribute(fallthrough)
+#define JWT_FALLTHROUGH [[fallthrough]]
+#endif
+#endif
+
+#ifndef JWT_FALLTHROUGH
+#define JWT_FALLTHROUGH
+#endif
+
+namespace jwt {
+	/**
+	 * \brief character maps when encoding and decoding
+	 */
+	namespace alphabet {
+		/**
+		 * \brief valid list of characted when working with [Base64](https://tools.ietf.org/html/rfc3548)
+		 */
+		struct base64 {
+			static const std::array<char, 64>& data() {
+				static constexpr std::array<char, 64> data{
+					{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+					 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+					 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+					 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'}};
+				return data;
+			}
+			static const std::string& fill() {
+				static std::string fill{"="};
+				return fill;
+			}
+		};
+		/**
+		 * \brief valid list of characted when working with [Base64URL](https://tools.ietf.org/html/rfc4648)
+		 */
+		struct base64url {
+			static const std::array<char, 64>& data() {
+				static constexpr std::array<char, 64> data{
+					{'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
+					 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
+					 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+					 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_'}};
+				return data;
+			}
+			static const std::string& fill() {
+				static std::string fill{"%3d"};
+				return fill;
+			}
+		};
+	} // namespace alphabet
+
+	/**
+	 * \brief Alphabet generic methods for working with encoding/decoding the base64 family
+	 */
+	class base {
+	public:
+		template<typename T>
+		static std::string encode(const std::string& bin) {
+			return encode(bin, T::data(), T::fill());
+		}
+		template<typename T>
+		static std::string decode(const std::string& base) {
+			return decode(base, T::data(), T::fill());
+		}
+		template<typename T>
+		static std::string pad(const std::string& base) {
+			return pad(base, T::fill());
+		}
+		template<typename T>
+		static std::string trim(const std::string& base) {
+			return trim(base, T::fill());
+		}
+
+	private:
+		static std::string encode(const std::string& bin, const std::array<char, 64>& alphabet,
+								  const std::string& fill) {
+			size_t size = bin.size();
+			std::string res;
+
+			// clear incomplete bytes
+			size_t fast_size = size - size % 3;
+			for (size_t i = 0; i < fast_size;) {
+				uint32_t octet_a = static_cast<unsigned char>(bin[i++]);
+				uint32_t octet_b = static_cast<unsigned char>(bin[i++]);
+				uint32_t octet_c = static_cast<unsigned char>(bin[i++]);
+
+				uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
+
+				res += alphabet[(triple >> 3 * 6) & 0x3F];
+				res += alphabet[(triple >> 2 * 6) & 0x3F];
+				res += alphabet[(triple >> 1 * 6) & 0x3F];
+				res += alphabet[(triple >> 0 * 6) & 0x3F];
+			}
+
+			if (fast_size == size) return res;
+
+			size_t mod = size % 3;
+
+			uint32_t octet_a = fast_size < size ? static_cast<unsigned char>(bin[fast_size++]) : 0;
+			uint32_t octet_b = fast_size < size ? static_cast<unsigned char>(bin[fast_size++]) : 0;
+			uint32_t octet_c = fast_size < size ? static_cast<unsigned char>(bin[fast_size++]) : 0;
+
+			uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
+
+			switch (mod) {
+			case 1:
+				res += alphabet[(triple >> 3 * 6) & 0x3F];
+				res += alphabet[(triple >> 2 * 6) & 0x3F];
+				res += fill;
+				res += fill;
+				break;
+			case 2:
+				res += alphabet[(triple >> 3 * 6) & 0x3F];
+				res += alphabet[(triple >> 2 * 6) & 0x3F];
+				res += alphabet[(triple >> 1 * 6) & 0x3F];
+				res += fill;
+				break;
+			default: break;
+			}
+
+			return res;
+		}
+
+		static std::string decode(const std::string& base, const std::array<char, 64>& alphabet,
+								  const std::string& fill) {
+			size_t size = base.size();
+
+			size_t fill_cnt = 0;
+			while (size > fill.size()) {
+				if (base.substr(size - fill.size(), fill.size()) == fill) {
+					fill_cnt++;
+					size -= fill.size();
+					if (fill_cnt > 2) throw std::runtime_error("Invalid input");
+				} else
+					break;
+			}
+
+			if ((size + fill_cnt) % 4 != 0) throw std::runtime_error("Invalid input");
+
+			size_t out_size = size / 4 * 3;
+			std::string res;
+			res.reserve(out_size);
+
+			auto get_sextet = [&](size_t offset) {
+				for (size_t i = 0; i < alphabet.size(); i++) {
+					if (alphabet[i] == base[offset]) return static_cast<uint32_t>(i);
+				}
+				throw std::runtime_error("Invalid input");
+			};
+
+			size_t fast_size = size - size % 4;
+			for (size_t i = 0; i < fast_size;) {
+				uint32_t sextet_a = get_sextet(i++);
+				uint32_t sextet_b = get_sextet(i++);
+				uint32_t sextet_c = get_sextet(i++);
+				uint32_t sextet_d = get_sextet(i++);
+
+				uint32_t triple = (sextet_a << 3 * 6) + (sextet_b << 2 * 6) + (sextet_c << 1 * 6) + (sextet_d << 0 * 6);
+
+				res += static_cast<char>((triple >> 2 * 8) & 0xFFU);
+				res += static_cast<char>((triple >> 1 * 8) & 0xFFU);
+				res += static_cast<char>((triple >> 0 * 8) & 0xFFU);
+			}
+
+			if (fill_cnt == 0) return res;
+
+			uint32_t triple = (get_sextet(fast_size) << 3 * 6) + (get_sextet(fast_size + 1) << 2 * 6);
+
+			switch (fill_cnt) {
+			case 1:
+				triple |= (get_sextet(fast_size + 2) << 1 * 6);
+				res += static_cast<char>((triple >> 2 * 8) & 0xFFU);
+				res += static_cast<char>((triple >> 1 * 8) & 0xFFU);
+				break;
+			case 2: res += static_cast<char>((triple >> 2 * 8) & 0xFFU); break;
+			default: break;
+			}
+
+			return res;
+		}
+
+		static std::string pad(const std::string& base, const std::string& fill) {
+			std::string padding;
+			switch (base.size() % 4) {
+			case 1: padding += fill; JWT_FALLTHROUGH;
+			case 2: padding += fill; JWT_FALLTHROUGH;
+			case 3: padding += fill; JWT_FALLTHROUGH;
+			default: break;
+			}
+
+			return base + padding;
+		}
+
+		static std::string trim(const std::string& base, const std::string& fill) {
+			auto pos = base.find(fill);
+			return base.substr(0, pos);
+		}
+	};
+} // namespace jwt
+
+#endif
diff --git a/dep/jwt-cpp/include/jwt-cpp/jwt.h b/dep/jwt-cpp/include/jwt-cpp/jwt.h
new file mode 100644
index 000000000..bd3e6e986
--- /dev/null
+++ b/dep/jwt-cpp/include/jwt-cpp/jwt.h
@@ -0,0 +1,3039 @@
+#ifndef JWT_CPP_JWT_H
+#define JWT_CPP_JWT_H
+
+#ifndef JWT_DISABLE_PICOJSON
+#ifndef PICOJSON_USE_INT64
+#define PICOJSON_USE_INT64
+#endif
+#include "picojson/picojson.h"
+#endif
+
+#ifndef JWT_DISABLE_BASE64
+#include "base.h"
+#endif
+
+#include <openssl/ec.h>
+#include <openssl/err.h>
+#include <openssl/evp.h>
+#include <openssl/hmac.h>
+#include <openssl/pem.h>
+
+#include <algorithm>
+#include <chrono>
+#include <memory>
+#include <set>
+#include <system_error>
+#include <type_traits>
+#include <unordered_map>
+#include <utility>
+
+#if __cplusplus >= 201402L
+#ifdef __has_include
+#if __has_include(<experimental/type_traits>)
+#include <experimental/type_traits>
+#endif
+#endif
+#endif
+
+// If openssl version less than 1.1
+#if OPENSSL_VERSION_NUMBER < 0x10100000L
+#define OPENSSL10
+#endif
+
+// If openssl version less than 1.1.1
+#if OPENSSL_VERSION_NUMBER < 0x10101000L
+#define OPENSSL110
+#endif
+
+#if defined(LIBRESSL_VERSION_NUMBER)
+#define OPENSSL10
+#define OPENSSL110
+#endif
+
+#ifndef JWT_CLAIM_EXPLICIT
+#define JWT_CLAIM_EXPLICIT explicit
+#endif
+
+/**
+ * \brief JSON Web Token
+ *
+ * A namespace to contain everything related to handling JSON Web Tokens, JWT for short,
+ * as a part of [RFC7519](https://tools.ietf.org/html/rfc7519), or alternatively for
+ * JWS (JSON Web Signature) from [RFC7515](https://tools.ietf.org/html/rfc7515)
+ */
+namespace jwt {
+	using date = std::chrono::system_clock::time_point;
+
+	/**
+	 * \brief Everything related to error codes issued by the library
+	 */
+	namespace error {
+		struct signature_verification_exception : public std::system_error {
+			using system_error::system_error;
+		};
+		struct signature_generation_exception : public std::system_error {
+			using system_error::system_error;
+		};
+		struct rsa_exception : public std::system_error {
+			using system_error::system_error;
+		};
+		struct ecdsa_exception : public std::system_error {
+			using system_error::system_error;
+		};
+		struct token_verification_exception : public std::system_error {
+			using system_error::system_error;
+		};
+		/**
+		 * \brief Errors related to processing of RSA signatures
+		 */
+		enum class rsa_error {
+			ok = 0,
+			cert_load_failed = 10,
+			get_key_failed,
+			write_key_failed,
+			write_cert_failed,
+			convert_to_pem_failed,
+			load_key_bio_write,
+			load_key_bio_read,
+			create_mem_bio_failed,
+			no_key_provided
+		};
+		/**
+		 * \brief Error category for RSA errors
+		 */
+		inline std::error_category& rsa_error_category() {
+			class rsa_error_cat : public std::error_category {
+			public:
+				const char* name() const noexcept override { return "rsa_error"; };
+				std::string message(int ev) const override {
+					switch (static_cast<rsa_error>(ev)) {
+					case rsa_error::ok: return "no error";
+					case rsa_error::cert_load_failed: return "error loading cert into memory";
+					case rsa_error::get_key_failed: return "error getting key from certificate";
+					case rsa_error::write_key_failed: return "error writing key data in PEM format";
+					case rsa_error::write_cert_failed: return "error writing cert data in PEM format";
+					case rsa_error::convert_to_pem_failed: return "failed to convert key to pem";
+					case rsa_error::load_key_bio_write: return "failed to load key: bio write failed";
+					case rsa_error::load_key_bio_read: return "failed to load key: bio read failed";
+					case rsa_error::create_mem_bio_failed: return "failed to create memory bio";
+					case rsa_error::no_key_provided: return "at least one of public or private key need to be present";
+					default: return "unknown RSA error";
+					}
+				}
+			};
+			static rsa_error_cat cat;
+			return cat;
+		}
+
+		inline std::error_code make_error_code(rsa_error e) { return {static_cast<int>(e), rsa_error_category()}; }
+		/**
+		 * \brief Errors related to processing of RSA signatures
+		 */
+		enum class ecdsa_error {
+			ok = 0,
+			load_key_bio_write = 10,
+			load_key_bio_read,
+			create_mem_bio_failed,
+			no_key_provided,
+			invalid_key_size,
+			invalid_key
+		};
+		/**
+		 * \brief Error category for ECDSA errors
+		 */
+		inline std::error_category& ecdsa_error_category() {
+			class ecdsa_error_cat : public std::error_category {
+			public:
+				const char* name() const noexcept override { return "ecdsa_error"; };
+				std::string message(int ev) const override {
+					switch (static_cast<ecdsa_error>(ev)) {
+					case ecdsa_error::ok: return "no error";
+					case ecdsa_error::load_key_bio_write: return "failed to load key: bio write failed";
+					case ecdsa_error::load_key_bio_read: return "failed to load key: bio read failed";
+					case ecdsa_error::create_mem_bio_failed: return "failed to create memory bio";
+					case ecdsa_error::no_key_provided:
+						return "at least one of public or private key need to be present";
+					case ecdsa_error::invalid_key_size: return "invalid key size";
+					case ecdsa_error::invalid_key: return "invalid key";
+					default: return "unknown ECDSA error";
+					}
+				}
+			};
+			static ecdsa_error_cat cat;
+			return cat;
+		}
+
+		inline std::error_code make_error_code(ecdsa_error e) { return {static_cast<int>(e), ecdsa_error_category()}; }
+
+		/**
+		 * \brief Errors related to verification of signatures
+		 */
+		enum class signature_verification_error {
+			ok = 0,
+			invalid_signature = 10,
+			create_context_failed,
+			verifyinit_failed,
+			verifyupdate_failed,
+			verifyfinal_failed,
+			get_key_failed
+		};
+		/**
+		 * \brief Error category for verification errors
+		 */
+		inline std::error_category& signature_verification_error_category() {
+			class verification_error_cat : public std::error_category {
+			public:
+				const char* name() const noexcept override { return "signature_verification_error"; };
+				std::string message(int ev) const override {
+					switch (static_cast<signature_verification_error>(ev)) {
+					case signature_verification_error::ok: return "no error";
+					case signature_verification_error::invalid_signature: return "invalid signature";
+					case signature_verification_error::create_context_failed:
+						return "failed to verify signature: could not create context";
+					case signature_verification_error::verifyinit_failed:
+						return "failed to verify signature: VerifyInit failed";
+					case signature_verification_error::verifyupdate_failed:
+						return "failed to verify signature: VerifyUpdate failed";
+					case signature_verification_error::verifyfinal_failed:
+						return "failed to verify signature: VerifyFinal failed";
+					case signature_verification_error::get_key_failed:
+						return "failed to verify signature: Could not get key";
+					default: return "unknown signature verification error";
+					}
+				}
+			};
+			static verification_error_cat cat;
+			return cat;
+		}
+
+		inline std::error_code make_error_code(signature_verification_error e) {
+			return {static_cast<int>(e), signature_verification_error_category()};
+		}
+
+		/**
+		 * \brief Errors related to signature generation errors
+		 */
+		enum class signature_generation_error {
+			ok = 0,
+			hmac_failed = 10,
+			create_context_failed,
+			signinit_failed,
+			signupdate_failed,
+			signfinal_failed,
+			ecdsa_do_sign_failed,
+			digestinit_failed,
+			digestupdate_failed,
+			digestfinal_failed,
+			rsa_padding_failed,
+			rsa_private_encrypt_failed,
+			get_key_failed
+		};
+		/**
+		 * \brief Error category for signature generation errors
+		 */
+		inline std::error_category& signature_generation_error_category() {
+			class signature_generation_error_cat : public std::error_category {
+			public:
+				const char* name() const noexcept override { return "signature_generation_error"; };
+				std::string message(int ev) const override {
+					switch (static_cast<signature_generation_error>(ev)) {
+					case signature_generation_error::ok: return "no error";
+					case signature_generation_error::hmac_failed: return "hmac failed";
+					case signature_generation_error::create_context_failed:
+						return "failed to create signature: could not create context";
+					case signature_generation_error::signinit_failed:
+						return "failed to create signature: SignInit failed";
+					case signature_generation_error::signupdate_failed:
+						return "failed to create signature: SignUpdate failed";
+					case signature_generation_error::signfinal_failed:
+						return "failed to create signature: SignFinal failed";
+					case signature_generation_error::ecdsa_do_sign_failed: return "failed to generate ecdsa signature";
+					case signature_generation_error::digestinit_failed:
+						return "failed to create signature: DigestInit failed";
+					case signature_generation_error::digestupdate_failed:
+						return "failed to create signature: DigestUpdate failed";
+					case signature_generation_error::digestfinal_failed:
+						return "failed to create signature: DigestFinal failed";
+					case signature_generation_error::rsa_padding_failed:
+						return "failed to create signature: RSA_padding_add_PKCS1_PSS_mgf1 failed";
+					case signature_generation_error::rsa_private_encrypt_failed:
+						return "failed to create signature: RSA_private_encrypt failed";
+					case signature_generation_error::get_key_failed:
+						return "failed to generate signature: Could not get key";
+					default: return "unknown signature generation error";
+					}
+				}
+			};
+			static signature_generation_error_cat cat = {};
+			return cat;
+		}
+
+		inline std::error_code make_error_code(signature_generation_error e) {
+			return {static_cast<int>(e), signature_generation_error_category()};
+		}
+
+		/**
+		 * \brief Errors related to token verification errors
+		 */
+		enum class token_verification_error {
+			ok = 0,
+			wrong_algorithm = 10,
+			missing_claim,
+			claim_type_missmatch,
+			claim_value_missmatch,
+			token_expired,
+			audience_missmatch
+		};
+		/**
+		 * \brief Error category for token verification errors
+		 */
+		inline std::error_category& token_verification_error_category() {
+			class token_verification_error_cat : public std::error_category {
+			public:
+				const char* name() const noexcept override { return "token_verification_error"; };
+				std::string message(int ev) const override {
+					switch (static_cast<token_verification_error>(ev)) {
+					case token_verification_error::ok: return "no error";
+					case token_verification_error::wrong_algorithm: return "wrong algorithm";
+					case token_verification_error::missing_claim: return "decoded JWT is missing required claim(s)";
+					case token_verification_error::claim_type_missmatch:
+						return "claim type does not match expected type";
+					case token_verification_error::claim_value_missmatch:
+						return "claim value does not match expected value";
+					case token_verification_error::token_expired: return "token expired";
+					case token_verification_error::audience_missmatch:
+						return "token doesn't contain the required audience";
+					default: return "unknown token verification error";
+					}
+				}
+			};
+			static token_verification_error_cat cat = {};
+			return cat;
+		}
+
+		inline std::error_code make_error_code(token_verification_error e) {
+			return {static_cast<int>(e), token_verification_error_category()};
+		}
+
+		inline void throw_if_error(std::error_code ec) {
+			if (ec) {
+				if (ec.category() == rsa_error_category()) throw rsa_exception(ec);
+				if (ec.category() == ecdsa_error_category()) throw ecdsa_exception(ec);
+				if (ec.category() == signature_verification_error_category())
+					throw signature_verification_exception(ec);
+				if (ec.category() == signature_generation_error_category()) throw signature_generation_exception(ec);
+				if (ec.category() == token_verification_error_category()) throw token_verification_exception(ec);
+			}
+		}
+	} // namespace error
+
+	// FIXME: Remove
+	// Keep backward compat at least for a couple of revisions
+	using error::ecdsa_exception;
+	using error::rsa_exception;
+	using error::signature_generation_exception;
+	using error::signature_verification_exception;
+	using error::token_verification_exception;
+} // namespace jwt
+namespace std {
+	template<>
+	struct is_error_code_enum<jwt::error::rsa_error> : true_type {};
+	template<>
+	struct is_error_code_enum<jwt::error::ecdsa_error> : true_type {};
+	template<>
+	struct is_error_code_enum<jwt::error::signature_verification_error> : true_type {};
+	template<>
+	struct is_error_code_enum<jwt::error::signature_generation_error> : true_type {};
+	template<>
+	struct is_error_code_enum<jwt::error::token_verification_error> : true_type {};
+} // namespace std
+namespace jwt {
+	/**
+	 * \brief A collection for working with certificates
+	 *
+	 * These _helpers_ are usefully when working with certificates OpenSSL APIs.
+	 * For example, when dealing with JWKS (JSON Web Key Set)[https://tools.ietf.org/html/rfc7517]
+	 * you maybe need to extract the modulus and exponent of an RSA Public Key.
+	 */
+	namespace helper {
+		/**
+		 * \brief Extract the public key of a pem certificate
+		 *
+		 * \param certstr	String containing the certificate encoded as pem
+		 * \param pw		Password used to decrypt certificate (leave empty if not encrypted)
+		 * \param ec		error_code for error_detection (gets cleared if no error occures)
+		 */
+		inline std::string extract_pubkey_from_cert(const std::string& certstr, const std::string& pw,
+													std::error_code& ec) {
+			ec.clear();
+#if OPENSSL_VERSION_NUMBER <= 0x10100003L
+			std::unique_ptr<BIO, decltype(&BIO_free_all)> certbio(
+				BIO_new_mem_buf(const_cast<char*>(certstr.data()), static_cast<int>(certstr.size())), BIO_free_all);
+#else
+			std::unique_ptr<BIO, decltype(&BIO_free_all)> certbio(
+				BIO_new_mem_buf(certstr.data(), static_cast<int>(certstr.size())), BIO_free_all);
+#endif
+			std::unique_ptr<BIO, decltype(&BIO_free_all)> keybio(BIO_new(BIO_s_mem()), BIO_free_all);
+			if (!certbio || !keybio) {
+				ec = error::rsa_error::create_mem_bio_failed;
+				return {};
+			}
+
+			std::unique_ptr<X509, decltype(&X509_free)> cert(
+				PEM_read_bio_X509(certbio.get(), nullptr, nullptr, const_cast<char*>(pw.c_str())), X509_free);
+			if (!cert) {
+				ec = error::rsa_error::cert_load_failed;
+				return {};
+			}
+			std::unique_ptr<EVP_PKEY, decltype(&EVP_PKEY_free)> key(X509_get_pubkey(cert.get()), EVP_PKEY_free);
+			if (!key) {
+				ec = error::rsa_error::get_key_failed;
+				return {};
+			}
+			if (PEM_write_bio_PUBKEY(keybio.get(), key.get()) == 0) {
+				ec = error::rsa_error::write_key_failed;
+				return {};
+			}
+			char* ptr = nullptr;
+			auto len = BIO_get_mem_data(keybio.get(), &ptr);
+			if (len <= 0 || ptr == nullptr) {
+				ec = error::rsa_error::convert_to_pem_failed;
+				return {};
+			}
+			return {ptr, static_cast<size_t>(len)};
+		}
+
+		/**
+		 * \brief Extract the public key of a pem certificate
+		 *
+		 * \param certstr	String containing the certificate encoded as pem
+		 * \param pw		Password used to decrypt certificate (leave empty if not encrypted)
+		 * \throw			rsa_exception if an error occurred
+		 */
+		inline std::string extract_pubkey_from_cert(const std::string& certstr, const std::string& pw = "") {
+			std::error_code ec;
+			auto res = extract_pubkey_from_cert(certstr, pw, ec);
+			error::throw_if_error(ec);
+			return res;
+		}
+
+		/**
+		 * \brief Convert the certificate provided as base64 DER to PEM.
+		 *
+		 * This is useful when using with JWKs as x5c claim is encoded as base64 DER. More info
+		 * (here)[https://tools.ietf.org/html/rfc7517#section-4.7]
+		 *
+		 * \tparam Decode is callabled, taking a string_type and returns a string_type.
+		 * It should ensure the padding of the input and then base64 decode and return
+		 * the results.
+		 *
+		 * \param cert_base64_der_str 	String containing the certificate encoded as base64 DER
+		 * \param decode 				The function to decode the cert
+		 * \param ec					error_code for error_detection (gets cleared if no error occures)
+		 */
+		template<typename Decode>
+		std::string convert_base64_der_to_pem(const std::string& cert_base64_der_str, Decode decode,
+											  std::error_code& ec) {
+			ec.clear();
+			const auto decodedStr = decode(cert_base64_der_str);
+			auto c_str = reinterpret_cast<const unsigned char*>(decodedStr.c_str());
+
+			std::unique_ptr<X509, decltype(&X509_free)> cert(d2i_X509(NULL, &c_str, decodedStr.size()), X509_free);
+			std::unique_ptr<BIO, decltype(&BIO_free_all)> certbio(BIO_new(BIO_s_mem()), BIO_free_all);
+			if (!cert || !certbio) {
+				ec = error::rsa_error::create_mem_bio_failed;
+				return {};
+			}
+
+			if (!PEM_write_bio_X509(certbio.get(), cert.get())) {
+				ec = error::rsa_error::write_cert_failed;
+				return {};
+			}
+
+			char* ptr = nullptr;
+			const auto len = BIO_get_mem_data(certbio.get(), &ptr);
+			if (len <= 0 || ptr == nullptr) {
+				ec = error::rsa_error::convert_to_pem_failed;
+				return {};
+			}
+
+			return {ptr, static_cast<size_t>(len)};
+		}
+
+		/**
+		 * \brief Convert the certificate provided as base64 DER to PEM.
+		 *
+		 * This is useful when using with JWKs as x5c claim is encoded as base64 DER. More info
+		 * (here)[https://tools.ietf.org/html/rfc7517#section-4.7]
+		 *
+		 * \tparam Decode is callabled, taking a string_type and returns a string_type.
+		 * It should ensure the padding of the input and then base64 decode and return
+		 * the results.
+		 *
+		 * \param cert_base64_der_str 	String containing the certificate encoded as base64 DER
+		 * \param decode 				The function to decode the cert
+		 * \throw						rsa_exception if an error occurred
+		 */
+		template<typename Decode>
+		std::string convert_base64_der_to_pem(const std::string& cert_base64_der_str, Decode decode) {
+			std::error_code ec;
+			auto res = convert_base64_der_to_pem(cert_base64_der_str, std::move(decode), ec);
+			error::throw_if_error(ec);
+			return res;
+		}
+#ifndef JWT_DISABLE_BASE64
+		/**
+		 * \brief Convert the certificate provided as base64 DER to PEM.
+		 *
+		 * This is useful when using with JWKs as x5c claim is encoded as base64 DER. More info
+		 * (here)[https://tools.ietf.org/html/rfc7517#section-4.7]
+		 *
+		 * \param cert_base64_der_str 	String containing the certificate encoded as base64 DER
+		 * \param ec					error_code for error_detection (gets cleared if no error occures)
+		 */
+		inline std::string convert_base64_der_to_pem(const std::string& cert_base64_der_str, std::error_code& ec) {
+			auto decode = [](const std::string& token) {
+				return base::decode<alphabet::base64>(base::pad<alphabet::base64>(token));
+			};
+			return convert_base64_der_to_pem(cert_base64_der_str, std::move(decode), ec);
+		}
+
+		/**
+		 * \brief Convert the certificate provided as base64 DER to PEM.
+		 *
+		 * This is useful when using with JWKs as x5c claim is encoded as base64 DER. More info
+		 * (here)[https://tools.ietf.org/html/rfc7517#section-4.7]
+		 *
+		 * \param cert_base64_der_str 	String containing the certificate encoded as base64 DER
+		 * \throw						rsa_exception if an error occurred
+		 */
+		inline std::string convert_base64_der_to_pem(const std::string& cert_base64_der_str) {
+			std::error_code ec;
+			auto res = convert_base64_der_to_pem(cert_base64_der_str, ec);
+			error::throw_if_error(ec);
+			return res;
+		}
+#endif
+		/**
+		 * \brief Load a public key from a string.
+		 *
+		 * The string should contain a pem encoded certificate or public key
+		 *
+		 * \param certstr	String containing the certificate encoded as pem
+		 * \param pw		Password used to decrypt certificate (leave empty if not encrypted)
+		 * \param ec		error_code for error_detection (gets cleared if no error occures)
+		 */
+		inline std::shared_ptr<EVP_PKEY> load_public_key_from_string(const std::string& key,
+																	 const std::string& password, std::error_code& ec) {
+			ec.clear();
+			std::unique_ptr<BIO, decltype(&BIO_free_all)> pubkey_bio(BIO_new(BIO_s_mem()), BIO_free_all);
+			if (!pubkey_bio) {
+				ec = error::rsa_error::create_mem_bio_failed;
+				return nullptr;
+			}
+			if (key.substr(0, 27) == "-----BEGIN CERTIFICATE-----") {
+				auto epkey = helper::extract_pubkey_from_cert(key, password, ec);
+				if (ec) return nullptr;
+				const int len = static_cast<int>(epkey.size());
+				if (BIO_write(pubkey_bio.get(), epkey.data(), len) != len) {
+					ec = error::rsa_error::load_key_bio_write;
+					return nullptr;
+				}
+			} else {
+				const int len = static_cast<int>(key.size());
+				if (BIO_write(pubkey_bio.get(), key.data(), len) != len) {
+					ec = error::rsa_error::load_key_bio_write;
+					return nullptr;
+				}
+			}
+
+			std::shared_ptr<EVP_PKEY> pkey(
+				PEM_read_bio_PUBKEY(pubkey_bio.get(), nullptr, nullptr,
+									(void*)password.data()), // NOLINT(google-readability-casting) requires `const_cast`
+				EVP_PKEY_free);
+			if (!pkey) {
+				ec = error::rsa_error::load_key_bio_read;
+				return nullptr;
+			}
+			return pkey;
+		}
+
+		/**
+		 * \brief Load a public key from a string.
+		 *
+		 * The string should contain a pem encoded certificate or public key
+		 *
+		 * \param certstr	String containing the certificate or key encoded as pem
+		 * \param pw		Password used to decrypt certificate or key (leave empty if not encrypted)
+		 * \throw			rsa_exception if an error occurred
+		 */
+		inline std::shared_ptr<EVP_PKEY> load_public_key_from_string(const std::string& key,
+																	 const std::string& password = "") {
+			std::error_code ec;
+			auto res = load_public_key_from_string(key, password, ec);
+			error::throw_if_error(ec);
+			return res;
+		}
+
+		/**
+		 * \brief Load a private key from a string.
+		 *
+		 * \param key		String containing a private key as pem
+		 * \param pw		Password used to decrypt key (leave empty if not encrypted)
+		 * \param ec		error_code for error_detection (gets cleared if no error occures)
+		 */
+		inline std::shared_ptr<EVP_PKEY>
+		load_private_key_from_string(const std::string& key, const std::string& password, std::error_code& ec) {
+			std::unique_ptr<BIO, decltype(&BIO_free_all)> privkey_bio(BIO_new(BIO_s_mem()), BIO_free_all);
+			if (!privkey_bio) {
+				ec = error::rsa_error::create_mem_bio_failed;
+				return nullptr;
+			}
+			const int len = static_cast<int>(key.size());
+			if (BIO_write(privkey_bio.get(), key.data(), len) != len) {
+				ec = error::rsa_error::load_key_bio_write;
+				return nullptr;
+			}
+			std::shared_ptr<EVP_PKEY> pkey(
+				PEM_read_bio_PrivateKey(privkey_bio.get(), nullptr, nullptr, const_cast<char*>(password.c_str())),
+				EVP_PKEY_free);
+			if (!pkey) {
+				ec = error::rsa_error::load_key_bio_read;
+				return nullptr;
+			}
+			return pkey;
+		}
+
+		/**
+		 * \brief Load a private key from a string.
+		 *
+		 * \param key		String containing a private key as pem
+		 * \param pw		Password used to decrypt key (leave empty if not encrypted)
+		 * \throw			rsa_exception if an error occurred
+		 */
+		inline std::shared_ptr<EVP_PKEY> load_private_key_from_string(const std::string& key,
+																	  const std::string& password = "") {
+			std::error_code ec;
+			auto res = load_private_key_from_string(key, password, ec);
+			error::throw_if_error(ec);
+			return res;
+		}
+
+		/**
+		 * Convert a OpenSSL BIGNUM to a std::string
+		 * \param bn BIGNUM to convert
+		 * \return bignum as string
+		 */
+		inline
+#ifdef OPENSSL10
+			static std::string
+			bn2raw(BIGNUM* bn)
+#else
+			static std::string
+			bn2raw(const BIGNUM* bn)
+#endif
+		{
+			std::string res(BN_num_bytes(bn), '\0');
+			BN_bn2bin(bn, (unsigned char*)res.data()); // NOLINT(google-readability-casting) requires `const_cast`
+			return res;
+		}
+		/**
+		 * Convert an std::string to a OpenSSL BIGNUM
+		 * \param raw String to convert
+		 * \return BIGNUM representation
+		 */
+		inline static std::unique_ptr<BIGNUM, decltype(&BN_free)> raw2bn(const std::string& raw) {
+			return std::unique_ptr<BIGNUM, decltype(&BN_free)>(
+				BN_bin2bn(reinterpret_cast<const unsigned char*>(raw.data()), static_cast<int>(raw.size()), nullptr),
+				BN_free);
+		}
+	} // namespace helper
+
+	/**
+	 * \brief Various cryptographic algorithms when working with JWT
+	 *
+	 * JWT (JSON Web Tokens) signatures are typically used as the payload for a JWS (JSON Web Signature) or
+	 * JWE (JSON Web Encryption). Both of these use various cryptographic as specified by
+	 * [RFC7518](https://tools.ietf.org/html/rfc7518) and are exposed through the a [JOSE
+	 * Header](https://tools.ietf.org/html/rfc7515#section-4) which points to one of the JWA (JSON Web
+	 * Algorithms)(https://tools.ietf.org/html/rfc7518#section-3.1)
+	 */
+	namespace algorithm {
+		/**
+		 * \brief "none" algorithm.
+		 *
+		 * Returns and empty signature and checks if the given signature is empty.
+		 */
+		struct none {
+			/**
+			 * \brief Return an empty string
+			 */
+			std::string sign(const std::string& /*unused*/, std::error_code& ec) const {
+				ec.clear();
+				return {};
+			}
+			/**
+			 * \brief Check if the given signature is empty.
+			 *
+			 * JWT's with "none" algorithm should not contain a signature.
+			 * \param signature Signature data to verify
+			 * \param ec		error_code filled with details about the error
+			 */
+			void verify(const std::string& /*unused*/, const std::string& signature, std::error_code& ec) const {
+				ec.clear();
+				if (!signature.empty()) { ec = error::signature_verification_error::invalid_signature; }
+			}
+			/// Get algorithm name
+			std::string name() const { return "none"; }
+		};
+		/**
+		 * \brief Base class for HMAC family of algorithms
+		 */
+		struct hmacsha {
+			/**
+			 * Construct new hmac algorithm
+			 * \param key Key to use for HMAC
+			 * \param md Pointer to hash function
+			 * \param name Name of the algorithm
+			 */
+			hmacsha(std::string key, const EVP_MD* (*md)(), std::string name)
+				: secret(std::move(key)), md(md), alg_name(std::move(name)) {}
+			/**
+			 * Sign jwt data
+			 * \param data The data to sign
+			 * \param ec error_code filled with details on error
+			 * \return HMAC signature for the given data
+			 */
+			std::string sign(const std::string& data, std::error_code& ec) const {
+				ec.clear();
+				std::string res(static_cast<size_t>(EVP_MAX_MD_SIZE), '\0');
+				auto len = static_cast<unsigned int>(res.size());
+				if (HMAC(md(), secret.data(), static_cast<int>(secret.size()),
+						 reinterpret_cast<const unsigned char*>(data.data()), static_cast<int>(data.size()),
+						 (unsigned char*)res.data(), // NOLINT(google-readability-casting) requires `const_cast`
+						 &len) == nullptr) {
+					ec = error::signature_generation_error::hmac_failed;
+					return {};
+				}
+				res.resize(len);
+				return res;
+			}
+			/**
+			 * Check if signature is valid
+			 * \param data The data to check signature against
+			 * \param signature Signature provided by the jwt
+			 * \param ec Filled with details about failure.
+			 */
+			void verify(const std::string& data, const std::string& signature, std::error_code& ec) const {
+				ec.clear();
+				auto res = sign(data, ec);
+				if (ec) return;
+
+				bool matched = true;
+				for (size_t i = 0; i < std::min<size_t>(res.size(), signature.size()); i++)
+					if (res[i] != signature[i]) matched = false;
+				if (res.size() != signature.size()) matched = false;
+				if (!matched) {
+					ec = error::signature_verification_error::invalid_signature;
+					return;
+				}
+			}
+			/**
+			 * Returns the algorithm name provided to the constructor
+			 * \return algorithm's name
+			 */
+			std::string name() const { return alg_name; }
+
+		private:
+			/// HMAC secrect
+			const std::string secret;
+			/// HMAC hash generator
+			const EVP_MD* (*md)();
+			/// algorithm's name
+			const std::string alg_name;
+		};
+		/**
+		 * \brief Base class for RSA family of algorithms
+		 */
+		struct rsa {
+			/**
+			 * Construct new rsa algorithm
+			 * \param public_key RSA public key in PEM format
+			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password to decrypt private key pem.
+			 * \param md Pointer to hash function
+			 * \param name Name of the algorithm
+			 */
+			rsa(const std::string& public_key, const std::string& private_key, const std::string& public_key_password,
+				const std::string& private_key_password, const EVP_MD* (*md)(), std::string name)
+				: md(md), alg_name(std::move(name)) {
+				if (!private_key.empty()) {
+					pkey = helper::load_private_key_from_string(private_key, private_key_password);
+				} else if (!public_key.empty()) {
+					pkey = helper::load_public_key_from_string(public_key, public_key_password);
+				} else
+					throw rsa_exception(error::rsa_error::no_key_provided);
+			}
+			/**
+			 * Sign jwt data
+			 * \param data The data to sign
+			 * \param ec error_code filled with details on error
+			 * \return RSA signature for the given data
+			 */
+			std::string sign(const std::string& data, std::error_code& ec) const {
+				ec.clear();
+#ifdef OPENSSL10
+				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_destroy)> ctx(EVP_MD_CTX_create(), EVP_MD_CTX_destroy);
+#else
+				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> ctx(EVP_MD_CTX_create(), EVP_MD_CTX_free);
+#endif
+				if (!ctx) {
+					ec = error::signature_generation_error::create_context_failed;
+					return {};
+				}
+				if (!EVP_SignInit(ctx.get(), md())) {
+					ec = error::signature_generation_error::signinit_failed;
+					return {};
+				}
+
+				std::string res(EVP_PKEY_size(pkey.get()), '\0');
+				unsigned int len = 0;
+
+				if (!EVP_SignUpdate(ctx.get(), data.data(), data.size())) {
+					ec = error::signature_generation_error::signupdate_failed;
+					return {};
+				}
+				if (EVP_SignFinal(ctx.get(), (unsigned char*)res.data(), &len, pkey.get()) == 0) {
+					ec = error::signature_generation_error::signfinal_failed;
+					return {};
+				}
+
+				res.resize(len);
+				return res;
+			}
+			/**
+			 * Check if signature is valid
+			 * \param data The data to check signature against
+			 * \param signature Signature provided by the jwt
+			 * \param ec Filled with details on failure
+			 */
+			void verify(const std::string& data, const std::string& signature, std::error_code& ec) const {
+				ec.clear();
+#ifdef OPENSSL10
+				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_destroy)> ctx(EVP_MD_CTX_create(), EVP_MD_CTX_destroy);
+#else
+				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> ctx(EVP_MD_CTX_create(), EVP_MD_CTX_free);
+#endif
+				if (!ctx) {
+					ec = error::signature_verification_error::create_context_failed;
+					return;
+				}
+				if (!EVP_VerifyInit(ctx.get(), md())) {
+					ec = error::signature_verification_error::verifyinit_failed;
+					return;
+				}
+				if (!EVP_VerifyUpdate(ctx.get(), data.data(), data.size())) {
+					ec = error::signature_verification_error::verifyupdate_failed;
+					return;
+				}
+				auto res = EVP_VerifyFinal(ctx.get(), reinterpret_cast<const unsigned char*>(signature.data()),
+										   static_cast<unsigned int>(signature.size()), pkey.get());
+				if (res != 1) {
+					ec = error::signature_verification_error::verifyfinal_failed;
+					return;
+				}
+			}
+			/**
+			 * Returns the algorithm name provided to the constructor
+			 * \return algorithm's name
+			 */
+			std::string name() const { return alg_name; }
+
+		private:
+			/// OpenSSL structure containing converted keys
+			std::shared_ptr<EVP_PKEY> pkey;
+			/// Hash generator
+			const EVP_MD* (*md)();
+			/// algorithm's name
+			const std::string alg_name;
+		};
+		/**
+		 * \brief Base class for ECDSA family of algorithms
+		 */
+		struct ecdsa {
+			/**
+			 * Construct new ecdsa algorithm
+			 * \param public_key ECDSA public key in PEM format
+			 * \param private_key ECDSA private key or empty string if not available. If empty, signing will always
+			 * fail. \param public_key_password Password to decrypt public key pem. \param private_key_password Password
+			 * to decrypt private key pem. \param md Pointer to hash function \param name Name of the algorithm
+			 */
+			ecdsa(const std::string& public_key, const std::string& private_key, const std::string& public_key_password,
+				  const std::string& private_key_password, const EVP_MD* (*md)(), std::string name, size_t siglen)
+				: md(md), alg_name(std::move(name)), signature_length(siglen) {
+				if (!public_key.empty()) {
+					std::unique_ptr<BIO, decltype(&BIO_free_all)> pubkey_bio(BIO_new(BIO_s_mem()), BIO_free_all);
+					if (!pubkey_bio) throw ecdsa_exception(error::ecdsa_error::create_mem_bio_failed);
+					if (public_key.substr(0, 27) == "-----BEGIN CERTIFICATE-----") {
+						auto epkey = helper::extract_pubkey_from_cert(public_key, public_key_password);
+						const int len = static_cast<int>(epkey.size());
+						if (BIO_write(pubkey_bio.get(), epkey.data(), len) != len)
+							throw ecdsa_exception(error::ecdsa_error::load_key_bio_write);
+					} else {
+						const int len = static_cast<int>(public_key.size());
+						if (BIO_write(pubkey_bio.get(), public_key.data(), len) != len)
+							throw ecdsa_exception(error::ecdsa_error::load_key_bio_write);
+					}
+
+					pkey.reset(PEM_read_bio_EC_PUBKEY(
+								   pubkey_bio.get(), nullptr, nullptr,
+								   (void*)public_key_password
+									   .c_str()), // NOLINT(google-readability-casting) requires `const_cast`
+							   EC_KEY_free);
+					if (!pkey) throw ecdsa_exception(error::ecdsa_error::load_key_bio_read);
+					size_t keysize = EC_GROUP_get_degree(EC_KEY_get0_group(pkey.get()));
+					if (keysize != signature_length * 4 && (signature_length != 132 || keysize != 521))
+						throw ecdsa_exception(error::ecdsa_error::invalid_key_size);
+				}
+
+				if (!private_key.empty()) {
+					std::unique_ptr<BIO, decltype(&BIO_free_all)> privkey_bio(BIO_new(BIO_s_mem()), BIO_free_all);
+					if (!privkey_bio) throw ecdsa_exception(error::ecdsa_error::create_mem_bio_failed);
+					const int len = static_cast<int>(private_key.size());
+					if (BIO_write(privkey_bio.get(), private_key.data(), len) != len)
+						throw ecdsa_exception(error::ecdsa_error::load_key_bio_write);
+					pkey.reset(PEM_read_bio_ECPrivateKey(privkey_bio.get(), nullptr, nullptr,
+														 const_cast<char*>(private_key_password.c_str())),
+							   EC_KEY_free);
+					if (!pkey) throw ecdsa_exception(error::ecdsa_error::load_key_bio_read);
+					size_t keysize = EC_GROUP_get_degree(EC_KEY_get0_group(pkey.get()));
+					if (keysize != signature_length * 4 && (signature_length != 132 || keysize != 521))
+						throw ecdsa_exception(error::ecdsa_error::invalid_key_size);
+				}
+				if (!pkey) throw ecdsa_exception(error::ecdsa_error::no_key_provided);
+
+				if (EC_KEY_check_key(pkey.get()) == 0) throw ecdsa_exception(error::ecdsa_error::invalid_key);
+			}
+			/**
+			 * Sign jwt data
+			 * \param data The data to sign
+			 * \param ec error_code filled with details on error
+			 * \return ECDSA signature for the given data
+			 */
+			std::string sign(const std::string& data, std::error_code& ec) const {
+				ec.clear();
+				const std::string hash = generate_hash(data, ec);
+				if (ec) return {};
+
+				std::unique_ptr<ECDSA_SIG, decltype(&ECDSA_SIG_free)> sig(
+					ECDSA_do_sign(reinterpret_cast<const unsigned char*>(hash.data()), static_cast<int>(hash.size()),
+								  pkey.get()),
+					ECDSA_SIG_free);
+				if (!sig) {
+					ec = error::signature_generation_error::ecdsa_do_sign_failed;
+					return {};
+				}
+#ifdef OPENSSL10
+
+				auto rr = helper::bn2raw(sig->r);
+				auto rs = helper::bn2raw(sig->s);
+#else
+				const BIGNUM* r;
+				const BIGNUM* s;
+				ECDSA_SIG_get0(sig.get(), &r, &s);
+				auto rr = helper::bn2raw(r);
+				auto rs = helper::bn2raw(s);
+#endif
+				if (rr.size() > signature_length / 2 || rs.size() > signature_length / 2)
+					throw std::logic_error("bignum size exceeded expected length");
+				rr.insert(0, signature_length / 2 - rr.size(), '\0');
+				rs.insert(0, signature_length / 2 - rs.size(), '\0');
+				return rr + rs;
+			}
+
+			/**
+			 * Check if signature is valid
+			 * \param data The data to check signature against
+			 * \param signature Signature provided by the jwt
+			 * \param ec Filled with details on error
+			 */
+			void verify(const std::string& data, const std::string& signature, std::error_code& ec) const {
+				ec.clear();
+				const std::string hash = generate_hash(data, ec);
+				if (ec) return;
+				auto r = helper::raw2bn(signature.substr(0, signature.size() / 2));
+				auto s = helper::raw2bn(signature.substr(signature.size() / 2));
+
+#ifdef OPENSSL10
+				ECDSA_SIG sig;
+				sig.r = r.get();
+				sig.s = s.get();
+
+				if (ECDSA_do_verify((const unsigned char*)hash.data(), static_cast<int>(hash.size()), &sig,
+									pkey.get()) != 1) {
+					ec = error::signature_verification_error::invalid_signature;
+					return;
+				}
+#else
+				std::unique_ptr<ECDSA_SIG, decltype(&ECDSA_SIG_free)> sig(ECDSA_SIG_new(), ECDSA_SIG_free);
+				if (!sig) {
+					ec = error::signature_verification_error::create_context_failed;
+					return;
+				}
+
+				ECDSA_SIG_set0(sig.get(), r.release(), s.release());
+
+				if (ECDSA_do_verify(reinterpret_cast<const unsigned char*>(hash.data()), static_cast<int>(hash.size()),
+									sig.get(), pkey.get()) != 1) {
+					ec = error::signature_verification_error::invalid_signature;
+					return;
+				}
+#endif
+			}
+			/**
+			 * Returns the algorithm name provided to the constructor
+			 * \return algorithm's name
+			 */
+			std::string name() const { return alg_name; }
+
+		private:
+			/**
+			 * Hash the provided data using the hash function specified in constructor
+			 * \param data Data to hash
+			 * \return Hash of data
+			 */
+			std::string generate_hash(const std::string& data, std::error_code& ec) const {
+#ifdef OPENSSL10
+				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_destroy)> ctx(EVP_MD_CTX_create(),
+																			   &EVP_MD_CTX_destroy);
+#else
+				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> ctx(EVP_MD_CTX_new(), EVP_MD_CTX_free);
+#endif
+				if (!ctx) {
+					ec = error::signature_generation_error::create_context_failed;
+					return {};
+				}
+				if (EVP_DigestInit(ctx.get(), md()) == 0) {
+					ec = error::signature_generation_error::digestinit_failed;
+					return {};
+				}
+				if (EVP_DigestUpdate(ctx.get(), data.data(), data.size()) == 0) {
+					ec = error::signature_generation_error::digestupdate_failed;
+					return {};
+				}
+				unsigned int len = 0;
+				std::string res(EVP_MD_CTX_size(ctx.get()), '\0');
+				if (EVP_DigestFinal(
+						ctx.get(),
+						(unsigned char*)res.data(), // NOLINT(google-readability-casting) requires `const_cast`
+						&len) == 0) {
+					ec = error::signature_generation_error::digestfinal_failed;
+					return {};
+				}
+				res.resize(len);
+				return res;
+			}
+
+			/// OpenSSL struct containing keys
+			std::shared_ptr<EC_KEY> pkey;
+			/// Hash generator function
+			const EVP_MD* (*md)();
+			/// algorithm's name
+			const std::string alg_name;
+			/// Length of the resulting signature
+			const size_t signature_length;
+		};
+
+#ifndef OPENSSL110
+		/**
+		 * \brief Base class for EdDSA family of algorithms
+		 *
+		 * https://tools.ietf.org/html/rfc8032
+		 *
+		 * The EdDSA algorithms were introduced in [OpenSSL v1.1.1](https://www.openssl.org/news/openssl-1.1.1-notes.html),
+		 * so these algorithms are only available when building against this version or higher.
+		 */
+		struct eddsa {
+			/**
+			 * Construct new eddsa algorithm
+			 * \param public_key EdDSA public key in PEM format
+			 * \param private_key EdDSA private key or empty string if not available. If empty, signing will always
+			 * fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password
+			 * to decrypt private key pem.
+			 * \param name Name of the algorithm
+			 */
+			eddsa(const std::string& public_key, const std::string& private_key, const std::string& public_key_password,
+				  const std::string& private_key_password, std::string name)
+				: alg_name(std::move(name)) {
+				if (!private_key.empty()) {
+					pkey = helper::load_private_key_from_string(private_key, private_key_password);
+				} else if (!public_key.empty()) {
+					pkey = helper::load_public_key_from_string(public_key, public_key_password);
+				} else
+					throw ecdsa_exception(error::ecdsa_error::load_key_bio_read);
+			}
+			/**
+			 * Sign jwt data
+			 * \param data The data to sign
+			 * \param ec error_code filled with details on error
+			 * \return EdDSA signature for the given data
+			 */
+			std::string sign(const std::string& data, std::error_code& ec) const {
+				ec.clear();
+				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> ctx(EVP_MD_CTX_create(), EVP_MD_CTX_free);
+				if (!ctx) {
+					ec = error::signature_generation_error::create_context_failed;
+					return {};
+				}
+				if (!EVP_DigestSignInit(ctx.get(), nullptr, nullptr, nullptr, pkey.get())) {
+					ec = error::signature_generation_error::signinit_failed;
+					return {};
+				}
+
+				size_t len = EVP_PKEY_size(pkey.get());
+				std::string res(len, '\0');
+
+// LibreSSL is the special kid in the block, as it does not support EVP_DigestSign.
+// OpenSSL on the otherhand does not support using EVP_DigestSignUpdate for eddsa, which is why we end up with this
+// mess.
+#ifdef LIBRESSL_VERSION_NUMBER
+				ERR_clear_error();
+				if (EVP_DigestSignUpdate(ctx.get(), reinterpret_cast<const unsigned char*>(data.data()), data.size()) !=
+					1) {
+					std::cout << ERR_error_string(ERR_get_error(), NULL) << std::endl;
+					ec = error::signature_generation_error::signupdate_failed;
+					return {};
+				}
+				if (EVP_DigestSignFinal(ctx.get(), reinterpret_cast<unsigned char*>(&res[0]), &len) != 1) {
+					ec = error::signature_generation_error::signfinal_failed;
+					return {};
+				}
+#else
+				if (EVP_DigestSign(ctx.get(), reinterpret_cast<unsigned char*>(&res[0]), &len,
+								   reinterpret_cast<const unsigned char*>(data.data()), data.size()) != 1) {
+					ec = error::signature_generation_error::signfinal_failed;
+					return {};
+				}
+#endif
+
+				res.resize(len);
+				return res;
+			}
+
+			/**
+			 * Check if signature is valid
+			 * \param data The data to check signature against
+			 * \param signature Signature provided by the jwt
+			 * \param ec Filled with details on error
+			 */
+			void verify(const std::string& data, const std::string& signature, std::error_code& ec) const {
+				ec.clear();
+				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> ctx(EVP_MD_CTX_create(), EVP_MD_CTX_free);
+				if (!ctx) {
+					ec = error::signature_verification_error::create_context_failed;
+					return;
+				}
+				if (!EVP_DigestVerifyInit(ctx.get(), nullptr, nullptr, nullptr, pkey.get())) {
+					ec = error::signature_verification_error::verifyinit_failed;
+					return;
+				}
+// LibreSSL is the special kid in the block, as it does not support EVP_DigestVerify.
+// OpenSSL on the otherhand does not support using EVP_DigestVerifyUpdate for eddsa, which is why we end up with this
+// mess.
+#ifdef LIBRESSL_VERSION_NUMBER
+				if (EVP_DigestVerifyUpdate(ctx.get(), reinterpret_cast<const unsigned char*>(data.data()),
+										   data.size()) != 1) {
+					ec = error::signature_verification_error::verifyupdate_failed;
+					return;
+				}
+				if (EVP_DigestVerifyFinal(ctx.get(), reinterpret_cast<const unsigned char*>(signature.data()),
+										  signature.size()) != 1) {
+					ec = error::signature_verification_error::verifyfinal_failed;
+					return;
+				}
+#else
+				auto res = EVP_DigestVerify(ctx.get(), reinterpret_cast<const unsigned char*>(signature.data()),
+											signature.size(), reinterpret_cast<const unsigned char*>(data.data()),
+											data.size());
+				if (res != 1) {
+					ec = error::signature_verification_error::verifyfinal_failed;
+					return;
+				}
+#endif
+			}
+			/**
+			 * Returns the algorithm name provided to the constructor
+			 * \return algorithm's name
+			 */
+			std::string name() const { return alg_name; }
+
+		private:
+			/// OpenSSL struct containing keys
+			std::shared_ptr<EVP_PKEY> pkey;
+			/// algorithm's name
+			const std::string alg_name;
+		};
+#endif
+		/**
+		 * \brief Base class for PSS-RSA family of algorithms
+		 */
+		struct pss {
+			/**
+			 * Construct new pss algorithm
+			 * \param public_key RSA public key in PEM format
+			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password to decrypt private key pem.
+			 * \param md Pointer to hash function
+			 * \param name Name of the algorithm
+			 */
+			pss(const std::string& public_key, const std::string& private_key, const std::string& public_key_password,
+				const std::string& private_key_password, const EVP_MD* (*md)(), std::string name)
+				: md(md), alg_name(std::move(name)) {
+				if (!private_key.empty()) {
+					pkey = helper::load_private_key_from_string(private_key, private_key_password);
+				} else if (!public_key.empty()) {
+					pkey = helper::load_public_key_from_string(public_key, public_key_password);
+				} else
+					throw rsa_exception(error::rsa_error::no_key_provided);
+			}
+
+			/**
+			 * Sign jwt data
+			 * \param data The data to sign
+			 * \param ec error_code filled with details on error
+			 * \return ECDSA signature for the given data
+			 */
+			std::string sign(const std::string& data, std::error_code& ec) const {
+				ec.clear();
+				auto hash = this->generate_hash(data, ec);
+				if (ec) return {};
+
+				std::unique_ptr<RSA, decltype(&RSA_free)> key(EVP_PKEY_get1_RSA(pkey.get()), RSA_free);
+				if (!key) {
+					ec = error::signature_generation_error::get_key_failed;
+					return {};
+				}
+				const int size = RSA_size(key.get());
+
+				std::string padded(size, 0x00);
+				if (RSA_padding_add_PKCS1_PSS_mgf1(
+						key.get(), (unsigned char*)padded.data(), reinterpret_cast<const unsigned char*>(hash.data()),
+						md(), md(), -1) == 0) { // NOLINT(google-readability-casting) requires `const_cast`
+					ec = error::signature_generation_error::rsa_padding_failed;
+					return {};
+				}
+
+				std::string res(size, 0x00);
+				if (RSA_private_encrypt(size, reinterpret_cast<const unsigned char*>(padded.data()),
+										(unsigned char*)res.data(), key.get(), RSA_NO_PADDING) <
+					0) { // NOLINT(google-readability-casting) requires `const_cast`
+					ec = error::signature_generation_error::rsa_private_encrypt_failed;
+					return {};
+				}
+				return res;
+			}
+
+			/**
+			 * Check if signature is valid
+			 * \param data The data to check signature against
+			 * \param signature Signature provided by the jwt
+			 * \param ec Filled with error details
+			 */
+			void verify(const std::string& data, const std::string& signature, std::error_code& ec) const {
+				ec.clear();
+				auto hash = this->generate_hash(data, ec);
+				if (ec) return;
+
+				std::unique_ptr<RSA, decltype(&RSA_free)> key(EVP_PKEY_get1_RSA(pkey.get()), RSA_free);
+				if (!key) {
+					ec = error::signature_verification_error::get_key_failed;
+					return;
+				}
+				const int size = RSA_size(key.get());
+
+				std::string sig(size, 0x00);
+				if (RSA_public_decrypt(
+						static_cast<int>(signature.size()), reinterpret_cast<const unsigned char*>(signature.data()),
+						(unsigned char*)sig.data(), // NOLINT(google-readability-casting) requires `const_cast`
+						key.get(), RSA_NO_PADDING) == 0) {
+					ec = error::signature_verification_error::invalid_signature;
+					return;
+				}
+
+				if (RSA_verify_PKCS1_PSS_mgf1(key.get(), reinterpret_cast<const unsigned char*>(hash.data()), md(),
+											  md(), reinterpret_cast<const unsigned char*>(sig.data()), -1) == 0) {
+					ec = error::signature_verification_error::invalid_signature;
+					return;
+				}
+			}
+			/**
+			 * Returns the algorithm name provided to the constructor
+			 * \return algorithm's name
+			 */
+			std::string name() const { return alg_name; }
+
+		private:
+			/**
+			 * Hash the provided data using the hash function specified in constructor
+			 * \param data Data to hash
+			 * \return Hash of data
+			 */
+			std::string generate_hash(const std::string& data, std::error_code& ec) const {
+#ifdef OPENSSL10
+				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_destroy)> ctx(EVP_MD_CTX_create(),
+																			   &EVP_MD_CTX_destroy);
+#else
+				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> ctx(EVP_MD_CTX_new(), EVP_MD_CTX_free);
+#endif
+				if (!ctx) {
+					ec = error::signature_generation_error::create_context_failed;
+					return {};
+				}
+				if (EVP_DigestInit(ctx.get(), md()) == 0) {
+					ec = error::signature_generation_error::digestinit_failed;
+					return {};
+				}
+				if (EVP_DigestUpdate(ctx.get(), data.data(), data.size()) == 0) {
+					ec = error::signature_generation_error::digestupdate_failed;
+					return {};
+				}
+				unsigned int len = 0;
+				std::string res(EVP_MD_CTX_size(ctx.get()), '\0');
+				if (EVP_DigestFinal(ctx.get(), (unsigned char*)res.data(), &len) ==
+					0) { // NOLINT(google-readability-casting) requires `const_cast`
+					ec = error::signature_generation_error::digestfinal_failed;
+					return {};
+				}
+				res.resize(len);
+				return res;
+			}
+
+			/// OpenSSL structure containing keys
+			std::shared_ptr<EVP_PKEY> pkey;
+			/// Hash generator function
+			const EVP_MD* (*md)();
+			/// algorithm's name
+			const std::string alg_name;
+		};
+
+		/**
+		 * HS256 algorithm
+		 */
+		struct hs256 : public hmacsha {
+			/**
+			 * Construct new instance of algorithm
+			 * \param key HMAC signing key
+			 */
+			explicit hs256(std::string key) : hmacsha(std::move(key), EVP_sha256, "HS256") {}
+		};
+		/**
+		 * HS384 algorithm
+		 */
+		struct hs384 : public hmacsha {
+			/**
+			 * Construct new instance of algorithm
+			 * \param key HMAC signing key
+			 */
+			explicit hs384(std::string key) : hmacsha(std::move(key), EVP_sha384, "HS384") {}
+		};
+		/**
+		 * HS512 algorithm
+		 */
+		struct hs512 : public hmacsha {
+			/**
+			 * Construct new instance of algorithm
+			 * \param key HMAC signing key
+			 */
+			explicit hs512(std::string key) : hmacsha(std::move(key), EVP_sha512, "HS512") {}
+		};
+		/**
+		 * RS256 algorithm
+		 */
+		struct rs256 : public rsa {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key RSA public key in PEM format
+			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password to decrypt private key pem.
+			 */
+			explicit rs256(const std::string& public_key, const std::string& private_key = "",
+						   const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: rsa(public_key, private_key, public_key_password, private_key_password, EVP_sha256, "RS256") {}
+		};
+		/**
+		 * RS384 algorithm
+		 */
+		struct rs384 : public rsa {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key RSA public key in PEM format
+			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password to decrypt private key pem.
+			 */
+			explicit rs384(const std::string& public_key, const std::string& private_key = "",
+						   const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: rsa(public_key, private_key, public_key_password, private_key_password, EVP_sha384, "RS384") {}
+		};
+		/**
+		 * RS512 algorithm
+		 */
+		struct rs512 : public rsa {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key RSA public key in PEM format
+			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password to decrypt private key pem.
+			 */
+			explicit rs512(const std::string& public_key, const std::string& private_key = "",
+						   const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: rsa(public_key, private_key, public_key_password, private_key_password, EVP_sha512, "RS512") {}
+		};
+		/**
+		 * ES256 algorithm
+		 */
+		struct es256 : public ecdsa {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key ECDSA public key in PEM format
+			 * \param private_key ECDSA private key or empty string if not available. If empty, signing will always
+			 * fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password
+			 * to decrypt private key pem.
+			 */
+			explicit es256(const std::string& public_key, const std::string& private_key = "",
+						   const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: ecdsa(public_key, private_key, public_key_password, private_key_password, EVP_sha256, "ES256", 64) {}
+		};
+		/**
+		 * ES384 algorithm
+		 */
+		struct es384 : public ecdsa {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key ECDSA public key in PEM format
+			 * \param private_key ECDSA private key or empty string if not available. If empty, signing will always
+			 * fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password
+			 * to decrypt private key pem.
+			 */
+			explicit es384(const std::string& public_key, const std::string& private_key = "",
+						   const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: ecdsa(public_key, private_key, public_key_password, private_key_password, EVP_sha384, "ES384", 96) {}
+		};
+		/**
+		 * ES512 algorithm
+		 */
+		struct es512 : public ecdsa {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key ECDSA public key in PEM format
+			 * \param private_key ECDSA private key or empty string if not available. If empty, signing will always
+			 * fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password
+			 * to decrypt private key pem.
+			 */
+			explicit es512(const std::string& public_key, const std::string& private_key = "",
+						   const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: ecdsa(public_key, private_key, public_key_password, private_key_password, EVP_sha512, "ES512", 132) {}
+		};
+
+#ifndef OPENSSL110
+		/**
+		 * Ed25519 algorithm
+		 *
+		 * https://en.wikipedia.org/wiki/EdDSA#Ed25519
+		 *
+		 * Requires at least OpenSSL 1.1.1.
+		 */
+		struct ed25519 : public eddsa {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key Ed25519 public key in PEM format
+			 * \param private_key Ed25519 private key or empty string if not available. If empty, signing will always
+			 * fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password
+			 * to decrypt private key pem.
+			 */
+			explicit ed25519(const std::string& public_key, const std::string& private_key = "",
+							 const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: eddsa(public_key, private_key, public_key_password, private_key_password, "EdDSA") {}
+		};
+
+		/**
+		 * Ed448 algorithm
+		 *
+		 * https://en.wikipedia.org/wiki/EdDSA#Ed448
+		 *
+		 * Requires at least OpenSSL 1.1.1.
+		 */
+		struct ed448 : public eddsa {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key Ed448 public key in PEM format
+			 * \param private_key Ed448 private key or empty string if not available. If empty, signing will always
+			 * fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password
+			 * to decrypt private key pem.
+			 */
+			explicit ed448(const std::string& public_key, const std::string& private_key = "",
+						   const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: eddsa(public_key, private_key, public_key_password, private_key_password, "EdDSA") {}
+		};
+#endif
+
+		/**
+		 * PS256 algorithm
+		 */
+		struct ps256 : public pss {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key RSA public key in PEM format
+			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password to decrypt private key pem.
+			 */
+			explicit ps256(const std::string& public_key, const std::string& private_key = "",
+						   const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: pss(public_key, private_key, public_key_password, private_key_password, EVP_sha256, "PS256") {}
+		};
+		/**
+		 * PS384 algorithm
+		 */
+		struct ps384 : public pss {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key RSA public key in PEM format
+			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password to decrypt private key pem.
+			 */
+			explicit ps384(const std::string& public_key, const std::string& private_key = "",
+						   const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: pss(public_key, private_key, public_key_password, private_key_password, EVP_sha384, "PS384") {}
+		};
+		/**
+		 * PS512 algorithm
+		 */
+		struct ps512 : public pss {
+			/**
+			 * Construct new instance of algorithm
+			 * \param public_key RSA public key in PEM format
+			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
+			 * \param public_key_password Password to decrypt public key pem.
+			 * \param private_key_password Password to decrypt private key pem.
+			 */
+			explicit ps512(const std::string& public_key, const std::string& private_key = "",
+						   const std::string& public_key_password = "", const std::string& private_key_password = "")
+				: pss(public_key, private_key, public_key_password, private_key_password, EVP_sha512, "PS512") {}
+		};
+	} // namespace algorithm
+
+	/**
+	 * \brief JSON Abstractions for working with any library
+	 */
+	namespace json {
+		/**
+		 * \brief Generic JSON types used in JWTs
+		 *
+		 * This enum is to abstract the third party underlying types
+		 */
+		enum class type { boolean, integer, number, string, array, object };
+	} // namespace json
+
+	namespace details {
+#ifdef __cpp_lib_void_t
+		template<typename... Ts>
+		using void_t = std::void_t<Ts...>;
+#else
+		// https://en.cppreference.com/w/cpp/types/void_t
+		template<typename... Ts>
+		struct make_void {
+			using type = void;
+		};
+
+		template<typename... Ts>
+		using void_t = typename make_void<Ts...>::type;
+#endif
+
+#ifdef __cpp_lib_experimental_detect
+		template<template<typename...> class _Op, typename... _Args>
+		using is_detected = std::experimental::is_detected<_Op, _Args...>;
+
+		template<template<typename...> class _Op, typename... _Args>
+		using is_detected_t = std::experimental::detected_t<_Op, _Args...>;
+#else
+		struct nonesuch {
+			nonesuch() = delete;
+			~nonesuch() = delete;
+			nonesuch(nonesuch const&) = delete;
+			nonesuch(nonesuch const&&) = delete;
+			void operator=(nonesuch const&) = delete;
+			void operator=(nonesuch&&) = delete;
+		};
+
+		// https://en.cppreference.com/w/cpp/experimental/is_detected
+		template<class Default, class AlwaysVoid, template<class...> class Op, class... Args>
+		struct detector {
+			using value = std::false_type;
+			using type = Default;
+		};
+
+		template<class Default, template<class...> class Op, class... Args>
+		struct detector<Default, void_t<Op<Args...>>, Op, Args...> {
+			using value = std::true_type;
+			using type = Op<Args...>;
+		};
+
+		template<template<class...> class Op, class... Args>
+		using is_detected = typename detector<nonesuch, void, Op, Args...>::value;
+
+		template<template<class...> class Op, class... Args>
+		using is_detected_t = typename detector<nonesuch, void, Op, Args...>::type;
+#endif
+
+		template<typename traits_type>
+		using get_type_function = decltype(traits_type::get_type);
+
+		template<typename traits_type, typename value_type>
+		using is_get_type_signature =
+			typename std::is_same<get_type_function<traits_type>, json::type(const value_type&)>;
+
+		template<typename traits_type, typename value_type>
+		struct supports_get_type {
+			static constexpr auto value = is_detected<get_type_function, traits_type>::value &&
+										  std::is_function<get_type_function<traits_type>>::value &&
+										  is_get_type_signature<traits_type, value_type>::value;
+		};
+
+		template<typename traits_type>
+		using as_object_function = decltype(traits_type::as_object);
+
+		template<typename traits_type, typename value_type, typename object_type>
+		using is_as_object_signature =
+			typename std::is_same<as_object_function<traits_type>, object_type(const value_type&)>;
+
+		template<typename traits_type, typename value_type, typename object_type>
+		struct supports_as_object {
+			static constexpr auto value = std::is_constructible<value_type, object_type>::value &&
+										  is_detected<as_object_function, traits_type>::value &&
+										  std::is_function<as_object_function<traits_type>>::value &&
+										  is_as_object_signature<traits_type, value_type, object_type>::value;
+		};
+
+		template<typename traits_type>
+		using as_array_function = decltype(traits_type::as_array);
+
+		template<typename traits_type, typename value_type, typename array_type>
+		using is_as_array_signature =
+			typename std::is_same<as_array_function<traits_type>, array_type(const value_type&)>;
+
+		template<typename traits_type, typename value_type, typename array_type>
+		struct supports_as_array {
+			static constexpr auto value = std::is_constructible<value_type, array_type>::value &&
+										  is_detected<as_array_function, traits_type>::value &&
+										  std::is_function<as_array_function<traits_type>>::value &&
+										  is_as_array_signature<traits_type, value_type, array_type>::value;
+		};
+
+		template<typename traits_type>
+		using as_string_function = decltype(traits_type::as_string);
+
+		template<typename traits_type, typename value_type, typename string_type>
+		using is_as_string_signature =
+			typename std::is_same<as_string_function<traits_type>, string_type(const value_type&)>;
+
+		template<typename traits_type, typename value_type, typename string_type>
+		struct supports_as_string {
+			static constexpr auto value = std::is_constructible<value_type, string_type>::value &&
+										  is_detected<as_string_function, traits_type>::value &&
+										  std::is_function<as_string_function<traits_type>>::value &&
+										  is_as_string_signature<traits_type, value_type, string_type>::value;
+		};
+
+		template<typename traits_type>
+		using as_number_function = decltype(traits_type::as_number);
+
+		template<typename traits_type, typename value_type, typename number_type>
+		using is_as_number_signature =
+			typename std::is_same<as_number_function<traits_type>, number_type(const value_type&)>;
+
+		template<typename traits_type, typename value_type, typename number_type>
+		struct supports_as_number {
+			static constexpr auto value = std::is_floating_point<number_type>::value &&
+										  std::is_constructible<value_type, number_type>::value &&
+										  is_detected<as_number_function, traits_type>::value &&
+										  std::is_function<as_number_function<traits_type>>::value &&
+										  is_as_number_signature<traits_type, value_type, number_type>::value;
+		};
+
+		template<typename traits_type>
+		using as_integer_function = decltype(traits_type::as_int);
+
+		template<typename traits_type, typename value_type, typename integer_type>
+		using is_as_integer_signature =
+			typename std::is_same<as_integer_function<traits_type>, integer_type(const value_type&)>;
+
+		template<typename traits_type, typename value_type, typename integer_type>
+		struct supports_as_integer {
+			static constexpr auto value = std::is_signed<integer_type>::value &&
+										  !std::is_floating_point<integer_type>::value &&
+										  std::is_constructible<value_type, integer_type>::value &&
+										  is_detected<as_integer_function, traits_type>::value &&
+										  std::is_function<as_integer_function<traits_type>>::value &&
+										  is_as_integer_signature<traits_type, value_type, integer_type>::value;
+		};
+
+		template<typename traits_type>
+		using as_boolean_function = decltype(traits_type::as_bool);
+
+		template<typename traits_type, typename value_type, typename boolean_type>
+		using is_as_boolean_signature =
+			typename std::is_same<as_boolean_function<traits_type>, boolean_type(const value_type&)>;
+
+		template<typename traits_type, typename value_type, typename boolean_type>
+		struct supports_as_boolean {
+			static constexpr auto value = std::is_convertible<boolean_type, bool>::value &&
+										  std::is_constructible<value_type, boolean_type>::value &&
+										  is_detected<as_boolean_function, traits_type>::value &&
+										  std::is_function<as_boolean_function<traits_type>>::value &&
+										  is_as_boolean_signature<traits_type, value_type, boolean_type>::value;
+		};
+
+		template<typename traits>
+		struct is_valid_traits {
+			// Internal assertions for better feedback
+			static_assert(supports_get_type<traits, typename traits::value_type>::value,
+						  "traits must provide `jwt::json::type get_type(const value_type&)`");
+			static_assert(supports_as_object<traits, typename traits::value_type, typename traits::object_type>::value,
+						  "traits must provide `object_type as_object(const value_type&)`");
+			static_assert(supports_as_array<traits, typename traits::value_type, typename traits::array_type>::value,
+						  "traits must provide `array_type as_array(const value_type&)`");
+			static_assert(supports_as_string<traits, typename traits::value_type, typename traits::string_type>::value,
+						  "traits must provide `string_type as_string(const value_type&)`");
+			static_assert(supports_as_number<traits, typename traits::value_type, typename traits::number_type>::value,
+						  "traits must provide `number_type as_number(const value_type&)`");
+			static_assert(
+				supports_as_integer<traits, typename traits::value_type, typename traits::integer_type>::value,
+				"traits must provide `integer_type as_int(const value_type&)`");
+			static_assert(
+				supports_as_boolean<traits, typename traits::value_type, typename traits::boolean_type>::value,
+				"traits must provide `boolean_type as_bool(const value_type&)`");
+
+			static constexpr auto value =
+				supports_get_type<traits, typename traits::value_type>::value &&
+				supports_as_object<traits, typename traits::value_type, typename traits::object_type>::value &&
+				supports_as_array<traits, typename traits::value_type, typename traits::array_type>::value &&
+				supports_as_string<traits, typename traits::value_type, typename traits::string_type>::value &&
+				supports_as_number<traits, typename traits::value_type, typename traits::number_type>::value &&
+				supports_as_integer<traits, typename traits::value_type, typename traits::integer_type>::value &&
+				supports_as_boolean<traits, typename traits::value_type, typename traits::boolean_type>::value;
+		};
+
+		template<typename value_type>
+		struct is_valid_json_value {
+			static constexpr auto value =
+				std::is_default_constructible<value_type>::value &&
+				std::is_constructible<value_type, const value_type&>::value && // a more generic is_copy_constructible
+				std::is_move_constructible<value_type>::value && std::is_assignable<value_type, value_type>::value &&
+				std::is_copy_assignable<value_type>::value && std::is_move_assignable<value_type>::value;
+			// TODO(cmcarthur): Stream operators
+		};
+
+		template<typename traits_type>
+		using has_mapped_type = typename traits_type::mapped_type;
+
+		template<typename traits_type>
+		using has_key_type = typename traits_type::key_type;
+
+		template<typename traits_type>
+		using has_value_type = typename traits_type::value_type;
+
+		template<typename object_type>
+		using has_iterator = typename object_type::iterator;
+
+		template<typename object_type>
+		using has_const_iterator = typename object_type::const_iterator;
+
+		template<typename object_type>
+		using is_begin_signature =
+			typename std::is_same<decltype(std::declval<object_type>().begin()), has_iterator<object_type>>;
+
+		template<typename object_type>
+		using is_begin_const_signature =
+			typename std::is_same<decltype(std::declval<const object_type>().begin()), has_const_iterator<object_type>>;
+
+		template<typename object_type>
+		struct supports_begin {
+			static constexpr auto value =
+				is_detected<has_iterator, object_type>::value && is_detected<has_const_iterator, object_type>::value &&
+				is_begin_signature<object_type>::value && is_begin_const_signature<object_type>::value;
+		};
+
+		template<typename object_type>
+		using is_end_signature =
+			typename std::is_same<decltype(std::declval<object_type>().end()), has_iterator<object_type>>;
+
+		template<typename object_type>
+		using is_end_const_signature =
+			typename std::is_same<decltype(std::declval<const object_type>().end()), has_const_iterator<object_type>>;
+
+		template<typename object_type>
+		struct supports_end {
+			static constexpr auto value =
+				is_detected<has_iterator, object_type>::value && is_detected<has_const_iterator, object_type>::value &&
+				is_end_signature<object_type>::value && is_end_const_signature<object_type>::value;
+		};
+
+		template<typename object_type, typename string_type>
+		using is_count_signature = typename std::is_integral<decltype(
+			std::declval<const object_type>().count(std::declval<const string_type>()))>;
+
+		template<typename object_type, typename value_type, typename string_type>
+		using is_subcription_operator_signature =
+			typename std::is_same<decltype(std::declval<object_type>()[std::declval<const string_type>()]),
+								  value_type&>;
+
+		template<typename object_type, typename value_type, typename string_type>
+		using is_at_const_signature =
+			typename std::is_same<decltype(std::declval<const object_type>().at(std::declval<const string_type>())),
+								  const value_type&>;
+
+		template<typename value_type, typename string_type, typename object_type>
+		struct is_valid_json_object {
+			static constexpr auto value =
+				is_detected<has_mapped_type, object_type>::value &&
+				std::is_same<typename object_type::mapped_type, value_type>::value &&
+				is_detected<has_key_type, object_type>::value &&
+				std::is_same<typename object_type::key_type, string_type>::value &&
+				supports_begin<object_type>::value && supports_end<object_type>::value &&
+				is_count_signature<object_type, string_type>::value &&
+				is_subcription_operator_signature<object_type, value_type, string_type>::value &&
+				is_at_const_signature<object_type, value_type, string_type>::value;
+
+			static constexpr auto supports_claims_transform =
+				value && is_detected<has_value_type, object_type>::value &&
+				std::is_same<typename object_type::value_type, std::pair<const string_type, value_type>>::value;
+		};
+
+		template<typename value_type, typename array_type>
+		struct is_valid_json_array {
+			static constexpr auto value = std::is_same<typename array_type::value_type, value_type>::value;
+		};
+
+		template<typename value_type, typename string_type, typename object_type, typename array_type>
+		struct is_valid_json_types {
+			// Internal assertions for better feedback
+			static_assert(is_valid_json_value<value_type>::value,
+						  "value type must meet basic requirements, default constructor, copyable, moveable");
+			static_assert(is_valid_json_object<value_type, string_type, object_type>::value,
+						  "object_type must be a string_type to value_type container");
+			static_assert(is_valid_json_array<value_type, array_type>::value,
+						  "array_type must be a container of value_type");
+
+			static constexpr auto value = is_valid_json_object<value_type, string_type, object_type>::value &&
+										  is_valid_json_value<value_type>::value &&
+										  is_valid_json_array<value_type, array_type>::value;
+		};
+	} // namespace details
+
+	/**
+	 * \brief a class to store a generic JSON value as claim
+	 *
+	 * The default template parameters use [picojson](https://github.com/kazuho/picojson)
+	 *
+	 * \tparam json_traits : JSON implementation traits
+	 *
+	 * \see [RFC 7519: JSON Web Token (JWT)](https://tools.ietf.org/html/rfc7519)
+	 */
+	template<typename json_traits>
+	class basic_claim {
+		/**
+		 * The reason behind this is to provide an expressive abstraction without
+		 * over complexifying the API. For more information take the time to read
+		 * https://github.com/nlohmann/json/issues/774. It maybe be expanded to
+		 * support custom string types.
+		 */
+		static_assert(std::is_same<typename json_traits::string_type, std::string>::value,
+					  "string_type must be a std::string.");
+
+		static_assert(
+			details::is_valid_json_types<typename json_traits::value_type, typename json_traits::string_type,
+										 typename json_traits::object_type, typename json_traits::array_type>::value,
+			"must staisfy json container requirements");
+		static_assert(details::is_valid_traits<json_traits>::value, "traits must satisfy requirements");
+
+		typename json_traits::value_type val;
+
+	public:
+		using set_t = std::set<typename json_traits::string_type>;
+
+		basic_claim() = default;
+		basic_claim(const basic_claim&) = default;
+		basic_claim(basic_claim&&) = default;
+		basic_claim& operator=(const basic_claim&) = default;
+		basic_claim& operator=(basic_claim&&) = default;
+		~basic_claim() = default;
+
+		JWT_CLAIM_EXPLICIT basic_claim(typename json_traits::string_type s) : val(std::move(s)) {}
+		JWT_CLAIM_EXPLICIT basic_claim(const date& d)
+			: val(typename json_traits::integer_type(std::chrono::system_clock::to_time_t(d))) {}
+		JWT_CLAIM_EXPLICIT basic_claim(typename json_traits::array_type a) : val(std::move(a)) {}
+		JWT_CLAIM_EXPLICIT basic_claim(typename json_traits::value_type v) : val(std::move(v)) {}
+		JWT_CLAIM_EXPLICIT basic_claim(const set_t& s) : val(typename json_traits::array_type(s.begin(), s.end())) {}
+		template<typename Iterator>
+		basic_claim(Iterator begin, Iterator end) : val(typename json_traits::array_type(begin, end)) {}
+
+		/**
+		 * Get wrapped JSON value
+		 * \return Wrapped JSON value
+		 */
+		typename json_traits::value_type to_json() const { return val; }
+
+		/**
+		 * Parse input stream into underlying JSON value
+		 * \return input stream
+		 */
+		std::istream& operator>>(std::istream& is) { return is >> val; }
+
+		/**
+		 * Serialize claim to output stream from wrapped JSON value
+		 * \return ouput stream
+		 */
+		std::ostream& operator<<(std::ostream& os) { return os << val; }
+
+		/**
+		 * Get type of contained JSON value
+		 * \return Type
+		 * \throw std::logic_error An internal error occured
+		 */
+		json::type get_type() const { return json_traits::get_type(val); }
+
+		/**
+		 * Get the contained JSON value as a string
+		 * \return content as string
+		 * \throw std::bad_cast Content was not a string
+		 */
+		typename json_traits::string_type as_string() const { return json_traits::as_string(val); }
+
+		/**
+		 * Get the contained JSON value as a date
+		 * \return content as date
+		 * \throw std::bad_cast Content was not a date
+		 */
+		date as_date() const { return std::chrono::system_clock::from_time_t(as_int()); }
+
+		/**
+		 * Get the contained JSON value as an array
+		 * \return content as array
+		 * \throw std::bad_cast Content was not an array
+		 */
+		typename json_traits::array_type as_array() const { return json_traits::as_array(val); }
+
+		/**
+		 * Get the contained JSON value as a set of strings
+		 * \return content as set of strings
+		 * \throw std::bad_cast Content was not an array of string
+		 */
+		set_t as_set() const {
+			set_t res;
+			for (const auto& e : json_traits::as_array(val)) {
+				res.insert(json_traits::as_string(e));
+			}
+			return res;
+		}
+
+		/**
+		 * Get the contained JSON value as an integer
+		 * \return content as int
+		 * \throw std::bad_cast Content was not an int
+		 */
+		typename json_traits::integer_type as_int() const { return json_traits::as_int(val); }
+
+		/**
+		 * Get the contained JSON value as a bool
+		 * \return content as bool
+		 * \throw std::bad_cast Content was not a bool
+		 */
+		typename json_traits::boolean_type as_bool() const { return json_traits::as_bool(val); }
+
+		/**
+		 * Get the contained JSON value as a number
+		 * \return content as double
+		 * \throw std::bad_cast Content was not a number
+		 */
+		typename json_traits::number_type as_number() const { return json_traits::as_number(val); }
+	};
+
+	namespace error {
+		struct invalid_json_exception : public std::runtime_error {
+			invalid_json_exception() : runtime_error("invalid json") {}
+		};
+		struct claim_not_present_exception : public std::out_of_range {
+			claim_not_present_exception() : out_of_range("claim not found") {}
+		};
+	} // namespace error
+
+	namespace details {
+		template<typename json_traits>
+		class map_of_claims {
+			typename json_traits::object_type claims;
+
+		public:
+			using basic_claim_t = basic_claim<json_traits>;
+			using iterator = typename json_traits::object_type::iterator;
+			using const_iterator = typename json_traits::object_type::const_iterator;
+
+			map_of_claims() = default;
+			map_of_claims(const map_of_claims&) = default;
+			map_of_claims(map_of_claims&&) = default;
+			map_of_claims& operator=(const map_of_claims&) = default;
+			map_of_claims& operator=(map_of_claims&&) = default;
+
+			map_of_claims(typename json_traits::object_type json) : claims(std::move(json)) {}
+
+			iterator begin() { return claims.begin(); }
+			iterator end() { return claims.end(); }
+			const_iterator cbegin() const { return claims.begin(); }
+			const_iterator cend() const { return claims.end(); }
+			const_iterator begin() const { return claims.begin(); }
+			const_iterator end() const { return claims.end(); }
+
+			/**
+			 * \brief Parse a JSON string into a map of claims
+			 *
+			 * The implication is that a "map of claims" is identic to a JSON object
+			 *
+			 * \param str JSON data to be parse as an object
+			 * \return content as JSON object
+			 */
+			static typename json_traits::object_type parse_claims(const typename json_traits::string_type& str) {
+				typename json_traits::value_type val;
+				if (!json_traits::parse(val, str)) throw error::invalid_json_exception();
+
+				return json_traits::as_object(val);
+			};
+
+			/**
+			 * Check if a claim is present in the map
+			 * \return true if claim was present, false otherwise
+			 */
+			bool has_claim(const typename json_traits::string_type& name) const noexcept {
+				return claims.count(name) != 0;
+			}
+
+			/**
+			 * Get a claim by name
+			 *
+			 * \param name the name of the desired claim
+			 * \return Requested claim
+			 * \throw jwt::error::claim_not_present_exception if the claim was not present
+			 */
+			basic_claim_t get_claim(const typename json_traits::string_type& name) const {
+				if (!has_claim(name)) throw error::claim_not_present_exception();
+				return basic_claim_t{claims.at(name)};
+			}
+
+			std::unordered_map<typename json_traits::string_type, basic_claim_t> get_claims() const {
+				static_assert(
+					details::is_valid_json_object<typename json_traits::value_type, typename json_traits::string_type,
+												  typename json_traits::object_type>::supports_claims_transform,
+					"currently there is a limitation on the internal implemantation of the `object_type` to have an "
+					"`std::pair` like `value_type`");
+
+				std::unordered_map<typename json_traits::string_type, basic_claim_t> res;
+				std::transform(claims.begin(), claims.end(), std::inserter(res, res.end()),
+							   [](const typename json_traits::object_type::value_type& val) {
+								   return std::make_pair(val.first, basic_claim_t{val.second});
+							   });
+				return res;
+			}
+		};
+	} // namespace details
+
+	/**
+	 * Base class that represents a token payload.
+	 * Contains Convenience accessors for common claims.
+	 */
+	template<typename json_traits>
+	class payload {
+	protected:
+		details::map_of_claims<json_traits> payload_claims;
+
+	public:
+		using basic_claim_t = basic_claim<json_traits>;
+
+		/**
+		 * Check if issuer is present ("iss")
+		 * \return true if present, false otherwise
+		 */
+		bool has_issuer() const noexcept { return has_payload_claim("iss"); }
+		/**
+		 * Check if subject is present ("sub")
+		 * \return true if present, false otherwise
+		 */
+		bool has_subject() const noexcept { return has_payload_claim("sub"); }
+		/**
+		 * Check if audience is present ("aud")
+		 * \return true if present, false otherwise
+		 */
+		bool has_audience() const noexcept { return has_payload_claim("aud"); }
+		/**
+		 * Check if expires is present ("exp")
+		 * \return true if present, false otherwise
+		 */
+		bool has_expires_at() const noexcept { return has_payload_claim("exp"); }
+		/**
+		 * Check if not before is present ("nbf")
+		 * \return true if present, false otherwise
+		 */
+		bool has_not_before() const noexcept { return has_payload_claim("nbf"); }
+		/**
+		 * Check if issued at is present ("iat")
+		 * \return true if present, false otherwise
+		 */
+		bool has_issued_at() const noexcept { return has_payload_claim("iat"); }
+		/**
+		 * Check if token id is present ("jti")
+		 * \return true if present, false otherwise
+		 */
+		bool has_id() const noexcept { return has_payload_claim("jti"); }
+		/**
+		 * Get issuer claim
+		 * \return issuer as string
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a string (Should not happen in a valid token)
+		 */
+		typename json_traits::string_type get_issuer() const { return get_payload_claim("iss").as_string(); }
+		/**
+		 * Get subject claim
+		 * \return subject as string
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a string (Should not happen in a valid token)
+		 */
+		typename json_traits::string_type get_subject() const { return get_payload_claim("sub").as_string(); }
+		/**
+		 * Get audience claim
+		 * \return audience as a set of strings
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a set (Should not happen in a valid token)
+		 */
+		typename basic_claim_t::set_t get_audience() const {
+			auto aud = get_payload_claim("aud");
+			if (aud.get_type() == json::type::string) return {aud.as_string()};
+
+			return aud.as_set();
+		}
+		/**
+		 * Get expires claim
+		 * \return expires as a date in utc
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a date (Should not happen in a valid token)
+		 */
+		date get_expires_at() const { return get_payload_claim("exp").as_date(); }
+		/**
+		 * Get not valid before claim
+		 * \return nbf date in utc
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a date (Should not happen in a valid token)
+		 */
+		date get_not_before() const { return get_payload_claim("nbf").as_date(); }
+		/**
+		 * Get issued at claim
+		 * \return issued at as date in utc
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a date (Should not happen in a valid token)
+		 */
+		date get_issued_at() const { return get_payload_claim("iat").as_date(); }
+		/**
+		 * Get id claim
+		 * \return id as string
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a string (Should not happen in a valid token)
+		 */
+		typename json_traits::string_type get_id() const { return get_payload_claim("jti").as_string(); }
+		/**
+		 * Check if a payload claim is present
+		 * \return true if claim was present, false otherwise
+		 */
+		bool has_payload_claim(const typename json_traits::string_type& name) const noexcept {
+			return payload_claims.has_claim(name);
+		}
+		/**
+		 * Get payload claim
+		 * \return Requested claim
+		 * \throw std::runtime_error If claim was not present
+		 */
+		basic_claim_t get_payload_claim(const typename json_traits::string_type& name) const {
+			return payload_claims.get_claim(name);
+		}
+	};
+
+	/**
+	 * Base class that represents a token header.
+	 * Contains Convenience accessors for common claims.
+	 */
+	template<typename json_traits>
+	class header {
+	protected:
+		details::map_of_claims<json_traits> header_claims;
+
+	public:
+		using basic_claim_t = basic_claim<json_traits>;
+		/**
+		 * Check if algortihm is present ("alg")
+		 * \return true if present, false otherwise
+		 */
+		bool has_algorithm() const noexcept { return has_header_claim("alg"); }
+		/**
+		 * Check if type is present ("typ")
+		 * \return true if present, false otherwise
+		 */
+		bool has_type() const noexcept { return has_header_claim("typ"); }
+		/**
+		 * Check if content type is present ("cty")
+		 * \return true if present, false otherwise
+		 */
+		bool has_content_type() const noexcept { return has_header_claim("cty"); }
+		/**
+		 * Check if key id is present ("kid")
+		 * \return true if present, false otherwise
+		 */
+		bool has_key_id() const noexcept { return has_header_claim("kid"); }
+		/**
+		 * Get algorithm claim
+		 * \return algorithm as string
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a string (Should not happen in a valid token)
+		 */
+		typename json_traits::string_type get_algorithm() const { return get_header_claim("alg").as_string(); }
+		/**
+		 * Get type claim
+		 * \return type as a string
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a string (Should not happen in a valid token)
+		 */
+		typename json_traits::string_type get_type() const { return get_header_claim("typ").as_string(); }
+		/**
+		 * Get content type claim
+		 * \return content type as string
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a string (Should not happen in a valid token)
+		 */
+		typename json_traits::string_type get_content_type() const { return get_header_claim("cty").as_string(); }
+		/**
+		 * Get key id claim
+		 * \return key id as string
+		 * \throw std::runtime_error If claim was not present
+		 * \throw std::bad_cast Claim was present but not a string (Should not happen in a valid token)
+		 */
+		typename json_traits::string_type get_key_id() const { return get_header_claim("kid").as_string(); }
+		/**
+		 * Check if a header claim is present
+		 * \return true if claim was present, false otherwise
+		 */
+		bool has_header_claim(const typename json_traits::string_type& name) const noexcept {
+			return header_claims.has_claim(name);
+		}
+		/**
+		 * Get header claim
+		 * \return Requested claim
+		 * \throw std::runtime_error If claim was not present
+		 */
+		basic_claim_t get_header_claim(const typename json_traits::string_type& name) const {
+			return header_claims.get_claim(name);
+		}
+	};
+
+	/**
+	 * Class containing all information about a decoded token
+	 */
+	template<typename json_traits>
+	class decoded_jwt : public header<json_traits>, public payload<json_traits> {
+	protected:
+		/// Unmodifed token, as passed to constructor
+		const typename json_traits::string_type token;
+		/// Header part decoded from base64
+		typename json_traits::string_type header;
+		/// Unmodified header part in base64
+		typename json_traits::string_type header_base64;
+		/// Payload part decoded from base64
+		typename json_traits::string_type payload;
+		/// Unmodified payload part in base64
+		typename json_traits::string_type payload_base64;
+		/// Signature part decoded from base64
+		typename json_traits::string_type signature;
+		/// Unmodified signature part in base64
+		typename json_traits::string_type signature_base64;
+
+	public:
+		using basic_claim_t = basic_claim<json_traits>;
+#ifndef JWT_DISABLE_BASE64
+		/**
+		 * \brief Parses a given token
+		 *
+		 * \note Decodes using the jwt::base64url which supports an std::string
+		 *
+		 * \param token The token to parse
+		 * \throw std::invalid_argument Token is not in correct format
+		 * \throw std::runtime_error Base64 decoding failed or invalid json
+		 */
+		JWT_CLAIM_EXPLICIT decoded_jwt(const typename json_traits::string_type& token)
+			: decoded_jwt(token, [](const typename json_traits::string_type& token) {
+				  return base::decode<alphabet::base64url>(base::pad<alphabet::base64url>(token));
+			  }) {}
+#endif
+		/**
+		 * \brief Parses a given token
+		 *
+		 * \tparam Decode is callabled, taking a string_type and returns a string_type.
+		 * It should ensure the padding of the input and then base64url decode and
+		 * return the results.
+		 * \param token The token to parse
+		 * \param decode The function to decode the token
+		 * \throw std::invalid_argument Token is not in correct format
+		 * \throw std::runtime_error Base64 decoding failed or invalid json
+		 */
+		template<typename Decode>
+		decoded_jwt(const typename json_traits::string_type& token, Decode decode) : token(token) {
+			auto hdr_end = token.find('.');
+			if (hdr_end == json_traits::string_type::npos) throw std::invalid_argument("invalid token supplied");
+			auto payload_end = token.find('.', hdr_end + 1);
+			if (payload_end == json_traits::string_type::npos) throw std::invalid_argument("invalid token supplied");
+			header_base64 = token.substr(0, hdr_end);
+			payload_base64 = token.substr(hdr_end + 1, payload_end - hdr_end - 1);
+			signature_base64 = token.substr(payload_end + 1);
+
+			header = decode(header_base64);
+			payload = decode(payload_base64);
+			signature = decode(signature_base64);
+
+			this->header_claims = details::map_of_claims<json_traits>::parse_claims(header);
+			this->payload_claims = details::map_of_claims<json_traits>::parse_claims(payload);
+		}
+
+		/**
+		 * Get token string, as passed to constructor
+		 * \return token as passed to constructor
+		 */
+		const typename json_traits::string_type& get_token() const noexcept { return token; }
+		/**
+		 * Get header part as json string
+		 * \return header part after base64 decoding
+		 */
+		const typename json_traits::string_type& get_header() const noexcept { return header; }
+		/**
+		 * Get payload part as json string
+		 * \return payload part after base64 decoding
+		 */
+		const typename json_traits::string_type& get_payload() const noexcept { return payload; }
+		/**
+		 * Get signature part as json string
+		 * \return signature part after base64 decoding
+		 */
+		const typename json_traits::string_type& get_signature() const noexcept { return signature; }
+		/**
+		 * Get header part as base64 string
+		 * \return header part before base64 decoding
+		 */
+		const typename json_traits::string_type& get_header_base64() const noexcept { return header_base64; }
+		/**
+		 * Get payload part as base64 string
+		 * \return payload part before base64 decoding
+		 */
+		const typename json_traits::string_type& get_payload_base64() const noexcept { return payload_base64; }
+		/**
+		 * Get signature part as base64 string
+		 * \return signature part before base64 decoding
+		 */
+		const typename json_traits::string_type& get_signature_base64() const noexcept { return signature_base64; }
+		/**
+		 * Get all payload claims
+		 * \return map of claims
+		 */
+		std::unordered_map<typename json_traits::string_type, basic_claim_t> get_payload_claims() const {
+			return this->payload_claims.get_claims();
+		}
+		/**
+		 * Get all header claims
+		 * \return map of claims
+		 */
+		std::unordered_map<typename json_traits::string_type, basic_claim_t> get_header_claims() const {
+			return this->header_claims.get_claims();
+		}
+	};
+
+	/**
+	 * Builder class to build and sign a new token
+	 * Use jwt::create() to get an instance of this class.
+	 */
+	template<typename json_traits>
+	class builder {
+		typename json_traits::object_type header_claims;
+		typename json_traits::object_type payload_claims;
+
+	public:
+		builder() = default;
+		/**
+		 * Set a header claim.
+		 * \param id Name of the claim
+		 * \param c Claim to add
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_header_claim(const typename json_traits::string_type& id, typename json_traits::value_type c) {
+			header_claims[id] = std::move(c);
+			return *this;
+		}
+
+		/**
+		 * Set a header claim.
+		 * \param id Name of the claim
+		 * \param c Claim to add
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_header_claim(const typename json_traits::string_type& id, basic_claim<json_traits> c) {
+			header_claims[id] = c.to_json();
+			return *this;
+		}
+		/**
+		 * Set a payload claim.
+		 * \param id Name of the claim
+		 * \param c Claim to add
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_payload_claim(const typename json_traits::string_type& id, typename json_traits::value_type c) {
+			payload_claims[id] = std::move(c);
+			return *this;
+		}
+		/**
+		 * Set a payload claim.
+		 * \param id Name of the claim
+		 * \param c Claim to add
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_payload_claim(const typename json_traits::string_type& id, basic_claim<json_traits> c) {
+			payload_claims[id] = c.to_json();
+			return *this;
+		}
+		/**
+		 * Set algorithm claim
+		 * You normally don't need to do this, as the algorithm is automatically set if you don't change it.
+		 * \param str Name of algorithm
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_algorithm(typename json_traits::string_type str) {
+			return set_header_claim("alg", typename json_traits::value_type(str));
+		}
+		/**
+		 * Set type claim
+		 * \param str Type to set
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_type(typename json_traits::string_type str) {
+			return set_header_claim("typ", typename json_traits::value_type(str));
+		}
+		/**
+		 * Set content type claim
+		 * \param str Type to set
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_content_type(typename json_traits::string_type str) {
+			return set_header_claim("cty", typename json_traits::value_type(str));
+		}
+		/**
+		 * Set key id claim
+		 * \param str Key id to set
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_key_id(typename json_traits::string_type str) {
+			return set_header_claim("kid", typename json_traits::value_type(str));
+		}
+		/**
+		 * Set issuer claim
+		 * \param str Issuer to set
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_issuer(typename json_traits::string_type str) {
+			return set_payload_claim("iss", typename json_traits::value_type(str));
+		}
+		/**
+		 * Set subject claim
+		 * \param str Subject to set
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_subject(typename json_traits::string_type str) {
+			return set_payload_claim("sub", typename json_traits::value_type(str));
+		}
+		/**
+		 * Set audience claim
+		 * \param a Audience set
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_audience(typename json_traits::array_type a) {
+			return set_payload_claim("aud", typename json_traits::value_type(a));
+		}
+		/**
+		 * Set audience claim
+		 * \param aud Single audience
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_audience(typename json_traits::string_type aud) {
+			return set_payload_claim("aud", typename json_traits::value_type(aud));
+		}
+		/**
+		 * Set expires at claim
+		 * \param d Expires time
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_expires_at(const date& d) { return set_payload_claim("exp", basic_claim<json_traits>(d)); }
+		/**
+		 * Set not before claim
+		 * \param d First valid time
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_not_before(const date& d) { return set_payload_claim("nbf", basic_claim<json_traits>(d)); }
+		/**
+		 * Set issued at claim
+		 * \param d Issued at time, should be current time
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_issued_at(const date& d) { return set_payload_claim("iat", basic_claim<json_traits>(d)); }
+		/**
+		 * Set id claim
+		 * \param str ID to set
+		 * \return *this to allow for method chaining
+		 */
+		builder& set_id(const typename json_traits::string_type& str) {
+			return set_payload_claim("jti", typename json_traits::value_type(str));
+		}
+
+		/**
+		 * Sign token and return result
+		 * \tparam Algo Callable method which takes a string_type and return the signed input as a string_type
+		 * \tparam Encode Callable method which takes a string_type and base64url safe encodes it,
+		 * MUST return the result with no padding; trim the result.
+		 * \param algo Instance of an algorithm to sign the token with
+		 * \param encode Callable to transform the serialized json to base64 with no padding
+		 * \return Final token as a string
+		 *
+		 * \note If the 'alg' header in not set in the token it will be set to `algo.name()`
+		 */
+		template<typename Algo, typename Encode>
+		typename json_traits::string_type sign(const Algo& algo, Encode encode) const {
+			std::error_code ec;
+			auto res = sign(algo, encode, ec);
+			error::throw_if_error(ec);
+			return res;
+		}
+#ifndef JWT_DISABLE_BASE64
+		/**
+		 * Sign token and return result
+		 *
+		 * using the `jwt::base` functions provided
+		 *
+		 * \param algo Instance of an algorithm to sign the token with
+		 * \return Final token as a string
+		 */
+		template<typename Algo>
+		typename json_traits::string_type sign(const Algo& algo) const {
+			std::error_code ec;
+			auto res = sign(algo, ec);
+			error::throw_if_error(ec);
+			return res;
+		}
+#endif
+
+		/**
+		 * Sign token and return result
+		 * \tparam Algo Callable method which takes a string_type and return the signed input as a string_type
+		 * \tparam Encode Callable method which takes a string_type and base64url safe encodes it,
+		 * MUST return the result with no padding; trim the result.
+		 * \param algo Instance of an algorithm to sign the token with
+		 * \param encode Callable to transform the serialized json to base64 with no padding
+		 * \param ec error_code filled with details on error
+		 * \return Final token as a string
+		 *
+		 * \note If the 'alg' header in not set in the token it will be set to `algo.name()`
+		 */
+		template<typename Algo, typename Encode>
+		typename json_traits::string_type sign(const Algo& algo, Encode encode, std::error_code& ec) const {
+			// make a copy such that a builder can be re-used
+			typename json_traits::object_type obj_header = header_claims;
+			if (header_claims.count("alg") == 0) obj_header["alg"] = typename json_traits::value_type(algo.name());
+
+			const auto header = encode(json_traits::serialize(typename json_traits::value_type(obj_header)));
+			const auto payload = encode(json_traits::serialize(typename json_traits::value_type(payload_claims)));
+			const auto token = header + "." + payload;
+
+			auto signature = algo.sign(token, ec);
+			if (ec) return {};
+
+			return token + "." + encode(signature);
+		}
+#ifndef JWT_DISABLE_BASE64
+		/**
+		 * Sign token and return result
+		 *
+		 * using the `jwt::base` functions provided
+		 *
+		 * \param algo Instance of an algorithm to sign the token with
+		 * \param ec error_code filled with details on error
+		 * \return Final token as a string
+		 */
+		template<typename Algo>
+		typename json_traits::string_type sign(const Algo& algo, std::error_code& ec) const {
+			return sign(
+				algo,
+				[](const typename json_traits::string_type& data) {
+					return base::trim<alphabet::base64url>(base::encode<alphabet::base64url>(data));
+				},
+				ec);
+		}
+#endif
+	};
+
+	/**
+	 * Verifier class used to check if a decoded token contains all claims required by your application and has a valid
+	 * signature.
+	 */
+	template<typename Clock, typename json_traits>
+	class verifier {
+		struct algo_base {
+			virtual ~algo_base() = default;
+			virtual void verify(const std::string& data, const std::string& sig, std::error_code& ec) = 0;
+		};
+		template<typename T>
+		struct algo : public algo_base {
+			T alg;
+			explicit algo(T a) : alg(a) {}
+			void verify(const std::string& data, const std::string& sig, std::error_code& ec) override {
+				alg.verify(data, sig, ec);
+			}
+		};
+
+		using basic_claim_t = basic_claim<json_traits>;
+		/// Required claims
+		std::unordered_map<typename json_traits::string_type, basic_claim_t> claims;
+		/// Leeway time for exp, nbf and iat
+		size_t default_leeway = 0;
+		/// Instance of clock type
+		Clock clock;
+		/// Supported algorithms
+		std::unordered_map<std::string, std::shared_ptr<algo_base>> algs;
+
+	public:
+		/**
+		 * Constructor for building a new verifier instance
+		 * \param c Clock instance
+		 */
+		explicit verifier(Clock c) : clock(c) {}
+
+		/**
+		 * Set default leeway to use.
+		 * \param leeway Default leeway to use if not specified otherwise
+		 * \return *this to allow chaining
+		 */
+		verifier& leeway(size_t leeway) {
+			default_leeway = leeway;
+			return *this;
+		}
+		/**
+		 * Set leeway for expires at.
+		 * If not specified the default leeway will be used.
+		 * \param leeway Set leeway to use for expires at.
+		 * \return *this to allow chaining
+		 */
+		verifier& expires_at_leeway(size_t leeway) {
+			return with_claim("exp", basic_claim_t(std::chrono::system_clock::from_time_t(leeway)));
+		}
+		/**
+		 * Set leeway for not before.
+		 * If not specified the default leeway will be used.
+		 * \param leeway Set leeway to use for not before.
+		 * \return *this to allow chaining
+		 */
+		verifier& not_before_leeway(size_t leeway) {
+			return with_claim("nbf", basic_claim_t(std::chrono::system_clock::from_time_t(leeway)));
+		}
+		/**
+		 * Set leeway for issued at.
+		 * If not specified the default leeway will be used.
+		 * \param leeway Set leeway to use for issued at.
+		 * \return *this to allow chaining
+		 */
+		verifier& issued_at_leeway(size_t leeway) {
+			return with_claim("iat", basic_claim_t(std::chrono::system_clock::from_time_t(leeway)));
+		}
+		/**
+		 * Set an issuer to check for.
+		 * Check is casesensitive.
+		 * \param iss Issuer to check for.
+		 * \return *this to allow chaining
+		 */
+		verifier& with_issuer(const typename json_traits::string_type& iss) {
+			return with_claim("iss", basic_claim_t(iss));
+		}
+		/**
+		 * Set a subject to check for.
+		 * Check is casesensitive.
+		 * \param sub Subject to check for.
+		 * \return *this to allow chaining
+		 */
+		verifier& with_subject(const typename json_traits::string_type& sub) {
+			return with_claim("sub", basic_claim_t(sub));
+		}
+		/**
+		 * Set an audience to check for.
+		 * If any of the specified audiences is not present in the token the check fails.
+		 * \param aud Audience to check for.
+		 * \return *this to allow chaining
+		 */
+		verifier& with_audience(const typename basic_claim_t::set_t& aud) {
+			return with_claim("aud", basic_claim_t(aud));
+		}
+		/**
+		 * Set an audience to check for.
+		 * If the specified audiences is not present in the token the check fails.
+		 * \param aud Audience to check for.
+		 * \return *this to allow chaining
+		 */
+		verifier& with_audience(const typename json_traits::string_type& aud) {
+			return with_claim("aud", basic_claim_t(aud));
+		}
+		/**
+		 * Set an id to check for.
+		 * Check is casesensitive.
+		 * \param id ID to check for.
+		 * \return *this to allow chaining
+		 */
+		verifier& with_id(const typename json_traits::string_type& id) { return with_claim("jti", basic_claim_t(id)); }
+		/**
+		 * Specify a claim to check for.
+		 * \param name Name of the claim to check for
+		 * \param c Claim to check for
+		 * \return *this to allow chaining
+		 */
+		verifier& with_claim(const typename json_traits::string_type& name, basic_claim_t c) {
+			claims[name] = c;
+			return *this;
+		}
+
+		/**
+		 * Add an algorithm available for checking.
+		 * \param alg Algorithm to allow
+		 * \return *this to allow chaining
+		 */
+		template<typename Algorithm>
+		verifier& allow_algorithm(Algorithm alg) {
+			algs[alg.name()] = std::make_shared<algo<Algorithm>>(alg);
+			return *this;
+		}
+
+		/**
+		 * Verify the given token.
+		 * \param jwt Token to check
+		 * \throw token_verification_exception Verification failed
+		 */
+		void verify(const decoded_jwt<json_traits>& jwt) const {
+			std::error_code ec;
+			verify(jwt, ec);
+			error::throw_if_error(ec);
+		}
+		/**
+		 * Verify the given token.
+		 * \param jwt Token to check
+		 * \param ec error_code filled with details on error
+		 */
+		void verify(const decoded_jwt<json_traits>& jwt, std::error_code& ec) const {
+			ec.clear();
+			const typename json_traits::string_type data = jwt.get_header_base64() + "." + jwt.get_payload_base64();
+			const typename json_traits::string_type sig = jwt.get_signature();
+			const std::string algo = jwt.get_algorithm();
+			if (algs.count(algo) == 0) {
+				ec = error::token_verification_error::wrong_algorithm;
+				return;
+			}
+			algs.at(algo)->verify(data, sig, ec);
+			if (ec) return;
+
+			auto assert_claim_eq = [](const decoded_jwt<json_traits>& jwt, const typename json_traits::string_type& key,
+									  const basic_claim_t& c, std::error_code& ec) {
+				if (!jwt.has_payload_claim(key)) {
+					ec = error::token_verification_error::missing_claim;
+					return;
+				}
+				auto jc = jwt.get_payload_claim(key);
+				if (jc.get_type() != c.get_type()) {
+					ec = error::token_verification_error::claim_type_missmatch;
+					return;
+				}
+				if (c.get_type() == json::type::integer) {
+					if (c.as_date() != jc.as_date()) {
+						ec = error::token_verification_error::claim_value_missmatch;
+						return;
+					}
+				} else if (c.get_type() == json::type::array) {
+					auto s1 = c.as_set();
+					auto s2 = jc.as_set();
+					if (s1.size() != s2.size()) {
+						ec = error::token_verification_error::claim_value_missmatch;
+						return;
+					}
+					auto it1 = s1.cbegin();
+					auto it2 = s2.cbegin();
+					while (it1 != s1.cend() && it2 != s2.cend()) {
+						if (*it1++ != *it2++) {
+							ec = error::token_verification_error::claim_value_missmatch;
+							return;
+						}
+					}
+				} else if (c.get_type() == json::type::object) {
+					if (json_traits::serialize(c.to_json()) != json_traits::serialize(jc.to_json())) {
+						ec = error::token_verification_error::claim_value_missmatch;
+						return;
+					}
+				} else if (c.get_type() == json::type::string) {
+					if (c.as_string() != jc.as_string()) {
+						ec = error::token_verification_error::claim_value_missmatch;
+						return;
+					}
+				} else
+					throw std::logic_error("internal error, should be unreachable");
+			};
+
+			auto time = clock.now();
+
+			if (jwt.has_expires_at()) {
+				auto leeway = claims.count("exp") == 1
+								  ? std::chrono::system_clock::to_time_t(claims.at("exp").as_date())
+								  : default_leeway;
+				auto exp = jwt.get_expires_at();
+				if (time > exp + std::chrono::seconds(leeway)) {
+					ec = error::token_verification_error::token_expired;
+					return;
+				}
+			}
+			if (jwt.has_issued_at()) {
+				auto leeway = claims.count("iat") == 1
+								  ? std::chrono::system_clock::to_time_t(claims.at("iat").as_date())
+								  : default_leeway;
+				auto iat = jwt.get_issued_at();
+				if (time < iat - std::chrono::seconds(leeway)) {
+					ec = error::token_verification_error::token_expired;
+					return;
+				}
+			}
+			if (jwt.has_not_before()) {
+				auto leeway = claims.count("nbf") == 1
+								  ? std::chrono::system_clock::to_time_t(claims.at("nbf").as_date())
+								  : default_leeway;
+				auto nbf = jwt.get_not_before();
+				if (time < nbf - std::chrono::seconds(leeway)) {
+					ec = error::token_verification_error::token_expired;
+					return;
+				}
+			}
+			for (auto& c : claims) {
+				if (c.first == "exp" || c.first == "iat" || c.first == "nbf") {
+					// Nothing to do here, already checked
+				} else if (c.first == "aud") {
+					if (!jwt.has_audience()) {
+						ec = error::token_verification_error::audience_missmatch;
+						return;
+					}
+					auto aud = jwt.get_audience();
+					typename basic_claim_t::set_t expected = {};
+					if (c.second.get_type() == json::type::string)
+						expected = {c.second.as_string()};
+					else
+						expected = c.second.as_set();
+					for (auto& e : expected) {
+						if (aud.count(e) == 0) {
+							ec = error::token_verification_error::audience_missmatch;
+							return;
+						}
+					}
+				} else {
+					assert_claim_eq(jwt, c.first, c.second, ec);
+					if (ec) return;
+				}
+			}
+		}
+	};
+
+	/**
+	 * Create a verifier using the given clock
+	 * \param c Clock instance to use
+	 * \return verifier instance
+	 */
+	template<typename Clock, typename json_traits>
+	verifier<Clock, json_traits> verify(Clock c) {
+		return verifier<Clock, json_traits>(c);
+	}
+
+	/**
+	 * Default clock class using std::chrono::system_clock as a backend.
+	 */
+	struct default_clock {
+		date now() const { return date::clock::now(); }
+	};
+
+	/**
+	 * Return a builder instance to create a new token
+	 */
+	template<typename json_traits>
+	builder<json_traits> create() {
+		return builder<json_traits>();
+	}
+
+	/**
+	 * Decode a token
+	 * \param token Token to decode
+	 * \param decode function that will pad and base64url decode the token
+	 * \return Decoded token
+	 * \throw std::invalid_argument Token is not in correct format
+	 * \throw std::runtime_error Base64 decoding failed or invalid json
+	 */
+	template<typename json_traits, typename Decode>
+	decoded_jwt<json_traits> decode(const typename json_traits::string_type& token, Decode decode) {
+		return decoded_jwt<json_traits>(token, decode);
+	}
+
+	/**
+	 * Decode a token
+	 * \param token Token to decode
+	 * \return Decoded token
+	 * \throw std::invalid_argument Token is not in correct format
+	 * \throw std::runtime_error Base64 decoding failed or invalid json
+	 */
+	template<typename json_traits>
+	decoded_jwt<json_traits> decode(const typename json_traits::string_type& token) {
+		return decoded_jwt<json_traits>(token);
+	}
+
+#ifndef JWT_DISABLE_PICOJSON
+	struct picojson_traits {
+		using value_type = picojson::value;
+		using object_type = picojson::object;
+		using array_type = picojson::array;
+		using string_type = std::string;
+		using number_type = double;
+		using integer_type = int64_t;
+		using boolean_type = bool;
+
+		static json::type get_type(const picojson::value& val) {
+			using json::type;
+			if (val.is<bool>()) return type::boolean;
+			if (val.is<int64_t>()) return type::integer;
+			if (val.is<double>()) return type::number;
+			if (val.is<std::string>()) return type::string;
+			if (val.is<picojson::array>()) return type::array;
+			if (val.is<picojson::object>()) return type::object;
+
+			throw std::logic_error("invalid type");
+		}
+
+		static picojson::object as_object(const picojson::value& val) {
+			if (!val.is<picojson::object>()) throw std::bad_cast();
+			return val.get<picojson::object>();
+		}
+
+		static std::string as_string(const picojson::value& val) {
+			if (!val.is<std::string>()) throw std::bad_cast();
+			return val.get<std::string>();
+		}
+
+		static picojson::array as_array(const picojson::value& val) {
+			if (!val.is<picojson::array>()) throw std::bad_cast();
+			return val.get<picojson::array>();
+		}
+
+		static int64_t as_int(const picojson::value& val) {
+			if (!val.is<int64_t>()) throw std::bad_cast();
+			return val.get<int64_t>();
+		}
+
+		static bool as_bool(const picojson::value& val) {
+			if (!val.is<bool>()) throw std::bad_cast();
+			return val.get<bool>();
+		}
+
+		static double as_number(const picojson::value& val) {
+			if (!val.is<double>()) throw std::bad_cast();
+			return val.get<double>();
+		}
+
+		static bool parse(picojson::value& val, const std::string& str) { return picojson::parse(val, str).empty(); }
+
+		static std::string serialize(const picojson::value& val) { return val.serialize(); }
+	};
+
+	/**
+	 * Default JSON claim
+	 *
+	 * This type is the default specialization of the \ref basic_claim class which
+	 * uses the standard template types.
+	 */
+	using claim = basic_claim<picojson_traits>;
+
+	/**
+	 * Create a verifier using the default clock
+	 * \return verifier instance
+	 */
+	inline verifier<default_clock, picojson_traits> verify() {
+		return verify<default_clock, picojson_traits>(default_clock{});
+	}
+	/**
+	 * Return a picojson builder instance to create a new token
+	 */
+	inline builder<picojson_traits> create() { return builder<picojson_traits>(); }
+#ifndef JWT_DISABLE_BASE64
+	/**
+	 * Decode a token
+	 * \param token Token to decode
+	 * \return Decoded token
+	 * \throw std::invalid_argument Token is not in correct format
+	 * \throw std::runtime_error Base64 decoding failed or invalid json
+	 */
+	inline decoded_jwt<picojson_traits> decode(const std::string& token) { return decoded_jwt<picojson_traits>(token); }
+#endif
+	/**
+	 * Decode a token
+	 * \tparam Decode is callabled, taking a string_type and returns a string_type.
+	 * It should ensure the padding of the input and then base64url decode and
+	 * return the results.
+	 * \param token Token to decode
+	 * \param decode The token to parse
+	 * \return Decoded token
+	 * \throw std::invalid_argument Token is not in correct format
+	 * \throw std::runtime_error Base64 decoding failed or invalid json
+	 */
+	template<typename Decode>
+	decoded_jwt<picojson_traits> decode(const std::string& token, Decode decode) {
+		return decoded_jwt<picojson_traits>(token, decode);
+	}
+#endif
+} // namespace jwt
+
+template<typename json_traits>
+std::istream& operator>>(std::istream& is, jwt::basic_claim<json_traits>& c) {
+	return c.operator>>(is);
+}
+
+template<typename json_traits>
+std::ostream& operator<<(std::ostream& os, const jwt::basic_claim<json_traits>& c) {
+	return os << c.to_json();
+}
+
+#endif
diff --git a/dep/jwt-cpp/include/nlohmann/json.hpp b/dep/jwt-cpp/include/nlohmann/json.hpp
new file mode 100644
index 000000000..a70aaf8cb
--- /dev/null
+++ b/dep/jwt-cpp/include/nlohmann/json.hpp
@@ -0,0 +1,25447 @@
+/*
+    __ _____ _____ _____
+ __|  |   __|     |   | |  JSON for Modern C++
+|  |  |__   |  |  | | | |  version 3.9.1
+|_____|_____|_____|_|___|  https://github.com/nlohmann/json
+
+Licensed under the MIT License <http://opensource.org/licenses/MIT>.
+SPDX-License-Identifier: MIT
+Copyright (c) 2013-2019 Niels Lohmann <http://nlohmann.me>.
+
+Permission is hereby  granted, free of charge, to any  person obtaining a copy
+of this software and associated  documentation files (the "Software"), to deal
+in the Software  without restriction, including without  limitation the rights
+to  use, copy,  modify, merge,  publish, distribute,  sublicense, and/or  sell
+copies  of  the Software,  and  to  permit persons  to  whom  the Software  is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE  IS PROVIDED "AS  IS", WITHOUT WARRANTY  OF ANY KIND,  EXPRESS OR
+IMPLIED,  INCLUDING BUT  NOT  LIMITED TO  THE  WARRANTIES OF  MERCHANTABILITY,
+FITNESS FOR  A PARTICULAR PURPOSE AND  NONINFRINGEMENT. IN NO EVENT  SHALL THE
+AUTHORS  OR COPYRIGHT  HOLDERS  BE  LIABLE FOR  ANY  CLAIM,  DAMAGES OR  OTHER
+LIABILITY, WHETHER IN AN ACTION OF  CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE  OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#ifndef INCLUDE_NLOHMANN_JSON_HPP_
+#define INCLUDE_NLOHMANN_JSON_HPP_
+
+#define NLOHMANN_JSON_VERSION_MAJOR 3
+#define NLOHMANN_JSON_VERSION_MINOR 9
+#define NLOHMANN_JSON_VERSION_PATCH 1
+
+#include <algorithm> // all_of, find, for_each
+#include <cstddef> // nullptr_t, ptrdiff_t, size_t
+#include <functional> // hash, less
+#include <initializer_list> // initializer_list
+#include <iosfwd> // istream, ostream
+#include <iterator> // random_access_iterator_tag
+#include <memory> // unique_ptr
+#include <numeric> // accumulate
+#include <string> // string, stoi, to_string
+#include <utility> // declval, forward, move, pair, swap
+#include <vector> // vector
+
+// #include <nlohmann/adl_serializer.hpp>
+
+
+#include <utility>
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+
+#include <algorithm> // transform
+#include <array> // array
+#include <forward_list> // forward_list
+#include <iterator> // inserter, front_inserter, end
+#include <map> // map
+#include <string> // string
+#include <tuple> // tuple, make_tuple
+#include <type_traits> // is_arithmetic, is_same, is_enum, underlying_type, is_convertible
+#include <unordered_map> // unordered_map
+#include <utility> // pair, declval
+#include <valarray> // valarray
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+
+#include <exception> // exception
+#include <stdexcept> // runtime_error
+#include <string> // to_string
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+
+#include <cstddef> // size_t
+
+namespace nlohmann
+{
+namespace detail
+{
+/// struct to capture the start position of the current token
+struct position_t
+{
+    /// the total number of characters read
+    std::size_t chars_read_total = 0;
+    /// the number of characters read in the current line
+    std::size_t chars_read_current_line = 0;
+    /// the number of lines read
+    std::size_t lines_read = 0;
+
+    /// conversion to size_t to preserve SAX interface
+    constexpr operator size_t() const
+    {
+        return chars_read_total;
+    }
+};
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+#include <utility> // pair
+// #include <nlohmann/thirdparty/hedley/hedley.hpp>
+/* Hedley - https://nemequ.github.io/hedley
+ * Created by Evan Nemerson <evan@nemerson.com>
+ *
+ * To the extent possible under law, the author(s) have dedicated all
+ * copyright and related and neighboring rights to this software to
+ * the public domain worldwide. This software is distributed without
+ * any warranty.
+ *
+ * For details, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+ * SPDX-License-Identifier: CC0-1.0
+ */
+
+#if !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < 13)
+#if defined(JSON_HEDLEY_VERSION)
+    #undef JSON_HEDLEY_VERSION
+#endif
+#define JSON_HEDLEY_VERSION 13
+
+#if defined(JSON_HEDLEY_STRINGIFY_EX)
+    #undef JSON_HEDLEY_STRINGIFY_EX
+#endif
+#define JSON_HEDLEY_STRINGIFY_EX(x) #x
+
+#if defined(JSON_HEDLEY_STRINGIFY)
+    #undef JSON_HEDLEY_STRINGIFY
+#endif
+#define JSON_HEDLEY_STRINGIFY(x) JSON_HEDLEY_STRINGIFY_EX(x)
+
+#if defined(JSON_HEDLEY_CONCAT_EX)
+    #undef JSON_HEDLEY_CONCAT_EX
+#endif
+#define JSON_HEDLEY_CONCAT_EX(a,b) a##b
+
+#if defined(JSON_HEDLEY_CONCAT)
+    #undef JSON_HEDLEY_CONCAT
+#endif
+#define JSON_HEDLEY_CONCAT(a,b) JSON_HEDLEY_CONCAT_EX(a,b)
+
+#if defined(JSON_HEDLEY_CONCAT3_EX)
+    #undef JSON_HEDLEY_CONCAT3_EX
+#endif
+#define JSON_HEDLEY_CONCAT3_EX(a,b,c) a##b##c
+
+#if defined(JSON_HEDLEY_CONCAT3)
+    #undef JSON_HEDLEY_CONCAT3
+#endif
+#define JSON_HEDLEY_CONCAT3(a,b,c) JSON_HEDLEY_CONCAT3_EX(a,b,c)
+
+#if defined(JSON_HEDLEY_VERSION_ENCODE)
+    #undef JSON_HEDLEY_VERSION_ENCODE
+#endif
+#define JSON_HEDLEY_VERSION_ENCODE(major,minor,revision) (((major) * 1000000) + ((minor) * 1000) + (revision))
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MAJOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MAJOR(version) ((version) / 1000000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_MINOR)
+    #undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_MINOR(version) (((version) % 1000000) / 1000)
+
+#if defined(JSON_HEDLEY_VERSION_DECODE_REVISION)
+    #undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#endif
+#define JSON_HEDLEY_VERSION_DECODE_REVISION(version) ((version) % 1000)
+
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #undef JSON_HEDLEY_GNUC_VERSION
+#endif
+#if defined(__GNUC__) && defined(__GNUC_PATCHLEVEL__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#elif defined(__GNUC__)
+    #define JSON_HEDLEY_GNUC_VERSION JSON_HEDLEY_VERSION_ENCODE(__GNUC__, __GNUC_MINOR__, 0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GNUC_VERSION)
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GNUC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION)
+    #undef JSON_HEDLEY_MSVC_VERSION
+#endif
+#if defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 140000000)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 10000000, (_MSC_FULL_VER % 10000000) / 100000, (_MSC_FULL_VER % 100000) / 100)
+#elif defined(_MSC_FULL_VER)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_FULL_VER / 1000000, (_MSC_FULL_VER % 1000000) / 10000, (_MSC_FULL_VER % 10000) / 10)
+#elif defined(_MSC_VER)
+    #define JSON_HEDLEY_MSVC_VERSION JSON_HEDLEY_VERSION_ENCODE(_MSC_VER / 100, _MSC_VER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_MSVC_VERSION_CHECK)
+    #undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#endif
+#if !defined(_MSC_VER)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (0)
+#elif defined(_MSC_VER) && (_MSC_VER >= 1400)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 10000000) + (minor * 100000) + (patch)))
+#elif defined(_MSC_VER) && (_MSC_VER >= 1200)
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_FULL_VER >= ((major * 1000000) + (minor * 10000) + (patch)))
+#else
+    #define JSON_HEDLEY_MSVC_VERSION_CHECK(major,minor,patch) (_MSC_VER >= ((major * 100) + (minor)))
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #undef JSON_HEDLEY_INTEL_VERSION
+#endif
+#if defined(__INTEL_COMPILER) && defined(__INTEL_COMPILER_UPDATE)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, __INTEL_COMPILER_UPDATE)
+#elif defined(__INTEL_COMPILER)
+    #define JSON_HEDLEY_INTEL_VERSION JSON_HEDLEY_VERSION_ENCODE(__INTEL_COMPILER / 100, __INTEL_COMPILER % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_INTEL_VERSION_CHECK)
+    #undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_INTEL_VERSION)
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_INTEL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_INTEL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #undef JSON_HEDLEY_PGI_VERSION
+#endif
+#if defined(__PGI) && defined(__PGIC__) && defined(__PGIC_MINOR__) && defined(__PGIC_PATCHLEVEL__)
+    #define JSON_HEDLEY_PGI_VERSION JSON_HEDLEY_VERSION_ENCODE(__PGIC__, __PGIC_MINOR__, __PGIC_PATCHLEVEL__)
+#endif
+
+#if defined(JSON_HEDLEY_PGI_VERSION_CHECK)
+    #undef JSON_HEDLEY_PGI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PGI_VERSION)
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PGI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PGI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #undef JSON_HEDLEY_SUNPRO_VERSION
+#endif
+#if defined(__SUNPRO_C) && (__SUNPRO_C > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_C >> 16) & 0xf) * 10) + ((__SUNPRO_C >> 12) & 0xf), (((__SUNPRO_C >> 8) & 0xf) * 10) + ((__SUNPRO_C >> 4) & 0xf), (__SUNPRO_C & 0xf) * 10)
+#elif defined(__SUNPRO_C)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_C >> 8) & 0xf, (__SUNPRO_C >> 4) & 0xf, (__SUNPRO_C) & 0xf)
+#elif defined(__SUNPRO_CC) && (__SUNPRO_CC > 0x1000)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((((__SUNPRO_CC >> 16) & 0xf) * 10) + ((__SUNPRO_CC >> 12) & 0xf), (((__SUNPRO_CC >> 8) & 0xf) * 10) + ((__SUNPRO_CC >> 4) & 0xf), (__SUNPRO_CC & 0xf) * 10)
+#elif defined(__SUNPRO_CC)
+    #define JSON_HEDLEY_SUNPRO_VERSION JSON_HEDLEY_VERSION_ENCODE((__SUNPRO_CC >> 8) & 0xf, (__SUNPRO_CC >> 4) & 0xf, (__SUNPRO_CC) & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_SUNPRO_VERSION_CHECK)
+    #undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_SUNPRO_VERSION)
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_SUNPRO_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_SUNPRO_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#endif
+#if defined(__EMSCRIPTEN__)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION JSON_HEDLEY_VERSION_ENCODE(__EMSCRIPTEN_major__, __EMSCRIPTEN_minor__, __EMSCRIPTEN_tiny__)
+#endif
+
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK)
+    #undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_EMSCRIPTEN_VERSION)
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_EMSCRIPTEN_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #undef JSON_HEDLEY_ARM_VERSION
+#endif
+#if defined(__CC_ARM) && defined(__ARMCOMPILER_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCOMPILER_VERSION / 1000000, (__ARMCOMPILER_VERSION % 1000000) / 10000, (__ARMCOMPILER_VERSION % 10000) / 100)
+#elif defined(__CC_ARM) && defined(__ARMCC_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ARMCC_VERSION / 1000000, (__ARMCC_VERSION % 1000000) / 10000, (__ARMCC_VERSION % 10000) / 100)
+#endif
+
+#if defined(JSON_HEDLEY_ARM_VERSION_CHECK)
+    #undef JSON_HEDLEY_ARM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_ARM_VERSION)
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_ARM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_ARM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #undef JSON_HEDLEY_IBM_VERSION
+#endif
+#if defined(__ibmxl__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__ibmxl_version__, __ibmxl_release__, __ibmxl_modification__)
+#elif defined(__xlC__) && defined(__xlC_ver__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, (__xlC_ver__ >> 8) & 0xff)
+#elif defined(__xlC__)
+    #define JSON_HEDLEY_IBM_VERSION JSON_HEDLEY_VERSION_ENCODE(__xlC__ >> 8, __xlC__ & 0xff, 0)
+#endif
+
+#if defined(JSON_HEDLEY_IBM_VERSION_CHECK)
+    #undef JSON_HEDLEY_IBM_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IBM_VERSION)
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IBM_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IBM_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #undef JSON_HEDLEY_TI_VERSION
+#endif
+#if \
+    defined(__TI_COMPILER_VERSION__) && \
+    ( \
+      defined(__TMS470__) || defined(__TI_ARM__) || \
+      defined(__MSP430__) || \
+      defined(__TMS320C2000__) \
+    )
+#if (__TI_COMPILER_VERSION__ >= 16000000)
+    #define JSON_HEDLEY_TI_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+#endif
+
+#if defined(JSON_HEDLEY_TI_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_VERSION)
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C2000__)
+    #define JSON_HEDLEY_TI_CL2000_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL2000_VERSION)
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL2000_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL2000_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #undef JSON_HEDLEY_TI_CL430_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__MSP430__)
+    #define JSON_HEDLEY_TI_CL430_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL430_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL430_VERSION)
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL430_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL430_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && (defined(__TMS470__) || defined(__TI_ARM__))
+    #define JSON_HEDLEY_TI_ARMCL_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_ARMCL_VERSION)
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_ARMCL_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__TMS320C6X__)
+    #define JSON_HEDLEY_TI_CL6X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL6X_VERSION)
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL6X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL6X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__C7000__)
+    #define JSON_HEDLEY_TI_CL7X_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CL7X_VERSION)
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CL7X_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CL7X_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION
+#endif
+#if defined(__TI_COMPILER_VERSION__) && defined(__PRU__)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION JSON_HEDLEY_VERSION_ENCODE(__TI_COMPILER_VERSION__ / 1000000, (__TI_COMPILER_VERSION__ % 1000000) / 1000, (__TI_COMPILER_VERSION__ % 1000))
+#endif
+
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION_CHECK)
+    #undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TI_CLPRU_VERSION)
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TI_CLPRU_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #undef JSON_HEDLEY_CRAY_VERSION
+#endif
+#if defined(_CRAYC)
+    #if defined(_RELEASE_PATCHLEVEL)
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, _RELEASE_PATCHLEVEL)
+    #else
+        #define JSON_HEDLEY_CRAY_VERSION JSON_HEDLEY_VERSION_ENCODE(_RELEASE_MAJOR, _RELEASE_MINOR, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_CRAY_VERSION_CHECK)
+    #undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_CRAY_VERSION)
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_CRAY_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_CRAY_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #undef JSON_HEDLEY_IAR_VERSION
+#endif
+#if defined(__IAR_SYSTEMS_ICC__)
+    #if __VER__ > 1000
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE((__VER__ / 1000000), ((__VER__ / 1000) % 1000), (__VER__ % 1000))
+    #else
+        #define JSON_HEDLEY_IAR_VERSION JSON_HEDLEY_VERSION_ENCODE(VER / 100, __VER__ % 100, 0)
+    #endif
+#endif
+
+#if defined(JSON_HEDLEY_IAR_VERSION_CHECK)
+    #undef JSON_HEDLEY_IAR_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_IAR_VERSION)
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_IAR_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_IAR_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #undef JSON_HEDLEY_TINYC_VERSION
+#endif
+#if defined(__TINYC__)
+    #define JSON_HEDLEY_TINYC_VERSION JSON_HEDLEY_VERSION_ENCODE(__TINYC__ / 1000, (__TINYC__ / 100) % 10, __TINYC__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_TINYC_VERSION_CHECK)
+    #undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_TINYC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_TINYC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #undef JSON_HEDLEY_DMC_VERSION
+#endif
+#if defined(__DMC__)
+    #define JSON_HEDLEY_DMC_VERSION JSON_HEDLEY_VERSION_ENCODE(__DMC__ >> 8, (__DMC__ >> 4) & 0xf, __DMC__ & 0xf)
+#endif
+
+#if defined(JSON_HEDLEY_DMC_VERSION_CHECK)
+    #undef JSON_HEDLEY_DMC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_DMC_VERSION)
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_DMC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_DMC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #undef JSON_HEDLEY_COMPCERT_VERSION
+#endif
+#if defined(__COMPCERT_VERSION__)
+    #define JSON_HEDLEY_COMPCERT_VERSION JSON_HEDLEY_VERSION_ENCODE(__COMPCERT_VERSION__ / 10000, (__COMPCERT_VERSION__ / 100) % 100, __COMPCERT_VERSION__ % 100)
+#endif
+
+#if defined(JSON_HEDLEY_COMPCERT_VERSION_CHECK)
+    #undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_COMPCERT_VERSION)
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_COMPCERT_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_COMPCERT_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #undef JSON_HEDLEY_PELLES_VERSION
+#endif
+#if defined(__POCC__)
+    #define JSON_HEDLEY_PELLES_VERSION JSON_HEDLEY_VERSION_ENCODE(__POCC__ / 100, __POCC__ % 100, 0)
+#endif
+
+#if defined(JSON_HEDLEY_PELLES_VERSION_CHECK)
+    #undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_PELLES_VERSION)
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_PELLES_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_PELLES_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #undef JSON_HEDLEY_GCC_VERSION
+#endif
+#if \
+    defined(JSON_HEDLEY_GNUC_VERSION) && \
+    !defined(__clang__) && \
+    !defined(JSON_HEDLEY_INTEL_VERSION) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_ARM_VERSION) && \
+    !defined(JSON_HEDLEY_TI_VERSION) && \
+    !defined(JSON_HEDLEY_TI_ARMCL_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL430_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL2000_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL6X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CL7X_VERSION) && \
+    !defined(JSON_HEDLEY_TI_CLPRU_VERSION) && \
+    !defined(__COMPCERT__)
+    #define JSON_HEDLEY_GCC_VERSION JSON_HEDLEY_GNUC_VERSION
+#endif
+
+#if defined(JSON_HEDLEY_GCC_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_VERSION_CHECK
+#endif
+#if defined(JSON_HEDLEY_GCC_VERSION)
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (JSON_HEDLEY_GCC_VERSION >= JSON_HEDLEY_VERSION_ENCODE(major, minor, patch))
+#else
+    #define JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#endif
+#if defined(__has_attribute)
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) __has_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#endif
+#if \
+    defined(__has_cpp_attribute) && \
+    defined(__cplusplus) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS)
+    #undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#endif
+#if !defined(__cplusplus) || !defined(__has_cpp_attribute)
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#elif \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_IAR_VERSION) && \
+    (!defined(JSON_HEDLEY_SUNPRO_VERSION) || JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0)) && \
+    (!defined(JSON_HEDLEY_MSVC_VERSION) || JSON_HEDLEY_MSVC_VERSION_CHECK(19,20,0))
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(ns::attribute)
+#else
+    #define JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(ns,attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#endif
+#if defined(__has_cpp_attribute) && defined(__cplusplus)
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) __has_cpp_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_BUILTIN)
+    #undef JSON_HEDLEY_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_HAS_BUILTIN(builtin) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_BUILTIN)
+    #undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#endif
+#if defined(__has_builtin)
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) __has_builtin(builtin)
+#else
+    #define JSON_HEDLEY_GCC_HAS_BUILTIN(builtin,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_FEATURE)
+    #undef JSON_HEDLEY_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_HAS_FEATURE(feature) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_HAS_FEATURE(feature) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_FEATURE)
+    #undef JSON_HEDLEY_GCC_HAS_FEATURE
+#endif
+#if defined(__has_feature)
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) __has_feature(feature)
+#else
+    #define JSON_HEDLEY_GCC_HAS_FEATURE(feature,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_EXTENSION)
+    #undef JSON_HEDLEY_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_HAS_EXTENSION(extension) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_EXTENSION)
+    #undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#endif
+#if defined(__has_extension)
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) __has_extension(extension)
+#else
+    #define JSON_HEDLEY_GCC_HAS_EXTENSION(extension,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#endif
+#if defined(__has_declspec_attribute)
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) __has_declspec_attribute(attribute)
+#else
+    #define JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE(attribute,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_HAS_WARNING)
+    #undef JSON_HEDLEY_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_HAS_WARNING(warning) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_HAS_WARNING(warning) (0)
+#endif
+
+#if defined(JSON_HEDLEY_GNUC_HAS_WARNING)
+    #undef JSON_HEDLEY_GNUC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GNUC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GNUC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_GCC_HAS_WARNING)
+    #undef JSON_HEDLEY_GCC_HAS_WARNING
+#endif
+#if defined(__has_warning)
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) __has_warning(warning)
+#else
+    #define JSON_HEDLEY_GCC_HAS_WARNING(warning,major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+/* JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat")
+#    if JSON_HEDLEY_HAS_WARNING("-Wc++17-extensions")
+#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    _Pragma("clang diagnostic ignored \"-Wc++17-extensions\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    else
+#      define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(xpr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wc++98-compat\"") \
+    xpr \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    endif
+#  endif
+#endif
+#if !defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(x) x
+#endif
+
+#if defined(JSON_HEDLEY_CONST_CAST)
+    #undef JSON_HEDLEY_CONST_CAST
+#endif
+#if defined(__cplusplus)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (const_cast<T>(expr))
+#elif \
+  JSON_HEDLEY_HAS_WARNING("-Wcast-qual") || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_CONST_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_CONST_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_REINTERPRET_CAST)
+    #undef JSON_HEDLEY_REINTERPRET_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) (reinterpret_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_REINTERPRET_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_CAST)
+    #undef JSON_HEDLEY_STATIC_CAST
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) (static_cast<T>(expr))
+#else
+    #define JSON_HEDLEY_STATIC_CAST(T, expr) ((T) (expr))
+#endif
+
+#if defined(JSON_HEDLEY_CPP_CAST)
+    #undef JSON_HEDLEY_CPP_CAST
+#endif
+#if defined(__cplusplus)
+#  if JSON_HEDLEY_HAS_WARNING("-Wold-style-cast")
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wold-style-cast\"") \
+    ((T) (expr)) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  elif JSON_HEDLEY_IAR_VERSION_CHECK(8,3,0)
+#    define JSON_HEDLEY_CPP_CAST(T, expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("diag_suppress=Pe137") \
+    JSON_HEDLEY_DIAGNOSTIC_POP \
+#  else
+#    define JSON_HEDLEY_CPP_CAST(T, expr) ((T) (expr))
+#  endif
+#else
+#  define JSON_HEDLEY_CPP_CAST(T, expr) (expr)
+#endif
+
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    defined(__clang__) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,17) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(8,0,0) || \
+    (JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) && defined(__C99_PRAGMA_OPERATOR))
+    #define JSON_HEDLEY_PRAGMA(value) _Pragma(#value)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_PRAGMA(value) __pragma(value)
+#else
+    #define JSON_HEDLEY_PRAGMA(value)
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_PUSH)
+    #undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#endif
+#if defined(JSON_HEDLEY_DIAGNOSTIC_POP)
+    #undef JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("clang diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("clang diagnostic pop")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("GCC diagnostic push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("GCC diagnostic pop")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH __pragma(warning(push))
+    #define JSON_HEDLEY_DIAGNOSTIC_POP __pragma(warning(pop))
+#elif JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("pop")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,4,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("diag_push")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("diag_pop")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH _Pragma("warning(push)")
+    #define JSON_HEDLEY_DIAGNOSTIC_POP _Pragma("warning(pop)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_PUSH
+    #define JSON_HEDLEY_DIAGNOSTIC_POP
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wdeprecated-declarations")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warning(disable:1478 1786)")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1215,1444")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED __pragma(warning(disable:4996))
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress 1291,1718")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,E_DEPRECATED_ATT,E_DEPRECATED_ATT_MESS)")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("error_messages(off,symdeprecated,symdeprecated2)")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("diag_suppress=Pe1444,Pe1215")
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,90,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED _Pragma("warn(disable:2241)")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("clang diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("warning(disable:161)")
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 1675")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("GCC diagnostic ignored \"-Wunknown-pragmas\"")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS __pragma(warning(disable:4068))
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(16,9,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress 163")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS _Pragma("diag_suppress=Pe161")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-attributes")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("clang diagnostic ignored \"-Wunknown-attributes\"")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(4,6,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("warning(disable:1292)")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES __pragma(warning(disable:5030))
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1097")
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("error_messages(off,attrskipunsup)")
+#elif \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress 1173")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES _Pragma("diag_suppress=Pe1097")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#endif
+
+#if defined(JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL)
+    #undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wcast-qual")
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("clang diagnostic ignored \"-Wcast-qual\"")
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("warning(disable:2203 2331)")
+#elif JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0)
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL _Pragma("GCC diagnostic ignored \"-Wcast-qual\"")
+#else
+    #define JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#endif
+
+#if defined(JSON_HEDLEY_DEPRECATED)
+    #undef JSON_HEDLEY_DEPRECATED
+#endif
+#if defined(JSON_HEDLEY_DEPRECATED_FOR)
+    #undef JSON_HEDLEY_DEPRECATED_FOR
+#endif
+#if JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated("Since " # since))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated("Since " #since "; use " #replacement))
+#elif defined(__cplusplus) && (__cplusplus >= 201402L)
+    #define JSON_HEDLEY_DEPRECATED(since) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since)]])
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[deprecated("Since " #since "; use " #replacement)]])
+#elif \
+    JSON_HEDLEY_HAS_EXTENSION(attribute_deprecated_with_message) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,13,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(18,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,3,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,3,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__("Since " #since)))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__("Since " #since "; use " #replacement)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(deprecated) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __attribute__((__deprecated__))
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __attribute__((__deprecated__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_PELLES_VERSION_CHECK(6,50,0)
+    #define JSON_HEDLEY_DEPRECATED(since) __declspec(deprecated)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) __declspec(deprecated)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_DEPRECATED(since) _Pragma("deprecated")
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement) _Pragma("deprecated")
+#else
+    #define JSON_HEDLEY_DEPRECATED(since)
+    #define JSON_HEDLEY_DEPRECATED_FOR(since, replacement)
+#endif
+
+#if defined(JSON_HEDLEY_UNAVAILABLE)
+    #undef JSON_HEDLEY_UNAVAILABLE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warning) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_UNAVAILABLE(available_since) __attribute__((__warning__("Not available until " #available_since)))
+#else
+    #define JSON_HEDLEY_UNAVAILABLE(available_since)
+#endif
+
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#endif
+#if defined(JSON_HEDLEY_WARN_UNUSED_RESULT_MSG)
+    #undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#endif
+#if (JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard) >= 201907L)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard(msg)]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(nodiscard)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[nodiscard]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(warn_unused_result) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT __attribute__((__warn_unused_result__))
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) __attribute__((__warn_unused_result__))
+#elif defined(_Check_return_) /* SAL */
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT _Check_return_
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg) _Check_return_
+#else
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT
+    #define JSON_HEDLEY_WARN_UNUSED_RESULT_MSG(msg)
+#endif
+
+#if defined(JSON_HEDLEY_SENTINEL)
+    #undef JSON_HEDLEY_SENTINEL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(sentinel) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0)
+    #define JSON_HEDLEY_SENTINEL(position) __attribute__((__sentinel__(position)))
+#else
+    #define JSON_HEDLEY_SENTINEL(position)
+#endif
+
+#if defined(JSON_HEDLEY_NO_RETURN)
+    #undef JSON_HEDLEY_NO_RETURN
+#endif
+#if JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NO_RETURN __noreturn
+#elif JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+    #define JSON_HEDLEY_NO_RETURN _Noreturn
+#elif defined(__cplusplus) && (__cplusplus >= 201103L)
+    #define JSON_HEDLEY_NO_RETURN JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[noreturn]])
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noreturn) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,2,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute__((__noreturn__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("does_not_return")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NO_RETURN _Pragma("FUNC_NEVER_RETURNS;")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NO_RETURN __attribute((noreturn))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NO_RETURN __declspec(noreturn)
+#else
+    #define JSON_HEDLEY_NO_RETURN
+#endif
+
+#if defined(JSON_HEDLEY_NO_ESCAPE)
+    #undef JSON_HEDLEY_NO_ESCAPE
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(noescape)
+    #define JSON_HEDLEY_NO_ESCAPE __attribute__((__noescape__))
+#else
+    #define JSON_HEDLEY_NO_ESCAPE
+#endif
+
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #undef JSON_HEDLEY_UNREACHABLE
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE_RETURN)
+    #undef JSON_HEDLEY_UNREACHABLE_RETURN
+#endif
+#if defined(JSON_HEDLEY_ASSUME)
+    #undef JSON_HEDLEY_ASSUME
+#endif
+#if \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_ASSUME(expr) __assume(expr)
+#elif JSON_HEDLEY_HAS_BUILTIN(__builtin_assume)
+    #define JSON_HEDLEY_ASSUME(expr) __builtin_assume(expr)
+#elif \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+    #if defined(__cplusplus)
+        #define JSON_HEDLEY_ASSUME(expr) std::_nassert(expr)
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) _nassert(expr)
+    #endif
+#endif
+#if \
+    (JSON_HEDLEY_HAS_BUILTIN(__builtin_unreachable) && (!defined(JSON_HEDLEY_ARM_VERSION))) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,5,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(18,10,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,5)
+    #define JSON_HEDLEY_UNREACHABLE() __builtin_unreachable()
+#elif defined(JSON_HEDLEY_ASSUME)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+#if !defined(JSON_HEDLEY_ASSUME)
+    #if defined(JSON_HEDLEY_UNREACHABLE)
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, ((expr) ? 1 : (JSON_HEDLEY_UNREACHABLE(), 1)))
+    #else
+        #define JSON_HEDLEY_ASSUME(expr) JSON_HEDLEY_STATIC_CAST(void, expr)
+    #endif
+#endif
+#if defined(JSON_HEDLEY_UNREACHABLE)
+    #if  \
+        JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0)
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (JSON_HEDLEY_STATIC_CAST(void, JSON_HEDLEY_ASSUME(0)), (value))
+    #else
+        #define JSON_HEDLEY_UNREACHABLE_RETURN(value) JSON_HEDLEY_UNREACHABLE()
+    #endif
+#else
+    #define JSON_HEDLEY_UNREACHABLE_RETURN(value) return (value)
+#endif
+#if !defined(JSON_HEDLEY_UNREACHABLE)
+    #define JSON_HEDLEY_UNREACHABLE() JSON_HEDLEY_ASSUME(0)
+#endif
+
+JSON_HEDLEY_DIAGNOSTIC_PUSH
+#if JSON_HEDLEY_HAS_WARNING("-Wpedantic")
+    #pragma clang diagnostic ignored "-Wpedantic"
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wc++98-compat-pedantic") && defined(__cplusplus)
+    #pragma clang diagnostic ignored "-Wc++98-compat-pedantic"
+#endif
+#if JSON_HEDLEY_GCC_HAS_WARNING("-Wvariadic-macros",4,0,0)
+    #if defined(__clang__)
+        #pragma clang diagnostic ignored "-Wvariadic-macros"
+    #elif defined(JSON_HEDLEY_GCC_VERSION)
+        #pragma GCC diagnostic ignored "-Wvariadic-macros"
+    #endif
+#endif
+#if defined(JSON_HEDLEY_NON_NULL)
+    #undef JSON_HEDLEY_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NON_NULL(...) __attribute__((__nonnull__(__VA_ARGS__)))
+#else
+    #define JSON_HEDLEY_NON_NULL(...)
+#endif
+JSON_HEDLEY_DIAGNOSTIC_POP
+
+#if defined(JSON_HEDLEY_PRINTF_FORMAT)
+    #undef JSON_HEDLEY_PRINTF_FORMAT
+#endif
+#if defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && !defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(ms_printf, string_idx, first_to_check)))
+#elif defined(__MINGW32__) && JSON_HEDLEY_GCC_HAS_ATTRIBUTE(format,4,4,0) && defined(__USE_MINGW_ANSI_STDIO)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(gnu_printf, string_idx, first_to_check)))
+#elif \
+    JSON_HEDLEY_HAS_ATTRIBUTE(format) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(5,6,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __attribute__((__format__(__printf__, string_idx, first_to_check)))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(6,0,0)
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check) __declspec(vaformat(printf,string_idx,first_to_check))
+#else
+    #define JSON_HEDLEY_PRINTF_FORMAT(string_idx,first_to_check)
+#endif
+
+#if defined(JSON_HEDLEY_CONSTEXPR)
+    #undef JSON_HEDLEY_CONSTEXPR
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_CONSTEXPR JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(constexpr)
+    #endif
+#endif
+#if !defined(JSON_HEDLEY_CONSTEXPR)
+    #define JSON_HEDLEY_CONSTEXPR
+#endif
+
+#if defined(JSON_HEDLEY_PREDICT)
+    #undef JSON_HEDLEY_PREDICT
+#endif
+#if defined(JSON_HEDLEY_LIKELY)
+    #undef JSON_HEDLEY_LIKELY
+#endif
+#if defined(JSON_HEDLEY_UNLIKELY)
+    #undef JSON_HEDLEY_UNLIKELY
+#endif
+#if defined(JSON_HEDLEY_UNPREDICTABLE)
+    #undef JSON_HEDLEY_UNPREDICTABLE
+#endif
+#if JSON_HEDLEY_HAS_BUILTIN(__builtin_unpredictable)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) __builtin_unpredictable((expr))
+#endif
+#if \
+  JSON_HEDLEY_HAS_BUILTIN(__builtin_expect_with_probability) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(9,0,0)
+#  define JSON_HEDLEY_PREDICT(expr, value, probability) __builtin_expect_with_probability(  (expr), (value), (probability))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability)   __builtin_expect_with_probability(!!(expr),    1   , (probability))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability)  __builtin_expect_with_probability(!!(expr),    0   , (probability))
+#  define JSON_HEDLEY_LIKELY(expr)                      __builtin_expect                 (!!(expr),    1                  )
+#  define JSON_HEDLEY_UNLIKELY(expr)                    __builtin_expect                 (!!(expr),    0                  )
+#elif \
+  JSON_HEDLEY_HAS_BUILTIN(__builtin_expect) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(3,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,15,0) && defined(__cplusplus)) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,7,0) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,27) || \
+  JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0)
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) \
+    (((probability) >= 0.9) ? __builtin_expect((expr), (expected)) : (JSON_HEDLEY_STATIC_CAST(void, expected), (expr)))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 1) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 0) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) \
+    (__extension__ ({ \
+        double hedley_probability_ = (probability); \
+        ((hedley_probability_ >= 0.9) ? __builtin_expect(!!(expr), 0) : ((hedley_probability_ <= 0.1) ? __builtin_expect(!!(expr), 1) : !!(expr))); \
+    }))
+#  define JSON_HEDLEY_LIKELY(expr)   __builtin_expect(!!(expr), 1)
+#  define JSON_HEDLEY_UNLIKELY(expr) __builtin_expect(!!(expr), 0)
+#else
+#  define JSON_HEDLEY_PREDICT(expr, expected, probability) (JSON_HEDLEY_STATIC_CAST(void, expected), (expr))
+#  define JSON_HEDLEY_PREDICT_TRUE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_PREDICT_FALSE(expr, probability) (!!(expr))
+#  define JSON_HEDLEY_LIKELY(expr) (!!(expr))
+#  define JSON_HEDLEY_UNLIKELY(expr) (!!(expr))
+#endif
+#if !defined(JSON_HEDLEY_UNPREDICTABLE)
+    #define JSON_HEDLEY_UNPREDICTABLE(expr) JSON_HEDLEY_PREDICT(expr, 1, 0.5)
+#endif
+
+#if defined(JSON_HEDLEY_MALLOC)
+    #undef JSON_HEDLEY_MALLOC
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(malloc) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_MALLOC __attribute__((__malloc__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_MALLOC _Pragma("returns_new_memory")
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(14, 0, 0)
+    #define JSON_HEDLEY_MALLOC __declspec(restrict)
+#else
+    #define JSON_HEDLEY_MALLOC
+#endif
+
+#if defined(JSON_HEDLEY_PURE)
+    #undef JSON_HEDLEY_PURE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(pure) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(2,96,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+#  define JSON_HEDLEY_PURE __attribute__((__pure__))
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+#  define JSON_HEDLEY_PURE _Pragma("does_not_write_global_data")
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(2,0,1) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(4,0,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) \
+    )
+#  define JSON_HEDLEY_PURE _Pragma("FUNC_IS_PURE;")
+#else
+#  define JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_CONST)
+    #undef JSON_HEDLEY_CONST
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(const) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(2,5,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0)
+    #define JSON_HEDLEY_CONST __attribute__((__const__))
+#elif \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0)
+    #define JSON_HEDLEY_CONST _Pragma("no_side_effect")
+#else
+    #define JSON_HEDLEY_CONST JSON_HEDLEY_PURE
+#endif
+
+#if defined(JSON_HEDLEY_RESTRICT)
+    #undef JSON_HEDLEY_RESTRICT
+#endif
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT restrict
+#elif \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(14,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_PGI_VERSION_CHECK(17,10,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,4) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,1,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,14,0) && defined(__cplusplus)) || \
+    JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0) || \
+    defined(__clang__)
+    #define JSON_HEDLEY_RESTRICT __restrict
+#elif JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,3,0) && !defined(__cplusplus)
+    #define JSON_HEDLEY_RESTRICT _Restrict
+#else
+    #define JSON_HEDLEY_RESTRICT
+#endif
+
+#if defined(JSON_HEDLEY_INLINE)
+    #undef JSON_HEDLEY_INLINE
+#endif
+#if \
+    (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L)) || \
+    (defined(__cplusplus) && (__cplusplus >= 199711L))
+    #define JSON_HEDLEY_INLINE inline
+#elif \
+    defined(JSON_HEDLEY_GCC_VERSION) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(6,2,0)
+    #define JSON_HEDLEY_INLINE __inline__
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,1,0) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(3,1,0) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,2,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(8,0,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_INLINE __inline
+#else
+    #define JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_ALWAYS_INLINE)
+    #undef JSON_HEDLEY_ALWAYS_INLINE
+#endif
+#if \
+  JSON_HEDLEY_HAS_ATTRIBUTE(always_inline) || \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+  JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+  JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+  JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+  JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+  (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+  (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+  (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+  (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+  JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+  JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+  JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __attribute__((__always_inline__)) JSON_HEDLEY_INLINE
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(12,0,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE __forceinline
+#elif defined(__cplusplus) && \
+    ( \
+      JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+      JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+      JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+      JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+      JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+      JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0) \
+    )
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("FUNC_ALWAYS_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_ALWAYS_INLINE _Pragma("inline=forced")
+#else
+#  define JSON_HEDLEY_ALWAYS_INLINE JSON_HEDLEY_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_NEVER_INLINE)
+    #undef JSON_HEDLEY_NEVER_INLINE
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(noinline) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,0,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(10,1,0) || \
+    JSON_HEDLEY_TI_VERSION_CHECK(15,12,0) || \
+    (JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(4,8,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_ARMCL_VERSION_CHECK(5,2,0) || \
+    (JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL2000_VERSION_CHECK(6,4,0) || \
+    (JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,0,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL430_VERSION_CHECK(4,3,0) || \
+    (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) || \
+    JSON_HEDLEY_TI_CL7X_VERSION_CHECK(1,2,0) || \
+    JSON_HEDLEY_TI_CLPRU_VERSION_CHECK(2,1,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute__((__noinline__))
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(13,10,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#elif JSON_HEDLEY_PGI_VERSION_CHECK(10,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("noinline")
+#elif JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,0,0) && defined(__cplusplus)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("FUNC_CANNOT_INLINE;")
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE _Pragma("inline=never")
+#elif JSON_HEDLEY_COMPCERT_VERSION_CHECK(3,2,0)
+    #define JSON_HEDLEY_NEVER_INLINE __attribute((noinline))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(9,0,0)
+    #define JSON_HEDLEY_NEVER_INLINE __declspec(noinline)
+#else
+    #define JSON_HEDLEY_NEVER_INLINE
+#endif
+
+#if defined(JSON_HEDLEY_PRIVATE)
+    #undef JSON_HEDLEY_PRIVATE
+#endif
+#if defined(JSON_HEDLEY_PUBLIC)
+    #undef JSON_HEDLEY_PUBLIC
+#endif
+#if defined(JSON_HEDLEY_IMPORT)
+    #undef JSON_HEDLEY_IMPORT
+#endif
+#if defined(_WIN32) || defined(__CYGWIN__)
+#  define JSON_HEDLEY_PRIVATE
+#  define JSON_HEDLEY_PUBLIC   __declspec(dllexport)
+#  define JSON_HEDLEY_IMPORT   __declspec(dllimport)
+#else
+#  if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(visibility) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,11,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    ( \
+      defined(__TI_EABI__) && \
+      ( \
+        (JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,2,0) && defined(__TI_GNU_ATTRIBUTE_SUPPORT__)) || \
+        JSON_HEDLEY_TI_CL6X_VERSION_CHECK(7,5,0) \
+      ) \
+    )
+#    define JSON_HEDLEY_PRIVATE __attribute__((__visibility__("hidden")))
+#    define JSON_HEDLEY_PUBLIC  __attribute__((__visibility__("default")))
+#  else
+#    define JSON_HEDLEY_PRIVATE
+#    define JSON_HEDLEY_PUBLIC
+#  endif
+#  define JSON_HEDLEY_IMPORT    extern
+#endif
+
+#if defined(JSON_HEDLEY_NO_THROW)
+    #undef JSON_HEDLEY_NO_THROW
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(nothrow) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,3,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+    #define JSON_HEDLEY_NO_THROW __attribute__((__nothrow__))
+#elif \
+    JSON_HEDLEY_MSVC_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0)
+    #define JSON_HEDLEY_NO_THROW __declspec(nothrow)
+#else
+    #define JSON_HEDLEY_NO_THROW
+#endif
+
+#if defined(JSON_HEDLEY_FALL_THROUGH)
+    #undef JSON_HEDLEY_FALL_THROUGH
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(fallthrough) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(7,0,0)
+    #define JSON_HEDLEY_FALL_THROUGH __attribute__((__fallthrough__))
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS(clang,fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[clang::fallthrough]])
+#elif JSON_HEDLEY_HAS_CPP_ATTRIBUTE(fallthrough)
+    #define JSON_HEDLEY_FALL_THROUGH JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_([[fallthrough]])
+#elif defined(__fallthrough) /* SAL */
+    #define JSON_HEDLEY_FALL_THROUGH __fallthrough
+#else
+    #define JSON_HEDLEY_FALL_THROUGH
+#endif
+
+#if defined(JSON_HEDLEY_RETURNS_NON_NULL)
+    #undef JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+#if \
+    JSON_HEDLEY_HAS_ATTRIBUTE(returns_nonnull) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0)
+    #define JSON_HEDLEY_RETURNS_NON_NULL __attribute__((__returns_nonnull__))
+#elif defined(_Ret_notnull_) /* SAL */
+    #define JSON_HEDLEY_RETURNS_NON_NULL _Ret_notnull_
+#else
+    #define JSON_HEDLEY_RETURNS_NON_NULL
+#endif
+
+#if defined(JSON_HEDLEY_ARRAY_PARAM)
+    #undef JSON_HEDLEY_ARRAY_PARAM
+#endif
+#if \
+    defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) && \
+    !defined(__STDC_NO_VLA__) && \
+    !defined(__cplusplus) && \
+    !defined(JSON_HEDLEY_PGI_VERSION) && \
+    !defined(JSON_HEDLEY_TINYC_VERSION)
+    #define JSON_HEDLEY_ARRAY_PARAM(name) (name)
+#else
+    #define JSON_HEDLEY_ARRAY_PARAM(name)
+#endif
+
+#if defined(JSON_HEDLEY_IS_CONSTANT)
+    #undef JSON_HEDLEY_IS_CONSTANT
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_CONSTEXPR)
+    #undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#endif
+/* JSON_HEDLEY_IS_CONSTEXPR_ is for
+   HEDLEY INTERNAL USE ONLY.  API subject to change without notice. */
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #undef JSON_HEDLEY_IS_CONSTEXPR_
+#endif
+#if \
+    JSON_HEDLEY_HAS_BUILTIN(__builtin_constant_p) || \
+    JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+    JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+    JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,19) || \
+    JSON_HEDLEY_ARM_VERSION_CHECK(4,1,0) || \
+    JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+    JSON_HEDLEY_TI_CL6X_VERSION_CHECK(6,1,0) || \
+    (JSON_HEDLEY_SUNPRO_VERSION_CHECK(5,10,0) && !defined(__cplusplus)) || \
+    JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0)
+    #define JSON_HEDLEY_IS_CONSTANT(expr) __builtin_constant_p(expr)
+#endif
+#if !defined(__cplusplus)
+#  if \
+       JSON_HEDLEY_HAS_BUILTIN(__builtin_types_compatible_p) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(3,4,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(13,1,0) || \
+       JSON_HEDLEY_CRAY_VERSION_CHECK(8,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,4,0) || \
+       JSON_HEDLEY_TINYC_VERSION_CHECK(0,9,24)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0)), int*)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) __builtin_types_compatible_p(__typeof__((1 ? (void*) ((intptr_t) ((expr) * 0)) : (int*) 0)), int*)
+#endif
+#  elif \
+       ( \
+          defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L) && \
+          !defined(JSON_HEDLEY_SUNPRO_VERSION) && \
+          !defined(JSON_HEDLEY_PGI_VERSION) && \
+          !defined(JSON_HEDLEY_IAR_VERSION)) || \
+       JSON_HEDLEY_HAS_EXTENSION(c_generic_selections) || \
+       JSON_HEDLEY_GCC_VERSION_CHECK(4,9,0) || \
+       JSON_HEDLEY_INTEL_VERSION_CHECK(17,0,0) || \
+       JSON_HEDLEY_IBM_VERSION_CHECK(12,1,0) || \
+       JSON_HEDLEY_ARM_VERSION_CHECK(5,3,0)
+#if defined(__INTPTR_TYPE__)
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((__INTPTR_TYPE__) ((expr) * 0)) : (int*) 0), int*: 1, void*: 0)
+#else
+    #include <stdint.h>
+    #define JSON_HEDLEY_IS_CONSTEXPR_(expr) _Generic((1 ? (void*) ((intptr_t) * 0) : (int*) 0), int*: 1, void*: 0)
+#endif
+#  elif \
+       defined(JSON_HEDLEY_GCC_VERSION) || \
+       defined(JSON_HEDLEY_INTEL_VERSION) || \
+       defined(JSON_HEDLEY_TINYC_VERSION) || \
+       defined(JSON_HEDLEY_TI_ARMCL_VERSION) || \
+       JSON_HEDLEY_TI_CL430_VERSION_CHECK(18,12,0) || \
+       defined(JSON_HEDLEY_TI_CL2000_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL6X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CL7X_VERSION) || \
+       defined(JSON_HEDLEY_TI_CLPRU_VERSION) || \
+       defined(__clang__)
+#    define JSON_HEDLEY_IS_CONSTEXPR_(expr) ( \
+        sizeof(void) != \
+        sizeof(*( \
+                  1 ? \
+                  ((void*) ((expr) * 0L) ) : \
+((struct { char v[sizeof(void) * 2]; } *) 1) \
+                ) \
+              ) \
+                                            )
+#  endif
+#endif
+#if defined(JSON_HEDLEY_IS_CONSTEXPR_)
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) JSON_HEDLEY_IS_CONSTEXPR_(expr)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (JSON_HEDLEY_IS_CONSTEXPR_(expr) ? (expr) : (-1))
+#else
+    #if !defined(JSON_HEDLEY_IS_CONSTANT)
+        #define JSON_HEDLEY_IS_CONSTANT(expr) (0)
+    #endif
+    #define JSON_HEDLEY_REQUIRE_CONSTEXPR(expr) (expr)
+#endif
+
+#if defined(JSON_HEDLEY_BEGIN_C_DECLS)
+    #undef JSON_HEDLEY_BEGIN_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_END_C_DECLS)
+    #undef JSON_HEDLEY_END_C_DECLS
+#endif
+#if defined(JSON_HEDLEY_C_DECL)
+    #undef JSON_HEDLEY_C_DECL
+#endif
+#if defined(__cplusplus)
+    #define JSON_HEDLEY_BEGIN_C_DECLS extern "C" {
+    #define JSON_HEDLEY_END_C_DECLS }
+    #define JSON_HEDLEY_C_DECL extern "C"
+#else
+    #define JSON_HEDLEY_BEGIN_C_DECLS
+    #define JSON_HEDLEY_END_C_DECLS
+    #define JSON_HEDLEY_C_DECL
+#endif
+
+#if defined(JSON_HEDLEY_STATIC_ASSERT)
+    #undef JSON_HEDLEY_STATIC_ASSERT
+#endif
+#if \
+  !defined(__cplusplus) && ( \
+      (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 201112L)) || \
+      JSON_HEDLEY_HAS_FEATURE(c_static_assert) || \
+      JSON_HEDLEY_GCC_VERSION_CHECK(6,0,0) || \
+      JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0) || \
+      defined(_Static_assert) \
+    )
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) _Static_assert(expr, message)
+#elif \
+  (defined(__cplusplus) && (__cplusplus >= 201103L)) || \
+  JSON_HEDLEY_MSVC_VERSION_CHECK(16,0,0)
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message) JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(static_assert(expr, message))
+#else
+#  define JSON_HEDLEY_STATIC_ASSERT(expr, message)
+#endif
+
+#if defined(JSON_HEDLEY_NULL)
+    #undef JSON_HEDLEY_NULL
+#endif
+#if defined(__cplusplus)
+    #if __cplusplus >= 201103L
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_(nullptr)
+    #elif defined(NULL)
+        #define JSON_HEDLEY_NULL NULL
+    #else
+        #define JSON_HEDLEY_NULL JSON_HEDLEY_STATIC_CAST(void*, 0)
+    #endif
+#elif defined(NULL)
+    #define JSON_HEDLEY_NULL NULL
+#else
+    #define JSON_HEDLEY_NULL ((void*) 0)
+#endif
+
+#if defined(JSON_HEDLEY_MESSAGE)
+    #undef JSON_HEDLEY_MESSAGE
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_MESSAGE(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(message msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message msg)
+#elif JSON_HEDLEY_CRAY_VERSION_CHECK(5,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(_CRI message msg)
+#elif JSON_HEDLEY_IAR_VERSION_CHECK(8,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#elif JSON_HEDLEY_PELLES_VERSION_CHECK(2,0,0)
+#  define JSON_HEDLEY_MESSAGE(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_WARNING)
+    #undef JSON_HEDLEY_WARNING
+#endif
+#if JSON_HEDLEY_HAS_WARNING("-Wunknown-pragmas")
+#  define JSON_HEDLEY_WARNING(msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS \
+    JSON_HEDLEY_PRAGMA(clang warning msg) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#elif \
+  JSON_HEDLEY_GCC_VERSION_CHECK(4,8,0) || \
+  JSON_HEDLEY_PGI_VERSION_CHECK(18,4,0) || \
+  JSON_HEDLEY_INTEL_VERSION_CHECK(13,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(GCC warning msg)
+#elif JSON_HEDLEY_MSVC_VERSION_CHECK(15,0,0)
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_PRAGMA(message(msg))
+#else
+#  define JSON_HEDLEY_WARNING(msg) JSON_HEDLEY_MESSAGE(msg)
+#endif
+
+#if defined(JSON_HEDLEY_REQUIRE)
+    #undef JSON_HEDLEY_REQUIRE
+#endif
+#if defined(JSON_HEDLEY_REQUIRE_MSG)
+    #undef JSON_HEDLEY_REQUIRE_MSG
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(diagnose_if)
+#  if JSON_HEDLEY_HAS_WARNING("-Wgcc-compat")
+#    define JSON_HEDLEY_REQUIRE(expr) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), #expr, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) \
+    JSON_HEDLEY_DIAGNOSTIC_PUSH \
+    _Pragma("clang diagnostic ignored \"-Wgcc-compat\"") \
+    __attribute__((diagnose_if(!(expr), msg, "error"))) \
+    JSON_HEDLEY_DIAGNOSTIC_POP
+#  else
+#    define JSON_HEDLEY_REQUIRE(expr) __attribute__((diagnose_if(!(expr), #expr, "error")))
+#    define JSON_HEDLEY_REQUIRE_MSG(expr,msg) __attribute__((diagnose_if(!(expr), msg, "error")))
+#  endif
+#else
+#  define JSON_HEDLEY_REQUIRE(expr)
+#  define JSON_HEDLEY_REQUIRE_MSG(expr,msg)
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS)
+    #undef JSON_HEDLEY_FLAGS
+#endif
+#if JSON_HEDLEY_HAS_ATTRIBUTE(flag_enum)
+    #define JSON_HEDLEY_FLAGS __attribute__((__flag_enum__))
+#endif
+
+#if defined(JSON_HEDLEY_FLAGS_CAST)
+    #undef JSON_HEDLEY_FLAGS_CAST
+#endif
+#if JSON_HEDLEY_INTEL_VERSION_CHECK(19,0,0)
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) (__extension__ ({ \
+        JSON_HEDLEY_DIAGNOSTIC_PUSH \
+        _Pragma("warning(disable:188)") \
+        ((T) (expr)); \
+        JSON_HEDLEY_DIAGNOSTIC_POP \
+    }))
+#else
+#  define JSON_HEDLEY_FLAGS_CAST(T, expr) JSON_HEDLEY_STATIC_CAST(T, expr)
+#endif
+
+#if defined(JSON_HEDLEY_EMPTY_BASES)
+    #undef JSON_HEDLEY_EMPTY_BASES
+#endif
+#if JSON_HEDLEY_MSVC_VERSION_CHECK(19,0,23918) && !JSON_HEDLEY_MSVC_VERSION_CHECK(20,0,0)
+    #define JSON_HEDLEY_EMPTY_BASES __declspec(empty_bases)
+#else
+    #define JSON_HEDLEY_EMPTY_BASES
+#endif
+
+/* Remaining macros are deprecated. */
+
+#if defined(JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK)
+    #undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#endif
+#if defined(__clang__)
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) (0)
+#else
+    #define JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK(major,minor,patch) JSON_HEDLEY_GCC_VERSION_CHECK(major,minor,patch)
+#endif
+
+#if defined(JSON_HEDLEY_CLANG_HAS_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_CPP_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_BUILTIN)
+    #undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#endif
+#define JSON_HEDLEY_CLANG_HAS_BUILTIN(builtin) JSON_HEDLEY_HAS_BUILTIN(builtin)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_FEATURE)
+    #undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_FEATURE(feature) JSON_HEDLEY_HAS_FEATURE(feature)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_EXTENSION)
+    #undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#endif
+#define JSON_HEDLEY_CLANG_HAS_EXTENSION(extension) JSON_HEDLEY_HAS_EXTENSION(extension)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE)
+    #undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#endif
+#define JSON_HEDLEY_CLANG_HAS_DECLSPEC_ATTRIBUTE(attribute) JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE(attribute)
+
+#if defined(JSON_HEDLEY_CLANG_HAS_WARNING)
+    #undef JSON_HEDLEY_CLANG_HAS_WARNING
+#endif
+#define JSON_HEDLEY_CLANG_HAS_WARNING(warning) JSON_HEDLEY_HAS_WARNING(warning)
+
+#endif /* !defined(JSON_HEDLEY_VERSION) || (JSON_HEDLEY_VERSION < X) */
+
+
+// This file contains all internal macro definitions
+// You MUST include macro_unscope.hpp at the end of json.hpp to undef all of them
+
+// exclude unsupported compilers
+#if !defined(JSON_SKIP_UNSUPPORTED_COMPILER_CHECK)
+    #if defined(__clang__)
+        #if (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) < 30400
+            #error "unsupported Clang version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #elif defined(__GNUC__) && !(defined(__ICC) || defined(__INTEL_COMPILER))
+        #if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) < 40800
+            #error "unsupported GCC version - see https://github.com/nlohmann/json#supported-compilers"
+        #endif
+    #endif
+#endif
+
+// C++ language standard detection
+#if (defined(__cplusplus) && __cplusplus >= 202002L) || (defined(_MSVC_LANG) && _MSVC_LANG >= 202002L)
+    #define JSON_HAS_CPP_20
+    #define JSON_HAS_CPP_17
+    #define JSON_HAS_CPP_14
+#elif (defined(__cplusplus) && __cplusplus >= 201703L) || (defined(_HAS_CXX17) && _HAS_CXX17 == 1) // fix for issue #464
+    #define JSON_HAS_CPP_17
+    #define JSON_HAS_CPP_14
+#elif (defined(__cplusplus) && __cplusplus >= 201402L) || (defined(_HAS_CXX14) && _HAS_CXX14 == 1)
+    #define JSON_HAS_CPP_14
+#endif
+
+// disable float-equal warnings on GCC/clang
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wfloat-equal"
+#endif
+
+// disable documentation warnings on clang
+#if defined(__clang__)
+    #pragma GCC diagnostic push
+    #pragma GCC diagnostic ignored "-Wdocumentation"
+#endif
+
+// allow to disable exceptions
+#if (defined(__cpp_exceptions) || defined(__EXCEPTIONS) || defined(_CPPUNWIND)) && !defined(JSON_NOEXCEPTION)
+    #define JSON_THROW(exception) throw exception
+    #define JSON_TRY try
+    #define JSON_CATCH(exception) catch(exception)
+    #define JSON_INTERNAL_CATCH(exception) catch(exception)
+#else
+    #include <cstdlib>
+    #define JSON_THROW(exception) std::abort()
+    #define JSON_TRY if(true)
+    #define JSON_CATCH(exception) if(false)
+    #define JSON_INTERNAL_CATCH(exception) if(false)
+#endif
+
+// override exception macros
+#if defined(JSON_THROW_USER)
+    #undef JSON_THROW
+    #define JSON_THROW JSON_THROW_USER
+#endif
+#if defined(JSON_TRY_USER)
+    #undef JSON_TRY
+    #define JSON_TRY JSON_TRY_USER
+#endif
+#if defined(JSON_CATCH_USER)
+    #undef JSON_CATCH
+    #define JSON_CATCH JSON_CATCH_USER
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_CATCH_USER
+#endif
+#if defined(JSON_INTERNAL_CATCH_USER)
+    #undef JSON_INTERNAL_CATCH
+    #define JSON_INTERNAL_CATCH JSON_INTERNAL_CATCH_USER
+#endif
+
+// allow to override assert
+#if !defined(JSON_ASSERT)
+    #include <cassert> // assert
+    #define JSON_ASSERT(x) assert(x)
+#endif
+
+/*!
+@brief macro to briefly define a mapping between an enum and JSON
+@def NLOHMANN_JSON_SERIALIZE_ENUM
+@since version 3.4.0
+*/
+#define NLOHMANN_JSON_SERIALIZE_ENUM(ENUM_TYPE, ...)                                            \
+    template<typename BasicJsonType>                                                            \
+    inline void to_json(BasicJsonType& j, const ENUM_TYPE& e)                                   \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [e](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool  \
+        {                                                                                       \
+            return ej_pair.first == e;                                                          \
+        });                                                                                     \
+        j = ((it != std::end(m)) ? it : std::begin(m))->second;                                 \
+    }                                                                                           \
+    template<typename BasicJsonType>                                                            \
+    inline void from_json(const BasicJsonType& j, ENUM_TYPE& e)                                 \
+    {                                                                                           \
+        static_assert(std::is_enum<ENUM_TYPE>::value, #ENUM_TYPE " must be an enum!");          \
+        static const std::pair<ENUM_TYPE, BasicJsonType> m[] = __VA_ARGS__;                     \
+        auto it = std::find_if(std::begin(m), std::end(m),                                      \
+                               [&j](const std::pair<ENUM_TYPE, BasicJsonType>& ej_pair) -> bool \
+        {                                                                                       \
+            return ej_pair.second == j;                                                         \
+        });                                                                                     \
+        e = ((it != std::end(m)) ? it : std::begin(m))->first;                                  \
+    }
+
+// Ugly macros to avoid uglier copy-paste when specializing basic_json. They
+// may be removed in the future once the class is split.
+
+#define NLOHMANN_BASIC_JSON_TPL_DECLARATION                                \
+    template<template<typename, typename, typename...> class ObjectType,   \
+             template<typename, typename...> class ArrayType,              \
+             class StringType, class BooleanType, class NumberIntegerType, \
+             class NumberUnsignedType, class NumberFloatType,              \
+             template<typename> class AllocatorType,                       \
+             template<typename, typename = void> class JSONSerializer,     \
+             class BinaryType>
+
+#define NLOHMANN_BASIC_JSON_TPL                                            \
+    basic_json<ObjectType, ArrayType, StringType, BooleanType,             \
+    NumberIntegerType, NumberUnsignedType, NumberFloatType,                \
+    AllocatorType, JSONSerializer, BinaryType>
+
+// Macros to simplify conversion from/to types
+
+#define NLOHMANN_JSON_EXPAND( x ) x
+#define NLOHMANN_JSON_GET_MACRO(_1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42, _43, _44, _45, _46, _47, _48, _49, _50, _51, _52, _53, _54, _55, _56, _57, _58, _59, _60, _61, _62, _63, _64, NAME,...) NAME
+#define NLOHMANN_JSON_PASTE(...) NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_GET_MACRO(__VA_ARGS__, \
+        NLOHMANN_JSON_PASTE64, \
+        NLOHMANN_JSON_PASTE63, \
+        NLOHMANN_JSON_PASTE62, \
+        NLOHMANN_JSON_PASTE61, \
+        NLOHMANN_JSON_PASTE60, \
+        NLOHMANN_JSON_PASTE59, \
+        NLOHMANN_JSON_PASTE58, \
+        NLOHMANN_JSON_PASTE57, \
+        NLOHMANN_JSON_PASTE56, \
+        NLOHMANN_JSON_PASTE55, \
+        NLOHMANN_JSON_PASTE54, \
+        NLOHMANN_JSON_PASTE53, \
+        NLOHMANN_JSON_PASTE52, \
+        NLOHMANN_JSON_PASTE51, \
+        NLOHMANN_JSON_PASTE50, \
+        NLOHMANN_JSON_PASTE49, \
+        NLOHMANN_JSON_PASTE48, \
+        NLOHMANN_JSON_PASTE47, \
+        NLOHMANN_JSON_PASTE46, \
+        NLOHMANN_JSON_PASTE45, \
+        NLOHMANN_JSON_PASTE44, \
+        NLOHMANN_JSON_PASTE43, \
+        NLOHMANN_JSON_PASTE42, \
+        NLOHMANN_JSON_PASTE41, \
+        NLOHMANN_JSON_PASTE40, \
+        NLOHMANN_JSON_PASTE39, \
+        NLOHMANN_JSON_PASTE38, \
+        NLOHMANN_JSON_PASTE37, \
+        NLOHMANN_JSON_PASTE36, \
+        NLOHMANN_JSON_PASTE35, \
+        NLOHMANN_JSON_PASTE34, \
+        NLOHMANN_JSON_PASTE33, \
+        NLOHMANN_JSON_PASTE32, \
+        NLOHMANN_JSON_PASTE31, \
+        NLOHMANN_JSON_PASTE30, \
+        NLOHMANN_JSON_PASTE29, \
+        NLOHMANN_JSON_PASTE28, \
+        NLOHMANN_JSON_PASTE27, \
+        NLOHMANN_JSON_PASTE26, \
+        NLOHMANN_JSON_PASTE25, \
+        NLOHMANN_JSON_PASTE24, \
+        NLOHMANN_JSON_PASTE23, \
+        NLOHMANN_JSON_PASTE22, \
+        NLOHMANN_JSON_PASTE21, \
+        NLOHMANN_JSON_PASTE20, \
+        NLOHMANN_JSON_PASTE19, \
+        NLOHMANN_JSON_PASTE18, \
+        NLOHMANN_JSON_PASTE17, \
+        NLOHMANN_JSON_PASTE16, \
+        NLOHMANN_JSON_PASTE15, \
+        NLOHMANN_JSON_PASTE14, \
+        NLOHMANN_JSON_PASTE13, \
+        NLOHMANN_JSON_PASTE12, \
+        NLOHMANN_JSON_PASTE11, \
+        NLOHMANN_JSON_PASTE10, \
+        NLOHMANN_JSON_PASTE9, \
+        NLOHMANN_JSON_PASTE8, \
+        NLOHMANN_JSON_PASTE7, \
+        NLOHMANN_JSON_PASTE6, \
+        NLOHMANN_JSON_PASTE5, \
+        NLOHMANN_JSON_PASTE4, \
+        NLOHMANN_JSON_PASTE3, \
+        NLOHMANN_JSON_PASTE2, \
+        NLOHMANN_JSON_PASTE1)(__VA_ARGS__))
+#define NLOHMANN_JSON_PASTE2(func, v1) func(v1)
+#define NLOHMANN_JSON_PASTE3(func, v1, v2) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE2(func, v2)
+#define NLOHMANN_JSON_PASTE4(func, v1, v2, v3) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE3(func, v2, v3)
+#define NLOHMANN_JSON_PASTE5(func, v1, v2, v3, v4) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE4(func, v2, v3, v4)
+#define NLOHMANN_JSON_PASTE6(func, v1, v2, v3, v4, v5) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE5(func, v2, v3, v4, v5)
+#define NLOHMANN_JSON_PASTE7(func, v1, v2, v3, v4, v5, v6) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE6(func, v2, v3, v4, v5, v6)
+#define NLOHMANN_JSON_PASTE8(func, v1, v2, v3, v4, v5, v6, v7) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE7(func, v2, v3, v4, v5, v6, v7)
+#define NLOHMANN_JSON_PASTE9(func, v1, v2, v3, v4, v5, v6, v7, v8) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE8(func, v2, v3, v4, v5, v6, v7, v8)
+#define NLOHMANN_JSON_PASTE10(func, v1, v2, v3, v4, v5, v6, v7, v8, v9) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE9(func, v2, v3, v4, v5, v6, v7, v8, v9)
+#define NLOHMANN_JSON_PASTE11(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE10(func, v2, v3, v4, v5, v6, v7, v8, v9, v10)
+#define NLOHMANN_JSON_PASTE12(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE11(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11)
+#define NLOHMANN_JSON_PASTE13(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE12(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12)
+#define NLOHMANN_JSON_PASTE14(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE13(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13)
+#define NLOHMANN_JSON_PASTE15(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE14(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14)
+#define NLOHMANN_JSON_PASTE16(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE15(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15)
+#define NLOHMANN_JSON_PASTE17(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE16(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16)
+#define NLOHMANN_JSON_PASTE18(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE17(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17)
+#define NLOHMANN_JSON_PASTE19(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE18(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18)
+#define NLOHMANN_JSON_PASTE20(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE19(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19)
+#define NLOHMANN_JSON_PASTE21(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE20(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20)
+#define NLOHMANN_JSON_PASTE22(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE21(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21)
+#define NLOHMANN_JSON_PASTE23(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE22(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22)
+#define NLOHMANN_JSON_PASTE24(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE23(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23)
+#define NLOHMANN_JSON_PASTE25(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE24(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24)
+#define NLOHMANN_JSON_PASTE26(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE25(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25)
+#define NLOHMANN_JSON_PASTE27(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE26(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26)
+#define NLOHMANN_JSON_PASTE28(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE27(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27)
+#define NLOHMANN_JSON_PASTE29(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE28(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28)
+#define NLOHMANN_JSON_PASTE30(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE29(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29)
+#define NLOHMANN_JSON_PASTE31(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE30(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30)
+#define NLOHMANN_JSON_PASTE32(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE31(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31)
+#define NLOHMANN_JSON_PASTE33(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE32(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32)
+#define NLOHMANN_JSON_PASTE34(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE33(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33)
+#define NLOHMANN_JSON_PASTE35(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE34(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34)
+#define NLOHMANN_JSON_PASTE36(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE35(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35)
+#define NLOHMANN_JSON_PASTE37(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE36(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36)
+#define NLOHMANN_JSON_PASTE38(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE37(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37)
+#define NLOHMANN_JSON_PASTE39(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE38(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38)
+#define NLOHMANN_JSON_PASTE40(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE39(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39)
+#define NLOHMANN_JSON_PASTE41(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE40(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40)
+#define NLOHMANN_JSON_PASTE42(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE41(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41)
+#define NLOHMANN_JSON_PASTE43(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE42(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42)
+#define NLOHMANN_JSON_PASTE44(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE43(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43)
+#define NLOHMANN_JSON_PASTE45(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE44(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44)
+#define NLOHMANN_JSON_PASTE46(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE45(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45)
+#define NLOHMANN_JSON_PASTE47(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE46(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46)
+#define NLOHMANN_JSON_PASTE48(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE47(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47)
+#define NLOHMANN_JSON_PASTE49(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE48(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48)
+#define NLOHMANN_JSON_PASTE50(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE49(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49)
+#define NLOHMANN_JSON_PASTE51(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE50(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50)
+#define NLOHMANN_JSON_PASTE52(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE51(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51)
+#define NLOHMANN_JSON_PASTE53(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE52(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52)
+#define NLOHMANN_JSON_PASTE54(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE53(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53)
+#define NLOHMANN_JSON_PASTE55(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE54(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54)
+#define NLOHMANN_JSON_PASTE56(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE55(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55)
+#define NLOHMANN_JSON_PASTE57(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE56(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56)
+#define NLOHMANN_JSON_PASTE58(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE57(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57)
+#define NLOHMANN_JSON_PASTE59(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE58(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58)
+#define NLOHMANN_JSON_PASTE60(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE59(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59)
+#define NLOHMANN_JSON_PASTE61(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE60(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60)
+#define NLOHMANN_JSON_PASTE62(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE61(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61)
+#define NLOHMANN_JSON_PASTE63(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE62(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62)
+#define NLOHMANN_JSON_PASTE64(func, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63) NLOHMANN_JSON_PASTE2(func, v1) NLOHMANN_JSON_PASTE63(func, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15, v16, v17, v18, v19, v20, v21, v22, v23, v24, v25, v26, v27, v28, v29, v30, v31, v32, v33, v34, v35, v36, v37, v38, v39, v40, v41, v42, v43, v44, v45, v46, v47, v48, v49, v50, v51, v52, v53, v54, v55, v56, v57, v58, v59, v60, v61, v62, v63)
+
+#define NLOHMANN_JSON_TO(v1) nlohmann_json_j[#v1] = nlohmann_json_t.v1;
+#define NLOHMANN_JSON_FROM(v1) nlohmann_json_j.at(#v1).get_to(nlohmann_json_t.v1);
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_INTRUSIVE
+@since version 3.9.0
+*/
+#define NLOHMANN_DEFINE_TYPE_INTRUSIVE(Type, ...)  \
+    friend void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    friend void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+/*!
+@brief macro
+@def NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE
+@since version 3.9.0
+*/
+#define NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(Type, ...)  \
+    inline void to_json(nlohmann::json& nlohmann_json_j, const Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_TO, __VA_ARGS__)) } \
+    inline void from_json(const nlohmann::json& nlohmann_json_j, Type& nlohmann_json_t) { NLOHMANN_JSON_EXPAND(NLOHMANN_JSON_PASTE(NLOHMANN_JSON_FROM, __VA_ARGS__)) }
+
+#ifndef JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_USE_IMPLICIT_CONVERSIONS 1
+#endif
+
+#if JSON_USE_IMPLICIT_CONVERSIONS
+    #define JSON_EXPLICIT
+#else
+    #define JSON_EXPLICIT explicit
+#endif
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////////
+// exceptions //
+////////////////
+
+/*!
+@brief general exception of the @ref basic_json class
+
+This class is an extension of `std::exception` objects with a member @a id for
+exception ids. It is used as the base class for all exceptions thrown by the
+@ref basic_json class. This class can hence be used as "wildcard" to catch
+exceptions.
+
+Subclasses:
+- @ref parse_error for exceptions indicating a parse error
+- @ref invalid_iterator for exceptions indicating errors with iterators
+- @ref type_error for exceptions indicating executing a member function with
+                  a wrong type
+- @ref out_of_range for exceptions indicating access out of the defined range
+- @ref other_error for exceptions indicating other library errors
+
+@internal
+@note To have nothrow-copy-constructible exceptions, we internally use
+      `std::runtime_error` which can cope with arbitrary-length error messages.
+      Intermediate strings are built with static functions and then passed to
+      the actual constructor.
+@endinternal
+
+@liveexample{The following code shows how arbitrary library exceptions can be
+caught.,exception}
+
+@since version 3.0.0
+*/
+class exception : public std::exception
+{
+  public:
+    /// returns the explanatory string
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* what() const noexcept override
+    {
+        return m.what();
+    }
+
+    /// the id of the exception
+    const int id;
+
+  protected:
+    JSON_HEDLEY_NON_NULL(3)
+    exception(int id_, const char* what_arg) : id(id_), m(what_arg) {}
+
+    static std::string name(const std::string& ename, int id_)
+    {
+        return "[json.exception." + ename + "." + std::to_string(id_) + "] ";
+    }
+
+  private:
+    /// an exception object as storage for error messages
+    std::runtime_error m;
+};
+
+/*!
+@brief exception indicating a parse error
+
+This exception is thrown by the library when a parse error occurs. Parse errors
+can occur during the deserialization of JSON text, CBOR, MessagePack, as well
+as when using JSON Patch.
+
+Member @a byte holds the byte index of the last read character in the input
+file.
+
+Exceptions have ids 1xx.
+
+name / id                      | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.parse_error.101 | parse error at 2: unexpected end of input; expected string literal | This error indicates a syntax error while deserializing a JSON text. The error message describes that an unexpected token (character) was encountered, and the member @a byte indicates the error position.
+json.exception.parse_error.102 | parse error at 14: missing or wrong low surrogate | JSON uses the `\uxxxx` format to describe Unicode characters. Code points above above 0xFFFF are split into two `\uxxxx` entries ("surrogate pairs"). This error indicates that the surrogate pair is incomplete or contains an invalid code point.
+json.exception.parse_error.103 | parse error: code points above 0x10FFFF are invalid | Unicode supports code points up to 0x10FFFF. Code points above 0x10FFFF are invalid.
+json.exception.parse_error.104 | parse error: JSON patch must be an array of objects | [RFC 6902](https://tools.ietf.org/html/rfc6902) requires a JSON Patch document to be a JSON document that represents an array of objects.
+json.exception.parse_error.105 | parse error: operation must have string member 'op' | An operation of a JSON Patch document must contain exactly one "op" member, whose value indicates the operation to perform. Its value must be one of "add", "remove", "replace", "move", "copy", or "test"; other values are errors.
+json.exception.parse_error.106 | parse error: array index '01' must not begin with '0' | An array index in a JSON Pointer ([RFC 6901](https://tools.ietf.org/html/rfc6901)) may be `0` or any number without a leading `0`.
+json.exception.parse_error.107 | parse error: JSON pointer must be empty or begin with '/' - was: 'foo' | A JSON Pointer must be a Unicode string containing a sequence of zero or more reference tokens, each prefixed by a `/` character.
+json.exception.parse_error.108 | parse error: escape character '~' must be followed with '0' or '1' | In a JSON Pointer, only `~0` and `~1` are valid escape sequences.
+json.exception.parse_error.109 | parse error: array index 'one' is not a number | A JSON Pointer array index must be a number.
+json.exception.parse_error.110 | parse error at 1: cannot read 2 bytes from vector | When parsing CBOR or MessagePack, the byte vector ends before the complete value has been read.
+json.exception.parse_error.112 | parse error at 1: error reading CBOR; last byte: 0xF8 | Not all types of CBOR or MessagePack are supported. This exception occurs if an unsupported byte was read.
+json.exception.parse_error.113 | parse error at 2: expected a CBOR string; last byte: 0x98 | While parsing a map key, a value that is not a string has been read.
+json.exception.parse_error.114 | parse error: Unsupported BSON record type 0x0F | The parsing of the corresponding BSON record type is not implemented (yet).
+json.exception.parse_error.115 | parse error at byte 5: syntax error while parsing UBJSON high-precision number: invalid number text: 1A | A UBJSON high-precision number could not be parsed.
+
+@note For an input with n bytes, 1 is the index of the first character and n+1
+      is the index of the terminating null byte or the end of file. This also
+      holds true when reading a byte vector (CBOR or MessagePack).
+
+@liveexample{The following code shows how a `parse_error` exception can be
+caught.,parse_error}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class parse_error : public exception
+{
+  public:
+    /*!
+    @brief create a parse error exception
+    @param[in] id_       the id of the exception
+    @param[in] pos       the position where the error occurred (or with
+                         chars_read_total=0 if the position cannot be
+                         determined)
+    @param[in] what_arg  the explanatory string
+    @return parse_error object
+    */
+    static parse_error create(int id_, const position_t& pos, const std::string& what_arg)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        position_string(pos) + ": " + what_arg;
+        return parse_error(id_, pos.chars_read_total, w.c_str());
+    }
+
+    static parse_error create(int id_, std::size_t byte_, const std::string& what_arg)
+    {
+        std::string w = exception::name("parse_error", id_) + "parse error" +
+                        (byte_ != 0 ? (" at byte " + std::to_string(byte_)) : "") +
+                        ": " + what_arg;
+        return parse_error(id_, byte_, w.c_str());
+    }
+
+    /*!
+    @brief byte index of the parse error
+
+    The byte index of the last read character in the input file.
+
+    @note For an input with n bytes, 1 is the index of the first character and
+          n+1 is the index of the terminating null byte or the end of file.
+          This also holds true when reading a byte vector (CBOR or MessagePack).
+    */
+    const std::size_t byte;
+
+  private:
+    parse_error(int id_, std::size_t byte_, const char* what_arg)
+        : exception(id_, what_arg), byte(byte_) {}
+
+    static std::string position_string(const position_t& pos)
+    {
+        return " at line " + std::to_string(pos.lines_read + 1) +
+               ", column " + std::to_string(pos.chars_read_current_line);
+    }
+};
+
+/*!
+@brief exception indicating errors with iterators
+
+This exception is thrown if iterators passed to a library function do not match
+the expected semantics.
+
+Exceptions have ids 2xx.
+
+name / id                           | example message | description
+----------------------------------- | --------------- | -------------------------
+json.exception.invalid_iterator.201 | iterators are not compatible | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.202 | iterator does not fit current value | In an erase or insert function, the passed iterator @a pos does not belong to the JSON value for which the function was called. It hence does not define a valid position for the deletion/insertion.
+json.exception.invalid_iterator.203 | iterators do not fit current value | Either iterator passed to function @ref erase(IteratorType first, IteratorType last) does not belong to the JSON value from which values shall be erased. It hence does not define a valid range to delete values from.
+json.exception.invalid_iterator.204 | iterators out of range | When an iterator range for a primitive type (number, boolean, or string) is passed to a constructor or an erase function, this range has to be exactly (@ref begin(), @ref end()), because this is the only way the single stored value is expressed. All other ranges are invalid.
+json.exception.invalid_iterator.205 | iterator out of range | When an iterator for a primitive type (number, boolean, or string) is passed to an erase function, the iterator has to be the @ref begin() iterator, because it is the only way to address the stored value. All other iterators are invalid.
+json.exception.invalid_iterator.206 | cannot construct with iterators from null | The iterators passed to constructor @ref basic_json(InputIT first, InputIT last) belong to a JSON null value and hence to not define a valid range.
+json.exception.invalid_iterator.207 | cannot use key() for non-object iterators | The key() member function can only be used on iterators belonging to a JSON object, because other types do not have a concept of a key.
+json.exception.invalid_iterator.208 | cannot use operator[] for object iterators | The operator[] to specify a concrete offset cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.209 | cannot use offsets with object iterators | The offset operators (+, -, +=, -=) cannot be used on iterators belonging to a JSON object, because JSON objects are unordered.
+json.exception.invalid_iterator.210 | iterators do not fit | The iterator range passed to the insert function are not compatible, meaning they do not belong to the same container. Therefore, the range (@a first, @a last) is invalid.
+json.exception.invalid_iterator.211 | passed iterators may not belong to container | The iterator range passed to the insert function must not be a subrange of the container to insert to.
+json.exception.invalid_iterator.212 | cannot compare iterators of different containers | When two iterators are compared, they must belong to the same container.
+json.exception.invalid_iterator.213 | cannot compare order of object iterators | The order of object iterators cannot be compared, because JSON objects are unordered.
+json.exception.invalid_iterator.214 | cannot get value | Cannot get value for iterator: Either the iterator belongs to a null value or it is an iterator to a primitive type (number, boolean, or string), but the iterator is different to @ref begin().
+
+@liveexample{The following code shows how an `invalid_iterator` exception can be
+caught.,invalid_iterator}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class invalid_iterator : public exception
+{
+  public:
+    static invalid_iterator create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("invalid_iterator", id_) + what_arg;
+        return invalid_iterator(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    invalid_iterator(int id_, const char* what_arg)
+        : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating executing a member function with a wrong type
+
+This exception is thrown in case of a type error; that is, a library function is
+executed on a JSON value whose type does not match the expected semantics.
+
+Exceptions have ids 3xx.
+
+name / id                     | example message | description
+----------------------------- | --------------- | -------------------------
+json.exception.type_error.301 | cannot create object from initializer list | To create an object from an initializer list, the initializer list must consist only of a list of pairs whose first element is a string. When this constraint is violated, an array is created instead.
+json.exception.type_error.302 | type must be object, but is array | During implicit or explicit value conversion, the JSON type must be compatible to the target type. For instance, a JSON string can only be converted into string types, but not into numbers or boolean types.
+json.exception.type_error.303 | incompatible ReferenceType for get_ref, actual type is object | To retrieve a reference to a value stored in a @ref basic_json object with @ref get_ref, the type of the reference must match the value type. For instance, for a JSON array, the @a ReferenceType must be @ref array_t &.
+json.exception.type_error.304 | cannot use at() with string | The @ref at() member functions can only be executed for certain JSON types.
+json.exception.type_error.305 | cannot use operator[] with string | The @ref operator[] member functions can only be executed for certain JSON types.
+json.exception.type_error.306 | cannot use value() with string | The @ref value() member functions can only be executed for certain JSON types.
+json.exception.type_error.307 | cannot use erase() with string | The @ref erase() member functions can only be executed for certain JSON types.
+json.exception.type_error.308 | cannot use push_back() with string | The @ref push_back() and @ref operator+= member functions can only be executed for certain JSON types.
+json.exception.type_error.309 | cannot use insert() with | The @ref insert() member functions can only be executed for certain JSON types.
+json.exception.type_error.310 | cannot use swap() with number | The @ref swap() member functions can only be executed for certain JSON types.
+json.exception.type_error.311 | cannot use emplace_back() with string | The @ref emplace_back() member function can only be executed for certain JSON types.
+json.exception.type_error.312 | cannot use update() with string | The @ref update() member functions can only be executed for certain JSON types.
+json.exception.type_error.313 | invalid value to unflatten | The @ref unflatten function converts an object whose keys are JSON Pointers back into an arbitrary nested JSON value. The JSON Pointers must not overlap, because then the resulting value would not be well defined.
+json.exception.type_error.314 | only objects can be unflattened | The @ref unflatten function only works for an object whose keys are JSON Pointers.
+json.exception.type_error.315 | values in object must be primitive | The @ref unflatten function only works for an object whose keys are JSON Pointers and whose values are primitive.
+json.exception.type_error.316 | invalid UTF-8 byte at index 10: 0x7E | The @ref dump function only works with UTF-8 encoded strings; that is, if you assign a `std::string` to a JSON value, make sure it is UTF-8 encoded. |
+json.exception.type_error.317 | JSON value cannot be serialized to requested format | The dynamic type of the object cannot be represented in the requested serialization format (e.g. a raw `true` or `null` JSON object cannot be serialized to BSON) |
+
+@liveexample{The following code shows how a `type_error` exception can be
+caught.,type_error}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class type_error : public exception
+{
+  public:
+    static type_error create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("type_error", id_) + what_arg;
+        return type_error(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    type_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating access out of the defined range
+
+This exception is thrown in case a library function is called on an input
+parameter that exceeds the expected range, for instance in case of array
+indices or nonexisting object keys.
+
+Exceptions have ids 4xx.
+
+name / id                       | example message | description
+------------------------------- | --------------- | -------------------------
+json.exception.out_of_range.401 | array index 3 is out of range | The provided array index @a i is larger than @a size-1.
+json.exception.out_of_range.402 | array index '-' (3) is out of range | The special array index `-` in a JSON Pointer never describes a valid element of the array, but the index past the end. That is, it can only be used to add elements at this position, but not to read it.
+json.exception.out_of_range.403 | key 'foo' not found | The provided key was not found in the JSON object.
+json.exception.out_of_range.404 | unresolved reference token 'foo' | A reference token in a JSON Pointer could not be resolved.
+json.exception.out_of_range.405 | JSON pointer has no parent | The JSON Patch operations 'remove' and 'add' can not be applied to the root element of the JSON value.
+json.exception.out_of_range.406 | number overflow parsing '10E1000' | A parsed number could not be stored as without changing it to NaN or INF.
+json.exception.out_of_range.407 | number overflow serializing '9223372036854775808' | UBJSON and BSON only support integer numbers up to 9223372036854775807. (until version 3.8.0) |
+json.exception.out_of_range.408 | excessive array size: 8658170730974374167 | The size (following `#`) of an UBJSON array or object exceeds the maximal capacity. |
+json.exception.out_of_range.409 | BSON key cannot contain code point U+0000 (at byte 2) | Key identifiers to be serialized to BSON cannot contain code point U+0000, since the key is stored as zero-terminated c-string |
+
+@liveexample{The following code shows how an `out_of_range` exception can be
+caught.,out_of_range}
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref other_error for exceptions indicating other library errors
+
+@since version 3.0.0
+*/
+class out_of_range : public exception
+{
+  public:
+    static out_of_range create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("out_of_range", id_) + what_arg;
+        return out_of_range(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    out_of_range(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+
+/*!
+@brief exception indicating other library errors
+
+This exception is thrown in case of errors that cannot be classified with the
+other exception types.
+
+Exceptions have ids 5xx.
+
+name / id                      | example message | description
+------------------------------ | --------------- | -------------------------
+json.exception.other_error.501 | unsuccessful: {"op":"test","path":"/baz", "value":"bar"} | A JSON Patch operation 'test' failed. The unsuccessful operation is also printed.
+
+@sa - @ref exception for the base class of the library exceptions
+@sa - @ref parse_error for exceptions indicating a parse error
+@sa - @ref invalid_iterator for exceptions indicating errors with iterators
+@sa - @ref type_error for exceptions indicating executing a member function with
+                    a wrong type
+@sa - @ref out_of_range for exceptions indicating access out of the defined range
+
+@liveexample{The following code shows how an `other_error` exception can be
+caught.,other_error}
+
+@since version 3.0.0
+*/
+class other_error : public exception
+{
+  public:
+    static other_error create(int id_, const std::string& what_arg)
+    {
+        std::string w = exception::name("other_error", id_) + what_arg;
+        return other_error(id_, w.c_str());
+    }
+
+  private:
+    JSON_HEDLEY_NON_NULL(3)
+    other_error(int id_, const char* what_arg) : exception(id_, what_arg) {}
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+#include <cstddef> // size_t
+#include <type_traits> // conditional, enable_if, false_type, integral_constant, is_constructible, is_integral, is_same, remove_cv, remove_reference, true_type
+
+namespace nlohmann
+{
+namespace detail
+{
+// alias templates to reduce boilerplate
+template<bool B, typename T = void>
+using enable_if_t = typename std::enable_if<B, T>::type;
+
+template<typename T>
+using uncvref_t = typename std::remove_cv<typename std::remove_reference<T>::type>::type;
+
+// implementation of C++14 index_sequence and affiliates
+// source: https://stackoverflow.com/a/32223343
+template<std::size_t... Ints>
+struct index_sequence
+{
+    using type = index_sequence;
+    using value_type = std::size_t;
+    static constexpr std::size_t size() noexcept
+    {
+        return sizeof...(Ints);
+    }
+};
+
+template<class Sequence1, class Sequence2>
+struct merge_and_renumber;
+
+template<std::size_t... I1, std::size_t... I2>
+struct merge_and_renumber<index_sequence<I1...>, index_sequence<I2...>>
+        : index_sequence < I1..., (sizeof...(I1) + I2)... > {};
+
+template<std::size_t N>
+struct make_index_sequence
+    : merge_and_renumber < typename make_index_sequence < N / 2 >::type,
+      typename make_index_sequence < N - N / 2 >::type > {};
+
+template<> struct make_index_sequence<0> : index_sequence<> {};
+template<> struct make_index_sequence<1> : index_sequence<0> {};
+
+template<typename... Ts>
+using index_sequence_for = make_index_sequence<sizeof...(Ts)>;
+
+// dispatch utility (taken from ranges-v3)
+template<unsigned N> struct priority_tag : priority_tag < N - 1 > {};
+template<> struct priority_tag<0> {};
+
+// taken from ranges-v3
+template<typename T>
+struct static_const
+{
+    static constexpr T value{};
+};
+
+template<typename T>
+constexpr T static_const<T>::value;
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+#include <limits> // numeric_limits
+#include <type_traits> // false_type, is_constructible, is_integral, is_same, true_type
+#include <utility> // declval
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+
+#include <iterator> // random_access_iterator_tag
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename ...Ts> struct make_void
+{
+    using type = void;
+};
+template<typename ...Ts> using void_t = typename make_void<Ts...>::type;
+} // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename It, typename = void>
+struct iterator_types {};
+
+template<typename It>
+struct iterator_types <
+    It,
+    void_t<typename It::difference_type, typename It::value_type, typename It::pointer,
+    typename It::reference, typename It::iterator_category >>
+{
+    using difference_type = typename It::difference_type;
+    using value_type = typename It::value_type;
+    using pointer = typename It::pointer;
+    using reference = typename It::reference;
+    using iterator_category = typename It::iterator_category;
+};
+
+// This is required as some compilers implement std::iterator_traits in a way that
+// doesn't work with SFINAE. See https://github.com/nlohmann/json/issues/1341.
+template<typename T, typename = void>
+struct iterator_traits
+{
+};
+
+template<typename T>
+struct iterator_traits < T, enable_if_t < !std::is_pointer<T>::value >>
+            : iterator_types<T>
+{
+};
+
+template<typename T>
+struct iterator_traits<T*, enable_if_t<std::is_object<T>::value>>
+{
+    using iterator_category = std::random_access_iterator_tag;
+    using value_type = T;
+    using difference_type = ptrdiff_t;
+    using pointer = T*;
+    using reference = T&;
+};
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+
+#include <type_traits>
+
+// #include <nlohmann/detail/meta/void_t.hpp>
+
+
+// https://en.cppreference.com/w/cpp/experimental/is_detected
+namespace nlohmann
+{
+namespace detail
+{
+struct nonesuch
+{
+    nonesuch() = delete;
+    ~nonesuch() = delete;
+    nonesuch(nonesuch const&) = delete;
+    nonesuch(nonesuch const&&) = delete;
+    void operator=(nonesuch const&) = delete;
+    void operator=(nonesuch&&) = delete;
+};
+
+template<class Default,
+         class AlwaysVoid,
+         template<class...> class Op,
+         class... Args>
+struct detector
+{
+    using value_t = std::false_type;
+    using type = Default;
+};
+
+template<class Default, template<class...> class Op, class... Args>
+struct detector<Default, void_t<Op<Args...>>, Op, Args...>
+{
+    using value_t = std::true_type;
+    using type = Op<Args...>;
+};
+
+template<template<class...> class Op, class... Args>
+using is_detected = typename detector<nonesuch, void, Op, Args...>::value_t;
+
+template<template<class...> class Op, class... Args>
+using detected_t = typename detector<nonesuch, void, Op, Args...>::type;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or = detector<Default, void, Op, Args...>;
+
+template<class Default, template<class...> class Op, class... Args>
+using detected_or_t = typename detected_or<Default, Op, Args...>::type;
+
+template<class Expected, template<class...> class Op, class... Args>
+using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
+
+template<class To, template<class...> class Op, class... Args>
+using is_detected_convertible =
+    std::is_convertible<detected_t<Op, Args...>, To>;
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/json_fwd.hpp>
+#ifndef INCLUDE_NLOHMANN_JSON_FWD_HPP_
+#define INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+#include <cstdint> // int64_t, uint64_t
+#include <map> // map
+#include <memory> // allocator
+#include <string> // string
+#include <vector> // vector
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+/*!
+@brief default JSONSerializer template argument
+
+This serializer ignores the template arguments and uses ADL
+([argument-dependent lookup](https://en.cppreference.com/w/cpp/language/adl))
+for serialization.
+*/
+template<typename T = void, typename SFINAE = void>
+struct adl_serializer;
+
+template<template<typename U, typename V, typename... Args> class ObjectType =
+         std::map,
+         template<typename U, typename... Args> class ArrayType = std::vector,
+         class StringType = std::string, class BooleanType = bool,
+         class NumberIntegerType = std::int64_t,
+         class NumberUnsignedType = std::uint64_t,
+         class NumberFloatType = double,
+         template<typename U> class AllocatorType = std::allocator,
+         template<typename T, typename SFINAE = void> class JSONSerializer =
+         adl_serializer,
+         class BinaryType = std::vector<std::uint8_t>>
+class basic_json;
+
+/*!
+@brief JSON Pointer
+
+A JSON pointer defines a string syntax for identifying a specific value
+within a JSON document. It can be used with functions `at` and
+`operator[]`. Furthermore, JSON pointers are the base for JSON patches.
+
+@sa [RFC 6901](https://tools.ietf.org/html/rfc6901)
+
+@since version 2.0.0
+*/
+template<typename BasicJsonType>
+class json_pointer;
+
+/*!
+@brief default JSON class
+
+This type is the default specialization of the @ref basic_json class which
+uses the standard template types.
+
+@since version 1.0.0
+*/
+using json = basic_json<>;
+
+template<class Key, class T, class IgnoredLess, class Allocator>
+struct ordered_map;
+
+/*!
+@brief ordered JSON class
+
+This type preserves the insertion order of object keys.
+
+@since version 3.9.0
+*/
+using ordered_json = basic_json<nlohmann::ordered_map>;
+
+}  // namespace nlohmann
+
+#endif  // INCLUDE_NLOHMANN_JSON_FWD_HPP_
+
+
+namespace nlohmann
+{
+/*!
+@brief detail namespace with internal helper functions
+
+This namespace collects functions that should not be exposed,
+implementations of some @ref basic_json methods, and meta-programming helpers.
+
+@since version 2.1.0
+*/
+namespace detail
+{
+/////////////
+// helpers //
+/////////////
+
+// Note to maintainers:
+//
+// Every trait in this file expects a non CV-qualified type.
+// The only exceptions are in the 'aliases for detected' section
+// (i.e. those of the form: decltype(T::member_function(std::declval<T>())))
+//
+// In this case, T has to be properly CV-qualified to constraint the function arguments
+// (e.g. to_json(BasicJsonType&, const T&))
+
+template<typename> struct is_basic_json : std::false_type {};
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+struct is_basic_json<NLOHMANN_BASIC_JSON_TPL> : std::true_type {};
+
+//////////////////////
+// json_ref helpers //
+//////////////////////
+
+template<typename>
+class json_ref;
+
+template<typename>
+struct is_json_ref : std::false_type {};
+
+template<typename T>
+struct is_json_ref<json_ref<T>> : std::true_type {};
+
+//////////////////////////
+// aliases for detected //
+//////////////////////////
+
+template<typename T>
+using mapped_type_t = typename T::mapped_type;
+
+template<typename T>
+using key_type_t = typename T::key_type;
+
+template<typename T>
+using value_type_t = typename T::value_type;
+
+template<typename T>
+using difference_type_t = typename T::difference_type;
+
+template<typename T>
+using pointer_t = typename T::pointer;
+
+template<typename T>
+using reference_t = typename T::reference;
+
+template<typename T>
+using iterator_category_t = typename T::iterator_category;
+
+template<typename T>
+using iterator_t = typename T::iterator;
+
+template<typename T, typename... Args>
+using to_json_function = decltype(T::to_json(std::declval<Args>()...));
+
+template<typename T, typename... Args>
+using from_json_function = decltype(T::from_json(std::declval<Args>()...));
+
+template<typename T, typename U>
+using get_template_function = decltype(std::declval<T>().template get<U>());
+
+// trait checking if JSONSerializer<T>::from_json(json const&, udt&) exists
+template<typename BasicJsonType, typename T, typename = void>
+struct has_from_json : std::false_type {};
+
+// trait checking if j.get<T> is valid
+// use this trait instead of std::is_constructible or std::is_convertible,
+// both rely on, or make use of implicit conversions, and thus fail when T
+// has several constructors/operator= (see https://github.com/nlohmann/json/issues/958)
+template <typename BasicJsonType, typename T>
+struct is_getable
+{
+    static constexpr bool value = is_detected<get_template_function, const BasicJsonType&, T>::value;
+};
+
+template<typename BasicJsonType, typename T>
+struct has_from_json < BasicJsonType, T,
+           enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, from_json_function, serializer,
+        const BasicJsonType&, T&>::value;
+};
+
+// This trait checks if JSONSerializer<T>::from_json(json const&) exists
+// this overload is used for non-default-constructible user-defined-types
+template<typename BasicJsonType, typename T, typename = void>
+struct has_non_default_from_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_non_default_from_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<T, from_json_function, serializer,
+        const BasicJsonType&>::value;
+};
+
+// This trait checks if BasicJsonType::json_serializer<T>::to_json exists
+// Do not evaluate the trait when T is a basic_json type, to avoid template instantiation infinite recursion.
+template<typename BasicJsonType, typename T, typename = void>
+struct has_to_json : std::false_type {};
+
+template<typename BasicJsonType, typename T>
+struct has_to_json < BasicJsonType, T, enable_if_t < !is_basic_json<T>::value >>
+{
+    using serializer = typename BasicJsonType::template json_serializer<T, void>;
+
+    static constexpr bool value =
+        is_detected_exact<void, to_json_function, serializer, BasicJsonType&,
+        T>::value;
+};
+
+
+///////////////////
+// is_ functions //
+///////////////////
+
+template<typename T, typename = void>
+struct is_iterator_traits : std::false_type {};
+
+template<typename T>
+struct is_iterator_traits<iterator_traits<T>>
+{
+  private:
+    using traits = iterator_traits<T>;
+
+  public:
+    static constexpr auto value =
+        is_detected<value_type_t, traits>::value &&
+        is_detected<difference_type_t, traits>::value &&
+        is_detected<pointer_t, traits>::value &&
+        is_detected<iterator_category_t, traits>::value &&
+        is_detected<reference_t, traits>::value;
+};
+
+// source: https://stackoverflow.com/a/37193089/4116453
+
+template<typename T, typename = void>
+struct is_complete_type : std::false_type {};
+
+template<typename T>
+struct is_complete_type<T, decltype(void(sizeof(T)))> : std::true_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType,
+         typename = void>
+struct is_compatible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type_impl <
+    BasicJsonType, CompatibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, CompatibleObjectType>::value&&
+    is_detected<key_type_t, CompatibleObjectType>::value >>
+{
+
+    using object_t = typename BasicJsonType::object_t;
+
+    // macOS's is_constructible does not play well with nonesuch...
+    static constexpr bool value =
+        std::is_constructible<typename object_t::key_type,
+        typename CompatibleObjectType::key_type>::value &&
+        std::is_constructible<typename object_t::mapped_type,
+        typename CompatibleObjectType::mapped_type>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleObjectType>
+struct is_compatible_object_type
+    : is_compatible_object_type_impl<BasicJsonType, CompatibleObjectType> {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         typename = void>
+struct is_constructible_object_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type_impl <
+    BasicJsonType, ConstructibleObjectType,
+    enable_if_t < is_detected<mapped_type_t, ConstructibleObjectType>::value&&
+    is_detected<key_type_t, ConstructibleObjectType>::value >>
+{
+    using object_t = typename BasicJsonType::object_t;
+
+    static constexpr bool value =
+        (std::is_default_constructible<ConstructibleObjectType>::value &&
+         (std::is_move_assignable<ConstructibleObjectType>::value ||
+          std::is_copy_assignable<ConstructibleObjectType>::value) &&
+         (std::is_constructible<typename ConstructibleObjectType::key_type,
+          typename object_t::key_type>::value &&
+          std::is_same <
+          typename object_t::mapped_type,
+          typename ConstructibleObjectType::mapped_type >::value)) ||
+        (has_from_json<BasicJsonType,
+         typename ConstructibleObjectType::mapped_type>::value ||
+         has_non_default_from_json <
+         BasicJsonType,
+         typename ConstructibleObjectType::mapped_type >::value);
+};
+
+template<typename BasicJsonType, typename ConstructibleObjectType>
+struct is_constructible_object_type
+    : is_constructible_object_type_impl<BasicJsonType,
+      ConstructibleObjectType> {};
+
+template<typename BasicJsonType, typename CompatibleStringType,
+         typename = void>
+struct is_compatible_string_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleStringType>
+struct is_compatible_string_type_impl <
+    BasicJsonType, CompatibleStringType,
+    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
+    value_type_t, CompatibleStringType>::value >>
+{
+    static constexpr auto value =
+        std::is_constructible<typename BasicJsonType::string_t, CompatibleStringType>::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleStringType>
+struct is_compatible_string_type
+    : is_compatible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
+
+template<typename BasicJsonType, typename ConstructibleStringType,
+         typename = void>
+struct is_constructible_string_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type_impl <
+    BasicJsonType, ConstructibleStringType,
+    enable_if_t<is_detected_exact<typename BasicJsonType::string_t::value_type,
+    value_type_t, ConstructibleStringType>::value >>
+{
+    static constexpr auto value =
+        std::is_constructible<ConstructibleStringType,
+        typename BasicJsonType::string_t>::value;
+};
+
+template<typename BasicJsonType, typename ConstructibleStringType>
+struct is_constructible_string_type
+    : is_constructible_string_type_impl<BasicJsonType, ConstructibleStringType> {};
+
+template<typename BasicJsonType, typename CompatibleArrayType, typename = void>
+struct is_compatible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type_impl <
+    BasicJsonType, CompatibleArrayType,
+    enable_if_t < is_detected<value_type_t, CompatibleArrayType>::value&&
+    is_detected<iterator_t, CompatibleArrayType>::value&&
+// This is needed because json_reverse_iterator has a ::iterator type...
+// Therefore it is detected as a CompatibleArrayType.
+// The real fix would be to have an Iterable concept.
+    !is_iterator_traits <
+    iterator_traits<CompatibleArrayType >>::value >>
+{
+    static constexpr bool value =
+        std::is_constructible<BasicJsonType,
+        typename CompatibleArrayType::value_type>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleArrayType>
+struct is_compatible_array_type
+    : is_compatible_array_type_impl<BasicJsonType, CompatibleArrayType> {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType, typename = void>
+struct is_constructible_array_type_impl : std::false_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t<std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value >>
+            : std::true_type {};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type_impl <
+    BasicJsonType, ConstructibleArrayType,
+    enable_if_t < !std::is_same<ConstructibleArrayType,
+    typename BasicJsonType::value_type>::value&&
+    std::is_default_constructible<ConstructibleArrayType>::value&&
+(std::is_move_assignable<ConstructibleArrayType>::value ||
+ std::is_copy_assignable<ConstructibleArrayType>::value)&&
+is_detected<value_type_t, ConstructibleArrayType>::value&&
+is_detected<iterator_t, ConstructibleArrayType>::value&&
+is_complete_type <
+detected_t<value_type_t, ConstructibleArrayType >>::value >>
+{
+    static constexpr bool value =
+        // This is needed because json_reverse_iterator has a ::iterator type,
+        // furthermore, std::back_insert_iterator (and other iterators) have a
+        // base class `iterator`... Therefore it is detected as a
+        // ConstructibleArrayType. The real fix would be to have an Iterable
+        // concept.
+        !is_iterator_traits<iterator_traits<ConstructibleArrayType>>::value &&
+
+        (std::is_same<typename ConstructibleArrayType::value_type,
+         typename BasicJsonType::array_t::value_type>::value ||
+         has_from_json<BasicJsonType,
+         typename ConstructibleArrayType::value_type>::value ||
+         has_non_default_from_json <
+         BasicJsonType, typename ConstructibleArrayType::value_type >::value);
+};
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+struct is_constructible_array_type
+    : is_constructible_array_type_impl<BasicJsonType, ConstructibleArrayType> {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType,
+         typename = void>
+struct is_compatible_integer_type_impl : std::false_type {};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type_impl <
+    RealIntegerType, CompatibleNumberIntegerType,
+    enable_if_t < std::is_integral<RealIntegerType>::value&&
+    std::is_integral<CompatibleNumberIntegerType>::value&&
+    !std::is_same<bool, CompatibleNumberIntegerType>::value >>
+{
+    // is there an assert somewhere on overflows?
+    using RealLimits = std::numeric_limits<RealIntegerType>;
+    using CompatibleLimits = std::numeric_limits<CompatibleNumberIntegerType>;
+
+    static constexpr auto value =
+        std::is_constructible<RealIntegerType,
+        CompatibleNumberIntegerType>::value &&
+        CompatibleLimits::is_integer &&
+        RealLimits::is_signed == CompatibleLimits::is_signed;
+};
+
+template<typename RealIntegerType, typename CompatibleNumberIntegerType>
+struct is_compatible_integer_type
+    : is_compatible_integer_type_impl<RealIntegerType,
+      CompatibleNumberIntegerType> {};
+
+template<typename BasicJsonType, typename CompatibleType, typename = void>
+struct is_compatible_type_impl: std::false_type {};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type_impl <
+    BasicJsonType, CompatibleType,
+    enable_if_t<is_complete_type<CompatibleType>::value >>
+{
+    static constexpr bool value =
+        has_to_json<BasicJsonType, CompatibleType>::value;
+};
+
+template<typename BasicJsonType, typename CompatibleType>
+struct is_compatible_type
+    : is_compatible_type_impl<BasicJsonType, CompatibleType> {};
+
+// https://en.cppreference.com/w/cpp/types/conjunction
+template<class...> struct conjunction : std::true_type { };
+template<class B1> struct conjunction<B1> : B1 { };
+template<class B1, class... Bn>
+struct conjunction<B1, Bn...>
+: std::conditional<bool(B1::value), conjunction<Bn...>, B1>::type {};
+
+template<typename T1, typename T2>
+struct is_constructible_tuple : std::false_type {};
+
+template<typename T1, typename... Args>
+struct is_constructible_tuple<T1, std::tuple<Args...>> : conjunction<std::is_constructible<T1, Args>...> {};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t
+#include <string> // string
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////////////
+// JSON type enumeration //
+///////////////////////////
+
+/*!
+@brief the JSON type enumeration
+
+This enumeration collects the different JSON types. It is internally used to
+distinguish the stored values, and the functions @ref basic_json::is_null(),
+@ref basic_json::is_object(), @ref basic_json::is_array(),
+@ref basic_json::is_string(), @ref basic_json::is_boolean(),
+@ref basic_json::is_number() (with @ref basic_json::is_number_integer(),
+@ref basic_json::is_number_unsigned(), and @ref basic_json::is_number_float()),
+@ref basic_json::is_discarded(), @ref basic_json::is_primitive(), and
+@ref basic_json::is_structured() rely on it.
+
+@note There are three enumeration entries (number_integer, number_unsigned, and
+number_float), because the library distinguishes these three types for numbers:
+@ref basic_json::number_unsigned_t is used for unsigned integers,
+@ref basic_json::number_integer_t is used for signed integers, and
+@ref basic_json::number_float_t is used for floating-point numbers or to
+approximate integers which do not fit in the limits of their respective type.
+
+@sa @ref basic_json::basic_json(const value_t value_type) -- create a JSON
+value with the default value for a given type
+
+@since version 1.0.0
+*/
+enum class value_t : std::uint8_t
+{
+    null,             ///< null value
+    object,           ///< object (unordered set of name/value pairs)
+    array,            ///< array (ordered collection of values)
+    string,           ///< string value
+    boolean,          ///< boolean value
+    number_integer,   ///< number value (signed integer)
+    number_unsigned,  ///< number value (unsigned integer)
+    number_float,     ///< number value (floating-point)
+    binary,           ///< binary array (ordered collection of bytes)
+    discarded         ///< discarded by the parser callback function
+};
+
+/*!
+@brief comparison operator for JSON types
+
+Returns an ordering that is similar to Python:
+- order: null < boolean < number < object < array < string < binary
+- furthermore, each type is not smaller than itself
+- discarded values are not comparable
+- binary is represented as a b"" string in python and directly comparable to a
+  string; however, making a binary array directly comparable with a string would
+  be surprising behavior in a JSON file.
+
+@since version 1.0.0
+*/
+inline bool operator<(const value_t lhs, const value_t rhs) noexcept
+{
+    static constexpr std::array<std::uint8_t, 9> order = {{
+            0 /* null */, 3 /* object */, 4 /* array */, 5 /* string */,
+            1 /* boolean */, 2 /* integer */, 2 /* unsigned */, 2 /* float */,
+            6 /* binary */
+        }
+    };
+
+    const auto l_index = static_cast<std::size_t>(lhs);
+    const auto r_index = static_cast<std::size_t>(rhs);
+    return l_index < order.size() && r_index < order.size() && order[l_index] < order[r_index];
+}
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename std::nullptr_t& n)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_null()))
+    {
+        JSON_THROW(type_error::create(302, "type must be null, but is " + std::string(j.type_name())));
+    }
+    n = nullptr;
+}
+
+// overloads for basic_json template parameters
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t < std::is_arithmetic<ArithmeticType>::value&&
+                         !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+                         int > = 0 >
+void get_arithmetic_value(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+    }
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::boolean_t& b)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_boolean()))
+    {
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(j.type_name())));
+    }
+    b = *j.template get_ptr<const typename BasicJsonType::boolean_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::string_t& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+    }
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template <
+    typename BasicJsonType, typename ConstructibleStringType,
+    enable_if_t <
+        is_constructible_string_type<BasicJsonType, ConstructibleStringType>::value&&
+        !std::is_same<typename BasicJsonType::string_t,
+                      ConstructibleStringType>::value,
+        int > = 0 >
+void from_json(const BasicJsonType& j, ConstructibleStringType& s)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_string()))
+    {
+        JSON_THROW(type_error::create(302, "type must be string, but is " + std::string(j.type_name())));
+    }
+
+    s = *j.template get_ptr<const typename BasicJsonType::string_t*>();
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_float_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_unsigned_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::number_integer_t& val)
+{
+    get_arithmetic_value(j, val);
+}
+
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void from_json(const BasicJsonType& j, EnumType& e)
+{
+    typename std::underlying_type<EnumType>::type val;
+    get_arithmetic_value(j, val);
+    e = static_cast<EnumType>(val);
+}
+
+// forward_list doesn't have an insert method
+template<typename BasicJsonType, typename T, typename Allocator,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::forward_list<T, Allocator>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    l.clear();
+    std::transform(j.rbegin(), j.rend(),
+                   std::front_inserter(l), [](const BasicJsonType & i)
+    {
+        return i.template get<T>();
+    });
+}
+
+// valarray doesn't have an insert method
+template<typename BasicJsonType, typename T,
+         enable_if_t<is_getable<BasicJsonType, T>::value, int> = 0>
+void from_json(const BasicJsonType& j, std::valarray<T>& l)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    l.resize(j.size());
+    std::transform(j.begin(), j.end(), std::begin(l),
+                   [](const BasicJsonType & elem)
+    {
+        return elem.template get<T>();
+    });
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json(const BasicJsonType& j, T (&arr)[N])
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType>
+void from_json_array_impl(const BasicJsonType& j, typename BasicJsonType::array_t& arr, priority_tag<3> /*unused*/)
+{
+    arr = *j.template get_ptr<const typename BasicJsonType::array_t*>();
+}
+
+template<typename BasicJsonType, typename T, std::size_t N>
+auto from_json_array_impl(const BasicJsonType& j, std::array<T, N>& arr,
+                          priority_tag<2> /*unused*/)
+-> decltype(j.template get<T>(), void())
+{
+    for (std::size_t i = 0; i < N; ++i)
+    {
+        arr[i] = j.at(i).template get<T>();
+    }
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+auto from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr, priority_tag<1> /*unused*/)
+-> decltype(
+    arr.reserve(std::declval<typename ConstructibleArrayType::size_type>()),
+    j.template get<typename ConstructibleArrayType::value_type>(),
+    void())
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    ret.reserve(j.size());
+    std::transform(j.begin(), j.end(),
+                   std::inserter(ret, end(ret)), [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template<typename BasicJsonType, typename ConstructibleArrayType>
+void from_json_array_impl(const BasicJsonType& j, ConstructibleArrayType& arr,
+                          priority_tag<0> /*unused*/)
+{
+    using std::end;
+
+    ConstructibleArrayType ret;
+    std::transform(
+        j.begin(), j.end(), std::inserter(ret, end(ret)),
+        [](const BasicJsonType & i)
+    {
+        // get<BasicJsonType>() returns *this, this won't call a from_json
+        // method when value_type is BasicJsonType
+        return i.template get<typename ConstructibleArrayType::value_type>();
+    });
+    arr = std::move(ret);
+}
+
+template < typename BasicJsonType, typename ConstructibleArrayType,
+           enable_if_t <
+               is_constructible_array_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_object_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !is_constructible_string_type<BasicJsonType, ConstructibleArrayType>::value&&
+               !std::is_same<ConstructibleArrayType, typename BasicJsonType::binary_t>::value&&
+               !is_basic_json<ConstructibleArrayType>::value,
+               int > = 0 >
+auto from_json(const BasicJsonType& j, ConstructibleArrayType& arr)
+-> decltype(from_json_array_impl(j, arr, priority_tag<3> {}),
+j.template get<typename ConstructibleArrayType::value_type>(),
+void())
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " +
+                                      std::string(j.type_name())));
+    }
+
+    from_json_array_impl(j, arr, priority_tag<3> {});
+}
+
+template<typename BasicJsonType>
+void from_json(const BasicJsonType& j, typename BasicJsonType::binary_t& bin)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_binary()))
+    {
+        JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(j.type_name())));
+    }
+
+    bin = *j.template get_ptr<const typename BasicJsonType::binary_t*>();
+}
+
+template<typename BasicJsonType, typename ConstructibleObjectType,
+         enable_if_t<is_constructible_object_type<BasicJsonType, ConstructibleObjectType>::value, int> = 0>
+void from_json(const BasicJsonType& j, ConstructibleObjectType& obj)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
+    {
+        JSON_THROW(type_error::create(302, "type must be object, but is " + std::string(j.type_name())));
+    }
+
+    ConstructibleObjectType ret;
+    auto inner_object = j.template get_ptr<const typename BasicJsonType::object_t*>();
+    using value_type = typename ConstructibleObjectType::value_type;
+    std::transform(
+        inner_object->begin(), inner_object->end(),
+        std::inserter(ret, ret.begin()),
+        [](typename BasicJsonType::object_t::value_type const & p)
+    {
+        return value_type(p.first, p.second.template get<typename ConstructibleObjectType::mapped_type>());
+    });
+    obj = std::move(ret);
+}
+
+// overload for arithmetic types, not chosen for basic_json template arguments
+// (BooleanType, etc..); note: Is it really necessary to provide explicit
+// overloads for boolean_t etc. in case of a custom BooleanType which is not
+// an arithmetic type?
+template < typename BasicJsonType, typename ArithmeticType,
+           enable_if_t <
+               std::is_arithmetic<ArithmeticType>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_unsigned_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_integer_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::number_float_t>::value&&
+               !std::is_same<ArithmeticType, typename BasicJsonType::boolean_t>::value,
+               int > = 0 >
+void from_json(const BasicJsonType& j, ArithmeticType& val)
+{
+    switch (static_cast<value_t>(j))
+    {
+        case value_t::number_unsigned:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_unsigned_t*>());
+            break;
+        }
+        case value_t::number_integer:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_integer_t*>());
+            break;
+        }
+        case value_t::number_float:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::number_float_t*>());
+            break;
+        }
+        case value_t::boolean:
+        {
+            val = static_cast<ArithmeticType>(*j.template get_ptr<const typename BasicJsonType::boolean_t*>());
+            break;
+        }
+
+        default:
+            JSON_THROW(type_error::create(302, "type must be number, but is " + std::string(j.type_name())));
+    }
+}
+
+template<typename BasicJsonType, typename A1, typename A2>
+void from_json(const BasicJsonType& j, std::pair<A1, A2>& p)
+{
+    p = {j.at(0).template get<A1>(), j.at(1).template get<A2>()};
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void from_json_tuple_impl(const BasicJsonType& j, Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    t = std::make_tuple(j.at(Idx).template get<typename std::tuple_element<Idx, Tuple>::type>()...);
+}
+
+template<typename BasicJsonType, typename... Args>
+void from_json(const BasicJsonType& j, std::tuple<Args...>& t)
+{
+    from_json_tuple_impl(j, t, index_sequence_for<Args...> {});
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Compare, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+void from_json(const BasicJsonType& j, std::map<Key, Value, Compare, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+template < typename BasicJsonType, typename Key, typename Value, typename Hash, typename KeyEqual, typename Allocator,
+           typename = enable_if_t < !std::is_constructible <
+                                        typename BasicJsonType::string_t, Key >::value >>
+void from_json(const BasicJsonType& j, std::unordered_map<Key, Value, Hash, KeyEqual, Allocator>& m)
+{
+    if (JSON_HEDLEY_UNLIKELY(!j.is_array()))
+    {
+        JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(j.type_name())));
+    }
+    m.clear();
+    for (const auto& p : j)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!p.is_array()))
+        {
+            JSON_THROW(type_error::create(302, "type must be array, but is " + std::string(p.type_name())));
+        }
+        m.emplace(p.at(0).template get<Key>(), p.at(1).template get<Value>());
+    }
+}
+
+struct from_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(const BasicJsonType& j, T& val) const
+    noexcept(noexcept(from_json(j, val)))
+    -> decltype(from_json(j, val), void())
+    {
+        return from_json(j, val);
+    }
+};
+}  // namespace detail
+
+/// namespace to hold default `from_json` function
+/// to see why this is required:
+/// http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2015/n4381.html
+namespace
+{
+constexpr const auto& from_json = detail::static_const<detail::from_json_fn>::value;
+} // namespace
+} // namespace nlohmann
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+
+#include <algorithm> // copy
+#include <iterator> // begin, end
+#include <string> // string
+#include <tuple> // tuple, get
+#include <type_traits> // is_same, is_constructible, is_floating_point, is_enum, underlying_type
+#include <utility> // move, forward, declval, pair
+#include <valarray> // valarray
+#include <vector> // vector
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+
+#include <cstddef> // size_t
+#include <iterator> // input_iterator_tag
+#include <string> // string, to_string
+#include <tuple> // tuple_size, get, tuple_element
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename string_type>
+void int_to_string( string_type& target, std::size_t value )
+{
+    // For ADL
+    using std::to_string;
+    target = to_string(value);
+}
+template<typename IteratorType> class iteration_proxy_value
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    using value_type = iteration_proxy_value;
+    using pointer = value_type * ;
+    using reference = value_type & ;
+    using iterator_category = std::input_iterator_tag;
+    using string_type = typename std::remove_cv< typename std::remove_reference<decltype( std::declval<IteratorType>().key() ) >::type >::type;
+
+  private:
+    /// the iterator
+    IteratorType anchor;
+    /// an index for arrays (used to create key names)
+    std::size_t array_index = 0;
+    /// last stringified array index
+    mutable std::size_t array_index_last = 0;
+    /// a string representation of the array index
+    mutable string_type array_index_str = "0";
+    /// an empty string (to return a reference for primitive values)
+    const string_type empty_str = "";
+
+  public:
+    explicit iteration_proxy_value(IteratorType it) noexcept : anchor(it) {}
+
+    /// dereference operator (needed for range-based for)
+    iteration_proxy_value& operator*()
+    {
+        return *this;
+    }
+
+    /// increment operator (needed for range-based for)
+    iteration_proxy_value& operator++()
+    {
+        ++anchor;
+        ++array_index;
+
+        return *this;
+    }
+
+    /// equality operator (needed for InputIterator)
+    bool operator==(const iteration_proxy_value& o) const
+    {
+        return anchor == o.anchor;
+    }
+
+    /// inequality operator (needed for range-based for)
+    bool operator!=(const iteration_proxy_value& o) const
+    {
+        return anchor != o.anchor;
+    }
+
+    /// return key of the iterator
+    const string_type& key() const
+    {
+        JSON_ASSERT(anchor.m_object != nullptr);
+
+        switch (anchor.m_object->type())
+        {
+            // use integer array index as key
+            case value_t::array:
+            {
+                if (array_index != array_index_last)
+                {
+                    int_to_string( array_index_str, array_index );
+                    array_index_last = array_index;
+                }
+                return array_index_str;
+            }
+
+            // use key from the object
+            case value_t::object:
+                return anchor.key();
+
+            // use an empty key for all primitive types
+            default:
+                return empty_str;
+        }
+    }
+
+    /// return value of the iterator
+    typename IteratorType::reference value() const
+    {
+        return anchor.value();
+    }
+};
+
+/// proxy class for the items() function
+template<typename IteratorType> class iteration_proxy
+{
+  private:
+    /// the container to iterate
+    typename IteratorType::reference container;
+
+  public:
+    /// construct iteration proxy from a container
+    explicit iteration_proxy(typename IteratorType::reference cont) noexcept
+        : container(cont) {}
+
+    /// return iterator begin (needed for range-based for)
+    iteration_proxy_value<IteratorType> begin() noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container.begin());
+    }
+
+    /// return iterator end (needed for range-based for)
+    iteration_proxy_value<IteratorType> end() noexcept
+    {
+        return iteration_proxy_value<IteratorType>(container.end());
+    }
+};
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 0, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.key())
+{
+    return i.key();
+}
+// Structured Bindings Support
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+template<std::size_t N, typename IteratorType, enable_if_t<N == 1, int> = 0>
+auto get(const nlohmann::detail::iteration_proxy_value<IteratorType>& i) -> decltype(i.value())
+{
+    return i.value();
+}
+}  // namespace detail
+}  // namespace nlohmann
+
+// The Addition to the STD Namespace is required to add
+// Structured Bindings Support to the iteration_proxy_value class
+// For further reference see https://blog.tartanllama.xyz/structured-bindings/
+// And see https://github.com/nlohmann/json/pull/1391
+namespace std
+{
+#if defined(__clang__)
+    // Fix: https://github.com/nlohmann/json/issues/1401
+    #pragma clang diagnostic push
+    #pragma clang diagnostic ignored "-Wmismatched-tags"
+#endif
+template<typename IteratorType>
+class tuple_size<::nlohmann::detail::iteration_proxy_value<IteratorType>>
+            : public std::integral_constant<std::size_t, 2> {};
+
+template<std::size_t N, typename IteratorType>
+class tuple_element<N, ::nlohmann::detail::iteration_proxy_value<IteratorType >>
+{
+  public:
+    using type = decltype(
+                     get<N>(std::declval <
+                            ::nlohmann::detail::iteration_proxy_value<IteratorType >> ()));
+};
+#if defined(__clang__)
+    #pragma clang diagnostic pop
+#endif
+} // namespace std
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////
+// constructors //
+//////////////////
+
+template<value_t> struct external_constructor;
+
+template<>
+struct external_constructor<value_t::boolean>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::boolean_t b) noexcept
+    {
+        j.m_type = value_t::boolean;
+        j.m_value = b;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::string>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::string_t& s)
+    {
+        j.m_type = value_t::string;
+        j.m_value = s;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+    {
+        j.m_type = value_t::string;
+        j.m_value = std::move(s);
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleStringType,
+               enable_if_t < !std::is_same<CompatibleStringType, typename BasicJsonType::string_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleStringType& str)
+    {
+        j.m_type = value_t::string;
+        j.m_value.string = j.template create<typename BasicJsonType::string_t>(str);
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::binary>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::binary_t& b)
+    {
+        j.m_type = value_t::binary;
+        typename BasicJsonType::binary_t value{b};
+        j.m_value = value;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::binary_t&& b)
+    {
+        j.m_type = value_t::binary;
+        typename BasicJsonType::binary_t value{std::move(b)};
+        j.m_value = value;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_float>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_float_t val) noexcept
+    {
+        j.m_type = value_t::number_float;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_unsigned>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_unsigned_t val) noexcept
+    {
+        j.m_type = value_t::number_unsigned;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::number_integer>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::number_integer_t val) noexcept
+    {
+        j.m_type = value_t::number_integer;
+        j.m_value = val;
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::array>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::array_t& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = arr;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = std::move(arr);
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleArrayType,
+               enable_if_t < !std::is_same<CompatibleArrayType, typename BasicJsonType::array_t>::value,
+                             int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleArrayType& arr)
+    {
+        using std::begin;
+        using std::end;
+        j.m_type = value_t::array;
+        j.m_value.array = j.template create<typename BasicJsonType::array_t>(begin(arr), end(arr));
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const std::vector<bool>& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->reserve(arr.size());
+        for (const bool x : arr)
+        {
+            j.m_value.array->push_back(x);
+        }
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType, typename T,
+             enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+    static void construct(BasicJsonType& j, const std::valarray<T>& arr)
+    {
+        j.m_type = value_t::array;
+        j.m_value = value_t::array;
+        j.m_value.array->resize(arr.size());
+        if (arr.size() > 0)
+        {
+            std::copy(std::begin(arr), std::end(arr), j.m_value.array->begin());
+        }
+        j.assert_invariant();
+    }
+};
+
+template<>
+struct external_constructor<value_t::object>
+{
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, const typename BasicJsonType::object_t& obj)
+    {
+        j.m_type = value_t::object;
+        j.m_value = obj;
+        j.assert_invariant();
+    }
+
+    template<typename BasicJsonType>
+    static void construct(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+    {
+        j.m_type = value_t::object;
+        j.m_value = std::move(obj);
+        j.assert_invariant();
+    }
+
+    template < typename BasicJsonType, typename CompatibleObjectType,
+               enable_if_t < !std::is_same<CompatibleObjectType, typename BasicJsonType::object_t>::value, int > = 0 >
+    static void construct(BasicJsonType& j, const CompatibleObjectType& obj)
+    {
+        using std::begin;
+        using std::end;
+
+        j.m_type = value_t::object;
+        j.m_value.object = j.template create<typename BasicJsonType::object_t>(begin(obj), end(obj));
+        j.assert_invariant();
+    }
+};
+
+/////////////
+// to_json //
+/////////////
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, typename BasicJsonType::boolean_t>::value, int> = 0>
+void to_json(BasicJsonType& j, T b) noexcept
+{
+    external_constructor<value_t::boolean>::construct(j, b);
+}
+
+template<typename BasicJsonType, typename CompatibleString,
+         enable_if_t<std::is_constructible<typename BasicJsonType::string_t, CompatibleString>::value, int> = 0>
+void to_json(BasicJsonType& j, const CompatibleString& s)
+{
+    external_constructor<value_t::string>::construct(j, s);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::string_t&& s)
+{
+    external_constructor<value_t::string>::construct(j, std::move(s));
+}
+
+template<typename BasicJsonType, typename FloatType,
+         enable_if_t<std::is_floating_point<FloatType>::value, int> = 0>
+void to_json(BasicJsonType& j, FloatType val) noexcept
+{
+    external_constructor<value_t::number_float>::construct(j, static_cast<typename BasicJsonType::number_float_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberUnsignedType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_unsigned_t, CompatibleNumberUnsignedType>::value, int> = 0>
+void to_json(BasicJsonType& j, CompatibleNumberUnsignedType val) noexcept
+{
+    external_constructor<value_t::number_unsigned>::construct(j, static_cast<typename BasicJsonType::number_unsigned_t>(val));
+}
+
+template<typename BasicJsonType, typename CompatibleNumberIntegerType,
+         enable_if_t<is_compatible_integer_type<typename BasicJsonType::number_integer_t, CompatibleNumberIntegerType>::value, int> = 0>
+void to_json(BasicJsonType& j, CompatibleNumberIntegerType val) noexcept
+{
+    external_constructor<value_t::number_integer>::construct(j, static_cast<typename BasicJsonType::number_integer_t>(val));
+}
+
+template<typename BasicJsonType, typename EnumType,
+         enable_if_t<std::is_enum<EnumType>::value, int> = 0>
+void to_json(BasicJsonType& j, EnumType e) noexcept
+{
+    using underlying_type = typename std::underlying_type<EnumType>::type;
+    external_constructor<value_t::number_integer>::construct(j, static_cast<underlying_type>(e));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const std::vector<bool>& e)
+{
+    external_constructor<value_t::array>::construct(j, e);
+}
+
+template < typename BasicJsonType, typename CompatibleArrayType,
+           enable_if_t < is_compatible_array_type<BasicJsonType,
+                         CompatibleArrayType>::value&&
+                         !is_compatible_object_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !is_compatible_string_type<BasicJsonType, CompatibleArrayType>::value&&
+                         !std::is_same<typename BasicJsonType::binary_t, CompatibleArrayType>::value&&
+                         !is_basic_json<CompatibleArrayType>::value,
+                         int > = 0 >
+void to_json(BasicJsonType& j, const CompatibleArrayType& arr)
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, const typename BasicJsonType::binary_t& bin)
+{
+    external_constructor<value_t::binary>::construct(j, bin);
+}
+
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_convertible<T, BasicJsonType>::value, int> = 0>
+void to_json(BasicJsonType& j, const std::valarray<T>& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::array_t&& arr)
+{
+    external_constructor<value_t::array>::construct(j, std::move(arr));
+}
+
+template < typename BasicJsonType, typename CompatibleObjectType,
+           enable_if_t < is_compatible_object_type<BasicJsonType, CompatibleObjectType>::value&& !is_basic_json<CompatibleObjectType>::value, int > = 0 >
+void to_json(BasicJsonType& j, const CompatibleObjectType& obj)
+{
+    external_constructor<value_t::object>::construct(j, obj);
+}
+
+template<typename BasicJsonType>
+void to_json(BasicJsonType& j, typename BasicJsonType::object_t&& obj)
+{
+    external_constructor<value_t::object>::construct(j, std::move(obj));
+}
+
+template <
+    typename BasicJsonType, typename T, std::size_t N,
+    enable_if_t < !std::is_constructible<typename BasicJsonType::string_t,
+                  const T(&)[N]>::value,
+                  int > = 0 >
+void to_json(BasicJsonType& j, const T(&arr)[N])
+{
+    external_constructor<value_t::array>::construct(j, arr);
+}
+
+template < typename BasicJsonType, typename T1, typename T2, enable_if_t < std::is_constructible<BasicJsonType, T1>::value&& std::is_constructible<BasicJsonType, T2>::value, int > = 0 >
+void to_json(BasicJsonType& j, const std::pair<T1, T2>& p)
+{
+    j = { p.first, p.second };
+}
+
+// for https://github.com/nlohmann/json/pull/1134
+template<typename BasicJsonType, typename T,
+         enable_if_t<std::is_same<T, iteration_proxy_value<typename BasicJsonType::iterator>>::value, int> = 0>
+void to_json(BasicJsonType& j, const T& b)
+{
+    j = { {b.key(), b.value()} };
+}
+
+template<typename BasicJsonType, typename Tuple, std::size_t... Idx>
+void to_json_tuple_impl(BasicJsonType& j, const Tuple& t, index_sequence<Idx...> /*unused*/)
+{
+    j = { std::get<Idx>(t)... };
+}
+
+template<typename BasicJsonType, typename T, enable_if_t<is_constructible_tuple<BasicJsonType, T>::value, int > = 0>
+void to_json(BasicJsonType& j, const T& t)
+{
+    to_json_tuple_impl(j, t, make_index_sequence<std::tuple_size<T>::value> {});
+}
+
+struct to_json_fn
+{
+    template<typename BasicJsonType, typename T>
+    auto operator()(BasicJsonType& j, T&& val) const noexcept(noexcept(to_json(j, std::forward<T>(val))))
+    -> decltype(to_json(j, std::forward<T>(val)), void())
+    {
+        return to_json(j, std::forward<T>(val));
+    }
+};
+}  // namespace detail
+
+/// namespace to hold default `to_json` function
+namespace
+{
+constexpr const auto& to_json = detail::static_const<detail::to_json_fn>::value;
+} // namespace
+} // namespace nlohmann
+
+
+namespace nlohmann
+{
+
+template<typename, typename>
+struct adl_serializer
+{
+    /*!
+    @brief convert a JSON value to any value type
+
+    This function is usually called by the `get()` function of the
+    @ref basic_json class (either explicit or via conversion operators).
+
+    @param[in] j        JSON value to read from
+    @param[in,out] val  value to write to
+    */
+    template<typename BasicJsonType, typename ValueType>
+    static auto from_json(BasicJsonType&& j, ValueType& val) noexcept(
+        noexcept(::nlohmann::from_json(std::forward<BasicJsonType>(j), val)))
+    -> decltype(::nlohmann::from_json(std::forward<BasicJsonType>(j), val), void())
+    {
+        ::nlohmann::from_json(std::forward<BasicJsonType>(j), val);
+    }
+
+    /*!
+    @brief convert any value type to a JSON value
+
+    This function is usually called by the constructors of the @ref basic_json
+    class.
+
+    @param[in,out] j  JSON value to write to
+    @param[in] val    value to read from
+    */
+    template<typename BasicJsonType, typename ValueType>
+    static auto to_json(BasicJsonType& j, ValueType&& val) noexcept(
+        noexcept(::nlohmann::to_json(j, std::forward<ValueType>(val))))
+    -> decltype(::nlohmann::to_json(j, std::forward<ValueType>(val)), void())
+    {
+        ::nlohmann::to_json(j, std::forward<ValueType>(val));
+    }
+};
+
+}  // namespace nlohmann
+
+// #include <nlohmann/byte_container_with_subtype.hpp>
+
+
+#include <cstdint> // uint8_t
+#include <tuple> // tie
+#include <utility> // move
+
+namespace nlohmann
+{
+
+/*!
+@brief an internal type for a backed binary type
+
+This type extends the template parameter @a BinaryType provided to `basic_json`
+with a subtype used by BSON and MessagePack. This type exists so that the user
+does not have to specify a type themselves with a specific naming scheme in
+order to override the binary type.
+
+@tparam BinaryType container to store bytes (`std::vector<std::uint8_t>` by
+                   default)
+
+@since version 3.8.0
+*/
+template<typename BinaryType>
+class byte_container_with_subtype : public BinaryType
+{
+  public:
+    /// the type of the underlying container
+    using container_type = BinaryType;
+
+    byte_container_with_subtype() noexcept(noexcept(container_type()))
+        : container_type()
+    {}
+
+    byte_container_with_subtype(const container_type& b) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+    {}
+
+    byte_container_with_subtype(container_type&& b) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+    {}
+
+    byte_container_with_subtype(const container_type& b, std::uint8_t subtype) noexcept(noexcept(container_type(b)))
+        : container_type(b)
+        , m_subtype(subtype)
+        , m_has_subtype(true)
+    {}
+
+    byte_container_with_subtype(container_type&& b, std::uint8_t subtype) noexcept(noexcept(container_type(std::move(b))))
+        : container_type(std::move(b))
+        , m_subtype(subtype)
+        , m_has_subtype(true)
+    {}
+
+    bool operator==(const byte_container_with_subtype& rhs) const
+    {
+        return std::tie(static_cast<const BinaryType&>(*this), m_subtype, m_has_subtype) ==
+               std::tie(static_cast<const BinaryType&>(rhs), rhs.m_subtype, rhs.m_has_subtype);
+    }
+
+    bool operator!=(const byte_container_with_subtype& rhs) const
+    {
+        return !(rhs == *this);
+    }
+
+    /*!
+    @brief sets the binary subtype
+
+    Sets the binary subtype of the value, also flags a binary JSON value as
+    having a subtype, which has implications for serialization.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @sa @ref subtype() -- return the binary subtype
+    @sa @ref clear_subtype() -- clears the binary subtype
+    @sa @ref has_subtype() -- returns whether or not the binary value has a
+    subtype
+
+    @since version 3.8.0
+    */
+    void set_subtype(std::uint8_t subtype) noexcept
+    {
+        m_subtype = subtype;
+        m_has_subtype = true;
+    }
+
+    /*!
+    @brief return the binary subtype
+
+    Returns the numerical subtype of the value if it has a subtype. If it does
+    not have a subtype, this function will return size_t(-1) as a sentinel
+    value.
+
+    @return the numerical subtype of the binary value
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @sa @ref set_subtype() -- sets the binary subtype
+    @sa @ref clear_subtype() -- clears the binary subtype
+    @sa @ref has_subtype() -- returns whether or not the binary value has a
+    subtype
+
+    @since version 3.8.0
+    */
+    constexpr std::uint8_t subtype() const noexcept
+    {
+        return m_subtype;
+    }
+
+    /*!
+    @brief return whether the value has a subtype
+
+    @return whether the value has a subtype
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @sa @ref subtype() -- return the binary subtype
+    @sa @ref set_subtype() -- sets the binary subtype
+    @sa @ref clear_subtype() -- clears the binary subtype
+
+    @since version 3.8.0
+    */
+    constexpr bool has_subtype() const noexcept
+    {
+        return m_has_subtype;
+    }
+
+    /*!
+    @brief clears the binary subtype
+
+    Clears the binary subtype and flags the value as not having a subtype, which
+    has implications for serialization; for instance MessagePack will prefer the
+    bin family over the ext family.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @sa @ref subtype() -- return the binary subtype
+    @sa @ref set_subtype() -- sets the binary subtype
+    @sa @ref has_subtype() -- returns whether or not the binary value has a
+    subtype
+
+    @since version 3.8.0
+    */
+    void clear_subtype() noexcept
+    {
+        m_subtype = 0;
+        m_has_subtype = false;
+    }
+
+  private:
+    std::uint8_t m_subtype = 0;
+    bool m_has_subtype = false;
+};
+
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/conversions/from_json.hpp>
+
+// #include <nlohmann/detail/conversions/to_json.hpp>
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/hash.hpp>
+
+
+#include <cstddef> // size_t, uint8_t
+#include <functional> // hash
+
+namespace nlohmann
+{
+namespace detail
+{
+
+// boost::hash_combine
+inline std::size_t combine(std::size_t seed, std::size_t h) noexcept
+{
+    seed ^= h + 0x9e3779b9 + (seed << 6U) + (seed >> 2U);
+    return seed;
+}
+
+/*!
+@brief hash a JSON value
+
+The hash function tries to rely on std::hash where possible. Furthermore, the
+type of the JSON value is taken into account to have different hash values for
+null, 0, 0U, and false, etc.
+
+@tparam BasicJsonType basic_json specialization
+@param j JSON value to hash
+@return hash value of j
+*/
+template<typename BasicJsonType>
+std::size_t hash(const BasicJsonType& j)
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+    const auto type = static_cast<std::size_t>(j.type());
+    switch (j.type())
+    {
+        case BasicJsonType::value_t::null:
+        case BasicJsonType::value_t::discarded:
+        {
+            return combine(type, 0);
+        }
+
+        case BasicJsonType::value_t::object:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j.items())
+            {
+                const auto h = std::hash<string_t> {}(element.key());
+                seed = combine(seed, h);
+                seed = combine(seed, hash(element.value()));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::array:
+        {
+            auto seed = combine(type, j.size());
+            for (const auto& element : j)
+            {
+                seed = combine(seed, hash(element));
+            }
+            return seed;
+        }
+
+        case BasicJsonType::value_t::string:
+        {
+            const auto h = std::hash<string_t> {}(j.template get_ref<const string_t&>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::boolean:
+        {
+            const auto h = std::hash<bool> {}(j.template get<bool>());
+            return combine(type, h);
+        }
+
+        case BasicJsonType::value_t::number_integer:
+        {
+            const auto h = std::hash<number_integer_t> {}(j.template get<number_integer_t>());
+            return combine(type, h);
+        }
+
+        case nlohmann::detail::value_t::number_unsigned:
+        {
+            const auto h = std::hash<number_unsigned_t> {}(j.template get<number_unsigned_t>());
+            return combine(type, h);
+        }
+
+        case nlohmann::detail::value_t::number_float:
+        {
+            const auto h = std::hash<number_float_t> {}(j.template get<number_float_t>());
+            return combine(type, h);
+        }
+
+        case nlohmann::detail::value_t::binary:
+        {
+            auto seed = combine(type, j.get_binary().size());
+            const auto h = std::hash<bool> {}(j.get_binary().has_subtype());
+            seed = combine(seed, h);
+            seed = combine(seed, j.get_binary().subtype());
+            for (const auto byte : j.get_binary())
+            {
+                seed = combine(seed, std::hash<std::uint8_t> {}(byte));
+            }
+            return seed;
+        }
+
+        default: // LCOV_EXCL_LINE
+            JSON_ASSERT(false); // LCOV_EXCL_LINE
+    }
+}
+
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+
+#include <algorithm> // generate_n
+#include <array> // array
+#include <cmath> // ldexp
+#include <cstddef> // size_t
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstdio> // snprintf
+#include <cstring> // memcpy
+#include <iterator> // back_inserter
+#include <limits> // numeric_limits
+#include <string> // char_traits, string
+#include <utility> // make_pair, move
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+
+#include <array> // array
+#include <cstddef> // size_t
+#include <cstdio> //FILE *
+#include <cstring> // strlen
+#include <istream> // istream
+#include <iterator> // begin, end, iterator_traits, random_access_iterator_tag, distance, next
+#include <memory> // shared_ptr, make_shared, addressof
+#include <numeric> // accumulate
+#include <string> // string, char_traits
+#include <type_traits> // enable_if, is_base_of, is_pointer, is_integral, remove_pointer
+#include <utility> // pair, declval
+
+// #include <nlohmann/detail/iterators/iterator_traits.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// the supported input formats
+enum class input_format_t { json, cbor, msgpack, ubjson, bson };
+
+////////////////////
+// input adapters //
+////////////////////
+
+/*!
+Input adapter for stdio file access. This adapter read only 1 byte and do not use any
+ buffer. This adapter is a very low level adapter.
+*/
+class file_input_adapter
+{
+  public:
+    using char_type = char;
+
+    JSON_HEDLEY_NON_NULL(2)
+    explicit file_input_adapter(std::FILE* f) noexcept
+        : m_file(f)
+    {}
+
+    // make class move-only
+    file_input_adapter(const file_input_adapter&) = delete;
+    file_input_adapter(file_input_adapter&&) = default;
+    file_input_adapter& operator=(const file_input_adapter&) = delete;
+    file_input_adapter& operator=(file_input_adapter&&) = delete;
+
+    std::char_traits<char>::int_type get_character() noexcept
+    {
+        return std::fgetc(m_file);
+    }
+
+  private:
+    /// the file pointer to read from
+    std::FILE* m_file;
+};
+
+
+/*!
+Input adapter for a (caching) istream. Ignores a UFT Byte Order Mark at
+beginning of input. Does not support changing the underlying std::streambuf
+in mid-input. Maintains underlying std::istream and std::streambuf to support
+subsequent use of standard std::istream operations to process any input
+characters following those used in parsing the JSON input.  Clears the
+std::istream flags; any input errors (e.g., EOF) will be detected by the first
+subsequent call for input from the std::istream.
+*/
+class input_stream_adapter
+{
+  public:
+    using char_type = char;
+
+    ~input_stream_adapter()
+    {
+        // clear stream flags; we use underlying streambuf I/O, do not
+        // maintain ifstream flags, except eof
+        if (is != nullptr)
+        {
+            is->clear(is->rdstate() & std::ios::eofbit);
+        }
+    }
+
+    explicit input_stream_adapter(std::istream& i)
+        : is(&i), sb(i.rdbuf())
+    {}
+
+    // delete because of pointer members
+    input_stream_adapter(const input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&) = delete;
+    input_stream_adapter& operator=(input_stream_adapter&& rhs) = delete;
+
+    input_stream_adapter(input_stream_adapter&& rhs) noexcept : is(rhs.is), sb(rhs.sb)
+    {
+        rhs.is = nullptr;
+        rhs.sb = nullptr;
+    }
+
+    // std::istream/std::streambuf use std::char_traits<char>::to_int_type, to
+    // ensure that std::char_traits<char>::eof() and the character 0xFF do not
+    // end up as the same value, eg. 0xFFFFFFFF.
+    std::char_traits<char>::int_type get_character()
+    {
+        auto res = sb->sbumpc();
+        // set eof manually, as we don't use the istream interface.
+        if (JSON_HEDLEY_UNLIKELY(res == EOF))
+        {
+            is->clear(is->rdstate() | std::ios::eofbit);
+        }
+        return res;
+    }
+
+  private:
+    /// the associated input stream
+    std::istream* is = nullptr;
+    std::streambuf* sb = nullptr;
+};
+
+// General-purpose iterator-based adapter. It might not be as fast as
+// theoretically possible for some containers, but it is extremely versatile.
+template<typename IteratorType>
+class iterator_input_adapter
+{
+  public:
+    using char_type = typename std::iterator_traits<IteratorType>::value_type;
+
+    iterator_input_adapter(IteratorType first, IteratorType last)
+        : current(std::move(first)), end(std::move(last)) {}
+
+    typename std::char_traits<char_type>::int_type get_character()
+    {
+        if (JSON_HEDLEY_LIKELY(current != end))
+        {
+            auto result = std::char_traits<char_type>::to_int_type(*current);
+            std::advance(current, 1);
+            return result;
+        }
+        else
+        {
+            return std::char_traits<char_type>::eof();
+        }
+    }
+
+  private:
+    IteratorType current;
+    IteratorType end;
+
+    template<typename BaseInputAdapter, size_t T>
+    friend struct wide_string_input_helper;
+
+    bool empty() const
+    {
+        return current == end;
+    }
+
+};
+
+
+template<typename BaseInputAdapter, size_t T>
+struct wide_string_input_helper;
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 4>
+{
+    // UTF-32
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-32 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u) & 0x1Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (wc <= 0xFFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u) & 0x0Fu));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else if (wc <= 0x10FFFF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | ((static_cast<unsigned int>(wc) >> 18u) & 0x07u));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 12u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 4;
+            }
+            else
+            {
+                // unknown character
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+        }
+    }
+};
+
+template<typename BaseInputAdapter>
+struct wide_string_input_helper<BaseInputAdapter, 2>
+{
+    // UTF-16
+    static void fill_buffer(BaseInputAdapter& input,
+                            std::array<std::char_traits<char>::int_type, 4>& utf8_bytes,
+                            size_t& utf8_bytes_index,
+                            size_t& utf8_bytes_filled)
+    {
+        utf8_bytes_index = 0;
+
+        if (JSON_HEDLEY_UNLIKELY(input.empty()))
+        {
+            utf8_bytes[0] = std::char_traits<char>::eof();
+            utf8_bytes_filled = 1;
+        }
+        else
+        {
+            // get the current character
+            const auto wc = input.get_character();
+
+            // UTF-16 to UTF-8 encoding
+            if (wc < 0x80)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                utf8_bytes_filled = 1;
+            }
+            else if (wc <= 0x7FF)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xC0u | ((static_cast<unsigned int>(wc) >> 6u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 2;
+            }
+            else if (0xD800 > wc || wc >= 0xE000)
+            {
+                utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xE0u | ((static_cast<unsigned int>(wc) >> 12u)));
+                utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((static_cast<unsigned int>(wc) >> 6u) & 0x3Fu));
+                utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | (static_cast<unsigned int>(wc) & 0x3Fu));
+                utf8_bytes_filled = 3;
+            }
+            else
+            {
+                if (JSON_HEDLEY_UNLIKELY(!input.empty()))
+                {
+                    const auto wc2 = static_cast<unsigned int>(input.get_character());
+                    const auto charcode = 0x10000u + (((static_cast<unsigned int>(wc) & 0x3FFu) << 10u) | (wc2 & 0x3FFu));
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(0xF0u | (charcode >> 18u));
+                    utf8_bytes[1] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 12u) & 0x3Fu));
+                    utf8_bytes[2] = static_cast<std::char_traits<char>::int_type>(0x80u | ((charcode >> 6u) & 0x3Fu));
+                    utf8_bytes[3] = static_cast<std::char_traits<char>::int_type>(0x80u | (charcode & 0x3Fu));
+                    utf8_bytes_filled = 4;
+                }
+                else
+                {
+                    utf8_bytes[0] = static_cast<std::char_traits<char>::int_type>(wc);
+                    utf8_bytes_filled = 1;
+                }
+            }
+        }
+    }
+};
+
+// Wraps another input apdater to convert wide character types into individual bytes.
+template<typename BaseInputAdapter, typename WideCharType>
+class wide_string_input_adapter
+{
+  public:
+    using char_type = char;
+
+    wide_string_input_adapter(BaseInputAdapter base)
+        : base_adapter(base) {}
+
+    typename std::char_traits<char>::int_type get_character() noexcept
+    {
+        // check if buffer needs to be filled
+        if (utf8_bytes_index == utf8_bytes_filled)
+        {
+            fill_buffer<sizeof(WideCharType)>();
+
+            JSON_ASSERT(utf8_bytes_filled > 0);
+            JSON_ASSERT(utf8_bytes_index == 0);
+        }
+
+        // use buffer
+        JSON_ASSERT(utf8_bytes_filled > 0);
+        JSON_ASSERT(utf8_bytes_index < utf8_bytes_filled);
+        return utf8_bytes[utf8_bytes_index++];
+    }
+
+  private:
+    BaseInputAdapter base_adapter;
+
+    template<size_t T>
+    void fill_buffer()
+    {
+        wide_string_input_helper<BaseInputAdapter, T>::fill_buffer(base_adapter, utf8_bytes, utf8_bytes_index, utf8_bytes_filled);
+    }
+
+    /// a buffer for UTF-8 bytes
+    std::array<std::char_traits<char>::int_type, 4> utf8_bytes = {{0, 0, 0, 0}};
+
+    /// index to the utf8_codes array for the next valid byte
+    std::size_t utf8_bytes_index = 0;
+    /// number of valid bytes in the utf8_codes array
+    std::size_t utf8_bytes_filled = 0;
+};
+
+
+template<typename IteratorType, typename Enable = void>
+struct iterator_input_adapter_factory
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using adapter_type = iterator_input_adapter<iterator_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(std::move(first), std::move(last));
+    }
+};
+
+template<typename T>
+struct is_iterator_of_multibyte
+{
+    using value_type = typename std::iterator_traits<T>::value_type;
+    enum
+    {
+        value = sizeof(value_type) > 1
+    };
+};
+
+template<typename IteratorType>
+struct iterator_input_adapter_factory<IteratorType, enable_if_t<is_iterator_of_multibyte<IteratorType>::value>>
+{
+    using iterator_type = IteratorType;
+    using char_type = typename std::iterator_traits<iterator_type>::value_type;
+    using base_adapter_type = iterator_input_adapter<iterator_type>;
+    using adapter_type = wide_string_input_adapter<base_adapter_type, char_type>;
+
+    static adapter_type create(IteratorType first, IteratorType last)
+    {
+        return adapter_type(base_adapter_type(std::move(first), std::move(last)));
+    }
+};
+
+// General purpose iterator-based input
+template<typename IteratorType>
+typename iterator_input_adapter_factory<IteratorType>::adapter_type input_adapter(IteratorType first, IteratorType last)
+{
+    using factory_type = iterator_input_adapter_factory<IteratorType>;
+    return factory_type::create(first, last);
+}
+
+// Convenience shorthand from container to iterator
+template<typename ContainerType>
+auto input_adapter(const ContainerType& container) -> decltype(input_adapter(begin(container), end(container)))
+{
+    // Enable ADL
+    using std::begin;
+    using std::end;
+
+    return input_adapter(begin(container), end(container));
+}
+
+// Special cases with fast paths
+inline file_input_adapter input_adapter(std::FILE* file)
+{
+    return file_input_adapter(file);
+}
+
+inline input_stream_adapter input_adapter(std::istream& stream)
+{
+    return input_stream_adapter(stream);
+}
+
+inline input_stream_adapter input_adapter(std::istream&& stream)
+{
+    return input_stream_adapter(stream);
+}
+
+using contiguous_bytes_input_adapter = decltype(input_adapter(std::declval<const char*>(), std::declval<const char*>()));
+
+// Null-delimited strings, and the like.
+template < typename CharT,
+           typename std::enable_if <
+               std::is_pointer<CharT>::value&&
+               !std::is_array<CharT>::value&&
+               std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+               sizeof(typename std::remove_pointer<CharT>::type) == 1,
+               int >::type = 0 >
+contiguous_bytes_input_adapter input_adapter(CharT b)
+{
+    auto length = std::strlen(reinterpret_cast<const char*>(b));
+    const auto* ptr = reinterpret_cast<const char*>(b);
+    return input_adapter(ptr, ptr + length);
+}
+
+template<typename T, std::size_t N>
+auto input_adapter(T (&array)[N]) -> decltype(input_adapter(array, array + N))
+{
+    return input_adapter(array, array + N);
+}
+
+// This class only handles inputs of input_buffer_adapter type.
+// It's required so that expressions like {ptr, len} can be implicitely casted
+// to the correct adapter.
+class span_input_adapter
+{
+  public:
+    template < typename CharT,
+               typename std::enable_if <
+                   std::is_pointer<CharT>::value&&
+                   std::is_integral<typename std::remove_pointer<CharT>::type>::value&&
+                   sizeof(typename std::remove_pointer<CharT>::type) == 1,
+                   int >::type = 0 >
+    span_input_adapter(CharT b, std::size_t l)
+        : ia(reinterpret_cast<const char*>(b), reinterpret_cast<const char*>(b) + l) {}
+
+    template<class IteratorType,
+             typename std::enable_if<
+                 std::is_same<typename iterator_traits<IteratorType>::iterator_category, std::random_access_iterator_tag>::value,
+                 int>::type = 0>
+    span_input_adapter(IteratorType first, IteratorType last)
+        : ia(input_adapter(first, last)) {}
+
+    contiguous_bytes_input_adapter&& get()
+    {
+        return std::move(ia);
+    }
+
+  private:
+    contiguous_bytes_input_adapter ia;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+
+#include <cstddef>
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+
+/*!
+@brief SAX interface
+
+This class describes the SAX interface used by @ref nlohmann::json::sax_parse.
+Each function is called in different situations while the input is parsed. The
+boolean return value informs the parser whether to continue processing the
+input.
+*/
+template<typename BasicJsonType>
+struct json_sax
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    /*!
+    @brief a null value was read
+    @return whether parsing should proceed
+    */
+    virtual bool null() = 0;
+
+    /*!
+    @brief a boolean value was read
+    @param[in] val  boolean value
+    @return whether parsing should proceed
+    */
+    virtual bool boolean(bool val) = 0;
+
+    /*!
+    @brief an integer number was read
+    @param[in] val  integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_integer(number_integer_t val) = 0;
+
+    /*!
+    @brief an unsigned integer number was read
+    @param[in] val  unsigned integer value
+    @return whether parsing should proceed
+    */
+    virtual bool number_unsigned(number_unsigned_t val) = 0;
+
+    /*!
+    @brief an floating-point number was read
+    @param[in] val  floating-point value
+    @param[in] s    raw token value
+    @return whether parsing should proceed
+    */
+    virtual bool number_float(number_float_t val, const string_t& s) = 0;
+
+    /*!
+    @brief a string was read
+    @param[in] val  string value
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool string(string_t& val) = 0;
+
+    /*!
+    @brief a binary string was read
+    @param[in] val  binary value
+    @return whether parsing should proceed
+    @note It is safe to move the passed binary.
+    */
+    virtual bool binary(binary_t& val) = 0;
+
+    /*!
+    @brief the beginning of an object was read
+    @param[in] elements  number of object elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_object(std::size_t elements) = 0;
+
+    /*!
+    @brief an object key was read
+    @param[in] val  object key
+    @return whether parsing should proceed
+    @note It is safe to move the passed string.
+    */
+    virtual bool key(string_t& val) = 0;
+
+    /*!
+    @brief the end of an object was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_object() = 0;
+
+    /*!
+    @brief the beginning of an array was read
+    @param[in] elements  number of array elements or -1 if unknown
+    @return whether parsing should proceed
+    @note binary formats may report the number of elements
+    */
+    virtual bool start_array(std::size_t elements) = 0;
+
+    /*!
+    @brief the end of an array was read
+    @return whether parsing should proceed
+    */
+    virtual bool end_array() = 0;
+
+    /*!
+    @brief a parse error occurred
+    @param[in] position    the position in the input where the error occurs
+    @param[in] last_token  the last read token
+    @param[in] ex          an exception object describing the error
+    @return whether parsing should proceed (must return false)
+    */
+    virtual bool parse_error(std::size_t position,
+                             const std::string& last_token,
+                             const detail::exception& ex) = 0;
+
+    virtual ~json_sax() = default;
+};
+
+
+namespace detail
+{
+/*!
+@brief SAX implementation to create a JSON value from SAX events
+
+This class implements the @ref json_sax interface and processes the SAX events
+to create a JSON value which makes it basically a DOM parser. The structure or
+hierarchy of the JSON value is managed by the stack `ref_stack` which contains
+a pointer to the respective array or object for each recursion depth.
+
+After successful parsing, the value that is passed by reference to the
+constructor contains the parsed value.
+
+@tparam BasicJsonType  the JSON type
+*/
+template<typename BasicJsonType>
+class json_sax_dom_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    /*!
+    @param[in, out] r  reference to a JSON value that is manipulated while
+                       parsing
+    @param[in] allow_exceptions_  whether parse errors yield exceptions
+    */
+    explicit json_sax_dom_parser(BasicJsonType& r, const bool allow_exceptions_ = true)
+        : root(r), allow_exceptions(allow_exceptions_)
+    {}
+
+    // make class move-only
+    json_sax_dom_parser(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser(json_sax_dom_parser&&) = default;
+    json_sax_dom_parser& operator=(const json_sax_dom_parser&) = delete;
+    json_sax_dom_parser& operator=(json_sax_dom_parser&&) = default;
+    ~json_sax_dom_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::object));
+
+        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408,
+                                            "excessive object size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        // add null at given key and store the reference for later
+        object_element = &(ref_stack.back()->m_value.object->operator[](val));
+        return true;
+    }
+
+    bool end_object()
+    {
+        ref_stack.pop_back();
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        ref_stack.push_back(handle_value(BasicJsonType::value_t::array));
+
+        if (JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408,
+                                            "excessive array size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        ref_stack.pop_back();
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+    */
+    template<typename Value>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    BasicJsonType* handle_value(Value&& v)
+    {
+        if (ref_stack.empty())
+        {
+            root = BasicJsonType(std::forward<Value>(v));
+            return &root;
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->emplace_back(std::forward<Value>(v));
+            return &(ref_stack.back()->m_value.array->back());
+        }
+
+        JSON_ASSERT(ref_stack.back()->is_object());
+        JSON_ASSERT(object_element);
+        *object_element = BasicJsonType(std::forward<Value>(v));
+        return object_element;
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+
+template<typename BasicJsonType>
+class json_sax_dom_callback_parser
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using parser_callback_t = typename BasicJsonType::parser_callback_t;
+    using parse_event_t = typename BasicJsonType::parse_event_t;
+
+    json_sax_dom_callback_parser(BasicJsonType& r,
+                                 const parser_callback_t cb,
+                                 const bool allow_exceptions_ = true)
+        : root(r), callback(cb), allow_exceptions(allow_exceptions_)
+    {
+        keep_stack.push_back(true);
+    }
+
+    // make class move-only
+    json_sax_dom_callback_parser(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser(json_sax_dom_callback_parser&&) = default;
+    json_sax_dom_callback_parser& operator=(const json_sax_dom_callback_parser&) = delete;
+    json_sax_dom_callback_parser& operator=(json_sax_dom_callback_parser&&) = default;
+    ~json_sax_dom_callback_parser() = default;
+
+    bool null()
+    {
+        handle_value(nullptr);
+        return true;
+    }
+
+    bool boolean(bool val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_integer(number_integer_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool number_float(number_float_t val, const string_t& /*unused*/)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool string(string_t& val)
+    {
+        handle_value(val);
+        return true;
+    }
+
+    bool binary(binary_t& val)
+    {
+        handle_value(std::move(val));
+        return true;
+    }
+
+    bool start_object(std::size_t len)
+    {
+        // check callback for object start
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::object_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::object, true);
+        ref_stack.push_back(val.second);
+
+        // check object limit
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive object size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool key(string_t& val)
+    {
+        BasicJsonType k = BasicJsonType(val);
+
+        // check callback for key
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::key, k);
+        key_keep_stack.push_back(keep);
+
+        // add discarded value at given key and store the reference for later
+        if (keep && ref_stack.back())
+        {
+            object_element = &(ref_stack.back()->m_value.object->operator[](val) = discarded);
+        }
+
+        return true;
+    }
+
+    bool end_object()
+    {
+        if (ref_stack.back() && !callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::object_end, *ref_stack.back()))
+        {
+            // discard object
+            *ref_stack.back() = discarded;
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        if (!ref_stack.empty() && ref_stack.back() && ref_stack.back()->is_structured())
+        {
+            // remove discarded value
+            for (auto it = ref_stack.back()->begin(); it != ref_stack.back()->end(); ++it)
+            {
+                if (it->is_discarded())
+                {
+                    ref_stack.back()->erase(it);
+                    break;
+                }
+            }
+        }
+
+        return true;
+    }
+
+    bool start_array(std::size_t len)
+    {
+        const bool keep = callback(static_cast<int>(ref_stack.size()), parse_event_t::array_start, discarded);
+        keep_stack.push_back(keep);
+
+        auto val = handle_value(BasicJsonType::value_t::array, true);
+        ref_stack.push_back(val.second);
+
+        // check array limit
+        if (ref_stack.back() && JSON_HEDLEY_UNLIKELY(len != std::size_t(-1) && len > ref_stack.back()->max_size()))
+        {
+            JSON_THROW(out_of_range::create(408, "excessive array size: " + std::to_string(len)));
+        }
+
+        return true;
+    }
+
+    bool end_array()
+    {
+        bool keep = true;
+
+        if (ref_stack.back())
+        {
+            keep = callback(static_cast<int>(ref_stack.size()) - 1, parse_event_t::array_end, *ref_stack.back());
+            if (!keep)
+            {
+                // discard array
+                *ref_stack.back() = discarded;
+            }
+        }
+
+        JSON_ASSERT(!ref_stack.empty());
+        JSON_ASSERT(!keep_stack.empty());
+        ref_stack.pop_back();
+        keep_stack.pop_back();
+
+        // remove discarded value
+        if (!keep && !ref_stack.empty() && ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->pop_back();
+        }
+
+        return true;
+    }
+
+    template<class Exception>
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/,
+                     const Exception& ex)
+    {
+        errored = true;
+        static_cast<void>(ex);
+        if (allow_exceptions)
+        {
+            JSON_THROW(ex);
+        }
+        return false;
+    }
+
+    constexpr bool is_errored() const
+    {
+        return errored;
+    }
+
+  private:
+    /*!
+    @param[in] v  value to add to the JSON value we build during parsing
+    @param[in] skip_callback  whether we should skip calling the callback
+               function; this is required after start_array() and
+               start_object() SAX events, because otherwise we would call the
+               callback function with an empty array or object, respectively.
+
+    @invariant If the ref stack is empty, then the passed value will be the new
+               root.
+    @invariant If the ref stack contains a value, then it is an array or an
+               object to which we can add elements
+
+    @return pair of boolean (whether value should be kept) and pointer (to the
+            passed value in the ref_stack hierarchy; nullptr if not kept)
+    */
+    template<typename Value>
+    std::pair<bool, BasicJsonType*> handle_value(Value&& v, const bool skip_callback = false)
+    {
+        JSON_ASSERT(!keep_stack.empty());
+
+        // do not handle this value if we know it would be added to a discarded
+        // container
+        if (!keep_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // create value
+        auto value = BasicJsonType(std::forward<Value>(v));
+
+        // check callback
+        const bool keep = skip_callback || callback(static_cast<int>(ref_stack.size()), parse_event_t::value, value);
+
+        // do not handle this value if we just learnt it shall be discarded
+        if (!keep)
+        {
+            return {false, nullptr};
+        }
+
+        if (ref_stack.empty())
+        {
+            root = std::move(value);
+            return {true, &root};
+        }
+
+        // skip this value if we already decided to skip the parent
+        // (https://github.com/nlohmann/json/issues/971#issuecomment-413678360)
+        if (!ref_stack.back())
+        {
+            return {false, nullptr};
+        }
+
+        // we now only expect arrays and objects
+        JSON_ASSERT(ref_stack.back()->is_array() || ref_stack.back()->is_object());
+
+        // array
+        if (ref_stack.back()->is_array())
+        {
+            ref_stack.back()->m_value.array->push_back(std::move(value));
+            return {true, &(ref_stack.back()->m_value.array->back())};
+        }
+
+        // object
+        JSON_ASSERT(ref_stack.back()->is_object());
+        // check if we should store an element for the current key
+        JSON_ASSERT(!key_keep_stack.empty());
+        const bool store_element = key_keep_stack.back();
+        key_keep_stack.pop_back();
+
+        if (!store_element)
+        {
+            return {false, nullptr};
+        }
+
+        JSON_ASSERT(object_element);
+        *object_element = std::move(value);
+        return {true, object_element};
+    }
+
+    /// the parsed JSON value
+    BasicJsonType& root;
+    /// stack to model hierarchy of values
+    std::vector<BasicJsonType*> ref_stack {};
+    /// stack to manage which values to keep
+    std::vector<bool> keep_stack {};
+    /// stack to manage which object keys to keep
+    std::vector<bool> key_keep_stack {};
+    /// helper to hold the reference for the next object element
+    BasicJsonType* object_element = nullptr;
+    /// whether a syntax error occurred
+    bool errored = false;
+    /// callback function
+    const parser_callback_t callback = nullptr;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+    /// a discarded value for the callback
+    BasicJsonType discarded = BasicJsonType::value_t::discarded;
+};
+
+template<typename BasicJsonType>
+class json_sax_acceptor
+{
+  public:
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+
+    bool null()
+    {
+        return true;
+    }
+
+    bool boolean(bool /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_integer(number_integer_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_unsigned(number_unsigned_t /*unused*/)
+    {
+        return true;
+    }
+
+    bool number_float(number_float_t /*unused*/, const string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool string(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool binary(binary_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool start_object(std::size_t /*unused*/ = std::size_t(-1))
+    {
+        return true;
+    }
+
+    bool key(string_t& /*unused*/)
+    {
+        return true;
+    }
+
+    bool end_object()
+    {
+        return true;
+    }
+
+    bool start_array(std::size_t /*unused*/ = std::size_t(-1))
+    {
+        return true;
+    }
+
+    bool end_array()
+    {
+        return true;
+    }
+
+    bool parse_error(std::size_t /*unused*/, const std::string& /*unused*/, const detail::exception& /*unused*/)
+    {
+        return false;
+    }
+};
+}  // namespace detail
+
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+
+#include <array> // array
+#include <clocale> // localeconv
+#include <cstddef> // size_t
+#include <cstdio> // snprintf
+#include <cstdlib> // strtof, strtod, strtold, strtoll, strtoull
+#include <initializer_list> // initializer_list
+#include <string> // char_traits, string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/position_t.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////
+// lexer //
+///////////
+
+template<typename BasicJsonType>
+class lexer_base
+{
+  public:
+    /// token types for the parser
+    enum class token_type
+    {
+        uninitialized,    ///< indicating the scanner is uninitialized
+        literal_true,     ///< the `true` literal
+        literal_false,    ///< the `false` literal
+        literal_null,     ///< the `null` literal
+        value_string,     ///< a string -- use get_string() for actual value
+        value_unsigned,   ///< an unsigned integer -- use get_number_unsigned() for actual value
+        value_integer,    ///< a signed integer -- use get_number_integer() for actual value
+        value_float,      ///< an floating point number -- use get_number_float() for actual value
+        begin_array,      ///< the character for array begin `[`
+        begin_object,     ///< the character for object begin `{`
+        end_array,        ///< the character for array end `]`
+        end_object,       ///< the character for object end `}`
+        name_separator,   ///< the name separator `:`
+        value_separator,  ///< the value separator `,`
+        parse_error,      ///< indicating a parse error
+        end_of_input,     ///< indicating the end of the input buffer
+        literal_or_value  ///< a literal or the begin of a value (only for diagnostics)
+    };
+
+    /// return name of values of type token_type (only used for errors)
+    JSON_HEDLEY_RETURNS_NON_NULL
+    JSON_HEDLEY_CONST
+    static const char* token_type_name(const token_type t) noexcept
+    {
+        switch (t)
+        {
+            case token_type::uninitialized:
+                return "<uninitialized>";
+            case token_type::literal_true:
+                return "true literal";
+            case token_type::literal_false:
+                return "false literal";
+            case token_type::literal_null:
+                return "null literal";
+            case token_type::value_string:
+                return "string literal";
+            case token_type::value_unsigned:
+            case token_type::value_integer:
+            case token_type::value_float:
+                return "number literal";
+            case token_type::begin_array:
+                return "'['";
+            case token_type::begin_object:
+                return "'{'";
+            case token_type::end_array:
+                return "']'";
+            case token_type::end_object:
+                return "'}'";
+            case token_type::name_separator:
+                return "':'";
+            case token_type::value_separator:
+                return "','";
+            case token_type::parse_error:
+                return "<parse error>";
+            case token_type::end_of_input:
+                return "end of input";
+            case token_type::literal_or_value:
+                return "'[', '{', or a literal";
+            // LCOV_EXCL_START
+            default: // catch non-enum values
+                return "unknown token";
+                // LCOV_EXCL_STOP
+        }
+    }
+};
+/*!
+@brief lexical analysis
+
+This class organizes the lexical analysis during JSON deserialization.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class lexer : public lexer_base<BasicJsonType>
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename std::char_traits<char_type>::int_type;
+
+  public:
+    using token_type = typename lexer_base<BasicJsonType>::token_type;
+
+    explicit lexer(InputAdapterType&& adapter, bool ignore_comments_ = false)
+        : ia(std::move(adapter))
+        , ignore_comments(ignore_comments_)
+        , decimal_point_char(static_cast<char_int_type>(get_decimal_point()))
+    {}
+
+    // delete because of pointer members
+    lexer(const lexer&) = delete;
+    lexer(lexer&&) = default;
+    lexer& operator=(lexer&) = delete;
+    lexer& operator=(lexer&&) = default;
+    ~lexer() = default;
+
+  private:
+    /////////////////////
+    // locales
+    /////////////////////
+
+    /// return the locale-dependent decimal point
+    JSON_HEDLEY_PURE
+    static char get_decimal_point() noexcept
+    {
+        const auto* loc = localeconv();
+        JSON_ASSERT(loc != nullptr);
+        return (loc->decimal_point == nullptr) ? '.' : *(loc->decimal_point);
+    }
+
+    /////////////////////
+    // scan functions
+    /////////////////////
+
+    /*!
+    @brief get codepoint from 4 hex characters following `\u`
+
+    For input "\u c1 c2 c3 c4" the codepoint is:
+      (c1 * 0x1000) + (c2 * 0x0100) + (c3 * 0x0010) + c4
+    = (c1 << 12) + (c2 << 8) + (c3 << 4) + (c4 << 0)
+
+    Furthermore, the possible characters '0'..'9', 'A'..'F', and 'a'..'f'
+    must be converted to the integers 0x0..0x9, 0xA..0xF, 0xA..0xF, resp. The
+    conversion is done by subtracting the offset (0x30, 0x37, and 0x57)
+    between the ASCII value of the character and the desired integer value.
+
+    @return codepoint (0x0000..0xFFFF) or -1 in case of an error (e.g. EOF or
+            non-hex character)
+    */
+    int get_codepoint()
+    {
+        // this function only makes sense after reading `\u`
+        JSON_ASSERT(current == 'u');
+        int codepoint = 0;
+
+        const auto factors = { 12u, 8u, 4u, 0u };
+        for (const auto factor : factors)
+        {
+            get();
+
+            if (current >= '0' && current <= '9')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x30u) << factor);
+            }
+            else if (current >= 'A' && current <= 'F')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x37u) << factor);
+            }
+            else if (current >= 'a' && current <= 'f')
+            {
+                codepoint += static_cast<int>((static_cast<unsigned int>(current) - 0x57u) << factor);
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        JSON_ASSERT(0x0000 <= codepoint && codepoint <= 0xFFFF);
+        return codepoint;
+    }
+
+    /*!
+    @brief check if the next byte(s) are inside a given range
+
+    Adds the current byte and, for each passed range, reads a new byte and
+    checks if it is inside the range. If a violation was detected, set up an
+    error message and return false. Otherwise, return true.
+
+    @param[in] ranges  list of integers; interpreted as list of pairs of
+                       inclusive lower and upper bound, respectively
+
+    @pre The passed list @a ranges must have 2, 4, or 6 elements; that is,
+         1, 2, or 3 pairs. This precondition is enforced by an assertion.
+
+    @return true if and only if no range violation was detected
+    */
+    bool next_byte_in_range(std::initializer_list<char_int_type> ranges)
+    {
+        JSON_ASSERT(ranges.size() == 2 || ranges.size() == 4 || ranges.size() == 6);
+        add(current);
+
+        for (auto range = ranges.begin(); range != ranges.end(); ++range)
+        {
+            get();
+            if (JSON_HEDLEY_LIKELY(*range <= current && current <= *(++range)))
+            {
+                add(current);
+            }
+            else
+            {
+                error_message = "invalid string: ill-formed UTF-8 byte";
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief scan a string literal
+
+    This function scans a string according to Sect. 7 of RFC 7159. While
+    scanning, bytes are escaped and copied into buffer token_buffer. Then the
+    function returns successfully, token_buffer is *not* null-terminated (as it
+    may contain \0 bytes), and token_buffer.size() is the number of bytes in the
+    string.
+
+    @return token_type::value_string if string could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note In case of errors, variable error_message contains a textual
+          description.
+    */
+    token_type scan_string()
+    {
+        // reset token_buffer (ignore opening quote)
+        reset();
+
+        // we entered the function by reading an open quote
+        JSON_ASSERT(current == '\"');
+
+        while (true)
+        {
+            // get next character
+            switch (get())
+            {
+                // end of file while parsing string
+                case std::char_traits<char_type>::eof():
+                {
+                    error_message = "invalid string: missing closing quote";
+                    return token_type::parse_error;
+                }
+
+                // closing quote
+                case '\"':
+                {
+                    return token_type::value_string;
+                }
+
+                // escapes
+                case '\\':
+                {
+                    switch (get())
+                    {
+                        // quotation mark
+                        case '\"':
+                            add('\"');
+                            break;
+                        // reverse solidus
+                        case '\\':
+                            add('\\');
+                            break;
+                        // solidus
+                        case '/':
+                            add('/');
+                            break;
+                        // backspace
+                        case 'b':
+                            add('\b');
+                            break;
+                        // form feed
+                        case 'f':
+                            add('\f');
+                            break;
+                        // line feed
+                        case 'n':
+                            add('\n');
+                            break;
+                        // carriage return
+                        case 'r':
+                            add('\r');
+                            break;
+                        // tab
+                        case 't':
+                            add('\t');
+                            break;
+
+                        // unicode escapes
+                        case 'u':
+                        {
+                            const int codepoint1 = get_codepoint();
+                            int codepoint = codepoint1; // start with codepoint1
+
+                            if (JSON_HEDLEY_UNLIKELY(codepoint1 == -1))
+                            {
+                                error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                return token_type::parse_error;
+                            }
+
+                            // check if code point is a high surrogate
+                            if (0xD800 <= codepoint1 && codepoint1 <= 0xDBFF)
+                            {
+                                // expect next \uxxxx entry
+                                if (JSON_HEDLEY_LIKELY(get() == '\\' && get() == 'u'))
+                                {
+                                    const int codepoint2 = get_codepoint();
+
+                                    if (JSON_HEDLEY_UNLIKELY(codepoint2 == -1))
+                                    {
+                                        error_message = "invalid string: '\\u' must be followed by 4 hex digits";
+                                        return token_type::parse_error;
+                                    }
+
+                                    // check if codepoint2 is a low surrogate
+                                    if (JSON_HEDLEY_LIKELY(0xDC00 <= codepoint2 && codepoint2 <= 0xDFFF))
+                                    {
+                                        // overwrite codepoint
+                                        codepoint = static_cast<int>(
+                                                        // high surrogate occupies the most significant 22 bits
+                                                        (static_cast<unsigned int>(codepoint1) << 10u)
+                                                        // low surrogate occupies the least significant 15 bits
+                                                        + static_cast<unsigned int>(codepoint2)
+                                                        // there is still the 0xD800, 0xDC00 and 0x10000 noise
+                                                        // in the result so we have to subtract with:
+                                                        // (0xD800 << 10) + DC00 - 0x10000 = 0x35FDC00
+                                                        - 0x35FDC00u);
+                                    }
+                                    else
+                                    {
+                                        error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                        return token_type::parse_error;
+                                    }
+                                }
+                                else
+                                {
+                                    error_message = "invalid string: surrogate U+D800..U+DBFF must be followed by U+DC00..U+DFFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+                            else
+                            {
+                                if (JSON_HEDLEY_UNLIKELY(0xDC00 <= codepoint1 && codepoint1 <= 0xDFFF))
+                                {
+                                    error_message = "invalid string: surrogate U+DC00..U+DFFF must follow U+D800..U+DBFF";
+                                    return token_type::parse_error;
+                                }
+                            }
+
+                            // result of the above calculation yields a proper codepoint
+                            JSON_ASSERT(0x00 <= codepoint && codepoint <= 0x10FFFF);
+
+                            // translate codepoint into bytes
+                            if (codepoint < 0x80)
+                            {
+                                // 1-byte characters: 0xxxxxxx (ASCII)
+                                add(static_cast<char_int_type>(codepoint));
+                            }
+                            else if (codepoint <= 0x7FF)
+                            {
+                                // 2-byte characters: 110xxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xC0u | (static_cast<unsigned int>(codepoint) >> 6u)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else if (codepoint <= 0xFFFF)
+                            {
+                                // 3-byte characters: 1110xxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xE0u | (static_cast<unsigned int>(codepoint) >> 12u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+                            else
+                            {
+                                // 4-byte characters: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+                                add(static_cast<char_int_type>(0xF0u | (static_cast<unsigned int>(codepoint) >> 18u)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 12u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | ((static_cast<unsigned int>(codepoint) >> 6u) & 0x3Fu)));
+                                add(static_cast<char_int_type>(0x80u | (static_cast<unsigned int>(codepoint) & 0x3Fu)));
+                            }
+
+                            break;
+                        }
+
+                        // other characters after escape
+                        default:
+                            error_message = "invalid string: forbidden character after backslash";
+                            return token_type::parse_error;
+                    }
+
+                    break;
+                }
+
+                // invalid control characters
+                case 0x00:
+                {
+                    error_message = "invalid string: control character U+0000 (NUL) must be escaped to \\u0000";
+                    return token_type::parse_error;
+                }
+
+                case 0x01:
+                {
+                    error_message = "invalid string: control character U+0001 (SOH) must be escaped to \\u0001";
+                    return token_type::parse_error;
+                }
+
+                case 0x02:
+                {
+                    error_message = "invalid string: control character U+0002 (STX) must be escaped to \\u0002";
+                    return token_type::parse_error;
+                }
+
+                case 0x03:
+                {
+                    error_message = "invalid string: control character U+0003 (ETX) must be escaped to \\u0003";
+                    return token_type::parse_error;
+                }
+
+                case 0x04:
+                {
+                    error_message = "invalid string: control character U+0004 (EOT) must be escaped to \\u0004";
+                    return token_type::parse_error;
+                }
+
+                case 0x05:
+                {
+                    error_message = "invalid string: control character U+0005 (ENQ) must be escaped to \\u0005";
+                    return token_type::parse_error;
+                }
+
+                case 0x06:
+                {
+                    error_message = "invalid string: control character U+0006 (ACK) must be escaped to \\u0006";
+                    return token_type::parse_error;
+                }
+
+                case 0x07:
+                {
+                    error_message = "invalid string: control character U+0007 (BEL) must be escaped to \\u0007";
+                    return token_type::parse_error;
+                }
+
+                case 0x08:
+                {
+                    error_message = "invalid string: control character U+0008 (BS) must be escaped to \\u0008 or \\b";
+                    return token_type::parse_error;
+                }
+
+                case 0x09:
+                {
+                    error_message = "invalid string: control character U+0009 (HT) must be escaped to \\u0009 or \\t";
+                    return token_type::parse_error;
+                }
+
+                case 0x0A:
+                {
+                    error_message = "invalid string: control character U+000A (LF) must be escaped to \\u000A or \\n";
+                    return token_type::parse_error;
+                }
+
+                case 0x0B:
+                {
+                    error_message = "invalid string: control character U+000B (VT) must be escaped to \\u000B";
+                    return token_type::parse_error;
+                }
+
+                case 0x0C:
+                {
+                    error_message = "invalid string: control character U+000C (FF) must be escaped to \\u000C or \\f";
+                    return token_type::parse_error;
+                }
+
+                case 0x0D:
+                {
+                    error_message = "invalid string: control character U+000D (CR) must be escaped to \\u000D or \\r";
+                    return token_type::parse_error;
+                }
+
+                case 0x0E:
+                {
+                    error_message = "invalid string: control character U+000E (SO) must be escaped to \\u000E";
+                    return token_type::parse_error;
+                }
+
+                case 0x0F:
+                {
+                    error_message = "invalid string: control character U+000F (SI) must be escaped to \\u000F";
+                    return token_type::parse_error;
+                }
+
+                case 0x10:
+                {
+                    error_message = "invalid string: control character U+0010 (DLE) must be escaped to \\u0010";
+                    return token_type::parse_error;
+                }
+
+                case 0x11:
+                {
+                    error_message = "invalid string: control character U+0011 (DC1) must be escaped to \\u0011";
+                    return token_type::parse_error;
+                }
+
+                case 0x12:
+                {
+                    error_message = "invalid string: control character U+0012 (DC2) must be escaped to \\u0012";
+                    return token_type::parse_error;
+                }
+
+                case 0x13:
+                {
+                    error_message = "invalid string: control character U+0013 (DC3) must be escaped to \\u0013";
+                    return token_type::parse_error;
+                }
+
+                case 0x14:
+                {
+                    error_message = "invalid string: control character U+0014 (DC4) must be escaped to \\u0014";
+                    return token_type::parse_error;
+                }
+
+                case 0x15:
+                {
+                    error_message = "invalid string: control character U+0015 (NAK) must be escaped to \\u0015";
+                    return token_type::parse_error;
+                }
+
+                case 0x16:
+                {
+                    error_message = "invalid string: control character U+0016 (SYN) must be escaped to \\u0016";
+                    return token_type::parse_error;
+                }
+
+                case 0x17:
+                {
+                    error_message = "invalid string: control character U+0017 (ETB) must be escaped to \\u0017";
+                    return token_type::parse_error;
+                }
+
+                case 0x18:
+                {
+                    error_message = "invalid string: control character U+0018 (CAN) must be escaped to \\u0018";
+                    return token_type::parse_error;
+                }
+
+                case 0x19:
+                {
+                    error_message = "invalid string: control character U+0019 (EM) must be escaped to \\u0019";
+                    return token_type::parse_error;
+                }
+
+                case 0x1A:
+                {
+                    error_message = "invalid string: control character U+001A (SUB) must be escaped to \\u001A";
+                    return token_type::parse_error;
+                }
+
+                case 0x1B:
+                {
+                    error_message = "invalid string: control character U+001B (ESC) must be escaped to \\u001B";
+                    return token_type::parse_error;
+                }
+
+                case 0x1C:
+                {
+                    error_message = "invalid string: control character U+001C (FS) must be escaped to \\u001C";
+                    return token_type::parse_error;
+                }
+
+                case 0x1D:
+                {
+                    error_message = "invalid string: control character U+001D (GS) must be escaped to \\u001D";
+                    return token_type::parse_error;
+                }
+
+                case 0x1E:
+                {
+                    error_message = "invalid string: control character U+001E (RS) must be escaped to \\u001E";
+                    return token_type::parse_error;
+                }
+
+                case 0x1F:
+                {
+                    error_message = "invalid string: control character U+001F (US) must be escaped to \\u001F";
+                    return token_type::parse_error;
+                }
+
+                // U+0020..U+007F (except U+0022 (quote) and U+005C (backspace))
+                case 0x20:
+                case 0x21:
+                case 0x23:
+                case 0x24:
+                case 0x25:
+                case 0x26:
+                case 0x27:
+                case 0x28:
+                case 0x29:
+                case 0x2A:
+                case 0x2B:
+                case 0x2C:
+                case 0x2D:
+                case 0x2E:
+                case 0x2F:
+                case 0x30:
+                case 0x31:
+                case 0x32:
+                case 0x33:
+                case 0x34:
+                case 0x35:
+                case 0x36:
+                case 0x37:
+                case 0x38:
+                case 0x39:
+                case 0x3A:
+                case 0x3B:
+                case 0x3C:
+                case 0x3D:
+                case 0x3E:
+                case 0x3F:
+                case 0x40:
+                case 0x41:
+                case 0x42:
+                case 0x43:
+                case 0x44:
+                case 0x45:
+                case 0x46:
+                case 0x47:
+                case 0x48:
+                case 0x49:
+                case 0x4A:
+                case 0x4B:
+                case 0x4C:
+                case 0x4D:
+                case 0x4E:
+                case 0x4F:
+                case 0x50:
+                case 0x51:
+                case 0x52:
+                case 0x53:
+                case 0x54:
+                case 0x55:
+                case 0x56:
+                case 0x57:
+                case 0x58:
+                case 0x59:
+                case 0x5A:
+                case 0x5B:
+                case 0x5D:
+                case 0x5E:
+                case 0x5F:
+                case 0x60:
+                case 0x61:
+                case 0x62:
+                case 0x63:
+                case 0x64:
+                case 0x65:
+                case 0x66:
+                case 0x67:
+                case 0x68:
+                case 0x69:
+                case 0x6A:
+                case 0x6B:
+                case 0x6C:
+                case 0x6D:
+                case 0x6E:
+                case 0x6F:
+                case 0x70:
+                case 0x71:
+                case 0x72:
+                case 0x73:
+                case 0x74:
+                case 0x75:
+                case 0x76:
+                case 0x77:
+                case 0x78:
+                case 0x79:
+                case 0x7A:
+                case 0x7B:
+                case 0x7C:
+                case 0x7D:
+                case 0x7E:
+                case 0x7F:
+                {
+                    add(current);
+                    break;
+                }
+
+                // U+0080..U+07FF: bytes C2..DF 80..BF
+                case 0xC2:
+                case 0xC3:
+                case 0xC4:
+                case 0xC5:
+                case 0xC6:
+                case 0xC7:
+                case 0xC8:
+                case 0xC9:
+                case 0xCA:
+                case 0xCB:
+                case 0xCC:
+                case 0xCD:
+                case 0xCE:
+                case 0xCF:
+                case 0xD0:
+                case 0xD1:
+                case 0xD2:
+                case 0xD3:
+                case 0xD4:
+                case 0xD5:
+                case 0xD6:
+                case 0xD7:
+                case 0xD8:
+                case 0xD9:
+                case 0xDA:
+                case 0xDB:
+                case 0xDC:
+                case 0xDD:
+                case 0xDE:
+                case 0xDF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!next_byte_in_range({0x80, 0xBF})))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+0800..U+0FFF: bytes E0 A0..BF 80..BF
+                case 0xE0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0xA0, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+1000..U+CFFF: bytes E1..EC 80..BF 80..BF
+                // U+E000..U+FFFF: bytes EE..EF 80..BF 80..BF
+                case 0xE1:
+                case 0xE2:
+                case 0xE3:
+                case 0xE4:
+                case 0xE5:
+                case 0xE6:
+                case 0xE7:
+                case 0xE8:
+                case 0xE9:
+                case 0xEA:
+                case 0xEB:
+                case 0xEC:
+                case 0xEE:
+                case 0xEF:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+D000..U+D7FF: bytes ED 80..9F 80..BF
+                case 0xED:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x9F, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+10000..U+3FFFF F0 90..BF 80..BF 80..BF
+                case 0xF0:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x90, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+40000..U+FFFFF F1..F3 80..BF 80..BF 80..BF
+                case 0xF1:
+                case 0xF2:
+                case 0xF3:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0xBF, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // U+100000..U+10FFFF F4 80..8F 80..BF 80..BF
+                case 0xF4:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!(next_byte_in_range({0x80, 0x8F, 0x80, 0xBF, 0x80, 0xBF}))))
+                    {
+                        return token_type::parse_error;
+                    }
+                    break;
+                }
+
+                // remaining bytes (80..C1 and F5..FF) are ill-formed
+                default:
+                {
+                    error_message = "invalid string: ill-formed UTF-8 byte";
+                    return token_type::parse_error;
+                }
+            }
+        }
+    }
+
+    /*!
+     * @brief scan a comment
+     * @return whether comment could be scanned successfully
+     */
+    bool scan_comment()
+    {
+        switch (get())
+        {
+            // single-line comments skip input until a newline or EOF is read
+            case '/':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case '\n':
+                        case '\r':
+                        case std::char_traits<char_type>::eof():
+                        case '\0':
+                            return true;
+
+                        default:
+                            break;
+                    }
+                }
+            }
+
+            // multi-line comments skip input until */ is read
+            case '*':
+            {
+                while (true)
+                {
+                    switch (get())
+                    {
+                        case std::char_traits<char_type>::eof():
+                        case '\0':
+                        {
+                            error_message = "invalid comment; missing closing '*/'";
+                            return false;
+                        }
+
+                        case '*':
+                        {
+                            switch (get())
+                            {
+                                case '/':
+                                    return true;
+
+                                default:
+                                {
+                                    unget();
+                                    continue;
+                                }
+                            }
+                        }
+
+                        default:
+                            continue;
+                    }
+                }
+            }
+
+            // unexpected character after reading '/'
+            default:
+            {
+                error_message = "invalid comment; expecting '/' or '*' after '/'";
+                return false;
+            }
+        }
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(float& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtof(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtod(str, endptr);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    static void strtof(long double& f, const char* str, char** endptr) noexcept
+    {
+        f = std::strtold(str, endptr);
+    }
+
+    /*!
+    @brief scan a number literal
+
+    This function scans a string according to Sect. 6 of RFC 7159.
+
+    The function is realized with a deterministic finite state machine derived
+    from the grammar described in RFC 7159. Starting in state "init", the
+    input is read and used to determined the next state. Only state "done"
+    accepts the number. State "error" is a trap state to model errors. In the
+    table below, "anything" means any character but the ones listed before.
+
+    state    | 0        | 1-9      | e E      | +       | -       | .        | anything
+    ---------|----------|----------|----------|---------|---------|----------|-----------
+    init     | zero     | any1     | [error]  | [error] | minus   | [error]  | [error]
+    minus    | zero     | any1     | [error]  | [error] | [error] | [error]  | [error]
+    zero     | done     | done     | exponent | done    | done    | decimal1 | done
+    any1     | any1     | any1     | exponent | done    | done    | decimal1 | done
+    decimal1 | decimal2 | decimal2 | [error]  | [error] | [error] | [error]  | [error]
+    decimal2 | decimal2 | decimal2 | exponent | done    | done    | done     | done
+    exponent | any2     | any2     | [error]  | sign    | sign    | [error]  | [error]
+    sign     | any2     | any2     | [error]  | [error] | [error] | [error]  | [error]
+    any2     | any2     | any2     | done     | done    | done    | done     | done
+
+    The state machine is realized with one label per state (prefixed with
+    "scan_number_") and `goto` statements between them. The state machine
+    contains cycles, but any cycle can be left when EOF is read. Therefore,
+    the function is guaranteed to terminate.
+
+    During scanning, the read bytes are stored in token_buffer. This string is
+    then converted to a signed integer, an unsigned integer, or a
+    floating-point number.
+
+    @return token_type::value_unsigned, token_type::value_integer, or
+            token_type::value_float if number could be successfully scanned,
+            token_type::parse_error otherwise
+
+    @note The scanner is independent of the current locale. Internally, the
+          locale's decimal point is used instead of `.` to work with the
+          locale-dependent converters.
+    */
+    token_type scan_number()  // lgtm [cpp/use-of-goto]
+    {
+        // reset token_buffer to store the number's bytes
+        reset();
+
+        // the type of the parsed number; initially set to unsigned; will be
+        // changed if minus sign, decimal point or exponent is read
+        token_type number_type = token_type::value_unsigned;
+
+        // state (init): we just found out we need to scan a number
+        switch (current)
+        {
+            case '-':
+            {
+                add(current);
+                goto scan_number_minus;
+            }
+
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            // all other characters are rejected outside scan_number()
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+        }
+
+scan_number_minus:
+        // state: we just parsed a leading minus sign
+        number_type = token_type::value_integer;
+        switch (get())
+        {
+            case '0':
+            {
+                add(current);
+                goto scan_number_zero;
+            }
+
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '-'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_zero:
+        // state: we just parse a zero (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_any1:
+        // state: we just parsed a number 0-9 (maybe with a leading minus sign)
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any1;
+            }
+
+            case '.':
+            {
+                add(decimal_point_char);
+                goto scan_number_decimal1;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_decimal1:
+        // state: we just parsed a decimal point
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after '.'";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_decimal2:
+        // we just parsed at least one number after a decimal point
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_decimal2;
+            }
+
+            case 'e':
+            case 'E':
+            {
+                add(current);
+                goto scan_number_exponent;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_exponent:
+        // we just parsed an exponent
+        number_type = token_type::value_float;
+        switch (get())
+        {
+            case '+':
+            case '-':
+            {
+                add(current);
+                goto scan_number_sign;
+            }
+
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message =
+                    "invalid number; expected '+', '-', or digit after exponent";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_sign:
+        // we just parsed an exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+            {
+                error_message = "invalid number; expected digit after exponent sign";
+                return token_type::parse_error;
+            }
+        }
+
+scan_number_any2:
+        // we just parsed a number after the exponent or exponent sign
+        switch (get())
+        {
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+            {
+                add(current);
+                goto scan_number_any2;
+            }
+
+            default:
+                goto scan_number_done;
+        }
+
+scan_number_done:
+        // unget the character after the number (we only read it to know that
+        // we are done scanning a number)
+        unget();
+
+        char* endptr = nullptr;
+        errno = 0;
+
+        // try to parse integers first and fall back to floats
+        if (number_type == token_type::value_unsigned)
+        {
+            const auto x = std::strtoull(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_unsigned = static_cast<number_unsigned_t>(x);
+                if (value_unsigned == x)
+                {
+                    return token_type::value_unsigned;
+                }
+            }
+        }
+        else if (number_type == token_type::value_integer)
+        {
+            const auto x = std::strtoll(token_buffer.data(), &endptr, 10);
+
+            // we checked the number format before
+            JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+            if (errno == 0)
+            {
+                value_integer = static_cast<number_integer_t>(x);
+                if (value_integer == x)
+                {
+                    return token_type::value_integer;
+                }
+            }
+        }
+
+        // this code is reached if we parse a floating-point number or if an
+        // integer conversion above failed
+        strtof(value_float, token_buffer.data(), &endptr);
+
+        // we checked the number format before
+        JSON_ASSERT(endptr == token_buffer.data() + token_buffer.size());
+
+        return token_type::value_float;
+    }
+
+    /*!
+    @param[in] literal_text  the literal text to expect
+    @param[in] length        the length of the passed literal text
+    @param[in] return_type   the token type to return on success
+    */
+    JSON_HEDLEY_NON_NULL(2)
+    token_type scan_literal(const char_type* literal_text, const std::size_t length,
+                            token_type return_type)
+    {
+        JSON_ASSERT(std::char_traits<char_type>::to_char_type(current) == literal_text[0]);
+        for (std::size_t i = 1; i < length; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(std::char_traits<char_type>::to_char_type(get()) != literal_text[i]))
+            {
+                error_message = "invalid literal";
+                return token_type::parse_error;
+            }
+        }
+        return return_type;
+    }
+
+    /////////////////////
+    // input management
+    /////////////////////
+
+    /// reset token_buffer; current character is beginning of token
+    void reset() noexcept
+    {
+        token_buffer.clear();
+        token_string.clear();
+        token_string.push_back(std::char_traits<char_type>::to_char_type(current));
+    }
+
+    /*
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a
+    `std::char_traits<char>::eof()` in that case.  Stores the scanned characters
+    for use in error messages.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++position.chars_read_total;
+        ++position.chars_read_current_line;
+
+        if (next_unget)
+        {
+            // just reset the next_unget variable and work with current
+            next_unget = false;
+        }
+        else
+        {
+            current = ia.get_character();
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
+        {
+            token_string.push_back(std::char_traits<char_type>::to_char_type(current));
+        }
+
+        if (current == '\n')
+        {
+            ++position.lines_read;
+            position.chars_read_current_line = 0;
+        }
+
+        return current;
+    }
+
+    /*!
+    @brief unget current character (read it again on next get)
+
+    We implement unget by setting variable next_unget to true. The input is not
+    changed - we just simulate ungetting by modifying chars_read_total,
+    chars_read_current_line, and token_string. The next call to get() will
+    behave as if the unget character is read again.
+    */
+    void unget()
+    {
+        next_unget = true;
+
+        --position.chars_read_total;
+
+        // in case we "unget" a newline, we have to also decrement the lines_read
+        if (position.chars_read_current_line == 0)
+        {
+            if (position.lines_read > 0)
+            {
+                --position.lines_read;
+            }
+        }
+        else
+        {
+            --position.chars_read_current_line;
+        }
+
+        if (JSON_HEDLEY_LIKELY(current != std::char_traits<char_type>::eof()))
+        {
+            JSON_ASSERT(!token_string.empty());
+            token_string.pop_back();
+        }
+    }
+
+    /// add a character to token_buffer
+    void add(char_int_type c)
+    {
+        token_buffer.push_back(static_cast<typename string_t::value_type>(c));
+    }
+
+  public:
+    /////////////////////
+    // value getters
+    /////////////////////
+
+    /// return integer value
+    constexpr number_integer_t get_number_integer() const noexcept
+    {
+        return value_integer;
+    }
+
+    /// return unsigned integer value
+    constexpr number_unsigned_t get_number_unsigned() const noexcept
+    {
+        return value_unsigned;
+    }
+
+    /// return floating-point value
+    constexpr number_float_t get_number_float() const noexcept
+    {
+        return value_float;
+    }
+
+    /// return current string value (implicitly resets the token; useful only once)
+    string_t& get_string()
+    {
+        return token_buffer;
+    }
+
+    /////////////////////
+    // diagnostics
+    /////////////////////
+
+    /// return position of last read token
+    constexpr position_t get_position() const noexcept
+    {
+        return position;
+    }
+
+    /// return the last read token (for errors only).  Will never contain EOF
+    /// (an arbitrary value that is not a valid char value, often -1), because
+    /// 255 may legitimately occur.  May contain NUL, which should be escaped.
+    std::string get_token_string() const
+    {
+        // escape control characters
+        std::string result;
+        for (const auto c : token_string)
+        {
+            if (static_cast<unsigned char>(c) <= '\x1F')
+            {
+                // escape control characters
+                std::array<char, 9> cs{{}};
+                (std::snprintf)(cs.data(), cs.size(), "<U+%.4X>", static_cast<unsigned char>(c));
+                result += cs.data();
+            }
+            else
+            {
+                // add character as is
+                result.push_back(static_cast<std::string::value_type>(c));
+            }
+        }
+
+        return result;
+    }
+
+    /// return syntax error message
+    JSON_HEDLEY_RETURNS_NON_NULL
+    constexpr const char* get_error_message() const noexcept
+    {
+        return error_message;
+    }
+
+    /////////////////////
+    // actual scanner
+    /////////////////////
+
+    /*!
+    @brief skip the UTF-8 byte order mark
+    @return true iff there is no BOM or the correct BOM has been skipped
+    */
+    bool skip_bom()
+    {
+        if (get() == 0xEF)
+        {
+            // check if we completely parse the BOM
+            return get() == 0xBB && get() == 0xBF;
+        }
+
+        // the first character is not the beginning of the BOM; unget it to
+        // process is later
+        unget();
+        return true;
+    }
+
+    void skip_whitespace()
+    {
+        do
+        {
+            get();
+        }
+        while (current == ' ' || current == '\t' || current == '\n' || current == '\r');
+    }
+
+    token_type scan()
+    {
+        // initially, skip the BOM
+        if (position.chars_read_total == 0 && !skip_bom())
+        {
+            error_message = "invalid BOM; must be 0xEF 0xBB 0xBF if given";
+            return token_type::parse_error;
+        }
+
+        // read next character and ignore whitespace
+        skip_whitespace();
+
+        // ignore comments
+        while (ignore_comments && current == '/')
+        {
+            if (!scan_comment())
+            {
+                return token_type::parse_error;
+            }
+
+            // skip following whitespace
+            skip_whitespace();
+        }
+
+        switch (current)
+        {
+            // structural characters
+            case '[':
+                return token_type::begin_array;
+            case ']':
+                return token_type::end_array;
+            case '{':
+                return token_type::begin_object;
+            case '}':
+                return token_type::end_object;
+            case ':':
+                return token_type::name_separator;
+            case ',':
+                return token_type::value_separator;
+
+            // literals
+            case 't':
+            {
+                std::array<char_type, 4> true_literal = {{'t', 'r', 'u', 'e'}};
+                return scan_literal(true_literal.data(), true_literal.size(), token_type::literal_true);
+            }
+            case 'f':
+            {
+                std::array<char_type, 5> false_literal = {{'f', 'a', 'l', 's', 'e'}};
+                return scan_literal(false_literal.data(), false_literal.size(), token_type::literal_false);
+            }
+            case 'n':
+            {
+                std::array<char_type, 4> null_literal = {{'n', 'u', 'l', 'l'}};
+                return scan_literal(null_literal.data(), null_literal.size(), token_type::literal_null);
+            }
+
+            // string
+            case '\"':
+                return scan_string();
+
+            // number
+            case '-':
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                return scan_number();
+
+            // end of input (the null byte is needed when parsing from
+            // string literals)
+            case '\0':
+            case std::char_traits<char_type>::eof():
+                return token_type::end_of_input;
+
+            // error
+            default:
+                error_message = "invalid literal";
+                return token_type::parse_error;
+        }
+    }
+
+  private:
+    /// input adapter
+    InputAdapterType ia;
+
+    /// whether comments should be ignored (true) or signaled as errors (false)
+    const bool ignore_comments = false;
+
+    /// the current character
+    char_int_type current = std::char_traits<char_type>::eof();
+
+    /// whether the next get() call should just return current
+    bool next_unget = false;
+
+    /// the start position of the current token
+    position_t position {};
+
+    /// raw input token string (for error messages)
+    std::vector<char_type> token_string {};
+
+    /// buffer for variable-length tokens (numbers, strings)
+    string_t token_buffer {};
+
+    /// a description of occurred lexer errors
+    const char* error_message = "";
+
+    // number values
+    number_integer_t value_integer = 0;
+    number_unsigned_t value_unsigned = 0;
+    number_float_t value_float = 0;
+
+    /// the decimal point
+    const char_int_type decimal_point_char = '.';
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+
+#include <cstdint> // size_t
+#include <utility> // declval
+#include <string> // string
+
+// #include <nlohmann/detail/meta/detected.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename T>
+using null_function_t = decltype(std::declval<T&>().null());
+
+template<typename T>
+using boolean_function_t =
+    decltype(std::declval<T&>().boolean(std::declval<bool>()));
+
+template<typename T, typename Integer>
+using number_integer_function_t =
+    decltype(std::declval<T&>().number_integer(std::declval<Integer>()));
+
+template<typename T, typename Unsigned>
+using number_unsigned_function_t =
+    decltype(std::declval<T&>().number_unsigned(std::declval<Unsigned>()));
+
+template<typename T, typename Float, typename String>
+using number_float_function_t = decltype(std::declval<T&>().number_float(
+                                    std::declval<Float>(), std::declval<const String&>()));
+
+template<typename T, typename String>
+using string_function_t =
+    decltype(std::declval<T&>().string(std::declval<String&>()));
+
+template<typename T, typename Binary>
+using binary_function_t =
+    decltype(std::declval<T&>().binary(std::declval<Binary&>()));
+
+template<typename T>
+using start_object_function_t =
+    decltype(std::declval<T&>().start_object(std::declval<std::size_t>()));
+
+template<typename T, typename String>
+using key_function_t =
+    decltype(std::declval<T&>().key(std::declval<String&>()));
+
+template<typename T>
+using end_object_function_t = decltype(std::declval<T&>().end_object());
+
+template<typename T>
+using start_array_function_t =
+    decltype(std::declval<T&>().start_array(std::declval<std::size_t>()));
+
+template<typename T>
+using end_array_function_t = decltype(std::declval<T&>().end_array());
+
+template<typename T, typename Exception>
+using parse_error_function_t = decltype(std::declval<T&>().parse_error(
+        std::declval<std::size_t>(), std::declval<const std::string&>(),
+        std::declval<const Exception&>()));
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static constexpr bool value =
+        is_detected_exact<bool, null_function_t, SAX>::value &&
+        is_detected_exact<bool, boolean_function_t, SAX>::value &&
+        is_detected_exact<bool, number_integer_function_t, SAX, number_integer_t>::value &&
+        is_detected_exact<bool, number_unsigned_function_t, SAX, number_unsigned_t>::value &&
+        is_detected_exact<bool, number_float_function_t, SAX, number_float_t, string_t>::value &&
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value &&
+        is_detected_exact<bool, start_object_function_t, SAX>::value &&
+        is_detected_exact<bool, key_function_t, SAX, string_t>::value &&
+        is_detected_exact<bool, end_object_function_t, SAX>::value &&
+        is_detected_exact<bool, start_array_function_t, SAX>::value &&
+        is_detected_exact<bool, end_array_function_t, SAX>::value &&
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value;
+};
+
+template<typename SAX, typename BasicJsonType>
+struct is_sax_static_asserts
+{
+  private:
+    static_assert(is_basic_json<BasicJsonType>::value,
+                  "BasicJsonType must be of type basic_json<...>");
+
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using exception_t = typename BasicJsonType::exception;
+
+  public:
+    static_assert(is_detected_exact<bool, null_function_t, SAX>::value,
+                  "Missing/invalid function: bool null()");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(is_detected_exact<bool, boolean_function_t, SAX>::value,
+                  "Missing/invalid function: bool boolean(bool)");
+    static_assert(
+        is_detected_exact<bool, number_integer_function_t, SAX,
+        number_integer_t>::value,
+        "Missing/invalid function: bool number_integer(number_integer_t)");
+    static_assert(
+        is_detected_exact<bool, number_unsigned_function_t, SAX,
+        number_unsigned_t>::value,
+        "Missing/invalid function: bool number_unsigned(number_unsigned_t)");
+    static_assert(is_detected_exact<bool, number_float_function_t, SAX,
+                  number_float_t, string_t>::value,
+                  "Missing/invalid function: bool number_float(number_float_t, const string_t&)");
+    static_assert(
+        is_detected_exact<bool, string_function_t, SAX, string_t>::value,
+        "Missing/invalid function: bool string(string_t&)");
+    static_assert(
+        is_detected_exact<bool, binary_function_t, SAX, binary_t>::value,
+        "Missing/invalid function: bool binary(binary_t&)");
+    static_assert(is_detected_exact<bool, start_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_object(std::size_t)");
+    static_assert(is_detected_exact<bool, key_function_t, SAX, string_t>::value,
+                  "Missing/invalid function: bool key(string_t&)");
+    static_assert(is_detected_exact<bool, end_object_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_object()");
+    static_assert(is_detected_exact<bool, start_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool start_array(std::size_t)");
+    static_assert(is_detected_exact<bool, end_array_function_t, SAX>::value,
+                  "Missing/invalid function: bool end_array()");
+    static_assert(
+        is_detected_exact<bool, parse_error_function_t, SAX, exception_t>::value,
+        "Missing/invalid function: bool parse_error(std::size_t, const "
+        "std::string&, const exception&)");
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+
+/// how to treat CBOR tags
+enum class cbor_tag_handler_t
+{
+    error,  ///< throw a parse_error exception in case of a tag
+    ignore   ///< ignore tags
+};
+
+/*!
+@brief determine system byte order
+
+@return true if and only if system's byte order is little endian
+
+@note from https://stackoverflow.com/a/1001328/266378
+*/
+static inline bool little_endianess(int num = 1) noexcept
+{
+    return *reinterpret_cast<char*>(&num) == 1;
+}
+
+
+///////////////////
+// binary reader //
+///////////////////
+
+/*!
+@brief deserialization of CBOR, MessagePack, and UBJSON values
+*/
+template<typename BasicJsonType, typename InputAdapterType, typename SAX = json_sax_dom_parser<BasicJsonType>>
+class binary_reader
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using json_sax_t = SAX;
+    using char_type = typename InputAdapterType::char_type;
+    using char_int_type = typename std::char_traits<char_type>::int_type;
+
+  public:
+    /*!
+    @brief create a binary reader
+
+    @param[in] adapter  input adapter to read from
+    */
+    explicit binary_reader(InputAdapterType&& adapter) : ia(std::move(adapter))
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+    }
+
+    // make class move-only
+    binary_reader(const binary_reader&) = delete;
+    binary_reader(binary_reader&&) = default;
+    binary_reader& operator=(const binary_reader&) = delete;
+    binary_reader& operator=(binary_reader&&) = default;
+    ~binary_reader() = default;
+
+    /*!
+    @param[in] format  the binary format to parse
+    @param[in] sax_    a SAX event processor
+    @param[in] strict  whether to expect the input to be consumed completed
+    @param[in] tag_handler  how to treat CBOR tags
+
+    @return
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool sax_parse(const input_format_t format,
+                   json_sax_t* sax_,
+                   const bool strict = true,
+                   const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        sax = sax_;
+        bool result = false;
+
+        switch (format)
+        {
+            case input_format_t::bson:
+                result = parse_bson_internal();
+                break;
+
+            case input_format_t::cbor:
+                result = parse_cbor_internal(true, tag_handler);
+                break;
+
+            case input_format_t::msgpack:
+                result = parse_msgpack_internal();
+                break;
+
+            case input_format_t::ubjson:
+                result = parse_ubjson_internal();
+                break;
+
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+        }
+
+        // strict mode: next byte must be EOF
+        if (result && strict)
+        {
+            if (format == input_format_t::ubjson)
+            {
+                get_ignore_noop();
+            }
+            else
+            {
+                get();
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(current != std::char_traits<char_type>::eof()))
+            {
+                return sax->parse_error(chars_read, get_token_string(),
+                                        parse_error::create(110, chars_read, exception_message(format, "expected end of input; last byte: 0x" + get_token_string(), "value")));
+            }
+        }
+
+        return result;
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @brief Reads in a BSON-object and passes it to the SAX-parser.
+    @return whether a valid BSON-value was passed to the SAX parser
+    */
+    bool parse_bson_internal()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/false)))
+        {
+            return false;
+        }
+
+        return sax->end_object();
+    }
+
+    /*!
+    @brief Parses a C-style string from the BSON input.
+    @param[in, out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @return `true` if the \x00-byte indicating the end of the string was
+             encountered before the EOF; false` indicates an unexpected EOF.
+    */
+    bool get_bson_cstr(string_t& result)
+    {
+        auto out = std::back_inserter(result);
+        while (true)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "cstring")))
+            {
+                return false;
+            }
+            if (current == 0x00)
+            {
+                return true;
+            }
+            *out++ = static_cast<typename string_t::value_type>(current);
+        }
+    }
+
+    /*!
+    @brief Parses a zero-terminated string of length @a len from the BSON
+           input.
+    @param[in] len  The length (including the zero-byte at the end) of the
+                    string to be read.
+    @param[in, out] result  A reference to the string variable where the read
+                            string is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 1
+    @return `true` if the string was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_string(const NumberType len, string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 1))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "string length must be at least 1, is " + std::to_string(len), "string")));
+        }
+
+        return get_string(input_format_t::bson, len - static_cast<NumberType>(1), result) && get() != std::char_traits<char_type>::eof();
+    }
+
+    /*!
+    @brief Parses a byte array input of length @a len from the BSON input.
+    @param[in] len  The length of the byte array to be read.
+    @param[in, out] result  A reference to the binary variable where the read
+                            array is to be stored.
+    @tparam NumberType The type of the length @a len
+    @pre len >= 0
+    @return `true` if the byte array was successfully parsed
+    */
+    template<typename NumberType>
+    bool get_bson_binary(const NumberType len, binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(len < 0))
+        {
+            auto last_token = get_token_string();
+            return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::bson, "byte array length cannot be negative, is " + std::to_string(len), "binary")));
+        }
+
+        // All BSON binary values have a subtype
+        std::uint8_t subtype{};
+        get_number<std::uint8_t>(input_format_t::bson, subtype);
+        result.set_subtype(subtype);
+
+        return get_binary(input_format_t::bson, len, result);
+    }
+
+    /*!
+    @brief Read a BSON document element of the given @a element_type.
+    @param[in] element_type The BSON element type, c.f. http://bsonspec.org/spec.html
+    @param[in] element_type_parse_position The position in the input stream,
+               where the `element_type` was read.
+    @warning Not all BSON element types are supported yet. An unsupported
+             @a element_type will give rise to a parse_error.114:
+             Unsupported BSON record type 0x...
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_internal(const char_int_type element_type,
+                                     const std::size_t element_type_parse_position)
+    {
+        switch (element_type)
+        {
+            case 0x01: // double
+            {
+                double number{};
+                return get_number<double, true>(input_format_t::bson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0x02: // string
+            {
+                std::int32_t len{};
+                string_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_string(len, value) && sax->string(value);
+            }
+
+            case 0x03: // object
+            {
+                return parse_bson_internal();
+            }
+
+            case 0x04: // array
+            {
+                return parse_bson_array();
+            }
+
+            case 0x05: // binary
+            {
+                std::int32_t len{};
+                binary_t value;
+                return get_number<std::int32_t, true>(input_format_t::bson, len) && get_bson_binary(len, value) && sax->binary(value);
+            }
+
+            case 0x08: // boolean
+            {
+                return sax->boolean(get() != 0);
+            }
+
+            case 0x0A: // null
+            {
+                return sax->null();
+            }
+
+            case 0x10: // int32
+            {
+                std::int32_t value{};
+                return get_number<std::int32_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            case 0x12: // int64
+            {
+                std::int64_t value{};
+                return get_number<std::int64_t, true>(input_format_t::bson, value) && sax->number_integer(value);
+            }
+
+            default: // anything else not supported (yet)
+            {
+                std::array<char, 3> cr{{}};
+                (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(element_type));
+                return sax->parse_error(element_type_parse_position, std::string(cr.data()), parse_error::create(114, element_type_parse_position, "Unsupported BSON record type 0x" + std::string(cr.data())));
+            }
+        }
+    }
+
+    /*!
+    @brief Read a BSON element list (as specified in the BSON-spec)
+
+    The same binary layout is used for objects and arrays, hence it must be
+    indicated with the argument @a is_array which one is expected
+    (true --> array, false --> object).
+
+    @param[in] is_array Determines if the element list being read is to be
+                        treated as an object (@a is_array == false), or as an
+                        array (@a is_array == true).
+    @return whether a valid BSON-object/array was passed to the SAX parser
+    */
+    bool parse_bson_element_list(const bool is_array)
+    {
+        string_t key;
+
+        while (auto element_type = get())
+        {
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::bson, "element list")))
+            {
+                return false;
+            }
+
+            const std::size_t element_type_parse_position = chars_read;
+            if (JSON_HEDLEY_UNLIKELY(!get_bson_cstr(key)))
+            {
+                return false;
+            }
+
+            if (!is_array && !sax->key(key))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_internal(element_type, element_type_parse_position)))
+            {
+                return false;
+            }
+
+            // get_bson_cstr only appends
+            key.clear();
+        }
+
+        return true;
+    }
+
+    /*!
+    @brief Reads an array from the BSON input and passes it to the SAX-parser.
+    @return whether a valid BSON-array was passed to the SAX parser
+    */
+    bool parse_bson_array()
+    {
+        std::int32_t document_size{};
+        get_number<std::int32_t, true>(input_format_t::bson, document_size);
+
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+        {
+            return false;
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!parse_bson_element_list(/*is_array*/true)))
+        {
+            return false;
+        }
+
+        return sax->end_array();
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true) or whether the last read character should
+                         be considered instead (false)
+    @param[in] tag_handler how CBOR tags should be treated
+
+    @return whether a valid CBOR value was passed to the SAX parser
+    */
+    bool parse_cbor_internal(const bool get_char,
+                             const cbor_tag_handler_t tag_handler)
+    {
+        switch (get_char ? get() : current)
+        {
+            // EOF
+            case std::char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::cbor, "value");
+
+            // Integer 0x00..0x17 (0..23)
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            case 0x18: // Unsigned integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x19: // Unsigned integer (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1A: // Unsigned integer (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            case 0x1B: // Unsigned integer (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_unsigned(number);
+            }
+
+            // Negative integer -1-0x00..-1-0x17 (-1..-24)
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+                return sax->number_integer(static_cast<std::int8_t>(0x20 - 1 - current));
+
+            case 0x38: // Negative integer (one-byte uint8_t follows)
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x39: // Negative integer -1-n (two-byte uint16_t follows)
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3A: // Negative integer -1-n (four-byte uint32_t follows)
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1) - number);
+            }
+
+            case 0x3B: // Negative integer -1-n (eight-byte uint64_t follows)
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::cbor, number) && sax->number_integer(static_cast<number_integer_t>(-1)
+                        - static_cast<number_integer_t>(number));
+            }
+
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            case 0x5F: // Binary data (indefinite length)
+            {
+                binary_t b;
+                return get_cbor_binary(b) && sax->binary(b);
+            }
+
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                string_t s;
+                return get_cbor_string(s) && sax->string(s);
+            }
+
+            // array (0x00..0x17 data items follow)
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+                return get_cbor_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0x98: // array (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x99: // array (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9A: // array (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9B: // array (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_array(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0x9F: // array (indefinite length)
+                return get_cbor_array(std::size_t(-1), tag_handler);
+
+            // map (0x00..0x17 pairs of data items follow)
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+                return get_cbor_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x1Fu), tag_handler);
+
+            case 0xB8: // map (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xB9: // map (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBA: // map (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBB: // map (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_cbor_object(static_cast<std::size_t>(len), tag_handler);
+            }
+
+            case 0xBF: // map (indefinite length)
+                return get_cbor_object(std::size_t(-1), tag_handler);
+
+            case 0xC6: // tagged item
+            case 0xC7:
+            case 0xC8:
+            case 0xC9:
+            case 0xCA:
+            case 0xCB:
+            case 0xCC:
+            case 0xCD:
+            case 0xCE:
+            case 0xCF:
+            case 0xD0:
+            case 0xD1:
+            case 0xD2:
+            case 0xD3:
+            case 0xD4:
+            case 0xD8: // tagged item (1 bytes follow)
+            case 0xD9: // tagged item (2 bytes follow)
+            case 0xDA: // tagged item (4 bytes follow)
+            case 0xDB: // tagged item (8 bytes follow)
+            {
+                switch (tag_handler)
+                {
+                    case cbor_tag_handler_t::error:
+                    {
+                        auto last_token = get_token_string();
+                        return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value")));
+                    }
+
+                    case cbor_tag_handler_t::ignore:
+                    {
+                        switch (current)
+                        {
+                            case 0xD8:
+                            {
+                                std::uint8_t len{};
+                                get_number(input_format_t::cbor, len);
+                                break;
+                            }
+                            case 0xD9:
+                            {
+                                std::uint16_t len{};
+                                get_number(input_format_t::cbor, len);
+                                break;
+                            }
+                            case 0xDA:
+                            {
+                                std::uint32_t len{};
+                                get_number(input_format_t::cbor, len);
+                                break;
+                            }
+                            case 0xDB:
+                            {
+                                std::uint64_t len{};
+                                get_number(input_format_t::cbor, len);
+                                break;
+                            }
+                            default:
+                                break;
+                        }
+                        return parse_cbor_internal(true, tag_handler);
+                    }
+
+                    default:            // LCOV_EXCL_LINE
+                        JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                }
+            }
+
+            case 0xF4: // false
+                return sax->boolean(false);
+
+            case 0xF5: // true
+                return sax->boolean(true);
+
+            case 0xF6: // null
+                return sax->null();
+
+            case 0xF9: // Half-Precision Float (two-byte IEEE 754)
+            {
+                const auto byte1_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+                const auto byte2_raw = get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "number")))
+                {
+                    return false;
+                }
+
+                const auto byte1 = static_cast<unsigned char>(byte1_raw);
+                const auto byte2 = static_cast<unsigned char>(byte2_raw);
+
+                // code from RFC 7049, Appendix D, Figure 3:
+                // As half-precision floating-point numbers were only added
+                // to IEEE 754 in 2008, today's programming platforms often
+                // still only have limited support for them. It is very
+                // easy to include at least decoding support for them even
+                // without such support. An example of a small decoder for
+                // half-precision floating-point numbers in the C language
+                // is shown in Fig. 3.
+                const auto half = static_cast<unsigned int>((byte1 << 8u) + byte2);
+                const double val = [&half]
+                {
+                    const int exp = (half >> 10u) & 0x1Fu;
+                    const unsigned int mant = half & 0x3FFu;
+                    JSON_ASSERT(0 <= exp&& exp <= 32);
+                    JSON_ASSERT(mant <= 1024);
+                    switch (exp)
+                    {
+                        case 0:
+                            return std::ldexp(mant, -24);
+                        case 31:
+                            return (mant == 0)
+                            ? std::numeric_limits<double>::infinity()
+                            : std::numeric_limits<double>::quiet_NaN();
+                        default:
+                            return std::ldexp(mant + 1024, exp - 25);
+                    }
+                }();
+                return sax->number_float((half & 0x8000u) != 0
+                                         ? static_cast<number_float_t>(-val)
+                                         : static_cast<number_float_t>(val), "");
+            }
+
+            case 0xFA: // Single-Precision Float (four-byte IEEE 754)
+            {
+                float number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xFB: // Double-Precision Float (eight-byte IEEE 754)
+            {
+                double number{};
+                return get_number(input_format_t::cbor, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            default: // anything else (0xFF is handled inside the other types)
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::cbor, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+    Additionally, CBOR's strings with indefinite lengths are supported.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_cbor_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // UTF-8 string (0x00..0x17 bytes follow)
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            {
+                return get_string(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x78: // UTF-8 string (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x79: // UTF-8 string (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7A: // UTF-8 string (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7B: // UTF-8 string (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) && get_string(input_format_t::cbor, len, result);
+            }
+
+            case 0x7F: // UTF-8 string (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    string_t chunk;
+                    if (!get_cbor_string(chunk))
+                    {
+                        return false;
+                    }
+                    result.append(chunk);
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x60-0x7B) or indefinite string type (0x7F); last byte: 0x" + last_token, "string")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a CBOR byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into the byte array.
+    Additionally, CBOR's byte arrays with indefinite lengths are supported.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_cbor_binary(binary_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::cbor, "binary")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // Binary data (0x00..0x17 bytes follow)
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            {
+                return get_binary(input_format_t::cbor, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0x58: // Binary data (one-byte uint8_t for n follows)
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x59: // Binary data (two-byte uint16_t for n follow)
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5A: // Binary data (four-byte uint32_t for n follow)
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5B: // Binary data (eight-byte uint64_t for n follow)
+            {
+                std::uint64_t len{};
+                return get_number(input_format_t::cbor, len) &&
+                       get_binary(input_format_t::cbor, len, result);
+            }
+
+            case 0x5F: // Binary data (indefinite length)
+            {
+                while (get() != 0xFF)
+                {
+                    binary_t chunk;
+                    if (!get_cbor_binary(chunk))
+                    {
+                        return false;
+                    }
+                    result.insert(result.end(), chunk.begin(), chunk.end());
+                }
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::cbor, "expected length specification (0x40-0x5B) or indefinite binary array type (0x5F); last byte: 0x" + last_token, "binary")));
+            }
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array or std::size_t(-1) for an
+                    array of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether array creation completed
+    */
+    bool get_cbor_array(const std::size_t len,
+                        const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        if (len != std::size_t(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(false, tag_handler)))
+                {
+                    return false;
+                }
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object or std::size_t(-1) for an
+                    object of indefinite size
+    @param[in] tag_handler how CBOR tags should be treated
+    @return whether object creation completed
+    */
+    bool get_cbor_object(const std::size_t len,
+                         const cbor_tag_handler_t tag_handler)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (len != std::size_t(-1))
+        {
+            for (std::size_t i = 0; i < len; ++i)
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                {
+                    return false;
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+                key.clear();
+            }
+        }
+        else
+        {
+            while (get() != 0xFF)
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_cbor_string(key) || !sax->key(key)))
+                {
+                    return false;
+                }
+
+                if (JSON_HEDLEY_UNLIKELY(!parse_cbor_internal(true, tag_handler)))
+                {
+                    return false;
+                }
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    /*!
+    @return whether a valid MessagePack value was passed to the SAX parser
+    */
+    bool parse_msgpack_internal()
+    {
+        switch (get())
+        {
+            // EOF
+            case std::char_traits<char_type>::eof():
+                return unexpect_eof(input_format_t::msgpack, "value");
+
+            // positive fixint
+            case 0x00:
+            case 0x01:
+            case 0x02:
+            case 0x03:
+            case 0x04:
+            case 0x05:
+            case 0x06:
+            case 0x07:
+            case 0x08:
+            case 0x09:
+            case 0x0A:
+            case 0x0B:
+            case 0x0C:
+            case 0x0D:
+            case 0x0E:
+            case 0x0F:
+            case 0x10:
+            case 0x11:
+            case 0x12:
+            case 0x13:
+            case 0x14:
+            case 0x15:
+            case 0x16:
+            case 0x17:
+            case 0x18:
+            case 0x19:
+            case 0x1A:
+            case 0x1B:
+            case 0x1C:
+            case 0x1D:
+            case 0x1E:
+            case 0x1F:
+            case 0x20:
+            case 0x21:
+            case 0x22:
+            case 0x23:
+            case 0x24:
+            case 0x25:
+            case 0x26:
+            case 0x27:
+            case 0x28:
+            case 0x29:
+            case 0x2A:
+            case 0x2B:
+            case 0x2C:
+            case 0x2D:
+            case 0x2E:
+            case 0x2F:
+            case 0x30:
+            case 0x31:
+            case 0x32:
+            case 0x33:
+            case 0x34:
+            case 0x35:
+            case 0x36:
+            case 0x37:
+            case 0x38:
+            case 0x39:
+            case 0x3A:
+            case 0x3B:
+            case 0x3C:
+            case 0x3D:
+            case 0x3E:
+            case 0x3F:
+            case 0x40:
+            case 0x41:
+            case 0x42:
+            case 0x43:
+            case 0x44:
+            case 0x45:
+            case 0x46:
+            case 0x47:
+            case 0x48:
+            case 0x49:
+            case 0x4A:
+            case 0x4B:
+            case 0x4C:
+            case 0x4D:
+            case 0x4E:
+            case 0x4F:
+            case 0x50:
+            case 0x51:
+            case 0x52:
+            case 0x53:
+            case 0x54:
+            case 0x55:
+            case 0x56:
+            case 0x57:
+            case 0x58:
+            case 0x59:
+            case 0x5A:
+            case 0x5B:
+            case 0x5C:
+            case 0x5D:
+            case 0x5E:
+            case 0x5F:
+            case 0x60:
+            case 0x61:
+            case 0x62:
+            case 0x63:
+            case 0x64:
+            case 0x65:
+            case 0x66:
+            case 0x67:
+            case 0x68:
+            case 0x69:
+            case 0x6A:
+            case 0x6B:
+            case 0x6C:
+            case 0x6D:
+            case 0x6E:
+            case 0x6F:
+            case 0x70:
+            case 0x71:
+            case 0x72:
+            case 0x73:
+            case 0x74:
+            case 0x75:
+            case 0x76:
+            case 0x77:
+            case 0x78:
+            case 0x79:
+            case 0x7A:
+            case 0x7B:
+            case 0x7C:
+            case 0x7D:
+            case 0x7E:
+            case 0x7F:
+                return sax->number_unsigned(static_cast<number_unsigned_t>(current));
+
+            // fixmap
+            case 0x80:
+            case 0x81:
+            case 0x82:
+            case 0x83:
+            case 0x84:
+            case 0x85:
+            case 0x86:
+            case 0x87:
+            case 0x88:
+            case 0x89:
+            case 0x8A:
+            case 0x8B:
+            case 0x8C:
+            case 0x8D:
+            case 0x8E:
+            case 0x8F:
+                return get_msgpack_object(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixarray
+            case 0x90:
+            case 0x91:
+            case 0x92:
+            case 0x93:
+            case 0x94:
+            case 0x95:
+            case 0x96:
+            case 0x97:
+            case 0x98:
+            case 0x99:
+            case 0x9A:
+            case 0x9B:
+            case 0x9C:
+            case 0x9D:
+            case 0x9E:
+            case 0x9F:
+                return get_msgpack_array(static_cast<std::size_t>(static_cast<unsigned int>(current) & 0x0Fu));
+
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            case 0xD9: // str 8
+            case 0xDA: // str 16
+            case 0xDB: // str 32
+            {
+                string_t s;
+                return get_msgpack_string(s) && sax->string(s);
+            }
+
+            case 0xC0: // nil
+                return sax->null();
+
+            case 0xC2: // false
+                return sax->boolean(false);
+
+            case 0xC3: // true
+                return sax->boolean(true);
+
+            case 0xC4: // bin 8
+            case 0xC5: // bin 16
+            case 0xC6: // bin 32
+            case 0xC7: // ext 8
+            case 0xC8: // ext 16
+            case 0xC9: // ext 32
+            case 0xD4: // fixext 1
+            case 0xD5: // fixext 2
+            case 0xD6: // fixext 4
+            case 0xD7: // fixext 8
+            case 0xD8: // fixext 16
+            {
+                binary_t b;
+                return get_msgpack_binary(b) && sax->binary(b);
+            }
+
+            case 0xCA: // float 32
+            {
+                float number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCB: // float 64
+            {
+                double number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 0xCC: // uint 8
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCD: // uint 16
+            {
+                std::uint16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCE: // uint 32
+            {
+                std::uint32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xCF: // uint 64
+            {
+                std::uint64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_unsigned(number);
+            }
+
+            case 0xD0: // int 8
+            {
+                std::int8_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD1: // int 16
+            {
+                std::int16_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD2: // int 32
+            {
+                std::int32_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xD3: // int 64
+            {
+                std::int64_t number{};
+                return get_number(input_format_t::msgpack, number) && sax->number_integer(number);
+            }
+
+            case 0xDC: // array 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDD: // array 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_array(static_cast<std::size_t>(len));
+            }
+
+            case 0xDE: // map 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            case 0xDF: // map 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_msgpack_object(static_cast<std::size_t>(len));
+            }
+
+            // negative fixint
+            case 0xE0:
+            case 0xE1:
+            case 0xE2:
+            case 0xE3:
+            case 0xE4:
+            case 0xE5:
+            case 0xE6:
+            case 0xE7:
+            case 0xE8:
+            case 0xE9:
+            case 0xEA:
+            case 0xEB:
+            case 0xEC:
+            case 0xED:
+            case 0xEE:
+            case 0xEF:
+            case 0xF0:
+            case 0xF1:
+            case 0xF2:
+            case 0xF3:
+            case 0xF4:
+            case 0xF5:
+            case 0xF6:
+            case 0xF7:
+            case 0xF8:
+            case 0xF9:
+            case 0xFA:
+            case 0xFB:
+            case 0xFC:
+            case 0xFD:
+            case 0xFE:
+            case 0xFF:
+                return sax->number_integer(static_cast<std::int8_t>(current));
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::msgpack, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack string
+
+    This function first reads starting bytes to determine the expected
+    string length and then copies this number of bytes into a string.
+
+    @param[out] result  created string
+
+    @return whether string creation completed
+    */
+    bool get_msgpack_string(string_t& result)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::msgpack, "string")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            // fixstr
+            case 0xA0:
+            case 0xA1:
+            case 0xA2:
+            case 0xA3:
+            case 0xA4:
+            case 0xA5:
+            case 0xA6:
+            case 0xA7:
+            case 0xA8:
+            case 0xA9:
+            case 0xAA:
+            case 0xAB:
+            case 0xAC:
+            case 0xAD:
+            case 0xAE:
+            case 0xAF:
+            case 0xB0:
+            case 0xB1:
+            case 0xB2:
+            case 0xB3:
+            case 0xB4:
+            case 0xB5:
+            case 0xB6:
+            case 0xB7:
+            case 0xB8:
+            case 0xB9:
+            case 0xBA:
+            case 0xBB:
+            case 0xBC:
+            case 0xBD:
+            case 0xBE:
+            case 0xBF:
+            {
+                return get_string(input_format_t::msgpack, static_cast<unsigned int>(current) & 0x1Fu, result);
+            }
+
+            case 0xD9: // str 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDA: // str 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            case 0xDB: // str 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) && get_string(input_format_t::msgpack, len, result);
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::msgpack, "expected length specification (0xA0-0xBF, 0xD9-0xDB); last byte: 0x" + last_token, "string")));
+            }
+        }
+    }
+
+    /*!
+    @brief reads a MessagePack byte array
+
+    This function first reads starting bytes to determine the expected
+    byte array length and then copies this number of bytes into a byte array.
+
+    @param[out] result  created byte array
+
+    @return whether byte array creation completed
+    */
+    bool get_msgpack_binary(binary_t& result)
+    {
+        // helper function to set the subtype
+        auto assign_and_return_true = [&result](std::int8_t subtype)
+        {
+            result.set_subtype(static_cast<std::uint8_t>(subtype));
+            return true;
+        };
+
+        switch (current)
+        {
+            case 0xC4: // bin 8
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC5: // bin 16
+            {
+                std::uint16_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC6: // bin 32
+            {
+                std::uint32_t len{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_binary(input_format_t::msgpack, len, result);
+            }
+
+            case 0xC7: // ext 8
+            {
+                std::uint8_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC8: // ext 16
+            {
+                std::uint16_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xC9: // ext 32
+            {
+                std::uint32_t len{};
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, len) &&
+                       get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, len, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD4: // fixext 1
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 1, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD5: // fixext 2
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 2, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD6: // fixext 4
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 4, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD7: // fixext 8
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 8, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            case 0xD8: // fixext 16
+            {
+                std::int8_t subtype{};
+                return get_number(input_format_t::msgpack, subtype) &&
+                       get_binary(input_format_t::msgpack, 16, result) &&
+                       assign_and_return_true(subtype);
+            }
+
+            default:           // LCOV_EXCL_LINE
+                return false;  // LCOV_EXCL_LINE
+        }
+    }
+
+    /*!
+    @param[in] len  the length of the array
+    @return whether array creation completed
+    */
+    bool get_msgpack_array(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(len)))
+        {
+            return false;
+        }
+
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @param[in] len  the length of the object
+    @return whether object creation completed
+    */
+    bool get_msgpack_object(const std::size_t len)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(len)))
+        {
+            return false;
+        }
+
+        string_t key;
+        for (std::size_t i = 0; i < len; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!get_msgpack_string(key) || !sax->key(key)))
+            {
+                return false;
+            }
+
+            if (JSON_HEDLEY_UNLIKELY(!parse_msgpack_internal()))
+            {
+                return false;
+            }
+            key.clear();
+        }
+
+        return sax->end_object();
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    /*!
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether a valid UBJSON value was passed to the SAX parser
+    */
+    bool parse_ubjson_internal(const bool get_char = true)
+    {
+        return get_ubjson_value(get_char ? get_ignore_noop() : current);
+    }
+
+    /*!
+    @brief reads a UBJSON string
+
+    This function is either called after reading the 'S' byte explicitly
+    indicating a string, or in case of an object key where the 'S' byte can be
+    left out.
+
+    @param[out] result   created string
+    @param[in] get_char  whether a new character should be retrieved from the
+                         input (true, default) or whether the last read
+                         character should be considered instead
+
+    @return whether string creation completed
+    */
+    bool get_ubjson_string(string_t& result, const bool get_char = true)
+    {
+        if (get_char)
+        {
+            get();  // TODO(niels): may we ignore N here?
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
+        {
+            return false;
+        }
+
+        switch (current)
+        {
+            case 'U':
+            {
+                std::uint8_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'i':
+            {
+                std::int8_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'I':
+            {
+                std::int16_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'l':
+            {
+                std::int32_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            case 'L':
+            {
+                std::int64_t len{};
+                return get_number(input_format_t::ubjson, len) && get_string(input_format_t::ubjson, len, result);
+            }
+
+            default:
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L); last byte: 0x" + last_token, "string")));
+        }
+    }
+
+    /*!
+    @param[out] result  determined size
+    @return whether size determination completed
+    */
+    bool get_ubjson_size_value(std::size_t& result)
+    {
+        switch (get_ignore_noop())
+        {
+            case 'U':
+            {
+                std::uint8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                if (JSON_HEDLEY_UNLIKELY(!get_number(input_format_t::ubjson, number)))
+                {
+                    return false;
+                }
+                result = static_cast<std::size_t>(number);
+                return true;
+            }
+
+            default:
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "expected length type specification (U, i, I, l, L) after '#'; last byte: 0x" + last_token, "size")));
+            }
+        }
+    }
+
+    /*!
+    @brief determine the type and size for a container
+
+    In the optimized UBJSON format, a type and a size can be provided to allow
+    for a more compact representation.
+
+    @param[out] result  pair of the size and the type
+
+    @return whether pair creation completed
+    */
+    bool get_ubjson_size_type(std::pair<std::size_t, char_int_type>& result)
+    {
+        result.first = string_t::npos; // size
+        result.second = 0; // type
+
+        get_ignore_noop();
+
+        if (current == '$')
+        {
+            result.second = get();  // must not ignore 'N', because 'N' maybe the type
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "type")))
+            {
+                return false;
+            }
+
+            get_ignore_noop();
+            if (JSON_HEDLEY_UNLIKELY(current != '#'))
+            {
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "value")))
+                {
+                    return false;
+                }
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "expected '#' after type information; last byte: 0x" + last_token, "size")));
+            }
+
+            return get_ubjson_size_value(result.first);
+        }
+
+        if (current == '#')
+        {
+            return get_ubjson_size_value(result.first);
+        }
+
+        return true;
+    }
+
+    /*!
+    @param prefix  the previously read or set type prefix
+    @return whether value creation completed
+    */
+    bool get_ubjson_value(const char_int_type prefix)
+    {
+        switch (prefix)
+        {
+            case std::char_traits<char_type>::eof():  // EOF
+                return unexpect_eof(input_format_t::ubjson, "value");
+
+            case 'T':  // true
+                return sax->boolean(true);
+            case 'F':  // false
+                return sax->boolean(false);
+
+            case 'Z':  // null
+                return sax->null();
+
+            case 'U':
+            {
+                std::uint8_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_unsigned(number);
+            }
+
+            case 'i':
+            {
+                std::int8_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'I':
+            {
+                std::int16_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'l':
+            {
+                std::int32_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'L':
+            {
+                std::int64_t number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_integer(number);
+            }
+
+            case 'd':
+            {
+                float number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'D':
+            {
+                double number{};
+                return get_number(input_format_t::ubjson, number) && sax->number_float(static_cast<number_float_t>(number), "");
+            }
+
+            case 'H':
+            {
+                return get_ubjson_high_precision_number();
+            }
+
+            case 'C':  // char
+            {
+                get();
+                if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "char")))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(current > 127))
+                {
+                    auto last_token = get_token_string();
+                    return sax->parse_error(chars_read, last_token, parse_error::create(113, chars_read, exception_message(input_format_t::ubjson, "byte after 'C' must be in range 0x00..0x7F; last byte: 0x" + last_token, "char")));
+                }
+                string_t s(1, static_cast<typename string_t::value_type>(current));
+                return sax->string(s);
+            }
+
+            case 'S':  // string
+            {
+                string_t s;
+                return get_ubjson_string(s) && sax->string(s);
+            }
+
+            case '[':  // array
+                return get_ubjson_array();
+
+            case '{':  // object
+                return get_ubjson_object();
+
+            default: // anything else
+            {
+                auto last_token = get_token_string();
+                return sax->parse_error(chars_read, last_token, parse_error::create(112, chars_read, exception_message(input_format_t::ubjson, "invalid byte: 0x" + last_token, "value")));
+            }
+        }
+    }
+
+    /*!
+    @return whether array creation completed
+    */
+    bool get_ubjson_array()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                if (size_and_type.second != 'N')
+                {
+                    for (std::size_t i = 0; i < size_and_type.first; ++i)
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                        {
+                            return false;
+                        }
+                    }
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+            {
+                return false;
+            }
+
+            while (current != ']')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal(false)))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+            }
+        }
+
+        return sax->end_array();
+    }
+
+    /*!
+    @return whether object creation completed
+    */
+    bool get_ubjson_object()
+    {
+        std::pair<std::size_t, char_int_type> size_and_type;
+        if (JSON_HEDLEY_UNLIKELY(!get_ubjson_size_type(size_and_type)))
+        {
+            return false;
+        }
+
+        string_t key;
+        if (size_and_type.first != string_t::npos)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(size_and_type.first)))
+            {
+                return false;
+            }
+
+            if (size_and_type.second != 0)
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_value(size_and_type.second)))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+            else
+            {
+                for (std::size_t i = 0; i < size_and_type.first; ++i)
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key) || !sax->key(key)))
+                    {
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                    {
+                        return false;
+                    }
+                    key.clear();
+                }
+            }
+        }
+        else
+        {
+            if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+            {
+                return false;
+            }
+
+            while (current != '}')
+            {
+                if (JSON_HEDLEY_UNLIKELY(!get_ubjson_string(key, false) || !sax->key(key)))
+                {
+                    return false;
+                }
+                if (JSON_HEDLEY_UNLIKELY(!parse_ubjson_internal()))
+                {
+                    return false;
+                }
+                get_ignore_noop();
+                key.clear();
+            }
+        }
+
+        return sax->end_object();
+    }
+
+    // Note, no reader for UBJSON binary types is implemented because they do
+    // not exist
+
+    bool get_ubjson_high_precision_number()
+    {
+        // get size of following number string
+        std::size_t size{};
+        auto res = get_ubjson_size_value(size);
+        if (JSON_HEDLEY_UNLIKELY(!res))
+        {
+            return res;
+        }
+
+        // get number string
+        std::vector<char> number_vector;
+        for (std::size_t i = 0; i < size; ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(input_format_t::ubjson, "number")))
+            {
+                return false;
+            }
+            number_vector.push_back(static_cast<char>(current));
+        }
+
+        // parse number string
+        auto number_ia = detail::input_adapter(std::forward<decltype(number_vector)>(number_vector));
+        auto number_lexer = detail::lexer<BasicJsonType, decltype(number_ia)>(std::move(number_ia), false);
+        const auto result_number = number_lexer.scan();
+        const auto number_string = number_lexer.get_token_string();
+        const auto result_remainder = number_lexer.scan();
+
+        using token_type = typename detail::lexer_base<BasicJsonType>::token_type;
+
+        if (JSON_HEDLEY_UNLIKELY(result_remainder != token_type::end_of_input))
+        {
+            return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number")));
+        }
+
+        switch (result_number)
+        {
+            case token_type::value_integer:
+                return sax->number_integer(number_lexer.get_number_integer());
+            case token_type::value_unsigned:
+                return sax->number_unsigned(number_lexer.get_number_unsigned());
+            case token_type::value_float:
+                return sax->number_float(number_lexer.get_number_float(), std::move(number_string));
+            default:
+                return sax->parse_error(chars_read, number_string, parse_error::create(115, chars_read, exception_message(input_format_t::ubjson, "invalid number text: " + number_lexer.get_token_string(), "high-precision number")));
+        }
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*!
+    @brief get next character from the input
+
+    This function provides the interface to the used input adapter. It does
+    not throw in case the input reached EOF, but returns a -'ve valued
+    `std::char_traits<char_type>::eof()` in that case.
+
+    @return character read from the input
+    */
+    char_int_type get()
+    {
+        ++chars_read;
+        return current = ia.get_character();
+    }
+
+    /*!
+    @return character read from the input after ignoring all 'N' entries
+    */
+    char_int_type get_ignore_noop()
+    {
+        do
+        {
+            get();
+        }
+        while (current == 'N');
+
+        return current;
+    }
+
+    /*
+    @brief read a number from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format   the current format (for diagnostics)
+    @param[out] result  number of type @a NumberType
+
+    @return whether conversion completed
+
+    @note This function needs to respect the system's endianess, because
+          bytes in CBOR, MessagePack, and UBJSON are stored in network order
+          (big endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool InputIsLittleEndian = false>
+    bool get_number(const input_format_t format, NumberType& result)
+    {
+        // step 1: read input into array with system's byte order
+        std::array<std::uint8_t, sizeof(NumberType)> vec;
+        for (std::size_t i = 0; i < sizeof(NumberType); ++i)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "number")))
+            {
+                return false;
+            }
+
+            // reverse byte order prior to conversion if necessary
+            if (is_little_endian != InputIsLittleEndian)
+            {
+                vec[sizeof(NumberType) - i - 1] = static_cast<std::uint8_t>(current);
+            }
+            else
+            {
+                vec[i] = static_cast<std::uint8_t>(current); // LCOV_EXCL_LINE
+            }
+        }
+
+        // step 2: convert array into number of type T and return
+        std::memcpy(&result, vec.data(), sizeof(NumberType));
+        return true;
+    }
+
+    /*!
+    @brief create a string by reading characters from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of characters to read
+    @param[out] result string created by reading @a len bytes
+
+    @return whether string creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of string memory.
+    */
+    template<typename NumberType>
+    bool get_string(const input_format_t format,
+                    const NumberType len,
+                    string_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "string")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<typename string_t::value_type>(current));
+        };
+        return success;
+    }
+
+    /*!
+    @brief create a byte array by reading bytes from the input
+
+    @tparam NumberType the type of the number
+    @param[in] format the current format (for diagnostics)
+    @param[in] len number of bytes to read
+    @param[out] result byte array created by reading @a len bytes
+
+    @return whether byte array creation completed
+
+    @note We can not reserve @a len bytes for the result, because @a len
+          may be too large. Usually, @ref unexpect_eof() detects the end of
+          the input before we run out of memory.
+    */
+    template<typename NumberType>
+    bool get_binary(const input_format_t format,
+                    const NumberType len,
+                    binary_t& result)
+    {
+        bool success = true;
+        for (NumberType i = 0; i < len; i++)
+        {
+            get();
+            if (JSON_HEDLEY_UNLIKELY(!unexpect_eof(format, "binary")))
+            {
+                success = false;
+                break;
+            }
+            result.push_back(static_cast<std::uint8_t>(current));
+        }
+        return success;
+    }
+
+    /*!
+    @param[in] format   the current format (for diagnostics)
+    @param[in] context  further context information (for diagnostics)
+    @return whether the last read character is not EOF
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    bool unexpect_eof(const input_format_t format, const char* context) const
+    {
+        if (JSON_HEDLEY_UNLIKELY(current == std::char_traits<char_type>::eof()))
+        {
+            return sax->parse_error(chars_read, "<end of file>",
+                                    parse_error::create(110, chars_read, exception_message(format, "unexpected end of input", context)));
+        }
+        return true;
+    }
+
+    /*!
+    @return a string representation of the last read byte
+    */
+    std::string get_token_string() const
+    {
+        std::array<char, 3> cr{{}};
+        (std::snprintf)(cr.data(), cr.size(), "%.2hhX", static_cast<unsigned char>(current));
+        return std::string{cr.data()};
+    }
+
+    /*!
+    @param[in] format   the current format
+    @param[in] detail   a detailed error message
+    @param[in] context  further context information
+    @return a message string to use in the parse_error exceptions
+    */
+    std::string exception_message(const input_format_t format,
+                                  const std::string& detail,
+                                  const std::string& context) const
+    {
+        std::string error_msg = "syntax error while parsing ";
+
+        switch (format)
+        {
+            case input_format_t::cbor:
+                error_msg += "CBOR";
+                break;
+
+            case input_format_t::msgpack:
+                error_msg += "MessagePack";
+                break;
+
+            case input_format_t::ubjson:
+                error_msg += "UBJSON";
+                break;
+
+            case input_format_t::bson:
+                error_msg += "BSON";
+                break;
+
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+        }
+
+        return error_msg + " " + context + ": " + detail;
+    }
+
+  private:
+    /// input adapter
+    InputAdapterType ia;
+
+    /// the current character
+    char_int_type current = std::char_traits<char_type>::eof();
+
+    /// the number of characters read
+    std::size_t chars_read = 0;
+
+    /// whether we can assume little endianess
+    const bool is_little_endian = little_endianess();
+
+    /// the SAX parser
+    json_sax_t* sax = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/input/parser.hpp>
+
+
+#include <cmath> // isfinite
+#include <cstdint> // uint8_t
+#include <functional> // function
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/input/input_adapters.hpp>
+
+// #include <nlohmann/detail/input/json_sax.hpp>
+
+// #include <nlohmann/detail/input/lexer.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/is_sax.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+////////////
+// parser //
+////////////
+
+enum class parse_event_t : uint8_t
+{
+    /// the parser read `{` and started to process a JSON object
+    object_start,
+    /// the parser read `}` and finished processing a JSON object
+    object_end,
+    /// the parser read `[` and started to process a JSON array
+    array_start,
+    /// the parser read `]` and finished processing a JSON array
+    array_end,
+    /// the parser read a key of a value in an object
+    key,
+    /// the parser finished reading a JSON value
+    value
+};
+
+template<typename BasicJsonType>
+using parser_callback_t =
+    std::function<bool(int depth, parse_event_t event, BasicJsonType& parsed)>;
+
+/*!
+@brief syntax analysis
+
+This class implements a recursive descent parser.
+*/
+template<typename BasicJsonType, typename InputAdapterType>
+class parser
+{
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using string_t = typename BasicJsonType::string_t;
+    using lexer_t = lexer<BasicJsonType, InputAdapterType>;
+    using token_type = typename lexer_t::token_type;
+
+  public:
+    /// a parser reading from an input adapter
+    explicit parser(InputAdapterType&& adapter,
+                    const parser_callback_t<BasicJsonType> cb = nullptr,
+                    const bool allow_exceptions_ = true,
+                    const bool skip_comments = false)
+        : callback(cb)
+        , m_lexer(std::move(adapter), skip_comments)
+        , allow_exceptions(allow_exceptions_)
+    {
+        // read first token
+        get_token();
+    }
+
+    /*!
+    @brief public parser interface
+
+    @param[in] strict      whether to expect the last token to be EOF
+    @param[in,out] result  parsed JSON value
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    void parse(const bool strict, BasicJsonType& result)
+    {
+        if (callback)
+        {
+            json_sax_dom_callback_parser<BasicJsonType> sdp(result, callback, allow_exceptions);
+            sax_parse_internal(&sdp);
+            result.assert_invariant();
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value")));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+
+            // set top-level value to null if it was discarded by the callback
+            // function
+            if (result.is_discarded())
+            {
+                result = nullptr;
+            }
+        }
+        else
+        {
+            json_sax_dom_parser<BasicJsonType> sdp(result, allow_exceptions);
+            sax_parse_internal(&sdp);
+            result.assert_invariant();
+
+            // in strict mode, input must be completely read
+            if (strict && (get_token() != token_type::end_of_input))
+            {
+                sdp.parse_error(m_lexer.get_position(),
+                                m_lexer.get_token_string(),
+                                parse_error::create(101, m_lexer.get_position(),
+                                                    exception_message(token_type::end_of_input, "value")));
+            }
+
+            // in case of an error, return discarded value
+            if (sdp.is_errored())
+            {
+                result = value_t::discarded;
+                return;
+            }
+        }
+    }
+
+    /*!
+    @brief public accept interface
+
+    @param[in] strict  whether to expect the last token to be EOF
+    @return whether the input is a proper JSON text
+    */
+    bool accept(const bool strict = true)
+    {
+        json_sax_acceptor<BasicJsonType> sax_acceptor;
+        return sax_parse(&sax_acceptor, strict);
+    }
+
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse(SAX* sax, const bool strict = true)
+    {
+        (void)detail::is_sax_static_asserts<SAX, BasicJsonType> {};
+        const bool result = sax_parse_internal(sax);
+
+        // strict mode: next byte must be EOF
+        if (result && strict && (get_token() != token_type::end_of_input))
+        {
+            return sax->parse_error(m_lexer.get_position(),
+                                    m_lexer.get_token_string(),
+                                    parse_error::create(101, m_lexer.get_position(),
+                                            exception_message(token_type::end_of_input, "value")));
+        }
+
+        return result;
+    }
+
+  private:
+    template<typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    bool sax_parse_internal(SAX* sax)
+    {
+        // stack to remember the hierarchy of structured values we are parsing
+        // true = array; false = object
+        std::vector<bool> states;
+        // value to avoid a goto (see comment where set to true)
+        bool skip_to_state_evaluation = false;
+
+        while (true)
+        {
+            if (!skip_to_state_evaluation)
+            {
+                // invariant: get_token() was called before each iteration
+                switch (last_token)
+                {
+                    case token_type::begin_object:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_object(std::size_t(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing } -> we are done
+                        if (get_token() == token_type::end_object)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // parse key
+                        if (JSON_HEDLEY_UNLIKELY(last_token != token_type::value_string))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            exception_message(token_type::value_string, "object key")));
+                        }
+                        if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        // parse separator (:)
+                        if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    parse_error::create(101, m_lexer.get_position(),
+                                                            exception_message(token_type::name_separator, "object separator")));
+                        }
+
+                        // remember we are now inside an object
+                        states.push_back(false);
+
+                        // parse values
+                        get_token();
+                        continue;
+                    }
+
+                    case token_type::begin_array:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->start_array(std::size_t(-1))))
+                        {
+                            return false;
+                        }
+
+                        // closing ] -> we are done
+                        if (get_token() == token_type::end_array)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                            {
+                                return false;
+                            }
+                            break;
+                        }
+
+                        // remember we are now inside an array
+                        states.push_back(true);
+
+                        // parse values (no need to call get_token)
+                        continue;
+                    }
+
+                    case token_type::value_float:
+                    {
+                        const auto res = m_lexer.get_number_float();
+
+                        if (JSON_HEDLEY_UNLIKELY(!std::isfinite(res)))
+                        {
+                            return sax->parse_error(m_lexer.get_position(),
+                                                    m_lexer.get_token_string(),
+                                                    out_of_range::create(406, "number overflow parsing '" + m_lexer.get_token_string() + "'"));
+                        }
+
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_float(res, m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+
+                        break;
+                    }
+
+                    case token_type::literal_false:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(false)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_null:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->null()))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::literal_true:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->boolean(true)))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_integer:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_integer(m_lexer.get_number_integer())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_string:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->string(m_lexer.get_string())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::value_unsigned:
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!sax->number_unsigned(m_lexer.get_number_unsigned())))
+                        {
+                            return false;
+                        }
+                        break;
+                    }
+
+                    case token_type::parse_error:
+                    {
+                        // using "uninitialized" to avoid "expected" message
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::uninitialized, "value")));
+                    }
+
+                    default: // the last token was unexpected
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::literal_or_value, "value")));
+                    }
+                }
+            }
+            else
+            {
+                skip_to_state_evaluation = false;
+            }
+
+            // we reached this line after we successfully parsed a value
+            if (states.empty())
+            {
+                // empty stack: we reached the end of the hierarchy: done
+                return true;
+            }
+
+            if (states.back())  // array
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse a new value
+                    get_token();
+                    continue;
+                }
+
+                // closing ]
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_array))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!sax->end_array()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this array. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    JSON_ASSERT(!states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(),
+                                                exception_message(token_type::end_array, "array")));
+            }
+            else  // object
+            {
+                // comma -> next value
+                if (get_token() == token_type::value_separator)
+                {
+                    // parse key
+                    if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::value_string))
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::value_string, "object key")));
+                    }
+
+                    if (JSON_HEDLEY_UNLIKELY(!sax->key(m_lexer.get_string())))
+                    {
+                        return false;
+                    }
+
+                    // parse separator (:)
+                    if (JSON_HEDLEY_UNLIKELY(get_token() != token_type::name_separator))
+                    {
+                        return sax->parse_error(m_lexer.get_position(),
+                                                m_lexer.get_token_string(),
+                                                parse_error::create(101, m_lexer.get_position(),
+                                                        exception_message(token_type::name_separator, "object separator")));
+                    }
+
+                    // parse values
+                    get_token();
+                    continue;
+                }
+
+                // closing }
+                if (JSON_HEDLEY_LIKELY(last_token == token_type::end_object))
+                {
+                    if (JSON_HEDLEY_UNLIKELY(!sax->end_object()))
+                    {
+                        return false;
+                    }
+
+                    // We are done with this object. Before we can parse a
+                    // new value, we need to evaluate the new state first.
+                    // By setting skip_to_state_evaluation to false, we
+                    // are effectively jumping to the beginning of this if.
+                    JSON_ASSERT(!states.empty());
+                    states.pop_back();
+                    skip_to_state_evaluation = true;
+                    continue;
+                }
+
+                return sax->parse_error(m_lexer.get_position(),
+                                        m_lexer.get_token_string(),
+                                        parse_error::create(101, m_lexer.get_position(),
+                                                exception_message(token_type::end_object, "object")));
+            }
+        }
+    }
+
+    /// get next token from lexer
+    token_type get_token()
+    {
+        return last_token = m_lexer.scan();
+    }
+
+    std::string exception_message(const token_type expected, const std::string& context)
+    {
+        std::string error_msg = "syntax error ";
+
+        if (!context.empty())
+        {
+            error_msg += "while parsing " + context + " ";
+        }
+
+        error_msg += "- ";
+
+        if (last_token == token_type::parse_error)
+        {
+            error_msg += std::string(m_lexer.get_error_message()) + "; last read: '" +
+                         m_lexer.get_token_string() + "'";
+        }
+        else
+        {
+            error_msg += "unexpected " + std::string(lexer_t::token_type_name(last_token));
+        }
+
+        if (expected != token_type::uninitialized)
+        {
+            error_msg += "; expected " + std::string(lexer_t::token_type_name(expected));
+        }
+
+        return error_msg;
+    }
+
+  private:
+    /// callback function
+    const parser_callback_t<BasicJsonType> callback = nullptr;
+    /// the type of the last read token
+    token_type last_token = token_type::uninitialized;
+    /// the lexer
+    lexer_t m_lexer;
+    /// whether to throw exceptions in case of errors
+    const bool allow_exceptions = true;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <limits>  // numeric_limits
+
+namespace nlohmann
+{
+namespace detail
+{
+/*
+@brief an iterator for primitive JSON types
+
+This class models an iterator for primitive JSON types (boolean, number,
+string). It's only purpose is to allow the iterator/const_iterator classes
+to "iterate" over primitive values. Internally, the iterator is modeled by
+a `difference_type` variable. Value begin_value (`0`) models the begin,
+end_value (`1`) models past the end.
+*/
+class primitive_iterator_t
+{
+  private:
+    using difference_type = std::ptrdiff_t;
+    static constexpr difference_type begin_value = 0;
+    static constexpr difference_type end_value = begin_value + 1;
+
+    /// iterator as signed integer type
+    difference_type m_it = (std::numeric_limits<std::ptrdiff_t>::min)();
+
+  public:
+    constexpr difference_type get_value() const noexcept
+    {
+        return m_it;
+    }
+
+    /// set iterator to a defined beginning
+    void set_begin() noexcept
+    {
+        m_it = begin_value;
+    }
+
+    /// set iterator to a defined past the end
+    void set_end() noexcept
+    {
+        m_it = end_value;
+    }
+
+    /// return whether the iterator can be dereferenced
+    constexpr bool is_begin() const noexcept
+    {
+        return m_it == begin_value;
+    }
+
+    /// return whether the iterator is at end
+    constexpr bool is_end() const noexcept
+    {
+        return m_it == end_value;
+    }
+
+    friend constexpr bool operator==(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it == rhs.m_it;
+    }
+
+    friend constexpr bool operator<(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it < rhs.m_it;
+    }
+
+    primitive_iterator_t operator+(difference_type n) noexcept
+    {
+        auto result = *this;
+        result += n;
+        return result;
+    }
+
+    friend constexpr difference_type operator-(primitive_iterator_t lhs, primitive_iterator_t rhs) noexcept
+    {
+        return lhs.m_it - rhs.m_it;
+    }
+
+    primitive_iterator_t& operator++() noexcept
+    {
+        ++m_it;
+        return *this;
+    }
+
+    primitive_iterator_t const operator++(int) noexcept
+    {
+        auto result = *this;
+        ++m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator--() noexcept
+    {
+        --m_it;
+        return *this;
+    }
+
+    primitive_iterator_t const operator--(int) noexcept
+    {
+        auto result = *this;
+        --m_it;
+        return result;
+    }
+
+    primitive_iterator_t& operator+=(difference_type n) noexcept
+    {
+        m_it += n;
+        return *this;
+    }
+
+    primitive_iterator_t& operator-=(difference_type n) noexcept
+    {
+        m_it -= n;
+        return *this;
+    }
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/*!
+@brief an iterator value
+
+@note This structure could easily be a union, but MSVC currently does not allow
+unions members with complex constructors, see https://github.com/nlohmann/json/pull/105.
+*/
+template<typename BasicJsonType> struct internal_iterator
+{
+    /// iterator for JSON objects
+    typename BasicJsonType::object_t::iterator object_iterator {};
+    /// iterator for JSON arrays
+    typename BasicJsonType::array_t::iterator array_iterator {};
+    /// generic iterator for all other types
+    primitive_iterator_t primitive_iterator {};
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/iter_impl.hpp>
+
+
+#include <iterator> // iterator, random_access_iterator_tag, bidirectional_iterator_tag, advance, next
+#include <type_traits> // conditional, is_const, remove_const
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/iterators/internal_iterator.hpp>
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+// forward declare, to be able to friend it later on
+template<typename IteratorType> class iteration_proxy;
+template<typename IteratorType> class iteration_proxy_value;
+
+/*!
+@brief a template for a bidirectional iterator for the @ref basic_json class
+This class implements a both iterators (iterator and const_iterator) for the
+@ref basic_json class.
+@note An iterator is called *initialized* when a pointer to a JSON value has
+      been set (e.g., by a constructor or a copy assignment). If the iterator is
+      default-constructed, it is *uninitialized* and most methods are undefined.
+      **The library uses assertions to detect calls on uninitialized iterators.**
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+@since version 1.0.0, simplified in version 2.0.9, change to bidirectional
+       iterators in version 3.0.0 (see https://github.com/nlohmann/json/issues/593)
+*/
+template<typename BasicJsonType>
+class iter_impl
+{
+    /// allow basic_json to access private members
+    friend iter_impl<typename std::conditional<std::is_const<BasicJsonType>::value, typename std::remove_const<BasicJsonType>::type, const BasicJsonType>::type>;
+    friend BasicJsonType;
+    friend iteration_proxy<iter_impl>;
+    friend iteration_proxy_value<iter_impl>;
+
+    using object_t = typename BasicJsonType::object_t;
+    using array_t = typename BasicJsonType::array_t;
+    // make sure BasicJsonType is basic_json or const basic_json
+    static_assert(is_basic_json<typename std::remove_const<BasicJsonType>::type>::value,
+                  "iter_impl only accepts (const) basic_json");
+
+  public:
+
+    /// The std::iterator class template (used as a base class to provide typedefs) is deprecated in C++17.
+    /// The C++ Standard has never required user-defined iterators to derive from std::iterator.
+    /// A user-defined iterator should provide publicly accessible typedefs named
+    /// iterator_category, value_type, difference_type, pointer, and reference.
+    /// Note that value_type is required to be non-const, even for constant iterators.
+    using iterator_category = std::bidirectional_iterator_tag;
+
+    /// the type of the values when the iterator is dereferenced
+    using value_type = typename BasicJsonType::value_type;
+    /// a type to represent differences between iterators
+    using difference_type = typename BasicJsonType::difference_type;
+    /// defines a pointer to the type iterated over (value_type)
+    using pointer = typename std::conditional<std::is_const<BasicJsonType>::value,
+          typename BasicJsonType::const_pointer,
+          typename BasicJsonType::pointer>::type;
+    /// defines a reference to the type iterated over (value_type)
+    using reference =
+        typename std::conditional<std::is_const<BasicJsonType>::value,
+        typename BasicJsonType::const_reference,
+        typename BasicJsonType::reference>::type;
+
+    /// default constructor
+    iter_impl() = default;
+
+    /*!
+    @brief constructor for a given JSON instance
+    @param[in] object  pointer to a JSON object for this iterator
+    @pre object != nullptr
+    @post The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    explicit iter_impl(pointer object) noexcept : m_object(object)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = typename object_t::iterator();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = typename array_t::iterator();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator = primitive_iterator_t();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @note The conventional copy constructor and copy assignment are implicitly
+          defined. Combined with the following converting constructor and
+          assignment, they support: (1) copy from iterator to iterator, (2)
+          copy from const iterator to const iterator, and (3) conversion from
+          iterator to const iterator. However conversion from const iterator
+          to iterator is not defined.
+    */
+
+    /*!
+    @brief const copy constructor
+    @param[in] other const iterator to copy from
+    @note This copy constructor had to be defined explicitly to circumvent a bug
+          occurring on msvc v19.0 compiler (VS 2015) debug build. For more
+          information refer to: https://github.com/nlohmann/json/issues/1608
+    */
+    iter_impl(const iter_impl<const BasicJsonType>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<const BasicJsonType>& other) noexcept
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+    /*!
+    @brief converting constructor
+    @param[in] other  non-const iterator to copy from
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+        : m_object(other.m_object), m_it(other.m_it)
+    {}
+
+    /*!
+    @brief converting assignment
+    @param[in] other  non-const iterator to copy from
+    @return const/non-const iterator
+    @note It is not checked whether @a other is initialized.
+    */
+    iter_impl& operator=(const iter_impl<typename std::remove_const<BasicJsonType>::type>& other) noexcept
+    {
+        m_object = other.m_object;
+        m_it = other.m_it;
+        return *this;
+    }
+
+  private:
+    /*!
+    @brief set the iterator to the first value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_begin() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->begin();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->begin();
+                break;
+            }
+
+            case value_t::null:
+            {
+                // set to end so begin()==end() is true: null is empty
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator.set_begin();
+                break;
+            }
+        }
+    }
+
+    /*!
+    @brief set the iterator past the last value
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    void set_end() noexcept
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                m_it.object_iterator = m_object->m_value.object->end();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_it.array_iterator = m_object->m_value.array->end();
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator.set_end();
+                break;
+            }
+        }
+    }
+
+  public:
+    /*!
+    @brief return a reference to the value pointed to by the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator*() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
+                return m_it.object_iterator->second;
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
+                return *m_it.array_iterator;
+            }
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief dereference the iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    pointer operator->() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                JSON_ASSERT(m_it.object_iterator != m_object->m_value.object->end());
+                return &(m_it.object_iterator->second);
+            }
+
+            case value_t::array:
+            {
+                JSON_ASSERT(m_it.array_iterator != m_object->m_value.array->end());
+                return &*m_it.array_iterator;
+            }
+
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.is_begin()))
+                {
+                    return m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief post-increment (it++)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl const operator++(int)
+    {
+        auto result = *this;
+        ++(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-increment (++it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator++()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, 1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, 1);
+                break;
+            }
+
+            default:
+            {
+                ++m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief post-decrement (it--)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl const operator--(int)
+    {
+        auto result = *this;
+        --(*this);
+        return result;
+    }
+
+    /*!
+    @brief pre-decrement (--it)
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator--()
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+            {
+                std::advance(m_it.object_iterator, -1);
+                break;
+            }
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, -1);
+                break;
+            }
+
+            default:
+            {
+                --m_it.primitive_iterator;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief  comparison: equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator==(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+        }
+
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                return (m_it.object_iterator == other.m_it.object_iterator);
+
+            case value_t::array:
+                return (m_it.array_iterator == other.m_it.array_iterator);
+
+            default:
+                return (m_it.primitive_iterator == other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief  comparison: not equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator!=(const iter_impl& other) const
+    {
+        return !operator==(other);
+    }
+
+    /*!
+    @brief  comparison: smaller
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<(const iter_impl& other) const
+    {
+        // if objects are not the same, the comparison is undefined
+        if (JSON_HEDLEY_UNLIKELY(m_object != other.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(212, "cannot compare iterators of different containers"));
+        }
+
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(213, "cannot compare order of object iterators"));
+
+            case value_t::array:
+                return (m_it.array_iterator < other.m_it.array_iterator);
+
+            default:
+                return (m_it.primitive_iterator < other.m_it.primitive_iterator);
+        }
+    }
+
+    /*!
+    @brief  comparison: less than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator<=(const iter_impl& other) const
+    {
+        return !other.operator < (*this);
+    }
+
+    /*!
+    @brief  comparison: greater than
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>(const iter_impl& other) const
+    {
+        return !operator<=(other);
+    }
+
+    /*!
+    @brief  comparison: greater than or equal
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    bool operator>=(const iter_impl& other) const
+    {
+        return !operator<(other);
+    }
+
+    /*!
+    @brief  add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator+=(difference_type i)
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+            case value_t::array:
+            {
+                std::advance(m_it.array_iterator, i);
+                break;
+            }
+
+            default:
+            {
+                m_it.primitive_iterator += i;
+                break;
+            }
+        }
+
+        return *this;
+    }
+
+    /*!
+    @brief  subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl& operator-=(difference_type i)
+    {
+        return operator+=(-i);
+    }
+
+    /*!
+    @brief  add to iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator+(difference_type i) const
+    {
+        auto result = *this;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief  addition of distance and iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    friend iter_impl operator+(difference_type i, const iter_impl& it)
+    {
+        auto result = it;
+        result += i;
+        return result;
+    }
+
+    /*!
+    @brief  subtract from iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    iter_impl operator-(difference_type i) const
+    {
+        auto result = *this;
+        result -= i;
+        return result;
+    }
+
+    /*!
+    @brief  return difference
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    difference_type operator-(const iter_impl& other) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(209, "cannot use offsets with object iterators"));
+
+            case value_t::array:
+                return m_it.array_iterator - other.m_it.array_iterator;
+
+            default:
+                return m_it.primitive_iterator - other.m_it.primitive_iterator;
+        }
+    }
+
+    /*!
+    @brief  access to successor
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference operator[](difference_type n) const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        switch (m_object->m_type)
+        {
+            case value_t::object:
+                JSON_THROW(invalid_iterator::create(208, "cannot use operator[] for object iterators"));
+
+            case value_t::array:
+                return *std::next(m_it.array_iterator, n);
+
+            case value_t::null:
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+
+            default:
+            {
+                if (JSON_HEDLEY_LIKELY(m_it.primitive_iterator.get_value() == -n))
+                {
+                    return *m_object;
+                }
+
+                JSON_THROW(invalid_iterator::create(214, "cannot get value"));
+            }
+        }
+    }
+
+    /*!
+    @brief  return the key of an object iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    const typename object_t::key_type& key() const
+    {
+        JSON_ASSERT(m_object != nullptr);
+
+        if (JSON_HEDLEY_LIKELY(m_object->is_object()))
+        {
+            return m_it.object_iterator->first;
+        }
+
+        JSON_THROW(invalid_iterator::create(207, "cannot use key() for non-object iterators"));
+    }
+
+    /*!
+    @brief  return the value of an iterator
+    @pre The iterator is initialized; i.e. `m_object != nullptr`.
+    */
+    reference value() const
+    {
+        return operator*();
+    }
+
+  private:
+    /// associated JSON instance
+    pointer m_object = nullptr;
+    /// the actual iterator of the associated instance
+    internal_iterator<typename std::remove_const<BasicJsonType>::type> m_it {};
+};
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/iteration_proxy.hpp>
+
+// #include <nlohmann/detail/iterators/json_reverse_iterator.hpp>
+
+
+#include <cstddef> // ptrdiff_t
+#include <iterator> // reverse_iterator
+#include <utility> // declval
+
+namespace nlohmann
+{
+namespace detail
+{
+//////////////////////
+// reverse_iterator //
+//////////////////////
+
+/*!
+@brief a template for a reverse iterator class
+
+@tparam Base the base iterator type to reverse. Valid types are @ref
+iterator (to create @ref reverse_iterator) and @ref const_iterator (to
+create @ref const_reverse_iterator).
+
+@requirement The class satisfies the following concept requirements:
+-
+[BidirectionalIterator](https://en.cppreference.com/w/cpp/named_req/BidirectionalIterator):
+  The iterator that can be moved can be moved in both directions (i.e.
+  incremented and decremented).
+- [OutputIterator](https://en.cppreference.com/w/cpp/named_req/OutputIterator):
+  It is possible to write to the pointed-to element (only if @a Base is
+  @ref iterator).
+
+@since version 1.0.0
+*/
+template<typename Base>
+class json_reverse_iterator : public std::reverse_iterator<Base>
+{
+  public:
+    using difference_type = std::ptrdiff_t;
+    /// shortcut to the reverse iterator adapter
+    using base_iterator = std::reverse_iterator<Base>;
+    /// the reference type for the pointed-to element
+    using reference = typename Base::reference;
+
+    /// create reverse iterator from iterator
+    explicit json_reverse_iterator(const typename base_iterator::iterator_type& it) noexcept
+        : base_iterator(it) {}
+
+    /// create reverse iterator from base class
+    explicit json_reverse_iterator(const base_iterator& it) noexcept : base_iterator(it) {}
+
+    /// post-increment (it++)
+    json_reverse_iterator const operator++(int)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator++(1));
+    }
+
+    /// pre-increment (++it)
+    json_reverse_iterator& operator++()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator++());
+    }
+
+    /// post-decrement (it--)
+    json_reverse_iterator const operator--(int)
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator--(1));
+    }
+
+    /// pre-decrement (--it)
+    json_reverse_iterator& operator--()
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator--());
+    }
+
+    /// add to iterator
+    json_reverse_iterator& operator+=(difference_type i)
+    {
+        return static_cast<json_reverse_iterator&>(base_iterator::operator+=(i));
+    }
+
+    /// add to iterator
+    json_reverse_iterator operator+(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator+(i));
+    }
+
+    /// subtract from iterator
+    json_reverse_iterator operator-(difference_type i) const
+    {
+        return static_cast<json_reverse_iterator>(base_iterator::operator-(i));
+    }
+
+    /// return difference
+    difference_type operator-(const json_reverse_iterator& other) const
+    {
+        return base_iterator(*this) - base_iterator(other);
+    }
+
+    /// access to successor
+    reference operator[](difference_type n) const
+    {
+        return *(this->operator+(n));
+    }
+
+    /// return the key of an object iterator
+    auto key() const -> decltype(std::declval<Base>().key())
+    {
+        auto it = --this->base();
+        return it.key();
+    }
+
+    /// return the value of an iterator
+    reference value() const
+    {
+        auto it = --this->base();
+        return it.operator * ();
+    }
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/iterators/primitive_iterator.hpp>
+
+// #include <nlohmann/detail/json_pointer.hpp>
+
+
+#include <algorithm> // all_of
+#include <cctype> // isdigit
+#include <limits> // max
+#include <numeric> // accumulate
+#include <string> // string
+#include <utility> // move
+#include <vector> // vector
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+template<typename BasicJsonType>
+class json_pointer
+{
+    // allow basic_json to access private members
+    NLOHMANN_BASIC_JSON_TPL_DECLARATION
+    friend class basic_json;
+
+  public:
+    /*!
+    @brief create JSON pointer
+
+    Create a JSON pointer according to the syntax described in
+    [Section 3 of RFC6901](https://tools.ietf.org/html/rfc6901#section-3).
+
+    @param[in] s  string representing the JSON pointer; if omitted, the empty
+                  string is assumed which references the whole JSON value
+
+    @throw parse_error.107 if the given JSON pointer @a s is nonempty and does
+                           not begin with a slash (`/`); see example below
+
+    @throw parse_error.108 if a tilde (`~`) in the given JSON pointer @a s is
+    not followed by `0` (representing `~`) or `1` (representing `/`); see
+    example below
+
+    @liveexample{The example shows the construction several valid JSON pointers
+    as well as the exceptional behavior.,json_pointer}
+
+    @since version 2.0.0
+    */
+    explicit json_pointer(const std::string& s = "")
+        : reference_tokens(split(s))
+    {}
+
+    /*!
+    @brief return a string representation of the JSON pointer
+
+    @invariant For each JSON pointer `ptr`, it holds:
+    @code {.cpp}
+    ptr == json_pointer(ptr.to_string());
+    @endcode
+
+    @return a string representation of the JSON pointer
+
+    @liveexample{The example shows the result of `to_string`.,json_pointer__to_string}
+
+    @since version 2.0.0
+    */
+    std::string to_string() const
+    {
+        return std::accumulate(reference_tokens.begin(), reference_tokens.end(),
+                               std::string{},
+                               [](const std::string & a, const std::string & b)
+        {
+            return a + "/" + escape(b);
+        });
+    }
+
+    /// @copydoc to_string()
+    operator std::string() const
+    {
+        return to_string();
+    }
+
+    /*!
+    @brief append another JSON pointer at the end of this JSON pointer
+
+    @param[in] ptr  JSON pointer to append
+    @return JSON pointer with @a ptr appended
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::string) to append a reference token
+    @sa @ref operator/=(std::size_t) to append an array index
+    @sa @ref operator/(const json_pointer&, const json_pointer&) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(const json_pointer& ptr)
+    {
+        reference_tokens.insert(reference_tokens.end(),
+                                ptr.reference_tokens.begin(),
+                                ptr.reference_tokens.end());
+        return *this;
+    }
+
+    /*!
+    @brief append an unescaped reference token at the end of this JSON pointer
+
+    @param[in] token  reference token to append
+    @return JSON pointer with @a token appended without escaping @a token
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Amortized constant.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+    @sa @ref operator/=(std::size_t) to append an array index
+    @sa @ref operator/(const json_pointer&, std::size_t) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(std::string token)
+    {
+        push_back(std::move(token));
+        return *this;
+    }
+
+    /*!
+    @brief append an array index at the end of this JSON pointer
+
+    @param[in] array_idx  array index to append
+    @return JSON pointer with @a array_idx appended
+
+    @liveexample{The example shows the usage of `operator/=`.,json_pointer__operator_add}
+
+    @complexity Amortized constant.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+    @sa @ref operator/=(std::string) to append a reference token
+    @sa @ref operator/(const json_pointer&, std::string) for a binary operator
+
+    @since version 3.6.0
+    */
+    json_pointer& operator/=(std::size_t array_idx)
+    {
+        return *this /= std::to_string(array_idx);
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the right JSON pointer at the end of the left JSON pointer
+
+    @param[in] lhs  JSON pointer
+    @param[in] rhs  JSON pointer
+    @return a new JSON pointer with @a rhs appended to @a lhs
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a lhs and @a rhs.
+
+    @sa @ref operator/=(const json_pointer&) to append a JSON pointer
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& lhs,
+                                  const json_pointer& rhs)
+    {
+        return json_pointer(lhs) /= rhs;
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the unescaped token at the end of the JSON pointer
+
+    @param[in] ptr  JSON pointer
+    @param[in] token  reference token
+    @return a new JSON pointer with unescaped @a token appended to @a ptr
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::string) to append a reference token
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& ptr, std::string token)
+    {
+        return json_pointer(ptr) /= std::move(token);
+    }
+
+    /*!
+    @brief create a new JSON pointer by appending the array-index-token at the end of the JSON pointer
+
+    @param[in] ptr  JSON pointer
+    @param[in] array_idx  array index
+    @return a new JSON pointer with @a array_idx appended to @a ptr
+
+    @liveexample{The example shows the usage of `operator/`.,json_pointer__operator_add_binary}
+
+    @complexity Linear in the length of @a ptr.
+
+    @sa @ref operator/=(std::size_t) to append an array index
+
+    @since version 3.6.0
+    */
+    friend json_pointer operator/(const json_pointer& ptr, std::size_t array_idx)
+    {
+        return json_pointer(ptr) /= array_idx;
+    }
+
+    /*!
+    @brief returns the parent of this JSON pointer
+
+    @return parent of this JSON pointer; in case this JSON pointer is the root,
+            the root itself is returned
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @liveexample{The example shows the result of `parent_pointer` for different
+    JSON Pointers.,json_pointer__parent_pointer}
+
+    @since version 3.6.0
+    */
+    json_pointer parent_pointer() const
+    {
+        if (empty())
+        {
+            return *this;
+        }
+
+        json_pointer res = *this;
+        res.pop_back();
+        return res;
+    }
+
+    /*!
+    @brief remove last reference token
+
+    @pre not `empty()`
+
+    @liveexample{The example shows the usage of `pop_back`.,json_pointer__pop_back}
+
+    @complexity Constant.
+
+    @throw out_of_range.405 if JSON pointer has no parent
+
+    @since version 3.6.0
+    */
+    void pop_back()
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        reference_tokens.pop_back();
+    }
+
+    /*!
+    @brief return last reference token
+
+    @pre not `empty()`
+    @return last reference token
+
+    @liveexample{The example shows the usage of `back`.,json_pointer__back}
+
+    @complexity Constant.
+
+    @throw out_of_range.405 if JSON pointer has no parent
+
+    @since version 3.6.0
+    */
+    const std::string& back() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        return reference_tokens.back();
+    }
+
+    /*!
+    @brief append an unescaped token at the end of the reference pointer
+
+    @param[in] token  token to add
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows the result of `push_back` for different
+    JSON Pointers.,json_pointer__push_back}
+
+    @since version 3.6.0
+    */
+    void push_back(const std::string& token)
+    {
+        reference_tokens.push_back(token);
+    }
+
+    /// @copydoc push_back(const std::string&)
+    void push_back(std::string&& token)
+    {
+        reference_tokens.push_back(std::move(token));
+    }
+
+    /*!
+    @brief return whether pointer points to the root document
+
+    @return true iff the JSON pointer points to the root document
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example shows the result of `empty` for different JSON
+    Pointers.,json_pointer__empty}
+
+    @since version 3.6.0
+    */
+    bool empty() const noexcept
+    {
+        return reference_tokens.empty();
+    }
+
+  private:
+    /*!
+    @param[in] s  reference token to be converted into an array index
+
+    @return integer representation of @a s
+
+    @throw parse_error.106  if an array index begins with '0'
+    @throw parse_error.109  if an array index begins not with a digit
+    @throw out_of_range.404 if string @a s could not be converted to an integer
+    @throw out_of_range.410 if an array index exceeds size_type
+    */
+    static typename BasicJsonType::size_type array_index(const std::string& s)
+    {
+        using size_type = typename BasicJsonType::size_type;
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && s[0] == '0'))
+        {
+            JSON_THROW(detail::parse_error::create(106, 0,
+                                                   "array index '" + s +
+                                                   "' must not begin with '0'"));
+        }
+
+        // error condition (cf. RFC 6901, Sect. 4)
+        if (JSON_HEDLEY_UNLIKELY(s.size() > 1 && !(s[0] >= '1' && s[0] <= '9')))
+        {
+            JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number"));
+        }
+
+        std::size_t processed_chars = 0;
+        unsigned long long res = 0;
+        JSON_TRY
+        {
+            res = std::stoull(s, &processed_chars);
+        }
+        JSON_CATCH(std::out_of_range&)
+        {
+            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'"));
+        }
+
+        // check if the string was completely read
+        if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
+        {
+            JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + s + "'"));
+        }
+
+        // only triggered on special platforms (like 32bit), see also
+        // https://github.com/nlohmann/json/pull/2203
+        if (res >= static_cast<unsigned long long>((std::numeric_limits<size_type>::max)()))
+        {
+            JSON_THROW(detail::out_of_range::create(410, "array index " + s + " exceeds size_type")); // LCOV_EXCL_LINE
+        }
+
+        return static_cast<size_type>(res);
+    }
+
+    json_pointer top() const
+    {
+        if (JSON_HEDLEY_UNLIKELY(empty()))
+        {
+            JSON_THROW(detail::out_of_range::create(405, "JSON pointer has no parent"));
+        }
+
+        json_pointer result = *this;
+        result.reference_tokens = {reference_tokens[0]};
+        return result;
+    }
+
+    /*!
+    @brief create and return a reference to the pointed to value
+
+    @complexity Linear in the number of reference tokens.
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.313 if value cannot be unflattened
+    */
+    BasicJsonType& get_and_create(BasicJsonType& j) const
+    {
+        auto result = &j;
+
+        // in case no reference tokens exist, return a reference to the JSON value
+        // j which will be overwritten by a primitive value
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (result->type())
+            {
+                case detail::value_t::null:
+                {
+                    if (reference_token == "0")
+                    {
+                        // start a new array if reference token is 0
+                        result = &result->operator[](0);
+                    }
+                    else
+                    {
+                        // start a new object otherwise
+                        result = &result->operator[](reference_token);
+                    }
+                    break;
+                }
+
+                case detail::value_t::object:
+                {
+                    // create an entry in the object
+                    result = &result->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    // create an entry in the array
+                    result = &result->operator[](array_index(reference_token));
+                    break;
+                }
+
+                /*
+                The following code is only reached if there exists a reference
+                token _and_ the current value is primitive. In this case, we have
+                an error situation, because primitive values may only occur as
+                single value; that is, with an empty list of reference tokens.
+                */
+                default:
+                    JSON_THROW(detail::type_error::create(313, "invalid value to unflatten"));
+            }
+        }
+
+        return *result;
+    }
+
+    /*!
+    @brief return a reference to the pointed to value
+
+    @note This version does not throw if a value is not present, but tries to
+          create nested values instead. For instance, calling this function
+          with pointer `"/this/that"` on a null value is equivalent to calling
+          `operator[]("this").operator[]("that")` on that value, effectively
+          changing the null value to an object.
+
+    @param[in] ptr  a JSON value
+
+    @return reference to the JSON value pointed to by the JSON pointer
+
+    @complexity Linear in the length of the JSON pointer.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    BasicJsonType& get_unchecked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            // convert null values to arrays or objects before continuing
+            if (ptr->is_null())
+            {
+                // check if reference token is a number
+                const bool nums =
+                    std::all_of(reference_token.begin(), reference_token.end(),
+                                [](const unsigned char x)
+                {
+                    return std::isdigit(x);
+                });
+
+                // change value to array for numbers or "-" or to object otherwise
+                *ptr = (nums || reference_token == "-")
+                       ? detail::value_t::array
+                       : detail::value_t::object;
+            }
+
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (reference_token == "-")
+                    {
+                        // explicitly treat "-" as index beyond the end
+                        ptr = &ptr->operator[](ptr->m_value.array->size());
+                    }
+                    else
+                    {
+                        // convert array index to number; unchecked access
+                        ptr = &ptr->operator[](array_index(reference_token));
+                    }
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    BasicJsonType& get_checked(BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index(reference_token));
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @brief return a const reference to the pointed to value
+
+    @param[in] ptr  a JSON value
+
+    @return const reference to the JSON value pointed to by the JSON
+    pointer
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    const BasicJsonType& get_unchecked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // use unchecked object access
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" cannot be used for const access
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // use unchecked array access
+                    ptr = &ptr->operator[](array_index(reference_token));
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+    */
+    const BasicJsonType& get_checked(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    // note: at performs range check
+                    ptr = &ptr->at(reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        JSON_THROW(detail::out_of_range::create(402,
+                                                                "array index '-' (" + std::to_string(ptr->m_value.array->size()) +
+                                                                ") is out of range"));
+                    }
+
+                    // note: at performs range check
+                    ptr = &ptr->at(array_index(reference_token));
+                    break;
+                }
+
+                default:
+                    JSON_THROW(detail::out_of_range::create(404, "unresolved reference token '" + reference_token + "'"));
+            }
+        }
+
+        return *ptr;
+    }
+
+    /*!
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    */
+    bool contains(const BasicJsonType* ptr) const
+    {
+        for (const auto& reference_token : reference_tokens)
+        {
+            switch (ptr->type())
+            {
+                case detail::value_t::object:
+                {
+                    if (!ptr->contains(reference_token))
+                    {
+                        // we did not find the key in the object
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](reference_token);
+                    break;
+                }
+
+                case detail::value_t::array:
+                {
+                    if (JSON_HEDLEY_UNLIKELY(reference_token == "-"))
+                    {
+                        // "-" always fails the range check
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() == 1 && !("0" <= reference_token && reference_token <= "9")))
+                    {
+                        // invalid char
+                        return false;
+                    }
+                    if (JSON_HEDLEY_UNLIKELY(reference_token.size() > 1))
+                    {
+                        if (JSON_HEDLEY_UNLIKELY(!('1' <= reference_token[0] && reference_token[0] <= '9')))
+                        {
+                            // first char should be between '1' and '9'
+                            return false;
+                        }
+                        for (std::size_t i = 1; i < reference_token.size(); i++)
+                        {
+                            if (JSON_HEDLEY_UNLIKELY(!('0' <= reference_token[i] && reference_token[i] <= '9')))
+                            {
+                                // other char should be between '0' and '9'
+                                return false;
+                            }
+                        }
+                    }
+
+                    const auto idx = array_index(reference_token);
+                    if (idx >= ptr->size())
+                    {
+                        // index out of range
+                        return false;
+                    }
+
+                    ptr = &ptr->operator[](idx);
+                    break;
+                }
+
+                default:
+                {
+                    // we do not expect primitive values if there is still a
+                    // reference token to process
+                    return false;
+                }
+            }
+        }
+
+        // no reference token left means we found a primitive value
+        return true;
+    }
+
+    /*!
+    @brief split the string input to reference tokens
+
+    @note This function is only called by the json_pointer constructor.
+          All exceptions below are documented there.
+
+    @throw parse_error.107  if the pointer is not empty or begins with '/'
+    @throw parse_error.108  if character '~' is not followed by '0' or '1'
+    */
+    static std::vector<std::string> split(const std::string& reference_string)
+    {
+        std::vector<std::string> result;
+
+        // special case: empty reference string -> no reference tokens
+        if (reference_string.empty())
+        {
+            return result;
+        }
+
+        // check if nonempty reference string begins with slash
+        if (JSON_HEDLEY_UNLIKELY(reference_string[0] != '/'))
+        {
+            JSON_THROW(detail::parse_error::create(107, 1,
+                                                   "JSON pointer must be empty or begin with '/' - was: '" +
+                                                   reference_string + "'"));
+        }
+
+        // extract the reference tokens:
+        // - slash: position of the last read slash (or end of string)
+        // - start: position after the previous slash
+        for (
+            // search for the first slash after the first character
+            std::size_t slash = reference_string.find_first_of('/', 1),
+            // set the beginning of the first reference token
+            start = 1;
+            // we can stop if start == 0 (if slash == std::string::npos)
+            start != 0;
+            // set the beginning of the next reference token
+            // (will eventually be 0 if slash == std::string::npos)
+            start = (slash == std::string::npos) ? 0 : slash + 1,
+            // find next slash
+            slash = reference_string.find_first_of('/', start))
+        {
+            // use the text between the beginning of the reference token
+            // (start) and the last slash (slash).
+            auto reference_token = reference_string.substr(start, slash - start);
+
+            // check reference tokens are properly escaped
+            for (std::size_t pos = reference_token.find_first_of('~');
+                    pos != std::string::npos;
+                    pos = reference_token.find_first_of('~', pos + 1))
+            {
+                JSON_ASSERT(reference_token[pos] == '~');
+
+                // ~ must be followed by 0 or 1
+                if (JSON_HEDLEY_UNLIKELY(pos == reference_token.size() - 1 ||
+                                         (reference_token[pos + 1] != '0' &&
+                                          reference_token[pos + 1] != '1')))
+                {
+                    JSON_THROW(detail::parse_error::create(108, 0, "escape character '~' must be followed with '0' or '1'"));
+                }
+            }
+
+            // finally, store the reference token
+            unescape(reference_token);
+            result.push_back(reference_token);
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief replace all occurrences of a substring by another string
+
+    @param[in,out] s  the string to manipulate; changed so that all
+                   occurrences of @a f are replaced with @a t
+    @param[in]     f  the substring to replace with @a t
+    @param[in]     t  the string to replace @a f
+
+    @pre The search string @a f must not be empty. **This precondition is
+    enforced with an assertion.**
+
+    @since version 2.0.0
+    */
+    static void replace_substring(std::string& s, const std::string& f,
+                                  const std::string& t)
+    {
+        JSON_ASSERT(!f.empty());
+        for (auto pos = s.find(f);                // find first occurrence of f
+                pos != std::string::npos;         // make sure f was found
+                s.replace(pos, f.size(), t),      // replace with t, and
+                pos = s.find(f, pos + t.size()))  // find next occurrence of f
+        {}
+    }
+
+    /// escape "~" to "~0" and "/" to "~1"
+    static std::string escape(std::string s)
+    {
+        replace_substring(s, "~", "~0");
+        replace_substring(s, "/", "~1");
+        return s;
+    }
+
+    /// unescape "~1" to tilde and "~0" to slash (order is important!)
+    static void unescape(std::string& s)
+    {
+        replace_substring(s, "~1", "/");
+        replace_substring(s, "~0", "~");
+    }
+
+    /*!
+    @param[in] reference_string  the reference string to the current value
+    @param[in] value             the value to consider
+    @param[in,out] result        the result object to insert values to
+
+    @note Empty objects or arrays are flattened to `null`.
+    */
+    static void flatten(const std::string& reference_string,
+                        const BasicJsonType& value,
+                        BasicJsonType& result)
+    {
+        switch (value.type())
+        {
+            case detail::value_t::array:
+            {
+                if (value.m_value.array->empty())
+                {
+                    // flatten empty array as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate array and use index as reference string
+                    for (std::size_t i = 0; i < value.m_value.array->size(); ++i)
+                    {
+                        flatten(reference_string + "/" + std::to_string(i),
+                                value.m_value.array->operator[](i), result);
+                    }
+                }
+                break;
+            }
+
+            case detail::value_t::object:
+            {
+                if (value.m_value.object->empty())
+                {
+                    // flatten empty object as null
+                    result[reference_string] = nullptr;
+                }
+                else
+                {
+                    // iterate object and use keys as reference string
+                    for (const auto& element : *value.m_value.object)
+                    {
+                        flatten(reference_string + "/" + escape(element.first), element.second, result);
+                    }
+                }
+                break;
+            }
+
+            default:
+            {
+                // add primitive value with its reference string
+                result[reference_string] = value;
+                break;
+            }
+        }
+    }
+
+    /*!
+    @param[in] value  flattened JSON
+
+    @return unflattened JSON
+
+    @throw parse_error.109 if array index is not a number
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+    @throw type_error.313  if value cannot be unflattened
+    */
+    static BasicJsonType
+    unflatten(const BasicJsonType& value)
+    {
+        if (JSON_HEDLEY_UNLIKELY(!value.is_object()))
+        {
+            JSON_THROW(detail::type_error::create(314, "only objects can be unflattened"));
+        }
+
+        BasicJsonType result;
+
+        // iterate the JSON object values
+        for (const auto& element : *value.m_value.object)
+        {
+            if (JSON_HEDLEY_UNLIKELY(!element.second.is_primitive()))
+            {
+                JSON_THROW(detail::type_error::create(315, "values in object must be primitive"));
+            }
+
+            // assign value to reference pointed to by JSON pointer; Note that if
+            // the JSON pointer is "" (i.e., points to the whole value), function
+            // get_and_create returns a reference to result itself. An assignment
+            // will then create a primitive value.
+            json_pointer(element.first).get_and_create(result) = element.second;
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief compares two JSON pointers for equality
+
+    @param[in] lhs  JSON pointer to compare
+    @param[in] rhs  JSON pointer to compare
+    @return whether @a lhs is equal to @a rhs
+
+    @complexity Linear in the length of the JSON pointer
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+    */
+    friend bool operator==(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept
+    {
+        return lhs.reference_tokens == rhs.reference_tokens;
+    }
+
+    /*!
+    @brief compares two JSON pointers for inequality
+
+    @param[in] lhs  JSON pointer to compare
+    @param[in] rhs  JSON pointer to compare
+    @return whether @a lhs is not equal @a rhs
+
+    @complexity Linear in the length of the JSON pointer
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+    */
+    friend bool operator!=(json_pointer const& lhs,
+                           json_pointer const& rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+    /// the reference tokens
+    std::vector<std::string> reference_tokens;
+};
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/json_ref.hpp>
+
+
+#include <initializer_list>
+#include <utility>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+template<typename BasicJsonType>
+class json_ref
+{
+  public:
+    using value_type = BasicJsonType;
+
+    json_ref(value_type&& value)
+        : owned_value(std::move(value))
+        , value_ref(&owned_value)
+        , is_rvalue(true)
+    {}
+
+    json_ref(const value_type& value)
+        : value_ref(const_cast<value_type*>(&value))
+        , is_rvalue(false)
+    {}
+
+    json_ref(std::initializer_list<json_ref> init)
+        : owned_value(init)
+        , value_ref(&owned_value)
+        , is_rvalue(true)
+    {}
+
+    template <
+        class... Args,
+        enable_if_t<std::is_constructible<value_type, Args...>::value, int> = 0 >
+    json_ref(Args && ... args)
+        : owned_value(std::forward<Args>(args)...)
+        , value_ref(&owned_value)
+        , is_rvalue(true)
+    {}
+
+    // class should be movable only
+    json_ref(json_ref&&) = default;
+    json_ref(const json_ref&) = delete;
+    json_ref& operator=(const json_ref&) = delete;
+    json_ref& operator=(json_ref&&) = delete;
+    ~json_ref() = default;
+
+    value_type moved_or_copied() const
+    {
+        if (is_rvalue)
+        {
+            return std::move(*value_ref);
+        }
+        return *value_ref;
+    }
+
+    value_type const& operator*() const
+    {
+        return *static_cast<value_type const*>(value_ref);
+    }
+
+    value_type const* operator->() const
+    {
+        return static_cast<value_type const*>(value_ref);
+    }
+
+  private:
+    mutable value_type owned_value = nullptr;
+    value_type* value_ref = nullptr;
+    const bool is_rvalue = true;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/meta/type_traits.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+
+#include <algorithm> // reverse
+#include <array> // array
+#include <cstdint> // uint8_t, uint16_t, uint32_t, uint64_t
+#include <cstring> // memcpy
+#include <limits> // numeric_limits
+#include <string> // string
+#include <cmath> // isnan, isinf
+
+// #include <nlohmann/detail/input/binary_reader.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+
+#include <algorithm> // copy
+#include <cstddef> // size_t
+#include <ios> // streamsize
+#include <iterator> // back_inserter
+#include <memory> // shared_ptr, make_shared
+#include <ostream> // basic_ostream
+#include <string> // basic_string
+#include <vector> // vector
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+/// abstract output adapter interface
+template<typename CharType> struct output_adapter_protocol
+{
+    virtual void write_character(CharType c) = 0;
+    virtual void write_characters(const CharType* s, std::size_t length) = 0;
+    virtual ~output_adapter_protocol() = default;
+};
+
+/// a type to simplify interfaces
+template<typename CharType>
+using output_adapter_t = std::shared_ptr<output_adapter_protocol<CharType>>;
+
+/// output adapter for byte vectors
+template<typename CharType>
+class output_vector_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_vector_adapter(std::vector<CharType>& vec) noexcept
+        : v(vec)
+    {}
+
+    void write_character(CharType c) override
+    {
+        v.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        std::copy(s, s + length, std::back_inserter(v));
+    }
+
+  private:
+    std::vector<CharType>& v;
+};
+
+/// output adapter for output streams
+template<typename CharType>
+class output_stream_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_stream_adapter(std::basic_ostream<CharType>& s) noexcept
+        : stream(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        stream.put(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        stream.write(s, static_cast<std::streamsize>(length));
+    }
+
+  private:
+    std::basic_ostream<CharType>& stream;
+};
+
+/// output adapter for basic_string
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_string_adapter : public output_adapter_protocol<CharType>
+{
+  public:
+    explicit output_string_adapter(StringType& s) noexcept
+        : str(s)
+    {}
+
+    void write_character(CharType c) override
+    {
+        str.push_back(c);
+    }
+
+    JSON_HEDLEY_NON_NULL(2)
+    void write_characters(const CharType* s, std::size_t length) override
+    {
+        str.append(s, length);
+    }
+
+  private:
+    StringType& str;
+};
+
+template<typename CharType, typename StringType = std::basic_string<CharType>>
+class output_adapter
+{
+  public:
+    output_adapter(std::vector<CharType>& vec)
+        : oa(std::make_shared<output_vector_adapter<CharType>>(vec)) {}
+
+    output_adapter(std::basic_ostream<CharType>& s)
+        : oa(std::make_shared<output_stream_adapter<CharType>>(s)) {}
+
+    output_adapter(StringType& s)
+        : oa(std::make_shared<output_string_adapter<CharType, StringType>>(s)) {}
+
+    operator output_adapter_t<CharType>()
+    {
+        return oa;
+    }
+
+  private:
+    output_adapter_t<CharType> oa = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// binary writer //
+///////////////////
+
+/*!
+@brief serialization to CBOR and MessagePack values
+*/
+template<typename BasicJsonType, typename CharType>
+class binary_writer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using binary_t = typename BasicJsonType::binary_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+
+  public:
+    /*!
+    @brief create a binary writer
+
+    @param[in] adapter  output adapter to write to
+    */
+    explicit binary_writer(output_adapter_t<CharType> adapter) : oa(adapter)
+    {
+        JSON_ASSERT(oa);
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+            {
+                write_bson_object(*j.m_value.object);
+                break;
+            }
+
+            default:
+            {
+                JSON_THROW(type_error::create(317, "to serialize to BSON, top-level type must be object, but is " + std::string(j.type_name())));
+            }
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_cbor(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                oa->write_character(to_char_type(0xF6));
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xF5)
+                                    : to_char_type(0xF4));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // CBOR does not differentiate between positive signed
+                    // integers and unsigned integers. Therefore, we used the
+                    // code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_integer <= 0x17)
+                    {
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x18));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x19));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x1A));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x1B));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    // The conversions below encode the sign in the first
+                    // byte, and the value is converted to a positive number.
+                    const auto positive_number = -1 - j.m_value.number_integer;
+                    if (j.m_value.number_integer >= -24)
+                    {
+                        write_number(static_cast<std::uint8_t>(0x20 + positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x38));
+                        write_number(static_cast<std::uint8_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x39));
+                        write_number(static_cast<std::uint16_t>(positive_number));
+                    }
+                    else if (positive_number <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        oa->write_character(to_char_type(0x3A));
+                        write_number(static_cast<std::uint32_t>(positive_number));
+                    }
+                    else
+                    {
+                        oa->write_character(to_char_type(0x3B));
+                        write_number(static_cast<std::uint64_t>(positive_number));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x18));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x19));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_unsigned));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x1A));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_unsigned));
+                }
+                else
+                {
+                    oa->write_character(to_char_type(0x1B));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_unsigned));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                if (std::isnan(j.m_value.number_float))
+                {
+                    // NaN is 0xf97e00 in CBOR
+                    oa->write_character(to_char_type(0xF9));
+                    oa->write_character(to_char_type(0x7E));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else if (std::isinf(j.m_value.number_float))
+                {
+                    // Infinity is 0xf97c00, -Infinity is 0xf9fc00
+                    oa->write_character(to_char_type(0xf9));
+                    oa->write_character(j.m_value.number_float > 0 ? to_char_type(0x7C) : to_char_type(0xFC));
+                    oa->write_character(to_char_type(0x00));
+                }
+                else
+                {
+                    write_compact_float(j.m_value.number_float, detail::input_format_t::cbor);
+                }
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x60 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x78));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x79));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x7B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x80 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x98));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x99));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x9B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_cbor(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (j.m_value.binary->has_subtype())
+                {
+                    write_number(static_cast<std::uint8_t>(0xd8));
+                    write_number(j.m_value.binary->subtype());
+                }
+
+                // step 1: write control byte and the binary array size
+                const auto N = j.m_value.binary->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0x40 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x58));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x59));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5A));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0x5B));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 0x17)
+                {
+                    write_number(static_cast<std::uint8_t>(0xA0 + N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB8));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xB9));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBA));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+                // LCOV_EXCL_START
+                else if (N <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    oa->write_character(to_char_type(0xBB));
+                    write_number(static_cast<std::uint64_t>(N));
+                }
+                // LCOV_EXCL_STOP
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_cbor(el.first);
+                    write_cbor(el.second);
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    */
+    void write_msgpack(const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::null: // nil
+            {
+                oa->write_character(to_char_type(0xC0));
+                break;
+            }
+
+            case value_t::boolean: // true and false
+            {
+                oa->write_character(j.m_value.boolean
+                                    ? to_char_type(0xC3)
+                                    : to_char_type(0xC2));
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                if (j.m_value.number_integer >= 0)
+                {
+                    // MessagePack does not differentiate between positive
+                    // signed integers and unsigned integers. Therefore, we used
+                    // the code from the value_t::number_unsigned case here.
+                    if (j.m_value.number_unsigned < 128)
+                    {
+                        // positive fixnum
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                    {
+                        // uint 8
+                        oa->write_character(to_char_type(0xCC));
+                        write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                    {
+                        // uint 16
+                        oa->write_character(to_char_type(0xCD));
+                        write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                    {
+                        // uint 32
+                        oa->write_character(to_char_type(0xCE));
+                        write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                    {
+                        // uint 64
+                        oa->write_character(to_char_type(0xCF));
+                        write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                    }
+                }
+                else
+                {
+                    if (j.m_value.number_integer >= -32)
+                    {
+                        // negative fixnum
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int8_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                    {
+                        // int 8
+                        oa->write_character(to_char_type(0xD0));
+                        write_number(static_cast<std::int8_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int16_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                    {
+                        // int 16
+                        oa->write_character(to_char_type(0xD1));
+                        write_number(static_cast<std::int16_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int32_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                    {
+                        // int 32
+                        oa->write_character(to_char_type(0xD2));
+                        write_number(static_cast<std::int32_t>(j.m_value.number_integer));
+                    }
+                    else if (j.m_value.number_integer >= (std::numeric_limits<std::int64_t>::min)() &&
+                             j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                    {
+                        // int 64
+                        oa->write_character(to_char_type(0xD3));
+                        write_number(static_cast<std::int64_t>(j.m_value.number_integer));
+                    }
+                }
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned < 128)
+                {
+                    // positive fixnum
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // uint 8
+                    oa->write_character(to_char_type(0xCC));
+                    write_number(static_cast<std::uint8_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // uint 16
+                    oa->write_character(to_char_type(0xCD));
+                    write_number(static_cast<std::uint16_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // uint 32
+                    oa->write_character(to_char_type(0xCE));
+                    write_number(static_cast<std::uint32_t>(j.m_value.number_integer));
+                }
+                else if (j.m_value.number_unsigned <= (std::numeric_limits<std::uint64_t>::max)())
+                {
+                    // uint 64
+                    oa->write_character(to_char_type(0xCF));
+                    write_number(static_cast<std::uint64_t>(j.m_value.number_integer));
+                }
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_compact_float(j.m_value.number_float, detail::input_format_t::msgpack);
+                break;
+            }
+
+            case value_t::string:
+            {
+                // step 1: write control byte and the string length
+                const auto N = j.m_value.string->size();
+                if (N <= 31)
+                {
+                    // fixstr
+                    write_number(static_cast<std::uint8_t>(0xA0 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    // str 8
+                    oa->write_character(to_char_type(0xD9));
+                    write_number(static_cast<std::uint8_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // str 16
+                    oa->write_character(to_char_type(0xDA));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // str 32
+                    oa->write_character(to_char_type(0xDB));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write the string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                // step 1: write control byte and the array size
+                const auto N = j.m_value.array->size();
+                if (N <= 15)
+                {
+                    // fixarray
+                    write_number(static_cast<std::uint8_t>(0x90 | N));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // array 16
+                    oa->write_character(to_char_type(0xDC));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // array 32
+                    oa->write_character(to_char_type(0xDD));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_msgpack(el);
+                }
+                break;
+            }
+
+            case value_t::binary:
+            {
+                // step 0: determine if the binary type has a set subtype to
+                // determine whether or not to use the ext or fixext types
+                const bool use_ext = j.m_value.binary->has_subtype();
+
+                // step 1: write control byte and the byte string length
+                const auto N = j.m_value.binary->size();
+                if (N <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    std::uint8_t output_type{};
+                    bool fixed = true;
+                    if (use_ext)
+                    {
+                        switch (N)
+                        {
+                            case 1:
+                                output_type = 0xD4; // fixext 1
+                                break;
+                            case 2:
+                                output_type = 0xD5; // fixext 2
+                                break;
+                            case 4:
+                                output_type = 0xD6; // fixext 4
+                                break;
+                            case 8:
+                                output_type = 0xD7; // fixext 8
+                                break;
+                            case 16:
+                                output_type = 0xD8; // fixext 16
+                                break;
+                            default:
+                                output_type = 0xC7; // ext 8
+                                fixed = false;
+                                break;
+                        }
+
+                    }
+                    else
+                    {
+                        output_type = 0xC4; // bin 8
+                        fixed = false;
+                    }
+
+                    oa->write_character(to_char_type(output_type));
+                    if (!fixed)
+                    {
+                        write_number(static_cast<std::uint8_t>(N));
+                    }
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    std::uint8_t output_type = use_ext
+                                               ? 0xC8 // ext 16
+                                               : 0xC5; // bin 16
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    std::uint8_t output_type = use_ext
+                                               ? 0xC9 // ext 32
+                                               : 0xC6; // bin 32
+
+                    oa->write_character(to_char_type(output_type));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 1.5: if this is an ext type, write the subtype
+                if (use_ext)
+                {
+                    write_number(static_cast<std::int8_t>(j.m_value.binary->subtype()));
+                }
+
+                // step 2: write the byte string
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                    N);
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // step 1: write control byte and the object size
+                const auto N = j.m_value.object->size();
+                if (N <= 15)
+                {
+                    // fixmap
+                    write_number(static_cast<std::uint8_t>(0x80 | (N & 0xF)));
+                }
+                else if (N <= (std::numeric_limits<std::uint16_t>::max)())
+                {
+                    // map 16
+                    oa->write_character(to_char_type(0xDE));
+                    write_number(static_cast<std::uint16_t>(N));
+                }
+                else if (N <= (std::numeric_limits<std::uint32_t>::max)())
+                {
+                    // map 32
+                    oa->write_character(to_char_type(0xDF));
+                    write_number(static_cast<std::uint32_t>(N));
+                }
+
+                // step 2: write each element
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_msgpack(el.first);
+                    write_msgpack(el.second);
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @param[in] use_count   whether to use '#' prefixes (optimized format)
+    @param[in] use_type    whether to use '$' prefixes (optimized format)
+    @param[in] add_prefix  whether prefixes need to be used for this value
+    */
+    void write_ubjson(const BasicJsonType& j, const bool use_count,
+                      const bool use_type, const bool add_prefix = true)
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('Z'));
+                }
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(j.m_value.boolean
+                                        ? to_char_type('T')
+                                        : to_char_type('F'));
+                }
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_integer, add_prefix);
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_unsigned, add_prefix);
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                write_number_with_ubjson_prefix(j.m_value.number_float, add_prefix);
+                break;
+            }
+
+            case value_t::string:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('S'));
+                }
+                write_number_with_ubjson_prefix(j.m_value.string->size(), true);
+                oa->write_characters(
+                    reinterpret_cast<const CharType*>(j.m_value.string->c_str()),
+                    j.m_value.string->size());
+                break;
+            }
+
+            case value_t::array:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_value.array->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const bool same_prefix = std::all_of(j.begin() + 1, j.end(),
+                                                         [this, first_prefix](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v) == first_prefix;
+                    });
+
+                    if (same_prefix)
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.array->size(), true);
+                }
+
+                for (const auto& el : *j.m_value.array)
+                {
+                    write_ubjson(el, use_count, use_type, prefix_required);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::binary:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('['));
+                }
+
+                if (use_type && !j.m_value.binary->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    oa->write_character(to_char_type('$'));
+                    oa->write_character('U');
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.binary->size(), true);
+                }
+
+                if (use_type)
+                {
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(j.m_value.binary->data()),
+                        j.m_value.binary->size());
+                }
+                else
+                {
+                    for (size_t i = 0; i < j.m_value.binary->size(); ++i)
+                    {
+                        oa->write_character(to_char_type('U'));
+                        oa->write_character(j.m_value.binary->data()[i]);
+                    }
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type(']'));
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                if (add_prefix)
+                {
+                    oa->write_character(to_char_type('{'));
+                }
+
+                bool prefix_required = true;
+                if (use_type && !j.m_value.object->empty())
+                {
+                    JSON_ASSERT(use_count);
+                    const CharType first_prefix = ubjson_prefix(j.front());
+                    const bool same_prefix = std::all_of(j.begin(), j.end(),
+                                                         [this, first_prefix](const BasicJsonType & v)
+                    {
+                        return ubjson_prefix(v) == first_prefix;
+                    });
+
+                    if (same_prefix)
+                    {
+                        prefix_required = false;
+                        oa->write_character(to_char_type('$'));
+                        oa->write_character(first_prefix);
+                    }
+                }
+
+                if (use_count)
+                {
+                    oa->write_character(to_char_type('#'));
+                    write_number_with_ubjson_prefix(j.m_value.object->size(), true);
+                }
+
+                for (const auto& el : *j.m_value.object)
+                {
+                    write_number_with_ubjson_prefix(el.first.size(), true);
+                    oa->write_characters(
+                        reinterpret_cast<const CharType*>(el.first.c_str()),
+                        el.first.size());
+                    write_ubjson(el.second, use_count, use_type, prefix_required);
+                }
+
+                if (!use_count)
+                {
+                    oa->write_character(to_char_type('}'));
+                }
+
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+  private:
+    //////////
+    // BSON //
+    //////////
+
+    /*!
+    @return The size of a BSON document entry header, including the id marker
+            and the entry name size (and its null-terminator).
+    */
+    static std::size_t calc_bson_entry_header_size(const string_t& name)
+    {
+        const auto it = name.find(static_cast<typename string_t::value_type>(0));
+        if (JSON_HEDLEY_UNLIKELY(it != BasicJsonType::string_t::npos))
+        {
+            JSON_THROW(out_of_range::create(409,
+                                            "BSON key cannot contain code point U+0000 (at byte " + std::to_string(it) + ")"));
+        }
+
+        return /*id*/ 1ul + name.size() + /*zero-terminator*/1u;
+    }
+
+    /*!
+    @brief Writes the given @a element_type and @a name to the output adapter
+    */
+    void write_bson_entry_header(const string_t& name,
+                                 const std::uint8_t element_type)
+    {
+        oa->write_character(to_char_type(element_type)); // boolean
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(name.c_str()),
+            name.size() + 1u);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and boolean value @a value
+    */
+    void write_bson_boolean(const string_t& name,
+                            const bool value)
+    {
+        write_bson_entry_header(name, 0x08);
+        oa->write_character(value ? to_char_type(0x01) : to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and double value @a value
+    */
+    void write_bson_double(const string_t& name,
+                           const double value)
+    {
+        write_bson_entry_header(name, 0x01);
+        write_number<double, true>(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded string in @a value
+    */
+    static std::size_t calc_bson_string_size(const string_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and string value @a value
+    */
+    void write_bson_string(const string_t& name,
+                           const string_t& value)
+    {
+        write_bson_entry_header(name, 0x02);
+
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size() + 1ul));
+        oa->write_characters(
+            reinterpret_cast<const CharType*>(value.c_str()),
+            value.size() + 1);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and null value
+    */
+    void write_bson_null(const string_t& name)
+    {
+        write_bson_entry_header(name, 0x0A);
+    }
+
+    /*!
+    @return The size of the BSON-encoded integer @a value
+    */
+    static std::size_t calc_bson_integer_size(const std::int64_t value)
+    {
+        return (std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)()
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and integer @a value
+    */
+    void write_bson_integer(const string_t& name,
+                            const std::int64_t value)
+    {
+        if ((std::numeric_limits<std::int32_t>::min)() <= value && value <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            write_bson_entry_header(name, 0x10); // int32
+            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+        }
+        else
+        {
+            write_bson_entry_header(name, 0x12); // int64
+            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+        }
+    }
+
+    /*!
+    @return The size of the BSON-encoded unsigned integer in @a j
+    */
+    static constexpr std::size_t calc_bson_unsigned_size(const std::uint64_t value) noexcept
+    {
+        return (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+               ? sizeof(std::int32_t)
+               : sizeof(std::int64_t);
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and unsigned @a value
+    */
+    void write_bson_unsigned(const string_t& name,
+                             const std::uint64_t value)
+    {
+        if (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x10 /* int32 */);
+            write_number<std::int32_t, true>(static_cast<std::int32_t>(value));
+        }
+        else if (value <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            write_bson_entry_header(name, 0x12 /* int64 */);
+            write_number<std::int64_t, true>(static_cast<std::int64_t>(value));
+        }
+        else
+        {
+            JSON_THROW(out_of_range::create(407, "integer number " + std::to_string(value) + " cannot be represented by BSON as it does not fit int64"));
+        }
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and object @a value
+    */
+    void write_bson_object_entry(const string_t& name,
+                                 const typename BasicJsonType::object_t& value)
+    {
+        write_bson_entry_header(name, 0x03); // object
+        write_bson_object(value);
+    }
+
+    /*!
+    @return The size of the BSON-encoded array @a value
+    */
+    static std::size_t calc_bson_array_size(const typename BasicJsonType::array_t& value)
+    {
+        std::size_t array_index = 0ul;
+
+        const std::size_t embedded_document_size = std::accumulate(std::begin(value), std::end(value), std::size_t(0), [&array_index](std::size_t result, const typename BasicJsonType::array_t::value_type & el)
+        {
+            return result + calc_bson_element_size(std::to_string(array_index++), el);
+        });
+
+        return sizeof(std::int32_t) + embedded_document_size + 1ul;
+    }
+
+    /*!
+    @return The size of the BSON-encoded binary array @a value
+    */
+    static std::size_t calc_bson_binary_size(const typename BasicJsonType::binary_t& value)
+    {
+        return sizeof(std::int32_t) + value.size() + 1ul;
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and array @a value
+    */
+    void write_bson_array(const string_t& name,
+                          const typename BasicJsonType::array_t& value)
+    {
+        write_bson_entry_header(name, 0x04); // array
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_array_size(value)));
+
+        std::size_t array_index = 0ul;
+
+        for (const auto& el : value)
+        {
+            write_bson_element(std::to_string(array_index++), el);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    /*!
+    @brief Writes a BSON element with key @a name and binary value @a value
+    */
+    void write_bson_binary(const string_t& name,
+                           const binary_t& value)
+    {
+        write_bson_entry_header(name, 0x05);
+
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(value.size()));
+        write_number(value.has_subtype() ? value.subtype() : std::uint8_t(0x00));
+
+        oa->write_characters(reinterpret_cast<const CharType*>(value.data()), value.size());
+    }
+
+    /*!
+    @brief Calculates the size necessary to serialize the JSON value @a j with its @a name
+    @return The calculated size for the BSON document entry for @a j with the given @a name.
+    */
+    static std::size_t calc_bson_element_size(const string_t& name,
+            const BasicJsonType& j)
+    {
+        const auto header_size = calc_bson_entry_header_size(name);
+        switch (j.type())
+        {
+            case value_t::object:
+                return header_size + calc_bson_object_size(*j.m_value.object);
+
+            case value_t::array:
+                return header_size + calc_bson_array_size(*j.m_value.array);
+
+            case value_t::binary:
+                return header_size + calc_bson_binary_size(*j.m_value.binary);
+
+            case value_t::boolean:
+                return header_size + 1ul;
+
+            case value_t::number_float:
+                return header_size + 8ul;
+
+            case value_t::number_integer:
+                return header_size + calc_bson_integer_size(j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return header_size + calc_bson_unsigned_size(j.m_value.number_unsigned);
+
+            case value_t::string:
+                return header_size + calc_bson_string_size(*j.m_value.string);
+
+            case value_t::null:
+                return header_size + 0ul;
+
+            // LCOV_EXCL_START
+            default:
+                JSON_ASSERT(false);
+                return 0ul;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Serializes the JSON value @a j to BSON and associates it with the
+           key @a name.
+    @param name The name to associate with the JSON entity @a j within the
+                current BSON document
+    @return The size of the BSON entry
+    */
+    void write_bson_element(const string_t& name,
+                            const BasicJsonType& j)
+    {
+        switch (j.type())
+        {
+            case value_t::object:
+                return write_bson_object_entry(name, *j.m_value.object);
+
+            case value_t::array:
+                return write_bson_array(name, *j.m_value.array);
+
+            case value_t::binary:
+                return write_bson_binary(name, *j.m_value.binary);
+
+            case value_t::boolean:
+                return write_bson_boolean(name, j.m_value.boolean);
+
+            case value_t::number_float:
+                return write_bson_double(name, j.m_value.number_float);
+
+            case value_t::number_integer:
+                return write_bson_integer(name, j.m_value.number_integer);
+
+            case value_t::number_unsigned:
+                return write_bson_unsigned(name, j.m_value.number_unsigned);
+
+            case value_t::string:
+                return write_bson_string(name, *j.m_value.string);
+
+            case value_t::null:
+                return write_bson_null(name);
+
+            // LCOV_EXCL_START
+            default:
+                JSON_ASSERT(false);
+                return;
+                // LCOV_EXCL_STOP
+        }
+    }
+
+    /*!
+    @brief Calculates the size of the BSON serialization of the given
+           JSON-object @a j.
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    static std::size_t calc_bson_object_size(const typename BasicJsonType::object_t& value)
+    {
+        std::size_t document_size = std::accumulate(value.begin(), value.end(), std::size_t(0),
+                                    [](size_t result, const typename BasicJsonType::object_t::value_type & el)
+        {
+            return result += calc_bson_element_size(el.first, el.second);
+        });
+
+        return sizeof(std::int32_t) + document_size + 1ul;
+    }
+
+    /*!
+    @param[in] j  JSON value to serialize
+    @pre       j.type() == value_t::object
+    */
+    void write_bson_object(const typename BasicJsonType::object_t& value)
+    {
+        write_number<std::int32_t, true>(static_cast<std::int32_t>(calc_bson_object_size(value)));
+
+        for (const auto& el : value)
+        {
+            write_bson_element(el.first, el.second);
+        }
+
+        oa->write_character(to_char_type(0x00));
+    }
+
+    //////////
+    // CBOR //
+    //////////
+
+    static constexpr CharType get_cbor_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xFA);  // Single-Precision Float
+    }
+
+    static constexpr CharType get_cbor_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xFB);  // Double-Precision Float
+    }
+
+    /////////////
+    // MsgPack //
+    /////////////
+
+    static constexpr CharType get_msgpack_float_prefix(float /*unused*/)
+    {
+        return to_char_type(0xCA);  // float 32
+    }
+
+    static constexpr CharType get_msgpack_float_prefix(double /*unused*/)
+    {
+        return to_char_type(0xCB);  // float 64
+    }
+
+    ////////////
+    // UBJSON //
+    ////////////
+
+    // UBJSON: write number (floating point)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_floating_point<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if (add_prefix)
+        {
+            oa->write_character(get_ubjson_float_prefix(n));
+        }
+        write_number(n);
+    }
+
+    // UBJSON: write number (unsigned integer)
+    template<typename NumberType, typename std::enable_if<
+                 std::is_unsigned<NumberType>::value, int>::type = 0>
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if (n <= (std::numeric_limits<std::uint8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n));
+        }
+        else if (n <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n));
+        }
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+    }
+
+    // UBJSON: write number (signed integer)
+    template < typename NumberType, typename std::enable_if <
+                   std::is_signed<NumberType>::value&&
+                   !std::is_floating_point<NumberType>::value, int >::type = 0 >
+    void write_number_with_ubjson_prefix(const NumberType n,
+                                         const bool add_prefix)
+    {
+        if ((std::numeric_limits<std::int8_t>::min)() <= n && n <= (std::numeric_limits<std::int8_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('i'));  // int8
+            }
+            write_number(static_cast<std::int8_t>(n));
+        }
+        else if (static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::min)()) <= n && n <= static_cast<std::int64_t>((std::numeric_limits<std::uint8_t>::max)()))
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('U'));  // uint8
+            }
+            write_number(static_cast<std::uint8_t>(n));
+        }
+        else if ((std::numeric_limits<std::int16_t>::min)() <= n && n <= (std::numeric_limits<std::int16_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('I'));  // int16
+            }
+            write_number(static_cast<std::int16_t>(n));
+        }
+        else if ((std::numeric_limits<std::int32_t>::min)() <= n && n <= (std::numeric_limits<std::int32_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('l'));  // int32
+            }
+            write_number(static_cast<std::int32_t>(n));
+        }
+        else if ((std::numeric_limits<std::int64_t>::min)() <= n && n <= (std::numeric_limits<std::int64_t>::max)())
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('L'));  // int64
+            }
+            write_number(static_cast<std::int64_t>(n));
+        }
+        // LCOV_EXCL_START
+        else
+        {
+            if (add_prefix)
+            {
+                oa->write_character(to_char_type('H'));  // high-precision number
+            }
+
+            const auto number = BasicJsonType(n).dump();
+            write_number_with_ubjson_prefix(number.size(), true);
+            for (std::size_t i = 0; i < number.size(); ++i)
+            {
+                oa->write_character(to_char_type(static_cast<std::uint8_t>(number[i])));
+            }
+        }
+        // LCOV_EXCL_STOP
+    }
+
+    /*!
+    @brief determine the type prefix of container values
+    */
+    CharType ubjson_prefix(const BasicJsonType& j) const noexcept
+    {
+        switch (j.type())
+        {
+            case value_t::null:
+                return 'Z';
+
+            case value_t::boolean:
+                return j.m_value.boolean ? 'T' : 'F';
+
+            case value_t::number_integer:
+            {
+                if ((std::numeric_limits<std::int8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int8_t>::max)())
+                {
+                    return 'i';
+                }
+                if ((std::numeric_limits<std::uint8_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::uint8_t>::max)())
+                {
+                    return 'U';
+                }
+                if ((std::numeric_limits<std::int16_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int16_t>::max)())
+                {
+                    return 'I';
+                }
+                if ((std::numeric_limits<std::int32_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int32_t>::max)())
+                {
+                    return 'l';
+                }
+                if ((std::numeric_limits<std::int64_t>::min)() <= j.m_value.number_integer && j.m_value.number_integer <= (std::numeric_limits<std::int64_t>::max)())
+                {
+                    return 'L';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_unsigned:
+            {
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int8_t>::max)()))
+                {
+                    return 'i';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::uint8_t>::max)()))
+                {
+                    return 'U';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int16_t>::max)()))
+                {
+                    return 'I';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int32_t>::max)()))
+                {
+                    return 'l';
+                }
+                if (j.m_value.number_unsigned <= static_cast<std::uint64_t>((std::numeric_limits<std::int64_t>::max)()))
+                {
+                    return 'L';
+                }
+                // anything else is treated as high-precision number
+                return 'H'; // LCOV_EXCL_LINE
+            }
+
+            case value_t::number_float:
+                return get_ubjson_float_prefix(j.m_value.number_float);
+
+            case value_t::string:
+                return 'S';
+
+            case value_t::array: // fallthrough
+            case value_t::binary:
+                return '[';
+
+            case value_t::object:
+                return '{';
+
+            default:  // discarded values
+                return 'N';
+        }
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(float /*unused*/)
+    {
+        return 'd';  // float 32
+    }
+
+    static constexpr CharType get_ubjson_float_prefix(double /*unused*/)
+    {
+        return 'D';  // float 64
+    }
+
+    ///////////////////////
+    // Utility functions //
+    ///////////////////////
+
+    /*
+    @brief write a number to output input
+    @param[in] n number of type @a NumberType
+    @tparam NumberType the type of the number
+    @tparam OutputIsLittleEndian Set to true if output data is
+                                 required to be little endian
+
+    @note This function needs to respect the system's endianess, because bytes
+          in CBOR, MessagePack, and UBJSON are stored in network order (big
+          endian) and therefore need reordering on little endian systems.
+    */
+    template<typename NumberType, bool OutputIsLittleEndian = false>
+    void write_number(const NumberType n)
+    {
+        // step 1: write number to array of length NumberType
+        std::array<CharType, sizeof(NumberType)> vec;
+        std::memcpy(vec.data(), &n, sizeof(NumberType));
+
+        // step 2: write array to output (with possible reordering)
+        if (is_little_endian != OutputIsLittleEndian)
+        {
+            // reverse byte order prior to conversion if necessary
+            std::reverse(vec.begin(), vec.end());
+        }
+
+        oa->write_characters(vec.data(), sizeof(NumberType));
+    }
+
+    void write_compact_float(const number_float_t n, detail::input_format_t format)
+    {
+        if (static_cast<double>(n) >= static_cast<double>(std::numeric_limits<float>::lowest()) &&
+                static_cast<double>(n) <= static_cast<double>((std::numeric_limits<float>::max)()) &&
+                static_cast<double>(static_cast<float>(n)) == static_cast<double>(n))
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(static_cast<float>(n))
+                                : get_msgpack_float_prefix(static_cast<float>(n)));
+            write_number(static_cast<float>(n));
+        }
+        else
+        {
+            oa->write_character(format == detail::input_format_t::cbor
+                                ? get_cbor_float_prefix(n)
+                                : get_msgpack_float_prefix(n));
+            write_number(n);
+        }
+    }
+
+  public:
+    // The following to_char_type functions are implement the conversion
+    // between uint8_t and CharType. In case CharType is not unsigned,
+    // such a conversion is required to allow values greater than 128.
+    // See <https://github.com/nlohmann/json/issues/1286> for a discussion.
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_signed<char>::value > * = nullptr >
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return *reinterpret_cast<char*>(&x);
+    }
+
+    template < typename C = CharType,
+               enable_if_t < std::is_signed<C>::value && std::is_unsigned<char>::value > * = nullptr >
+    static CharType to_char_type(std::uint8_t x) noexcept
+    {
+        static_assert(sizeof(std::uint8_t) == sizeof(CharType), "size of CharType must be equal to std::uint8_t");
+        static_assert(std::is_trivial<CharType>::value, "CharType must be trivial");
+        CharType result;
+        std::memcpy(&result, &x, sizeof(x));
+        return result;
+    }
+
+    template<typename C = CharType,
+             enable_if_t<std::is_unsigned<C>::value>* = nullptr>
+    static constexpr CharType to_char_type(std::uint8_t x) noexcept
+    {
+        return x;
+    }
+
+    template < typename InputCharType, typename C = CharType,
+               enable_if_t <
+                   std::is_signed<C>::value &&
+                   std::is_signed<char>::value &&
+                   std::is_same<char, typename std::remove_cv<InputCharType>::type>::value
+                   > * = nullptr >
+    static constexpr CharType to_char_type(InputCharType x) noexcept
+    {
+        return x;
+    }
+
+  private:
+    /// whether we can assume little endianess
+    const bool is_little_endian = little_endianess();
+
+    /// the output
+    output_adapter_t<CharType> oa = nullptr;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/output/serializer.hpp>
+
+
+#include <algorithm> // reverse, remove, fill, find, none_of
+#include <array> // array
+#include <clocale> // localeconv, lconv
+#include <cmath> // labs, isfinite, isnan, signbit
+#include <cstddef> // size_t, ptrdiff_t
+#include <cstdint> // uint8_t
+#include <cstdio> // snprintf
+#include <limits> // numeric_limits
+#include <string> // string, char_traits
+#include <type_traits> // is_same
+#include <utility> // move
+
+// #include <nlohmann/detail/conversions/to_chars.hpp>
+
+
+#include <array> // array
+#include <cmath>   // signbit, isfinite
+#include <cstdint> // intN_t, uintN_t
+#include <cstring> // memcpy, memmove
+#include <limits> // numeric_limits
+#include <type_traits> // conditional
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+
+/*!
+@brief implements the Grisu2 algorithm for binary to decimal floating-point
+conversion.
+
+This implementation is a slightly modified version of the reference
+implementation which may be obtained from
+http://florian.loitsch.com/publications (bench.tar.gz).
+
+The code is distributed under the MIT license, Copyright (c) 2009 Florian Loitsch.
+
+For a detailed description of the algorithm see:
+
+[1] Loitsch, "Printing Floating-Point Numbers Quickly and Accurately with
+    Integers", Proceedings of the ACM SIGPLAN 2010 Conference on Programming
+    Language Design and Implementation, PLDI 2010
+[2] Burger, Dybvig, "Printing Floating-Point Numbers Quickly and Accurately",
+    Proceedings of the ACM SIGPLAN 1996 Conference on Programming Language
+    Design and Implementation, PLDI 1996
+*/
+namespace dtoa_impl
+{
+
+template<typename Target, typename Source>
+Target reinterpret_bits(const Source source)
+{
+    static_assert(sizeof(Target) == sizeof(Source), "size mismatch");
+
+    Target target;
+    std::memcpy(&target, &source, sizeof(Source));
+    return target;
+}
+
+struct diyfp // f * 2^e
+{
+    static constexpr int kPrecision = 64; // = q
+
+    std::uint64_t f = 0;
+    int e = 0;
+
+    constexpr diyfp(std::uint64_t f_, int e_) noexcept : f(f_), e(e_) {}
+
+    /*!
+    @brief returns x - y
+    @pre x.e == y.e and x.f >= y.f
+    */
+    static diyfp sub(const diyfp& x, const diyfp& y) noexcept
+    {
+        JSON_ASSERT(x.e == y.e);
+        JSON_ASSERT(x.f >= y.f);
+
+        return {x.f - y.f, x.e};
+    }
+
+    /*!
+    @brief returns x * y
+    @note The result is rounded. (Only the upper q bits are returned.)
+    */
+    static diyfp mul(const diyfp& x, const diyfp& y) noexcept
+    {
+        static_assert(kPrecision == 64, "internal error");
+
+        // Computes:
+        //  f = round((x.f * y.f) / 2^q)
+        //  e = x.e + y.e + q
+
+        // Emulate the 64-bit * 64-bit multiplication:
+        //
+        // p = u * v
+        //   = (u_lo + 2^32 u_hi) (v_lo + 2^32 v_hi)
+        //   = (u_lo v_lo         ) + 2^32 ((u_lo v_hi         ) + (u_hi v_lo         )) + 2^64 (u_hi v_hi         )
+        //   = (p0                ) + 2^32 ((p1                ) + (p2                )) + 2^64 (p3                )
+        //   = (p0_lo + 2^32 p0_hi) + 2^32 ((p1_lo + 2^32 p1_hi) + (p2_lo + 2^32 p2_hi)) + 2^64 (p3                )
+        //   = (p0_lo             ) + 2^32 (p0_hi + p1_lo + p2_lo                      ) + 2^64 (p1_hi + p2_hi + p3)
+        //   = (p0_lo             ) + 2^32 (Q                                          ) + 2^64 (H                 )
+        //   = (p0_lo             ) + 2^32 (Q_lo + 2^32 Q_hi                           ) + 2^64 (H                 )
+        //
+        // (Since Q might be larger than 2^32 - 1)
+        //
+        //   = (p0_lo + 2^32 Q_lo) + 2^64 (Q_hi + H)
+        //
+        // (Q_hi + H does not overflow a 64-bit int)
+        //
+        //   = p_lo + 2^64 p_hi
+
+        const std::uint64_t u_lo = x.f & 0xFFFFFFFFu;
+        const std::uint64_t u_hi = x.f >> 32u;
+        const std::uint64_t v_lo = y.f & 0xFFFFFFFFu;
+        const std::uint64_t v_hi = y.f >> 32u;
+
+        const std::uint64_t p0 = u_lo * v_lo;
+        const std::uint64_t p1 = u_lo * v_hi;
+        const std::uint64_t p2 = u_hi * v_lo;
+        const std::uint64_t p3 = u_hi * v_hi;
+
+        const std::uint64_t p0_hi = p0 >> 32u;
+        const std::uint64_t p1_lo = p1 & 0xFFFFFFFFu;
+        const std::uint64_t p1_hi = p1 >> 32u;
+        const std::uint64_t p2_lo = p2 & 0xFFFFFFFFu;
+        const std::uint64_t p2_hi = p2 >> 32u;
+
+        std::uint64_t Q = p0_hi + p1_lo + p2_lo;
+
+        // The full product might now be computed as
+        //
+        // p_hi = p3 + p2_hi + p1_hi + (Q >> 32)
+        // p_lo = p0_lo + (Q << 32)
+        //
+        // But in this particular case here, the full p_lo is not required.
+        // Effectively we only need to add the highest bit in p_lo to p_hi (and
+        // Q_hi + 1 does not overflow).
+
+        Q += std::uint64_t{1} << (64u - 32u - 1u); // round, ties up
+
+        const std::uint64_t h = p3 + p2_hi + p1_hi + (Q >> 32u);
+
+        return {h, x.e + y.e + 64};
+    }
+
+    /*!
+    @brief normalize x such that the significand is >= 2^(q-1)
+    @pre x.f != 0
+    */
+    static diyfp normalize(diyfp x) noexcept
+    {
+        JSON_ASSERT(x.f != 0);
+
+        while ((x.f >> 63u) == 0)
+        {
+            x.f <<= 1u;
+            x.e--;
+        }
+
+        return x;
+    }
+
+    /*!
+    @brief normalize x such that the result has the exponent E
+    @pre e >= x.e and the upper e - x.e bits of x.f must be zero.
+    */
+    static diyfp normalize_to(const diyfp& x, const int target_exponent) noexcept
+    {
+        const int delta = x.e - target_exponent;
+
+        JSON_ASSERT(delta >= 0);
+        JSON_ASSERT(((x.f << delta) >> delta) == x.f);
+
+        return {x.f << delta, target_exponent};
+    }
+};
+
+struct boundaries
+{
+    diyfp w;
+    diyfp minus;
+    diyfp plus;
+};
+
+/*!
+Compute the (normalized) diyfp representing the input number 'value' and its
+boundaries.
+
+@pre value must be finite and positive
+*/
+template<typename FloatType>
+boundaries compute_boundaries(FloatType value)
+{
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // Convert the IEEE representation into a diyfp.
+    //
+    // If v is denormal:
+    //      value = 0.F * 2^(1 - bias) = (          F) * 2^(1 - bias - (p-1))
+    // If v is normalized:
+    //      value = 1.F * 2^(E - bias) = (2^(p-1) + F) * 2^(E - bias - (p-1))
+
+    static_assert(std::numeric_limits<FloatType>::is_iec559,
+                  "internal error: dtoa_short requires an IEEE-754 floating-point implementation");
+
+    constexpr int      kPrecision = std::numeric_limits<FloatType>::digits; // = p (includes the hidden bit)
+    constexpr int      kBias      = std::numeric_limits<FloatType>::max_exponent - 1 + (kPrecision - 1);
+    constexpr int      kMinExp    = 1 - kBias;
+    constexpr std::uint64_t kHiddenBit = std::uint64_t{1} << (kPrecision - 1); // = 2^(p-1)
+
+    using bits_type = typename std::conditional<kPrecision == 24, std::uint32_t, std::uint64_t >::type;
+
+    const std::uint64_t bits = reinterpret_bits<bits_type>(value);
+    const std::uint64_t E = bits >> (kPrecision - 1);
+    const std::uint64_t F = bits & (kHiddenBit - 1);
+
+    const bool is_denormal = E == 0;
+    const diyfp v = is_denormal
+                    ? diyfp(F, kMinExp)
+                    : diyfp(F + kHiddenBit, static_cast<int>(E) - kBias);
+
+    // Compute the boundaries m- and m+ of the floating-point value
+    // v = f * 2^e.
+    //
+    // Determine v- and v+, the floating-point predecessor and successor if v,
+    // respectively.
+    //
+    //      v- = v - 2^e        if f != 2^(p-1) or e == e_min                (A)
+    //         = v - 2^(e-1)    if f == 2^(p-1) and e > e_min                (B)
+    //
+    //      v+ = v + 2^e
+    //
+    // Let m- = (v- + v) / 2 and m+ = (v + v+) / 2. All real numbers _strictly_
+    // between m- and m+ round to v, regardless of how the input rounding
+    // algorithm breaks ties.
+    //
+    //      ---+-------------+-------------+-------------+-------------+---  (A)
+    //         v-            m-            v             m+            v+
+    //
+    //      -----------------+------+------+-------------+-------------+---  (B)
+    //                       v-     m-     v             m+            v+
+
+    const bool lower_boundary_is_closer = F == 0 && E > 1;
+    const diyfp m_plus = diyfp(2 * v.f + 1, v.e - 1);
+    const diyfp m_minus = lower_boundary_is_closer
+                          ? diyfp(4 * v.f - 1, v.e - 2)  // (B)
+                          : diyfp(2 * v.f - 1, v.e - 1); // (A)
+
+    // Determine the normalized w+ = m+.
+    const diyfp w_plus = diyfp::normalize(m_plus);
+
+    // Determine w- = m- such that e_(w-) = e_(w+).
+    const diyfp w_minus = diyfp::normalize_to(m_minus, w_plus.e);
+
+    return {diyfp::normalize(v), w_minus, w_plus};
+}
+
+// Given normalized diyfp w, Grisu needs to find a (normalized) cached
+// power-of-ten c, such that the exponent of the product c * w = f * 2^e lies
+// within a certain range [alpha, gamma] (Definition 3.2 from [1])
+//
+//      alpha <= e = e_c + e_w + q <= gamma
+//
+// or
+//
+//      f_c * f_w * 2^alpha <= f_c 2^(e_c) * f_w 2^(e_w) * 2^q
+//                          <= f_c * f_w * 2^gamma
+//
+// Since c and w are normalized, i.e. 2^(q-1) <= f < 2^q, this implies
+//
+//      2^(q-1) * 2^(q-1) * 2^alpha <= c * w * 2^q < 2^q * 2^q * 2^gamma
+//
+// or
+//
+//      2^(q - 2 + alpha) <= c * w < 2^(q + gamma)
+//
+// The choice of (alpha,gamma) determines the size of the table and the form of
+// the digit generation procedure. Using (alpha,gamma)=(-60,-32) works out well
+// in practice:
+//
+// The idea is to cut the number c * w = f * 2^e into two parts, which can be
+// processed independently: An integral part p1, and a fractional part p2:
+//
+//      f * 2^e = ( (f div 2^-e) * 2^-e + (f mod 2^-e) ) * 2^e
+//              = (f div 2^-e) + (f mod 2^-e) * 2^e
+//              = p1 + p2 * 2^e
+//
+// The conversion of p1 into decimal form requires a series of divisions and
+// modulos by (a power of) 10. These operations are faster for 32-bit than for
+// 64-bit integers, so p1 should ideally fit into a 32-bit integer. This can be
+// achieved by choosing
+//
+//      -e >= 32   or   e <= -32 := gamma
+//
+// In order to convert the fractional part
+//
+//      p2 * 2^e = p2 / 2^-e = d[-1] / 10^1 + d[-2] / 10^2 + ...
+//
+// into decimal form, the fraction is repeatedly multiplied by 10 and the digits
+// d[-i] are extracted in order:
+//
+//      (10 * p2) div 2^-e = d[-1]
+//      (10 * p2) mod 2^-e = d[-2] / 10^1 + ...
+//
+// The multiplication by 10 must not overflow. It is sufficient to choose
+//
+//      10 * p2 < 16 * p2 = 2^4 * p2 <= 2^64.
+//
+// Since p2 = f mod 2^-e < 2^-e,
+//
+//      -e <= 60   or   e >= -60 := alpha
+
+constexpr int kAlpha = -60;
+constexpr int kGamma = -32;
+
+struct cached_power // c = f * 2^e ~= 10^k
+{
+    std::uint64_t f;
+    int e;
+    int k;
+};
+
+/*!
+For a normalized diyfp w = f * 2^e, this function returns a (normalized) cached
+power-of-ten c = f_c * 2^e_c, such that the exponent of the product w * c
+satisfies (Definition 3.2 from [1])
+
+     alpha <= e_c + e + q <= gamma.
+*/
+inline cached_power get_cached_power_for_binary_exponent(int e)
+{
+    // Now
+    //
+    //      alpha <= e_c + e + q <= gamma                                    (1)
+    //      ==> f_c * 2^alpha <= c * 2^e * 2^q
+    //
+    // and since the c's are normalized, 2^(q-1) <= f_c,
+    //
+    //      ==> 2^(q - 1 + alpha) <= c * 2^(e + q)
+    //      ==> 2^(alpha - e - 1) <= c
+    //
+    // If c were an exact power of ten, i.e. c = 10^k, one may determine k as
+    //
+    //      k = ceil( log_10( 2^(alpha - e - 1) ) )
+    //        = ceil( (alpha - e - 1) * log_10(2) )
+    //
+    // From the paper:
+    // "In theory the result of the procedure could be wrong since c is rounded,
+    //  and the computation itself is approximated [...]. In practice, however,
+    //  this simple function is sufficient."
+    //
+    // For IEEE double precision floating-point numbers converted into
+    // normalized diyfp's w = f * 2^e, with q = 64,
+    //
+    //      e >= -1022      (min IEEE exponent)
+    //           -52        (p - 1)
+    //           -52        (p - 1, possibly normalize denormal IEEE numbers)
+    //           -11        (normalize the diyfp)
+    //         = -1137
+    //
+    // and
+    //
+    //      e <= +1023      (max IEEE exponent)
+    //           -52        (p - 1)
+    //           -11        (normalize the diyfp)
+    //         = 960
+    //
+    // This binary exponent range [-1137,960] results in a decimal exponent
+    // range [-307,324]. One does not need to store a cached power for each
+    // k in this range. For each such k it suffices to find a cached power
+    // such that the exponent of the product lies in [alpha,gamma].
+    // This implies that the difference of the decimal exponents of adjacent
+    // table entries must be less than or equal to
+    //
+    //      floor( (gamma - alpha) * log_10(2) ) = 8.
+    //
+    // (A smaller distance gamma-alpha would require a larger table.)
+
+    // NB:
+    // Actually this function returns c, such that -60 <= e_c + e + 64 <= -34.
+
+    constexpr int kCachedPowersMinDecExp = -300;
+    constexpr int kCachedPowersDecStep = 8;
+
+    static constexpr std::array<cached_power, 79> kCachedPowers =
+    {
+        {
+            { 0xAB70FE17C79AC6CA, -1060, -300 },
+            { 0xFF77B1FCBEBCDC4F, -1034, -292 },
+            { 0xBE5691EF416BD60C, -1007, -284 },
+            { 0x8DD01FAD907FFC3C,  -980, -276 },
+            { 0xD3515C2831559A83,  -954, -268 },
+            { 0x9D71AC8FADA6C9B5,  -927, -260 },
+            { 0xEA9C227723EE8BCB,  -901, -252 },
+            { 0xAECC49914078536D,  -874, -244 },
+            { 0x823C12795DB6CE57,  -847, -236 },
+            { 0xC21094364DFB5637,  -821, -228 },
+            { 0x9096EA6F3848984F,  -794, -220 },
+            { 0xD77485CB25823AC7,  -768, -212 },
+            { 0xA086CFCD97BF97F4,  -741, -204 },
+            { 0xEF340A98172AACE5,  -715, -196 },
+            { 0xB23867FB2A35B28E,  -688, -188 },
+            { 0x84C8D4DFD2C63F3B,  -661, -180 },
+            { 0xC5DD44271AD3CDBA,  -635, -172 },
+            { 0x936B9FCEBB25C996,  -608, -164 },
+            { 0xDBAC6C247D62A584,  -582, -156 },
+            { 0xA3AB66580D5FDAF6,  -555, -148 },
+            { 0xF3E2F893DEC3F126,  -529, -140 },
+            { 0xB5B5ADA8AAFF80B8,  -502, -132 },
+            { 0x87625F056C7C4A8B,  -475, -124 },
+            { 0xC9BCFF6034C13053,  -449, -116 },
+            { 0x964E858C91BA2655,  -422, -108 },
+            { 0xDFF9772470297EBD,  -396, -100 },
+            { 0xA6DFBD9FB8E5B88F,  -369,  -92 },
+            { 0xF8A95FCF88747D94,  -343,  -84 },
+            { 0xB94470938FA89BCF,  -316,  -76 },
+            { 0x8A08F0F8BF0F156B,  -289,  -68 },
+            { 0xCDB02555653131B6,  -263,  -60 },
+            { 0x993FE2C6D07B7FAC,  -236,  -52 },
+            { 0xE45C10C42A2B3B06,  -210,  -44 },
+            { 0xAA242499697392D3,  -183,  -36 },
+            { 0xFD87B5F28300CA0E,  -157,  -28 },
+            { 0xBCE5086492111AEB,  -130,  -20 },
+            { 0x8CBCCC096F5088CC,  -103,  -12 },
+            { 0xD1B71758E219652C,   -77,   -4 },
+            { 0x9C40000000000000,   -50,    4 },
+            { 0xE8D4A51000000000,   -24,   12 },
+            { 0xAD78EBC5AC620000,     3,   20 },
+            { 0x813F3978F8940984,    30,   28 },
+            { 0xC097CE7BC90715B3,    56,   36 },
+            { 0x8F7E32CE7BEA5C70,    83,   44 },
+            { 0xD5D238A4ABE98068,   109,   52 },
+            { 0x9F4F2726179A2245,   136,   60 },
+            { 0xED63A231D4C4FB27,   162,   68 },
+            { 0xB0DE65388CC8ADA8,   189,   76 },
+            { 0x83C7088E1AAB65DB,   216,   84 },
+            { 0xC45D1DF942711D9A,   242,   92 },
+            { 0x924D692CA61BE758,   269,  100 },
+            { 0xDA01EE641A708DEA,   295,  108 },
+            { 0xA26DA3999AEF774A,   322,  116 },
+            { 0xF209787BB47D6B85,   348,  124 },
+            { 0xB454E4A179DD1877,   375,  132 },
+            { 0x865B86925B9BC5C2,   402,  140 },
+            { 0xC83553C5C8965D3D,   428,  148 },
+            { 0x952AB45CFA97A0B3,   455,  156 },
+            { 0xDE469FBD99A05FE3,   481,  164 },
+            { 0xA59BC234DB398C25,   508,  172 },
+            { 0xF6C69A72A3989F5C,   534,  180 },
+            { 0xB7DCBF5354E9BECE,   561,  188 },
+            { 0x88FCF317F22241E2,   588,  196 },
+            { 0xCC20CE9BD35C78A5,   614,  204 },
+            { 0x98165AF37B2153DF,   641,  212 },
+            { 0xE2A0B5DC971F303A,   667,  220 },
+            { 0xA8D9D1535CE3B396,   694,  228 },
+            { 0xFB9B7CD9A4A7443C,   720,  236 },
+            { 0xBB764C4CA7A44410,   747,  244 },
+            { 0x8BAB8EEFB6409C1A,   774,  252 },
+            { 0xD01FEF10A657842C,   800,  260 },
+            { 0x9B10A4E5E9913129,   827,  268 },
+            { 0xE7109BFBA19C0C9D,   853,  276 },
+            { 0xAC2820D9623BF429,   880,  284 },
+            { 0x80444B5E7AA7CF85,   907,  292 },
+            { 0xBF21E44003ACDD2D,   933,  300 },
+            { 0x8E679C2F5E44FF8F,   960,  308 },
+            { 0xD433179D9C8CB841,   986,  316 },
+            { 0x9E19DB92B4E31BA9,  1013,  324 },
+        }
+    };
+
+    // This computation gives exactly the same results for k as
+    //      k = ceil((kAlpha - e - 1) * 0.30102999566398114)
+    // for |e| <= 1500, but doesn't require floating-point operations.
+    // NB: log_10(2) ~= 78913 / 2^18
+    JSON_ASSERT(e >= -1500);
+    JSON_ASSERT(e <=  1500);
+    const int f = kAlpha - e - 1;
+    const int k = (f * 78913) / (1 << 18) + static_cast<int>(f > 0);
+
+    const int index = (-kCachedPowersMinDecExp + k + (kCachedPowersDecStep - 1)) / kCachedPowersDecStep;
+    JSON_ASSERT(index >= 0);
+    JSON_ASSERT(static_cast<std::size_t>(index) < kCachedPowers.size());
+
+    const cached_power cached = kCachedPowers[static_cast<std::size_t>(index)];
+    JSON_ASSERT(kAlpha <= cached.e + e + 64);
+    JSON_ASSERT(kGamma >= cached.e + e + 64);
+
+    return cached;
+}
+
+/*!
+For n != 0, returns k, such that pow10 := 10^(k-1) <= n < 10^k.
+For n == 0, returns 1 and sets pow10 := 1.
+*/
+inline int find_largest_pow10(const std::uint32_t n, std::uint32_t& pow10)
+{
+    // LCOV_EXCL_START
+    if (n >= 1000000000)
+    {
+        pow10 = 1000000000;
+        return 10;
+    }
+    // LCOV_EXCL_STOP
+    else if (n >= 100000000)
+    {
+        pow10 = 100000000;
+        return  9;
+    }
+    else if (n >= 10000000)
+    {
+        pow10 = 10000000;
+        return  8;
+    }
+    else if (n >= 1000000)
+    {
+        pow10 = 1000000;
+        return  7;
+    }
+    else if (n >= 100000)
+    {
+        pow10 = 100000;
+        return  6;
+    }
+    else if (n >= 10000)
+    {
+        pow10 = 10000;
+        return  5;
+    }
+    else if (n >= 1000)
+    {
+        pow10 = 1000;
+        return  4;
+    }
+    else if (n >= 100)
+    {
+        pow10 = 100;
+        return  3;
+    }
+    else if (n >= 10)
+    {
+        pow10 = 10;
+        return  2;
+    }
+    else
+    {
+        pow10 = 1;
+        return 1;
+    }
+}
+
+inline void grisu2_round(char* buf, int len, std::uint64_t dist, std::uint64_t delta,
+                         std::uint64_t rest, std::uint64_t ten_k)
+{
+    JSON_ASSERT(len >= 1);
+    JSON_ASSERT(dist <= delta);
+    JSON_ASSERT(rest <= delta);
+    JSON_ASSERT(ten_k > 0);
+
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    //                                  ten_k
+    //                                <------>
+    //                                       <---- rest ---->
+    // --------------[------------------+----+--------------]--------------
+    //                                  w    V
+    //                                       = buf * 10^k
+    //
+    // ten_k represents a unit-in-the-last-place in the decimal representation
+    // stored in buf.
+    // Decrement buf by ten_k while this takes buf closer to w.
+
+    // The tests are written in this order to avoid overflow in unsigned
+    // integer arithmetic.
+
+    while (rest < dist
+            && delta - rest >= ten_k
+            && (rest + ten_k < dist || dist - rest > rest + ten_k - dist))
+    {
+        JSON_ASSERT(buf[len - 1] != '0');
+        buf[len - 1]--;
+        rest += ten_k;
+    }
+}
+
+/*!
+Generates V = buffer * 10^decimal_exponent, such that M- <= V <= M+.
+M- and M+ must be normalized and share the same exponent -60 <= e <= -32.
+*/
+inline void grisu2_digit_gen(char* buffer, int& length, int& decimal_exponent,
+                             diyfp M_minus, diyfp w, diyfp M_plus)
+{
+    static_assert(kAlpha >= -60, "internal error");
+    static_assert(kGamma <= -32, "internal error");
+
+    // Generates the digits (and the exponent) of a decimal floating-point
+    // number V = buffer * 10^decimal_exponent in the range [M-, M+]. The diyfp's
+    // w, M- and M+ share the same exponent e, which satisfies alpha <= e <= gamma.
+    //
+    //               <--------------------------- delta ---->
+    //                                  <---- dist --------->
+    // --------------[------------------+-------------------]--------------
+    //               M-                 w                   M+
+    //
+    // Grisu2 generates the digits of M+ from left to right and stops as soon as
+    // V is in [M-,M+].
+
+    JSON_ASSERT(M_plus.e >= kAlpha);
+    JSON_ASSERT(M_plus.e <= kGamma);
+
+    std::uint64_t delta = diyfp::sub(M_plus, M_minus).f; // (significand of (M+ - M-), implicit exponent is e)
+    std::uint64_t dist  = diyfp::sub(M_plus, w      ).f; // (significand of (M+ - w ), implicit exponent is e)
+
+    // Split M+ = f * 2^e into two parts p1 and p2 (note: e < 0):
+    //
+    //      M+ = f * 2^e
+    //         = ((f div 2^-e) * 2^-e + (f mod 2^-e)) * 2^e
+    //         = ((p1        ) * 2^-e + (p2        )) * 2^e
+    //         = p1 + p2 * 2^e
+
+    const diyfp one(std::uint64_t{1} << -M_plus.e, M_plus.e);
+
+    auto p1 = static_cast<std::uint32_t>(M_plus.f >> -one.e); // p1 = f div 2^-e (Since -e >= 32, p1 fits into a 32-bit int.)
+    std::uint64_t p2 = M_plus.f & (one.f - 1);                    // p2 = f mod 2^-e
+
+    // 1)
+    //
+    // Generate the digits of the integral part p1 = d[n-1]...d[1]d[0]
+
+    JSON_ASSERT(p1 > 0);
+
+    std::uint32_t pow10;
+    const int k = find_largest_pow10(p1, pow10);
+
+    //      10^(k-1) <= p1 < 10^k, pow10 = 10^(k-1)
+    //
+    //      p1 = (p1 div 10^(k-1)) * 10^(k-1) + (p1 mod 10^(k-1))
+    //         = (d[k-1]         ) * 10^(k-1) + (p1 mod 10^(k-1))
+    //
+    //      M+ = p1                                             + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + (p1 mod 10^(k-1))          + p2 * 2^e
+    //         = d[k-1] * 10^(k-1) + ((p1 mod 10^(k-1)) * 2^-e + p2) * 2^e
+    //         = d[k-1] * 10^(k-1) + (                         rest) * 2^e
+    //
+    // Now generate the digits d[n] of p1 from left to right (n = k-1,...,0)
+    //
+    //      p1 = d[k-1]...d[n] * 10^n + d[n-1]...d[0]
+    //
+    // but stop as soon as
+    //
+    //      rest * 2^e = (d[n-1]...d[0] * 2^-e + p2) * 2^e <= delta * 2^e
+
+    int n = k;
+    while (n > 0)
+    {
+        // Invariants:
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)    (buffer = 0 for n = k)
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        //
+        const std::uint32_t d = p1 / pow10;  // d = p1 div 10^(n-1)
+        const std::uint32_t r = p1 % pow10;  // r = p1 mod 10^(n-1)
+        //
+        //      M+ = buffer * 10^n + (d * 10^(n-1) + r) + p2 * 2^e
+        //         = (buffer * 10 + d) * 10^(n-1) + (r + p2 * 2^e)
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(n-1) + (r + p2 * 2^e)
+        //
+        p1 = r;
+        n--;
+        //
+        //      M+ = buffer * 10^n + (p1 + p2 * 2^e)
+        //      pow10 = 10^n
+        //
+
+        // Now check if enough digits have been generated.
+        // Compute
+        //
+        //      p1 + p2 * 2^e = (p1 * 2^-e + p2) * 2^e = rest * 2^e
+        //
+        // Note:
+        // Since rest and delta share the same exponent e, it suffices to
+        // compare the significands.
+        const std::uint64_t rest = (std::uint64_t{p1} << -one.e) + p2;
+        if (rest <= delta)
+        {
+            // V = buffer * 10^n, with M- <= V <= M+.
+
+            decimal_exponent += n;
+
+            // We may now just stop. But instead look if the buffer could be
+            // decremented to bring V closer to w.
+            //
+            // pow10 = 10^n is now 1 ulp in the decimal representation V.
+            // The rounding procedure works with diyfp's with an implicit
+            // exponent of e.
+            //
+            //      10^n = (10^n * 2^-e) * 2^e = ulp * 2^e
+            //
+            const std::uint64_t ten_n = std::uint64_t{pow10} << -one.e;
+            grisu2_round(buffer, length, dist, delta, rest, ten_n);
+
+            return;
+        }
+
+        pow10 /= 10;
+        //
+        //      pow10 = 10^(n-1) <= p1 < 10^n
+        // Invariants restored.
+    }
+
+    // 2)
+    //
+    // The digits of the integral part have been generated:
+    //
+    //      M+ = d[k-1]...d[1]d[0] + p2 * 2^e
+    //         = buffer            + p2 * 2^e
+    //
+    // Now generate the digits of the fractional part p2 * 2^e.
+    //
+    // Note:
+    // No decimal point is generated: the exponent is adjusted instead.
+    //
+    // p2 actually represents the fraction
+    //
+    //      p2 * 2^e
+    //          = p2 / 2^-e
+    //          = d[-1] / 10^1 + d[-2] / 10^2 + ...
+    //
+    // Now generate the digits d[-m] of p1 from left to right (m = 1,2,...)
+    //
+    //      p2 * 2^e = d[-1]d[-2]...d[-m] * 10^-m
+    //                      + 10^-m * (d[-m-1] / 10^1 + d[-m-2] / 10^2 + ...)
+    //
+    // using
+    //
+    //      10^m * p2 = ((10^m * p2) div 2^-e) * 2^-e + ((10^m * p2) mod 2^-e)
+    //                = (                   d) * 2^-e + (                   r)
+    //
+    // or
+    //      10^m * p2 * 2^e = d + r * 2^e
+    //
+    // i.e.
+    //
+    //      M+ = buffer + p2 * 2^e
+    //         = buffer + 10^-m * (d + r * 2^e)
+    //         = (buffer * 10^m + d) * 10^-m + 10^-m * r * 2^e
+    //
+    // and stop as soon as 10^-m * r * 2^e <= delta * 2^e
+
+    JSON_ASSERT(p2 > delta);
+
+    int m = 0;
+    for (;;)
+    {
+        // Invariant:
+        //      M+ = buffer * 10^-m + 10^-m * (d[-m-1] / 10 + d[-m-2] / 10^2 + ...) * 2^e
+        //         = buffer * 10^-m + 10^-m * (p2                                 ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (10 * p2)                   ) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * ((10*p2 div 2^-e) * 2^-e + (10*p2 mod 2^-e)) * 2^e
+        //
+        JSON_ASSERT(p2 <= (std::numeric_limits<std::uint64_t>::max)() / 10);
+        p2 *= 10;
+        const std::uint64_t d = p2 >> -one.e;     // d = (10 * p2) div 2^-e
+        const std::uint64_t r = p2 & (one.f - 1); // r = (10 * p2) mod 2^-e
+        //
+        //      M+ = buffer * 10^-m + 10^-m * (1/10 * (d * 2^-e + r) * 2^e
+        //         = buffer * 10^-m + 10^-m * (1/10 * (d + r * 2^e))
+        //         = (buffer * 10 + d) * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        JSON_ASSERT(d <= 9);
+        buffer[length++] = static_cast<char>('0' + d); // buffer := buffer * 10 + d
+        //
+        //      M+ = buffer * 10^(-m-1) + 10^(-m-1) * r * 2^e
+        //
+        p2 = r;
+        m++;
+        //
+        //      M+ = buffer * 10^-m + 10^-m * p2 * 2^e
+        // Invariant restored.
+
+        // Check if enough digits have been generated.
+        //
+        //      10^-m * p2 * 2^e <= delta * 2^e
+        //              p2 * 2^e <= 10^m * delta * 2^e
+        //                    p2 <= 10^m * delta
+        delta *= 10;
+        dist  *= 10;
+        if (p2 <= delta)
+        {
+            break;
+        }
+    }
+
+    // V = buffer * 10^-m, with M- <= V <= M+.
+
+    decimal_exponent -= m;
+
+    // 1 ulp in the decimal representation is now 10^-m.
+    // Since delta and dist are now scaled by 10^m, we need to do the
+    // same with ulp in order to keep the units in sync.
+    //
+    //      10^m * 10^-m = 1 = 2^-e * 2^e = ten_m * 2^e
+    //
+    const std::uint64_t ten_m = one.f;
+    grisu2_round(buffer, length, dist, delta, p2, ten_m);
+
+    // By construction this algorithm generates the shortest possible decimal
+    // number (Loitsch, Theorem 6.2) which rounds back to w.
+    // For an input number of precision p, at least
+    //
+    //      N = 1 + ceil(p * log_10(2))
+    //
+    // decimal digits are sufficient to identify all binary floating-point
+    // numbers (Matula, "In-and-Out conversions").
+    // This implies that the algorithm does not produce more than N decimal
+    // digits.
+    //
+    //      N = 17 for p = 53 (IEEE double precision)
+    //      N = 9  for p = 24 (IEEE single precision)
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline void grisu2(char* buf, int& len, int& decimal_exponent,
+                   diyfp m_minus, diyfp v, diyfp m_plus)
+{
+    JSON_ASSERT(m_plus.e == m_minus.e);
+    JSON_ASSERT(m_plus.e == v.e);
+
+    //  --------(-----------------------+-----------------------)--------    (A)
+    //          m-                      v                       m+
+    //
+    //  --------------------(-----------+-----------------------)--------    (B)
+    //                      m-          v                       m+
+    //
+    // First scale v (and m- and m+) such that the exponent is in the range
+    // [alpha, gamma].
+
+    const cached_power cached = get_cached_power_for_binary_exponent(m_plus.e);
+
+    const diyfp c_minus_k(cached.f, cached.e); // = c ~= 10^-k
+
+    // The exponent of the products is = v.e + c_minus_k.e + q and is in the range [alpha,gamma]
+    const diyfp w       = diyfp::mul(v,       c_minus_k);
+    const diyfp w_minus = diyfp::mul(m_minus, c_minus_k);
+    const diyfp w_plus  = diyfp::mul(m_plus,  c_minus_k);
+
+    //  ----(---+---)---------------(---+---)---------------(---+---)----
+    //          w-                      w                       w+
+    //          = c*m-                  = c*v                   = c*m+
+    //
+    // diyfp::mul rounds its result and c_minus_k is approximated too. w, w- and
+    // w+ are now off by a small amount.
+    // In fact:
+    //
+    //      w - v * 10^k < 1 ulp
+    //
+    // To account for this inaccuracy, add resp. subtract 1 ulp.
+    //
+    //  --------+---[---------------(---+---)---------------]---+--------
+    //          w-  M-                  w                   M+  w+
+    //
+    // Now any number in [M-, M+] (bounds included) will round to w when input,
+    // regardless of how the input rounding algorithm breaks ties.
+    //
+    // And digit_gen generates the shortest possible such number in [M-, M+].
+    // Note that this does not mean that Grisu2 always generates the shortest
+    // possible number in the interval (m-, m+).
+    const diyfp M_minus(w_minus.f + 1, w_minus.e);
+    const diyfp M_plus (w_plus.f  - 1, w_plus.e );
+
+    decimal_exponent = -cached.k; // = -(-k) = k
+
+    grisu2_digit_gen(buf, len, decimal_exponent, M_minus, w, M_plus);
+}
+
+/*!
+v = buf * 10^decimal_exponent
+len is the length of the buffer (number of decimal digits)
+The buffer must be large enough, i.e. >= max_digits10.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1)
+void grisu2(char* buf, int& len, int& decimal_exponent, FloatType value)
+{
+    static_assert(diyfp::kPrecision >= std::numeric_limits<FloatType>::digits + 3,
+                  "internal error: not enough precision");
+
+    JSON_ASSERT(std::isfinite(value));
+    JSON_ASSERT(value > 0);
+
+    // If the neighbors (and boundaries) of 'value' are always computed for double-precision
+    // numbers, all float's can be recovered using strtod (and strtof). However, the resulting
+    // decimal representations are not exactly "short".
+    //
+    // The documentation for 'std::to_chars' (https://en.cppreference.com/w/cpp/utility/to_chars)
+    // says "value is converted to a string as if by std::sprintf in the default ("C") locale"
+    // and since sprintf promotes float's to double's, I think this is exactly what 'std::to_chars'
+    // does.
+    // On the other hand, the documentation for 'std::to_chars' requires that "parsing the
+    // representation using the corresponding std::from_chars function recovers value exactly". That
+    // indicates that single precision floating-point numbers should be recovered using
+    // 'std::strtof'.
+    //
+    // NB: If the neighbors are computed for single-precision numbers, there is a single float
+    //     (7.0385307e-26f) which can't be recovered using strtod. The resulting double precision
+    //     value is off by 1 ulp.
+#if 0
+    const boundaries w = compute_boundaries(static_cast<double>(value));
+#else
+    const boundaries w = compute_boundaries(value);
+#endif
+
+    grisu2(buf, len, decimal_exponent, w.minus, w.w, w.plus);
+}
+
+/*!
+@brief appends a decimal representation of e to buf
+@return a pointer to the element following the exponent.
+@pre -1000 < e < 1000
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* append_exponent(char* buf, int e)
+{
+    JSON_ASSERT(e > -1000);
+    JSON_ASSERT(e <  1000);
+
+    if (e < 0)
+    {
+        e = -e;
+        *buf++ = '-';
+    }
+    else
+    {
+        *buf++ = '+';
+    }
+
+    auto k = static_cast<std::uint32_t>(e);
+    if (k < 10)
+    {
+        // Always print at least two digits in the exponent.
+        // This is for compatibility with printf("%g").
+        *buf++ = '0';
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else if (k < 100)
+    {
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+    else
+    {
+        *buf++ = static_cast<char>('0' + k / 100);
+        k %= 100;
+        *buf++ = static_cast<char>('0' + k / 10);
+        k %= 10;
+        *buf++ = static_cast<char>('0' + k);
+    }
+
+    return buf;
+}
+
+/*!
+@brief prettify v = buf * 10^decimal_exponent
+
+If v is in the range [10^min_exp, 10^max_exp) it will be printed in fixed-point
+notation. Otherwise it will be printed in exponential notation.
+
+@pre min_exp < 0
+@pre max_exp > 0
+*/
+JSON_HEDLEY_NON_NULL(1)
+JSON_HEDLEY_RETURNS_NON_NULL
+inline char* format_buffer(char* buf, int len, int decimal_exponent,
+                           int min_exp, int max_exp)
+{
+    JSON_ASSERT(min_exp < 0);
+    JSON_ASSERT(max_exp > 0);
+
+    const int k = len;
+    const int n = len + decimal_exponent;
+
+    // v = buf * 10^(n-k)
+    // k is the length of the buffer (number of decimal digits)
+    // n is the position of the decimal point relative to the start of the buffer.
+
+    if (k <= n && n <= max_exp)
+    {
+        // digits[000]
+        // len <= max_exp + 2
+
+        std::memset(buf + k, '0', static_cast<size_t>(n) - static_cast<size_t>(k));
+        // Make it look like a floating-point number (#362, #378)
+        buf[n + 0] = '.';
+        buf[n + 1] = '0';
+        return buf + (static_cast<size_t>(n) + 2);
+    }
+
+    if (0 < n && n <= max_exp)
+    {
+        // dig.its
+        // len <= max_digits10 + 1
+
+        JSON_ASSERT(k > n);
+
+        std::memmove(buf + (static_cast<size_t>(n) + 1), buf + n, static_cast<size_t>(k) - static_cast<size_t>(n));
+        buf[n] = '.';
+        return buf + (static_cast<size_t>(k) + 1U);
+    }
+
+    if (min_exp < n && n <= 0)
+    {
+        // 0.[000]digits
+        // len <= 2 + (-min_exp - 1) + max_digits10
+
+        std::memmove(buf + (2 + static_cast<size_t>(-n)), buf, static_cast<size_t>(k));
+        buf[0] = '0';
+        buf[1] = '.';
+        std::memset(buf + 2, '0', static_cast<size_t>(-n));
+        return buf + (2U + static_cast<size_t>(-n) + static_cast<size_t>(k));
+    }
+
+    if (k == 1)
+    {
+        // dE+123
+        // len <= 1 + 5
+
+        buf += 1;
+    }
+    else
+    {
+        // d.igitsE+123
+        // len <= max_digits10 + 1 + 5
+
+        std::memmove(buf + 2, buf + 1, static_cast<size_t>(k) - 1);
+        buf[1] = '.';
+        buf += 1 + static_cast<size_t>(k);
+    }
+
+    *buf++ = 'e';
+    return append_exponent(buf, n - 1);
+}
+
+} // namespace dtoa_impl
+
+/*!
+@brief generates a decimal representation of the floating-point number value in [first, last).
+
+The format of the resulting decimal representation is similar to printf's %g
+format. Returns an iterator pointing past-the-end of the decimal representation.
+
+@note The input number must be finite, i.e. NaN's and Inf's are not supported.
+@note The buffer must be large enough.
+@note The result is NOT null-terminated.
+*/
+template<typename FloatType>
+JSON_HEDLEY_NON_NULL(1, 2)
+JSON_HEDLEY_RETURNS_NON_NULL
+char* to_chars(char* first, const char* last, FloatType value)
+{
+    static_cast<void>(last); // maybe unused - fix warning
+    JSON_ASSERT(std::isfinite(value));
+
+    // Use signbit(value) instead of (value < 0) since signbit works for -0.
+    if (std::signbit(value))
+    {
+        value = -value;
+        *first++ = '-';
+    }
+
+    if (value == 0) // +-0
+    {
+        *first++ = '0';
+        // Make it look like a floating-point number (#362, #378)
+        *first++ = '.';
+        *first++ = '0';
+        return first;
+    }
+
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10);
+
+    // Compute v = buffer * 10^decimal_exponent.
+    // The decimal digits are stored in the buffer, which needs to be interpreted
+    // as an unsigned decimal integer.
+    // len is the length of the buffer, i.e. the number of decimal digits.
+    int len = 0;
+    int decimal_exponent = 0;
+    dtoa_impl::grisu2(first, len, decimal_exponent, value);
+
+    JSON_ASSERT(len <= std::numeric_limits<FloatType>::max_digits10);
+
+    // Format the buffer like printf("%.*g", prec, value)
+    constexpr int kMinExp = -4;
+    // Use digits10 here to increase compatibility with version 2.
+    constexpr int kMaxExp = std::numeric_limits<FloatType>::digits10;
+
+    JSON_ASSERT(last - first >= kMaxExp + 2);
+    JSON_ASSERT(last - first >= 2 + (-kMinExp - 1) + std::numeric_limits<FloatType>::max_digits10);
+    JSON_ASSERT(last - first >= std::numeric_limits<FloatType>::max_digits10 + 6);
+
+    return dtoa_impl::format_buffer(first, len, decimal_exponent, kMinExp, kMaxExp);
+}
+
+} // namespace detail
+} // namespace nlohmann
+
+// #include <nlohmann/detail/exceptions.hpp>
+
+// #include <nlohmann/detail/macro_scope.hpp>
+
+// #include <nlohmann/detail/meta/cpp_future.hpp>
+
+// #include <nlohmann/detail/output/binary_writer.hpp>
+
+// #include <nlohmann/detail/output/output_adapters.hpp>
+
+// #include <nlohmann/detail/value_t.hpp>
+
+
+namespace nlohmann
+{
+namespace detail
+{
+///////////////////
+// serialization //
+///////////////////
+
+/// how to treat decoding errors
+enum class error_handler_t
+{
+    strict,  ///< throw a type_error exception in case of invalid UTF-8
+    replace, ///< replace invalid UTF-8 sequences with U+FFFD
+    ignore   ///< ignore invalid UTF-8 sequences
+};
+
+template<typename BasicJsonType>
+class serializer
+{
+    using string_t = typename BasicJsonType::string_t;
+    using number_float_t = typename BasicJsonType::number_float_t;
+    using number_integer_t = typename BasicJsonType::number_integer_t;
+    using number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+    using binary_char_t = typename BasicJsonType::binary_t::value_type;
+    static constexpr std::uint8_t UTF8_ACCEPT = 0;
+    static constexpr std::uint8_t UTF8_REJECT = 1;
+
+  public:
+    /*!
+    @param[in] s  output stream to serialize to
+    @param[in] ichar  indentation character to use
+    @param[in] error_handler_  how to react on decoding errors
+    */
+    serializer(output_adapter_t<char> s, const char ichar,
+               error_handler_t error_handler_ = error_handler_t::strict)
+        : o(std::move(s))
+        , loc(std::localeconv())
+        , thousands_sep(loc->thousands_sep == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->thousands_sep)))
+        , decimal_point(loc->decimal_point == nullptr ? '\0' : std::char_traits<char>::to_char_type(* (loc->decimal_point)))
+        , indent_char(ichar)
+        , indent_string(512, indent_char)
+        , error_handler(error_handler_)
+    {}
+
+    // delete because of pointer members
+    serializer(const serializer&) = delete;
+    serializer& operator=(const serializer&) = delete;
+    serializer(serializer&&) = delete;
+    serializer& operator=(serializer&&) = delete;
+    ~serializer() = default;
+
+    /*!
+    @brief internal implementation of the serialization function
+
+    This function is called by the public member function dump and organizes
+    the serialization internally. The indentation level is propagated as
+    additional parameter. In case of arrays and objects, the function is
+    called recursively.
+
+    - strings and object keys are escaped using `escape_string()`
+    - integer numbers are converted implicitly via `operator<<`
+    - floating-point numbers are converted to a string using `"%g"` format
+    - binary values are serialized as objects containing the subtype and the
+      byte array
+
+    @param[in] val               value to serialize
+    @param[in] pretty_print      whether the output shall be pretty-printed
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] indent_step       the indent level
+    @param[in] current_indent    the current indent level (only used internally)
+    */
+    void dump(const BasicJsonType& val,
+              const bool pretty_print,
+              const bool ensure_ascii,
+              const unsigned int indent_step,
+              const unsigned int current_indent = 0)
+    {
+        switch (val.m_type)
+        {
+            case value_t::object:
+            {
+                if (val.m_value.object->empty())
+                {
+                    o->write_characters("{}", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\": ", 3);
+                        dump(i->second, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\": ", 3);
+                    dump(i->second, true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_character('{');
+
+                    // first n-1 elements
+                    auto i = val.m_value.object->cbegin();
+                    for (std::size_t cnt = 0; cnt < val.m_value.object->size() - 1; ++cnt, ++i)
+                    {
+                        o->write_character('\"');
+                        dump_escaped(i->first, ensure_ascii);
+                        o->write_characters("\":", 2);
+                        dump(i->second, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(i != val.m_value.object->cend());
+                    JSON_ASSERT(std::next(i) == val.m_value.object->cend());
+                    o->write_character('\"');
+                    dump_escaped(i->first, ensure_ascii);
+                    o->write_characters("\":", 2);
+                    dump(i->second, false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character('}');
+                }
+
+                return;
+            }
+
+            case value_t::array:
+            {
+                if (val.m_value.array->empty())
+                {
+                    o->write_characters("[]", 2);
+                    return;
+                }
+
+                if (pretty_print)
+                {
+                    o->write_characters("[\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        o->write_characters(indent_string.c_str(), new_indent);
+                        dump(*i, true, ensure_ascii, indent_step, new_indent);
+                        o->write_characters(",\n", 2);
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_value.array->empty());
+                    o->write_characters(indent_string.c_str(), new_indent);
+                    dump(val.m_value.array->back(), true, ensure_ascii, indent_step, new_indent);
+
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character(']');
+                }
+                else
+                {
+                    o->write_character('[');
+
+                    // first n-1 elements
+                    for (auto i = val.m_value.array->cbegin();
+                            i != val.m_value.array->cend() - 1; ++i)
+                    {
+                        dump(*i, false, ensure_ascii, indent_step, current_indent);
+                        o->write_character(',');
+                    }
+
+                    // last element
+                    JSON_ASSERT(!val.m_value.array->empty());
+                    dump(val.m_value.array->back(), false, ensure_ascii, indent_step, current_indent);
+
+                    o->write_character(']');
+                }
+
+                return;
+            }
+
+            case value_t::string:
+            {
+                o->write_character('\"');
+                dump_escaped(*val.m_value.string, ensure_ascii);
+                o->write_character('\"');
+                return;
+            }
+
+            case value_t::binary:
+            {
+                if (pretty_print)
+                {
+                    o->write_characters("{\n", 2);
+
+                    // variable to hold indentation for recursive calls
+                    const auto new_indent = current_indent + indent_step;
+                    if (JSON_HEDLEY_UNLIKELY(indent_string.size() < new_indent))
+                    {
+                        indent_string.resize(indent_string.size() * 2, ' ');
+                    }
+
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"bytes\": [", 10);
+
+                    if (!val.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_value.binary->cbegin();
+                                i != val.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_characters(", ", 2);
+                        }
+                        dump_integer(val.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\n", 3);
+                    o->write_characters(indent_string.c_str(), new_indent);
+
+                    o->write_characters("\"subtype\": ", 11);
+                    if (val.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_value.binary->subtype());
+                    }
+                    else
+                    {
+                        o->write_characters("null", 4);
+                    }
+                    o->write_character('\n');
+                    o->write_characters(indent_string.c_str(), current_indent);
+                    o->write_character('}');
+                }
+                else
+                {
+                    o->write_characters("{\"bytes\":[", 10);
+
+                    if (!val.m_value.binary->empty())
+                    {
+                        for (auto i = val.m_value.binary->cbegin();
+                                i != val.m_value.binary->cend() - 1; ++i)
+                        {
+                            dump_integer(*i);
+                            o->write_character(',');
+                        }
+                        dump_integer(val.m_value.binary->back());
+                    }
+
+                    o->write_characters("],\"subtype\":", 12);
+                    if (val.m_value.binary->has_subtype())
+                    {
+                        dump_integer(val.m_value.binary->subtype());
+                        o->write_character('}');
+                    }
+                    else
+                    {
+                        o->write_characters("null}", 5);
+                    }
+                }
+                return;
+            }
+
+            case value_t::boolean:
+            {
+                if (val.m_value.boolean)
+                {
+                    o->write_characters("true", 4);
+                }
+                else
+                {
+                    o->write_characters("false", 5);
+                }
+                return;
+            }
+
+            case value_t::number_integer:
+            {
+                dump_integer(val.m_value.number_integer);
+                return;
+            }
+
+            case value_t::number_unsigned:
+            {
+                dump_integer(val.m_value.number_unsigned);
+                return;
+            }
+
+            case value_t::number_float:
+            {
+                dump_float(val.m_value.number_float);
+                return;
+            }
+
+            case value_t::discarded:
+            {
+                o->write_characters("<discarded>", 11);
+                return;
+            }
+
+            case value_t::null:
+            {
+                o->write_characters("null", 4);
+                return;
+            }
+
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+        }
+    }
+
+  private:
+    /*!
+    @brief dump escaped string
+
+    Escape a string by replacing certain special characters by a sequence of an
+    escape character (backslash) and another character and other control
+    characters by a sequence of "\u" followed by a four-digit hex
+    representation. The escaped string is written to output stream @a o.
+
+    @param[in] s  the string to escape
+    @param[in] ensure_ascii  whether to escape non-ASCII characters with
+                             \uXXXX sequences
+
+    @complexity Linear in the length of string @a s.
+    */
+    void dump_escaped(const string_t& s, const bool ensure_ascii)
+    {
+        std::uint32_t codepoint;
+        std::uint8_t state = UTF8_ACCEPT;
+        std::size_t bytes = 0;  // number of bytes written to string_buffer
+
+        // number of bytes written at the point of the last valid byte
+        std::size_t bytes_after_last_accept = 0;
+        std::size_t undumped_chars = 0;
+
+        for (std::size_t i = 0; i < s.size(); ++i)
+        {
+            const auto byte = static_cast<uint8_t>(s[i]);
+
+            switch (decode(state, codepoint, byte))
+            {
+                case UTF8_ACCEPT:  // decode found a new code point
+                {
+                    switch (codepoint)
+                    {
+                        case 0x08: // backspace
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'b';
+                            break;
+                        }
+
+                        case 0x09: // horizontal tab
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 't';
+                            break;
+                        }
+
+                        case 0x0A: // newline
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'n';
+                            break;
+                        }
+
+                        case 0x0C: // formfeed
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'f';
+                            break;
+                        }
+
+                        case 0x0D: // carriage return
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = 'r';
+                            break;
+                        }
+
+                        case 0x22: // quotation mark
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\"';
+                            break;
+                        }
+
+                        case 0x5C: // reverse solidus
+                        {
+                            string_buffer[bytes++] = '\\';
+                            string_buffer[bytes++] = '\\';
+                            break;
+                        }
+
+                        default:
+                        {
+                            // escape control characters (0x00..0x1F) or, if
+                            // ensure_ascii parameter is used, non-ASCII characters
+                            if ((codepoint <= 0x1F) || (ensure_ascii && (codepoint >= 0x7F)))
+                            {
+                                if (codepoint <= 0xFFFF)
+                                {
+                                    (std::snprintf)(string_buffer.data() + bytes, 7, "\\u%04x",
+                                                    static_cast<std::uint16_t>(codepoint));
+                                    bytes += 6;
+                                }
+                                else
+                                {
+                                    (std::snprintf)(string_buffer.data() + bytes, 13, "\\u%04x\\u%04x",
+                                                    static_cast<std::uint16_t>(0xD7C0u + (codepoint >> 10u)),
+                                                    static_cast<std::uint16_t>(0xDC00u + (codepoint & 0x3FFu)));
+                                    bytes += 12;
+                                }
+                            }
+                            else
+                            {
+                                // copy byte to buffer (all previous bytes
+                                // been copied have in default case above)
+                                string_buffer[bytes++] = s[i];
+                            }
+                            break;
+                        }
+                    }
+
+                    // write buffer and reset index; there must be 13 bytes
+                    // left, as this is the maximal number of bytes to be
+                    // written ("\uxxxx\uxxxx\0") for one code point
+                    if (string_buffer.size() - bytes < 13)
+                    {
+                        o->write_characters(string_buffer.data(), bytes);
+                        bytes = 0;
+                    }
+
+                    // remember the byte position of this accept
+                    bytes_after_last_accept = bytes;
+                    undumped_chars = 0;
+                    break;
+                }
+
+                case UTF8_REJECT:  // decode found invalid UTF-8 byte
+                {
+                    switch (error_handler)
+                    {
+                        case error_handler_t::strict:
+                        {
+                            std::string sn(3, '\0');
+                            (std::snprintf)(&sn[0], sn.size(), "%.2X", byte);
+                            JSON_THROW(type_error::create(316, "invalid UTF-8 byte at index " + std::to_string(i) + ": 0x" + sn));
+                        }
+
+                        case error_handler_t::ignore:
+                        case error_handler_t::replace:
+                        {
+                            // in case we saw this character the first time, we
+                            // would like to read it again, because the byte
+                            // may be OK for itself, but just not OK for the
+                            // previous sequence
+                            if (undumped_chars > 0)
+                            {
+                                --i;
+                            }
+
+                            // reset length buffer to the last accepted index;
+                            // thus removing/ignoring the invalid characters
+                            bytes = bytes_after_last_accept;
+
+                            if (error_handler == error_handler_t::replace)
+                            {
+                                // add a replacement character
+                                if (ensure_ascii)
+                                {
+                                    string_buffer[bytes++] = '\\';
+                                    string_buffer[bytes++] = 'u';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'f';
+                                    string_buffer[bytes++] = 'd';
+                                }
+                                else
+                                {
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xEF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBF');
+                                    string_buffer[bytes++] = detail::binary_writer<BasicJsonType, char>::to_char_type('\xBD');
+                                }
+
+                                // write buffer and reset index; there must be 13 bytes
+                                // left, as this is the maximal number of bytes to be
+                                // written ("\uxxxx\uxxxx\0") for one code point
+                                if (string_buffer.size() - bytes < 13)
+                                {
+                                    o->write_characters(string_buffer.data(), bytes);
+                                    bytes = 0;
+                                }
+
+                                bytes_after_last_accept = bytes;
+                            }
+
+                            undumped_chars = 0;
+
+                            // continue processing the string
+                            state = UTF8_ACCEPT;
+                            break;
+                        }
+
+                        default:            // LCOV_EXCL_LINE
+                            JSON_ASSERT(false);  // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+
+                default:  // decode found yet incomplete multi-byte code point
+                {
+                    if (!ensure_ascii)
+                    {
+                        // code point will not be escaped - copy byte to buffer
+                        string_buffer[bytes++] = s[i];
+                    }
+                    ++undumped_chars;
+                    break;
+                }
+            }
+        }
+
+        // we finished processing the string
+        if (JSON_HEDLEY_LIKELY(state == UTF8_ACCEPT))
+        {
+            // write buffer
+            if (bytes > 0)
+            {
+                o->write_characters(string_buffer.data(), bytes);
+            }
+        }
+        else
+        {
+            // we finish reading, but do not accept: string was incomplete
+            switch (error_handler)
+            {
+                case error_handler_t::strict:
+                {
+                    std::string sn(3, '\0');
+                    (std::snprintf)(&sn[0], sn.size(), "%.2X", static_cast<std::uint8_t>(s.back()));
+                    JSON_THROW(type_error::create(316, "incomplete UTF-8 string; last byte: 0x" + sn));
+                }
+
+                case error_handler_t::ignore:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    break;
+                }
+
+                case error_handler_t::replace:
+                {
+                    // write all accepted bytes
+                    o->write_characters(string_buffer.data(), bytes_after_last_accept);
+                    // add a replacement character
+                    if (ensure_ascii)
+                    {
+                        o->write_characters("\\ufffd", 6);
+                    }
+                    else
+                    {
+                        o->write_characters("\xEF\xBF\xBD", 3);
+                    }
+                    break;
+                }
+
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false);  // LCOV_EXCL_LINE
+            }
+        }
+    }
+
+    /*!
+    @brief count digits
+
+    Count the number of decimal (base 10) digits for an input unsigned integer.
+
+    @param[in] x  unsigned integer number to count its digits
+    @return    number of decimal digits
+    */
+    inline unsigned int count_digits(number_unsigned_t x) noexcept
+    {
+        unsigned int n_digits = 1;
+        for (;;)
+        {
+            if (x < 10)
+            {
+                return n_digits;
+            }
+            if (x < 100)
+            {
+                return n_digits + 1;
+            }
+            if (x < 1000)
+            {
+                return n_digits + 2;
+            }
+            if (x < 10000)
+            {
+                return n_digits + 3;
+            }
+            x = x / 10000u;
+            n_digits += 4;
+        }
+    }
+
+    /*!
+    @brief dump an integer
+
+    Dump a given integer to output stream @a o. Works internally with
+    @a number_buffer.
+
+    @param[in] x  integer number (signed or unsigned) to dump
+    @tparam NumberType either @a number_integer_t or @a number_unsigned_t
+    */
+    template < typename NumberType, detail::enable_if_t <
+                   std::is_same<NumberType, number_unsigned_t>::value ||
+                   std::is_same<NumberType, number_integer_t>::value ||
+                   std::is_same<NumberType, binary_char_t>::value,
+                   int > = 0 >
+    void dump_integer(NumberType x)
+    {
+        static constexpr std::array<std::array<char, 2>, 100> digits_to_99
+        {
+            {
+                {{'0', '0'}}, {{'0', '1'}}, {{'0', '2'}}, {{'0', '3'}}, {{'0', '4'}}, {{'0', '5'}}, {{'0', '6'}}, {{'0', '7'}}, {{'0', '8'}}, {{'0', '9'}},
+                {{'1', '0'}}, {{'1', '1'}}, {{'1', '2'}}, {{'1', '3'}}, {{'1', '4'}}, {{'1', '5'}}, {{'1', '6'}}, {{'1', '7'}}, {{'1', '8'}}, {{'1', '9'}},
+                {{'2', '0'}}, {{'2', '1'}}, {{'2', '2'}}, {{'2', '3'}}, {{'2', '4'}}, {{'2', '5'}}, {{'2', '6'}}, {{'2', '7'}}, {{'2', '8'}}, {{'2', '9'}},
+                {{'3', '0'}}, {{'3', '1'}}, {{'3', '2'}}, {{'3', '3'}}, {{'3', '4'}}, {{'3', '5'}}, {{'3', '6'}}, {{'3', '7'}}, {{'3', '8'}}, {{'3', '9'}},
+                {{'4', '0'}}, {{'4', '1'}}, {{'4', '2'}}, {{'4', '3'}}, {{'4', '4'}}, {{'4', '5'}}, {{'4', '6'}}, {{'4', '7'}}, {{'4', '8'}}, {{'4', '9'}},
+                {{'5', '0'}}, {{'5', '1'}}, {{'5', '2'}}, {{'5', '3'}}, {{'5', '4'}}, {{'5', '5'}}, {{'5', '6'}}, {{'5', '7'}}, {{'5', '8'}}, {{'5', '9'}},
+                {{'6', '0'}}, {{'6', '1'}}, {{'6', '2'}}, {{'6', '3'}}, {{'6', '4'}}, {{'6', '5'}}, {{'6', '6'}}, {{'6', '7'}}, {{'6', '8'}}, {{'6', '9'}},
+                {{'7', '0'}}, {{'7', '1'}}, {{'7', '2'}}, {{'7', '3'}}, {{'7', '4'}}, {{'7', '5'}}, {{'7', '6'}}, {{'7', '7'}}, {{'7', '8'}}, {{'7', '9'}},
+                {{'8', '0'}}, {{'8', '1'}}, {{'8', '2'}}, {{'8', '3'}}, {{'8', '4'}}, {{'8', '5'}}, {{'8', '6'}}, {{'8', '7'}}, {{'8', '8'}}, {{'8', '9'}},
+                {{'9', '0'}}, {{'9', '1'}}, {{'9', '2'}}, {{'9', '3'}}, {{'9', '4'}}, {{'9', '5'}}, {{'9', '6'}}, {{'9', '7'}}, {{'9', '8'}}, {{'9', '9'}},
+            }
+        };
+
+        // special case for "0"
+        if (x == 0)
+        {
+            o->write_character('0');
+            return;
+        }
+
+        // use a pointer to fill the buffer
+        auto buffer_ptr = number_buffer.begin();
+
+        const bool is_negative = std::is_same<NumberType, number_integer_t>::value && !(x >= 0); // see issue #755
+        number_unsigned_t abs_value;
+
+        unsigned int n_chars;
+
+        if (is_negative)
+        {
+            *buffer_ptr = '-';
+            abs_value = remove_sign(static_cast<number_integer_t>(x));
+
+            // account one more byte for the minus sign
+            n_chars = 1 + count_digits(abs_value);
+        }
+        else
+        {
+            abs_value = static_cast<number_unsigned_t>(x);
+            n_chars = count_digits(abs_value);
+        }
+
+        // spare 1 byte for '\0'
+        JSON_ASSERT(n_chars < number_buffer.size() - 1);
+
+        // jump to the end to generate the string from backward
+        // so we later avoid reversing the result
+        buffer_ptr += n_chars;
+
+        // Fast int2ascii implementation inspired by "Fastware" talk by Andrei Alexandrescu
+        // See: https://www.youtube.com/watch?v=o4-CwDo2zpg
+        while (abs_value >= 100)
+        {
+            const auto digits_index = static_cast<unsigned>((abs_value % 100));
+            abs_value /= 100;
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+
+        if (abs_value >= 10)
+        {
+            const auto digits_index = static_cast<unsigned>(abs_value);
+            *(--buffer_ptr) = digits_to_99[digits_index][1];
+            *(--buffer_ptr) = digits_to_99[digits_index][0];
+        }
+        else
+        {
+            *(--buffer_ptr) = static_cast<char>('0' + abs_value);
+        }
+
+        o->write_characters(number_buffer.data(), n_chars);
+    }
+
+    /*!
+    @brief dump a floating-point number
+
+    Dump a given floating-point number to output stream @a o. Works internally
+    with @a number_buffer.
+
+    @param[in] x  floating-point number to dump
+    */
+    void dump_float(number_float_t x)
+    {
+        // NaN / inf
+        if (!std::isfinite(x))
+        {
+            o->write_characters("null", 4);
+            return;
+        }
+
+        // If number_float_t is an IEEE-754 single or double precision number,
+        // use the Grisu2 algorithm to produce short numbers which are
+        // guaranteed to round-trip, using strtof and strtod, resp.
+        //
+        // NB: The test below works if <long double> == <double>.
+        static constexpr bool is_ieee_single_or_double
+            = (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 24 && std::numeric_limits<number_float_t>::max_exponent == 128) ||
+              (std::numeric_limits<number_float_t>::is_iec559 && std::numeric_limits<number_float_t>::digits == 53 && std::numeric_limits<number_float_t>::max_exponent == 1024);
+
+        dump_float(x, std::integral_constant<bool, is_ieee_single_or_double>());
+    }
+
+    void dump_float(number_float_t x, std::true_type /*is_ieee_single_or_double*/)
+    {
+        char* begin = number_buffer.data();
+        char* end = ::nlohmann::detail::to_chars(begin, begin + number_buffer.size(), x);
+
+        o->write_characters(begin, static_cast<size_t>(end - begin));
+    }
+
+    void dump_float(number_float_t x, std::false_type /*is_ieee_single_or_double*/)
+    {
+        // get number of digits for a float -> text -> float round-trip
+        static constexpr auto d = std::numeric_limits<number_float_t>::max_digits10;
+
+        // the actual conversion
+        std::ptrdiff_t len = (std::snprintf)(number_buffer.data(), number_buffer.size(), "%.*g", d, x);
+
+        // negative value indicates an error
+        JSON_ASSERT(len > 0);
+        // check if buffer was large enough
+        JSON_ASSERT(static_cast<std::size_t>(len) < number_buffer.size());
+
+        // erase thousands separator
+        if (thousands_sep != '\0')
+        {
+            const auto end = std::remove(number_buffer.begin(),
+                                         number_buffer.begin() + len, thousands_sep);
+            std::fill(end, number_buffer.end(), '\0');
+            JSON_ASSERT((end - number_buffer.begin()) <= len);
+            len = (end - number_buffer.begin());
+        }
+
+        // convert decimal point to '.'
+        if (decimal_point != '\0' && decimal_point != '.')
+        {
+            const auto dec_pos = std::find(number_buffer.begin(), number_buffer.end(), decimal_point);
+            if (dec_pos != number_buffer.end())
+            {
+                *dec_pos = '.';
+            }
+        }
+
+        o->write_characters(number_buffer.data(), static_cast<std::size_t>(len));
+
+        // determine if need to append ".0"
+        const bool value_is_int_like =
+            std::none_of(number_buffer.begin(), number_buffer.begin() + len + 1,
+                         [](char c)
+        {
+            return c == '.' || c == 'e';
+        });
+
+        if (value_is_int_like)
+        {
+            o->write_characters(".0", 2);
+        }
+    }
+
+    /*!
+    @brief check whether a string is UTF-8 encoded
+
+    The function checks each byte of a string whether it is UTF-8 encoded. The
+    result of the check is stored in the @a state parameter. The function must
+    be called initially with state 0 (accept). State 1 means the string must
+    be rejected, because the current byte is not allowed. If the string is
+    completely processed, but the state is non-zero, the string ended
+    prematurely; that is, the last byte indicated more bytes should have
+    followed.
+
+    @param[in,out] state  the state of the decoding
+    @param[in,out] codep  codepoint (valid only if resulting state is UTF8_ACCEPT)
+    @param[in] byte       next byte to decode
+    @return               new state
+
+    @note The function has been edited: a std::array is used.
+
+    @copyright Copyright (c) 2008-2009 Bjoern Hoehrmann <bjoern@hoehrmann.de>
+    @sa http://bjoern.hoehrmann.de/utf-8/decoder/dfa/
+    */
+    static std::uint8_t decode(std::uint8_t& state, std::uint32_t& codep, const std::uint8_t byte) noexcept
+    {
+        static const std::array<std::uint8_t, 400> utf8d =
+        {
+            {
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 00..1F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 20..3F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 40..5F
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, // 60..7F
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, 9, // 80..9F
+                7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, // A0..BF
+                8, 8, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, // C0..DF
+                0xA, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x3, 0x4, 0x3, 0x3, // E0..EF
+                0xB, 0x6, 0x6, 0x6, 0x5, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, 0x8, // F0..FF
+                0x0, 0x1, 0x2, 0x3, 0x5, 0x8, 0x7, 0x1, 0x1, 0x1, 0x4, 0x6, 0x1, 0x1, 0x1, 0x1, // s0..s0
+                1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, // s1..s2
+                1, 2, 1, 1, 1, 1, 1, 2, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, // s3..s4
+                1, 2, 1, 1, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, // s5..s6
+                1, 3, 1, 1, 1, 1, 1, 3, 1, 3, 1, 1, 1, 1, 1, 1, 1, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 // s7..s8
+            }
+        };
+
+        const std::uint8_t type = utf8d[byte];
+
+        codep = (state != UTF8_ACCEPT)
+                ? (byte & 0x3fu) | (codep << 6u)
+                : (0xFFu >> type) & (byte);
+
+        std::size_t index = 256u + static_cast<size_t>(state) * 16u + static_cast<size_t>(type);
+        JSON_ASSERT(index < 400);
+        state = utf8d[index];
+        return state;
+    }
+
+    /*
+     * Overload to make the compiler happy while it is instantiating
+     * dump_integer for number_unsigned_t.
+     * Must never be called.
+     */
+    number_unsigned_t remove_sign(number_unsigned_t x)
+    {
+        JSON_ASSERT(false); // LCOV_EXCL_LINE
+        return x; // LCOV_EXCL_LINE
+    }
+
+    /*
+     * Helper function for dump_integer
+     *
+     * This function takes a negative signed integer and returns its absolute
+     * value as unsigned integer. The plus/minus shuffling is necessary as we can
+     * not directly remove the sign of an arbitrary signed integer as the
+     * absolute values of INT_MIN and INT_MAX are usually not the same. See
+     * #1708 for details.
+     */
+    inline number_unsigned_t remove_sign(number_integer_t x) noexcept
+    {
+        JSON_ASSERT(x < 0 && x < (std::numeric_limits<number_integer_t>::max)());
+        return static_cast<number_unsigned_t>(-(x + 1)) + 1;
+    }
+
+  private:
+    /// the output of the serializer
+    output_adapter_t<char> o = nullptr;
+
+    /// a (hopefully) large enough character buffer
+    std::array<char, 64> number_buffer{{}};
+
+    /// the locale
+    const std::lconv* loc = nullptr;
+    /// the locale's thousand separator character
+    const char thousands_sep = '\0';
+    /// the locale's decimal point character
+    const char decimal_point = '\0';
+
+    /// string buffer
+    std::array<char, 512> string_buffer{{}};
+
+    /// the indentation character
+    const char indent_char;
+    /// the indentation string
+    string_t indent_string;
+
+    /// error_handler how to react on decoding errors
+    const error_handler_t error_handler;
+};
+}  // namespace detail
+}  // namespace nlohmann
+
+// #include <nlohmann/detail/value_t.hpp>
+
+// #include <nlohmann/json_fwd.hpp>
+
+// #include <nlohmann/ordered_map.hpp>
+
+
+#include <functional> // less
+#include <memory> // allocator
+#include <utility> // pair
+#include <vector> // vector
+
+namespace nlohmann
+{
+
+/// ordered_map: a minimal map-like container that preserves insertion order
+/// for use within nlohmann::basic_json<ordered_map>
+template <class Key, class T, class IgnoredLess = std::less<Key>,
+          class Allocator = std::allocator<std::pair<const Key, T>>>
+                  struct ordered_map : std::vector<std::pair<const Key, T>, Allocator>
+{
+    using key_type = Key;
+    using mapped_type = T;
+    using Container = std::vector<std::pair<const Key, T>, Allocator>;
+    using typename Container::iterator;
+    using typename Container::const_iterator;
+    using typename Container::size_type;
+    using typename Container::value_type;
+
+    // Explicit constructors instead of `using Container::Container`
+    // otherwise older compilers choke on it (GCC <= 5.5, xcode <= 9.4)
+    ordered_map(const Allocator& alloc = Allocator()) : Container{alloc} {}
+    template <class It>
+    ordered_map(It first, It last, const Allocator& alloc = Allocator())
+        : Container{first, last, alloc} {}
+    ordered_map(std::initializer_list<T> init, const Allocator& alloc = Allocator() )
+        : Container{init, alloc} {}
+
+    std::pair<iterator, bool> emplace(const key_type& key, T&& t)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return {it, false};
+            }
+        }
+        Container::emplace_back(key, t);
+        return {--this->end(), true};
+    }
+
+    T& operator[](const Key& key)
+    {
+        return emplace(key, T{}).first->second;
+    }
+
+    const T& operator[](const Key& key) const
+    {
+        return at(key);
+    }
+
+    T& at(const Key& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it->second;
+            }
+        }
+
+        throw std::out_of_range("key not found");
+    }
+
+    const T& at(const Key& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it->second;
+            }
+        }
+
+        throw std::out_of_range("key not found");
+    }
+
+    size_type erase(const Key& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                // Since we cannot move const Keys, re-construct them in place
+                for (auto next = it; ++next != this->end(); ++it)
+                {
+                    it->~value_type(); // Destroy but keep allocation
+                    new (&*it) value_type{std::move(*next)};
+                }
+                Container::pop_back();
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator erase(iterator pos)
+    {
+        auto it = pos;
+
+        // Since we cannot move const Keys, re-construct them in place
+        for (auto next = it; ++next != this->end(); ++it)
+        {
+            it->~value_type(); // Destroy but keep allocation
+            new (&*it) value_type{std::move(*next)};
+        }
+        Container::pop_back();
+        return pos;
+    }
+
+    size_type count(const Key& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return 1;
+            }
+        }
+        return 0;
+    }
+
+    iterator find(const Key& key)
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    const_iterator find(const Key& key) const
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == key)
+            {
+                return it;
+            }
+        }
+        return Container::end();
+    }
+
+    std::pair<iterator, bool> insert( value_type&& value )
+    {
+        return emplace(value.first, std::move(value.second));
+    }
+
+    std::pair<iterator, bool> insert( const value_type& value )
+    {
+        for (auto it = this->begin(); it != this->end(); ++it)
+        {
+            if (it->first == value.first)
+            {
+                return {it, false};
+            }
+        }
+        Container::push_back(value);
+        return {--this->end(), true};
+    }
+};
+
+}  // namespace nlohmann
+
+
+/*!
+@brief namespace for Niels Lohmann
+@see https://github.com/nlohmann
+@since version 1.0.0
+*/
+namespace nlohmann
+{
+
+/*!
+@brief a class to store JSON values
+
+@tparam ObjectType type for JSON objects (`std::map` by default; will be used
+in @ref object_t)
+@tparam ArrayType type for JSON arrays (`std::vector` by default; will be used
+in @ref array_t)
+@tparam StringType type for JSON strings and object keys (`std::string` by
+default; will be used in @ref string_t)
+@tparam BooleanType type for JSON booleans (`bool` by default; will be used
+in @ref boolean_t)
+@tparam NumberIntegerType type for JSON integer numbers (`int64_t` by
+default; will be used in @ref number_integer_t)
+@tparam NumberUnsignedType type for JSON unsigned integer numbers (@c
+`uint64_t` by default; will be used in @ref number_unsigned_t)
+@tparam NumberFloatType type for JSON floating-point numbers (`double` by
+default; will be used in @ref number_float_t)
+@tparam BinaryType type for packed binary data for compatibility with binary
+serialization formats (`std::vector<std::uint8_t>` by default; will be used in
+@ref binary_t)
+@tparam AllocatorType type of the allocator to use (`std::allocator` by
+default)
+@tparam JSONSerializer the serializer to resolve internal calls to `to_json()`
+and `from_json()` (@ref adl_serializer by default)
+
+@requirement The class satisfies the following concept requirements:
+- Basic
+ - [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible):
+   JSON values can be default constructed. The result will be a JSON null
+   value.
+ - [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible):
+   A JSON value can be constructed from an rvalue argument.
+ - [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible):
+   A JSON value can be copy-constructed from an lvalue expression.
+ - [MoveAssignable](https://en.cppreference.com/w/cpp/named_req/MoveAssignable):
+   A JSON value van be assigned from an rvalue argument.
+ - [CopyAssignable](https://en.cppreference.com/w/cpp/named_req/CopyAssignable):
+   A JSON value can be copy-assigned from an lvalue expression.
+ - [Destructible](https://en.cppreference.com/w/cpp/named_req/Destructible):
+   JSON values can be destructed.
+- Layout
+ - [StandardLayoutType](https://en.cppreference.com/w/cpp/named_req/StandardLayoutType):
+   JSON values have
+   [standard layout](https://en.cppreference.com/w/cpp/language/data_members#Standard_layout):
+   All non-static data members are private and standard layout types, the
+   class has no virtual functions or (virtual) base classes.
+- Library-wide
+ - [EqualityComparable](https://en.cppreference.com/w/cpp/named_req/EqualityComparable):
+   JSON values can be compared with `==`, see @ref
+   operator==(const_reference,const_reference).
+ - [LessThanComparable](https://en.cppreference.com/w/cpp/named_req/LessThanComparable):
+   JSON values can be compared with `<`, see @ref
+   operator<(const_reference,const_reference).
+ - [Swappable](https://en.cppreference.com/w/cpp/named_req/Swappable):
+   Any JSON lvalue or rvalue of can be swapped with any lvalue or rvalue of
+   other compatible types, using unqualified function call @ref swap().
+ - [NullablePointer](https://en.cppreference.com/w/cpp/named_req/NullablePointer):
+   JSON values can be compared against `std::nullptr_t` objects which are used
+   to model the `null` value.
+- Container
+ - [Container](https://en.cppreference.com/w/cpp/named_req/Container):
+   JSON values can be used like STL containers and provide iterator access.
+ - [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer);
+   JSON values can be used like STL containers and provide reverse iterator
+   access.
+
+@invariant The member variables @a m_value and @a m_type have the following
+relationship:
+- If `m_type == value_t::object`, then `m_value.object != nullptr`.
+- If `m_type == value_t::array`, then `m_value.array != nullptr`.
+- If `m_type == value_t::string`, then `m_value.string != nullptr`.
+The invariants are checked by member function assert_invariant().
+
+@internal
+@note ObjectType trick from https://stackoverflow.com/a/9860911
+@endinternal
+
+@see [RFC 7159: The JavaScript Object Notation (JSON) Data Interchange
+Format](http://rfc7159.net/rfc7159)
+
+@since version 1.0.0
+
+@nosubgrouping
+*/
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+class basic_json
+{
+  private:
+    template<detail::value_t> friend struct detail::external_constructor;
+    friend ::nlohmann::json_pointer<basic_json>;
+
+    template<typename BasicJsonType, typename InputType>
+    friend class ::nlohmann::detail::parser;
+    friend ::nlohmann::detail::serializer<basic_json>;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::iter_impl;
+    template<typename BasicJsonType, typename CharType>
+    friend class ::nlohmann::detail::binary_writer;
+    template<typename BasicJsonType, typename InputType, typename SAX>
+    friend class ::nlohmann::detail::binary_reader;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_parser;
+    template<typename BasicJsonType>
+    friend class ::nlohmann::detail::json_sax_dom_callback_parser;
+
+    /// workaround type for MSVC
+    using basic_json_t = NLOHMANN_BASIC_JSON_TPL;
+
+    // convenience aliases for types residing in namespace detail;
+    using lexer = ::nlohmann::detail::lexer_base<basic_json>;
+
+    template<typename InputAdapterType>
+    static ::nlohmann::detail::parser<basic_json, InputAdapterType> parser(
+        InputAdapterType adapter,
+        detail::parser_callback_t<basic_json>cb = nullptr,
+        const bool allow_exceptions = true,
+        const bool ignore_comments = false
+                                 )
+    {
+        return ::nlohmann::detail::parser<basic_json, InputAdapterType>(std::move(adapter),
+                std::move(cb), allow_exceptions, ignore_comments);
+    }
+
+    using primitive_iterator_t = ::nlohmann::detail::primitive_iterator_t;
+    template<typename BasicJsonType>
+    using internal_iterator = ::nlohmann::detail::internal_iterator<BasicJsonType>;
+    template<typename BasicJsonType>
+    using iter_impl = ::nlohmann::detail::iter_impl<BasicJsonType>;
+    template<typename Iterator>
+    using iteration_proxy = ::nlohmann::detail::iteration_proxy<Iterator>;
+    template<typename Base> using json_reverse_iterator = ::nlohmann::detail::json_reverse_iterator<Base>;
+
+    template<typename CharType>
+    using output_adapter_t = ::nlohmann::detail::output_adapter_t<CharType>;
+
+    template<typename InputType>
+    using binary_reader = ::nlohmann::detail::binary_reader<basic_json, InputType>;
+    template<typename CharType> using binary_writer = ::nlohmann::detail::binary_writer<basic_json, CharType>;
+
+    using serializer = ::nlohmann::detail::serializer<basic_json>;
+
+  public:
+    using value_t = detail::value_t;
+    /// JSON Pointer, see @ref nlohmann::json_pointer
+    using json_pointer = ::nlohmann::json_pointer<basic_json>;
+    template<typename T, typename SFINAE>
+    using json_serializer = JSONSerializer<T, SFINAE>;
+    /// how to treat decoding errors
+    using error_handler_t = detail::error_handler_t;
+    /// how to treat CBOR tags
+    using cbor_tag_handler_t = detail::cbor_tag_handler_t;
+    /// helper type for initializer lists of basic_json values
+    using initializer_list_t = std::initializer_list<detail::json_ref<basic_json>>;
+
+    using input_format_t = detail::input_format_t;
+    /// SAX interface type, see @ref nlohmann::json_sax
+    using json_sax_t = json_sax<basic_json>;
+
+    ////////////////
+    // exceptions //
+    ////////////////
+
+    /// @name exceptions
+    /// Classes to implement user-defined exceptions.
+    /// @{
+
+    /// @copydoc detail::exception
+    using exception = detail::exception;
+    /// @copydoc detail::parse_error
+    using parse_error = detail::parse_error;
+    /// @copydoc detail::invalid_iterator
+    using invalid_iterator = detail::invalid_iterator;
+    /// @copydoc detail::type_error
+    using type_error = detail::type_error;
+    /// @copydoc detail::out_of_range
+    using out_of_range = detail::out_of_range;
+    /// @copydoc detail::other_error
+    using other_error = detail::other_error;
+
+    /// @}
+
+
+    /////////////////////
+    // container types //
+    /////////////////////
+
+    /// @name container types
+    /// The canonic container types to use @ref basic_json like any other STL
+    /// container.
+    /// @{
+
+    /// the type of elements in a basic_json container
+    using value_type = basic_json;
+
+    /// the type of an element reference
+    using reference = value_type&;
+    /// the type of an element const reference
+    using const_reference = const value_type&;
+
+    /// a type to represent differences between iterators
+    using difference_type = std::ptrdiff_t;
+    /// a type to represent container sizes
+    using size_type = std::size_t;
+
+    /// the allocator type
+    using allocator_type = AllocatorType<basic_json>;
+
+    /// the type of an element pointer
+    using pointer = typename std::allocator_traits<allocator_type>::pointer;
+    /// the type of an element const pointer
+    using const_pointer = typename std::allocator_traits<allocator_type>::const_pointer;
+
+    /// an iterator for a basic_json container
+    using iterator = iter_impl<basic_json>;
+    /// a const iterator for a basic_json container
+    using const_iterator = iter_impl<const basic_json>;
+    /// a reverse iterator for a basic_json container
+    using reverse_iterator = json_reverse_iterator<typename basic_json::iterator>;
+    /// a const reverse iterator for a basic_json container
+    using const_reverse_iterator = json_reverse_iterator<typename basic_json::const_iterator>;
+
+    /// @}
+
+
+    /*!
+    @brief returns the allocator associated with the container
+    */
+    static allocator_type get_allocator()
+    {
+        return allocator_type();
+    }
+
+    /*!
+    @brief returns version information on the library
+
+    This function returns a JSON object with information about the library,
+    including the version number and information on the platform and compiler.
+
+    @return JSON object holding version information
+    key         | description
+    ----------- | ---------------
+    `compiler`  | Information on the used compiler. It is an object with the following keys: `c++` (the used C++ standard), `family` (the compiler family; possible values are `clang`, `icc`, `gcc`, `ilecpp`, `msvc`, `pgcpp`, `sunpro`, and `unknown`), and `version` (the compiler version).
+    `copyright` | The copyright line for the library as string.
+    `name`      | The name of the library as string.
+    `platform`  | The used platform as string. Possible values are `win32`, `linux`, `apple`, `unix`, and `unknown`.
+    `url`       | The URL of the project as string.
+    `version`   | The version of the library. It is an object with the following keys: `major`, `minor`, and `patch` as defined by [Semantic Versioning](http://semver.org), and `string` (the version string).
+
+    @liveexample{The following code shows an example output of the `meta()`
+    function.,meta}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @complexity Constant.
+
+    @since 2.1.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json meta()
+    {
+        basic_json result;
+
+        result["copyright"] = "(C) 2013-2020 Niels Lohmann";
+        result["name"] = "JSON for Modern C++";
+        result["url"] = "https://github.com/nlohmann/json";
+        result["version"]["string"] =
+            std::to_string(NLOHMANN_JSON_VERSION_MAJOR) + "." +
+            std::to_string(NLOHMANN_JSON_VERSION_MINOR) + "." +
+            std::to_string(NLOHMANN_JSON_VERSION_PATCH);
+        result["version"]["major"] = NLOHMANN_JSON_VERSION_MAJOR;
+        result["version"]["minor"] = NLOHMANN_JSON_VERSION_MINOR;
+        result["version"]["patch"] = NLOHMANN_JSON_VERSION_PATCH;
+
+#ifdef _WIN32
+        result["platform"] = "win32";
+#elif defined __linux__
+        result["platform"] = "linux";
+#elif defined __APPLE__
+        result["platform"] = "apple";
+#elif defined __unix__
+        result["platform"] = "unix";
+#else
+        result["platform"] = "unknown";
+#endif
+
+#if defined(__ICC) || defined(__INTEL_COMPILER)
+        result["compiler"] = {{"family", "icc"}, {"version", __INTEL_COMPILER}};
+#elif defined(__clang__)
+        result["compiler"] = {{"family", "clang"}, {"version", __clang_version__}};
+#elif defined(__GNUC__) || defined(__GNUG__)
+        result["compiler"] = {{"family", "gcc"}, {"version", std::to_string(__GNUC__) + "." + std::to_string(__GNUC_MINOR__) + "." + std::to_string(__GNUC_PATCHLEVEL__)}};
+#elif defined(__HP_cc) || defined(__HP_aCC)
+        result["compiler"] = "hp"
+#elif defined(__IBMCPP__)
+        result["compiler"] = {{"family", "ilecpp"}, {"version", __IBMCPP__}};
+#elif defined(_MSC_VER)
+        result["compiler"] = {{"family", "msvc"}, {"version", _MSC_VER}};
+#elif defined(__PGI)
+        result["compiler"] = {{"family", "pgcpp"}, {"version", __PGI}};
+#elif defined(__SUNPRO_CC)
+        result["compiler"] = {{"family", "sunpro"}, {"version", __SUNPRO_CC}};
+#else
+        result["compiler"] = {{"family", "unknown"}, {"version", "unknown"}};
+#endif
+
+#ifdef __cplusplus
+        result["compiler"]["c++"] = std::to_string(__cplusplus);
+#else
+        result["compiler"]["c++"] = "unknown";
+#endif
+        return result;
+    }
+
+
+    ///////////////////////////
+    // JSON value data types //
+    ///////////////////////////
+
+    /// @name JSON value data types
+    /// The data types to store a JSON value. These types are derived from
+    /// the template arguments passed to class @ref basic_json.
+    /// @{
+
+#if defined(JSON_HAS_CPP_14)
+    // Use transparent comparator if possible, combined with perfect forwarding
+    // on find() and count() calls prevents unnecessary string construction.
+    using object_comparator_t = std::less<>;
+#else
+    using object_comparator_t = std::less<StringType>;
+#endif
+
+    /*!
+    @brief a type for an object
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON objects as follows:
+    > An object is an unordered collection of zero or more name/value pairs,
+    > where a name is a string and a value is a string, number, boolean, null,
+    > object, or array.
+
+    To store objects in C++, a type is defined by the template parameters
+    described below.
+
+    @tparam ObjectType  the container to store objects (e.g., `std::map` or
+    `std::unordered_map`)
+    @tparam StringType the type of the keys or names (e.g., `std::string`).
+    The comparison function `std::less<StringType>` is used to order elements
+    inside the container.
+    @tparam AllocatorType the allocator to use for objects (e.g.,
+    `std::allocator`)
+
+    #### Default type
+
+    With the default values for @a ObjectType (`std::map`), @a StringType
+    (`std::string`), and @a AllocatorType (`std::allocator`), the default
+    value for @a object_t is:
+
+    @code {.cpp}
+    std::map<
+      std::string, // key_type
+      basic_json, // value_type
+      std::less<std::string>, // key_compare
+      std::allocator<std::pair<const std::string, basic_json>> // allocator_type
+    >
+    @endcode
+
+    #### Behavior
+
+    The choice of @a object_t influences the behavior of the JSON class. With
+    the default type, objects have the following behavior:
+
+    - When all names are unique, objects will be interoperable in the sense
+      that all software implementations receiving that object will agree on
+      the name-value mappings.
+    - When the names within an object are not unique, it is unspecified which
+      one of the values for a given key will be chosen. For instance,
+      `{"key": 2, "key": 1}` could be equal to either `{"key": 1}` or
+      `{"key": 2}`.
+    - Internally, name/value pairs are stored in lexicographical order of the
+      names. Objects will also be serialized (see @ref dump) in this order.
+      For instance, `{"b": 1, "a": 2}` and `{"a": 2, "b": 1}` will be stored
+      and serialized as `{"a": 2, "b": 1}`.
+    - When comparing objects, the order of the name/value pairs is irrelevant.
+      This makes objects interoperable in the sense that they will not be
+      affected by these differences. For instance, `{"b": 1, "a": 2}` and
+      `{"a": 2, "b": 1}` will be treated as equal.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the maximum depth of nesting.
+
+    In this class, the object's limit of nesting is not explicitly constrained.
+    However, a maximum depth of nesting may be introduced by the compiler or
+    runtime environment. A theoretical limit can be queried by calling the
+    @ref max_size function of a JSON object.
+
+    #### Storage
+
+    Objects are stored as pointers in a @ref basic_json type. That is, for any
+    access to object values, a pointer of type `object_t*` must be
+    dereferenced.
+
+    @sa @ref array_t -- type for an array value
+
+    @since version 1.0.0
+
+    @note The order name/value pairs are added to the object is *not*
+    preserved by the library. Therefore, iterating an object may return
+    name/value pairs in a different order than they were originally stored. In
+    fact, keys will be traversed in alphabetical order as `std::map` with
+    `std::less` is used by default. Please note this behavior conforms to [RFC
+    7159](http://rfc7159.net/rfc7159), because any order implements the
+    specified "unordered" nature of JSON objects.
+    */
+    using object_t = ObjectType<StringType,
+          basic_json,
+          object_comparator_t,
+          AllocatorType<std::pair<const StringType,
+          basic_json>>>;
+
+    /*!
+    @brief a type for an array
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON arrays as follows:
+    > An array is an ordered sequence of zero or more values.
+
+    To store objects in C++, a type is defined by the template parameters
+    explained below.
+
+    @tparam ArrayType  container type to store arrays (e.g., `std::vector` or
+    `std::list`)
+    @tparam AllocatorType allocator to use for arrays (e.g., `std::allocator`)
+
+    #### Default type
+
+    With the default values for @a ArrayType (`std::vector`) and @a
+    AllocatorType (`std::allocator`), the default value for @a array_t is:
+
+    @code {.cpp}
+    std::vector<
+      basic_json, // value_type
+      std::allocator<basic_json> // allocator_type
+    >
+    @endcode
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the maximum depth of nesting.
+
+    In this class, the array's limit of nesting is not explicitly constrained.
+    However, a maximum depth of nesting may be introduced by the compiler or
+    runtime environment. A theoretical limit can be queried by calling the
+    @ref max_size function of a JSON array.
+
+    #### Storage
+
+    Arrays are stored as pointers in a @ref basic_json type. That is, for any
+    access to array values, a pointer of type `array_t*` must be dereferenced.
+
+    @sa @ref object_t -- type for an object value
+
+    @since version 1.0.0
+    */
+    using array_t = ArrayType<basic_json, AllocatorType<basic_json>>;
+
+    /*!
+    @brief a type for a string
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes JSON strings as follows:
+    > A string is a sequence of zero or more Unicode characters.
+
+    To store objects in C++, a type is defined by the template parameter
+    described below. Unicode values are split by the JSON class into
+    byte-sized characters during deserialization.
+
+    @tparam StringType  the container to store strings (e.g., `std::string`).
+    Note this container is used for keys/names in objects, see @ref object_t.
+
+    #### Default type
+
+    With the default values for @a StringType (`std::string`), the default
+    value for @a string_t is:
+
+    @code {.cpp}
+    std::string
+    @endcode
+
+    #### Encoding
+
+    Strings are stored in UTF-8 encoding. Therefore, functions like
+    `std::string::size()` or `std::string::length()` return the number of
+    bytes in the string rather than the number of characters or glyphs.
+
+    #### String comparison
+
+    [RFC 7159](http://rfc7159.net/rfc7159) states:
+    > Software implementations are typically required to test names of object
+    > members for equality. Implementations that transform the textual
+    > representation into sequences of Unicode code units and then perform the
+    > comparison numerically, code unit by code unit, are interoperable in the
+    > sense that implementations will agree in all cases on equality or
+    > inequality of two strings. For example, implementations that compare
+    > strings with escaped characters unconverted may incorrectly find that
+    > `"a\\b"` and `"a\u005Cb"` are not equal.
+
+    This implementation is interoperable as it does compare strings code unit
+    by code unit.
+
+    #### Storage
+
+    String values are stored as pointers in a @ref basic_json type. That is,
+    for any access to string values, a pointer of type `string_t*` must be
+    dereferenced.
+
+    @since version 1.0.0
+    */
+    using string_t = StringType;
+
+    /*!
+    @brief a type for a boolean
+
+    [RFC 7159](http://rfc7159.net/rfc7159) implicitly describes a boolean as a
+    type which differentiates the two literals `true` and `false`.
+
+    To store objects in C++, a type is defined by the template parameter @a
+    BooleanType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a BooleanType (`bool`), the default value for
+    @a boolean_t is:
+
+    @code {.cpp}
+    bool
+    @endcode
+
+    #### Storage
+
+    Boolean values are stored directly inside a @ref basic_json type.
+
+    @since version 1.0.0
+    */
+    using boolean_t = BooleanType;
+
+    /*!
+    @brief a type for a number (integer)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store integer numbers in C++, a type is defined by the template
+    parameter @a NumberIntegerType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberIntegerType (`int64_t`), the default
+    value for @a number_integer_t is:
+
+    @code {.cpp}
+    int64_t
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in integer literals lead to an interpretation as octal
+      number. Internally, the value will be stored as decimal number. For
+      instance, the C++ integer literal `010` will be serialized to `8`.
+      During deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the range and precision of numbers.
+
+    When the default type is used, the maximal integer number that can be
+    stored is `9223372036854775807` (INT64_MAX) and the minimal integer number
+    that can be stored is `-9223372036854775808` (INT64_MIN). Integer numbers
+    that are out of range will yield over/underflow when used in a
+    constructor. During deserialization, too large or small integer numbers
+    will be automatically be stored as @ref number_unsigned_t or @ref
+    number_float_t.
+
+    [RFC 7159](http://rfc7159.net/rfc7159) further states:
+    > Note that when such software is used, numbers that are integers and are
+    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
+    > that implementations will agree exactly on their numeric values.
+
+    As this range is a subrange of the exactly supported range [INT64_MIN,
+    INT64_MAX], this class's integer type is interoperable.
+
+    #### Storage
+
+    Integer number values are stored directly inside a @ref basic_json type.
+
+    @sa @ref number_float_t -- type for number values (floating-point)
+
+    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+
+    @since version 1.0.0
+    */
+    using number_integer_t = NumberIntegerType;
+
+    /*!
+    @brief a type for a number (unsigned)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store unsigned integer numbers in C++, a type is defined by the
+    template parameter @a NumberUnsignedType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberUnsignedType (`uint64_t`), the
+    default value for @a number_unsigned_t is:
+
+    @code {.cpp}
+    uint64_t
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in integer literals lead to an interpretation as octal
+      number. Internally, the value will be stored as decimal number. For
+      instance, the C++ integer literal `010` will be serialized to `8`.
+      During deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) specifies:
+    > An implementation may set limits on the range and precision of numbers.
+
+    When the default type is used, the maximal integer number that can be
+    stored is `18446744073709551615` (UINT64_MAX) and the minimal integer
+    number that can be stored is `0`. Integer numbers that are out of range
+    will yield over/underflow when used in a constructor. During
+    deserialization, too large or small integer numbers will be automatically
+    be stored as @ref number_integer_t or @ref number_float_t.
+
+    [RFC 7159](http://rfc7159.net/rfc7159) further states:
+    > Note that when such software is used, numbers that are integers and are
+    > in the range \f$[-2^{53}+1, 2^{53}-1]\f$ are interoperable in the sense
+    > that implementations will agree exactly on their numeric values.
+
+    As this range is a subrange (when considered in conjunction with the
+    number_integer_t type) of the exactly supported range [0, UINT64_MAX],
+    this class's integer type is interoperable.
+
+    #### Storage
+
+    Integer number values are stored directly inside a @ref basic_json type.
+
+    @sa @ref number_float_t -- type for number values (floating-point)
+    @sa @ref number_integer_t -- type for number values (integer)
+
+    @since version 2.0.0
+    */
+    using number_unsigned_t = NumberUnsignedType;
+
+    /*!
+    @brief a type for a number (floating-point)
+
+    [RFC 7159](http://rfc7159.net/rfc7159) describes numbers as follows:
+    > The representation of numbers is similar to that used in most
+    > programming languages. A number is represented in base 10 using decimal
+    > digits. It contains an integer component that may be prefixed with an
+    > optional minus sign, which may be followed by a fraction part and/or an
+    > exponent part. Leading zeros are not allowed. (...) Numeric values that
+    > cannot be represented in the grammar below (such as Infinity and NaN)
+    > are not permitted.
+
+    This description includes both integer and floating-point numbers.
+    However, C++ allows more precise storage if it is known whether the number
+    is a signed integer, an unsigned integer or a floating-point number.
+    Therefore, three different types, @ref number_integer_t, @ref
+    number_unsigned_t and @ref number_float_t are used.
+
+    To store floating-point numbers in C++, a type is defined by the template
+    parameter @a NumberFloatType which chooses the type to use.
+
+    #### Default type
+
+    With the default values for @a NumberFloatType (`double`), the default
+    value for @a number_float_t is:
+
+    @code {.cpp}
+    double
+    @endcode
+
+    #### Default behavior
+
+    - The restrictions about leading zeros is not enforced in C++. Instead,
+      leading zeros in floating-point literals will be ignored. Internally,
+      the value will be stored as decimal number. For instance, the C++
+      floating-point literal `01.2` will be serialized to `1.2`. During
+      deserialization, leading zeros yield an error.
+    - Not-a-number (NaN) values will be serialized to `null`.
+
+    #### Limits
+
+    [RFC 7159](http://rfc7159.net/rfc7159) states:
+    > This specification allows implementations to set limits on the range and
+    > precision of numbers accepted. Since software that implements IEEE
+    > 754-2008 binary64 (double precision) numbers is generally available and
+    > widely used, good interoperability can be achieved by implementations
+    > that expect no more precision or range than these provide, in the sense
+    > that implementations will approximate JSON numbers within the expected
+    > precision.
+
+    This implementation does exactly follow this approach, as it uses double
+    precision floating-point numbers. Note values smaller than
+    `-1.79769313486232e+308` and values greater than `1.79769313486232e+308`
+    will be stored as NaN internally and be serialized to `null`.
+
+    #### Storage
+
+    Floating-point number values are stored directly inside a @ref basic_json
+    type.
+
+    @sa @ref number_integer_t -- type for number values (integer)
+
+    @sa @ref number_unsigned_t -- type for number values (unsigned integer)
+
+    @since version 1.0.0
+    */
+    using number_float_t = NumberFloatType;
+
+    /*!
+    @brief a type for a packed binary type
+
+    This type is a type designed to carry binary data that appears in various
+    serialized formats, such as CBOR's Major Type 2, MessagePack's bin, and
+    BSON's generic binary subtype. This type is NOT a part of standard JSON and
+    exists solely for compatibility with these binary types. As such, it is
+    simply defined as an ordered sequence of zero or more byte values.
+
+    Additionally, as an implementation detail, the subtype of the binary data is
+    carried around as a `std::uint8_t`, which is compatible with both of the
+    binary data formats that use binary subtyping, (though the specific
+    numbering is incompatible with each other, and it is up to the user to
+    translate between them).
+
+    [CBOR's RFC 7049](https://tools.ietf.org/html/rfc7049) describes this type
+    as:
+    > Major type 2: a byte string. The string's length in bytes is represented
+    > following the rules for positive integers (major type 0).
+
+    [MessagePack's documentation on the bin type
+    family](https://github.com/msgpack/msgpack/blob/master/spec.md#bin-format-family)
+    describes this type as:
+    > Bin format family stores an byte array in 2, 3, or 5 bytes of extra bytes
+    > in addition to the size of the byte array.
+
+    [BSON's specifications](http://bsonspec.org/spec.html) describe several
+    binary types; however, this type is intended to represent the generic binary
+    type which has the description:
+    > Generic binary subtype - This is the most commonly used binary subtype and
+    > should be the 'default' for drivers and tools.
+
+    None of these impose any limitations on the internal representation other
+    than the basic unit of storage be some type of array whose parts are
+    decomposable into bytes.
+
+    The default representation of this binary format is a
+    `std::vector<std::uint8_t>`, which is a very common way to represent a byte
+    array in modern C++.
+
+    #### Default type
+
+    The default values for @a BinaryType is `std::vector<std::uint8_t>`
+
+    #### Storage
+
+    Binary Arrays are stored as pointers in a @ref basic_json type. That is,
+    for any access to array values, a pointer of the type `binary_t*` must be
+    dereferenced.
+
+    #### Notes on subtypes
+
+    - CBOR
+       - Binary values are represented as byte strings. No subtypes are
+         supported and will be ignored when CBOR is written.
+    - MessagePack
+       - If a subtype is given and the binary array contains exactly 1, 2, 4, 8,
+         or 16 elements, the fixext family (fixext1, fixext2, fixext4, fixext8)
+         is used. For other sizes, the ext family (ext8, ext16, ext32) is used.
+         The subtype is then added as singed 8-bit integer.
+       - If no subtype is given, the bin family (bin8, bin16, bin32) is used.
+    - BSON
+       - If a subtype is given, it is used and added as unsigned 8-bit integer.
+       - If no subtype is given, the generic binary subtype 0x00 is used.
+
+    @sa @ref binary -- create a binary array
+
+    @since version 3.8.0
+    */
+    using binary_t = nlohmann::byte_container_with_subtype<BinaryType>;
+    /// @}
+
+  private:
+
+    /// helper for exception-safe object creation
+    template<typename T, typename... Args>
+    JSON_HEDLEY_RETURNS_NON_NULL
+    static T* create(Args&& ... args)
+    {
+        AllocatorType<T> alloc;
+        using AllocatorTraits = std::allocator_traits<AllocatorType<T>>;
+
+        auto deleter = [&](T * object)
+        {
+            AllocatorTraits::deallocate(alloc, object, 1);
+        };
+        std::unique_ptr<T, decltype(deleter)> object(AllocatorTraits::allocate(alloc, 1), deleter);
+        AllocatorTraits::construct(alloc, object.get(), std::forward<Args>(args)...);
+        JSON_ASSERT(object != nullptr);
+        return object.release();
+    }
+
+    ////////////////////////
+    // JSON value storage //
+    ////////////////////////
+
+    /*!
+    @brief a JSON value
+
+    The actual storage for a JSON value of the @ref basic_json class. This
+    union combines the different storage types for the JSON value types
+    defined in @ref value_t.
+
+    JSON type | value_t type    | used type
+    --------- | --------------- | ------------------------
+    object    | object          | pointer to @ref object_t
+    array     | array           | pointer to @ref array_t
+    string    | string          | pointer to @ref string_t
+    boolean   | boolean         | @ref boolean_t
+    number    | number_integer  | @ref number_integer_t
+    number    | number_unsigned | @ref number_unsigned_t
+    number    | number_float    | @ref number_float_t
+    binary    | binary          | pointer to @ref binary_t
+    null      | null            | *no value is stored*
+
+    @note Variable-length types (objects, arrays, and strings) are stored as
+    pointers. The size of the union should not exceed 64 bits if the default
+    value types are used.
+
+    @since version 1.0.0
+    */
+    union json_value
+    {
+        /// object (stored with pointer to save storage)
+        object_t* object;
+        /// array (stored with pointer to save storage)
+        array_t* array;
+        /// string (stored with pointer to save storage)
+        string_t* string;
+        /// binary (stored with pointer to save storage)
+        binary_t* binary;
+        /// boolean
+        boolean_t boolean;
+        /// number (integer)
+        number_integer_t number_integer;
+        /// number (unsigned integer)
+        number_unsigned_t number_unsigned;
+        /// number (floating-point)
+        number_float_t number_float;
+
+        /// default constructor (for null values)
+        json_value() = default;
+        /// constructor for booleans
+        json_value(boolean_t v) noexcept : boolean(v) {}
+        /// constructor for numbers (integer)
+        json_value(number_integer_t v) noexcept : number_integer(v) {}
+        /// constructor for numbers (unsigned)
+        json_value(number_unsigned_t v) noexcept : number_unsigned(v) {}
+        /// constructor for numbers (floating-point)
+        json_value(number_float_t v) noexcept : number_float(v) {}
+        /// constructor for empty values of a given type
+        json_value(value_t t)
+        {
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    object = create<object_t>();
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    array = create<array_t>();
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    string = create<string_t>("");
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    binary = create<binary_t>();
+                    break;
+                }
+
+                case value_t::boolean:
+                {
+                    boolean = boolean_t(false);
+                    break;
+                }
+
+                case value_t::number_integer:
+                {
+                    number_integer = number_integer_t(0);
+                    break;
+                }
+
+                case value_t::number_unsigned:
+                {
+                    number_unsigned = number_unsigned_t(0);
+                    break;
+                }
+
+                case value_t::number_float:
+                {
+                    number_float = number_float_t(0.0);
+                    break;
+                }
+
+                case value_t::null:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    break;
+                }
+
+                default:
+                {
+                    object = nullptr;  // silence warning, see #821
+                    if (JSON_HEDLEY_UNLIKELY(t == value_t::null))
+                    {
+                        JSON_THROW(other_error::create(500, "961c151d2e87f2686a955a9be24d316f1362bf21 3.9.1")); // LCOV_EXCL_LINE
+                    }
+                    break;
+                }
+            }
+        }
+
+        /// constructor for strings
+        json_value(const string_t& value)
+        {
+            string = create<string_t>(value);
+        }
+
+        /// constructor for rvalue strings
+        json_value(string_t&& value)
+        {
+            string = create<string_t>(std::move(value));
+        }
+
+        /// constructor for objects
+        json_value(const object_t& value)
+        {
+            object = create<object_t>(value);
+        }
+
+        /// constructor for rvalue objects
+        json_value(object_t&& value)
+        {
+            object = create<object_t>(std::move(value));
+        }
+
+        /// constructor for arrays
+        json_value(const array_t& value)
+        {
+            array = create<array_t>(value);
+        }
+
+        /// constructor for rvalue arrays
+        json_value(array_t&& value)
+        {
+            array = create<array_t>(std::move(value));
+        }
+
+        /// constructor for binary arrays
+        json_value(const typename binary_t::container_type& value)
+        {
+            binary = create<binary_t>(value);
+        }
+
+        /// constructor for rvalue binary arrays
+        json_value(typename binary_t::container_type&& value)
+        {
+            binary = create<binary_t>(std::move(value));
+        }
+
+        /// constructor for binary arrays (internal type)
+        json_value(const binary_t& value)
+        {
+            binary = create<binary_t>(value);
+        }
+
+        /// constructor for rvalue binary arrays (internal type)
+        json_value(binary_t&& value)
+        {
+            binary = create<binary_t>(std::move(value));
+        }
+
+        void destroy(value_t t) noexcept
+        {
+            // flatten the current json_value to a heap-allocated stack
+            std::vector<basic_json> stack;
+
+            // move the top-level items to stack
+            if (t == value_t::array)
+            {
+                stack.reserve(array->size());
+                std::move(array->begin(), array->end(), std::back_inserter(stack));
+            }
+            else if (t == value_t::object)
+            {
+                stack.reserve(object->size());
+                for (auto&& it : *object)
+                {
+                    stack.push_back(std::move(it.second));
+                }
+            }
+
+            while (!stack.empty())
+            {
+                // move the last item to local variable to be processed
+                basic_json current_item(std::move(stack.back()));
+                stack.pop_back();
+
+                // if current_item is array/object, move
+                // its children to the stack to be processed later
+                if (current_item.is_array())
+                {
+                    std::move(current_item.m_value.array->begin(), current_item.m_value.array->end(),
+                              std::back_inserter(stack));
+
+                    current_item.m_value.array->clear();
+                }
+                else if (current_item.is_object())
+                {
+                    for (auto&& it : *current_item.m_value.object)
+                    {
+                        stack.push_back(std::move(it.second));
+                    }
+
+                    current_item.m_value.object->clear();
+                }
+
+                // it's now safe that current_item get destructed
+                // since it doesn't have any children
+            }
+
+            switch (t)
+            {
+                case value_t::object:
+                {
+                    AllocatorType<object_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, object);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, object, 1);
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    AllocatorType<array_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, array);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, array, 1);
+                    break;
+                }
+
+                case value_t::string:
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, string, 1);
+                    break;
+                }
+
+                case value_t::binary:
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, binary, 1);
+                    break;
+                }
+
+                default:
+                {
+                    break;
+                }
+            }
+        }
+    };
+
+    /*!
+    @brief checks the class invariants
+
+    This function asserts the class invariants. It needs to be called at the
+    end of every constructor to make sure that created objects respect the
+    invariant. Furthermore, it has to be called each time the type of a JSON
+    value is changed, because the invariant expresses a relationship between
+    @a m_type and @a m_value.
+    */
+    void assert_invariant() const noexcept
+    {
+        JSON_ASSERT(m_type != value_t::object || m_value.object != nullptr);
+        JSON_ASSERT(m_type != value_t::array || m_value.array != nullptr);
+        JSON_ASSERT(m_type != value_t::string || m_value.string != nullptr);
+        JSON_ASSERT(m_type != value_t::binary || m_value.binary != nullptr);
+    }
+
+  public:
+    //////////////////////////
+    // JSON parser callback //
+    //////////////////////////
+
+    /*!
+    @brief parser event types
+
+    The parser callback distinguishes the following events:
+    - `object_start`: the parser read `{` and started to process a JSON object
+    - `key`: the parser read a key of a value in an object
+    - `object_end`: the parser read `}` and finished processing a JSON object
+    - `array_start`: the parser read `[` and started to process a JSON array
+    - `array_end`: the parser read `]` and finished processing a JSON array
+    - `value`: the parser finished reading a JSON value
+
+    @image html callback_events.png "Example when certain parse events are triggered"
+
+    @sa @ref parser_callback_t for more information and examples
+    */
+    using parse_event_t = detail::parse_event_t;
+
+    /*!
+    @brief per-element parser callback type
+
+    With a parser callback function, the result of parsing a JSON text can be
+    influenced. When passed to @ref parse, it is called on certain events
+    (passed as @ref parse_event_t via parameter @a event) with a set recursion
+    depth @a depth and context JSON value @a parsed. The return value of the
+    callback function is a boolean indicating whether the element that emitted
+    the callback shall be kept or not.
+
+    We distinguish six scenarios (determined by the event type) in which the
+    callback function can be called. The following table describes the values
+    of the parameters @a depth, @a event, and @a parsed.
+
+    parameter @a event | description | parameter @a depth | parameter @a parsed
+    ------------------ | ----------- | ------------------ | -------------------
+    parse_event_t::object_start | the parser read `{` and started to process a JSON object | depth of the parent of the JSON object | a JSON value with type discarded
+    parse_event_t::key | the parser read a key of a value in an object | depth of the currently parsed JSON object | a JSON string containing the key
+    parse_event_t::object_end | the parser read `}` and finished processing a JSON object | depth of the parent of the JSON object | the parsed JSON object
+    parse_event_t::array_start | the parser read `[` and started to process a JSON array | depth of the parent of the JSON array | a JSON value with type discarded
+    parse_event_t::array_end | the parser read `]` and finished processing a JSON array | depth of the parent of the JSON array | the parsed JSON array
+    parse_event_t::value | the parser finished reading a JSON value | depth of the value | the parsed JSON value
+
+    @image html callback_events.png "Example when certain parse events are triggered"
+
+    Discarding a value (i.e., returning `false`) has different effects
+    depending on the context in which function was called:
+
+    - Discarded values in structured types are skipped. That is, the parser
+      will behave as if the discarded value was never read.
+    - In case a value outside a structured type is skipped, it is replaced
+      with `null`. This case happens if the top-level element is skipped.
+
+    @param[in] depth  the depth of the recursion during parsing
+
+    @param[in] event  an event of type parse_event_t indicating the context in
+    the callback function has been called
+
+    @param[in,out] parsed  the current intermediate parse result; note that
+    writing to this value has no effect for parse_event_t::key events
+
+    @return Whether the JSON value which called the function during parsing
+    should be kept (`true`) or not (`false`). In the latter case, it is either
+    skipped completely or replaced by an empty discarded object.
+
+    @sa @ref parse for examples
+
+    @since version 1.0.0
+    */
+    using parser_callback_t = detail::parser_callback_t<basic_json>;
+
+    //////////////////
+    // constructors //
+    //////////////////
+
+    /// @name constructors and destructors
+    /// Constructors of class @ref basic_json, copy/move constructor, copy
+    /// assignment, static functions creating objects, and the destructor.
+    /// @{
+
+    /*!
+    @brief create an empty value with a given type
+
+    Create an empty JSON value with a given type. The value will be default
+    initialized with an empty value which depends on the type:
+
+    Value type  | initial value
+    ----------- | -------------
+    null        | `null`
+    boolean     | `false`
+    string      | `""`
+    number      | `0`
+    object      | `{}`
+    array       | `[]`
+    binary      | empty array
+
+    @param[in] v  the type of the value to create
+
+    @complexity Constant.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows the constructor for different @ref
+    value_t values,basic_json__value_t}
+
+    @sa @ref clear() -- restores the postcondition of this constructor
+
+    @since version 1.0.0
+    */
+    basic_json(const value_t v)
+        : m_type(v), m_value(v)
+    {
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a null object
+
+    Create a `null` JSON value. It either takes a null pointer as parameter
+    (explicitly creating `null`) or no parameter (implicitly creating `null`).
+    The passed null pointer itself is not read -- it is only used to choose
+    the right constructor.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this constructor never throws
+    exceptions.
+
+    @liveexample{The following code shows the constructor with and without a
+    null pointer parameter.,basic_json__nullptr_t}
+
+    @since version 1.0.0
+    */
+    basic_json(std::nullptr_t = nullptr) noexcept
+        : basic_json(value_t::null)
+    {
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a JSON value
+
+    This is a "catch all" constructor for all compatible JSON types; that is,
+    types for which a `to_json()` method exists. The constructor forwards the
+    parameter @a val to that method (to `json_serializer<U>::to_json` method
+    with `U = uncvref_t<CompatibleType>`, to be exact).
+
+    Template type @a CompatibleType includes, but is not limited to, the
+    following types:
+    - **arrays**: @ref array_t and all kinds of compatible containers such as
+      `std::vector`, `std::deque`, `std::list`, `std::forward_list`,
+      `std::array`, `std::valarray`, `std::set`, `std::unordered_set`,
+      `std::multiset`, and `std::unordered_multiset` with a `value_type` from
+      which a @ref basic_json value can be constructed.
+    - **objects**: @ref object_t and all kinds of compatible associative
+      containers such as `std::map`, `std::unordered_map`, `std::multimap`,
+      and `std::unordered_multimap` with a `key_type` compatible to
+      @ref string_t and a `value_type` from which a @ref basic_json value can
+      be constructed.
+    - **strings**: @ref string_t, string literals, and all compatible string
+      containers can be used.
+    - **numbers**: @ref number_integer_t, @ref number_unsigned_t,
+      @ref number_float_t, and all convertible number types such as `int`,
+      `size_t`, `int64_t`, `float` or `double` can be used.
+    - **boolean**: @ref boolean_t / `bool` can be used.
+    - **binary**: @ref binary_t / `std::vector<uint8_t>` may be used,
+      unfortunately because string literals cannot be distinguished from binary
+      character arrays by the C++ type system, all types compatible with `const
+      char*` will be directed to the string constructor instead.  This is both
+      for backwards compatibility, and due to the fact that a binary type is not
+      a standard JSON type.
+
+    See the examples below.
+
+    @tparam CompatibleType a type such that:
+    - @a CompatibleType is not derived from `std::istream`,
+    - @a CompatibleType is not @ref basic_json (to avoid hijacking copy/move
+         constructors),
+    - @a CompatibleType is not a different @ref basic_json type (i.e. with different template arguments)
+    - @a CompatibleType is not a @ref basic_json nested type (e.g.,
+         @ref json_pointer, @ref iterator, etc ...)
+    - @ref @ref json_serializer<U> has a
+         `to_json(basic_json_t&, CompatibleType&&)` method
+
+    @tparam U = `uncvref_t<CompatibleType>`
+
+    @param[in] val the value to be forwarded to the respective constructor
+
+    @complexity Usually linear in the size of the passed @a val, also
+                depending on the implementation of the called `to_json()`
+                method.
+
+    @exceptionsafety Depends on the called constructor. For types directly
+    supported by the library (i.e., all types for which no `to_json()` function
+    was provided), strong guarantee holds: if an exception is thrown, there are
+    no changes to any JSON value.
+
+    @liveexample{The following code shows the constructor with several
+    compatible types.,basic_json__CompatibleType}
+
+    @since version 2.1.0
+    */
+    template < typename CompatibleType,
+               typename U = detail::uncvref_t<CompatibleType>,
+               detail::enable_if_t <
+                   !detail::is_basic_json<U>::value && detail::is_compatible_type<basic_json_t, U>::value, int > = 0 >
+    basic_json(CompatibleType && val) noexcept(noexcept(
+                JSONSerializer<U>::to_json(std::declval<basic_json_t&>(),
+                                           std::forward<CompatibleType>(val))))
+    {
+        JSONSerializer<U>::to_json(*this, std::forward<CompatibleType>(val));
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a JSON value from an existing one
+
+    This is a constructor for existing @ref basic_json types.
+    It does not hijack copy/move constructors, since the parameter has different
+    template arguments than the current ones.
+
+    The constructor tries to convert the internal @ref m_value of the parameter.
+
+    @tparam BasicJsonType a type such that:
+    - @a BasicJsonType is a @ref basic_json type.
+    - @a BasicJsonType has different template arguments than @ref basic_json_t.
+
+    @param[in] val the @ref basic_json value to be converted.
+
+    @complexity Usually linear in the size of the passed @a val, also
+                depending on the implementation of the called `to_json()`
+                method.
+
+    @exceptionsafety Depends on the called constructor. For types directly
+    supported by the library (i.e., all types for which no `to_json()` function
+    was provided), strong guarantee holds: if an exception is thrown, there are
+    no changes to any JSON value.
+
+    @since version 3.2.0
+    */
+    template < typename BasicJsonType,
+               detail::enable_if_t <
+                   detail::is_basic_json<BasicJsonType>::value&& !std::is_same<basic_json, BasicJsonType>::value, int > = 0 >
+    basic_json(const BasicJsonType& val)
+    {
+        using other_boolean_t = typename BasicJsonType::boolean_t;
+        using other_number_float_t = typename BasicJsonType::number_float_t;
+        using other_number_integer_t = typename BasicJsonType::number_integer_t;
+        using other_number_unsigned_t = typename BasicJsonType::number_unsigned_t;
+        using other_string_t = typename BasicJsonType::string_t;
+        using other_object_t = typename BasicJsonType::object_t;
+        using other_array_t = typename BasicJsonType::array_t;
+        using other_binary_t = typename BasicJsonType::binary_t;
+
+        switch (val.type())
+        {
+            case value_t::boolean:
+                JSONSerializer<other_boolean_t>::to_json(*this, val.template get<other_boolean_t>());
+                break;
+            case value_t::number_float:
+                JSONSerializer<other_number_float_t>::to_json(*this, val.template get<other_number_float_t>());
+                break;
+            case value_t::number_integer:
+                JSONSerializer<other_number_integer_t>::to_json(*this, val.template get<other_number_integer_t>());
+                break;
+            case value_t::number_unsigned:
+                JSONSerializer<other_number_unsigned_t>::to_json(*this, val.template get<other_number_unsigned_t>());
+                break;
+            case value_t::string:
+                JSONSerializer<other_string_t>::to_json(*this, val.template get_ref<const other_string_t&>());
+                break;
+            case value_t::object:
+                JSONSerializer<other_object_t>::to_json(*this, val.template get_ref<const other_object_t&>());
+                break;
+            case value_t::array:
+                JSONSerializer<other_array_t>::to_json(*this, val.template get_ref<const other_array_t&>());
+                break;
+            case value_t::binary:
+                JSONSerializer<other_binary_t>::to_json(*this, val.template get_ref<const other_binary_t&>());
+                break;
+            case value_t::null:
+                *this = nullptr;
+                break;
+            case value_t::discarded:
+                m_type = value_t::discarded;
+                break;
+            default:            // LCOV_EXCL_LINE
+                JSON_ASSERT(false);  // LCOV_EXCL_LINE
+        }
+        assert_invariant();
+    }
+
+    /*!
+    @brief create a container (array or object) from an initializer list
+
+    Creates a JSON value of type array or object from the passed initializer
+    list @a init. In case @a type_deduction is `true` (default), the type of
+    the JSON value to be created is deducted from the initializer list @a init
+    according to the following rules:
+
+    1. If the list is empty, an empty JSON object value `{}` is created.
+    2. If the list consists of pairs whose first element is a string, a JSON
+       object value is created where the first elements of the pairs are
+       treated as keys and the second elements are as values.
+    3. In all other cases, an array is created.
+
+    The rules aim to create the best fit between a C++ initializer list and
+    JSON values. The rationale is as follows:
+
+    1. The empty initializer list is written as `{}` which is exactly an empty
+       JSON object.
+    2. C++ has no way of describing mapped types other than to list a list of
+       pairs. As JSON requires that keys must be of type string, rule 2 is the
+       weakest constraint one can pose on initializer lists to interpret them
+       as an object.
+    3. In all other cases, the initializer list could not be interpreted as
+       JSON object type, so interpreting it as JSON array type is safe.
+
+    With the rules described above, the following JSON values cannot be
+    expressed by an initializer list:
+
+    - the empty array (`[]`): use @ref array(initializer_list_t)
+      with an empty initializer list in this case
+    - arrays whose elements satisfy rule 2: use @ref
+      array(initializer_list_t) with the same initializer list
+      in this case
+
+    @note When used without parentheses around an empty initializer list, @ref
+    basic_json() is called instead of this function, yielding the JSON null
+    value.
+
+    @param[in] init  initializer list with JSON values
+
+    @param[in] type_deduction internal parameter; when set to `true`, the type
+    of the JSON value is deducted from the initializer list @a init; when set
+    to `false`, the type provided via @a manual_type is forced. This mode is
+    used by the functions @ref array(initializer_list_t) and
+    @ref object(initializer_list_t).
+
+    @param[in] manual_type internal parameter; when @a type_deduction is set
+    to `false`, the created JSON value will use the provided type (only @ref
+    value_t::array and @ref value_t::object are valid); when @a type_deduction
+    is set to `true`, this parameter has no effect
+
+    @throw type_error.301 if @a type_deduction is `false`, @a manual_type is
+    `value_t::object`, but @a init contains an element which is not a pair
+    whose first element is a string. In this case, the constructor could not
+    create an object. If @a type_deduction would have be `true`, an array
+    would have been created. See @ref object(initializer_list_t)
+    for an example.
+
+    @complexity Linear in the size of the initializer list @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The example below shows how JSON values are created from
+    initializer lists.,basic_json__list_init_t}
+
+    @sa @ref array(initializer_list_t) -- create a JSON array
+    value from an initializer list
+    @sa @ref object(initializer_list_t) -- create a JSON object
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    basic_json(initializer_list_t init,
+               bool type_deduction = true,
+               value_t manual_type = value_t::array)
+    {
+        // check if each element is an array with two elements whose first
+        // element is a string
+        bool is_an_object = std::all_of(init.begin(), init.end(),
+                                        [](const detail::json_ref<basic_json>& element_ref)
+        {
+            return element_ref->is_array() && element_ref->size() == 2 && (*element_ref)[0].is_string();
+        });
+
+        // adjust type if type deduction is not wanted
+        if (!type_deduction)
+        {
+            // if array is wanted, do not create an object though possible
+            if (manual_type == value_t::array)
+            {
+                is_an_object = false;
+            }
+
+            // if object is wanted but impossible, throw an exception
+            if (JSON_HEDLEY_UNLIKELY(manual_type == value_t::object && !is_an_object))
+            {
+                JSON_THROW(type_error::create(301, "cannot create object from initializer list"));
+            }
+        }
+
+        if (is_an_object)
+        {
+            // the initializer list is a list of pairs -> create object
+            m_type = value_t::object;
+            m_value = value_t::object;
+
+            std::for_each(init.begin(), init.end(), [this](const detail::json_ref<basic_json>& element_ref)
+            {
+                auto element = element_ref.moved_or_copied();
+                m_value.object->emplace(
+                    std::move(*((*element.m_value.array)[0].m_value.string)),
+                    std::move((*element.m_value.array)[1]));
+            });
+        }
+        else
+        {
+            // the initializer list describes an array -> create array
+            m_type = value_t::array;
+            m_value.array = create<array_t>(init.begin(), init.end());
+        }
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief explicitly create a binary array (without subtype)
+
+    Creates a JSON binary array value from a given binary container. Binary
+    values are part of various binary formats, such as CBOR, MessagePack, and
+    BSON. This constructor is used to create a value for serialization to those
+    formats.
+
+    @note Note, this function exists because of the difficulty in correctly
+    specifying the correct template overload in the standard value ctor, as both
+    JSON arrays and JSON binary arrays are backed with some form of a
+    `std::vector`. Because JSON binary arrays are a non-standard extension it
+    was decided that it would be best to prevent automatic initialization of a
+    binary array type, for backwards compatibility and so it does not happen on
+    accident.
+
+    @param[in] init container containing bytes to use as binary type
+
+    @return JSON binary array value
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @since version 3.8.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = init;
+        return res;
+    }
+
+    /*!
+    @brief explicitly create a binary array (with subtype)
+
+    Creates a JSON binary array value from a given binary container. Binary
+    values are part of various binary formats, such as CBOR, MessagePack, and
+    BSON. This constructor is used to create a value for serialization to those
+    formats.
+
+    @note Note, this function exists because of the difficulty in correctly
+    specifying the correct template overload in the standard value ctor, as both
+    JSON arrays and JSON binary arrays are backed with some form of a
+    `std::vector`. Because JSON binary arrays are a non-standard extension it
+    was decided that it would be best to prevent automatic initialization of a
+    binary array type, for backwards compatibility and so it does not happen on
+    accident.
+
+    @param[in] init container containing bytes to use as binary type
+    @param[in] subtype subtype to use in MessagePack and BSON
+
+    @return JSON binary array value
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @since version 3.8.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(const typename binary_t::container_type& init, std::uint8_t subtype)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = binary_t(init, subtype);
+        return res;
+    }
+
+    /// @copydoc binary(const typename binary_t::container_type&)
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = std::move(init);
+        return res;
+    }
+
+    /// @copydoc binary(const typename binary_t::container_type&, std::uint8_t)
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json binary(typename binary_t::container_type&& init, std::uint8_t subtype)
+    {
+        auto res = basic_json();
+        res.m_type = value_t::binary;
+        res.m_value = binary_t(std::move(init), subtype);
+        return res;
+    }
+
+    /*!
+    @brief explicitly create an array from an initializer list
+
+    Creates a JSON array value from a given initializer list. That is, given a
+    list of values `a, b, c`, creates the JSON value `[a, b, c]`. If the
+    initializer list is empty, the empty array `[]` is created.
+
+    @note This function is only needed to express two edge cases that cannot
+    be realized with the initializer list constructor (@ref
+    basic_json(initializer_list_t, bool, value_t)). These cases
+    are:
+    1. creating an array whose elements are all pairs whose first element is a
+    string -- in this case, the initializer list constructor would create an
+    object, taking the first elements as keys
+    2. creating an empty array -- passing the empty initializer list to the
+    initializer list constructor yields an empty object
+
+    @param[in] init  initializer list with JSON values to create an array from
+    (optional)
+
+    @return JSON array value
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows an example for the `array`
+    function.,array}
+
+    @sa @ref basic_json(initializer_list_t, bool, value_t) --
+    create a JSON value from an initializer list
+    @sa @ref object(initializer_list_t) -- create a JSON object
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json array(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::array);
+    }
+
+    /*!
+    @brief explicitly create an object from an initializer list
+
+    Creates a JSON object value from a given initializer list. The initializer
+    lists elements must be pairs, and their first elements must be strings. If
+    the initializer list is empty, the empty object `{}` is created.
+
+    @note This function is only added for symmetry reasons. In contrast to the
+    related function @ref array(initializer_list_t), there are
+    no cases which can only be expressed by this function. That is, any
+    initializer list @a init can also be passed to the initializer list
+    constructor @ref basic_json(initializer_list_t, bool, value_t).
+
+    @param[in] init  initializer list to create an object from (optional)
+
+    @return JSON object value
+
+    @throw type_error.301 if @a init is not a list of pairs whose first
+    elements are strings. In this case, no object can be created. When such a
+    value is passed to @ref basic_json(initializer_list_t, bool, value_t),
+    an array would have been created from the passed initializer list @a init.
+    See example below.
+
+    @complexity Linear in the size of @a init.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows an example for the `object`
+    function.,object}
+
+    @sa @ref basic_json(initializer_list_t, bool, value_t) --
+    create a JSON value from an initializer list
+    @sa @ref array(initializer_list_t) -- create a JSON array
+    value from an initializer list
+
+    @since version 1.0.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json object(initializer_list_t init = {})
+    {
+        return basic_json(init, false, value_t::object);
+    }
+
+    /*!
+    @brief construct an array with count copies of given value
+
+    Constructs a JSON array value by creating @a cnt copies of a passed value.
+    In case @a cnt is `0`, an empty array is created.
+
+    @param[in] cnt  the number of JSON copies of @a val to create
+    @param[in] val  the JSON value to copy
+
+    @post `std::distance(begin(),end()) == cnt` holds.
+
+    @complexity Linear in @a cnt.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The following code shows examples for the @ref
+    basic_json(size_type\, const basic_json&)
+    constructor.,basic_json__size_type_basic_json}
+
+    @since version 1.0.0
+    */
+    basic_json(size_type cnt, const basic_json& val)
+        : m_type(value_t::array)
+    {
+        m_value.array = create<array_t>(cnt, val);
+        assert_invariant();
+    }
+
+    /*!
+    @brief construct a JSON container given an iterator range
+
+    Constructs the JSON value with the contents of the range `[first, last)`.
+    The semantics depends on the different types a JSON value can have:
+    - In case of a null type, invalid_iterator.206 is thrown.
+    - In case of other primitive types (number, boolean, or string), @a first
+      must be `begin()` and @a last must be `end()`. In this case, the value is
+      copied. Otherwise, invalid_iterator.204 is thrown.
+    - In case of structured types (array, object), the constructor behaves as
+      similar versions for `std::vector` or `std::map`; that is, a JSON array
+      or object is constructed from the values in the range.
+
+    @tparam InputIT an input iterator type (@ref iterator or @ref
+    const_iterator)
+
+    @param[in] first begin of the range to copy from (included)
+    @param[in] last end of the range to copy from (excluded)
+
+    @pre Iterators @a first and @a last must be initialized. **This
+         precondition is enforced with an assertion (see warning).** If
+         assertions are switched off, a violation of this precondition yields
+         undefined behavior.
+
+    @pre Range `[first, last)` is valid. Usually, this precondition cannot be
+         checked efficiently. Only certain edge cases are detected; see the
+         description of the exceptions below. A violation of this precondition
+         yields undefined behavior.
+
+    @warning A precondition is enforced with a runtime assertion that will
+             result in calling `std::abort` if this precondition is not met.
+             Assertions can be disabled by defining `NDEBUG` at compile time.
+             See https://en.cppreference.com/w/cpp/error/assert for more
+             information.
+
+    @throw invalid_iterator.201 if iterators @a first and @a last are not
+    compatible (i.e., do not belong to the same JSON value). In this case,
+    the range `[first, last)` is undefined.
+    @throw invalid_iterator.204 if iterators @a first and @a last belong to a
+    primitive type (number, boolean, or string), but @a first does not point
+    to the first element any more. In this case, the range `[first, last)` is
+    undefined. See example code below.
+    @throw invalid_iterator.206 if iterators @a first and @a last belong to a
+    null value. In this case, the range `[first, last)` is undefined.
+
+    @complexity Linear in distance between @a first and @a last.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @liveexample{The example below shows several ways to create JSON values by
+    specifying a subrange with iterators.,basic_json__InputIt_InputIt}
+
+    @since version 1.0.0
+    */
+    template < class InputIT, typename std::enable_if <
+                   std::is_same<InputIT, typename basic_json_t::iterator>::value ||
+                   std::is_same<InputIT, typename basic_json_t::const_iterator>::value, int >::type = 0 >
+    basic_json(InputIT first, InputIT last)
+    {
+        JSON_ASSERT(first.m_object != nullptr);
+        JSON_ASSERT(last.m_object != nullptr);
+
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(201, "iterators are not compatible"));
+        }
+
+        // copy type from first iterator
+        m_type = first.m_object->m_type;
+
+        // check if iterator range is complete for primitive values
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!first.m_it.primitive_iterator.is_begin()
+                                         || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
+                }
+                break;
+            }
+
+            default:
+                break;
+        }
+
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = first.m_object->m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = first.m_object->m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = first.m_object->m_value.number_float;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = first.m_object->m_value.boolean;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *first.m_object->m_value.string;
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object = create<object_t>(first.m_it.object_iterator,
+                                                  last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array = create<array_t>(first.m_it.array_iterator,
+                                                last.m_it.array_iterator);
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_value = *first.m_object->m_value.binary;
+                break;
+            }
+
+            default:
+                JSON_THROW(invalid_iterator::create(206, "cannot construct with iterators from " +
+                                                    std::string(first.m_object->type_name())));
+        }
+
+        assert_invariant();
+    }
+
+
+    ///////////////////////////////////////
+    // other constructors and destructor //
+    ///////////////////////////////////////
+
+    template<typename JsonRef,
+             detail::enable_if_t<detail::conjunction<detail::is_json_ref<JsonRef>,
+                                 std::is_same<typename JsonRef::value_type, basic_json>>::value, int> = 0 >
+    basic_json(const JsonRef& ref) : basic_json(ref.moved_or_copied()) {}
+
+    /*!
+    @brief copy constructor
+
+    Creates a copy of a given JSON value.
+
+    @param[in] other  the JSON value to copy
+
+    @post `*this == other`
+
+    @complexity Linear in the size of @a other.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes to any JSON value.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is linear.
+    - As postcondition, it holds: `other == basic_json(other)`.
+
+    @liveexample{The following code shows an example for the copy
+    constructor.,basic_json__basic_json}
+
+    @since version 1.0.0
+    */
+    basic_json(const basic_json& other)
+        : m_type(other.m_type)
+    {
+        // check of passed value is valid
+        other.assert_invariant();
+
+        switch (m_type)
+        {
+            case value_t::object:
+            {
+                m_value = *other.m_value.object;
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value = *other.m_value.array;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value = *other.m_value.string;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value = other.m_value.boolean;
+                break;
+            }
+
+            case value_t::number_integer:
+            {
+                m_value = other.m_value.number_integer;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value = other.m_value.number_unsigned;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value = other.m_value.number_float;
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_value = *other.m_value.binary;
+                break;
+            }
+
+            default:
+                break;
+        }
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief move constructor
+
+    Move constructor. Constructs a JSON value with the contents of the given
+    value @a other using move semantics. It "steals" the resources from @a
+    other and leaves it as JSON null value.
+
+    @param[in,out] other  value to move to this object
+
+    @post `*this` has the same value as @a other before the call.
+    @post @a other is a JSON null value.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this constructor never throws
+    exceptions.
+
+    @requirement This function helps `basic_json` satisfying the
+    [MoveConstructible](https://en.cppreference.com/w/cpp/named_req/MoveConstructible)
+    requirements.
+
+    @liveexample{The code below shows the move constructor explicitly called
+    via std::move.,basic_json__moveconstructor}
+
+    @since version 1.0.0
+    */
+    basic_json(basic_json&& other) noexcept
+        : m_type(std::move(other.m_type)),
+          m_value(std::move(other.m_value))
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        // invalidate payload
+        other.m_type = value_t::null;
+        other.m_value = {};
+
+        assert_invariant();
+    }
+
+    /*!
+    @brief copy assignment
+
+    Copy assignment operator. Copies a JSON value via the "copy and swap"
+    strategy: It is expressed in terms of the copy constructor, destructor,
+    and the `swap()` member function.
+
+    @param[in] other  value to copy from
+
+    @complexity Linear.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is linear.
+
+    @liveexample{The code below shows and example for the copy assignment. It
+    creates a copy of value `a` which is then swapped with `b`. Finally\, the
+    copy of `a` (which is the null value after the swap) is
+    destroyed.,basic_json__copyassignment}
+
+    @since version 1.0.0
+    */
+    basic_json& operator=(basic_json other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        // check that passed value is valid
+        other.assert_invariant();
+
+        using std::swap;
+        swap(m_type, other.m_type);
+        swap(m_value, other.m_value);
+
+        assert_invariant();
+        return *this;
+    }
+
+    /*!
+    @brief destructor
+
+    Destroys the JSON value and frees all allocated memory.
+
+    @complexity Linear.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is linear.
+    - All stored elements are destroyed and all memory is freed.
+
+    @since version 1.0.0
+    */
+    ~basic_json() noexcept
+    {
+        assert_invariant();
+        m_value.destroy(m_type);
+    }
+
+    /// @}
+
+  public:
+    ///////////////////////
+    // object inspection //
+    ///////////////////////
+
+    /// @name object inspection
+    /// Functions to inspect the type of a JSON value.
+    /// @{
+
+    /*!
+    @brief serialization
+
+    Serialization function for JSON values. The function tries to mimic
+    Python's `json.dumps()` function, and currently supports its @a indent
+    and @a ensure_ascii parameters.
+
+    @param[in] indent If indent is nonnegative, then array elements and object
+    members will be pretty-printed with that indent level. An indent level of
+    `0` will only insert newlines. `-1` (the default) selects the most compact
+    representation.
+    @param[in] indent_char The character to use for indentation if @a indent is
+    greater than `0`. The default is ` ` (space).
+    @param[in] ensure_ascii If @a ensure_ascii is true, all non-ASCII characters
+    in the output are escaped with `\uXXXX` sequences, and the result consists
+    of ASCII characters only.
+    @param[in] error_handler  how to react on decoding errors; there are three
+    possible values: `strict` (throws and exception in case a decoding error
+    occurs; default), `replace` (replace invalid UTF-8 sequences with U+FFFD),
+    and `ignore` (ignore invalid UTF-8 sequences during serialization; all
+    bytes are copied to the output unchanged).
+
+    @return string containing the serialization of the JSON value
+
+    @throw type_error.316 if a string stored inside the JSON value is not
+                          UTF-8 encoded and @a error_handler is set to strict
+
+    @note Binary values are serialized as object containing two keys:
+      - "bytes": an array of bytes as integers
+      - "subtype": the subtype as integer or "null" if the binary has no subtype
+
+    @complexity Linear.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @liveexample{The following example shows the effect of different @a indent\,
+    @a indent_char\, and @a ensure_ascii parameters to the result of the
+    serialization.,dump}
+
+    @see https://docs.python.org/2/library/json.html#json.dump
+
+    @since version 1.0.0; indentation character @a indent_char, option
+           @a ensure_ascii and exceptions added in version 3.0.0; error
+           handlers added in version 3.4.0; serialization of binary values added
+           in version 3.8.0.
+    */
+    string_t dump(const int indent = -1,
+                  const char indent_char = ' ',
+                  const bool ensure_ascii = false,
+                  const error_handler_t error_handler = error_handler_t::strict) const
+    {
+        string_t result;
+        serializer s(detail::output_adapter<char, string_t>(result), indent_char, error_handler);
+
+        if (indent >= 0)
+        {
+            s.dump(*this, true, ensure_ascii, static_cast<unsigned int>(indent));
+        }
+        else
+        {
+            s.dump(*this, false, ensure_ascii, 0);
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief return the type of the JSON value (explicit)
+
+    Return the type of the JSON value as a value from the @ref value_t
+    enumeration.
+
+    @return the type of the JSON value
+            Value type                | return value
+            ------------------------- | -------------------------
+            null                      | value_t::null
+            boolean                   | value_t::boolean
+            string                    | value_t::string
+            number (integer)          | value_t::number_integer
+            number (unsigned integer) | value_t::number_unsigned
+            number (floating-point)   | value_t::number_float
+            object                    | value_t::object
+            array                     | value_t::array
+            binary                    | value_t::binary
+            discarded                 | value_t::discarded
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `type()` for all JSON
+    types.,type}
+
+    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+    @sa @ref type_name() -- return the type as string
+
+    @since version 1.0.0
+    */
+    constexpr value_t type() const noexcept
+    {
+        return m_type;
+    }
+
+    /*!
+    @brief return whether type is primitive
+
+    This function returns true if and only if the JSON type is primitive
+    (string, number, boolean, or null).
+
+    @return `true` if type is primitive (string, number, boolean, or null),
+    `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_primitive()` for all JSON
+    types.,is_primitive}
+
+    @sa @ref is_structured() -- returns whether JSON value is structured
+    @sa @ref is_null() -- returns whether JSON value is `null`
+    @sa @ref is_string() -- returns whether JSON value is a string
+    @sa @ref is_boolean() -- returns whether JSON value is a boolean
+    @sa @ref is_number() -- returns whether JSON value is a number
+    @sa @ref is_binary() -- returns whether JSON value is a binary array
+
+    @since version 1.0.0
+    */
+    constexpr bool is_primitive() const noexcept
+    {
+        return is_null() || is_string() || is_boolean() || is_number() || is_binary();
+    }
+
+    /*!
+    @brief return whether type is structured
+
+    This function returns true if and only if the JSON type is structured
+    (array or object).
+
+    @return `true` if type is structured (array or object), `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_structured()` for all JSON
+    types.,is_structured}
+
+    @sa @ref is_primitive() -- returns whether value is primitive
+    @sa @ref is_array() -- returns whether value is an array
+    @sa @ref is_object() -- returns whether value is an object
+
+    @since version 1.0.0
+    */
+    constexpr bool is_structured() const noexcept
+    {
+        return is_array() || is_object();
+    }
+
+    /*!
+    @brief return whether value is null
+
+    This function returns true if and only if the JSON value is null.
+
+    @return `true` if type is null, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_null()` for all JSON
+    types.,is_null}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_null() const noexcept
+    {
+        return m_type == value_t::null;
+    }
+
+    /*!
+    @brief return whether value is a boolean
+
+    This function returns true if and only if the JSON value is a boolean.
+
+    @return `true` if type is boolean, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_boolean()` for all JSON
+    types.,is_boolean}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_boolean() const noexcept
+    {
+        return m_type == value_t::boolean;
+    }
+
+    /*!
+    @brief return whether value is a number
+
+    This function returns true if and only if the JSON value is a number. This
+    includes both integer (signed and unsigned) and floating-point values.
+
+    @return `true` if type is number (regardless whether integer, unsigned
+    integer or floating-type), `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number()` for all JSON
+    types.,is_number}
+
+    @sa @ref is_number_integer() -- check if value is an integer or unsigned
+    integer number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number() const noexcept
+    {
+        return is_number_integer() || is_number_float();
+    }
+
+    /*!
+    @brief return whether value is an integer number
+
+    This function returns true if and only if the JSON value is a signed or
+    unsigned integer number. This excludes floating-point values.
+
+    @return `true` if type is an integer or unsigned integer number, `false`
+    otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_integer()` for all
+    JSON types.,is_number_integer}
+
+    @sa @ref is_number() -- check if value is a number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number_integer() const noexcept
+    {
+        return m_type == value_t::number_integer || m_type == value_t::number_unsigned;
+    }
+
+    /*!
+    @brief return whether value is an unsigned integer number
+
+    This function returns true if and only if the JSON value is an unsigned
+    integer number. This excludes floating-point and signed integer values.
+
+    @return `true` if type is an unsigned integer number, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_unsigned()` for all
+    JSON types.,is_number_unsigned}
+
+    @sa @ref is_number() -- check if value is a number
+    @sa @ref is_number_integer() -- check if value is an integer or unsigned
+    integer number
+    @sa @ref is_number_float() -- check if value is a floating-point number
+
+    @since version 2.0.0
+    */
+    constexpr bool is_number_unsigned() const noexcept
+    {
+        return m_type == value_t::number_unsigned;
+    }
+
+    /*!
+    @brief return whether value is a floating-point number
+
+    This function returns true if and only if the JSON value is a
+    floating-point number. This excludes signed and unsigned integer values.
+
+    @return `true` if type is a floating-point number, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_number_float()` for all
+    JSON types.,is_number_float}
+
+    @sa @ref is_number() -- check if value is number
+    @sa @ref is_number_integer() -- check if value is an integer number
+    @sa @ref is_number_unsigned() -- check if value is an unsigned integer
+    number
+
+    @since version 1.0.0
+    */
+    constexpr bool is_number_float() const noexcept
+    {
+        return m_type == value_t::number_float;
+    }
+
+    /*!
+    @brief return whether value is an object
+
+    This function returns true if and only if the JSON value is an object.
+
+    @return `true` if type is object, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_object()` for all JSON
+    types.,is_object}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_object() const noexcept
+    {
+        return m_type == value_t::object;
+    }
+
+    /*!
+    @brief return whether value is an array
+
+    This function returns true if and only if the JSON value is an array.
+
+    @return `true` if type is array, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_array()` for all JSON
+    types.,is_array}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_array() const noexcept
+    {
+        return m_type == value_t::array;
+    }
+
+    /*!
+    @brief return whether value is a string
+
+    This function returns true if and only if the JSON value is a string.
+
+    @return `true` if type is string, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_string()` for all JSON
+    types.,is_string}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_string() const noexcept
+    {
+        return m_type == value_t::string;
+    }
+
+    /*!
+    @brief return whether value is a binary array
+
+    This function returns true if and only if the JSON value is a binary array.
+
+    @return `true` if type is binary array, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_binary()` for all JSON
+    types.,is_binary}
+
+    @since version 3.8.0
+    */
+    constexpr bool is_binary() const noexcept
+    {
+        return m_type == value_t::binary;
+    }
+
+    /*!
+    @brief return whether value is discarded
+
+    This function returns true if and only if the JSON value was discarded
+    during parsing with a callback function (see @ref parser_callback_t).
+
+    @note This function will always be `false` for JSON values after parsing.
+    That is, discarded values can only occur during parsing, but will be
+    removed when inside a structured value or replaced by null in other cases.
+
+    @return `true` if type is discarded, `false` otherwise.
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies `is_discarded()` for all JSON
+    types.,is_discarded}
+
+    @since version 1.0.0
+    */
+    constexpr bool is_discarded() const noexcept
+    {
+        return m_type == value_t::discarded;
+    }
+
+    /*!
+    @brief return the type of the JSON value (implicit)
+
+    Implicitly return the type of the JSON value as a value from the @ref
+    value_t enumeration.
+
+    @return the type of the JSON value
+
+    @complexity Constant.
+
+    @exceptionsafety No-throw guarantee: this member function never throws
+    exceptions.
+
+    @liveexample{The following code exemplifies the @ref value_t operator for
+    all JSON types.,operator__value_t}
+
+    @sa @ref type() -- return the type of the JSON value (explicit)
+    @sa @ref type_name() -- return the type as string
+
+    @since version 1.0.0
+    */
+    constexpr operator value_t() const noexcept
+    {
+        return m_type;
+    }
+
+    /// @}
+
+  private:
+    //////////////////
+    // value access //
+    //////////////////
+
+    /// get a boolean (explicit)
+    boolean_t get_impl(boolean_t* /*unused*/) const
+    {
+        if (JSON_HEDLEY_LIKELY(is_boolean()))
+        {
+            return m_value.boolean;
+        }
+
+        JSON_THROW(type_error::create(302, "type must be boolean, but is " + std::string(type_name())));
+    }
+
+    /// get a pointer to the value (object)
+    object_t* get_impl_ptr(object_t* /*unused*/) noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (object)
+    constexpr const object_t* get_impl_ptr(const object_t* /*unused*/) const noexcept
+    {
+        return is_object() ? m_value.object : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    array_t* get_impl_ptr(array_t* /*unused*/) noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (array)
+    constexpr const array_t* get_impl_ptr(const array_t* /*unused*/) const noexcept
+    {
+        return is_array() ? m_value.array : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    string_t* get_impl_ptr(string_t* /*unused*/) noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (string)
+    constexpr const string_t* get_impl_ptr(const string_t* /*unused*/) const noexcept
+    {
+        return is_string() ? m_value.string : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    boolean_t* get_impl_ptr(boolean_t* /*unused*/) noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (boolean)
+    constexpr const boolean_t* get_impl_ptr(const boolean_t* /*unused*/) const noexcept
+    {
+        return is_boolean() ? &m_value.boolean : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    number_integer_t* get_impl_ptr(number_integer_t* /*unused*/) noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (integer number)
+    constexpr const number_integer_t* get_impl_ptr(const number_integer_t* /*unused*/) const noexcept
+    {
+        return is_number_integer() ? &m_value.number_integer : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    number_unsigned_t* get_impl_ptr(number_unsigned_t* /*unused*/) noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (unsigned number)
+    constexpr const number_unsigned_t* get_impl_ptr(const number_unsigned_t* /*unused*/) const noexcept
+    {
+        return is_number_unsigned() ? &m_value.number_unsigned : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    number_float_t* get_impl_ptr(number_float_t* /*unused*/) noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (floating-point number)
+    constexpr const number_float_t* get_impl_ptr(const number_float_t* /*unused*/) const noexcept
+    {
+        return is_number_float() ? &m_value.number_float : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    binary_t* get_impl_ptr(binary_t* /*unused*/) noexcept
+    {
+        return is_binary() ? m_value.binary : nullptr;
+    }
+
+    /// get a pointer to the value (binary)
+    constexpr const binary_t* get_impl_ptr(const binary_t* /*unused*/) const noexcept
+    {
+        return is_binary() ? m_value.binary : nullptr;
+    }
+
+    /*!
+    @brief helper function to implement get_ref()
+
+    This function helps to implement get_ref() without code duplication for
+    const and non-const overloads
+
+    @tparam ThisType will be deduced as `basic_json` or `const basic_json`
+
+    @throw type_error.303 if ReferenceType does not match underlying value
+    type of the current JSON
+    */
+    template<typename ReferenceType, typename ThisType>
+    static ReferenceType get_ref_impl(ThisType& obj)
+    {
+        // delegate the call to get_ptr<>()
+        auto ptr = obj.template get_ptr<typename std::add_pointer<ReferenceType>::type>();
+
+        if (JSON_HEDLEY_LIKELY(ptr != nullptr))
+        {
+            return *ptr;
+        }
+
+        JSON_THROW(type_error::create(303, "incompatible ReferenceType for get_ref, actual type is " + std::string(obj.type_name())));
+    }
+
+  public:
+    /// @name value access
+    /// Direct access to the stored value of a JSON value.
+    /// @{
+
+    /*!
+    @brief get special-case overload
+
+    This overloads avoids a lot of template boilerplate, it can be seen as the
+    identity method
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this
+
+    @complexity Constant.
+
+    @since version 2.1.0
+    */
+    template<typename BasicJsonType, detail::enable_if_t<
+                 std::is_same<typename std::remove_const<BasicJsonType>::type, basic_json_t>::value,
+                 int> = 0>
+    basic_json get() const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get special-case overload
+
+    This overloads converts the current @ref basic_json in a different
+    @ref basic_json type
+
+    @tparam BasicJsonType == @ref basic_json
+
+    @return a copy of *this, converted into @tparam BasicJsonType
+
+    @complexity Depending on the implementation of the called `from_json()`
+                method.
+
+    @since version 3.2.0
+    */
+    template < typename BasicJsonType, detail::enable_if_t <
+                   !std::is_same<BasicJsonType, basic_json>::value&&
+                   detail::is_basic_json<BasicJsonType>::value, int > = 0 >
+    BasicJsonType get() const
+    {
+        return *this;
+    }
+
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType ret;
+    JSONSerializer<ValueType>::from_json(*this, ret);
+    return ret;
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+    - @ref json_serializer<ValueType> does not have a `from_json()` method of
+      the form `ValueType from_json(const basic_json&)`
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get__ValueType_const}
+
+    @since version 2.1.0
+    */
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value &&
+                   detail::has_from_json<basic_json_t, ValueType>::value &&
+                   !detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType get() const noexcept(noexcept(
+                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), std::declval<ValueType&>())))
+    {
+        // we cannot static_assert on ValueTypeCV being non-const, because
+        // there is support for get<const basic_json_t>(), which is why we
+        // still need the uncvref
+        static_assert(!std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        static_assert(std::is_default_constructible<ValueType>::value,
+                      "types must be DefaultConstructible when used with get()");
+
+        ValueType ret;
+        JSONSerializer<ValueType>::from_json(*this, ret);
+        return ret;
+    }
+
+    /*!
+    @brief get a value (explicit); special case
+
+    Explicit type conversion between the JSON value and a compatible value
+    which is **not** [CopyConstructible](https://en.cppreference.com/w/cpp/named_req/CopyConstructible)
+    and **not** [DefaultConstructible](https://en.cppreference.com/w/cpp/named_req/DefaultConstructible).
+    The value is converted by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    return JSONSerializer<ValueTypeCV>::from_json(*this);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json and
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `ValueType from_json(const basic_json&)`
+
+    @note If @ref json_serializer<ValueType> has both overloads of
+    `from_json()`, this one is chosen.
+
+    @tparam ValueTypeCV the provided value type
+    @tparam ValueType the returned value type
+
+    @return copy of the JSON value, converted to @a ValueType
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @since version 2.1.0
+    */
+    template < typename ValueTypeCV, typename ValueType = detail::uncvref_t<ValueTypeCV>,
+               detail::enable_if_t < !std::is_same<basic_json_t, ValueType>::value &&
+                                     detail::has_non_default_from_json<basic_json_t, ValueType>::value,
+                                     int > = 0 >
+    ValueType get() const noexcept(noexcept(
+                                       JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>())))
+    {
+        static_assert(!std::is_reference<ValueTypeCV>::value,
+                      "get() cannot be used with reference types, you might want to use get_ref()");
+        return JSONSerializer<ValueType>::from_json(*this);
+    }
+
+    /*!
+    @brief get a value (explicit)
+
+    Explicit type conversion between the JSON value and a compatible value.
+    The value is filled into the input parameter by calling the @ref json_serializer<ValueType>
+    `from_json()` method.
+
+    The function is equivalent to executing
+    @code {.cpp}
+    ValueType v;
+    JSONSerializer<ValueType>::from_json(*this, v);
+    @endcode
+
+    This overloads is chosen if:
+    - @a ValueType is not @ref basic_json,
+    - @ref json_serializer<ValueType> has a `from_json()` method of the form
+      `void from_json(const basic_json&, ValueType&)`, and
+
+    @tparam ValueType the input parameter type.
+
+    @return the input parameter, allowing chaining calls.
+
+    @throw what @ref json_serializer<ValueType> `from_json()` method throws
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,get_to}
+
+    @since version 3.3.0
+    */
+    template < typename ValueType,
+               detail::enable_if_t <
+                   !detail::is_basic_json<ValueType>::value&&
+                   detail::has_from_json<basic_json_t, ValueType>::value,
+                   int > = 0 >
+    ValueType & get_to(ValueType& v) const noexcept(noexcept(
+                JSONSerializer<ValueType>::from_json(std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<ValueType>::from_json(*this, v);
+        return v;
+    }
+
+    // specialization to allow to call get_to with a basic_json value
+    // see https://github.com/nlohmann/json/issues/2175
+    template<typename ValueType,
+             detail::enable_if_t <
+                 detail::is_basic_json<ValueType>::value,
+                 int> = 0>
+    ValueType & get_to(ValueType& v) const
+    {
+        v = *this;
+        return v;
+    }
+
+    template <
+        typename T, std::size_t N,
+        typename Array = T (&)[N],
+        detail::enable_if_t <
+            detail::has_from_json<basic_json_t, Array>::value, int > = 0 >
+    Array get_to(T (&v)[N]) const
+    noexcept(noexcept(JSONSerializer<Array>::from_json(
+                          std::declval<const basic_json_t&>(), v)))
+    {
+        JSONSerializer<Array>::from_json(*this, v);
+        return v;
+    }
+
+
+    /*!
+    @brief get a pointer value (implicit)
+
+    Implicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning Writing data to the pointee of the result yields an undefined
+    state.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t. Enforced by a static
+    assertion.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get_ptr}
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get_ptr() noexcept -> decltype(std::declval<basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>()
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /*!
+    @brief get a pointer value (implicit)
+    @copydoc get_ptr()
+    */
+    template < typename PointerType, typename std::enable_if <
+                   std::is_pointer<PointerType>::value&&
+                   std::is_const<typename std::remove_pointer<PointerType>::type>::value, int >::type = 0 >
+    constexpr auto get_ptr() const noexcept -> decltype(std::declval<const basic_json_t&>().get_impl_ptr(std::declval<PointerType>()))
+    {
+        // delegate the call to get_impl_ptr<>() const
+        return get_impl_ptr(static_cast<PointerType>(nullptr));
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+
+    Explicit pointer access to the internally stored JSON value. No copies are
+    made.
+
+    @warning The pointer becomes invalid if the underlying JSON object
+    changes.
+
+    @tparam PointerType pointer type; must be a pointer to @ref array_t, @ref
+    object_t, @ref string_t, @ref boolean_t, @ref number_integer_t,
+    @ref number_unsigned_t, or @ref number_float_t.
+
+    @return pointer to the internally stored JSON value if the requested
+    pointer type @a PointerType fits to the JSON value; `nullptr` otherwise
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how pointers to internal values of a
+    JSON value can be requested. Note that no type conversions are made and a
+    `nullptr` is returned if the value and the requested pointer type does not
+    match.,get__PointerType}
+
+    @sa @ref get_ptr() for explicit pointer-member access
+
+    @since version 1.0.0
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    auto get() noexcept -> decltype(std::declval<basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /*!
+    @brief get a pointer value (explicit)
+    @copydoc get()
+    */
+    template<typename PointerType, typename std::enable_if<
+                 std::is_pointer<PointerType>::value, int>::type = 0>
+    constexpr auto get() const noexcept -> decltype(std::declval<const basic_json_t&>().template get_ptr<PointerType>())
+    {
+        // delegate the call to get_ptr
+        return get_ptr<PointerType>();
+    }
+
+    /*!
+    @brief get a reference value (implicit)
+
+    Implicit reference access to the internally stored JSON value. No copies
+    are made.
+
+    @warning Writing data to the referee of the result yields an undefined
+    state.
+
+    @tparam ReferenceType reference type; must be a reference to @ref array_t,
+    @ref object_t, @ref string_t, @ref boolean_t, @ref number_integer_t, or
+    @ref number_float_t. Enforced by static assertion.
+
+    @return reference to the internally stored JSON value if the requested
+    reference type @a ReferenceType fits to the JSON value; throws
+    type_error.303 otherwise
+
+    @throw type_error.303 in case passed type @a ReferenceType is incompatible
+    with the stored JSON value; see example below
+
+    @complexity Constant.
+
+    @liveexample{The example shows several calls to `get_ref()`.,get_ref}
+
+    @since version 1.1.0
+    */
+    template<typename ReferenceType, typename std::enable_if<
+                 std::is_reference<ReferenceType>::value, int>::type = 0>
+    ReferenceType get_ref()
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a reference value (implicit)
+    @copydoc get_ref()
+    */
+    template < typename ReferenceType, typename std::enable_if <
+                   std::is_reference<ReferenceType>::value&&
+                   std::is_const<typename std::remove_reference<ReferenceType>::type>::value, int >::type = 0 >
+    ReferenceType get_ref() const
+    {
+        // delegate call to get_ref_impl
+        return get_ref_impl<ReferenceType>(*this);
+    }
+
+    /*!
+    @brief get a value (implicit)
+
+    Implicit type conversion between the JSON value and a compatible value.
+    The call is realized by calling @ref get() const.
+
+    @tparam ValueType non-pointer type compatible to the JSON value, for
+    instance `int` for JSON integer numbers, `bool` for JSON booleans, or
+    `std::vector` types for JSON arrays. The character type of @ref string_t
+    as well as an initializer list of this type is excluded to avoid
+    ambiguities as these types implicitly convert to `std::string`.
+
+    @return copy of the JSON value, converted to type @a ValueType
+
+    @throw type_error.302 in case passed type @a ValueType is incompatible
+    to the JSON value type (e.g., the JSON value is of type boolean, but a
+    string is requested); see example below
+
+    @complexity Linear in the size of the JSON value.
+
+    @liveexample{The example below shows several conversions from JSON values
+    to other types. There a few things to note: (1) Floating-point numbers can
+    be converted to integers\, (2) A JSON array can be converted to a standard
+    `std::vector<short>`\, (3) A JSON object can be converted to C++
+    associative containers such as `std::unordered_map<std::string\,
+    json>`.,operator__ValueType}
+
+    @since version 1.0.0
+    */
+    template < typename ValueType, typename std::enable_if <
+                   !std::is_pointer<ValueType>::value&&
+                   !std::is_same<ValueType, detail::json_ref<basic_json>>::value&&
+                   !std::is_same<ValueType, typename string_t::value_type>::value&&
+                   !detail::is_basic_json<ValueType>::value
+                   && !std::is_same<ValueType, std::initializer_list<typename string_t::value_type>>::value
+#if defined(JSON_HAS_CPP_17) && (defined(__GNUC__) || (defined(_MSC_VER) && _MSC_VER >= 1910 && _MSC_VER <= 1914))
+                   && !std::is_same<ValueType, typename std::string_view>::value
+#endif
+                   && detail::is_detected<detail::get_template_function, const basic_json_t&, ValueType>::value
+                   , int >::type = 0 >
+    JSON_EXPLICIT operator ValueType() const
+    {
+        // delegate the call to get<>() const
+        return get<ValueType>();
+    }
+
+    /*!
+    @return reference to the binary value
+
+    @throw type_error.302 if the value is not binary
+
+    @sa @ref is_binary() to check if the value is binary
+
+    @since version 3.8.0
+    */
+    binary_t& get_binary()
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name())));
+        }
+
+        return *get_ptr<binary_t*>();
+    }
+
+    /// @copydoc get_binary()
+    const binary_t& get_binary() const
+    {
+        if (!is_binary())
+        {
+            JSON_THROW(type_error::create(302, "type must be binary, but is " + std::string(type_name())));
+        }
+
+        return *get_ptr<const binary_t*>();
+    }
+
+    /// @}
+
+
+    ////////////////////
+    // element access //
+    ////////////////////
+
+    /// @name element access
+    /// Access to the JSON value.
+    /// @{
+
+    /*!
+    @brief access specified array element with bounds checking
+
+    Returns a reference to the element at specified location @a idx, with
+    bounds checking.
+
+    @param[in] idx  index of the element to access
+
+    @return reference to the element at index @a idx
+
+    @throw type_error.304 if the JSON value is not an array; in this case,
+    calling `at` with an index makes no sense. See example below.
+    @throw out_of_range.401 if the index @a idx is out of range of the array;
+    that is, `idx >= size()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how array elements can be read and
+    written using `at()`. It also demonstrates the different exceptions that
+    can be thrown.,at__size_type}
+    */
+    reference at(size_type idx)
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified array element with bounds checking
+
+    Returns a const reference to the element at specified location @a idx,
+    with bounds checking.
+
+    @param[in] idx  index of the element to access
+
+    @return const reference to the element at index @a idx
+
+    @throw type_error.304 if the JSON value is not an array; in this case,
+    calling `at` with an index makes no sense. See example below.
+    @throw out_of_range.401 if the index @a idx is out of range of the array;
+    that is, `idx >= size()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how array elements can be read using
+    `at()`. It also demonstrates the different exceptions that can be thrown.,
+    at__size_type_const}
+    */
+    const_reference at(size_type idx) const
+    {
+        // at only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            JSON_TRY
+            {
+                return m_value.array->at(idx);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified object element with bounds checking
+
+    Returns a reference to the element at with specified key @a key, with
+    bounds checking.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.304 if the JSON value is not an object; in this case,
+    calling `at` with a key makes no sense. See example below.
+    @throw out_of_range.403 if the key @a key is is not stored in the object;
+    that is, `find(key) == end()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Logarithmic in the size of the container.
+
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how object elements can be read and
+    written using `at()`. It also demonstrates the different exceptions that
+    can be thrown.,at__object_t_key_type}
+    */
+    reference at(const typename object_t::key_type& key)
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_TRY
+            {
+                return m_value.object->at(key);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified object element with bounds checking
+
+    Returns a const reference to the element at with specified key @a key,
+    with bounds checking.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @throw type_error.304 if the JSON value is not an object; in this case,
+    calling `at` with a key makes no sense. See example below.
+    @throw out_of_range.403 if the key @a key is is not stored in the object;
+    that is, `find(key) == end()`. See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Logarithmic in the size of the container.
+
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+
+    @liveexample{The example below shows how object elements can be read using
+    `at()`. It also demonstrates the different exceptions that can be thrown.,
+    at__object_t_key_type_const}
+    */
+    const_reference at(const typename object_t::key_type& key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_TRY
+            {
+                return m_value.object->at(key);
+            }
+            JSON_CATCH (std::out_of_range&)
+            {
+                // create better exception explanation
+                JSON_THROW(out_of_range::create(403, "key '" + key + "' not found"));
+            }
+        }
+        else
+        {
+            JSON_THROW(type_error::create(304, "cannot use at() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief access specified array element
+
+    Returns a reference to the element at specified location @a idx.
+
+    @note If @a idx is beyond the range of the array (i.e., `idx >= size()`),
+    then the array is silently filled up with `null` values to make `idx` a
+    valid reference to the last stored element.
+
+    @param[in] idx  index of the element to access
+
+    @return reference to the element at index @a idx
+
+    @throw type_error.305 if the JSON value is not an array or null; in that
+    cases, using the [] operator with an index makes no sense.
+
+    @complexity Constant if @a idx is in the range of the array. Otherwise
+    linear in `idx - size()`.
+
+    @liveexample{The example below shows how array elements can be read and
+    written using `[]` operator. Note the addition of `null`
+    values.,operatorarray__size_type}
+
+    @since version 1.0.0
+    */
+    reference operator[](size_type idx)
+    {
+        // implicitly convert null value to an empty array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value.array = create<array_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // fill up array with null values if given idx is outside range
+            if (idx >= m_value.array->size())
+            {
+                m_value.array->insert(m_value.array->end(),
+                                      idx - m_value.array->size() + 1,
+                                      basic_json());
+            }
+
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified array element
+
+    Returns a const reference to the element at specified location @a idx.
+
+    @param[in] idx  index of the element to access
+
+    @return const reference to the element at index @a idx
+
+    @throw type_error.305 if the JSON value is not an array; in that case,
+    using the [] operator with an index makes no sense.
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how array elements can be read using
+    the `[]` operator.,operatorarray__size_type_const}
+
+    @since version 1.0.0
+    */
+    const_reference operator[](size_type idx) const
+    {
+        // const operator[] only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            return m_value.array->operator[](idx);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a numeric argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element
+
+    Returns a reference to the element at with specified key @a key.
+
+    @note If @a key is not found in the object, then it is silently added to
+    the object and filled with a `null` value to make `key` a valid reference.
+    In case the value was `null` before, it is converted to an object.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.305 if the JSON value is not an object or null; in that
+    cases, using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read and
+    written using the `[]` operator.,operatorarray__key_type}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+    */
+    reference operator[](const typename object_t::key_type& key)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        // operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return m_value.object->operator[](key);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief read-only access specified object element
+
+    Returns a const reference to the element at with specified key @a key. No
+    bounds checking is performed.
+
+    @warning If the element with key @a key does not exist, the behavior is
+    undefined.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @pre The element with key @a key must exist. **This precondition is
+         enforced with an assertion.**
+
+    @throw type_error.305 if the JSON value is not an object; in that case,
+    using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read using
+    the `[]` operator.,operatorarray__key_type_const}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.0.0
+    */
+    const_reference operator[](const typename object_t::key_type& key) const
+    {
+        // const operator[] only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
+            return m_value.object->find(key)->second;
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element
+
+    Returns a reference to the element at with specified key @a key.
+
+    @note If @a key is not found in the object, then it is silently added to
+    the object and filled with a `null` value to make `key` a valid reference.
+    In case the value was `null` before, it is converted to an object.
+
+    @param[in] key  key of the element to access
+
+    @return reference to the element at key @a key
+
+    @throw type_error.305 if the JSON value is not an object or null; in that
+    cases, using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read and
+    written using the `[]` operator.,operatorarray__key_type}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.1.0
+    */
+    template<typename T>
+    JSON_HEDLEY_NON_NULL(2)
+    reference operator[](T* key)
+    {
+        // implicitly convert null to object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return m_value.object->operator[](key);
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief read-only access specified object element
+
+    Returns a const reference to the element at with specified key @a key. No
+    bounds checking is performed.
+
+    @warning If the element with key @a key does not exist, the behavior is
+    undefined.
+
+    @param[in] key  key of the element to access
+
+    @return const reference to the element at key @a key
+
+    @pre The element with key @a key must exist. **This precondition is
+         enforced with an assertion.**
+
+    @throw type_error.305 if the JSON value is not an object; in that case,
+    using the [] operator with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be read using
+    the `[]` operator.,operatorarray__key_type_const}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref value() for access by value with a default value
+
+    @since version 1.1.0
+    */
+    template<typename T>
+    JSON_HEDLEY_NON_NULL(2)
+    const_reference operator[](T* key) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            JSON_ASSERT(m_value.object->find(key) != m_value.object->end());
+            return m_value.object->find(key)->second;
+        }
+
+        JSON_THROW(type_error::create(305, "cannot use operator[] with a string argument with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief access specified object element with default value
+
+    Returns either a copy of an object's element at the specified key @a key
+    or a given default value if no element with key @a key exists.
+
+    The function is basically equivalent to executing
+    @code {.cpp}
+    try {
+        return at(key);
+    } catch(out_of_range) {
+        return default_value;
+    }
+    @endcode
+
+    @note Unlike @ref at(const typename object_t::key_type&), this function
+    does not throw if the given key @a key was not found.
+
+    @note Unlike @ref operator[](const typename object_t::key_type& key), this
+    function does not implicitly add an element to the position defined by @a
+    key. This function is furthermore also applicable to const objects.
+
+    @param[in] key  key of the element to access
+    @param[in] default_value  the value to return if @a key is not found
+
+    @tparam ValueType type compatible to JSON values, for instance `int` for
+    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
+    JSON arrays. Note the type of the expected value at @a key and the default
+    value @a default_value must be compatible.
+
+    @return copy of the element at key @a key or @a default_value if @a key
+    is not found
+
+    @throw type_error.302 if @a default_value does not match the type of the
+    value at @a key
+    @throw type_error.306 if the JSON value is not an object; in that case,
+    using `value()` with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be queried
+    with a default value.,basic_json__value}
+
+    @sa @ref at(const typename object_t::key_type&) for access by reference
+    with range checking
+    @sa @ref operator[](const typename object_t::key_type&) for unchecked
+    access by reference
+
+    @since version 1.0.0
+    */
+    // using std::is_convertible in a std::enable_if will fail when using explicit conversions
+    template < class ValueType, typename std::enable_if <
+                   detail::is_getable<basic_json_t, ValueType>::value
+                   && !std::is_same<value_t, ValueType>::value, int >::type = 0 >
+    ValueType value(const typename object_t::key_type& key, const ValueType& default_value) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if key is found, return value and given default value otherwise
+            const auto it = find(key);
+            if (it != end())
+            {
+                return it->template get<ValueType>();
+            }
+
+            return default_value;
+        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief overload for a default value of type const char*
+    @copydoc basic_json::value(const typename object_t::key_type&, const ValueType&) const
+    */
+    string_t value(const typename object_t::key_type& key, const char* default_value) const
+    {
+        return value(key, string_t(default_value));
+    }
+
+    /*!
+    @brief access specified object element via JSON Pointer with default value
+
+    Returns either a copy of an object's element at the specified key @a key
+    or a given default value if no element with key @a key exists.
+
+    The function is basically equivalent to executing
+    @code {.cpp}
+    try {
+        return at(ptr);
+    } catch(out_of_range) {
+        return default_value;
+    }
+    @endcode
+
+    @note Unlike @ref at(const json_pointer&), this function does not throw
+    if the given key @a key was not found.
+
+    @param[in] ptr  a JSON pointer to the element to access
+    @param[in] default_value  the value to return if @a ptr found no value
+
+    @tparam ValueType type compatible to JSON values, for instance `int` for
+    JSON integer numbers, `bool` for JSON booleans, or `std::vector` types for
+    JSON arrays. Note the type of the expected value at @a key and the default
+    value @a default_value must be compatible.
+
+    @return copy of the element at key @a key or @a default_value if @a key
+    is not found
+
+    @throw type_error.302 if @a default_value does not match the type of the
+    value at @a ptr
+    @throw type_error.306 if the JSON value is not an object; in that case,
+    using `value()` with a key makes no sense.
+
+    @complexity Logarithmic in the size of the container.
+
+    @liveexample{The example below shows how object elements can be queried
+    with a default value.,basic_json__value_ptr}
+
+    @sa @ref operator[](const json_pointer&) for unchecked access by reference
+
+    @since version 2.0.2
+    */
+    template<class ValueType, typename std::enable_if<
+                 detail::is_getable<basic_json_t, ValueType>::value, int>::type = 0>
+    ValueType value(const json_pointer& ptr, const ValueType& default_value) const
+    {
+        // at only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            // if pointer resolves a value, return it or use default value
+            JSON_TRY
+            {
+                return ptr.get_checked(this).template get<ValueType>();
+            }
+            JSON_INTERNAL_CATCH (out_of_range&)
+            {
+                return default_value;
+            }
+        }
+
+        JSON_THROW(type_error::create(306, "cannot use value() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief overload for a default value of type const char*
+    @copydoc basic_json::value(const json_pointer&, ValueType) const
+    */
+    JSON_HEDLEY_NON_NULL(3)
+    string_t value(const json_pointer& ptr, const char* default_value) const
+    {
+        return value(ptr, string_t(default_value));
+    }
+
+    /*!
+    @brief access the first element
+
+    Returns a reference to the first element in the container. For a JSON
+    container `c`, the expression `c.front()` is equivalent to `*c.begin()`.
+
+    @return In case of a structured type (array or object), a reference to the
+    first element is returned. In case of number, string, boolean, or binary
+    values, a reference to the value is returned.
+
+    @complexity Constant.
+
+    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
+    or an empty array or object (undefined behavior, **guarded by
+    assertions**).
+    @post The JSON value remains unchanged.
+
+    @throw invalid_iterator.214 when called on `null` value
+
+    @liveexample{The following code shows an example for `front()`.,front}
+
+    @sa @ref back() -- access the last element
+
+    @since version 1.0.0
+    */
+    reference front()
+    {
+        return *begin();
+    }
+
+    /*!
+    @copydoc basic_json::front()
+    */
+    const_reference front() const
+    {
+        return *cbegin();
+    }
+
+    /*!
+    @brief access the last element
+
+    Returns a reference to the last element in the container. For a JSON
+    container `c`, the expression `c.back()` is equivalent to
+    @code {.cpp}
+    auto tmp = c.end();
+    --tmp;
+    return *tmp;
+    @endcode
+
+    @return In case of a structured type (array or object), a reference to the
+    last element is returned. In case of number, string, boolean, or binary
+    values, a reference to the value is returned.
+
+    @complexity Constant.
+
+    @pre The JSON value must not be `null` (would throw `std::out_of_range`)
+    or an empty array or object (undefined behavior, **guarded by
+    assertions**).
+    @post The JSON value remains unchanged.
+
+    @throw invalid_iterator.214 when called on a `null` value. See example
+    below.
+
+    @liveexample{The following code shows an example for `back()`.,back}
+
+    @sa @ref front() -- access the first element
+
+    @since version 1.0.0
+    */
+    reference back()
+    {
+        auto tmp = end();
+        --tmp;
+        return *tmp;
+    }
+
+    /*!
+    @copydoc basic_json::back()
+    */
+    const_reference back() const
+    {
+        auto tmp = cend();
+        --tmp;
+        return *tmp;
+    }
+
+    /*!
+    @brief remove element given an iterator
+
+    Removes the element specified by iterator @a pos. The iterator @a pos must
+    be valid and dereferenceable. Thus the `end()` iterator (which is valid,
+    but is not dereferenceable) cannot be used as a value for @a pos.
+
+    If called on a primitive type other than `null`, the resulting JSON value
+    will be `null`.
+
+    @param[in] pos iterator to the element to remove
+    @return Iterator following the last removed element. If the iterator @a
+    pos refers to the last element, the `end()` iterator is returned.
+
+    @tparam IteratorType an @ref iterator or @ref const_iterator
+
+    @post Invalidates iterators and references at or after the point of the
+    erase, including the `end()` iterator.
+
+    @throw type_error.307 if called on a `null` value; example: `"cannot use
+    erase() with null"`
+    @throw invalid_iterator.202 if called on an iterator which does not belong
+    to the current JSON value; example: `"iterator does not fit current
+    value"`
+    @throw invalid_iterator.205 if called on a primitive type with invalid
+    iterator (i.e., any iterator which is not `begin()`); example: `"iterator
+    out of range"`
+
+    @complexity The complexity depends on the type:
+    - objects: amortized constant
+    - arrays: linear in distance between @a pos and the end of the container
+    - strings and binary: linear in the length of the member
+    - other types: constant
+
+    @liveexample{The example shows the result of `erase()` for different JSON
+    types.,erase__IteratorType}
+
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    template < class IteratorType, typename std::enable_if <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
+               = 0 >
+    IteratorType erase(IteratorType pos)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != pos.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_UNLIKELY(!pos.m_it.primitive_iterator.is_begin()))
+                {
+                    JSON_THROW(invalid_iterator::create(205, "iterator out of range"));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
+                    m_value.binary = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(pos.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(pos.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief remove elements given an iterator range
+
+    Removes the element specified by the range `[first; last)`. The iterator
+    @a first does not need to be dereferenceable if `first == last`: erasing
+    an empty range is a no-op.
+
+    If called on a primitive type other than `null`, the resulting JSON value
+    will be `null`.
+
+    @param[in] first iterator to the beginning of the range to remove
+    @param[in] last iterator past the end of the range to remove
+    @return Iterator following the last removed element. If the iterator @a
+    second refers to the last element, the `end()` iterator is returned.
+
+    @tparam IteratorType an @ref iterator or @ref const_iterator
+
+    @post Invalidates iterators and references at or after the point of the
+    erase, including the `end()` iterator.
+
+    @throw type_error.307 if called on a `null` value; example: `"cannot use
+    erase() with null"`
+    @throw invalid_iterator.203 if called on iterators which does not belong
+    to the current JSON value; example: `"iterators do not fit current value"`
+    @throw invalid_iterator.204 if called on a primitive type with invalid
+    iterators (i.e., if `first != begin()` and `last != end()`); example:
+    `"iterators out of range"`
+
+    @complexity The complexity depends on the type:
+    - objects: `log(size()) + std::distance(first, last)`
+    - arrays: linear in the distance between @a first and @a last, plus linear
+      in the distance between @a last and end of the container
+    - strings and binary: linear in the length of the member
+    - other types: constant
+
+    @liveexample{The example shows the result of `erase()` for different JSON
+    types.,erase__IteratorType_IteratorType}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    template < class IteratorType, typename std::enable_if <
+                   std::is_same<IteratorType, typename basic_json_t::iterator>::value ||
+                   std::is_same<IteratorType, typename basic_json_t::const_iterator>::value, int >::type
+               = 0 >
+    IteratorType erase(IteratorType first, IteratorType last)
+    {
+        // make sure iterator fits the current value
+        if (JSON_HEDLEY_UNLIKELY(this != first.m_object || this != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(203, "iterators do not fit current value"));
+        }
+
+        IteratorType result = end();
+
+        switch (m_type)
+        {
+            case value_t::boolean:
+            case value_t::number_float:
+            case value_t::number_integer:
+            case value_t::number_unsigned:
+            case value_t::string:
+            case value_t::binary:
+            {
+                if (JSON_HEDLEY_LIKELY(!first.m_it.primitive_iterator.is_begin()
+                                       || !last.m_it.primitive_iterator.is_end()))
+                {
+                    JSON_THROW(invalid_iterator::create(204, "iterators out of range"));
+                }
+
+                if (is_string())
+                {
+                    AllocatorType<string_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.string);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.string, 1);
+                    m_value.string = nullptr;
+                }
+                else if (is_binary())
+                {
+                    AllocatorType<binary_t> alloc;
+                    std::allocator_traits<decltype(alloc)>::destroy(alloc, m_value.binary);
+                    std::allocator_traits<decltype(alloc)>::deallocate(alloc, m_value.binary, 1);
+                    m_value.binary = nullptr;
+                }
+
+                m_type = value_t::null;
+                assert_invariant();
+                break;
+            }
+
+            case value_t::object:
+            {
+                result.m_it.object_iterator = m_value.object->erase(first.m_it.object_iterator,
+                                              last.m_it.object_iterator);
+                break;
+            }
+
+            case value_t::array:
+            {
+                result.m_it.array_iterator = m_value.array->erase(first.m_it.array_iterator,
+                                             last.m_it.array_iterator);
+                break;
+            }
+
+            default:
+                JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief remove element from a JSON object given a key
+
+    Removes elements from a JSON object with the key value @a key.
+
+    @param[in] key value of the elements to remove
+
+    @return Number of elements removed. If @a ObjectType is the default
+    `std::map` type, the return value will always be `0` (@a key was not
+    found) or `1` (@a key was found).
+
+    @post References and iterators to the erased elements are invalidated.
+    Other references and iterators are not affected.
+
+    @throw type_error.307 when called on a type other than JSON object;
+    example: `"cannot use erase() with null"`
+
+    @complexity `log(size()) + count(key)`
+
+    @liveexample{The example shows the effect of `erase()`.,erase__key_type}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const size_type) -- removes the element from an array at
+    the given index
+
+    @since version 1.0.0
+    */
+    size_type erase(const typename object_t::key_type& key)
+    {
+        // this erase only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            return m_value.object->erase(key);
+        }
+
+        JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief remove element from a JSON array given an index
+
+    Removes element from a JSON array at the index @a idx.
+
+    @param[in] idx index of the element to remove
+
+    @throw type_error.307 when called on a type other than JSON object;
+    example: `"cannot use erase() with null"`
+    @throw out_of_range.401 when `idx >= size()`; example: `"array index 17
+    is out of range"`
+
+    @complexity Linear in distance between @a idx and the end of the container.
+
+    @liveexample{The example shows the effect of `erase()`.,erase__size_type}
+
+    @sa @ref erase(IteratorType) -- removes the element at a given position
+    @sa @ref erase(IteratorType, IteratorType) -- removes the elements in
+    the given range
+    @sa @ref erase(const typename object_t::key_type&) -- removes the element
+    from an object at the given key
+
+    @since version 1.0.0
+    */
+    void erase(const size_type idx)
+    {
+        // this erase only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            if (JSON_HEDLEY_UNLIKELY(idx >= size()))
+            {
+                JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+            }
+
+            m_value.array->erase(m_value.array->begin() + static_cast<difference_type>(idx));
+        }
+        else
+        {
+            JSON_THROW(type_error::create(307, "cannot use erase() with " + std::string(type_name())));
+        }
+    }
+
+    /// @}
+
+
+    ////////////
+    // lookup //
+    ////////////
+
+    /// @name lookup
+    /// @{
+
+    /*!
+    @brief find an element in a JSON object
+
+    Finds an element in a JSON object with key equivalent to @a key. If the
+    element is not found or the JSON value is not an object, end() is
+    returned.
+
+    @note This method always returns @ref end() when executed on a JSON type
+          that is not an object.
+
+    @param[in] key key value of the element to search for.
+
+    @return Iterator to an element with key equivalent to @a key. If no such
+    element is found or the JSON value is not an object, past-the-end (see
+    @ref end()) iterator is returned.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The example shows how `find()` is used.,find__key_type}
+
+    @sa @ref contains(KeyT&&) const -- checks whether a key exists
+
+    @since version 1.0.0
+    */
+    template<typename KeyT>
+    iterator find(KeyT&& key)
+    {
+        auto result = end();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief find an element in a JSON object
+    @copydoc find(KeyT&&)
+    */
+    template<typename KeyT>
+    const_iterator find(KeyT&& key) const
+    {
+        auto result = cend();
+
+        if (is_object())
+        {
+            result.m_it.object_iterator = m_value.object->find(std::forward<KeyT>(key));
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief returns the number of occurrences of a key in a JSON object
+
+    Returns the number of elements with key @a key. If ObjectType is the
+    default `std::map` type, the return value will always be `0` (@a key was
+    not found) or `1` (@a key was found).
+
+    @note This method always returns `0` when executed on a JSON type that is
+          not an object.
+
+    @param[in] key key value of the element to count
+
+    @return Number of elements with key @a key. If the JSON value is not an
+    object, the return value will be `0`.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The example shows how `count()` is used.,count}
+
+    @since version 1.0.0
+    */
+    template<typename KeyT>
+    size_type count(KeyT&& key) const
+    {
+        // return 0 for all nonobject types
+        return is_object() ? m_value.object->count(std::forward<KeyT>(key)) : 0;
+    }
+
+    /*!
+    @brief check the existence of an element in a JSON object
+
+    Check whether an element exists in a JSON object with key equivalent to
+    @a key. If the element is not found or the JSON value is not an object,
+    false is returned.
+
+    @note This method always returns false when executed on a JSON type
+          that is not an object.
+
+    @param[in] key key value to check its existence.
+
+    @return true if an element with specified @a key exists. If no such
+    element with such key is found or the JSON value is not an object,
+    false is returned.
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The following code shows an example for `contains()`.,contains}
+
+    @sa @ref find(KeyT&&) -- returns an iterator to an object element
+    @sa @ref contains(const json_pointer&) const -- checks the existence for a JSON pointer
+
+    @since version 3.6.0
+    */
+    template < typename KeyT, typename std::enable_if <
+                   !std::is_same<typename std::decay<KeyT>::type, json_pointer>::value, int >::type = 0 >
+    bool contains(KeyT && key) const
+    {
+        return is_object() && m_value.object->find(std::forward<KeyT>(key)) != m_value.object->end();
+    }
+
+    /*!
+    @brief check the existence of an element in a JSON object given a JSON pointer
+
+    Check whether the given JSON pointer @a ptr can be resolved in the current
+    JSON value.
+
+    @note This method can be executed on any JSON value type.
+
+    @param[in] ptr JSON pointer to check its existence.
+
+    @return true if the JSON pointer can be resolved to a stored value, false
+    otherwise.
+
+    @post If `j.contains(ptr)` returns true, it is safe to call `j[ptr]`.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+
+    @complexity Logarithmic in the size of the JSON object.
+
+    @liveexample{The following code shows an example for `contains()`.,contains_json_pointer}
+
+    @sa @ref contains(KeyT &&) const -- checks the existence of a key
+
+    @since version 3.7.0
+    */
+    bool contains(const json_pointer& ptr) const
+    {
+        return ptr.contains(this);
+    }
+
+    /// @}
+
+
+    ///////////////
+    // iterators //
+    ///////////////
+
+    /// @name iterators
+    /// @{
+
+    /*!
+    @brief returns an iterator to the first element
+
+    Returns an iterator to the first element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return iterator to the first element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+
+    @liveexample{The following code shows an example for `begin()`.,begin}
+
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref cend() -- returns a const iterator to the end
+
+    @since version 1.0.0
+    */
+    iterator begin() noexcept
+    {
+        iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /*!
+    @copydoc basic_json::cbegin()
+    */
+    const_iterator begin() const noexcept
+    {
+        return cbegin();
+    }
+
+    /*!
+    @brief returns a const iterator to the first element
+
+    Returns a const iterator to the first element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return const iterator to the first element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).begin()`.
+
+    @liveexample{The following code shows an example for `cbegin()`.,cbegin}
+
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref cend() -- returns a const iterator to the end
+
+    @since version 1.0.0
+    */
+    const_iterator cbegin() const noexcept
+    {
+        const_iterator result(this);
+        result.set_begin();
+        return result;
+    }
+
+    /*!
+    @brief returns an iterator to one past the last element
+
+    Returns an iterator to one past the last element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return iterator one past the last element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+
+    @liveexample{The following code shows an example for `end()`.,end}
+
+    @sa @ref cend() -- returns a const iterator to the end
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+
+    @since version 1.0.0
+    */
+    iterator end() noexcept
+    {
+        iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /*!
+    @copydoc basic_json::cend()
+    */
+    const_iterator end() const noexcept
+    {
+        return cend();
+    }
+
+    /*!
+    @brief returns a const iterator to one past the last element
+
+    Returns a const iterator to one past the last element.
+
+    @image html range-begin-end.svg "Illustration from cppreference.com"
+
+    @return const iterator one past the last element
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).end()`.
+
+    @liveexample{The following code shows an example for `cend()`.,cend}
+
+    @sa @ref end() -- returns an iterator to the end
+    @sa @ref begin() -- returns an iterator to the beginning
+    @sa @ref cbegin() -- returns a const iterator to the beginning
+
+    @since version 1.0.0
+    */
+    const_iterator cend() const noexcept
+    {
+        const_iterator result(this);
+        result.set_end();
+        return result;
+    }
+
+    /*!
+    @brief returns an iterator to the reverse-beginning
+
+    Returns an iterator to the reverse-beginning; that is, the last element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `reverse_iterator(end())`.
+
+    @liveexample{The following code shows an example for `rbegin()`.,rbegin}
+
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref crend() -- returns a const reverse iterator to the end
+
+    @since version 1.0.0
+    */
+    reverse_iterator rbegin() noexcept
+    {
+        return reverse_iterator(end());
+    }
+
+    /*!
+    @copydoc basic_json::crbegin()
+    */
+    const_reverse_iterator rbegin() const noexcept
+    {
+        return crbegin();
+    }
+
+    /*!
+    @brief returns an iterator to the reverse-end
+
+    Returns an iterator to the reverse-end; that is, one before the first
+    element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `reverse_iterator(begin())`.
+
+    @liveexample{The following code shows an example for `rend()`.,rend}
+
+    @sa @ref crend() -- returns a const reverse iterator to the end
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+
+    @since version 1.0.0
+    */
+    reverse_iterator rend() noexcept
+    {
+        return reverse_iterator(begin());
+    }
+
+    /*!
+    @copydoc basic_json::crend()
+    */
+    const_reverse_iterator rend() const noexcept
+    {
+        return crend();
+    }
+
+    /*!
+    @brief returns a const reverse iterator to the last element
+
+    Returns a const iterator to the reverse-beginning; that is, the last
+    element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).rbegin()`.
+
+    @liveexample{The following code shows an example for `crbegin()`.,crbegin}
+
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref crend() -- returns a const reverse iterator to the end
+
+    @since version 1.0.0
+    */
+    const_reverse_iterator crbegin() const noexcept
+    {
+        return const_reverse_iterator(cend());
+    }
+
+    /*!
+    @brief returns a const reverse iterator to one before the first
+
+    Returns a const reverse iterator to the reverse-end; that is, one before
+    the first element.
+
+    @image html range-rbegin-rend.svg "Illustration from cppreference.com"
+
+    @complexity Constant.
+
+    @requirement This function helps `basic_json` satisfying the
+    [ReversibleContainer](https://en.cppreference.com/w/cpp/named_req/ReversibleContainer)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `const_cast<const basic_json&>(*this).rend()`.
+
+    @liveexample{The following code shows an example for `crend()`.,crend}
+
+    @sa @ref rend() -- returns a reverse iterator to the end
+    @sa @ref rbegin() -- returns a reverse iterator to the beginning
+    @sa @ref crbegin() -- returns a const reverse iterator to the beginning
+
+    @since version 1.0.0
+    */
+    const_reverse_iterator crend() const noexcept
+    {
+        return const_reverse_iterator(cbegin());
+    }
+
+  public:
+    /*!
+    @brief wrapper to access iterator member functions in range-based for
+
+    This function allows to access @ref iterator::key() and @ref
+    iterator::value() during range-based for loops. In these loops, a
+    reference to the JSON values is returned, so there is no access to the
+    underlying iterator.
+
+    For loop without iterator_wrapper:
+
+    @code{cpp}
+    for (auto it = j_object.begin(); it != j_object.end(); ++it)
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    Range-based for loop without iterator proxy:
+
+    @code{cpp}
+    for (auto it : j_object)
+    {
+        // "it" is of type json::reference and has no key() member
+        std::cout << "value: " << it << '\n';
+    }
+    @endcode
+
+    Range-based for loop with iterator proxy:
+
+    @code{cpp}
+    for (auto it : json::iterator_wrapper(j_object))
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    @note When iterating over an array, `key()` will return the index of the
+          element as string (see example).
+
+    @param[in] ref  reference to a JSON value
+    @return iteration proxy object wrapping @a ref with an interface to use in
+            range-based for loops
+
+    @liveexample{The following code shows how the wrapper is used,iterator_wrapper}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @note The name of this function is not yet final and may change in the
+    future.
+
+    @deprecated This stream operator is deprecated and will be removed in
+                future 4.0.0 of the library. Please use @ref items() instead;
+                that is, replace `json::iterator_wrapper(j)` with `j.items()`.
+    */
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<iterator> iterator_wrapper(reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /*!
+    @copydoc iterator_wrapper(reference)
+    */
+    JSON_HEDLEY_DEPRECATED_FOR(3.1.0, items())
+    static iteration_proxy<const_iterator> iterator_wrapper(const_reference ref) noexcept
+    {
+        return ref.items();
+    }
+
+    /*!
+    @brief helper to access iterator member functions in range-based for
+
+    This function allows to access @ref iterator::key() and @ref
+    iterator::value() during range-based for loops. In these loops, a
+    reference to the JSON values is returned, so there is no access to the
+    underlying iterator.
+
+    For loop without `items()` function:
+
+    @code{cpp}
+    for (auto it = j_object.begin(); it != j_object.end(); ++it)
+    {
+        std::cout << "key: " << it.key() << ", value:" << it.value() << '\n';
+    }
+    @endcode
+
+    Range-based for loop without `items()` function:
+
+    @code{cpp}
+    for (auto it : j_object)
+    {
+        // "it" is of type json::reference and has no key() member
+        std::cout << "value: " << it << '\n';
+    }
+    @endcode
+
+    Range-based for loop with `items()` function:
+
+    @code{cpp}
+    for (auto& el : j_object.items())
+    {
+        std::cout << "key: " << el.key() << ", value:" << el.value() << '\n';
+    }
+    @endcode
+
+    The `items()` function also allows to use
+    [structured bindings](https://en.cppreference.com/w/cpp/language/structured_binding)
+    (C++17):
+
+    @code{cpp}
+    for (auto& [key, val] : j_object.items())
+    {
+        std::cout << "key: " << key << ", value:" << val << '\n';
+    }
+    @endcode
+
+    @note When iterating over an array, `key()` will return the index of the
+          element as string (see example). For primitive types (e.g., numbers),
+          `key()` returns an empty string.
+
+    @warning Using `items()` on temporary objects is dangerous. Make sure the
+             object's lifetime exeeds the iteration. See
+             <https://github.com/nlohmann/json/issues/2040> for more
+             information.
+
+    @return iteration proxy object wrapping @a ref with an interface to use in
+            range-based for loops
+
+    @liveexample{The following code shows how the function is used.,items}
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 3.1.0, structured bindings support since 3.5.0.
+    */
+    iteration_proxy<iterator> items() noexcept
+    {
+        return iteration_proxy<iterator>(*this);
+    }
+
+    /*!
+    @copydoc items()
+    */
+    iteration_proxy<const_iterator> items() const noexcept
+    {
+        return iteration_proxy<const_iterator>(*this);
+    }
+
+    /// @}
+
+
+    //////////////
+    // capacity //
+    //////////////
+
+    /// @name capacity
+    /// @{
+
+    /*!
+    @brief checks whether the container is empty.
+
+    Checks if a JSON value has no elements (i.e. whether its @ref size is `0`).
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `true`
+            boolean     | `false`
+            string      | `false`
+            number      | `false`
+            binary      | `false`
+            object      | result of function `object_t::empty()`
+            array       | result of function `array_t::empty()`
+
+    @liveexample{The following code uses `empty()` to check if a JSON
+    object contains any elements.,empty}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their `empty()` functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @note This function does not return whether a string stored as JSON value
+    is empty - it returns whether the JSON container itself is empty which is
+    false in the case of a string.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `begin() == end()`.
+
+    @sa @ref size() -- returns the number of elements
+
+    @since version 1.0.0
+    */
+    bool empty() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return true;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::empty()
+                return m_value.array->empty();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::empty()
+                return m_value.object->empty();
+            }
+
+            default:
+            {
+                // all other types are nonempty
+                return false;
+            }
+        }
+    }
+
+    /*!
+    @brief returns the number of elements
+
+    Returns the number of elements in a JSON value.
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `0`
+            boolean     | `1`
+            string      | `1`
+            number      | `1`
+            binary      | `1`
+            object      | result of function object_t::size()
+            array       | result of function array_t::size()
+
+    @liveexample{The following code calls `size()` on the different value
+    types.,size}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their size() functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @note This function does not return the length of a string stored as JSON
+    value - it returns the number of elements in the JSON value which is 1 in
+    the case of a string.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of `std::distance(begin(), end())`.
+
+    @sa @ref empty() -- checks whether the container is empty
+    @sa @ref max_size() -- returns the maximal number of elements
+
+    @since version 1.0.0
+    */
+    size_type size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::null:
+            {
+                // null values are empty
+                return 0;
+            }
+
+            case value_t::array:
+            {
+                // delegate call to array_t::size()
+                return m_value.array->size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::size()
+                return m_value.object->size();
+            }
+
+            default:
+            {
+                // all other types have size 1
+                return 1;
+            }
+        }
+    }
+
+    /*!
+    @brief returns the maximum possible number of elements
+
+    Returns the maximum number of elements a JSON value is able to hold due to
+    system or library implementation limitations, i.e. `std::distance(begin(),
+    end())` for the JSON value.
+
+    @return The return value depends on the different types and is
+            defined as follows:
+            Value type  | return value
+            ----------- | -------------
+            null        | `0` (same as `size()`)
+            boolean     | `1` (same as `size()`)
+            string      | `1` (same as `size()`)
+            number      | `1` (same as `size()`)
+            binary      | `1` (same as `size()`)
+            object      | result of function `object_t::max_size()`
+            array       | result of function `array_t::max_size()`
+
+    @liveexample{The following code calls `max_size()` on the different value
+    types. Note the output is implementation specific.,max_size}
+
+    @complexity Constant, as long as @ref array_t and @ref object_t satisfy
+    the Container concept; that is, their `max_size()` functions have constant
+    complexity.
+
+    @iterators No changes.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @requirement This function helps `basic_json` satisfying the
+    [Container](https://en.cppreference.com/w/cpp/named_req/Container)
+    requirements:
+    - The complexity is constant.
+    - Has the semantics of returning `b.size()` where `b` is the largest
+      possible JSON value.
+
+    @sa @ref size() -- returns the number of elements
+
+    @since version 1.0.0
+    */
+    size_type max_size() const noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::array:
+            {
+                // delegate call to array_t::max_size()
+                return m_value.array->max_size();
+            }
+
+            case value_t::object:
+            {
+                // delegate call to object_t::max_size()
+                return m_value.object->max_size();
+            }
+
+            default:
+            {
+                // all other types have max_size() == size()
+                return size();
+            }
+        }
+    }
+
+    /// @}
+
+
+    ///////////////
+    // modifiers //
+    ///////////////
+
+    /// @name modifiers
+    /// @{
+
+    /*!
+    @brief clears the contents
+
+    Clears the content of a JSON value and resets it to the default value as
+    if @ref basic_json(value_t) would have been called with the current value
+    type from @ref type():
+
+    Value type  | initial value
+    ----------- | -------------
+    null        | `null`
+    boolean     | `false`
+    string      | `""`
+    number      | `0`
+    binary      | An empty byte vector
+    object      | `{}`
+    array       | `[]`
+
+    @post Has the same effect as calling
+    @code {.cpp}
+    *this = basic_json(type());
+    @endcode
+
+    @liveexample{The example below shows the effect of `clear()` to different
+    JSON types.,clear}
+
+    @complexity Linear in the size of the JSON value.
+
+    @iterators All iterators, pointers and references related to this container
+               are invalidated.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @sa @ref basic_json(value_t) -- constructor that creates an object with the
+        same value than calling `clear()`
+
+    @since version 1.0.0
+    */
+    void clear() noexcept
+    {
+        switch (m_type)
+        {
+            case value_t::number_integer:
+            {
+                m_value.number_integer = 0;
+                break;
+            }
+
+            case value_t::number_unsigned:
+            {
+                m_value.number_unsigned = 0;
+                break;
+            }
+
+            case value_t::number_float:
+            {
+                m_value.number_float = 0.0;
+                break;
+            }
+
+            case value_t::boolean:
+            {
+                m_value.boolean = false;
+                break;
+            }
+
+            case value_t::string:
+            {
+                m_value.string->clear();
+                break;
+            }
+
+            case value_t::binary:
+            {
+                m_value.binary->clear();
+                break;
+            }
+
+            case value_t::array:
+            {
+                m_value.array->clear();
+                break;
+            }
+
+            case value_t::object:
+            {
+                m_value.object->clear();
+                break;
+            }
+
+            default:
+                break;
+        }
+    }
+
+    /*!
+    @brief add an object to an array
+
+    Appends the given element @a val to the end of the JSON value. If the
+    function is called on a JSON null value, an empty array is created before
+    appending @a val.
+
+    @param[in] val the value to add to the JSON array
+
+    @throw type_error.308 when called on a type other than JSON array or
+    null; example: `"cannot use push_back() with number"`
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows how `push_back()` and `+=` can be used to
+    add elements to a JSON array. Note how the `null` value was silently
+    converted to a JSON array.,push_back}
+
+    @since version 1.0.0
+    */
+    void push_back(basic_json&& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (move semantics)
+        m_value.array->push_back(std::move(val));
+        // if val is moved from, basic_json move constructor marks it null so we do not call the destructor
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    reference operator+=(basic_json&& val)
+    {
+        push_back(std::move(val));
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    void push_back(const basic_json& val)
+    {
+        // push_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array
+        m_value.array->push_back(val);
+    }
+
+    /*!
+    @brief add an object to an array
+    @copydoc push_back(basic_json&&)
+    */
+    reference operator+=(const basic_json& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an object
+
+    Inserts the given element @a val to the JSON object. If the function is
+    called on a JSON null value, an empty object is created before inserting
+    @a val.
+
+    @param[in] val the value to add to the JSON object
+
+    @throw type_error.308 when called on a type other than JSON object or
+    null; example: `"cannot use push_back() with number"`
+
+    @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+    @liveexample{The example shows how `push_back()` and `+=` can be used to
+    add elements to a JSON object. Note how the `null` value was silently
+    converted to a JSON object.,push_back__object_t__value}
+
+    @since version 1.0.0
+    */
+    void push_back(const typename object_t::value_type& val)
+    {
+        // push_back only works for null objects or objects
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(308, "cannot use push_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array
+        m_value.object->insert(val);
+    }
+
+    /*!
+    @brief add an object to an object
+    @copydoc push_back(const typename object_t::value_type&)
+    */
+    reference operator+=(const typename object_t::value_type& val)
+    {
+        push_back(val);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an object
+
+    This function allows to use `push_back` with an initializer list. In case
+
+    1. the current value is an object,
+    2. the initializer list @a init contains only two elements, and
+    3. the first element of @a init is a string,
+
+    @a init is converted into an object element and added using
+    @ref push_back(const typename object_t::value_type&). Otherwise, @a init
+    is converted to a JSON value and added using @ref push_back(basic_json&&).
+
+    @param[in] init  an initializer list
+
+    @complexity Linear in the size of the initializer list @a init.
+
+    @note This function is required to resolve an ambiguous overload error,
+          because pairs like `{"key", "value"}` can be both interpreted as
+          `object_t::value_type` or `std::initializer_list<basic_json>`, see
+          https://github.com/nlohmann/json/issues/235 for more information.
+
+    @liveexample{The example shows how initializer lists are treated as
+    objects when possible.,push_back__initializer_list}
+    */
+    void push_back(initializer_list_t init)
+    {
+        if (is_object() && init.size() == 2 && (*init.begin())->is_string())
+        {
+            basic_json&& key = init.begin()->moved_or_copied();
+            push_back(typename object_t::value_type(
+                          std::move(key.get_ref<string_t&>()), (init.begin() + 1)->moved_or_copied()));
+        }
+        else
+        {
+            push_back(basic_json(init));
+        }
+    }
+
+    /*!
+    @brief add an object to an object
+    @copydoc push_back(initializer_list_t)
+    */
+    reference operator+=(initializer_list_t init)
+    {
+        push_back(init);
+        return *this;
+    }
+
+    /*!
+    @brief add an object to an array
+
+    Creates a JSON value from the passed parameters @a args to the end of the
+    JSON value. If the function is called on a JSON null value, an empty array
+    is created before appending the value created from @a args.
+
+    @param[in] args arguments to forward to a constructor of @ref basic_json
+    @tparam Args compatible types to create a @ref basic_json object
+
+    @return reference to the inserted element
+
+    @throw type_error.311 when called on a type other than JSON array or
+    null; example: `"cannot use emplace_back() with number"`
+
+    @complexity Amortized constant.
+
+    @liveexample{The example shows how `push_back()` can be used to add
+    elements to a JSON array. Note how the `null` value was silently converted
+    to a JSON array.,emplace_back}
+
+    @since version 2.0.8, returns reference since 3.7.0
+    */
+    template<class... Args>
+    reference emplace_back(Args&& ... args)
+    {
+        // emplace_back only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_array())))
+        {
+            JSON_THROW(type_error::create(311, "cannot use emplace_back() with " + std::string(type_name())));
+        }
+
+        // transform null object into an array
+        if (is_null())
+        {
+            m_type = value_t::array;
+            m_value = value_t::array;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+#ifdef JSON_HAS_CPP_17
+        return m_value.array->emplace_back(std::forward<Args>(args)...);
+#else
+        m_value.array->emplace_back(std::forward<Args>(args)...);
+        return m_value.array->back();
+#endif
+    }
+
+    /*!
+    @brief add an object to an object if key does not exist
+
+    Inserts a new element into a JSON object constructed in-place with the
+    given @a args if there is no element with the key in the container. If the
+    function is called on a JSON null value, an empty object is created before
+    appending the value created from @a args.
+
+    @param[in] args arguments to forward to a constructor of @ref basic_json
+    @tparam Args compatible types to create a @ref basic_json object
+
+    @return a pair consisting of an iterator to the inserted element, or the
+            already-existing element if no insertion happened, and a bool
+            denoting whether the insertion took place.
+
+    @throw type_error.311 when called on a type other than JSON object or
+    null; example: `"cannot use emplace() with number"`
+
+    @complexity Logarithmic in the size of the container, O(log(`size()`)).
+
+    @liveexample{The example shows how `emplace()` can be used to add elements
+    to a JSON object. Note how the `null` value was silently converted to a
+    JSON object. Further note how no value is added if there was already one
+    value stored with the same key.,emplace}
+
+    @since version 2.0.8
+    */
+    template<class... Args>
+    std::pair<iterator, bool> emplace(Args&& ... args)
+    {
+        // emplace only works for null objects or arrays
+        if (JSON_HEDLEY_UNLIKELY(!(is_null() || is_object())))
+        {
+            JSON_THROW(type_error::create(311, "cannot use emplace() with " + std::string(type_name())));
+        }
+
+        // transform null object into an object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value = value_t::object;
+            assert_invariant();
+        }
+
+        // add element to array (perfect forwarding)
+        auto res = m_value.object->emplace(std::forward<Args>(args)...);
+        // create result iterator and set iterator to the result of emplace
+        auto it = begin();
+        it.m_it.object_iterator = res.first;
+
+        // return pair of iterator and boolean
+        return {it, res.second};
+    }
+
+    /// Helper for insertion of an iterator
+    /// @note: This uses std::distance to support GCC 4.8,
+    ///        see https://github.com/nlohmann/json/pull/1257
+    template<typename... Args>
+    iterator insert_iterator(const_iterator pos, Args&& ... args)
+    {
+        iterator result(this);
+        JSON_ASSERT(m_value.array != nullptr);
+
+        auto insert_pos = std::distance(m_value.array->begin(), pos.m_it.array_iterator);
+        m_value.array->insert(pos.m_it.array_iterator, std::forward<Args>(args)...);
+        result.m_it.array_iterator = m_value.array->begin() + insert_pos;
+
+        // This could have been written as:
+        // result.m_it.array_iterator = m_value.array->insert(pos.m_it.array_iterator, cnt, val);
+        // but the return value of insert is missing in GCC 4.8, so it is written this way instead.
+
+        return result;
+    }
+
+    /*!
+    @brief inserts element
+
+    Inserts element @a val before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] val element to insert
+    @return iterator pointing to the inserted @a val.
+
+    @throw type_error.309 if called on JSON values other than arrays;
+    example: `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @complexity Constant plus linear in the distance between @a pos and end of
+    the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, val);
+        }
+
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief inserts element
+    @copydoc insert(const_iterator, const basic_json&)
+    */
+    iterator insert(const_iterator pos, basic_json&& val)
+    {
+        return insert(pos, val);
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts @a cnt copies of @a val before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] cnt number of copies of @a val to insert
+    @param[in] val element to insert
+    @return iterator pointing to the first element inserted, or @a pos if
+    `cnt==0`
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @complexity Linear in @a cnt plus linear in the distance between @a pos
+    and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__count}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, size_type cnt, const basic_json& val)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            // check if iterator pos fits to this JSON value
+            if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+            {
+                JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+            }
+
+            // insert to array and return iterator
+            return insert_iterator(pos, cnt, val);
+        }
+
+        JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from range `[first, last)` before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+    @throw invalid_iterator.211 if @a first or @a last are iterators into
+    container for which insert is called; example: `"passed iterators may not
+    belong to container"`
+
+    @return iterator pointing to the first element inserted, or @a pos if
+    `first==last`
+
+    @complexity Linear in `std::distance(first, last)` plus linear in the
+    distance between @a pos and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__range}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, const_iterator first, const_iterator last)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(first.m_object == this))
+        {
+            JSON_THROW(invalid_iterator::create(211, "passed iterators may not belong to container"));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, first.m_it.array_iterator, last.m_it.array_iterator);
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from initializer list @a ilist before iterator @a pos.
+
+    @param[in] pos iterator before which the content will be inserted; may be
+    the end() iterator
+    @param[in] ilist initializer list to insert the values from
+
+    @throw type_error.309 if called on JSON values other than arrays; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if @a pos is not an iterator of *this;
+    example: `"iterator does not fit current value"`
+
+    @return iterator pointing to the first element inserted, or @a pos if
+    `ilist` is empty
+
+    @complexity Linear in `ilist.size()` plus linear in the distance between
+    @a pos and end of the container.
+
+    @liveexample{The example shows how `insert()` is used.,insert__ilist}
+
+    @since version 1.0.0
+    */
+    iterator insert(const_iterator pos, initializer_list_t ilist)
+    {
+        // insert only works for arrays
+        if (JSON_HEDLEY_UNLIKELY(!is_array()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if iterator pos fits to this JSON value
+        if (JSON_HEDLEY_UNLIKELY(pos.m_object != this))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterator does not fit current value"));
+        }
+
+        // insert to array and return iterator
+        return insert_iterator(pos, ilist.begin(), ilist.end());
+    }
+
+    /*!
+    @brief inserts elements
+
+    Inserts elements from range `[first, last)`.
+
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.309 if called on JSON values other than objects; example:
+    `"cannot use insert() with string"`
+    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    point to an object; example: `"iterators first and last must point to
+    objects"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+
+    @complexity Logarithmic: `O(N*log(size() + N))`, where `N` is the number
+    of elements to insert.
+
+    @liveexample{The example shows how `insert()` is used.,insert__range_object}
+
+    @since version 3.0.0
+    */
+    void insert(const_iterator first, const_iterator last)
+    {
+        // insert only works for objects
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(309, "cannot use insert() with " + std::string(type_name())));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+        }
+
+        m_value.object->insert(first.m_it.object_iterator, last.m_it.object_iterator);
+    }
+
+    /*!
+    @brief updates a JSON object from another object, overwriting existing keys
+
+    Inserts all values from JSON object @a j and overwrites existing keys.
+
+    @param[in] j  JSON object to read values from
+
+    @throw type_error.312 if called on JSON values other than objects; example:
+    `"cannot use update() with string"`
+
+    @complexity O(N*log(size() + N)), where N is the number of elements to
+                insert.
+
+    @liveexample{The example shows how `update()` is used.,update}
+
+    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+    @since version 3.0.0
+    */
+    void update(const_reference j)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+        }
+        if (JSON_HEDLEY_UNLIKELY(!j.is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(j.type_name())));
+        }
+
+        for (auto it = j.cbegin(); it != j.cend(); ++it)
+        {
+            m_value.object->operator[](it.key()) = it.value();
+        }
+    }
+
+    /*!
+    @brief updates a JSON object from another object, overwriting existing keys
+
+    Inserts all values from from range `[first, last)` and overwrites existing
+    keys.
+
+    @param[in] first begin of the range of elements to insert
+    @param[in] last end of the range of elements to insert
+
+    @throw type_error.312 if called on JSON values other than objects; example:
+    `"cannot use update() with string"`
+    @throw invalid_iterator.202 if iterator @a first or @a last does does not
+    point to an object; example: `"iterators first and last must point to
+    objects"`
+    @throw invalid_iterator.210 if @a first and @a last do not belong to the
+    same JSON value; example: `"iterators do not fit"`
+
+    @complexity O(N*log(size() + N)), where N is the number of elements to
+                insert.
+
+    @liveexample{The example shows how `update()` is used__range.,update}
+
+    @sa https://docs.python.org/3.6/library/stdtypes.html#dict.update
+
+    @since version 3.0.0
+    */
+    void update(const_iterator first, const_iterator last)
+    {
+        // implicitly convert null value to an empty object
+        if (is_null())
+        {
+            m_type = value_t::object;
+            m_value.object = create<object_t>();
+            assert_invariant();
+        }
+
+        if (JSON_HEDLEY_UNLIKELY(!is_object()))
+        {
+            JSON_THROW(type_error::create(312, "cannot use update() with " + std::string(type_name())));
+        }
+
+        // check if range iterators belong to the same JSON object
+        if (JSON_HEDLEY_UNLIKELY(first.m_object != last.m_object))
+        {
+            JSON_THROW(invalid_iterator::create(210, "iterators do not fit"));
+        }
+
+        // passed iterators must belong to objects
+        if (JSON_HEDLEY_UNLIKELY(!first.m_object->is_object()
+                                 || !last.m_object->is_object()))
+        {
+            JSON_THROW(invalid_iterator::create(202, "iterators first and last must point to objects"));
+        }
+
+        for (auto it = first; it != last; ++it)
+        {
+            m_value.object->operator[](it.key()) = it.value();
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of the JSON value with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other JSON value to exchange the contents with
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how JSON values can be swapped with
+    `swap()`.,swap__reference}
+
+    @since version 1.0.0
+    */
+    void swap(reference other) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        std::swap(m_type, other.m_type);
+        std::swap(m_value, other.m_value);
+        assert_invariant();
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of the JSON value from @a left with those of @a right. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated. implemented as a friend function callable via ADL.
+
+    @param[in,out] left JSON value to exchange the contents with
+    @param[in,out] right JSON value to exchange the contents with
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how JSON values can be swapped with
+    `swap()`.,swap__reference}
+
+    @since version 1.0.0
+    */
+    friend void swap(reference left, reference right) noexcept (
+        std::is_nothrow_move_constructible<value_t>::value&&
+        std::is_nothrow_move_assignable<value_t>::value&&
+        std::is_nothrow_move_constructible<json_value>::value&&
+        std::is_nothrow_move_assignable<json_value>::value
+    )
+    {
+        left.swap(right);
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON array with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other array to exchange the contents with
+
+    @throw type_error.310 when JSON value is not an array; example: `"cannot
+    use swap() with string"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how arrays can be swapped with
+    `swap()`.,swap__array_t}
+
+    @since version 1.0.0
+    */
+    void swap(array_t& other)
+    {
+        // swap only works for arrays
+        if (JSON_HEDLEY_LIKELY(is_array()))
+        {
+            std::swap(*(m_value.array), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON object with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other object to exchange the contents with
+
+    @throw type_error.310 when JSON value is not an object; example:
+    `"cannot use swap() with string"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how objects can be swapped with
+    `swap()`.,swap__object_t}
+
+    @since version 1.0.0
+    */
+    void swap(object_t& other)
+    {
+        // swap only works for objects
+        if (JSON_HEDLEY_LIKELY(is_object()))
+        {
+            std::swap(*(m_value.object), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON string with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other string to exchange the contents with
+
+    @throw type_error.310 when JSON value is not a string; example: `"cannot
+    use swap() with boolean"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how strings can be swapped with
+    `swap()`.,swap__string_t}
+
+    @since version 1.0.0
+    */
+    void swap(string_t& other)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_string()))
+        {
+            std::swap(*(m_value.string), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /*!
+    @brief exchanges the values
+
+    Exchanges the contents of a JSON string with those of @a other. Does not
+    invoke any move, copy, or swap operations on individual elements. All
+    iterators and references remain valid. The past-the-end iterator is
+    invalidated.
+
+    @param[in,out] other binary to exchange the contents with
+
+    @throw type_error.310 when JSON value is not a string; example: `"cannot
+    use swap() with boolean"`
+
+    @complexity Constant.
+
+    @liveexample{The example below shows how strings can be swapped with
+    `swap()`.,swap__binary_t}
+
+    @since version 3.8.0
+    */
+    void swap(binary_t& other)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            std::swap(*(m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /// @copydoc swap(binary_t)
+    void swap(typename binary_t::container_type& other)
+    {
+        // swap only works for strings
+        if (JSON_HEDLEY_LIKELY(is_binary()))
+        {
+            std::swap(*(m_value.binary), other);
+        }
+        else
+        {
+            JSON_THROW(type_error::create(310, "cannot use swap() with " + std::string(type_name())));
+        }
+    }
+
+    /// @}
+
+  public:
+    //////////////////////////////////////////
+    // lexicographical comparison operators //
+    //////////////////////////////////////////
+
+    /// @name lexicographical comparison operators
+    /// @{
+
+    /*!
+    @brief comparison: equal
+
+    Compares two JSON values for equality according to the following rules:
+    - Two JSON values are equal if (1) they are from the same type and (2)
+      their stored values are the same according to their respective
+      `operator==`.
+    - Integer and floating-point numbers are automatically converted before
+      comparison. Note that two NaN values are always treated as unequal.
+    - Two JSON null values are equal.
+
+    @note Floating-point inside JSON values numbers are compared with
+    `json::number_float_t::operator==` which is `double::operator==` by
+    default. To compare floating-point while respecting an epsilon, an alternative
+    [comparison function](https://github.com/mariokonrad/marnav/blob/master/include/marnav/math/floatingpoint.hpp#L34-#L39)
+    could be used, for instance
+    @code {.cpp}
+    template<typename T, typename = typename std::enable_if<std::is_floating_point<T>::value, T>::type>
+    inline bool is_same(T a, T b, T epsilon = std::numeric_limits<T>::epsilon()) noexcept
+    {
+        return std::abs(a - b) <= epsilon;
+    }
+    @endcode
+    Or you can self-defined operator equal function like this:
+    @code {.cpp}
+    bool my_equal(const_reference lhs, const_reference rhs) {
+    const auto lhs_type lhs.type();
+    const auto rhs_type rhs.type();
+    if (lhs_type == rhs_type) {
+        switch(lhs_type)
+            // self_defined case
+            case value_t::number_float:
+                return std::abs(lhs - rhs) <= std::numeric_limits<float>::epsilon();
+            // other cases remain the same with the original
+            ...
+    }
+    ...
+    }
+    @endcode
+
+    @note NaN values never compare equal to themselves or to other NaN values.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether the values @a lhs and @a rhs are equal
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @complexity Linear.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__equal}
+
+    @since version 1.0.0
+    */
+    friend bool operator==(const_reference lhs, const_reference rhs) noexcept
+    {
+        const auto lhs_type = lhs.type();
+        const auto rhs_type = rhs.type();
+
+        if (lhs_type == rhs_type)
+        {
+            switch (lhs_type)
+            {
+                case value_t::array:
+                    return *lhs.m_value.array == *rhs.m_value.array;
+
+                case value_t::object:
+                    return *lhs.m_value.object == *rhs.m_value.object;
+
+                case value_t::null:
+                    return true;
+
+                case value_t::string:
+                    return *lhs.m_value.string == *rhs.m_value.string;
+
+                case value_t::boolean:
+                    return lhs.m_value.boolean == rhs.m_value.boolean;
+
+                case value_t::number_integer:
+                    return lhs.m_value.number_integer == rhs.m_value.number_integer;
+
+                case value_t::number_unsigned:
+                    return lhs.m_value.number_unsigned == rhs.m_value.number_unsigned;
+
+                case value_t::number_float:
+                    return lhs.m_value.number_float == rhs.m_value.number_float;
+
+                case value_t::binary:
+                    return *lhs.m_value.binary == *rhs.m_value.binary;
+
+                default:
+                    return false;
+            }
+        }
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_integer) == rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
+        {
+            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_integer);
+        }
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_float == static_cast<number_float_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
+        {
+            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) == rhs.m_value.number_integer;
+        }
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_integer == static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+        }
+
+        return false;
+    }
+
+    /*!
+    @brief comparison: equal
+    @copydoc operator==(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs == basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: equal
+    @copydoc operator==(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator==(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) == rhs;
+    }
+
+    /*!
+    @brief comparison: not equal
+
+    Compares two JSON values for inequality by calculating `not (lhs == rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether the values @a lhs and @a rhs are not equal
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__notequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator!=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return !(lhs == rhs);
+    }
+
+    /*!
+    @brief comparison: not equal
+    @copydoc operator!=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs != basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: not equal
+    @copydoc operator!=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator!=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) != rhs;
+    }
+
+    /*!
+    @brief comparison: less than
+
+    Compares whether one JSON value @a lhs is less than another JSON value @a
+    rhs according to the following rules:
+    - If @a lhs and @a rhs have the same type, the values are compared using
+      the default `<` operator.
+    - Integer and floating-point numbers are automatically converted before
+      comparison
+    - In case @a lhs and @a rhs have different types, the values are ignored
+      and the order of the types is considered, see
+      @ref operator<(const value_t, const value_t).
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is less than @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__less}
+
+    @since version 1.0.0
+    */
+    friend bool operator<(const_reference lhs, const_reference rhs) noexcept
+    {
+        const auto lhs_type = lhs.type();
+        const auto rhs_type = rhs.type();
+
+        if (lhs_type == rhs_type)
+        {
+            switch (lhs_type)
+            {
+                case value_t::array:
+                    // note parentheses are necessary, see
+                    // https://github.com/nlohmann/json/issues/1530
+                    return (*lhs.m_value.array) < (*rhs.m_value.array);
+
+                case value_t::object:
+                    return (*lhs.m_value.object) < (*rhs.m_value.object);
+
+                case value_t::null:
+                    return false;
+
+                case value_t::string:
+                    return (*lhs.m_value.string) < (*rhs.m_value.string);
+
+                case value_t::boolean:
+                    return (lhs.m_value.boolean) < (rhs.m_value.boolean);
+
+                case value_t::number_integer:
+                    return (lhs.m_value.number_integer) < (rhs.m_value.number_integer);
+
+                case value_t::number_unsigned:
+                    return (lhs.m_value.number_unsigned) < (rhs.m_value.number_unsigned);
+
+                case value_t::number_float:
+                    return (lhs.m_value.number_float) < (rhs.m_value.number_float);
+
+                case value_t::binary:
+                    return (*lhs.m_value.binary) < (*rhs.m_value.binary);
+
+                default:
+                    return false;
+            }
+        }
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_integer) < rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_integer)
+        {
+            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_integer);
+        }
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_float)
+        {
+            return static_cast<number_float_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_float;
+        }
+        else if (lhs_type == value_t::number_float && rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_float < static_cast<number_float_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_integer && rhs_type == value_t::number_unsigned)
+        {
+            return lhs.m_value.number_integer < static_cast<number_integer_t>(rhs.m_value.number_unsigned);
+        }
+        else if (lhs_type == value_t::number_unsigned && rhs_type == value_t::number_integer)
+        {
+            return static_cast<number_integer_t>(lhs.m_value.number_unsigned) < rhs.m_value.number_integer;
+        }
+
+        // We only reach this line if we cannot compare values. In that case,
+        // we compare types. Note we have to call the operator explicitly,
+        // because MSVC has problems otherwise.
+        return operator<(lhs_type, rhs_type);
+    }
+
+    /*!
+    @brief comparison: less than
+    @copydoc operator<(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs < basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: less than
+    @copydoc operator<(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) < rhs;
+    }
+
+    /*!
+    @brief comparison: less than or equal
+
+    Compares whether one JSON value @a lhs is less than or equal to another
+    JSON value by calculating `not (rhs < lhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is less than or equal to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__greater}
+
+    @since version 1.0.0
+    */
+    friend bool operator<=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return !(rhs < lhs);
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @copydoc operator<=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs <= basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: less than or equal
+    @copydoc operator<=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator<=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) <= rhs;
+    }
+
+    /*!
+    @brief comparison: greater than
+
+    Compares whether one JSON value @a lhs is greater than another
+    JSON value by calculating `not (lhs <= rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is greater than to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__lessequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator>(const_reference lhs, const_reference rhs) noexcept
+    {
+        return !(lhs <= rhs);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @copydoc operator>(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs > basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: greater than
+    @copydoc operator>(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) > rhs;
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+
+    Compares whether one JSON value @a lhs is greater than or equal to another
+    JSON value by calculating `not (lhs < rhs)`.
+
+    @param[in] lhs  first JSON value to consider
+    @param[in] rhs  second JSON value to consider
+    @return whether @a lhs is greater than or equal to @a rhs
+
+    @complexity Linear.
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @liveexample{The example demonstrates comparing several JSON
+    types.,operator__greaterequal}
+
+    @since version 1.0.0
+    */
+    friend bool operator>=(const_reference lhs, const_reference rhs) noexcept
+    {
+        return !(lhs < rhs);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @copydoc operator>=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const_reference lhs, const ScalarType rhs) noexcept
+    {
+        return lhs >= basic_json(rhs);
+    }
+
+    /*!
+    @brief comparison: greater than or equal
+    @copydoc operator>=(const_reference, const_reference)
+    */
+    template<typename ScalarType, typename std::enable_if<
+                 std::is_scalar<ScalarType>::value, int>::type = 0>
+    friend bool operator>=(const ScalarType lhs, const_reference rhs) noexcept
+    {
+        return basic_json(lhs) >= rhs;
+    }
+
+    /// @}
+
+    ///////////////////
+    // serialization //
+    ///////////////////
+
+    /// @name serialization
+    /// @{
+
+    /*!
+    @brief serialize to stream
+
+    Serialize the given JSON value @a j to the output stream @a o. The JSON
+    value will be serialized using the @ref dump member function.
+
+    - The indentation of the output can be controlled with the member variable
+      `width` of the output stream @a o. For instance, using the manipulator
+      `std::setw(4)` on @a o sets the indentation level to `4` and the
+      serialization result is the same as calling `dump(4)`.
+
+    - The indentation character can be controlled with the member variable
+      `fill` of the output stream @a o. For instance, the manipulator
+      `std::setfill('\\t')` sets indentation to use a tab character rather than
+      the default space character.
+
+    @param[in,out] o  stream to serialize to
+    @param[in] j  JSON value to serialize
+
+    @return the stream @a o
+
+    @throw type_error.316 if a string stored inside the JSON value is not
+                          UTF-8 encoded
+
+    @complexity Linear.
+
+    @liveexample{The example below shows the serialization with different
+    parameters to `width` to adjust the indentation level.,operator_serialize}
+
+    @since version 1.0.0; indentation character added in version 3.0.0
+    */
+    friend std::ostream& operator<<(std::ostream& o, const basic_json& j)
+    {
+        // read width member and use it as indentation parameter if nonzero
+        const bool pretty_print = o.width() > 0;
+        const auto indentation = pretty_print ? o.width() : 0;
+
+        // reset width to 0 for subsequent calls to this stream
+        o.width(0);
+
+        // do the actual serialization
+        serializer s(detail::output_adapter<char>(o), o.fill());
+        s.dump(j, pretty_print, false, static_cast<unsigned int>(indentation));
+        return o;
+    }
+
+    /*!
+    @brief serialize to stream
+    @deprecated This stream operator is deprecated and will be removed in
+                future 4.0.0 of the library. Please use
+                @ref operator<<(std::ostream&, const basic_json&)
+                instead; that is, replace calls like `j >> o;` with `o << j;`.
+    @since version 1.0.0; deprecated since version 3.0.0
+    */
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator<<(std::ostream&, const basic_json&))
+    friend std::ostream& operator>>(const basic_json& j, std::ostream& o)
+    {
+        return o << j;
+    }
+
+    /// @}
+
+
+    /////////////////////
+    // deserialization //
+    /////////////////////
+
+    /// @name deserialization
+    /// @{
+
+    /*!
+    @brief deserialize from a compatible input
+
+    @tparam InputType A compatible input, for instance
+    - an std::istream object
+    - a FILE pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object obj for which begin(obj) and end(obj) produces a valid pair of
+      iterators.
+
+    @param[in] i  input to read from
+    @param[in] cb  a parser callback function of type @ref parser_callback_t
+    which is used to control the deserialization by filtering unwanted values
+    (optional)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+    @param[in] ignore_comments  whether comments should be ignored and treated
+    like whitespace (true) or yield a parse error (true); (optional, false by
+    default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the parser callback function
+    @a cb or reading from the input @a i has a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from an array.,parse__array__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function with
+    and without callback function.,parse__string__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function with
+    and without callback function.,parse__istream__parser_callback_t}
+
+    @liveexample{The example below demonstrates the `parse()` function reading
+    from a contiguous container.,parse__contiguouscontainer__parser_callback_t}
+
+    @since version 2.0.3 (contiguous containers); version 3.9.0 allowed to
+    ignore comments.
+    */
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(InputType&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::forward<InputType>(i)), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    /*!
+    @brief deserialize from a pair of character iterators
+
+    The value_type of the iterator must be a integral type with size of 1, 2 or
+    4 bytes, which will be interpreted respectively as UTF-8, UTF-16 and UTF-32.
+
+    @param[in] first iterator to start of character range
+    @param[in] last  iterator to end of character range
+    @param[in] cb  a parser callback function of type @ref parser_callback_t
+    which is used to control the deserialization by filtering unwanted values
+    (optional)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+    @param[in] ignore_comments  whether comments should be ignored and treated
+    like whitespace (true) or yield a parse error (true); (optional, false by
+    default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+    */
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json parse(IteratorType first,
+                            IteratorType last,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(detail::input_adapter(std::move(first), std::move(last)), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, parse(ptr, ptr + len))
+    static basic_json parse(detail::span_input_adapter&& i,
+                            const parser_callback_t cb = nullptr,
+                            const bool allow_exceptions = true,
+                            const bool ignore_comments = false)
+    {
+        basic_json result;
+        parser(i.get(), cb, allow_exceptions, ignore_comments).parse(true, result);
+        return result;
+    }
+
+    /*!
+    @brief check if the input is valid JSON
+
+    Unlike the @ref parse(InputType&&, const parser_callback_t,const bool)
+    function, this function neither throws an exception in case of invalid JSON
+    input (i.e., a parse error) nor creates diagnostic information.
+
+    @tparam InputType A compatible input, for instance
+    - an std::istream object
+    - a FILE pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object obj for which begin(obj) and end(obj) produces a valid pair of
+      iterators.
+
+    @param[in] i input to read from
+    @param[in] ignore_comments  whether comments should be ignored and treated
+    like whitespace (true) or yield a parse error (true); (optional, false by
+    default)
+
+    @return Whether the input read from @a i is valid JSON.
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `accept()` function reading
+    from a string.,accept__string}
+    */
+    template<typename InputType>
+    static bool accept(InputType&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::forward<InputType>(i)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    template<typename IteratorType>
+    static bool accept(IteratorType first, IteratorType last,
+                       const bool ignore_comments = false)
+    {
+        return parser(detail::input_adapter(std::move(first), std::move(last)), nullptr, false, ignore_comments).accept(true);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, accept(ptr, ptr + len))
+    static bool accept(detail::span_input_adapter&& i,
+                       const bool ignore_comments = false)
+    {
+        return parser(i.get(), nullptr, false, ignore_comments).accept(true);
+    }
+
+    /*!
+    @brief generate SAX events
+
+    The SAX event lister must follow the interface of @ref json_sax.
+
+    This function reads from a compatible input. Examples are:
+    - an std::istream object
+    - a FILE pointer
+    - a C-style array of characters
+    - a pointer to a null-terminated string of single byte characters
+    - an object obj for which begin(obj) and end(obj) produces a valid pair of
+      iterators.
+
+    @param[in] i  input to read from
+    @param[in,out] sax  SAX event listener
+    @param[in] format  the format to parse (JSON, CBOR, MessagePack, or UBJSON)
+    @param[in] strict  whether the input has to be consumed completely
+    @param[in] ignore_comments  whether comments should be ignored and treated
+    like whitespace (true) or yield a parse error (true); (optional, false by
+    default); only applies to the JSON file format.
+
+    @return return value of the last processed SAX event
+
+    @throw parse_error.101 if a parse error occurs; example: `""unexpected end
+    of input; expected string literal""`
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser. The complexity can be higher if the SAX consumer @a sax has
+    a super-linear complexity.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below demonstrates the `sax_parse()` function
+    reading from string and processing the events with a user-defined SAX
+    event consumer.,sax_parse}
+
+    @since version 3.2.0
+    */
+    template <typename InputType, typename SAX>
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(InputType&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
+    }
+
+    template<class IteratorType, class SAX>
+    JSON_HEDLEY_NON_NULL(3)
+    static bool sax_parse(IteratorType first, IteratorType last, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
+    }
+
+    template <typename SAX>
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, sax_parse(ptr, ptr + len, ...))
+    JSON_HEDLEY_NON_NULL(2)
+    static bool sax_parse(detail::span_input_adapter&& i, SAX* sax,
+                          input_format_t format = input_format_t::json,
+                          const bool strict = true,
+                          const bool ignore_comments = false)
+    {
+        auto ia = i.get();
+        return format == input_format_t::json
+               ? parser(std::move(ia), nullptr, true, ignore_comments).sax_parse(sax, strict)
+               : detail::binary_reader<basic_json, decltype(ia), SAX>(std::move(ia)).sax_parse(format, sax, strict);
+    }
+
+    /*!
+    @brief deserialize from stream
+    @deprecated This stream operator is deprecated and will be removed in
+                version 4.0.0 of the library. Please use
+                @ref operator>>(std::istream&, basic_json&)
+                instead; that is, replace calls like `j << i;` with `i >> j;`.
+    @since version 1.0.0; deprecated since version 3.0.0
+    */
+    JSON_HEDLEY_DEPRECATED_FOR(3.0.0, operator>>(std::istream&, basic_json&))
+    friend std::istream& operator<<(basic_json& j, std::istream& i)
+    {
+        return operator>>(i, j);
+    }
+
+    /*!
+    @brief deserialize from stream
+
+    Deserializes an input stream to a JSON value.
+
+    @param[in,out] i  input stream to read a serialized JSON value from
+    @param[in,out] j  JSON value to write the deserialized input to
+
+    @throw parse_error.101 in case of an unexpected token
+    @throw parse_error.102 if to_unicode fails or surrogate error
+    @throw parse_error.103 if to_unicode fails
+
+    @complexity Linear in the length of the input. The parser is a predictive
+    LL(1) parser.
+
+    @note A UTF-8 byte order mark is silently ignored.
+
+    @liveexample{The example below shows how a JSON value is constructed by
+    reading a serialization from a stream.,operator_deserialize}
+
+    @sa parse(std::istream&, const parser_callback_t) for a variant with a
+    parser callback function to filter values while parsing
+
+    @since version 1.0.0
+    */
+    friend std::istream& operator>>(std::istream& i, basic_json& j)
+    {
+        parser(detail::input_adapter(i)).parse(false, j);
+        return i;
+    }
+
+    /// @}
+
+    ///////////////////////////
+    // convenience functions //
+    ///////////////////////////
+
+    /*!
+    @brief return the type as string
+
+    Returns the type name as string to be used in error messages - usually to
+    indicate that a function was called on a wrong JSON type.
+
+    @return a string representation of a the @a m_type member:
+            Value type  | return value
+            ----------- | -------------
+            null        | `"null"`
+            boolean     | `"boolean"`
+            string      | `"string"`
+            number      | `"number"` (for all number types)
+            object      | `"object"`
+            array       | `"array"`
+            binary      | `"binary"`
+            discarded   | `"discarded"`
+
+    @exceptionsafety No-throw guarantee: this function never throws exceptions.
+
+    @complexity Constant.
+
+    @liveexample{The following code exemplifies `type_name()` for all JSON
+    types.,type_name}
+
+    @sa @ref type() -- return the type of the JSON value
+    @sa @ref operator value_t() -- return the type of the JSON value (implicit)
+
+    @since version 1.0.0, public since 2.1.0, `const char*` and `noexcept`
+    since 3.0.0
+    */
+    JSON_HEDLEY_RETURNS_NON_NULL
+    const char* type_name() const noexcept
+    {
+        {
+            switch (m_type)
+            {
+                case value_t::null:
+                    return "null";
+                case value_t::object:
+                    return "object";
+                case value_t::array:
+                    return "array";
+                case value_t::string:
+                    return "string";
+                case value_t::boolean:
+                    return "boolean";
+                case value_t::binary:
+                    return "binary";
+                case value_t::discarded:
+                    return "discarded";
+                default:
+                    return "number";
+            }
+        }
+    }
+
+
+  private:
+    //////////////////////
+    // member variables //
+    //////////////////////
+
+    /// the type of the current element
+    value_t m_type = value_t::null;
+
+    /// the value of the current element
+    json_value m_value = {};
+
+    //////////////////////////////////////////
+    // binary serialization/deserialization //
+    //////////////////////////////////////////
+
+    /// @name binary serialization/deserialization support
+    /// @{
+
+  public:
+    /*!
+    @brief create a CBOR serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the CBOR (Concise
+    Binary Object Representation) serialization format. CBOR is a binary
+    serialization format which aims to be more compact than JSON itself, yet
+    more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    CBOR types according to the CBOR specification (RFC 7049):
+
+    JSON value type | value/range                                | CBOR type                          | first byte
+    --------------- | ------------------------------------------ | ---------------------------------- | ---------------
+    null            | `null`                                     | Null                               | 0xF6
+    boolean         | `true`                                     | True                               | 0xF5
+    boolean         | `false`                                    | False                              | 0xF4
+    number_integer  | -9223372036854775808..-2147483649          | Negative integer (8 bytes follow)  | 0x3B
+    number_integer  | -2147483648..-32769                        | Negative integer (4 bytes follow)  | 0x3A
+    number_integer  | -32768..-129                               | Negative integer (2 bytes follow)  | 0x39
+    number_integer  | -128..-25                                  | Negative integer (1 byte follow)   | 0x38
+    number_integer  | -24..-1                                    | Negative integer                   | 0x20..0x37
+    number_integer  | 0..23                                      | Integer                            | 0x00..0x17
+    number_integer  | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
+    number_integer  | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
+    number_integer  | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
+    number_integer  | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
+    number_unsigned | 0..23                                      | Integer                            | 0x00..0x17
+    number_unsigned | 24..255                                    | Unsigned integer (1 byte follow)   | 0x18
+    number_unsigned | 256..65535                                 | Unsigned integer (2 bytes follow)  | 0x19
+    number_unsigned | 65536..4294967295                          | Unsigned integer (4 bytes follow)  | 0x1A
+    number_unsigned | 4294967296..18446744073709551615           | Unsigned integer (8 bytes follow)  | 0x1B
+    number_float    | *any value representable by a float*       | Single-Precision Float             | 0xFA
+    number_float    | *any value NOT representable by a float*   | Double-Precision Float             | 0xFB
+    string          | *length*: 0..23                            | UTF-8 string                       | 0x60..0x77
+    string          | *length*: 23..255                          | UTF-8 string (1 byte follow)       | 0x78
+    string          | *length*: 256..65535                       | UTF-8 string (2 bytes follow)      | 0x79
+    string          | *length*: 65536..4294967295                | UTF-8 string (4 bytes follow)      | 0x7A
+    string          | *length*: 4294967296..18446744073709551615 | UTF-8 string (8 bytes follow)      | 0x7B
+    array           | *size*: 0..23                              | array                              | 0x80..0x97
+    array           | *size*: 23..255                            | array (1 byte follow)              | 0x98
+    array           | *size*: 256..65535                         | array (2 bytes follow)             | 0x99
+    array           | *size*: 65536..4294967295                  | array (4 bytes follow)             | 0x9A
+    array           | *size*: 4294967296..18446744073709551615   | array (8 bytes follow)             | 0x9B
+    object          | *size*: 0..23                              | map                                | 0xA0..0xB7
+    object          | *size*: 23..255                            | map (1 byte follow)                | 0xB8
+    object          | *size*: 256..65535                         | map (2 bytes follow)               | 0xB9
+    object          | *size*: 65536..4294967295                  | map (4 bytes follow)               | 0xBA
+    object          | *size*: 4294967296..18446744073709551615   | map (8 bytes follow)               | 0xBB
+    binary          | *size*: 0..23                              | byte string                        | 0x40..0x57
+    binary          | *size*: 23..255                            | byte string (1 byte follow)        | 0x58
+    binary          | *size*: 256..65535                         | byte string (2 bytes follow)       | 0x59
+    binary          | *size*: 65536..4294967295                  | byte string (4 bytes follow)       | 0x5A
+    binary          | *size*: 4294967296..18446744073709551615   | byte string (8 bytes follow)       | 0x5B
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a CBOR value.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @note The following CBOR types are not used in the conversion:
+          - UTF-8 strings terminated by "break" (0x7F)
+          - arrays terminated by "break" (0x9F)
+          - maps terminated by "break" (0xBF)
+          - byte strings terminated by "break" (0x5F)
+          - date/time (0xC0..0xC1)
+          - bignum (0xC2..0xC3)
+          - decimal fraction (0xC4)
+          - bigfloat (0xC5)
+          - expected conversions (0xD5..0xD7)
+          - simple values (0xE0..0xF3, 0xF8)
+          - undefined (0xF7)
+          - half-precision floats (0xF9)
+          - break (0xFF)
+
+    @param[in] j  JSON value to serialize
+    @return CBOR serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in CBOR format.,to_cbor}
+
+    @sa http://cbor.io
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
+        analogous deserialization
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+
+    @since version 2.0.9; compact representation of floating-point numbers
+           since version 3.8.0
+    */
+    static std::vector<uint8_t> to_cbor(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_cbor(j, result);
+        return result;
+    }
+
+    static void to_cbor(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_cbor(j);
+    }
+
+    static void to_cbor(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_cbor(j);
+    }
+
+    /*!
+    @brief create a MessagePack serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the MessagePack
+    serialization format. MessagePack is a binary serialization format which
+    aims to be more compact than JSON itself, yet more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    MessagePack types according to the MessagePack specification:
+
+    JSON value type | value/range                       | MessagePack type | first byte
+    --------------- | --------------------------------- | ---------------- | ----------
+    null            | `null`                            | nil              | 0xC0
+    boolean         | `true`                            | true             | 0xC3
+    boolean         | `false`                           | false            | 0xC2
+    number_integer  | -9223372036854775808..-2147483649 | int64            | 0xD3
+    number_integer  | -2147483648..-32769               | int32            | 0xD2
+    number_integer  | -32768..-129                      | int16            | 0xD1
+    number_integer  | -128..-33                         | int8             | 0xD0
+    number_integer  | -32..-1                           | negative fixint  | 0xE0..0xFF
+    number_integer  | 0..127                            | positive fixint  | 0x00..0x7F
+    number_integer  | 128..255                          | uint 8           | 0xCC
+    number_integer  | 256..65535                        | uint 16          | 0xCD
+    number_integer  | 65536..4294967295                 | uint 32          | 0xCE
+    number_integer  | 4294967296..18446744073709551615  | uint 64          | 0xCF
+    number_unsigned | 0..127                            | positive fixint  | 0x00..0x7F
+    number_unsigned | 128..255                          | uint 8           | 0xCC
+    number_unsigned | 256..65535                        | uint 16          | 0xCD
+    number_unsigned | 65536..4294967295                 | uint 32          | 0xCE
+    number_unsigned | 4294967296..18446744073709551615  | uint 64          | 0xCF
+    number_float    | *any value representable by a float*     | float 32 | 0xCA
+    number_float    | *any value NOT representable by a float* | float 64 | 0xCB
+    string          | *length*: 0..31                   | fixstr           | 0xA0..0xBF
+    string          | *length*: 32..255                 | str 8            | 0xD9
+    string          | *length*: 256..65535              | str 16           | 0xDA
+    string          | *length*: 65536..4294967295       | str 32           | 0xDB
+    array           | *size*: 0..15                     | fixarray         | 0x90..0x9F
+    array           | *size*: 16..65535                 | array 16         | 0xDC
+    array           | *size*: 65536..4294967295         | array 32         | 0xDD
+    object          | *size*: 0..15                     | fix map          | 0x80..0x8F
+    object          | *size*: 16..65535                 | map 16           | 0xDE
+    object          | *size*: 65536..4294967295         | map 32           | 0xDF
+    binary          | *size*: 0..255                    | bin 8            | 0xC4
+    binary          | *size*: 256..65535                | bin 16           | 0xC5
+    binary          | *size*: 65536..4294967295         | bin 32           | 0xC6
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a MessagePack value.
+
+    @note The following values can **not** be converted to a MessagePack value:
+          - strings with more than 4294967295 bytes
+          - byte strings with more than 4294967295 bytes
+          - arrays with more than 4294967295 elements
+          - objects with more than 4294967295 elements
+
+    @note Any MessagePack output created @ref to_msgpack can be successfully
+          parsed by @ref from_msgpack.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @param[in] j  JSON value to serialize
+    @return MessagePack serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in MessagePack format.,to_msgpack}
+
+    @sa http://msgpack.org
+    @sa @ref from_msgpack for the analogous deserialization
+    @sa @ref to_cbor(const basic_json& for the related CBOR format
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+
+    @since version 2.0.9
+    */
+    static std::vector<uint8_t> to_msgpack(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_msgpack(j, result);
+        return result;
+    }
+
+    static void to_msgpack(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_msgpack(j);
+    }
+
+    static void to_msgpack(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_msgpack(j);
+    }
+
+    /*!
+    @brief create a UBJSON serialization of a given JSON value
+
+    Serializes a given JSON value @a j to a byte vector using the UBJSON
+    (Universal Binary JSON) serialization format. UBJSON aims to be more compact
+    than JSON itself, yet more efficient to parse.
+
+    The library uses the following mapping from JSON values types to
+    UBJSON types according to the UBJSON specification:
+
+    JSON value type | value/range                       | UBJSON type | marker
+    --------------- | --------------------------------- | ----------- | ------
+    null            | `null`                            | null        | `Z`
+    boolean         | `true`                            | true        | `T`
+    boolean         | `false`                           | false       | `F`
+    number_integer  | -9223372036854775808..-2147483649 | int64       | `L`
+    number_integer  | -2147483648..-32769               | int32       | `l`
+    number_integer  | -32768..-129                      | int16       | `I`
+    number_integer  | -128..127                         | int8        | `i`
+    number_integer  | 128..255                          | uint8       | `U`
+    number_integer  | 256..32767                        | int16       | `I`
+    number_integer  | 32768..2147483647                 | int32       | `l`
+    number_integer  | 2147483648..9223372036854775807   | int64       | `L`
+    number_unsigned | 0..127                            | int8        | `i`
+    number_unsigned | 128..255                          | uint8       | `U`
+    number_unsigned | 256..32767                        | int16       | `I`
+    number_unsigned | 32768..2147483647                 | int32       | `l`
+    number_unsigned | 2147483648..9223372036854775807   | int64       | `L`
+    number_unsigned | 2147483649..18446744073709551615  | high-precision | `H`
+    number_float    | *any value*                       | float64     | `D`
+    string          | *with shortest length indicator*  | string      | `S`
+    array           | *see notes on optimized format*   | array       | `[`
+    object          | *see notes on optimized format*   | map         | `{`
+
+    @note The mapping is **complete** in the sense that any JSON value type
+          can be converted to a UBJSON value.
+
+    @note The following values can **not** be converted to a UBJSON value:
+          - strings with more than 9223372036854775807 bytes (theoretical)
+
+    @note The following markers are not used in the conversion:
+          - `Z`: no-op values are not created.
+          - `C`: single-byte strings are serialized with `S` markers.
+
+    @note Any UBJSON output created @ref to_ubjson can be successfully parsed
+          by @ref from_ubjson.
+
+    @note If NaN or Infinity are stored inside a JSON number, they are
+          serialized properly. This behavior differs from the @ref dump()
+          function which serializes NaN or Infinity to `null`.
+
+    @note The optimized formats for containers are supported: Parameter
+          @a use_size adds size information to the beginning of a container and
+          removes the closing marker. Parameter @a use_type further checks
+          whether all elements of a container have the same type and adds the
+          type marker to the beginning of the container. The @a use_type
+          parameter must only be used together with @a use_size = true. Note
+          that @a use_size = true alone may result in larger representations -
+          the benefit of this parameter is that the receiving side is
+          immediately informed on the number of elements of the container.
+
+    @note If the JSON data contains the binary type, the value stored is a list
+          of integers, as suggested by the UBJSON documentation.  In particular,
+          this means that serialization and the deserialization of a JSON
+          containing binary values into UBJSON and back will result in a
+          different JSON object.
+
+    @param[in] j  JSON value to serialize
+    @param[in] use_size  whether to add size annotations to container types
+    @param[in] use_type  whether to add type annotations to container types
+                         (must be combined with @a use_size = true)
+    @return UBJSON serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in UBJSON format.,to_ubjson}
+
+    @sa http://ubjson.org
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        analogous deserialization
+    @sa @ref to_cbor(const basic_json& for the related CBOR format
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+
+    @since version 3.1.0
+    */
+    static std::vector<uint8_t> to_ubjson(const basic_json& j,
+                                          const bool use_size = false,
+                                          const bool use_type = false)
+    {
+        std::vector<uint8_t> result;
+        to_ubjson(j, result, use_size, use_type);
+        return result;
+    }
+
+    static void to_ubjson(const basic_json& j, detail::output_adapter<uint8_t> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<uint8_t>(o).write_ubjson(j, use_size, use_type);
+    }
+
+    static void to_ubjson(const basic_json& j, detail::output_adapter<char> o,
+                          const bool use_size = false, const bool use_type = false)
+    {
+        binary_writer<char>(o).write_ubjson(j, use_size, use_type);
+    }
+
+
+    /*!
+    @brief Serializes the given JSON object `j` to BSON and returns a vector
+           containing the corresponding BSON-representation.
+
+    BSON (Binary JSON) is a binary format in which zero or more ordered key/value pairs are
+    stored as a single entity (a so-called document).
+
+    The library uses the following mapping from JSON values types to BSON types:
+
+    JSON value type | value/range                       | BSON type   | marker
+    --------------- | --------------------------------- | ----------- | ------
+    null            | `null`                            | null        | 0x0A
+    boolean         | `true`, `false`                   | boolean     | 0x08
+    number_integer  | -9223372036854775808..-2147483649 | int64       | 0x12
+    number_integer  | -2147483648..2147483647           | int32       | 0x10
+    number_integer  | 2147483648..9223372036854775807   | int64       | 0x12
+    number_unsigned | 0..2147483647                     | int32       | 0x10
+    number_unsigned | 2147483648..9223372036854775807   | int64       | 0x12
+    number_unsigned | 9223372036854775808..18446744073709551615| --   | --
+    number_float    | *any value*                       | double      | 0x01
+    string          | *any value*                       | string      | 0x02
+    array           | *any value*                       | document    | 0x04
+    object          | *any value*                       | document    | 0x03
+    binary          | *any value*                       | binary      | 0x05
+
+    @warning The mapping is **incomplete**, since only JSON-objects (and things
+    contained therein) can be serialized to BSON.
+    Also, integers larger than 9223372036854775807 cannot be serialized to BSON,
+    and the keys may not contain U+0000, since they are serialized a
+    zero-terminated c-strings.
+
+    @throw out_of_range.407  if `j.is_number_unsigned() && j.get<std::uint64_t>() > 9223372036854775807`
+    @throw out_of_range.409  if a key in `j` contains a NULL (U+0000)
+    @throw type_error.317    if `!j.is_object()`
+
+    @pre The input `j` is required to be an object: `j.is_object() == true`.
+
+    @note Any BSON output created via @ref to_bson can be successfully parsed
+          by @ref from_bson.
+
+    @param[in] j  JSON value to serialize
+    @return BSON serialization as byte vector
+
+    @complexity Linear in the size of the JSON value @a j.
+
+    @liveexample{The example shows the serialization of a JSON value to a byte
+    vector in BSON format.,to_bson}
+
+    @sa http://bsonspec.org/spec.html
+    @sa @ref from_bson(detail::input_adapter&&, const bool strict) for the
+        analogous deserialization
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             related UBJSON format
+    @sa @ref to_cbor(const basic_json&) for the related CBOR format
+    @sa @ref to_msgpack(const basic_json&) for the related MessagePack format
+    */
+    static std::vector<uint8_t> to_bson(const basic_json& j)
+    {
+        std::vector<uint8_t> result;
+        to_bson(j, result);
+        return result;
+    }
+
+    /*!
+    @brief Serializes the given JSON object `j` to BSON and forwards the
+           corresponding BSON-representation to the given output_adapter `o`.
+    @param j The JSON object to convert to BSON.
+    @param o The output adapter that receives the binary BSON representation.
+    @pre The input `j` shall be an object: `j.is_object() == true`
+    @sa @ref to_bson(const basic_json&)
+    */
+    static void to_bson(const basic_json& j, detail::output_adapter<uint8_t> o)
+    {
+        binary_writer<uint8_t>(o).write_bson(j);
+    }
+
+    /*!
+    @copydoc to_bson(const basic_json&, detail::output_adapter<uint8_t>)
+    */
+    static void to_bson(const basic_json& j, detail::output_adapter<char> o)
+    {
+        binary_writer<char>(o).write_bson(j);
+    }
+
+
+    /*!
+    @brief create a JSON value from an input in CBOR format
+
+    Deserializes a given input @a i to a JSON value using the CBOR (Concise
+    Binary Object Representation) serialization format.
+
+    The library maps CBOR types to JSON value types as follows:
+
+    CBOR type              | JSON value type | first byte
+    ---------------------- | --------------- | ----------
+    Integer                | number_unsigned | 0x00..0x17
+    Unsigned integer       | number_unsigned | 0x18
+    Unsigned integer       | number_unsigned | 0x19
+    Unsigned integer       | number_unsigned | 0x1A
+    Unsigned integer       | number_unsigned | 0x1B
+    Negative integer       | number_integer  | 0x20..0x37
+    Negative integer       | number_integer  | 0x38
+    Negative integer       | number_integer  | 0x39
+    Negative integer       | number_integer  | 0x3A
+    Negative integer       | number_integer  | 0x3B
+    Byte string            | binary          | 0x40..0x57
+    Byte string            | binary          | 0x58
+    Byte string            | binary          | 0x59
+    Byte string            | binary          | 0x5A
+    Byte string            | binary          | 0x5B
+    UTF-8 string           | string          | 0x60..0x77
+    UTF-8 string           | string          | 0x78
+    UTF-8 string           | string          | 0x79
+    UTF-8 string           | string          | 0x7A
+    UTF-8 string           | string          | 0x7B
+    UTF-8 string           | string          | 0x7F
+    array                  | array           | 0x80..0x97
+    array                  | array           | 0x98
+    array                  | array           | 0x99
+    array                  | array           | 0x9A
+    array                  | array           | 0x9B
+    array                  | array           | 0x9F
+    map                    | object          | 0xA0..0xB7
+    map                    | object          | 0xB8
+    map                    | object          | 0xB9
+    map                    | object          | 0xBA
+    map                    | object          | 0xBB
+    map                    | object          | 0xBF
+    False                  | `false`         | 0xF4
+    True                   | `true`          | 0xF5
+    Null                   | `null`          | 0xF6
+    Half-Precision Float   | number_float    | 0xF9
+    Single-Precision Float | number_float    | 0xFA
+    Double-Precision Float | number_float    | 0xFB
+
+    @warning The mapping is **incomplete** in the sense that not all CBOR
+             types can be converted to a JSON value. The following CBOR types
+             are not supported and will yield parse errors (parse_error.112):
+             - date/time (0xC0..0xC1)
+             - bignum (0xC2..0xC3)
+             - decimal fraction (0xC4)
+             - bigfloat (0xC5)
+             - expected conversions (0xD5..0xD7)
+             - simple values (0xE0..0xF3, 0xF8)
+             - undefined (0xF7)
+
+    @warning CBOR allows map keys of any type, whereas JSON only allows
+             strings as keys in object values. Therefore, CBOR maps with keys
+             other than UTF-8 strings are rejected (parse_error.113).
+
+    @note Any CBOR output created @ref to_cbor can be successfully parsed by
+          @ref from_cbor.
+
+    @param[in] i  an input in CBOR format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+    @param[in] tag_handler how to treat CBOR tags (optional, error by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported features from CBOR were
+    used in the given input @a v or if the input is not valid CBOR
+    @throw parse_error.113 if a string was expected as map key, but not found
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in CBOR
+    format to a JSON value.,from_cbor}
+
+    @sa http://cbor.io
+    @sa @ref to_cbor(const basic_json&) for the analogous serialization
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for the
+        related MessagePack format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        related UBJSON format
+
+    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+           consume input adapters, removed start_index parameter, and added
+           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
+           since 3.2.0; added @a tag_handler parameter since 3.9.0.
+    */
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t)
+    */
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_cbor(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        return from_cbor(ptr, ptr + len, strict, allow_exceptions, tag_handler);
+    }
+
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_cbor(ptr, ptr + len))
+    static basic_json from_cbor(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true,
+                                const cbor_tag_handler_t tag_handler = cbor_tag_handler_t::error)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::cbor, &sdp, strict, tag_handler);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @brief create a JSON value from an input in MessagePack format
+
+    Deserializes a given input @a i to a JSON value using the MessagePack
+    serialization format.
+
+    The library maps MessagePack types to JSON value types as follows:
+
+    MessagePack type | JSON value type | first byte
+    ---------------- | --------------- | ----------
+    positive fixint  | number_unsigned | 0x00..0x7F
+    fixmap           | object          | 0x80..0x8F
+    fixarray         | array           | 0x90..0x9F
+    fixstr           | string          | 0xA0..0xBF
+    nil              | `null`          | 0xC0
+    false            | `false`         | 0xC2
+    true             | `true`          | 0xC3
+    float 32         | number_float    | 0xCA
+    float 64         | number_float    | 0xCB
+    uint 8           | number_unsigned | 0xCC
+    uint 16          | number_unsigned | 0xCD
+    uint 32          | number_unsigned | 0xCE
+    uint 64          | number_unsigned | 0xCF
+    int 8            | number_integer  | 0xD0
+    int 16           | number_integer  | 0xD1
+    int 32           | number_integer  | 0xD2
+    int 64           | number_integer  | 0xD3
+    str 8            | string          | 0xD9
+    str 16           | string          | 0xDA
+    str 32           | string          | 0xDB
+    array 16         | array           | 0xDC
+    array 32         | array           | 0xDD
+    map 16           | object          | 0xDE
+    map 32           | object          | 0xDF
+    bin 8            | binary          | 0xC4
+    bin 16           | binary          | 0xC5
+    bin 32           | binary          | 0xC6
+    ext 8            | binary          | 0xC7
+    ext 16           | binary          | 0xC8
+    ext 32           | binary          | 0xC9
+    fixext 1         | binary          | 0xD4
+    fixext 2         | binary          | 0xD5
+    fixext 4         | binary          | 0xD6
+    fixext 8         | binary          | 0xD7
+    fixext 16        | binary          | 0xD8
+    negative fixint  | number_integer  | 0xE0-0xFF
+
+    @note Any MessagePack output created @ref to_msgpack can be successfully
+          parsed by @ref from_msgpack.
+
+    @param[in] i  an input in MessagePack format convertible to an input
+                  adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if unsupported features from MessagePack were
+    used in the given input @a i or if the input is not valid MessagePack
+    @throw parse_error.113 if a string was expected as map key, but not found
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    MessagePack format to a JSON value.,from_msgpack}
+
+    @sa http://msgpack.org
+    @sa @ref to_msgpack(const basic_json&) for the analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
+        related CBOR format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for
+        the related UBJSON format
+    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
+        the related BSON format
+
+    @since version 2.0.9; parameter @a start_index since 2.1.1; changed to
+           consume input adapters, removed start_index parameter, and added
+           @a strict parameter since 3.0.0; added @a allow_exceptions parameter
+           since 3.2.0
+    */
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(InputType&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_msgpack(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_msgpack(IteratorType first, IteratorType last,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(const T* ptr, std::size_t len,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        return from_msgpack(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_msgpack(ptr, ptr + len))
+    static basic_json from_msgpack(detail::span_input_adapter&& i,
+                                   const bool strict = true,
+                                   const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::msgpack, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+
+    /*!
+    @brief create a JSON value from an input in UBJSON format
+
+    Deserializes a given input @a i to a JSON value using the UBJSON (Universal
+    Binary JSON) serialization format.
+
+    The library maps UBJSON types to JSON value types as follows:
+
+    UBJSON type | JSON value type                         | marker
+    ----------- | --------------------------------------- | ------
+    no-op       | *no value, next value is read*          | `N`
+    null        | `null`                                  | `Z`
+    false       | `false`                                 | `F`
+    true        | `true`                                  | `T`
+    float32     | number_float                            | `d`
+    float64     | number_float                            | `D`
+    uint8       | number_unsigned                         | `U`
+    int8        | number_integer                          | `i`
+    int16       | number_integer                          | `I`
+    int32       | number_integer                          | `l`
+    int64       | number_integer                          | `L`
+    high-precision number | number_integer, number_unsigned, or number_float - depends on number string | 'H'
+    string      | string                                  | `S`
+    char        | string                                  | `C`
+    array       | array (optimized values are supported)  | `[`
+    object      | object (optimized values are supported) | `{`
+
+    @note The mapping is **complete** in the sense that any UBJSON value can
+          be converted to a JSON value.
+
+    @param[in] i  an input in UBJSON format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.110 if the given input ends prematurely or the end of
+    file was not reached when @a strict was set to true
+    @throw parse_error.112 if a parse error occurs
+    @throw parse_error.113 if a string could not be parsed successfully
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    UBJSON format to a JSON value.,from_ubjson}
+
+    @sa http://ubjson.org
+    @sa @ref to_ubjson(const basic_json&, const bool, const bool) for the
+             analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
+        related CBOR format
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
+        the related MessagePack format
+    @sa @ref from_bson(detail::input_adapter&&, const bool, const bool) for
+        the related BSON format
+
+    @since version 3.1.0; added @a allow_exceptions parameter since 3.2.0
+    */
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(InputType&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_ubjson(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_ubjson(IteratorType first, IteratorType last,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(const T* ptr, std::size_t len,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        return from_ubjson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_ubjson(ptr, ptr + len))
+    static basic_json from_ubjson(detail::span_input_adapter&& i,
+                                  const bool strict = true,
+                                  const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::ubjson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+
+    /*!
+    @brief Create a JSON value from an input in BSON format
+
+    Deserializes a given input @a i to a JSON value using the BSON (Binary JSON)
+    serialization format.
+
+    The library maps BSON record types to JSON value types as follows:
+
+    BSON type       | BSON marker byte | JSON value type
+    --------------- | ---------------- | ---------------------------
+    double          | 0x01             | number_float
+    string          | 0x02             | string
+    document        | 0x03             | object
+    array           | 0x04             | array
+    binary          | 0x05             | still unsupported
+    undefined       | 0x06             | still unsupported
+    ObjectId        | 0x07             | still unsupported
+    boolean         | 0x08             | boolean
+    UTC Date-Time   | 0x09             | still unsupported
+    null            | 0x0A             | null
+    Regular Expr.   | 0x0B             | still unsupported
+    DB Pointer      | 0x0C             | still unsupported
+    JavaScript Code | 0x0D             | still unsupported
+    Symbol          | 0x0E             | still unsupported
+    JavaScript Code | 0x0F             | still unsupported
+    int32           | 0x10             | number_integer
+    Timestamp       | 0x11             | still unsupported
+    128-bit decimal float | 0x13       | still unsupported
+    Max Key         | 0x7F             | still unsupported
+    Min Key         | 0xFF             | still unsupported
+
+    @warning The mapping is **incomplete**. The unsupported mappings
+             are indicated in the table above.
+
+    @param[in] i  an input in BSON format convertible to an input adapter
+    @param[in] strict  whether to expect the input to be consumed until EOF
+                       (true by default)
+    @param[in] allow_exceptions  whether to throw exceptions in case of a
+    parse error (optional, true by default)
+
+    @return deserialized JSON value; in case of a parse error and
+            @a allow_exceptions set to `false`, the return value will be
+            value_t::discarded.
+
+    @throw parse_error.114 if an unsupported BSON record type is encountered
+
+    @complexity Linear in the size of the input @a i.
+
+    @liveexample{The example shows the deserialization of a byte vector in
+    BSON format to a JSON value.,from_bson}
+
+    @sa http://bsonspec.org/spec.html
+    @sa @ref to_bson(const basic_json&) for the analogous serialization
+    @sa @ref from_cbor(detail::input_adapter&&, const bool, const bool, const cbor_tag_handler_t) for the
+        related CBOR format
+    @sa @ref from_msgpack(detail::input_adapter&&, const bool, const bool) for
+        the related MessagePack format
+    @sa @ref from_ubjson(detail::input_adapter&&, const bool, const bool) for the
+        related UBJSON format
+    */
+    template<typename InputType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(InputType&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::forward<InputType>(i));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    /*!
+    @copydoc from_bson(detail::input_adapter&&, const bool, const bool)
+    */
+    template<typename IteratorType>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json from_bson(IteratorType first, IteratorType last,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = detail::input_adapter(std::move(first), std::move(last));
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+
+    template<typename T>
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(const T* ptr, std::size_t len,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        return from_bson(ptr, ptr + len, strict, allow_exceptions);
+    }
+
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    JSON_HEDLEY_DEPRECATED_FOR(3.8.0, from_bson(ptr, ptr + len))
+    static basic_json from_bson(detail::span_input_adapter&& i,
+                                const bool strict = true,
+                                const bool allow_exceptions = true)
+    {
+        basic_json result;
+        detail::json_sax_dom_parser<basic_json> sdp(result, allow_exceptions);
+        auto ia = i.get();
+        const bool res = binary_reader<decltype(ia)>(std::move(ia)).sax_parse(input_format_t::bson, &sdp, strict);
+        return res ? result : basic_json(value_t::discarded);
+    }
+    /// @}
+
+    //////////////////////////
+    // JSON Pointer support //
+    //////////////////////////
+
+    /// @name JSON Pointer functions
+    /// @{
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Uses a JSON pointer to retrieve a reference to the respective JSON value.
+    No bound checking is performed. Similar to @ref operator[](const typename
+    object_t::key_type&), `null` values are created in arrays and objects if
+    necessary.
+
+    In particular:
+    - If the JSON pointer points to an object key that does not exist, it
+      is created an filled with a `null` value before a reference to it
+      is returned.
+    - If the JSON pointer points to an array index that does not exist, it
+      is created an filled with a `null` value before a reference to it
+      is returned. All indices between the current maximum and the given
+      index are also filled with `null`.
+    - The special value `-` is treated as a synonym for the index past the
+      end.
+
+    @param[in] ptr  a JSON pointer
+
+    @return reference to the element pointed to by @a ptr
+
+    @complexity Constant.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+
+    @liveexample{The behavior is shown in the example.,operatorjson_pointer}
+
+    @since version 2.0.0
+    */
+    reference operator[](const json_pointer& ptr)
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Uses a JSON pointer to retrieve a reference to the respective JSON value.
+    No bound checking is performed. The function does not change the JSON
+    value; no `null` values are created. In particular, the special value
+    `-` yields an exception.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return const reference to the element pointed to by @a ptr
+
+    @complexity Constant.
+
+    @throw parse_error.106   if an array index begins with '0'
+    @throw parse_error.109   if an array index was not a number
+    @throw out_of_range.402  if the array index '-' is used
+    @throw out_of_range.404  if the JSON pointer can not be resolved
+
+    @liveexample{The behavior is shown in the example.,operatorjson_pointer_const}
+
+    @since version 2.0.0
+    */
+    const_reference operator[](const json_pointer& ptr) const
+    {
+        return ptr.get_unchecked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Returns a reference to the element at with specified JSON pointer @a ptr,
+    with bounds checking.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return reference to the element pointed to by @a ptr
+
+    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+    begins with '0'. See example below.
+
+    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+    is not a number. See example below.
+
+    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+    is out of range. See example below.
+
+    @throw out_of_range.402 if the array index '-' is used in the passed JSON
+    pointer @a ptr. As `at` provides checked access (and no elements are
+    implicitly inserted), the index '-' is always invalid. See example below.
+
+    @throw out_of_range.403 if the JSON pointer describes a key of an object
+    which cannot be found. See example below.
+
+    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 2.0.0
+
+    @liveexample{The behavior is shown in the example.,at_json_pointer}
+    */
+    reference at(const json_pointer& ptr)
+    {
+        return ptr.get_checked(this);
+    }
+
+    /*!
+    @brief access specified element via JSON Pointer
+
+    Returns a const reference to the element at with specified JSON pointer @a
+    ptr, with bounds checking.
+
+    @param[in] ptr  JSON pointer to the desired element
+
+    @return reference to the element pointed to by @a ptr
+
+    @throw parse_error.106 if an array index in the passed JSON pointer @a ptr
+    begins with '0'. See example below.
+
+    @throw parse_error.109 if an array index in the passed JSON pointer @a ptr
+    is not a number. See example below.
+
+    @throw out_of_range.401 if an array index in the passed JSON pointer @a ptr
+    is out of range. See example below.
+
+    @throw out_of_range.402 if the array index '-' is used in the passed JSON
+    pointer @a ptr. As `at` provides checked access (and no elements are
+    implicitly inserted), the index '-' is always invalid. See example below.
+
+    @throw out_of_range.403 if the JSON pointer describes a key of an object
+    which cannot be found. See example below.
+
+    @throw out_of_range.404 if the JSON pointer @a ptr can not be resolved.
+    See example below.
+
+    @exceptionsafety Strong guarantee: if an exception is thrown, there are no
+    changes in the JSON value.
+
+    @complexity Constant.
+
+    @since version 2.0.0
+
+    @liveexample{The behavior is shown in the example.,at_json_pointer_const}
+    */
+    const_reference at(const json_pointer& ptr) const
+    {
+        return ptr.get_checked(this);
+    }
+
+    /*!
+    @brief return flattened JSON value
+
+    The function creates a JSON object whose keys are JSON pointers (see [RFC
+    6901](https://tools.ietf.org/html/rfc6901)) and whose values are all
+    primitive. The original JSON value can be restored using the @ref
+    unflatten() function.
+
+    @return an object that maps JSON pointers to primitive values
+
+    @note Empty objects and arrays are flattened to `null` and will not be
+          reconstructed correctly by the @ref unflatten() function.
+
+    @complexity Linear in the size the JSON value.
+
+    @liveexample{The following code shows how a JSON object is flattened to an
+    object whose keys consist of JSON pointers.,flatten}
+
+    @sa @ref unflatten() for the reverse function
+
+    @since version 2.0.0
+    */
+    basic_json flatten() const
+    {
+        basic_json result(value_t::object);
+        json_pointer::flatten("", *this, result);
+        return result;
+    }
+
+    /*!
+    @brief unflatten a previously flattened JSON value
+
+    The function restores the arbitrary nesting of a JSON value that has been
+    flattened before using the @ref flatten() function. The JSON value must
+    meet certain constraints:
+    1. The value must be an object.
+    2. The keys must be JSON pointers (see
+       [RFC 6901](https://tools.ietf.org/html/rfc6901))
+    3. The mapped values must be primitive JSON types.
+
+    @return the original JSON from a flattened version
+
+    @note Empty objects and arrays are flattened by @ref flatten() to `null`
+          values and can not unflattened to their original type. Apart from
+          this example, for a JSON value `j`, the following is always true:
+          `j == j.flatten().unflatten()`.
+
+    @complexity Linear in the size the JSON value.
+
+    @throw type_error.314  if value is not an object
+    @throw type_error.315  if object values are not primitive
+
+    @liveexample{The following code shows how a flattened JSON object is
+    unflattened into the original nested JSON object.,unflatten}
+
+    @sa @ref flatten() for the reverse function
+
+    @since version 2.0.0
+    */
+    basic_json unflatten() const
+    {
+        return json_pointer::unflatten(*this);
+    }
+
+    /// @}
+
+    //////////////////////////
+    // JSON Patch functions //
+    //////////////////////////
+
+    /// @name JSON Patch functions
+    /// @{
+
+    /*!
+    @brief applies a JSON patch
+
+    [JSON Patch](http://jsonpatch.com) defines a JSON document structure for
+    expressing a sequence of operations to apply to a JSON) document. With
+    this function, a JSON Patch is applied to the current JSON value by
+    executing all operations from the patch.
+
+    @param[in] json_patch  JSON patch document
+    @return patched document
+
+    @note The application of a patch is atomic: Either all operations succeed
+          and the patched document is returned or an exception is thrown. In
+          any case, the original value is not changed: the patch is applied
+          to a copy of the value.
+
+    @throw parse_error.104 if the JSON patch does not consist of an array of
+    objects
+
+    @throw parse_error.105 if the JSON patch is malformed (e.g., mandatory
+    attributes are missing); example: `"operation add must have member path"`
+
+    @throw out_of_range.401 if an array index is out of range.
+
+    @throw out_of_range.403 if a JSON pointer inside the patch could not be
+    resolved successfully in the current JSON value; example: `"key baz not
+    found"`
+
+    @throw out_of_range.405 if JSON pointer has no parent ("add", "remove",
+    "move")
+
+    @throw other_error.501 if "test" operation was unsuccessful
+
+    @complexity Linear in the size of the JSON value and the length of the
+    JSON patch. As usually only a fraction of the JSON value is affected by
+    the patch, the complexity can usually be neglected.
+
+    @liveexample{The following code shows how a JSON patch is applied to a
+    value.,patch}
+
+    @sa @ref diff -- create a JSON patch by comparing two JSON values
+
+    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+    @sa [RFC 6901 (JSON Pointer)](https://tools.ietf.org/html/rfc6901)
+
+    @since version 2.0.0
+    */
+    basic_json patch(const basic_json& json_patch) const
+    {
+        // make a working copy to apply the patch to
+        basic_json result = *this;
+
+        // the valid JSON Patch operations
+        enum class patch_operations {add, remove, replace, move, copy, test, invalid};
+
+        const auto get_op = [](const std::string & op)
+        {
+            if (op == "add")
+            {
+                return patch_operations::add;
+            }
+            if (op == "remove")
+            {
+                return patch_operations::remove;
+            }
+            if (op == "replace")
+            {
+                return patch_operations::replace;
+            }
+            if (op == "move")
+            {
+                return patch_operations::move;
+            }
+            if (op == "copy")
+            {
+                return patch_operations::copy;
+            }
+            if (op == "test")
+            {
+                return patch_operations::test;
+            }
+
+            return patch_operations::invalid;
+        };
+
+        // wrapper for "add" operation; add value at ptr
+        const auto operation_add = [&result](json_pointer & ptr, basic_json val)
+        {
+            // adding to the root of the target document means replacing it
+            if (ptr.empty())
+            {
+                result = val;
+                return;
+            }
+
+            // make sure the top element of the pointer exists
+            json_pointer top_pointer = ptr.top();
+            if (top_pointer != ptr)
+            {
+                result.at(top_pointer);
+            }
+
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result[ptr];
+
+            switch (parent.m_type)
+            {
+                case value_t::null:
+                case value_t::object:
+                {
+                    // use operator[] to add value
+                    parent[last_path] = val;
+                    break;
+                }
+
+                case value_t::array:
+                {
+                    if (last_path == "-")
+                    {
+                        // special case: append to back
+                        parent.push_back(val);
+                    }
+                    else
+                    {
+                        const auto idx = json_pointer::array_index(last_path);
+                        if (JSON_HEDLEY_UNLIKELY(idx > parent.size()))
+                        {
+                            // avoid undefined behavior
+                            JSON_THROW(out_of_range::create(401, "array index " + std::to_string(idx) + " is out of range"));
+                        }
+
+                        // default case: insert add offset
+                        parent.insert(parent.begin() + static_cast<difference_type>(idx), val);
+                    }
+                    break;
+                }
+
+                // if there exists a parent it cannot be primitive
+                default:            // LCOV_EXCL_LINE
+                    JSON_ASSERT(false);  // LCOV_EXCL_LINE
+            }
+        };
+
+        // wrapper for "remove" operation; remove value at ptr
+        const auto operation_remove = [&result](json_pointer & ptr)
+        {
+            // get reference to parent of JSON pointer ptr
+            const auto last_path = ptr.back();
+            ptr.pop_back();
+            basic_json& parent = result.at(ptr);
+
+            // remove child
+            if (parent.is_object())
+            {
+                // perform range check
+                auto it = parent.find(last_path);
+                if (JSON_HEDLEY_LIKELY(it != parent.end()))
+                {
+                    parent.erase(it);
+                }
+                else
+                {
+                    JSON_THROW(out_of_range::create(403, "key '" + last_path + "' not found"));
+                }
+            }
+            else if (parent.is_array())
+            {
+                // note erase performs range check
+                parent.erase(json_pointer::array_index(last_path));
+            }
+        };
+
+        // type check: top level value must be an array
+        if (JSON_HEDLEY_UNLIKELY(!json_patch.is_array()))
+        {
+            JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
+        }
+
+        // iterate and apply the operations
+        for (const auto& val : json_patch)
+        {
+            // wrapper to get a value for an operation
+            const auto get_value = [&val](const std::string & op,
+                                          const std::string & member,
+                                          bool string_type) -> basic_json &
+            {
+                // find value
+                auto it = val.m_value.object->find(member);
+
+                // context-sensitive error message
+                const auto error_msg = (op == "op") ? "operation" : "operation '" + op + "'";
+
+                // check if desired value is present
+                if (JSON_HEDLEY_UNLIKELY(it == val.m_value.object->end()))
+                {
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have member '" + member + "'"));
+                }
+
+                // check if result is of type string
+                if (JSON_HEDLEY_UNLIKELY(string_type && !it->second.is_string()))
+                {
+                    JSON_THROW(parse_error::create(105, 0, error_msg + " must have string member '" + member + "'"));
+                }
+
+                // no error: return value
+                return it->second;
+            };
+
+            // type check: every element of the array must be an object
+            if (JSON_HEDLEY_UNLIKELY(!val.is_object()))
+            {
+                JSON_THROW(parse_error::create(104, 0, "JSON patch must be an array of objects"));
+            }
+
+            // collect mandatory members
+            const auto op = get_value("op", "op", true).template get<std::string>();
+            const auto path = get_value(op, "path", true).template get<std::string>();
+            json_pointer ptr(path);
+
+            switch (get_op(op))
+            {
+                case patch_operations::add:
+                {
+                    operation_add(ptr, get_value("add", "value", false));
+                    break;
+                }
+
+                case patch_operations::remove:
+                {
+                    operation_remove(ptr);
+                    break;
+                }
+
+                case patch_operations::replace:
+                {
+                    // the "path" location must exist - use at()
+                    result.at(ptr) = get_value("replace", "value", false);
+                    break;
+                }
+
+                case patch_operations::move:
+                {
+                    const auto from_path = get_value("move", "from", true).template get<std::string>();
+                    json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json v = result.at(from_ptr);
+
+                    // The move operation is functionally identical to a
+                    // "remove" operation on the "from" location, followed
+                    // immediately by an "add" operation at the target
+                    // location with the value that was just removed.
+                    operation_remove(from_ptr);
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::copy:
+                {
+                    const auto from_path = get_value("copy", "from", true).template get<std::string>();
+                    const json_pointer from_ptr(from_path);
+
+                    // the "from" location must exist - use at()
+                    basic_json v = result.at(from_ptr);
+
+                    // The copy is functionally identical to an "add"
+                    // operation at the target location using the value
+                    // specified in the "from" member.
+                    operation_add(ptr, v);
+                    break;
+                }
+
+                case patch_operations::test:
+                {
+                    bool success = false;
+                    JSON_TRY
+                    {
+                        // check if "value" matches the one at "path"
+                        // the "path" location must exist - use at()
+                        success = (result.at(ptr) == get_value("test", "value", false));
+                    }
+                    JSON_INTERNAL_CATCH (out_of_range&)
+                    {
+                        // ignore out of range errors: success remains false
+                    }
+
+                    // throw an exception if test fails
+                    if (JSON_HEDLEY_UNLIKELY(!success))
+                    {
+                        JSON_THROW(other_error::create(501, "unsuccessful: " + val.dump()));
+                    }
+
+                    break;
+                }
+
+                default:
+                {
+                    // op must be "add", "remove", "replace", "move", "copy", or
+                    // "test"
+                    JSON_THROW(parse_error::create(105, 0, "operation value '" + op + "' is invalid"));
+                }
+            }
+        }
+
+        return result;
+    }
+
+    /*!
+    @brief creates a diff as a JSON patch
+
+    Creates a [JSON Patch](http://jsonpatch.com) so that value @a source can
+    be changed into the value @a target by calling @ref patch function.
+
+    @invariant For two JSON values @a source and @a target, the following code
+    yields always `true`:
+    @code {.cpp}
+    source.patch(diff(source, target)) == target;
+    @endcode
+
+    @note Currently, only `remove`, `add`, and `replace` operations are
+          generated.
+
+    @param[in] source  JSON value to compare from
+    @param[in] target  JSON value to compare against
+    @param[in] path    helper value to create JSON pointers
+
+    @return a JSON patch to convert the @a source to @a target
+
+    @complexity Linear in the lengths of @a source and @a target.
+
+    @liveexample{The following code shows how a JSON patch is created as a
+    diff for two JSON values.,diff}
+
+    @sa @ref patch -- apply a JSON patch
+    @sa @ref merge_patch -- apply a JSON Merge Patch
+
+    @sa [RFC 6902 (JSON Patch)](https://tools.ietf.org/html/rfc6902)
+
+    @since version 2.0.0
+    */
+    JSON_HEDLEY_WARN_UNUSED_RESULT
+    static basic_json diff(const basic_json& source, const basic_json& target,
+                           const std::string& path = "")
+    {
+        // the patch
+        basic_json result(value_t::array);
+
+        // if the values are the same, return empty patch
+        if (source == target)
+        {
+            return result;
+        }
+
+        if (source.type() != target.type())
+        {
+            // different types: replace value
+            result.push_back(
+            {
+                {"op", "replace"}, {"path", path}, {"value", target}
+            });
+            return result;
+        }
+
+        switch (source.type())
+        {
+            case value_t::array:
+            {
+                // first pass: traverse common elements
+                std::size_t i = 0;
+                while (i < source.size() && i < target.size())
+                {
+                    // recursive call to compare array values at index i
+                    auto temp_diff = diff(source[i], target[i], path + "/" + std::to_string(i));
+                    result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    ++i;
+                }
+
+                // i now reached the end of at least one array
+                // in a second pass, traverse the remaining elements
+
+                // remove my remaining elements
+                const auto end_index = static_cast<difference_type>(result.size());
+                while (i < source.size())
+                {
+                    // add operations in reverse order to avoid invalid
+                    // indices
+                    result.insert(result.begin() + end_index, object(
+                    {
+                        {"op", "remove"},
+                        {"path", path + "/" + std::to_string(i)}
+                    }));
+                    ++i;
+                }
+
+                // add other remaining elements
+                while (i < target.size())
+                {
+                    result.push_back(
+                    {
+                        {"op", "add"},
+                        {"path", path + "/-"},
+                        {"value", target[i]}
+                    });
+                    ++i;
+                }
+
+                break;
+            }
+
+            case value_t::object:
+            {
+                // first pass: traverse this object's elements
+                for (auto it = source.cbegin(); it != source.cend(); ++it)
+                {
+                    // escape the key name to be used in a JSON patch
+                    const auto key = json_pointer::escape(it.key());
+
+                    if (target.find(it.key()) != target.end())
+                    {
+                        // recursive call to compare object values at key it
+                        auto temp_diff = diff(it.value(), target[it.key()], path + "/" + key);
+                        result.insert(result.end(), temp_diff.begin(), temp_diff.end());
+                    }
+                    else
+                    {
+                        // found a key that is not in o -> remove it
+                        result.push_back(object(
+                        {
+                            {"op", "remove"}, {"path", path + "/" + key}
+                        }));
+                    }
+                }
+
+                // second pass: traverse other object's elements
+                for (auto it = target.cbegin(); it != target.cend(); ++it)
+                {
+                    if (source.find(it.key()) == source.end())
+                    {
+                        // found a key that is not in this -> add it
+                        const auto key = json_pointer::escape(it.key());
+                        result.push_back(
+                        {
+                            {"op", "add"}, {"path", path + "/" + key},
+                            {"value", it.value()}
+                        });
+                    }
+                }
+
+                break;
+            }
+
+            default:
+            {
+                // both primitive type: replace value
+                result.push_back(
+                {
+                    {"op", "replace"}, {"path", path}, {"value", target}
+                });
+                break;
+            }
+        }
+
+        return result;
+    }
+
+    /// @}
+
+    ////////////////////////////////
+    // JSON Merge Patch functions //
+    ////////////////////////////////
+
+    /// @name JSON Merge Patch functions
+    /// @{
+
+    /*!
+    @brief applies a JSON Merge Patch
+
+    The merge patch format is primarily intended for use with the HTTP PATCH
+    method as a means of describing a set of modifications to a target
+    resource's content. This function applies a merge patch to the current
+    JSON value.
+
+    The function implements the following algorithm from Section 2 of
+    [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396):
+
+    ```
+    define MergePatch(Target, Patch):
+      if Patch is an Object:
+        if Target is not an Object:
+          Target = {} // Ignore the contents and set it to an empty Object
+        for each Name/Value pair in Patch:
+          if Value is null:
+            if Name exists in Target:
+              remove the Name/Value pair from Target
+          else:
+            Target[Name] = MergePatch(Target[Name], Value)
+        return Target
+      else:
+        return Patch
+    ```
+
+    Thereby, `Target` is the current object; that is, the patch is applied to
+    the current value.
+
+    @param[in] apply_patch  the patch to apply
+
+    @complexity Linear in the lengths of @a patch.
+
+    @liveexample{The following code shows how a JSON Merge Patch is applied to
+    a JSON document.,merge_patch}
+
+    @sa @ref patch -- apply a JSON patch
+    @sa [RFC 7396 (JSON Merge Patch)](https://tools.ietf.org/html/rfc7396)
+
+    @since version 3.0.0
+    */
+    void merge_patch(const basic_json& apply_patch)
+    {
+        if (apply_patch.is_object())
+        {
+            if (!is_object())
+            {
+                *this = object();
+            }
+            for (auto it = apply_patch.begin(); it != apply_patch.end(); ++it)
+            {
+                if (it.value().is_null())
+                {
+                    erase(it.key());
+                }
+                else
+                {
+                    operator[](it.key()).merge_patch(it.value());
+                }
+            }
+        }
+        else
+        {
+            *this = apply_patch;
+        }
+    }
+
+    /// @}
+};
+
+/*!
+@brief user-defined to_string function for JSON values
+
+This function implements a user-defined to_string  for JSON objects.
+
+@param[in] j  a JSON object
+@return a std::string object
+*/
+
+NLOHMANN_BASIC_JSON_TPL_DECLARATION
+std::string to_string(const NLOHMANN_BASIC_JSON_TPL& j)
+{
+    return j.dump();
+}
+} // namespace nlohmann
+
+///////////////////////
+// nonmember support //
+///////////////////////
+
+// specialization of std::swap, and std::hash
+namespace std
+{
+
+/// hash value for JSON objects
+template<>
+struct hash<nlohmann::json>
+{
+    /*!
+    @brief return a hash value for a JSON object
+
+    @since version 1.0.0
+    */
+    std::size_t operator()(const nlohmann::json& j) const
+    {
+        return nlohmann::detail::hash(j);
+    }
+};
+
+/// specialization for std::less<value_t>
+/// @note: do not remove the space after '<',
+///        see https://github.com/nlohmann/json/pull/679
+template<>
+struct less<::nlohmann::detail::value_t>
+{
+    /*!
+    @brief compare two value_t enum values
+    @since version 3.0.0
+    */
+    bool operator()(nlohmann::detail::value_t lhs,
+                    nlohmann::detail::value_t rhs) const noexcept
+    {
+        return nlohmann::detail::operator<(lhs, rhs);
+    }
+};
+
+// C++20 prohibit function specialization in the std namespace.
+#ifndef JSON_HAS_CPP_20
+
+/*!
+@brief exchanges the values of two JSON objects
+
+@since version 1.0.0
+*/
+template<>
+inline void swap<nlohmann::json>(nlohmann::json& j1, nlohmann::json& j2) noexcept(
+    is_nothrow_move_constructible<nlohmann::json>::value&&
+    is_nothrow_move_assignable<nlohmann::json>::value
+                              )
+{
+    j1.swap(j2);
+}
+
+#endif
+
+} // namespace std
+
+/*!
+@brief user-defined string literal for JSON values
+
+This operator implements a user-defined string literal for JSON objects. It
+can be used by adding `"_json"` to a string literal and returns a JSON object
+if no parse error occurred.
+
+@param[in] s  a string representation of a JSON object
+@param[in] n  the length of string @a s
+@return a JSON object
+
+@since version 1.0.0
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline nlohmann::json operator "" _json(const char* s, std::size_t n)
+{
+    return nlohmann::json::parse(s, s + n);
+}
+
+/*!
+@brief user-defined string literal for JSON pointer
+
+This operator implements a user-defined string literal for JSON Pointers. It
+can be used by adding `"_json_pointer"` to a string literal and returns a JSON pointer
+object if no parse error occurred.
+
+@param[in] s  a string representation of a JSON Pointer
+@param[in] n  the length of string @a s
+@return a JSON pointer object
+
+@since version 2.0.0
+*/
+JSON_HEDLEY_NON_NULL(1)
+inline nlohmann::json::json_pointer operator "" _json_pointer(const char* s, std::size_t n)
+{
+    return nlohmann::json::json_pointer(std::string(s, n));
+}
+
+// #include <nlohmann/detail/macro_unscope.hpp>
+
+
+// restore GCC/clang diagnostic settings
+#if defined(__clang__) || defined(__GNUC__) || defined(__GNUG__)
+    #pragma GCC diagnostic pop
+#endif
+#if defined(__clang__)
+    #pragma GCC diagnostic pop
+#endif
+
+// clean up
+#undef JSON_ASSERT
+#undef JSON_INTERNAL_CATCH
+#undef JSON_CATCH
+#undef JSON_THROW
+#undef JSON_TRY
+#undef JSON_HAS_CPP_14
+#undef JSON_HAS_CPP_17
+#undef NLOHMANN_BASIC_JSON_TPL_DECLARATION
+#undef NLOHMANN_BASIC_JSON_TPL
+#undef JSON_EXPLICIT
+
+// #include <nlohmann/thirdparty/hedley/hedley_undef.hpp>
+#undef JSON_HEDLEY_ALWAYS_INLINE
+#undef JSON_HEDLEY_ARM_VERSION
+#undef JSON_HEDLEY_ARM_VERSION_CHECK
+#undef JSON_HEDLEY_ARRAY_PARAM
+#undef JSON_HEDLEY_ASSUME
+#undef JSON_HEDLEY_BEGIN_C_DECLS
+#undef JSON_HEDLEY_CLANG_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_BUILTIN
+#undef JSON_HEDLEY_CLANG_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_DECLSPEC_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_CLANG_HAS_EXTENSION
+#undef JSON_HEDLEY_CLANG_HAS_FEATURE
+#undef JSON_HEDLEY_CLANG_HAS_WARNING
+#undef JSON_HEDLEY_COMPCERT_VERSION
+#undef JSON_HEDLEY_COMPCERT_VERSION_CHECK
+#undef JSON_HEDLEY_CONCAT
+#undef JSON_HEDLEY_CONCAT3
+#undef JSON_HEDLEY_CONCAT3_EX
+#undef JSON_HEDLEY_CONCAT_EX
+#undef JSON_HEDLEY_CONST
+#undef JSON_HEDLEY_CONSTEXPR
+#undef JSON_HEDLEY_CONST_CAST
+#undef JSON_HEDLEY_CPP_CAST
+#undef JSON_HEDLEY_CRAY_VERSION
+#undef JSON_HEDLEY_CRAY_VERSION_CHECK
+#undef JSON_HEDLEY_C_DECL
+#undef JSON_HEDLEY_DEPRECATED
+#undef JSON_HEDLEY_DEPRECATED_FOR
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CAST_QUAL
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_CPP98_COMPAT_WRAP_
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_DEPRECATED
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_CPP_ATTRIBUTES
+#undef JSON_HEDLEY_DIAGNOSTIC_DISABLE_UNKNOWN_PRAGMAS
+#undef JSON_HEDLEY_DIAGNOSTIC_POP
+#undef JSON_HEDLEY_DIAGNOSTIC_PUSH
+#undef JSON_HEDLEY_DMC_VERSION
+#undef JSON_HEDLEY_DMC_VERSION_CHECK
+#undef JSON_HEDLEY_EMPTY_BASES
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION
+#undef JSON_HEDLEY_EMSCRIPTEN_VERSION_CHECK
+#undef JSON_HEDLEY_END_C_DECLS
+#undef JSON_HEDLEY_FLAGS
+#undef JSON_HEDLEY_FLAGS_CAST
+#undef JSON_HEDLEY_GCC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_BUILTIN
+#undef JSON_HEDLEY_GCC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GCC_HAS_EXTENSION
+#undef JSON_HEDLEY_GCC_HAS_FEATURE
+#undef JSON_HEDLEY_GCC_HAS_WARNING
+#undef JSON_HEDLEY_GCC_NOT_CLANG_VERSION_CHECK
+#undef JSON_HEDLEY_GCC_VERSION
+#undef JSON_HEDLEY_GCC_VERSION_CHECK
+#undef JSON_HEDLEY_GNUC_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_BUILTIN
+#undef JSON_HEDLEY_GNUC_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_GNUC_HAS_EXTENSION
+#undef JSON_HEDLEY_GNUC_HAS_FEATURE
+#undef JSON_HEDLEY_GNUC_HAS_WARNING
+#undef JSON_HEDLEY_GNUC_VERSION
+#undef JSON_HEDLEY_GNUC_VERSION_CHECK
+#undef JSON_HEDLEY_HAS_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_BUILTIN
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_CPP_ATTRIBUTE_NS
+#undef JSON_HEDLEY_HAS_DECLSPEC_ATTRIBUTE
+#undef JSON_HEDLEY_HAS_EXTENSION
+#undef JSON_HEDLEY_HAS_FEATURE
+#undef JSON_HEDLEY_HAS_WARNING
+#undef JSON_HEDLEY_IAR_VERSION
+#undef JSON_HEDLEY_IAR_VERSION_CHECK
+#undef JSON_HEDLEY_IBM_VERSION
+#undef JSON_HEDLEY_IBM_VERSION_CHECK
+#undef JSON_HEDLEY_IMPORT
+#undef JSON_HEDLEY_INLINE
+#undef JSON_HEDLEY_INTEL_VERSION
+#undef JSON_HEDLEY_INTEL_VERSION_CHECK
+#undef JSON_HEDLEY_IS_CONSTANT
+#undef JSON_HEDLEY_IS_CONSTEXPR_
+#undef JSON_HEDLEY_LIKELY
+#undef JSON_HEDLEY_MALLOC
+#undef JSON_HEDLEY_MESSAGE
+#undef JSON_HEDLEY_MSVC_VERSION
+#undef JSON_HEDLEY_MSVC_VERSION_CHECK
+#undef JSON_HEDLEY_NEVER_INLINE
+#undef JSON_HEDLEY_NON_NULL
+#undef JSON_HEDLEY_NO_ESCAPE
+#undef JSON_HEDLEY_NO_RETURN
+#undef JSON_HEDLEY_NO_THROW
+#undef JSON_HEDLEY_NULL
+#undef JSON_HEDLEY_PELLES_VERSION
+#undef JSON_HEDLEY_PELLES_VERSION_CHECK
+#undef JSON_HEDLEY_PGI_VERSION
+#undef JSON_HEDLEY_PGI_VERSION_CHECK
+#undef JSON_HEDLEY_PREDICT
+#undef JSON_HEDLEY_PRINTF_FORMAT
+#undef JSON_HEDLEY_PRIVATE
+#undef JSON_HEDLEY_PUBLIC
+#undef JSON_HEDLEY_PURE
+#undef JSON_HEDLEY_REINTERPRET_CAST
+#undef JSON_HEDLEY_REQUIRE
+#undef JSON_HEDLEY_REQUIRE_CONSTEXPR
+#undef JSON_HEDLEY_REQUIRE_MSG
+#undef JSON_HEDLEY_RESTRICT
+#undef JSON_HEDLEY_RETURNS_NON_NULL
+#undef JSON_HEDLEY_SENTINEL
+#undef JSON_HEDLEY_STATIC_ASSERT
+#undef JSON_HEDLEY_STATIC_CAST
+#undef JSON_HEDLEY_STRINGIFY
+#undef JSON_HEDLEY_STRINGIFY_EX
+#undef JSON_HEDLEY_SUNPRO_VERSION
+#undef JSON_HEDLEY_SUNPRO_VERSION_CHECK
+#undef JSON_HEDLEY_TINYC_VERSION
+#undef JSON_HEDLEY_TINYC_VERSION_CHECK
+#undef JSON_HEDLEY_TI_ARMCL_VERSION
+#undef JSON_HEDLEY_TI_ARMCL_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL2000_VERSION
+#undef JSON_HEDLEY_TI_CL2000_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL430_VERSION
+#undef JSON_HEDLEY_TI_CL430_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL6X_VERSION
+#undef JSON_HEDLEY_TI_CL6X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CL7X_VERSION
+#undef JSON_HEDLEY_TI_CL7X_VERSION_CHECK
+#undef JSON_HEDLEY_TI_CLPRU_VERSION
+#undef JSON_HEDLEY_TI_CLPRU_VERSION_CHECK
+#undef JSON_HEDLEY_TI_VERSION
+#undef JSON_HEDLEY_TI_VERSION_CHECK
+#undef JSON_HEDLEY_UNAVAILABLE
+#undef JSON_HEDLEY_UNLIKELY
+#undef JSON_HEDLEY_UNPREDICTABLE
+#undef JSON_HEDLEY_UNREACHABLE
+#undef JSON_HEDLEY_UNREACHABLE_RETURN
+#undef JSON_HEDLEY_VERSION
+#undef JSON_HEDLEY_VERSION_DECODE_MAJOR
+#undef JSON_HEDLEY_VERSION_DECODE_MINOR
+#undef JSON_HEDLEY_VERSION_DECODE_REVISION
+#undef JSON_HEDLEY_VERSION_ENCODE
+#undef JSON_HEDLEY_WARNING
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT
+#undef JSON_HEDLEY_WARN_UNUSED_RESULT_MSG
+#undef JSON_HEDLEY_FALL_THROUGH
+
+
+
+#endif  // INCLUDE_NLOHMANN_JSON_HPP_
diff --git a/src/jwt-cpp/include/jwt-cpp/picojson.h b/dep/jwt-cpp/include/picojson/picojson.h
similarity index 96%
rename from src/jwt-cpp/include/jwt-cpp/picojson.h
rename to dep/jwt-cpp/include/picojson/picojson.h
index 24a60c5be..76742fe06 100644
--- a/src/jwt-cpp/include/jwt-cpp/picojson.h
+++ b/dep/jwt-cpp/include/picojson/picojson.h
@@ -76,8 +76,14 @@ extern "C" {
 // experimental support for int64_t (see README.mkdn for detail)
 #ifdef PICOJSON_USE_INT64
 #define __STDC_FORMAT_MACROS
-#include <errno.h>
+#include <cerrno>
+#if __cplusplus >= 201103L
+#include <cinttypes>
+#else
+extern "C" {
 #include <inttypes.h>
+}
+#endif
 #endif
 
 // to disable the use of localeconv(3), set PICOJSON_USE_LOCALE to 0
@@ -104,6 +110,7 @@ extern "C" {
 #pragma warning(disable : 4244) // conversion from int to char
 #pragma warning(disable : 4127) // conditional expression is constant
 #pragma warning(disable : 4702) // unreachable code
+#pragma warning(disable : 4706) // assignment within conditional expression
 #else
 #define SNPRINTF snprintf
 #endif
@@ -123,7 +130,7 @@ enum {
 #endif
 };
 
-enum { INDENT_WIDTH = 2 };
+enum { INDENT_WIDTH = 2, DEFAULT_MAX_DEPTHS = 100 };
 
 struct null {};
 
@@ -377,7 +384,7 @@ GET(array, *u_.array_)
 GET(object, *u_.object_)
 #ifdef PICOJSON_USE_INT64
 GET(double,
-    (type_ == int64_type && (const_cast<value *>(this)->type_ = number_type, const_cast<value *>(this)->u_.number_ = u_.int64_),
+    (type_ == int64_type && (const_cast<value *>(this)->type_ = number_type, (const_cast<value *>(this)->u_.number_ = u_.int64_)),
      u_.number_))
 GET(int64_t, u_.int64_)
 #else
@@ -832,7 +839,7 @@ template <typename Context, typename Iter> inline bool _parse_object(Context &ct
     return false;
   }
   if (in.expect('}')) {
-    return true;
+    return ctx.parse_object_stop();
   }
   do {
     std::string key;
@@ -843,7 +850,7 @@ template <typename Context, typename Iter> inline bool _parse_object(Context &ct
       return false;
     }
   } while (in.expect(','));
-  return in.expect('}');
+  return in.expect('}') && ctx.parse_object_stop();
 }
 
 template <typename Iter> inline std::string _parse_number(input<Iter> &in) {
@@ -959,9 +966,10 @@ public:
 class default_parse_context {
 protected:
   value *out_;
+  size_t depths_;
 
 public:
-  default_parse_context(value *out) : out_(out) {
+  default_parse_context(value *out, size_t depths = DEFAULT_MAX_DEPTHS) : out_(out), depths_(depths) {
   }
   bool set_null() {
     *out_ = value();
@@ -986,27 +994,37 @@ public:
     return _parse_string(out_->get<std::string>(), in);
   }
   bool parse_array_start() {
+    if (depths_ == 0)
+      return false;
+    --depths_;
     *out_ = value(array_type, false);
     return true;
   }
   template <typename Iter> bool parse_array_item(input<Iter> &in, size_t) {
     array &a = out_->get<array>();
     a.push_back(value());
-    default_parse_context ctx(&a.back());
+    default_parse_context ctx(&a.back(), depths_);
     return _parse(ctx, in);
   }
   bool parse_array_stop(size_t) {
+    ++depths_;
     return true;
   }
   bool parse_object_start() {
+    if (depths_ == 0)
+      return false;
     *out_ = value(object_type, false);
     return true;
   }
   template <typename Iter> bool parse_object_item(input<Iter> &in, const std::string &key) {
     object &o = out_->get<object>();
-    default_parse_context ctx(&o[key]);
+    default_parse_context ctx(&o[key], depths_);
     return _parse(ctx, in);
   }
+  bool parse_object_stop() {
+    ++depths_;
+    return true;
+  }
 
 private:
   default_parse_context(const default_parse_context &);
@@ -1014,6 +1032,9 @@ private:
 };
 
 class null_parse_context {
+protected:
+  size_t depths_;
+
 public:
   struct dummy_str {
     void push_back(int) {
@@ -1021,7 +1042,7 @@ public:
   };
 
 public:
-  null_parse_context() {
+  null_parse_context(size_t depths = DEFAULT_MAX_DEPTHS) : depths_(depths) {
   }
   bool set_null() {
     return true;
@@ -1042,20 +1063,31 @@ public:
     return _parse_string(s, in);
   }
   bool parse_array_start() {
+    if (depths_ == 0)
+      return false;
+    --depths_;
     return true;
   }
   template <typename Iter> bool parse_array_item(input<Iter> &in, size_t) {
     return _parse(*this, in);
   }
   bool parse_array_stop(size_t) {
+    ++depths_;
     return true;
   }
   bool parse_object_start() {
+    if (depths_ == 0)
+      return false;
+    --depths_;
     return true;
   }
   template <typename Iter> bool parse_object_item(input<Iter> &in, const std::string &) {
+    ++depths_;
     return _parse(*this, in);
   }
+  bool parse_object_stop() {
+    return true;
+  }
 
 private:
   null_parse_context(const null_parse_context &);
@@ -1165,4 +1197,4 @@ inline std::ostream &operator<<(std::ostream &os, const picojson::value &x) {
 #pragma warning(pop)
 #endif
 
-#endif
\ No newline at end of file
+#endif
diff --git a/dep/libbcrypt/CMakeLists.txt b/dep/libbcrypt/CMakeLists.txt
new file mode 100644
index 000000000..9885d016d
--- /dev/null
+++ b/dep/libbcrypt/CMakeLists.txt
@@ -0,0 +1,25 @@
+enable_language(ASM)
+
+set(BCRYPT_SOURCES
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/bcrypt.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/crypt_blowfish.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/crypt_gensalt.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/wrapper.c
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/x86.S)
+
+add_library(bcrypt STATIC ${BCRYPT_SOURCES})
+add_library(libbcrypt::bcrypt ALIAS bcrypt)
+
+target_include_directories(bcrypt
+  PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/include/bcrypt)
+
+target_link_libraries(bcrypt
+  PRIVATE
+    zm-dependency-interface)
+
+if(BSD)
+  target_compile_definitions(bcrypt
+    PRIVATE
+      __SKIP_GNU)
+endif()
diff --git a/src/libbcrypt/LICENSE b/dep/libbcrypt/LICENSE
similarity index 100%
rename from src/libbcrypt/LICENSE
rename to dep/libbcrypt/LICENSE
diff --git a/src/libbcrypt/README.md b/dep/libbcrypt/README.md
similarity index 100%
rename from src/libbcrypt/README.md
rename to dep/libbcrypt/README.md
diff --git a/src/libbcrypt/include/bcrypt/BCrypt.hpp b/dep/libbcrypt/include/bcrypt/BCrypt.hpp
similarity index 96%
rename from src/libbcrypt/include/bcrypt/BCrypt.hpp
rename to dep/libbcrypt/include/bcrypt/BCrypt.hpp
index 27f9b563e..07e5c53d4 100644
--- a/src/libbcrypt/include/bcrypt/BCrypt.hpp
+++ b/dep/libbcrypt/include/bcrypt/BCrypt.hpp
@@ -1,32 +1,32 @@
-#ifndef __BCRYPT__
-#define __BCRYPT__
-
-#ifdef _WIN32
-#include "winbcrypt.h"
-#else
-
-#include "bcrypt.h"
-#include <string>
-#include <stdexcept>
-
-class BCrypt {
-public:
-    static std::string generateHash(const std::string & password, int workload = 12){
-        char salt[BCRYPT_HASHSIZE];
-        char hash[BCRYPT_HASHSIZE];
-        int ret;
-        ret = bcrypt_gensalt(workload, salt);
-        if(ret != 0)throw std::runtime_error{"bcrypt: can not generate salt"};
-        ret = bcrypt_hashpw(password.c_str(), salt, hash);
-        if(ret != 0)throw std::runtime_error{"bcrypt: can not generate hash"};
-        return std::string{hash};
-    }
-
-    static bool validatePassword(const std::string & password, const std::string & hash){
-        return (bcrypt_checkpw(password.c_str(), hash.c_str()) == 0);
-    }
-};
-
-#endif
-
-#endif // __BCRYPT__
+#ifndef __BCRYPT__
+#define __BCRYPT__
+
+#ifdef _WIN32
+#include "winbcrypt.h"
+#else
+
+#include "bcrypt.h"
+#include <string>
+#include <stdexcept>
+
+class BCrypt {
+public:
+    static std::string generateHash(const std::string & password, int workload = 12){
+        char salt[BCRYPT_HASHSIZE];
+        char hash[BCRYPT_HASHSIZE];
+        int ret;
+        ret = bcrypt_gensalt(workload, salt);
+        if(ret != 0)throw std::runtime_error{"bcrypt: can not generate salt"};
+        ret = bcrypt_hashpw(password.c_str(), salt, hash);
+        if(ret != 0)throw std::runtime_error{"bcrypt: can not generate hash"};
+        return std::string{hash};
+    }
+
+    static bool validatePassword(const std::string & password, const std::string & hash){
+        return (bcrypt_checkpw(password.c_str(), hash.c_str()) == 0);
+    }
+};
+
+#endif
+
+#endif // __BCRYPT__
diff --git a/src/libbcrypt/include/bcrypt/bcrypt.h b/dep/libbcrypt/include/bcrypt/bcrypt.h
similarity index 100%
rename from src/libbcrypt/include/bcrypt/bcrypt.h
rename to dep/libbcrypt/include/bcrypt/bcrypt.h
diff --git a/src/libbcrypt/include/bcrypt/crypt.h b/dep/libbcrypt/include/bcrypt/crypt.h
similarity index 100%
rename from src/libbcrypt/include/bcrypt/crypt.h
rename to dep/libbcrypt/include/bcrypt/crypt.h
diff --git a/src/libbcrypt/include/bcrypt/crypt_blowfish.h b/dep/libbcrypt/include/bcrypt/crypt_blowfish.h
similarity index 100%
rename from src/libbcrypt/include/bcrypt/crypt_blowfish.h
rename to dep/libbcrypt/include/bcrypt/crypt_blowfish.h
diff --git a/src/libbcrypt/include/bcrypt/crypt_gensalt.h b/dep/libbcrypt/include/bcrypt/crypt_gensalt.h
similarity index 100%
rename from src/libbcrypt/include/bcrypt/crypt_gensalt.h
rename to dep/libbcrypt/include/bcrypt/crypt_gensalt.h
diff --git a/src/libbcrypt/include/bcrypt/ow-crypt.h b/dep/libbcrypt/include/bcrypt/ow-crypt.h
similarity index 97%
rename from src/libbcrypt/include/bcrypt/ow-crypt.h
rename to dep/libbcrypt/include/bcrypt/ow-crypt.h
index 2c8ddf8f6..2e4879426 100644
--- a/src/libbcrypt/include/bcrypt/ow-crypt.h
+++ b/dep/libbcrypt/include/bcrypt/ow-crypt.h
@@ -1,43 +1,43 @@
-/*
- * Written by Solar Designer <solar at openwall.com> in 2000-2011.
- * No copyright is claimed, and the software is hereby placed in the public
- * domain.  In case this attempt to disclaim copyright and place the software
- * in the public domain is deemed null and void, then the software is
- * Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- *
- * See crypt_blowfish.c for more information.
- */
-
-#ifndef _OW_CRYPT_H
-#define _OW_CRYPT_H
-
-#ifndef __GNUC__
-#undef __const
-#define __const const
-#endif
-
-#ifndef __SKIP_GNU
-extern char *crypt(__const char *key, __const char *setting);
-extern char *crypt_r(__const char *key, __const char *setting, void *data);
-#endif
-
-#ifndef __SKIP_OW
-extern char *crypt_rn(__const char *key, __const char *setting,
-	void *data, int size);
-extern char *crypt_ra(__const char *key, __const char *setting,
-	void **data, int *size);
-extern char *crypt_gensalt(__const char *prefix, unsigned long count,
-	__const char *input, int size);
-extern char *crypt_gensalt_rn(__const char *prefix, unsigned long count,
-	__const char *input, int size, char *output, int output_size);
-extern char *crypt_gensalt_ra(__const char *prefix, unsigned long count,
-	__const char *input, int size);
-#endif
-
-#endif
+/*
+ * Written by Solar Designer <solar at openwall.com> in 2000-2011.
+ * No copyright is claimed, and the software is hereby placed in the public
+ * domain.  In case this attempt to disclaim copyright and place the software
+ * in the public domain is deemed null and void, then the software is
+ * Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
+ * general public under the following terms:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ *
+ * See crypt_blowfish.c for more information.
+ */
+
+#ifndef _OW_CRYPT_H
+#define _OW_CRYPT_H
+
+#ifndef __GNUC__
+#undef __const
+#define __const const
+#endif
+
+#ifndef __SKIP_GNU
+extern char *crypt(__const char *key, __const char *setting);
+extern char *crypt_r(__const char *key, __const char *setting, void *data);
+#endif
+
+#ifndef __SKIP_OW
+extern char *crypt_rn(__const char *key, __const char *setting,
+	void *data, int size);
+extern char *crypt_ra(__const char *key, __const char *setting,
+	void **data, int *size);
+extern char *crypt_gensalt(__const char *prefix, unsigned long count,
+	__const char *input, int size);
+extern char *crypt_gensalt_rn(__const char *prefix, unsigned long count,
+	__const char *input, int size, char *output, int output_size);
+extern char *crypt_gensalt_ra(__const char *prefix, unsigned long count,
+	__const char *input, int size);
+#endif
+
+#endif
diff --git a/src/libbcrypt/include/bcrypt/winbcrypt.h b/dep/libbcrypt/include/bcrypt/winbcrypt.h
similarity index 95%
rename from src/libbcrypt/include/bcrypt/winbcrypt.h
rename to dep/libbcrypt/include/bcrypt/winbcrypt.h
index 703ecd211..8ac27e1c3 100644
--- a/src/libbcrypt/include/bcrypt/winbcrypt.h
+++ b/dep/libbcrypt/include/bcrypt/winbcrypt.h
@@ -1,27 +1,27 @@
-#ifndef __WIN_BCRYPT__H
-#define __WIN_BCRYPT__H
-
-#include <iostream>
-
-#include "crypt_blowfish.h"
-#include "./bcrypt.h"
-
-class BCrypt {
-public:
-	static std::string generateHash(const std::string & password, int workload = 12) {
-		char salt[BCRYPT_HASHSIZE];
-		char hash[BCRYPT_HASHSIZE];
-		int ret;
-		ret = bcrypt_gensalt(workload, salt);
-		if (ret != 0)throw std::runtime_error{ "bcrypt: can not generate salt" };
-		ret = bcrypt_hashpw(password.c_str(), salt, hash);
-		if (ret != 0)throw std::runtime_error{ "bcrypt: can not generate hash" };
-		return std::string{ hash };
-	}
-
-	static bool validatePassword(const std::string & password, const std::string & hash) {
-		return (bcrypt_checkpw(password.c_str(), hash.c_str()) == 0);
-	}
-};
-
+#ifndef __WIN_BCRYPT__H
+#define __WIN_BCRYPT__H
+
+#include <iostream>
+
+#include "crypt_blowfish.h"
+#include "./bcrypt.h"
+
+class BCrypt {
+public:
+	static std::string generateHash(const std::string & password, int workload = 12) {
+		char salt[BCRYPT_HASHSIZE];
+		char hash[BCRYPT_HASHSIZE];
+		int ret;
+		ret = bcrypt_gensalt(workload, salt);
+		if (ret != 0)throw std::runtime_error{ "bcrypt: can not generate salt" };
+		ret = bcrypt_hashpw(password.c_str(), salt, hash);
+		if (ret != 0)throw std::runtime_error{ "bcrypt: can not generate hash" };
+		return std::string{ hash };
+	}
+
+	static bool validatePassword(const std::string & password, const std::string & hash) {
+		return (bcrypt_checkpw(password.c_str(), hash.c_str()) == 0);
+	}
+};
+
 #endif
\ No newline at end of file
diff --git a/src/libbcrypt/src/bcrypt.c b/dep/libbcrypt/src/bcrypt.c
similarity index 95%
rename from src/libbcrypt/src/bcrypt.c
rename to dep/libbcrypt/src/bcrypt.c
index db16d27b3..eafdb2136 100644
--- a/src/libbcrypt/src/bcrypt.c
+++ b/dep/libbcrypt/src/bcrypt.c
@@ -1,230 +1,230 @@
-/*
- * bcrypt wrapper library
- *
- * Written in 2011, 2013, 2014, 2015 by Ricardo Garcia <r@rg3.name>
- *
- * To the extent possible under law, the author(s) have dedicated all copyright
- * and related and neighboring rights to this software to the public domain
- * worldwide. This software is distributed without any warranty.
- *
- * You should have received a copy of the CC0 Public Domain Dedication along
- * with this software. If not, see
- * <http://creativecommons.org/publicdomain/zero/1.0/>.
- */
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#ifdef _WIN32
-#elif _WIN64
-#else
-#include <unistd.h>
-#endif
-#include <errno.h>
-
-#if defined(_WIN32) || defined(_WIN64)
-// On windows we need to generate random bytes differently.
-typedef __int64 ssize_t;
-#define BCRYPT_HASHSIZE 60
-
-#include "../include/bcrypt/bcrypt.h"
-
-#include <windows.h>
-#include <wincrypt.h> /* CryptAcquireContext, CryptGenRandom */
-#else
-#include "bcrypt.h"
-#include "ow-crypt.h"
-#endif
-
-#define RANDBYTES (16)
-
-static int try_close(int fd)
-{
-	int ret;
-	for (;;) {
-		errno = 0;
-		ret = close(fd);
-		if (ret == -1 && errno == EINTR)
-			continue;
-		break;
-	}
-	return ret;
-}
-
-static int try_read(int fd, char *out, size_t count)
-{
-	size_t total;
-	ssize_t partial;
-
-	total = 0;
-	while (total < count)
-	{
-		for (;;) {
-			errno = 0;
-			partial = read(fd, out + total, count - total);
-			if (partial == -1 && errno == EINTR)
-				continue;
-			break;
-		}
-
-		if (partial < 1)
-			return -1;
-
-		total += partial;
-	}
-
-	return 0;
-}
-
-/*
- * This is a best effort implementation. Nothing prevents a compiler from
- * optimizing this function and making it vulnerable to timing attacks, but
- * this method is commonly used in crypto libraries like NaCl.
- *
- * Return value is zero if both strings are equal and nonzero otherwise.
-*/
-static int timing_safe_strcmp(const char *str1, const char *str2)
-{
-	const unsigned char *u1;
-	const unsigned char *u2;
-	int ret;
-	int i;
-
-	int len1 = strlen(str1);
-	int len2 = strlen(str2);
-
-	/* In our context both strings should always have the same length
-	 * because they will be hashed passwords. */
-	if (len1 != len2)
-		return 1;
-
-	/* Force unsigned for bitwise operations. */
-	u1 = (const unsigned char *)str1;
-	u2 = (const unsigned char *)str2;
-
-	ret = 0;
-	for (i = 0; i < len1; ++i)
-		ret |= (u1[i] ^ u2[i]);
-
-	return ret;
-}
-
-int bcrypt_gensalt(int factor, char salt[BCRYPT_HASHSIZE])
-{
-	int fd;
-	char input[RANDBYTES];
-	int workf;
-	char *aux;
-
-	// Note: Windows does not have /dev/urandom sadly.
-#if defined(_WIN32) || defined(_WIN64)
-	HCRYPTPROV p;
-	ULONG     i;
-
-	// Acquire a crypt context for generating random bytes.
-	if (CryptAcquireContext(&p, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT) == FALSE) {
-		return 1;
-	}
-
-	if (CryptGenRandom(p, RANDBYTES, (BYTE*)input) == FALSE) {
-		return 2;
-	}
-
-	if (CryptReleaseContext(p, 0) == FALSE) {
-		return 3;
-	}
-#else
-	// Get random bytes on Unix/Linux.
-	fd = open("/dev/urandom", O_RDONLY);
-	if (fd == -1)
-		return 1;
-
-	if (try_read(fd, input, RANDBYTES) != 0) {
-		if (try_close(fd) != 0)
-			return 4;
-		return 2;
-	}
-
-	if (try_close(fd) != 0)
-		return 3;
-#endif
-
-	/* Generate salt. */
-	workf = (factor < 4 || factor > 31)?12:factor;
-	aux = crypt_gensalt_rn("$2a$", workf, input, RANDBYTES,
-			       salt, BCRYPT_HASHSIZE);
-	return (aux == NULL)?5:0;
-}
-
-int bcrypt_hashpw(const char *passwd, const char salt[BCRYPT_HASHSIZE], char hash[BCRYPT_HASHSIZE])
-{
-	char *aux;
-	aux = crypt_rn(passwd, salt, hash, BCRYPT_HASHSIZE);
-	return (aux == NULL)?1:0;
-}
-
-int bcrypt_checkpw(const char *passwd, const char hash[BCRYPT_HASHSIZE])
-{
-	int ret;
-	char outhash[BCRYPT_HASHSIZE];
-
-	ret = bcrypt_hashpw(passwd, hash, outhash);
-	if (ret != 0)
-		return -1;
-
-	return timing_safe_strcmp(hash, outhash);
-}
-
-#ifdef TEST_BCRYPT
-#include <assert.h>
-#include <stdio.h>
-#include <string.h>
-#include <time.h>
-
-int main(void)
-{
-	clock_t before;
-	clock_t after;
-	char salt[BCRYPT_HASHSIZE];
-	char hash[BCRYPT_HASHSIZE];
-	int ret;
-
-	const char pass[] = "hi,mom";
-	const char hash1[] = "$2a$10$VEVmGHy4F4XQMJ3eOZJAUeb.MedU0W10pTPCuf53eHdKJPiSE8sMK";
-	const char hash2[] = "$2a$10$3F0BVk5t8/aoS.3ddaB3l.fxg5qvafQ9NybxcpXLzMeAt.nVWn.NO";
-
-	ret = bcrypt_gensalt(12, salt);
-	assert(ret == 0);
-	printf("Generated salt: %s\n", salt);
-	before = clock();
-	ret = bcrypt_hashpw("testtesttest", salt, hash);
-	assert(ret == 0);
-	after = clock();
-	printf("Hashed password: %s\n", hash);
-	printf("Time taken: %f seconds\n",
-	       (double)(after - before) / CLOCKS_PER_SEC);
-
-	ret = bcrypt_hashpw(pass, hash1, hash);
-	assert(ret == 0);
-	printf("First hash check: %s\n", (strcmp(hash1, hash) == 0)?"OK":"FAIL");
-	ret = bcrypt_hashpw(pass, hash2, hash);
-	assert(ret == 0);
-	printf("Second hash check: %s\n", (strcmp(hash2, hash) == 0)?"OK":"FAIL");
-
-	before = clock();
-	ret = (bcrypt_checkpw(pass, hash1) == 0);
-	after = clock();
-	printf("First hash check with bcrypt_checkpw: %s\n", ret?"OK":"FAIL");
-	printf("Time taken: %f seconds\n",
-	       (double)(after - before) / CLOCKS_PER_SEC);
-
-	before = clock();
-	ret = (bcrypt_checkpw(pass, hash2) == 0);
-	after = clock();
-	printf("Second hash check with bcrypt_checkpw: %s\n", ret?"OK":"FAIL");
-	printf("Time taken: %f seconds\n",
-	       (double)(after - before) / CLOCKS_PER_SEC);
-
-	return 0;
-}
-#endif
+/*
+ * bcrypt wrapper library
+ *
+ * Written in 2011, 2013, 2014, 2015 by Ricardo Garcia <r@rg3.name>
+ *
+ * To the extent possible under law, the author(s) have dedicated all copyright
+ * and related and neighboring rights to this software to the public domain
+ * worldwide. This software is distributed without any warranty.
+ *
+ * You should have received a copy of the CC0 Public Domain Dedication along
+ * with this software. If not, see
+ * <http://creativecommons.org/publicdomain/zero/1.0/>.
+ */
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#ifdef _WIN32
+#elif _WIN64
+#else
+#include <unistd.h>
+#endif
+#include <errno.h>
+
+#if defined(_WIN32) || defined(_WIN64)
+// On windows we need to generate random bytes differently.
+typedef __int64 ssize_t;
+#define BCRYPT_HASHSIZE 60
+
+#include "../include/bcrypt/bcrypt.h"
+
+#include <windows.h>
+#include <wincrypt.h> /* CryptAcquireContext, CryptGenRandom */
+#else
+#include "bcrypt.h"
+#include "ow-crypt.h"
+#endif
+
+#define RANDBYTES (16)
+
+static int try_close(int fd)
+{
+	int ret;
+	for (;;) {
+		errno = 0;
+		ret = close(fd);
+		if (ret == -1 && errno == EINTR)
+			continue;
+		break;
+	}
+	return ret;
+}
+
+static int try_read(int fd, char *out, size_t count)
+{
+	size_t total;
+	ssize_t partial;
+
+	total = 0;
+	while (total < count)
+	{
+		for (;;) {
+			errno = 0;
+			partial = read(fd, out + total, count - total);
+			if (partial == -1 && errno == EINTR)
+				continue;
+			break;
+		}
+
+		if (partial < 1)
+			return -1;
+
+		total += partial;
+	}
+
+	return 0;
+}
+
+/*
+ * This is a best effort implementation. Nothing prevents a compiler from
+ * optimizing this function and making it vulnerable to timing attacks, but
+ * this method is commonly used in crypto libraries like NaCl.
+ *
+ * Return value is zero if both strings are equal and nonzero otherwise.
+*/
+static int timing_safe_strcmp(const char *str1, const char *str2)
+{
+	const unsigned char *u1;
+	const unsigned char *u2;
+	int ret;
+	int i;
+
+	int len1 = strlen(str1);
+	int len2 = strlen(str2);
+
+	/* In our context both strings should always have the same length
+	 * because they will be hashed passwords. */
+	if (len1 != len2)
+		return 1;
+
+	/* Force unsigned for bitwise operations. */
+	u1 = (const unsigned char *)str1;
+	u2 = (const unsigned char *)str2;
+
+	ret = 0;
+	for (i = 0; i < len1; ++i)
+		ret |= (u1[i] ^ u2[i]);
+
+	return ret;
+}
+
+int bcrypt_gensalt(int factor, char salt[BCRYPT_HASHSIZE])
+{
+	int fd;
+	char input[RANDBYTES];
+	int workf;
+	char *aux;
+
+	// Note: Windows does not have /dev/urandom sadly.
+#if defined(_WIN32) || defined(_WIN64)
+	HCRYPTPROV p;
+	ULONG     i;
+
+	// Acquire a crypt context for generating random bytes.
+	if (CryptAcquireContext(&p, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT) == FALSE) {
+		return 1;
+	}
+
+	if (CryptGenRandom(p, RANDBYTES, (BYTE*)input) == FALSE) {
+		return 2;
+	}
+
+	if (CryptReleaseContext(p, 0) == FALSE) {
+		return 3;
+	}
+#else
+	// Get random bytes on Unix/Linux.
+	fd = open("/dev/urandom", O_RDONLY);
+	if (fd == -1)
+		return 1;
+
+	if (try_read(fd, input, RANDBYTES) != 0) {
+		if (try_close(fd) != 0)
+			return 4;
+		return 2;
+	}
+
+	if (try_close(fd) != 0)
+		return 3;
+#endif
+
+	/* Generate salt. */
+	workf = (factor < 4 || factor > 31)?12:factor;
+	aux = crypt_gensalt_rn("$2a$", workf, input, RANDBYTES,
+			       salt, BCRYPT_HASHSIZE);
+	return (aux == NULL)?5:0;
+}
+
+int bcrypt_hashpw(const char *passwd, const char salt[BCRYPT_HASHSIZE], char hash[BCRYPT_HASHSIZE])
+{
+	char *aux;
+	aux = crypt_rn(passwd, salt, hash, BCRYPT_HASHSIZE);
+	return (aux == NULL)?1:0;
+}
+
+int bcrypt_checkpw(const char *passwd, const char hash[BCRYPT_HASHSIZE])
+{
+	int ret;
+	char outhash[BCRYPT_HASHSIZE];
+
+	ret = bcrypt_hashpw(passwd, hash, outhash);
+	if (ret != 0)
+		return -1;
+
+	return timing_safe_strcmp(hash, outhash);
+}
+
+#ifdef TEST_BCRYPT
+#include <assert.h>
+#include <stdio.h>
+#include <string.h>
+#include <time.h>
+
+int main(void)
+{
+	clock_t before;
+	clock_t after;
+	char salt[BCRYPT_HASHSIZE];
+	char hash[BCRYPT_HASHSIZE];
+	int ret;
+
+	const char pass[] = "hi,mom";
+	const char hash1[] = "$2a$10$VEVmGHy4F4XQMJ3eOZJAUeb.MedU0W10pTPCuf53eHdKJPiSE8sMK";
+	const char hash2[] = "$2a$10$3F0BVk5t8/aoS.3ddaB3l.fxg5qvafQ9NybxcpXLzMeAt.nVWn.NO";
+
+	ret = bcrypt_gensalt(12, salt);
+	assert(ret == 0);
+	printf("Generated salt: %s\n", salt);
+	before = clock();
+	ret = bcrypt_hashpw("testtesttest", salt, hash);
+	assert(ret == 0);
+	after = clock();
+	printf("Hashed password: %s\n", hash);
+	printf("Time taken: %f seconds\n",
+	       (double)(after - before) / CLOCKS_PER_SEC);
+
+	ret = bcrypt_hashpw(pass, hash1, hash);
+	assert(ret == 0);
+	printf("First hash check: %s\n", (strcmp(hash1, hash) == 0)?"OK":"FAIL");
+	ret = bcrypt_hashpw(pass, hash2, hash);
+	assert(ret == 0);
+	printf("Second hash check: %s\n", (strcmp(hash2, hash) == 0)?"OK":"FAIL");
+
+	before = clock();
+	ret = (bcrypt_checkpw(pass, hash1) == 0);
+	after = clock();
+	printf("First hash check with bcrypt_checkpw: %s\n", ret?"OK":"FAIL");
+	printf("Time taken: %f seconds\n",
+	       (double)(after - before) / CLOCKS_PER_SEC);
+
+	before = clock();
+	ret = (bcrypt_checkpw(pass, hash2) == 0);
+	after = clock();
+	printf("Second hash check with bcrypt_checkpw: %s\n", ret?"OK":"FAIL");
+	printf("Time taken: %f seconds\n",
+	       (double)(after - before) / CLOCKS_PER_SEC);
+
+	return 0;
+}
+#endif
diff --git a/src/libbcrypt/src/crypt_blowfish.c b/dep/libbcrypt/src/crypt_blowfish.c
similarity index 97%
rename from src/libbcrypt/src/crypt_blowfish.c
rename to dep/libbcrypt/src/crypt_blowfish.c
index 0fa55ea07..27133d535 100644
--- a/src/libbcrypt/src/crypt_blowfish.c
+++ b/dep/libbcrypt/src/crypt_blowfish.c
@@ -1,911 +1,911 @@
-/*
- * The crypt_blowfish homepage is:
- *
- *	http://www.openwall.com/crypt/
- *
- * This code comes from John the Ripper password cracker, with reentrant
- * and crypt(3) interfaces added, but optimizations specific to password
- * cracking removed.
- *
- * Written by Solar Designer <solar at openwall.com> in 1998-2014.
- * No copyright is claimed, and the software is hereby placed in the public
- * domain.  In case this attempt to disclaim copyright and place the software
- * in the public domain is deemed null and void, then the software is
- * Copyright (c) 1998-2014 Solar Designer and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- *
- * It is my intent that you should be able to use this on your system,
- * as part of a software package, or anywhere else to improve security,
- * ensure compatibility, or for any other purpose.  I would appreciate
- * it if you give credit where it is due and keep your modifications in
- * the public domain as well, but I don't require that in order to let
- * you place this code and any modifications you make under a license
- * of your choice.
- *
- * This implementation is fully compatible with OpenBSD's bcrypt.c for prefix
- * "$2b$", originally by Niels Provos <provos at citi.umich.edu>, and it uses
- * some of his ideas.  The password hashing algorithm was designed by David
- * Mazieres <dm at lcs.mit.edu>.  For information on the level of
- * compatibility for bcrypt hash prefixes other than "$2b$", please refer to
- * the comments in BF_set_key() below and to the included crypt(3) man page.
- *
- * There's a paper on the algorithm that explains its design decisions:
- *
- *	http://www.usenix.org/events/usenix99/provos.html
- *
- * Some of the tricks in BF_ROUND might be inspired by Eric Young's
- * Blowfish library (I can't be sure if I would think of something if I
- * hadn't seen his code).
- */
-
-#include <string.h>
-
-#include <errno.h>
-#ifndef __set_errno
-#define __set_errno(val) errno = (val)
-#endif
-
-/* Just to make sure the prototypes match the actual definitions */
-#ifdef _WIN32 || _WIN64
-#include "../include/bcrypt/crypt_blowfish.h"
-#else
-#include "crypt_blowfish.h"
-#endif
-
-#ifdef __i386__
-#define BF_ASM				1
-#define BF_SCALE			1
-#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__)
-#define BF_ASM				0
-#define BF_SCALE			1
-#else
-#define BF_ASM				0
-#define BF_SCALE			0
-#endif
-
-typedef unsigned int BF_word;
-typedef signed int BF_word_signed;
-
-/* Number of Blowfish rounds, this is also hardcoded into a few places */
-#define BF_N				16
-
-typedef BF_word BF_key[BF_N + 2];
-
-typedef struct {
-	BF_word S[4][0x100];
-	BF_key P;
-} BF_ctx;
-
-/*
- * Magic IV for 64 Blowfish encryptions that we do at the end.
- * The string is "OrpheanBeholderScryDoubt" on big-endian.
- */
-static BF_word BF_magic_w[6] = {
-	0x4F727068, 0x65616E42, 0x65686F6C,
-	0x64657253, 0x63727944, 0x6F756274
-};
-
-/*
- * P-box and S-box tables initialized with digits of Pi.
- */
-static BF_ctx BF_init_state = {
-	{
-		{
-			0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
-			0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
-			0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-			0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
-			0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
-			0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-			0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
-			0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
-			0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-			0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
-			0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
-			0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-			0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
-			0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
-			0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-			0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
-			0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
-			0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-			0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
-			0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
-			0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-			0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
-			0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
-			0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-			0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
-			0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
-			0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-			0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
-			0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
-			0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-			0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
-			0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
-			0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-			0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
-			0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
-			0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-			0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
-			0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
-			0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-			0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
-			0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
-			0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-			0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
-			0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
-			0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-			0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
-			0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
-			0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-			0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
-			0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
-			0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-			0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
-			0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
-			0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-			0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
-			0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
-			0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-			0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
-			0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
-			0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-			0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
-			0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
-			0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-			0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
-		}, {
-			0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
-			0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
-			0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-			0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
-			0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
-			0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-			0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
-			0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
-			0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-			0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
-			0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
-			0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-			0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
-			0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
-			0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-			0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
-			0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
-			0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-			0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
-			0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
-			0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-			0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
-			0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
-			0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-			0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
-			0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
-			0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-			0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
-			0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
-			0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-			0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
-			0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
-			0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-			0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
-			0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
-			0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-			0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
-			0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
-			0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-			0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
-			0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
-			0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-			0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
-			0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
-			0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-			0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
-			0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
-			0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-			0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
-			0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
-			0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-			0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
-			0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
-			0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-			0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
-			0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
-			0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-			0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
-			0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
-			0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-			0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
-			0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
-			0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-			0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
-		}, {
-			0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
-			0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
-			0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-			0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
-			0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
-			0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-			0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
-			0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
-			0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-			0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
-			0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
-			0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-			0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
-			0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
-			0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-			0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
-			0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
-			0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-			0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
-			0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
-			0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-			0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
-			0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
-			0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-			0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
-			0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
-			0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-			0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
-			0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
-			0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-			0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
-			0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
-			0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-			0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
-			0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
-			0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-			0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
-			0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
-			0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-			0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
-			0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
-			0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-			0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
-			0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
-			0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-			0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
-			0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
-			0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-			0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
-			0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
-			0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-			0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
-			0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
-			0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-			0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
-			0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
-			0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-			0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
-			0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
-			0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-			0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
-			0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
-			0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-			0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
-		}, {
-			0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
-			0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
-			0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-			0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
-			0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
-			0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-			0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
-			0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
-			0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-			0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
-			0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
-			0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-			0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
-			0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
-			0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-			0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
-			0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
-			0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-			0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
-			0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
-			0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-			0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
-			0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
-			0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-			0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
-			0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
-			0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-			0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
-			0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
-			0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-			0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
-			0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
-			0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-			0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
-			0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
-			0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-			0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
-			0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
-			0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-			0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
-			0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
-			0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-			0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
-			0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
-			0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-			0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
-			0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
-			0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-			0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
-			0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
-			0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-			0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
-			0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
-			0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-			0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
-			0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
-			0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-			0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
-			0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
-			0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-			0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
-			0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
-			0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-			0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
-		}
-	}, {
-		0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
-		0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
-		0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-		0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
-		0x9216d5d9, 0x8979fb1b
-	}
-};
-
-static unsigned char BF_itoa64[64 + 1] =
-	"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
-
-static unsigned char BF_atoi64[0x60] = {
-	64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 1,
-	54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 64, 64, 64, 64, 64,
-	64, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
-	17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 64, 64, 64, 64, 64,
-	64, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
-	43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 64, 64, 64, 64, 64
-};
-
-#define BF_safe_atoi64(dst, src) \
-{ \
-	tmp = (unsigned char)(src); \
-	if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
-	tmp = BF_atoi64[tmp]; \
-	if (tmp > 63) return -1; \
-	(dst) = tmp; \
-}
-
-static int BF_decode(BF_word *dst, const char *src, int size)
-{
-	unsigned char *dptr = (unsigned char *)dst;
-	unsigned char *end = dptr + size;
-	const unsigned char *sptr = (const unsigned char *)src;
-	unsigned int tmp, c1, c2, c3, c4;
-
-	do {
-		BF_safe_atoi64(c1, *sptr++);
-		BF_safe_atoi64(c2, *sptr++);
-		*dptr++ = (c1 << 2) | ((c2 & 0x30) >> 4);
-		if (dptr >= end) break;
-
-		BF_safe_atoi64(c3, *sptr++);
-		*dptr++ = ((c2 & 0x0F) << 4) | ((c3 & 0x3C) >> 2);
-		if (dptr >= end) break;
-
-		BF_safe_atoi64(c4, *sptr++);
-		*dptr++ = ((c3 & 0x03) << 6) | c4;
-	} while (dptr < end);
-
-	return 0;
-}
-
-static void BF_encode(char *dst, const BF_word *src, int size)
-{
-	const unsigned char *sptr = (const unsigned char *)src;
-	const unsigned char *end = sptr + size;
-	unsigned char *dptr = (unsigned char *)dst;
-	unsigned int c1, c2;
-
-	do {
-		c1 = *sptr++;
-		*dptr++ = BF_itoa64[c1 >> 2];
-		c1 = (c1 & 0x03) << 4;
-		if (sptr >= end) {
-			*dptr++ = BF_itoa64[c1];
-			break;
-		}
-
-		c2 = *sptr++;
-		c1 |= c2 >> 4;
-		*dptr++ = BF_itoa64[c1];
-		c1 = (c2 & 0x0f) << 2;
-		if (sptr >= end) {
-			*dptr++ = BF_itoa64[c1];
-			break;
-		}
-
-		c2 = *sptr++;
-		c1 |= c2 >> 6;
-		*dptr++ = BF_itoa64[c1];
-		*dptr++ = BF_itoa64[c2 & 0x3f];
-	} while (sptr < end);
-}
-
-static void BF_swap(BF_word *x, int count)
-{
-	static int endianness_check = 1;
-	char *is_little_endian = (char *)&endianness_check;
-	BF_word tmp;
-
-	if (*is_little_endian)
-	do {
-		tmp = *x;
-		tmp = (tmp << 16) | (tmp >> 16);
-		*x++ = ((tmp & 0x00FF00FF) << 8) | ((tmp >> 8) & 0x00FF00FF);
-	} while (--count);
-}
-
-#if BF_SCALE
-/* Architectures which can shift addresses left by 2 bits with no extra cost */
-#define BF_ROUND(L, R, N) \
-	tmp1 = L & 0xFF; \
-	tmp2 = L >> 8; \
-	tmp2 &= 0xFF; \
-	tmp3 = L >> 16; \
-	tmp3 &= 0xFF; \
-	tmp4 = L >> 24; \
-	tmp1 = data.ctx.S[3][tmp1]; \
-	tmp2 = data.ctx.S[2][tmp2]; \
-	tmp3 = data.ctx.S[1][tmp3]; \
-	tmp3 += data.ctx.S[0][tmp4]; \
-	tmp3 ^= tmp2; \
-	R ^= data.ctx.P[N + 1]; \
-	tmp3 += tmp1; \
-	R ^= tmp3;
-#else
-/* Architectures with no complicated addressing modes supported */
-#define BF_INDEX(S, i) \
-	(*((BF_word *)(((unsigned char *)S) + (i))))
-#define BF_ROUND(L, R, N) \
-	tmp1 = L & 0xFF; \
-	tmp1 <<= 2; \
-	tmp2 = L >> 6; \
-	tmp2 &= 0x3FC; \
-	tmp3 = L >> 14; \
-	tmp3 &= 0x3FC; \
-	tmp4 = L >> 22; \
-	tmp4 &= 0x3FC; \
-	tmp1 = BF_INDEX(data.ctx.S[3], tmp1); \
-	tmp2 = BF_INDEX(data.ctx.S[2], tmp2); \
-	tmp3 = BF_INDEX(data.ctx.S[1], tmp3); \
-	tmp3 += BF_INDEX(data.ctx.S[0], tmp4); \
-	tmp3 ^= tmp2; \
-	R ^= data.ctx.P[N + 1]; \
-	tmp3 += tmp1; \
-	R ^= tmp3;
-#endif
-
-/*
- * Encrypt one block, BF_N is hardcoded here.
- */
-#define BF_ENCRYPT \
-	L ^= data.ctx.P[0]; \
-	BF_ROUND(L, R, 0); \
-	BF_ROUND(R, L, 1); \
-	BF_ROUND(L, R, 2); \
-	BF_ROUND(R, L, 3); \
-	BF_ROUND(L, R, 4); \
-	BF_ROUND(R, L, 5); \
-	BF_ROUND(L, R, 6); \
-	BF_ROUND(R, L, 7); \
-	BF_ROUND(L, R, 8); \
-	BF_ROUND(R, L, 9); \
-	BF_ROUND(L, R, 10); \
-	BF_ROUND(R, L, 11); \
-	BF_ROUND(L, R, 12); \
-	BF_ROUND(R, L, 13); \
-	BF_ROUND(L, R, 14); \
-	BF_ROUND(R, L, 15); \
-	tmp4 = R; \
-	R = L; \
-	L = tmp4 ^ data.ctx.P[BF_N + 1];
-
-#if BF_ASM
-#define BF_body() \
-	_BF_body_r(&data.ctx);
-#else
-#define BF_body() \
-	L = R = 0; \
-	ptr = data.ctx.P; \
-	do { \
-		ptr += 2; \
-		BF_ENCRYPT; \
-		*(ptr - 2) = L; \
-		*(ptr - 1) = R; \
-	} while (ptr < &data.ctx.P[BF_N + 2]); \
-\
-	ptr = data.ctx.S[0]; \
-	do { \
-		ptr += 2; \
-		BF_ENCRYPT; \
-		*(ptr - 2) = L; \
-		*(ptr - 1) = R; \
-	} while (ptr < &data.ctx.S[3][0xFF]);
-#endif
-
-static void BF_set_key(const char *key, BF_key expanded, BF_key initial,
-    unsigned char flags)
-{
-	const char *ptr = key;
-	unsigned int bug, i, j;
-	BF_word safety, sign, diff, tmp[2];
-
-/*
- * There was a sign extension bug in older revisions of this function.  While
- * we would have liked to simply fix the bug and move on, we have to provide
- * a backwards compatibility feature (essentially the bug) for some systems and
- * a safety measure for some others.  The latter is needed because for certain
- * multiple inputs to the buggy algorithm there exist easily found inputs to
- * the correct algorithm that produce the same hash.  Thus, we optionally
- * deviate from the correct algorithm just enough to avoid such collisions.
- * While the bug itself affected the majority of passwords containing
- * characters with the 8th bit set (although only a percentage of those in a
- * collision-producing way), the anti-collision safety measure affects
- * only a subset of passwords containing the '\xff' character (not even all of
- * those passwords, just some of them).  This character is not found in valid
- * UTF-8 sequences and is rarely used in popular 8-bit character encodings.
- * Thus, the safety measure is unlikely to cause much annoyance, and is a
- * reasonable tradeoff to use when authenticating against existing hashes that
- * are not reliably known to have been computed with the correct algorithm.
- *
- * We use an approach that tries to minimize side-channel leaks of password
- * information - that is, we mostly use fixed-cost bitwise operations instead
- * of branches or table lookups.  (One conditional branch based on password
- * length remains.  It is not part of the bug aftermath, though, and is
- * difficult and possibly unreasonable to avoid given the use of C strings by
- * the caller, which results in similar timing leaks anyway.)
- *
- * For actual implementation, we set an array index in the variable "bug"
- * (0 means no bug, 1 means sign extension bug emulation) and a flag in the
- * variable "safety" (bit 16 is set when the safety measure is requested).
- * Valid combinations of settings are:
- *
- * Prefix "$2a$": bug = 0, safety = 0x10000
- * Prefix "$2b$": bug = 0, safety = 0
- * Prefix "$2x$": bug = 1, safety = 0
- * Prefix "$2y$": bug = 0, safety = 0
- */
-	bug = (unsigned int)flags & 1;
-	safety = ((BF_word)flags & 2) << 15;
-
-	sign = diff = 0;
-
-	for (i = 0; i < BF_N + 2; i++) {
-		tmp[0] = tmp[1] = 0;
-		for (j = 0; j < 4; j++) {
-			tmp[0] <<= 8;
-			tmp[0] |= (unsigned char)*ptr; /* correct */
-			tmp[1] <<= 8;
-			tmp[1] |= (BF_word_signed)(signed char)*ptr; /* bug */
-/*
- * Sign extension in the first char has no effect - nothing to overwrite yet,
- * and those extra 24 bits will be fully shifted out of the 32-bit word.  For
- * chars 2, 3, 4 in each four-char block, we set bit 7 of "sign" if sign
- * extension in tmp[1] occurs.  Once this flag is set, it remains set.
- */
-			if (j)
-				sign |= tmp[1] & 0x80;
-			if (!*ptr)
-				ptr = key;
-			else
-				ptr++;
-		}
-		diff |= tmp[0] ^ tmp[1]; /* Non-zero on any differences */
-
-		expanded[i] = tmp[bug];
-		initial[i] = BF_init_state.P[i] ^ tmp[bug];
-	}
-
-/*
- * At this point, "diff" is zero iff the correct and buggy algorithms produced
- * exactly the same result.  If so and if "sign" is non-zero, which indicates
- * that there was a non-benign sign extension, this means that we have a
- * collision between the correctly computed hash for this password and a set of
- * passwords that could be supplied to the buggy algorithm.  Our safety measure
- * is meant to protect from such many-buggy to one-correct collisions, by
- * deviating from the correct algorithm in such cases.  Let's check for this.
- */
-	diff |= diff >> 16; /* still zero iff exact match */
-	diff &= 0xffff; /* ditto */
-	diff += 0xffff; /* bit 16 set iff "diff" was non-zero (on non-match) */
-	sign <<= 9; /* move the non-benign sign extension flag to bit 16 */
-	sign &= ~diff & safety; /* action needed? */
-
-/*
- * If we have determined that we need to deviate from the correct algorithm,
- * flip bit 16 in initial expanded key.  (The choice of 16 is arbitrary, but
- * let's stick to it now.  It came out of the approach we used above, and it's
- * not any worse than any other choice we could make.)
- *
- * It is crucial that we don't do the same to the expanded key used in the main
- * Eksblowfish loop.  By doing it to only one of these two, we deviate from a
- * state that could be directly specified by a password to the buggy algorithm
- * (and to the fully correct one as well, but that's a side-effect).
- */
-	initial[0] ^= sign;
-}
-
-static const unsigned char flags_by_subtype[26] =
-	{2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 4, 0};
-
-static char *BF_crypt(const char *key, const char *setting,
-	char *output, int size,
-	BF_word min)
-{
-#if BF_ASM
-	extern void _BF_body_r(BF_ctx *ctx);
-#endif
-	struct {
-		BF_ctx ctx;
-		BF_key expanded_key;
-		union {
-			BF_word salt[4];
-			BF_word output[6];
-		} binary;
-	} data;
-	BF_word L, R;
-	BF_word tmp1, tmp2, tmp3, tmp4;
-	BF_word *ptr;
-	BF_word count;
-	int i;
-
-	if (size < 7 + 22 + 31 + 1) {
-		__set_errno(ERANGE);
-		return NULL;
-	}
-
-	if (setting[0] != '$' ||
-	    setting[1] != '2' ||
-	    setting[2] < 'a' || setting[2] > 'z' ||
-	    !flags_by_subtype[(unsigned int)(unsigned char)setting[2] - 'a'] ||
-	    setting[3] != '$' ||
-	    setting[4] < '0' || setting[4] > '3' ||
-	    setting[5] < '0' || setting[5] > '9' ||
-	    (setting[4] == '3' && setting[5] > '1') ||
-	    setting[6] != '$') {
-		__set_errno(EINVAL);
-		return NULL;
-	}
-
-	count = (BF_word)1 << ((setting[4] - '0') * 10 + (setting[5] - '0'));
-	if (count < min || BF_decode(data.binary.salt, &setting[7], 16)) {
-		__set_errno(EINVAL);
-		return NULL;
-	}
-	BF_swap(data.binary.salt, 4);
-
-	BF_set_key(key, data.expanded_key, data.ctx.P,
-	    flags_by_subtype[(unsigned int)(unsigned char)setting[2] - 'a']);
-
-	memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S));
-
-	L = R = 0;
-	for (i = 0; i < BF_N + 2; i += 2) {
-		L ^= data.binary.salt[i & 2];
-		R ^= data.binary.salt[(i & 2) + 1];
-		BF_ENCRYPT;
-		data.ctx.P[i] = L;
-		data.ctx.P[i + 1] = R;
-	}
-
-	ptr = data.ctx.S[0];
-	do {
-		ptr += 4;
-		L ^= data.binary.salt[(BF_N + 2) & 3];
-		R ^= data.binary.salt[(BF_N + 3) & 3];
-		BF_ENCRYPT;
-		*(ptr - 4) = L;
-		*(ptr - 3) = R;
-
-		L ^= data.binary.salt[(BF_N + 4) & 3];
-		R ^= data.binary.salt[(BF_N + 5) & 3];
-		BF_ENCRYPT;
-		*(ptr - 2) = L;
-		*(ptr - 1) = R;
-	} while (ptr < &data.ctx.S[3][0xFF]);
-
-	do {
-		int done;
-
-		for (i = 0; i < BF_N + 2; i += 2) {
-			data.ctx.P[i] ^= data.expanded_key[i];
-			data.ctx.P[i + 1] ^= data.expanded_key[i + 1];
-		}
-
-		done = 0;
-		do {
-			BF_body();
-			if (done)
-				break;
-			done = 1;
-
-			tmp1 = data.binary.salt[0];
-			tmp2 = data.binary.salt[1];
-			tmp3 = data.binary.salt[2];
-			tmp4 = data.binary.salt[3];
-			for (i = 0; i < BF_N; i += 4) {
-				data.ctx.P[i] ^= tmp1;
-				data.ctx.P[i + 1] ^= tmp2;
-				data.ctx.P[i + 2] ^= tmp3;
-				data.ctx.P[i + 3] ^= tmp4;
-			}
-			data.ctx.P[16] ^= tmp1;
-			data.ctx.P[17] ^= tmp2;
-		} while (1);
-	} while (--count);
-
-	for (i = 0; i < 6; i += 2) {
-		L = BF_magic_w[i];
-		R = BF_magic_w[i + 1];
-
-		count = 64;
-		do {
-			BF_ENCRYPT;
-		} while (--count);
-
-		data.binary.output[i] = L;
-		data.binary.output[i + 1] = R;
-	}
-
-	memcpy(output, setting, 7 + 22 - 1);
-	output[7 + 22 - 1] = BF_itoa64[(int)
-		BF_atoi64[(int)setting[7 + 22 - 1] - 0x20] & 0x30];
-
-/* This has to be bug-compatible with the original implementation, so
- * only encode 23 of the 24 bytes. :-) */
-	BF_swap(data.binary.output, 6);
-	BF_encode(&output[7 + 22], data.binary.output, 23);
-	output[7 + 22 + 31] = '\0';
-
-	return output;
-}
-
-int _crypt_output_magic(const char *setting, char *output, int size)
-{
-	if (size < 3)
-		return -1;
-
-	output[0] = '*';
-	output[1] = '0';
-	output[2] = '\0';
-
-	if (setting[0] == '*' && setting[1] == '0')
-		output[1] = '1';
-
-	return 0;
-}
-
-/*
- * Please preserve the runtime self-test.  It serves two purposes at once:
- *
- * 1. We really can't afford the risk of producing incompatible hashes e.g.
- * when there's something like gcc bug 26587 again, whereas an application or
- * library integrating this code might not also integrate our external tests or
- * it might not run them after every build.  Even if it does, the miscompile
- * might only occur on the production build, but not on a testing build (such
- * as because of different optimization settings).  It is painful to recover
- * from incorrectly-computed hashes - merely fixing whatever broke is not
- * enough.  Thus, a proactive measure like this self-test is needed.
- *
- * 2. We don't want to leave sensitive data from our actual password hash
- * computation on the stack or in registers.  Previous revisions of the code
- * would do explicit cleanups, but simply running the self-test after hash
- * computation is more reliable.
- *
- * The performance cost of this quick self-test is around 0.6% at the "$2a$08"
- * setting.
- */
-char *_crypt_blowfish_rn(const char *key, const char *setting,
-	char *output, int size)
-{
-	const char *test_key = "8b \xd0\xc1\xd2\xcf\xcc\xd8";
-	const char *test_setting = "$2a$00$abcdefghijklmnopqrstuu";
-	static const char * const test_hashes[2] =
-		{"i1D709vfamulimlGcq0qq3UvuUasvEa\0\x55", /* 'a', 'b', 'y' */
-		"VUrPmXD6q/nVSSp7pNDhCR9071IfIRe\0\x55"}; /* 'x' */
-	const char *test_hash = test_hashes[0];
-	char *retval;
-	const char *p;
-	int save_errno, ok;
-	struct {
-		char s[7 + 22 + 1];
-		char o[7 + 22 + 31 + 1 + 1 + 1];
-	} buf;
-
-/* Hash the supplied password */
-	_crypt_output_magic(setting, output, size);
-	retval = BF_crypt(key, setting, output, size, 16);
-	save_errno = errno;
-
-/*
- * Do a quick self-test.  It is important that we make both calls to BF_crypt()
- * from the same scope such that they likely use the same stack locations,
- * which makes the second call overwrite the first call's sensitive data on the
- * stack and makes it more likely that any alignment related issues would be
- * detected by the self-test.
- */
-	memcpy(buf.s, test_setting, sizeof(buf.s));
-	if (retval) {
-		unsigned int flags = flags_by_subtype[
-		    (unsigned int)(unsigned char)setting[2] - 'a'];
-		test_hash = test_hashes[flags & 1];
-		buf.s[2] = setting[2];
-	}
-	memset(buf.o, 0x55, sizeof(buf.o));
-	buf.o[sizeof(buf.o) - 1] = 0;
-	p = BF_crypt(test_key, buf.s, buf.o, sizeof(buf.o) - (1 + 1), 1);
-
-	ok = (p == buf.o &&
-	    !memcmp(p, buf.s, 7 + 22) &&
-	    !memcmp(p + (7 + 22), test_hash, 31 + 1 + 1 + 1));
-
-	{
-		const char *k = "\xff\xa3" "34" "\xff\xff\xff\xa3" "345";
-		BF_key ae, ai, ye, yi;
-		BF_set_key(k, ae, ai, 2); /* $2a$ */
-		BF_set_key(k, ye, yi, 4); /* $2y$ */
-		ai[0] ^= 0x10000; /* undo the safety (for comparison) */
-		ok = ok && ai[0] == 0xdb9c59bc && ye[17] == 0x33343500 &&
-		    !memcmp(ae, ye, sizeof(ae)) &&
-		    !memcmp(ai, yi, sizeof(ai));
-	}
-
-	__set_errno(save_errno);
-	if (ok)
-		return retval;
-
-/* Should not happen */
-	_crypt_output_magic(setting, output, size);
-	__set_errno(EINVAL); /* pretend we don't support this hash type */
-	return NULL;
-}
-
-char *_crypt_gensalt_blowfish_rn(const char *prefix, unsigned long count,
-	const char *input, int size, char *output, int output_size)
-{
-	if (size < 16 || output_size < 7 + 22 + 1 ||
-	    (count && (count < 4 || count > 31)) ||
-	    prefix[0] != '$' || prefix[1] != '2' ||
-	    (prefix[2] != 'a' && prefix[2] != 'b' && prefix[2] != 'y')) {
-		if (output_size > 0) output[0] = '\0';
-		__set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL);
-		return NULL;
-	}
-
-	if (!count) count = 5;
-
-	output[0] = '$';
-	output[1] = '2';
-	output[2] = prefix[2];
-	output[3] = '$';
-	output[4] = '0' + count / 10;
-	output[5] = '0' + count % 10;
-	output[6] = '$';
-
-	BF_encode(&output[7], (const BF_word *)input, 16);
-	output[7 + 22] = '\0';
-
-	return output;
-}
+/*
+ * The crypt_blowfish homepage is:
+ *
+ *	http://www.openwall.com/crypt/
+ *
+ * This code comes from John the Ripper password cracker, with reentrant
+ * and crypt(3) interfaces added, but optimizations specific to password
+ * cracking removed.
+ *
+ * Written by Solar Designer <solar at openwall.com> in 1998-2014.
+ * No copyright is claimed, and the software is hereby placed in the public
+ * domain.  In case this attempt to disclaim copyright and place the software
+ * in the public domain is deemed null and void, then the software is
+ * Copyright (c) 1998-2014 Solar Designer and it is hereby released to the
+ * general public under the following terms:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ *
+ * It is my intent that you should be able to use this on your system,
+ * as part of a software package, or anywhere else to improve security,
+ * ensure compatibility, or for any other purpose.  I would appreciate
+ * it if you give credit where it is due and keep your modifications in
+ * the public domain as well, but I don't require that in order to let
+ * you place this code and any modifications you make under a license
+ * of your choice.
+ *
+ * This implementation is fully compatible with OpenBSD's bcrypt.c for prefix
+ * "$2b$", originally by Niels Provos <provos at citi.umich.edu>, and it uses
+ * some of his ideas.  The password hashing algorithm was designed by David
+ * Mazieres <dm at lcs.mit.edu>.  For information on the level of
+ * compatibility for bcrypt hash prefixes other than "$2b$", please refer to
+ * the comments in BF_set_key() below and to the included crypt(3) man page.
+ *
+ * There's a paper on the algorithm that explains its design decisions:
+ *
+ *	http://www.usenix.org/events/usenix99/provos.html
+ *
+ * Some of the tricks in BF_ROUND might be inspired by Eric Young's
+ * Blowfish library (I can't be sure if I would think of something if I
+ * hadn't seen his code).
+ */
+
+#include <string.h>
+
+#include <errno.h>
+#ifndef __set_errno
+#define __set_errno(val) errno = (val)
+#endif
+
+/* Just to make sure the prototypes match the actual definitions */
+#ifdef _WIN32 || _WIN64
+#include "../include/bcrypt/crypt_blowfish.h"
+#else
+#include "crypt_blowfish.h"
+#endif
+
+#ifdef __i386__
+#define BF_ASM				1
+#define BF_SCALE			1
+#elif defined(__x86_64__) || defined(__alpha__) || defined(__hppa__)
+#define BF_ASM				0
+#define BF_SCALE			1
+#else
+#define BF_ASM				0
+#define BF_SCALE			0
+#endif
+
+typedef unsigned int BF_word;
+typedef signed int BF_word_signed;
+
+/* Number of Blowfish rounds, this is also hardcoded into a few places */
+#define BF_N				16
+
+typedef BF_word BF_key[BF_N + 2];
+
+typedef struct {
+	BF_word S[4][0x100];
+	BF_key P;
+} BF_ctx;
+
+/*
+ * Magic IV for 64 Blowfish encryptions that we do at the end.
+ * The string is "OrpheanBeholderScryDoubt" on big-endian.
+ */
+static BF_word BF_magic_w[6] = {
+	0x4F727068, 0x65616E42, 0x65686F6C,
+	0x64657253, 0x63727944, 0x6F756274
+};
+
+/*
+ * P-box and S-box tables initialized with digits of Pi.
+ */
+static BF_ctx BF_init_state = {
+	{
+		{
+			0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7,
+			0xb8e1afed, 0x6a267e96, 0xba7c9045, 0xf12c7f99,
+			0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
+			0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e,
+			0x0d95748f, 0x728eb658, 0x718bcd58, 0x82154aee,
+			0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
+			0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef,
+			0x8e79dcb0, 0x603a180e, 0x6c9e0e8b, 0xb01e8a3e,
+			0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
+			0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440,
+			0x55ca396a, 0x2aab10b6, 0xb4cc5c34, 0x1141e8ce,
+			0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
+			0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e,
+			0xafd6ba33, 0x6c24cf5c, 0x7a325381, 0x28958677,
+			0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
+			0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032,
+			0xef845d5d, 0xe98575b1, 0xdc262302, 0xeb651b88,
+			0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
+			0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e,
+			0x21c66842, 0xf6e96c9a, 0x670c9c61, 0xabd388f0,
+			0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
+			0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98,
+			0xa1f1651d, 0x39af0176, 0x66ca593e, 0x82430e88,
+			0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
+			0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6,
+			0x4ed3aa62, 0x363f7706, 0x1bfedf72, 0x429b023d,
+			0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
+			0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7,
+			0xe3fe501a, 0xb6794c3b, 0x976ce0bd, 0x04c006ba,
+			0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
+			0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f,
+			0x6dfc511f, 0x9b30952c, 0xcc814544, 0xaf5ebd09,
+			0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
+			0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb,
+			0x5579c0bd, 0x1a60320a, 0xd6a100c6, 0x402c7279,
+			0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
+			0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab,
+			0x323db5fa, 0xfd238760, 0x53317b48, 0x3e00df82,
+			0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
+			0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573,
+			0x695b27b0, 0xbbca58c8, 0xe1ffa35d, 0xb8f011a0,
+			0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
+			0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790,
+			0xe1ddf2da, 0xa4cb7e33, 0x62fb1341, 0xcee4c6e8,
+			0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
+			0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0,
+			0xd08ed1d0, 0xafc725e0, 0x8e3c5b2f, 0x8e7594b7,
+			0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
+			0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad,
+			0x2f2f2218, 0xbe0e1777, 0xea752dfe, 0x8b021fa1,
+			0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
+			0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9,
+			0x165fa266, 0x80957705, 0x93cc7314, 0x211a1477,
+			0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
+			0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49,
+			0x00250e2d, 0x2071b35e, 0x226800bb, 0x57b8e0af,
+			0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
+			0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5,
+			0x83260376, 0x6295cfa9, 0x11c81968, 0x4e734a41,
+			0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
+			0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400,
+			0x08ba6fb5, 0x571be91f, 0xf296ec6b, 0x2a0dd915,
+			0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
+			0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a
+		}, {
+			0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623,
+			0xad6ea6b0, 0x49a7df7d, 0x9cee60b8, 0x8fedb266,
+			0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
+			0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e,
+			0x3f54989a, 0x5b429d65, 0x6b8fe4d6, 0x99f73fd6,
+			0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
+			0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e,
+			0x09686b3f, 0x3ebaefc9, 0x3c971814, 0x6b6a70a1,
+			0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
+			0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8,
+			0xb03ada37, 0xf0500c0d, 0xf01c1f04, 0x0200b3ff,
+			0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
+			0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701,
+			0x3ae5e581, 0x37c2dadc, 0xc8b57634, 0x9af3dda7,
+			0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
+			0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331,
+			0x4e548b38, 0x4f6db908, 0x6f420d03, 0xf60a04bf,
+			0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
+			0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e,
+			0x5512721f, 0x2e6b7124, 0x501adde6, 0x9f84cd87,
+			0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
+			0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2,
+			0xef1c1847, 0x3215d908, 0xdd433b37, 0x24c2ba16,
+			0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
+			0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b,
+			0x043556f1, 0xd7a3c76b, 0x3c11183b, 0x5924a509,
+			0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
+			0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3,
+			0x771fe71c, 0x4e3d06fa, 0x2965dcb9, 0x99e71d0f,
+			0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
+			0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4,
+			0xf2f74ea7, 0x361d2b3d, 0x1939260f, 0x19c27960,
+			0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
+			0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28,
+			0xc332ddef, 0xbe6c5aa5, 0x65582185, 0x68ab9802,
+			0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
+			0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510,
+			0x13cca830, 0xeb61bd96, 0x0334fe1e, 0xaa0363cf,
+			0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
+			0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e,
+			0x648b1eaf, 0x19bdf0ca, 0xa02369b9, 0x655abb50,
+			0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
+			0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8,
+			0xf837889a, 0x97e32d77, 0x11ed935f, 0x16681281,
+			0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
+			0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696,
+			0xcdb30aeb, 0x532e3054, 0x8fd948e4, 0x6dbc3128,
+			0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
+			0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0,
+			0x45eee2b6, 0xa3aaabea, 0xdb6c4f15, 0xfacb4fd0,
+			0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
+			0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250,
+			0xcf62a1f2, 0x5b8d2646, 0xfc8883a0, 0xc1c7b6a3,
+			0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
+			0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00,
+			0x58428d2a, 0x0c55f5ea, 0x1dadf43e, 0x233f7061,
+			0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
+			0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e,
+			0xa6078084, 0x19f8509e, 0xe8efd855, 0x61d99735,
+			0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
+			0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9,
+			0xdb73dbd3, 0x105588cd, 0x675fda79, 0xe3674340,
+			0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
+			0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7
+		}, {
+			0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934,
+			0x411520f7, 0x7602d4f7, 0xbcf46b2e, 0xd4a20068,
+			0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
+			0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840,
+			0x4d95fc1d, 0x96b591af, 0x70f4ddd3, 0x66a02f45,
+			0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
+			0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a,
+			0x28507825, 0x530429f4, 0x0a2c86da, 0xe9b66dfb,
+			0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
+			0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6,
+			0xaace1e7c, 0xd3375fec, 0xce78a399, 0x406b2a42,
+			0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
+			0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2,
+			0x3a6efa74, 0xdd5b4332, 0x6841e7f7, 0xca7820fb,
+			0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
+			0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b,
+			0x55a867bc, 0xa1159a58, 0xcca92963, 0x99e1db33,
+			0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
+			0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3,
+			0x95c11548, 0xe4c66d22, 0x48c1133f, 0xc70f86dc,
+			0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
+			0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564,
+			0x257b7834, 0x602a9c60, 0xdff8e8a3, 0x1f636c1b,
+			0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
+			0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922,
+			0x85b2a20e, 0xe6ba0d99, 0xde720c8c, 0x2da2f728,
+			0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
+			0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e,
+			0x0a476341, 0x992eff74, 0x3a6f6eab, 0xf4f8fd37,
+			0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
+			0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804,
+			0xf1290dc7, 0xcc00ffa3, 0xb5390f92, 0x690fed0b,
+			0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
+			0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb,
+			0x37392eb3, 0xcc115979, 0x8026e297, 0xf42e312d,
+			0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
+			0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350,
+			0x1a6b1018, 0x11caedfa, 0x3d25bdd8, 0xe2e1c3c9,
+			0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
+			0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe,
+			0x9dbc8057, 0xf0f7c086, 0x60787bf8, 0x6003604d,
+			0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
+			0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f,
+			0x77a057be, 0xbde8ae24, 0x55464299, 0xbf582e61,
+			0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
+			0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9,
+			0x7aeb2661, 0x8b1ddf84, 0x846a0e79, 0x915f95e2,
+			0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
+			0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e,
+			0xb77f19b6, 0xe0a9dc09, 0x662d09a1, 0xc4324633,
+			0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
+			0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169,
+			0xdcb7da83, 0x573906fe, 0xa1e2ce9b, 0x4fcd7f52,
+			0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
+			0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5,
+			0xf0177a28, 0xc0f586e0, 0x006058aa, 0x30dc7d62,
+			0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
+			0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76,
+			0x6f05e409, 0x4b7c0188, 0x39720a3d, 0x7c927c24,
+			0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
+			0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4,
+			0x1e50ef5e, 0xb161e6f8, 0xa28514d9, 0x6c51133c,
+			0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
+			0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0
+		}, {
+			0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b,
+			0x5cb0679e, 0x4fa33742, 0xd3822740, 0x99bc9bbe,
+			0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
+			0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4,
+			0x5748ab2f, 0xbc946e79, 0xc6a376d2, 0x6549c2c8,
+			0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
+			0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304,
+			0xa1fad5f0, 0x6a2d519a, 0x63ef8ce2, 0x9a86ee22,
+			0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
+			0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6,
+			0x2826a2f9, 0xa73a3ae1, 0x4ba99586, 0xef5562e9,
+			0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
+			0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593,
+			0xe990fd5a, 0x9e34d797, 0x2cf0b7d9, 0x022b8b51,
+			0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
+			0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c,
+			0xe029ac71, 0xe019a5e6, 0x47b0acfd, 0xed93fa9b,
+			0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
+			0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c,
+			0x15056dd4, 0x88f46dba, 0x03a16125, 0x0564f0bd,
+			0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
+			0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319,
+			0x7533d928, 0xb155fdf5, 0x03563482, 0x8aba3cbb,
+			0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
+			0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991,
+			0xea7a90c2, 0xfb3e7bce, 0x5121ce64, 0x774fbe32,
+			0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
+			0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166,
+			0xb39a460a, 0x6445c0dd, 0x586cdecf, 0x1c20c8ae,
+			0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
+			0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5,
+			0x72eacea8, 0xfa6484bb, 0x8d6612ae, 0xbf3c6f47,
+			0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
+			0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d,
+			0x4040cb08, 0x4eb4e2cc, 0x34d2466a, 0x0115af84,
+			0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
+			0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8,
+			0x611560b1, 0xe7933fdc, 0xbb3a792b, 0x344525bd,
+			0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
+			0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7,
+			0x1a908749, 0xd44fbd9a, 0xd0dadecb, 0xd50ada38,
+			0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
+			0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c,
+			0xbf97222c, 0x15e6fc2a, 0x0f91fc71, 0x9b941525,
+			0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
+			0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442,
+			0xe0ec6e0e, 0x1698db3b, 0x4c98a0be, 0x3278e964,
+			0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
+			0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8,
+			0xdf359f8d, 0x9b992f2e, 0xe60b6f47, 0x0fe3f11d,
+			0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
+			0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299,
+			0xf523f357, 0xa6327623, 0x93a83531, 0x56cccd02,
+			0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
+			0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614,
+			0xe6c6c7bd, 0x327a140a, 0x45e1d006, 0xc3f27b9a,
+			0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
+			0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b,
+			0x53113ec0, 0x1640e3d3, 0x38abbd60, 0x2547adf0,
+			0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
+			0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e,
+			0x1948c25c, 0x02fb8a8c, 0x01c36ae4, 0xd6ebe1f9,
+			0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
+			0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6
+		}
+	}, {
+		0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344,
+		0xa4093822, 0x299f31d0, 0x082efa98, 0xec4e6c89,
+		0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
+		0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917,
+		0x9216d5d9, 0x8979fb1b
+	}
+};
+
+static unsigned char BF_itoa64[64 + 1] =
+	"./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+
+static unsigned char BF_atoi64[0x60] = {
+	64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 64, 0, 1,
+	54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 64, 64, 64, 64, 64,
+	64, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
+	17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 64, 64, 64, 64, 64,
+	64, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42,
+	43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 64, 64, 64, 64, 64
+};
+
+#define BF_safe_atoi64(dst, src) \
+{ \
+	tmp = (unsigned char)(src); \
+	if ((unsigned int)(tmp -= 0x20) >= 0x60) return -1; \
+	tmp = BF_atoi64[tmp]; \
+	if (tmp > 63) return -1; \
+	(dst) = tmp; \
+}
+
+static int BF_decode(BF_word *dst, const char *src, int size)
+{
+	unsigned char *dptr = (unsigned char *)dst;
+	unsigned char *end = dptr + size;
+	const unsigned char *sptr = (const unsigned char *)src;
+	unsigned int tmp, c1, c2, c3, c4;
+
+	do {
+		BF_safe_atoi64(c1, *sptr++);
+		BF_safe_atoi64(c2, *sptr++);
+		*dptr++ = (c1 << 2) | ((c2 & 0x30) >> 4);
+		if (dptr >= end) break;
+
+		BF_safe_atoi64(c3, *sptr++);
+		*dptr++ = ((c2 & 0x0F) << 4) | ((c3 & 0x3C) >> 2);
+		if (dptr >= end) break;
+
+		BF_safe_atoi64(c4, *sptr++);
+		*dptr++ = ((c3 & 0x03) << 6) | c4;
+	} while (dptr < end);
+
+	return 0;
+}
+
+static void BF_encode(char *dst, const BF_word *src, int size)
+{
+	const unsigned char *sptr = (const unsigned char *)src;
+	const unsigned char *end = sptr + size;
+	unsigned char *dptr = (unsigned char *)dst;
+	unsigned int c1, c2;
+
+	do {
+		c1 = *sptr++;
+		*dptr++ = BF_itoa64[c1 >> 2];
+		c1 = (c1 & 0x03) << 4;
+		if (sptr >= end) {
+			*dptr++ = BF_itoa64[c1];
+			break;
+		}
+
+		c2 = *sptr++;
+		c1 |= c2 >> 4;
+		*dptr++ = BF_itoa64[c1];
+		c1 = (c2 & 0x0f) << 2;
+		if (sptr >= end) {
+			*dptr++ = BF_itoa64[c1];
+			break;
+		}
+
+		c2 = *sptr++;
+		c1 |= c2 >> 6;
+		*dptr++ = BF_itoa64[c1];
+		*dptr++ = BF_itoa64[c2 & 0x3f];
+	} while (sptr < end);
+}
+
+static void BF_swap(BF_word *x, int count)
+{
+	static int endianness_check = 1;
+	char *is_little_endian = (char *)&endianness_check;
+	BF_word tmp;
+
+	if (*is_little_endian)
+	do {
+		tmp = *x;
+		tmp = (tmp << 16) | (tmp >> 16);
+		*x++ = ((tmp & 0x00FF00FF) << 8) | ((tmp >> 8) & 0x00FF00FF);
+	} while (--count);
+}
+
+#if BF_SCALE
+/* Architectures which can shift addresses left by 2 bits with no extra cost */
+#define BF_ROUND(L, R, N) \
+	tmp1 = L & 0xFF; \
+	tmp2 = L >> 8; \
+	tmp2 &= 0xFF; \
+	tmp3 = L >> 16; \
+	tmp3 &= 0xFF; \
+	tmp4 = L >> 24; \
+	tmp1 = data.ctx.S[3][tmp1]; \
+	tmp2 = data.ctx.S[2][tmp2]; \
+	tmp3 = data.ctx.S[1][tmp3]; \
+	tmp3 += data.ctx.S[0][tmp4]; \
+	tmp3 ^= tmp2; \
+	R ^= data.ctx.P[N + 1]; \
+	tmp3 += tmp1; \
+	R ^= tmp3;
+#else
+/* Architectures with no complicated addressing modes supported */
+#define BF_INDEX(S, i) \
+	(*((BF_word *)(((unsigned char *)S) + (i))))
+#define BF_ROUND(L, R, N) \
+	tmp1 = L & 0xFF; \
+	tmp1 <<= 2; \
+	tmp2 = L >> 6; \
+	tmp2 &= 0x3FC; \
+	tmp3 = L >> 14; \
+	tmp3 &= 0x3FC; \
+	tmp4 = L >> 22; \
+	tmp4 &= 0x3FC; \
+	tmp1 = BF_INDEX(data.ctx.S[3], tmp1); \
+	tmp2 = BF_INDEX(data.ctx.S[2], tmp2); \
+	tmp3 = BF_INDEX(data.ctx.S[1], tmp3); \
+	tmp3 += BF_INDEX(data.ctx.S[0], tmp4); \
+	tmp3 ^= tmp2; \
+	R ^= data.ctx.P[N + 1]; \
+	tmp3 += tmp1; \
+	R ^= tmp3;
+#endif
+
+/*
+ * Encrypt one block, BF_N is hardcoded here.
+ */
+#define BF_ENCRYPT \
+	L ^= data.ctx.P[0]; \
+	BF_ROUND(L, R, 0); \
+	BF_ROUND(R, L, 1); \
+	BF_ROUND(L, R, 2); \
+	BF_ROUND(R, L, 3); \
+	BF_ROUND(L, R, 4); \
+	BF_ROUND(R, L, 5); \
+	BF_ROUND(L, R, 6); \
+	BF_ROUND(R, L, 7); \
+	BF_ROUND(L, R, 8); \
+	BF_ROUND(R, L, 9); \
+	BF_ROUND(L, R, 10); \
+	BF_ROUND(R, L, 11); \
+	BF_ROUND(L, R, 12); \
+	BF_ROUND(R, L, 13); \
+	BF_ROUND(L, R, 14); \
+	BF_ROUND(R, L, 15); \
+	tmp4 = R; \
+	R = L; \
+	L = tmp4 ^ data.ctx.P[BF_N + 1];
+
+#if BF_ASM
+#define BF_body() \
+	_BF_body_r(&data.ctx);
+#else
+#define BF_body() \
+	L = R = 0; \
+	ptr = data.ctx.P; \
+	do { \
+		ptr += 2; \
+		BF_ENCRYPT; \
+		*(ptr - 2) = L; \
+		*(ptr - 1) = R; \
+	} while (ptr < &data.ctx.P[BF_N + 2]); \
+\
+	ptr = data.ctx.S[0]; \
+	do { \
+		ptr += 2; \
+		BF_ENCRYPT; \
+		*(ptr - 2) = L; \
+		*(ptr - 1) = R; \
+	} while (ptr < &data.ctx.S[3][0xFF]);
+#endif
+
+static void BF_set_key(const char *key, BF_key expanded, BF_key initial,
+    unsigned char flags)
+{
+	const char *ptr = key;
+	unsigned int bug, i, j;
+	BF_word safety, sign, diff, tmp[2];
+
+/*
+ * There was a sign extension bug in older revisions of this function.  While
+ * we would have liked to simply fix the bug and move on, we have to provide
+ * a backwards compatibility feature (essentially the bug) for some systems and
+ * a safety measure for some others.  The latter is needed because for certain
+ * multiple inputs to the buggy algorithm there exist easily found inputs to
+ * the correct algorithm that produce the same hash.  Thus, we optionally
+ * deviate from the correct algorithm just enough to avoid such collisions.
+ * While the bug itself affected the majority of passwords containing
+ * characters with the 8th bit set (although only a percentage of those in a
+ * collision-producing way), the anti-collision safety measure affects
+ * only a subset of passwords containing the '\xff' character (not even all of
+ * those passwords, just some of them).  This character is not found in valid
+ * UTF-8 sequences and is rarely used in popular 8-bit character encodings.
+ * Thus, the safety measure is unlikely to cause much annoyance, and is a
+ * reasonable tradeoff to use when authenticating against existing hashes that
+ * are not reliably known to have been computed with the correct algorithm.
+ *
+ * We use an approach that tries to minimize side-channel leaks of password
+ * information - that is, we mostly use fixed-cost bitwise operations instead
+ * of branches or table lookups.  (One conditional branch based on password
+ * length remains.  It is not part of the bug aftermath, though, and is
+ * difficult and possibly unreasonable to avoid given the use of C strings by
+ * the caller, which results in similar timing leaks anyway.)
+ *
+ * For actual implementation, we set an array index in the variable "bug"
+ * (0 means no bug, 1 means sign extension bug emulation) and a flag in the
+ * variable "safety" (bit 16 is set when the safety measure is requested).
+ * Valid combinations of settings are:
+ *
+ * Prefix "$2a$": bug = 0, safety = 0x10000
+ * Prefix "$2b$": bug = 0, safety = 0
+ * Prefix "$2x$": bug = 1, safety = 0
+ * Prefix "$2y$": bug = 0, safety = 0
+ */
+	bug = (unsigned int)flags & 1;
+	safety = ((BF_word)flags & 2) << 15;
+
+	sign = diff = 0;
+
+	for (i = 0; i < BF_N + 2; i++) {
+		tmp[0] = tmp[1] = 0;
+		for (j = 0; j < 4; j++) {
+			tmp[0] <<= 8;
+			tmp[0] |= (unsigned char)*ptr; /* correct */
+			tmp[1] <<= 8;
+			tmp[1] |= (BF_word_signed)(signed char)*ptr; /* bug */
+/*
+ * Sign extension in the first char has no effect - nothing to overwrite yet,
+ * and those extra 24 bits will be fully shifted out of the 32-bit word.  For
+ * chars 2, 3, 4 in each four-char block, we set bit 7 of "sign" if sign
+ * extension in tmp[1] occurs.  Once this flag is set, it remains set.
+ */
+			if (j)
+				sign |= tmp[1] & 0x80;
+			if (!*ptr)
+				ptr = key;
+			else
+				ptr++;
+		}
+		diff |= tmp[0] ^ tmp[1]; /* Non-zero on any differences */
+
+		expanded[i] = tmp[bug];
+		initial[i] = BF_init_state.P[i] ^ tmp[bug];
+	}
+
+/*
+ * At this point, "diff" is zero iff the correct and buggy algorithms produced
+ * exactly the same result.  If so and if "sign" is non-zero, which indicates
+ * that there was a non-benign sign extension, this means that we have a
+ * collision between the correctly computed hash for this password and a set of
+ * passwords that could be supplied to the buggy algorithm.  Our safety measure
+ * is meant to protect from such many-buggy to one-correct collisions, by
+ * deviating from the correct algorithm in such cases.  Let's check for this.
+ */
+	diff |= diff >> 16; /* still zero iff exact match */
+	diff &= 0xffff; /* ditto */
+	diff += 0xffff; /* bit 16 set iff "diff" was non-zero (on non-match) */
+	sign <<= 9; /* move the non-benign sign extension flag to bit 16 */
+	sign &= ~diff & safety; /* action needed? */
+
+/*
+ * If we have determined that we need to deviate from the correct algorithm,
+ * flip bit 16 in initial expanded key.  (The choice of 16 is arbitrary, but
+ * let's stick to it now.  It came out of the approach we used above, and it's
+ * not any worse than any other choice we could make.)
+ *
+ * It is crucial that we don't do the same to the expanded key used in the main
+ * Eksblowfish loop.  By doing it to only one of these two, we deviate from a
+ * state that could be directly specified by a password to the buggy algorithm
+ * (and to the fully correct one as well, but that's a side-effect).
+ */
+	initial[0] ^= sign;
+}
+
+static const unsigned char flags_by_subtype[26] =
+	{2, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+	0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 4, 0};
+
+static char *BF_crypt(const char *key, const char *setting,
+	char *output, int size,
+	BF_word min)
+{
+#if BF_ASM
+	extern void _BF_body_r(BF_ctx *ctx);
+#endif
+	struct {
+		BF_ctx ctx;
+		BF_key expanded_key;
+		union {
+			BF_word salt[4];
+			BF_word output[6];
+		} binary;
+	} data;
+	BF_word L, R;
+	BF_word tmp1, tmp2, tmp3, tmp4;
+	BF_word *ptr;
+	BF_word count;
+	int i;
+
+	if (size < 7 + 22 + 31 + 1) {
+		__set_errno(ERANGE);
+		return NULL;
+	}
+
+	if (setting[0] != '$' ||
+	    setting[1] != '2' ||
+	    setting[2] < 'a' || setting[2] > 'z' ||
+	    !flags_by_subtype[(unsigned int)(unsigned char)setting[2] - 'a'] ||
+	    setting[3] != '$' ||
+	    setting[4] < '0' || setting[4] > '3' ||
+	    setting[5] < '0' || setting[5] > '9' ||
+	    (setting[4] == '3' && setting[5] > '1') ||
+	    setting[6] != '$') {
+		__set_errno(EINVAL);
+		return NULL;
+	}
+
+	count = (BF_word)1 << ((setting[4] - '0') * 10 + (setting[5] - '0'));
+	if (count < min || BF_decode(data.binary.salt, &setting[7], 16)) {
+		__set_errno(EINVAL);
+		return NULL;
+	}
+	BF_swap(data.binary.salt, 4);
+
+	BF_set_key(key, data.expanded_key, data.ctx.P,
+	    flags_by_subtype[(unsigned int)(unsigned char)setting[2] - 'a']);
+
+	memcpy(data.ctx.S, BF_init_state.S, sizeof(data.ctx.S));
+
+	L = R = 0;
+	for (i = 0; i < BF_N + 2; i += 2) {
+		L ^= data.binary.salt[i & 2];
+		R ^= data.binary.salt[(i & 2) + 1];
+		BF_ENCRYPT;
+		data.ctx.P[i] = L;
+		data.ctx.P[i + 1] = R;
+	}
+
+	ptr = data.ctx.S[0];
+	do {
+		ptr += 4;
+		L ^= data.binary.salt[(BF_N + 2) & 3];
+		R ^= data.binary.salt[(BF_N + 3) & 3];
+		BF_ENCRYPT;
+		*(ptr - 4) = L;
+		*(ptr - 3) = R;
+
+		L ^= data.binary.salt[(BF_N + 4) & 3];
+		R ^= data.binary.salt[(BF_N + 5) & 3];
+		BF_ENCRYPT;
+		*(ptr - 2) = L;
+		*(ptr - 1) = R;
+	} while (ptr < &data.ctx.S[3][0xFF]);
+
+	do {
+		int done;
+
+		for (i = 0; i < BF_N + 2; i += 2) {
+			data.ctx.P[i] ^= data.expanded_key[i];
+			data.ctx.P[i + 1] ^= data.expanded_key[i + 1];
+		}
+
+		done = 0;
+		do {
+			BF_body();
+			if (done)
+				break;
+			done = 1;
+
+			tmp1 = data.binary.salt[0];
+			tmp2 = data.binary.salt[1];
+			tmp3 = data.binary.salt[2];
+			tmp4 = data.binary.salt[3];
+			for (i = 0; i < BF_N; i += 4) {
+				data.ctx.P[i] ^= tmp1;
+				data.ctx.P[i + 1] ^= tmp2;
+				data.ctx.P[i + 2] ^= tmp3;
+				data.ctx.P[i + 3] ^= tmp4;
+			}
+			data.ctx.P[16] ^= tmp1;
+			data.ctx.P[17] ^= tmp2;
+		} while (1);
+	} while (--count);
+
+	for (i = 0; i < 6; i += 2) {
+		L = BF_magic_w[i];
+		R = BF_magic_w[i + 1];
+
+		count = 64;
+		do {
+			BF_ENCRYPT;
+		} while (--count);
+
+		data.binary.output[i] = L;
+		data.binary.output[i + 1] = R;
+	}
+
+	memcpy(output, setting, 7 + 22 - 1);
+	output[7 + 22 - 1] = BF_itoa64[(int)
+		BF_atoi64[(int)setting[7 + 22 - 1] - 0x20] & 0x30];
+
+/* This has to be bug-compatible with the original implementation, so
+ * only encode 23 of the 24 bytes. :-) */
+	BF_swap(data.binary.output, 6);
+	BF_encode(&output[7 + 22], data.binary.output, 23);
+	output[7 + 22 + 31] = '\0';
+
+	return output;
+}
+
+int _crypt_output_magic(const char *setting, char *output, int size)
+{
+	if (size < 3)
+		return -1;
+
+	output[0] = '*';
+	output[1] = '0';
+	output[2] = '\0';
+
+	if (setting[0] == '*' && setting[1] == '0')
+		output[1] = '1';
+
+	return 0;
+}
+
+/*
+ * Please preserve the runtime self-test.  It serves two purposes at once:
+ *
+ * 1. We really can't afford the risk of producing incompatible hashes e.g.
+ * when there's something like gcc bug 26587 again, whereas an application or
+ * library integrating this code might not also integrate our external tests or
+ * it might not run them after every build.  Even if it does, the miscompile
+ * might only occur on the production build, but not on a testing build (such
+ * as because of different optimization settings).  It is painful to recover
+ * from incorrectly-computed hashes - merely fixing whatever broke is not
+ * enough.  Thus, a proactive measure like this self-test is needed.
+ *
+ * 2. We don't want to leave sensitive data from our actual password hash
+ * computation on the stack or in registers.  Previous revisions of the code
+ * would do explicit cleanups, but simply running the self-test after hash
+ * computation is more reliable.
+ *
+ * The performance cost of this quick self-test is around 0.6% at the "$2a$08"
+ * setting.
+ */
+char *_crypt_blowfish_rn(const char *key, const char *setting,
+	char *output, int size)
+{
+	const char *test_key = "8b \xd0\xc1\xd2\xcf\xcc\xd8";
+	const char *test_setting = "$2a$00$abcdefghijklmnopqrstuu";
+	static const char * const test_hashes[2] =
+		{"i1D709vfamulimlGcq0qq3UvuUasvEa\0\x55", /* 'a', 'b', 'y' */
+		"VUrPmXD6q/nVSSp7pNDhCR9071IfIRe\0\x55"}; /* 'x' */
+	const char *test_hash = test_hashes[0];
+	char *retval;
+	const char *p;
+	int save_errno, ok;
+	struct {
+		char s[7 + 22 + 1];
+		char o[7 + 22 + 31 + 1 + 1 + 1];
+	} buf;
+
+/* Hash the supplied password */
+	_crypt_output_magic(setting, output, size);
+	retval = BF_crypt(key, setting, output, size, 16);
+	save_errno = errno;
+
+/*
+ * Do a quick self-test.  It is important that we make both calls to BF_crypt()
+ * from the same scope such that they likely use the same stack locations,
+ * which makes the second call overwrite the first call's sensitive data on the
+ * stack and makes it more likely that any alignment related issues would be
+ * detected by the self-test.
+ */
+	memcpy(buf.s, test_setting, sizeof(buf.s));
+	if (retval) {
+		unsigned int flags = flags_by_subtype[
+		    (unsigned int)(unsigned char)setting[2] - 'a'];
+		test_hash = test_hashes[flags & 1];
+		buf.s[2] = setting[2];
+	}
+	memset(buf.o, 0x55, sizeof(buf.o));
+	buf.o[sizeof(buf.o) - 1] = 0;
+	p = BF_crypt(test_key, buf.s, buf.o, sizeof(buf.o) - (1 + 1), 1);
+
+	ok = (p == buf.o &&
+	    !memcmp(p, buf.s, 7 + 22) &&
+	    !memcmp(p + (7 + 22), test_hash, 31 + 1 + 1 + 1));
+
+	{
+		const char *k = "\xff\xa3" "34" "\xff\xff\xff\xa3" "345";
+		BF_key ae, ai, ye, yi;
+		BF_set_key(k, ae, ai, 2); /* $2a$ */
+		BF_set_key(k, ye, yi, 4); /* $2y$ */
+		ai[0] ^= 0x10000; /* undo the safety (for comparison) */
+		ok = ok && ai[0] == 0xdb9c59bc && ye[17] == 0x33343500 &&
+		    !memcmp(ae, ye, sizeof(ae)) &&
+		    !memcmp(ai, yi, sizeof(ai));
+	}
+
+	__set_errno(save_errno);
+	if (ok)
+		return retval;
+
+/* Should not happen */
+	_crypt_output_magic(setting, output, size);
+	__set_errno(EINVAL); /* pretend we don't support this hash type */
+	return NULL;
+}
+
+char *_crypt_gensalt_blowfish_rn(const char *prefix, unsigned long count,
+	const char *input, int size, char *output, int output_size)
+{
+	if (size < 16 || output_size < 7 + 22 + 1 ||
+	    (count && (count < 4 || count > 31)) ||
+	    prefix[0] != '$' || prefix[1] != '2' ||
+	    (prefix[2] != 'a' && prefix[2] != 'b' && prefix[2] != 'y')) {
+		if (output_size > 0) output[0] = '\0';
+		__set_errno((output_size < 7 + 22 + 1) ? ERANGE : EINVAL);
+		return NULL;
+	}
+
+	if (!count) count = 5;
+
+	output[0] = '$';
+	output[1] = '2';
+	output[2] = prefix[2];
+	output[3] = '$';
+	output[4] = '0' + count / 10;
+	output[5] = '0' + count % 10;
+	output[6] = '$';
+
+	BF_encode(&output[7], (const BF_word *)input, 16);
+	output[7 + 22] = '\0';
+
+	return output;
+}
diff --git a/src/libbcrypt/src/crypt_gensalt.c b/dep/libbcrypt/src/crypt_gensalt.c
similarity index 96%
rename from src/libbcrypt/src/crypt_gensalt.c
rename to dep/libbcrypt/src/crypt_gensalt.c
index 1f0d73da0..a1d719ec4 100644
--- a/src/libbcrypt/src/crypt_gensalt.c
+++ b/dep/libbcrypt/src/crypt_gensalt.c
@@ -1,128 +1,128 @@
-/*
- * Written by Solar Designer <solar at openwall.com> in 2000-2011.
- * No copyright is claimed, and the software is hereby placed in the public
- * domain.  In case this attempt to disclaim copyright and place the software
- * in the public domain is deemed null and void, then the software is
- * Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- *
- * See crypt_blowfish.c for more information.
- *
- * This file contains salt generation functions for the traditional and
- * other common crypt(3) algorithms, except for bcrypt which is defined
- * entirely in crypt_blowfish.c.
- */
-
-#include <string.h>
-
-#include <errno.h>
-#ifndef __set_errno
-#define __set_errno(val) errno = (val)
-#endif
-
-/* Just to make sure the prototypes match the actual definitions */
-#ifdef _WIN32
-#include "../include/bcrypt/crypt_gensalt.h"
-#else
-#include "crypt_gensalt.h"
-#endif
-
-unsigned char _crypt_itoa64[64 + 1] =
-	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-char *_crypt_gensalt_traditional_rn(const char *prefix, unsigned long count,
-	const char *input, int size, char *output, int output_size)
-{
-	(void) prefix;
-
-	if (size < 2 || output_size < 2 + 1 || (count && count != 25)) {
-		if (output_size > 0) output[0] = '\0';
-		__set_errno((output_size < 2 + 1) ? ERANGE : EINVAL);
-		return NULL;
-	}
-
-	output[0] = _crypt_itoa64[(unsigned int)input[0] & 0x3f];
-	output[1] = _crypt_itoa64[(unsigned int)input[1] & 0x3f];
-	output[2] = '\0';
-
-	return output;
-}
-
-char *_crypt_gensalt_extended_rn(const char *prefix, unsigned long count,
-	const char *input, int size, char *output, int output_size)
-{
-	unsigned long value;
-
-	(void) prefix;
-
-/* Even iteration counts make it easier to detect weak DES keys from a look
- * at the hash, so they should be avoided */
-	if (size < 3 || output_size < 1 + 4 + 4 + 1 ||
-	    (count && (count > 0xffffff || !(count & 1)))) {
-		if (output_size > 0) output[0] = '\0';
-		__set_errno((output_size < 1 + 4 + 4 + 1) ? ERANGE : EINVAL);
-		return NULL;
-	}
-
-	if (!count) count = 725;
-
-	output[0] = '_';
-	output[1] = _crypt_itoa64[count & 0x3f];
-	output[2] = _crypt_itoa64[(count >> 6) & 0x3f];
-	output[3] = _crypt_itoa64[(count >> 12) & 0x3f];
-	output[4] = _crypt_itoa64[(count >> 18) & 0x3f];
-	value = (unsigned long)(unsigned char)input[0] |
-		((unsigned long)(unsigned char)input[1] << 8) |
-		((unsigned long)(unsigned char)input[2] << 16);
-	output[5] = _crypt_itoa64[value & 0x3f];
-	output[6] = _crypt_itoa64[(value >> 6) & 0x3f];
-	output[7] = _crypt_itoa64[(value >> 12) & 0x3f];
-	output[8] = _crypt_itoa64[(value >> 18) & 0x3f];
-	output[9] = '\0';
-
-	return output;
-}
-
-char *_crypt_gensalt_md5_rn(const char *prefix, unsigned long count,
-	const char *input, int size, char *output, int output_size)
-{
-	unsigned long value;
-
-	(void) prefix;
-
-	if (size < 3 || output_size < 3 + 4 + 1 || (count && count != 1000)) {
-		if (output_size > 0) output[0] = '\0';
-		__set_errno((output_size < 3 + 4 + 1) ? ERANGE : EINVAL);
-		return NULL;
-	}
-
-	output[0] = '$';
-	output[1] = '1';
-	output[2] = '$';
-	value = (unsigned long)(unsigned char)input[0] |
-		((unsigned long)(unsigned char)input[1] << 8) |
-		((unsigned long)(unsigned char)input[2] << 16);
-	output[3] = _crypt_itoa64[value & 0x3f];
-	output[4] = _crypt_itoa64[(value >> 6) & 0x3f];
-	output[5] = _crypt_itoa64[(value >> 12) & 0x3f];
-	output[6] = _crypt_itoa64[(value >> 18) & 0x3f];
-	output[7] = '\0';
-
-	if (size >= 6 && output_size >= 3 + 4 + 4 + 1) {
-		value = (unsigned long)(unsigned char)input[3] |
-			((unsigned long)(unsigned char)input[4] << 8) |
-			((unsigned long)(unsigned char)input[5] << 16);
-		output[7] = _crypt_itoa64[value & 0x3f];
-		output[8] = _crypt_itoa64[(value >> 6) & 0x3f];
-		output[9] = _crypt_itoa64[(value >> 12) & 0x3f];
-		output[10] = _crypt_itoa64[(value >> 18) & 0x3f];
-		output[11] = '\0';
-	}
-
-	return output;
-}
+/*
+ * Written by Solar Designer <solar at openwall.com> in 2000-2011.
+ * No copyright is claimed, and the software is hereby placed in the public
+ * domain.  In case this attempt to disclaim copyright and place the software
+ * in the public domain is deemed null and void, then the software is
+ * Copyright (c) 2000-2011 Solar Designer and it is hereby released to the
+ * general public under the following terms:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ *
+ * See crypt_blowfish.c for more information.
+ *
+ * This file contains salt generation functions for the traditional and
+ * other common crypt(3) algorithms, except for bcrypt which is defined
+ * entirely in crypt_blowfish.c.
+ */
+
+#include <string.h>
+
+#include <errno.h>
+#ifndef __set_errno
+#define __set_errno(val) errno = (val)
+#endif
+
+/* Just to make sure the prototypes match the actual definitions */
+#ifdef _WIN32
+#include "../include/bcrypt/crypt_gensalt.h"
+#else
+#include "crypt_gensalt.h"
+#endif
+
+unsigned char _crypt_itoa64[64 + 1] =
+	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+char *_crypt_gensalt_traditional_rn(const char *prefix, unsigned long count,
+	const char *input, int size, char *output, int output_size)
+{
+	(void) prefix;
+
+	if (size < 2 || output_size < 2 + 1 || (count && count != 25)) {
+		if (output_size > 0) output[0] = '\0';
+		__set_errno((output_size < 2 + 1) ? ERANGE : EINVAL);
+		return NULL;
+	}
+
+	output[0] = _crypt_itoa64[(unsigned int)input[0] & 0x3f];
+	output[1] = _crypt_itoa64[(unsigned int)input[1] & 0x3f];
+	output[2] = '\0';
+
+	return output;
+}
+
+char *_crypt_gensalt_extended_rn(const char *prefix, unsigned long count,
+	const char *input, int size, char *output, int output_size)
+{
+	unsigned long value;
+
+	(void) prefix;
+
+/* Even iteration counts make it easier to detect weak DES keys from a look
+ * at the hash, so they should be avoided */
+	if (size < 3 || output_size < 1 + 4 + 4 + 1 ||
+	    (count && (count > 0xffffff || !(count & 1)))) {
+		if (output_size > 0) output[0] = '\0';
+		__set_errno((output_size < 1 + 4 + 4 + 1) ? ERANGE : EINVAL);
+		return NULL;
+	}
+
+	if (!count) count = 725;
+
+	output[0] = '_';
+	output[1] = _crypt_itoa64[count & 0x3f];
+	output[2] = _crypt_itoa64[(count >> 6) & 0x3f];
+	output[3] = _crypt_itoa64[(count >> 12) & 0x3f];
+	output[4] = _crypt_itoa64[(count >> 18) & 0x3f];
+	value = (unsigned long)(unsigned char)input[0] |
+		((unsigned long)(unsigned char)input[1] << 8) |
+		((unsigned long)(unsigned char)input[2] << 16);
+	output[5] = _crypt_itoa64[value & 0x3f];
+	output[6] = _crypt_itoa64[(value >> 6) & 0x3f];
+	output[7] = _crypt_itoa64[(value >> 12) & 0x3f];
+	output[8] = _crypt_itoa64[(value >> 18) & 0x3f];
+	output[9] = '\0';
+
+	return output;
+}
+
+char *_crypt_gensalt_md5_rn(const char *prefix, unsigned long count,
+	const char *input, int size, char *output, int output_size)
+{
+	unsigned long value;
+
+	(void) prefix;
+
+	if (size < 3 || output_size < 3 + 4 + 1 || (count && count != 1000)) {
+		if (output_size > 0) output[0] = '\0';
+		__set_errno((output_size < 3 + 4 + 1) ? ERANGE : EINVAL);
+		return NULL;
+	}
+
+	output[0] = '$';
+	output[1] = '1';
+	output[2] = '$';
+	value = (unsigned long)(unsigned char)input[0] |
+		((unsigned long)(unsigned char)input[1] << 8) |
+		((unsigned long)(unsigned char)input[2] << 16);
+	output[3] = _crypt_itoa64[value & 0x3f];
+	output[4] = _crypt_itoa64[(value >> 6) & 0x3f];
+	output[5] = _crypt_itoa64[(value >> 12) & 0x3f];
+	output[6] = _crypt_itoa64[(value >> 18) & 0x3f];
+	output[7] = '\0';
+
+	if (size >= 6 && output_size >= 3 + 4 + 4 + 1) {
+		value = (unsigned long)(unsigned char)input[3] |
+			((unsigned long)(unsigned char)input[4] << 8) |
+			((unsigned long)(unsigned char)input[5] << 16);
+		output[7] = _crypt_itoa64[value & 0x3f];
+		output[8] = _crypt_itoa64[(value >> 6) & 0x3f];
+		output[9] = _crypt_itoa64[(value >> 12) & 0x3f];
+		output[10] = _crypt_itoa64[(value >> 18) & 0x3f];
+		output[11] = '\0';
+	}
+
+	return output;
+}
diff --git a/src/libbcrypt/src/main.cpp b/dep/libbcrypt/src/main.cpp
similarity index 100%
rename from src/libbcrypt/src/main.cpp
rename to dep/libbcrypt/src/main.cpp
diff --git a/src/libbcrypt/src/wrapper.c b/dep/libbcrypt/src/wrapper.c
similarity index 96%
rename from src/libbcrypt/src/wrapper.c
rename to dep/libbcrypt/src/wrapper.c
index 98ffeecfd..995e07ca5 100644
--- a/src/libbcrypt/src/wrapper.c
+++ b/dep/libbcrypt/src/wrapper.c
@@ -1,563 +1,563 @@
-/*
- * Written by Solar Designer <solar at openwall.com> in 2000-2014.
- * No copyright is claimed, and the software is hereby placed in the public
- * domain.  In case this attempt to disclaim copyright and place the software
- * in the public domain is deemed null and void, then the software is
- * Copyright (c) 2000-2014 Solar Designer and it is hereby released to the
- * general public under the following terms:
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted.
- *
- * There's ABSOLUTELY NO WARRANTY, express or implied.
- *
- * See crypt_blowfish.c for more information.
- */
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <errno.h>
-#ifndef __set_errno
-#define __set_errno(val) errno = (val)
-#endif
-
-#ifdef TEST
-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#ifdef TEST_THREADS
-#include <pthread.h>
-#endif
-#endif
-
-#define CRYPT_OUTPUT_SIZE		(7 + 22 + 31 + 1)
-#define CRYPT_GENSALT_OUTPUT_SIZE	(7 + 22 + 1)
-
-#if defined(__GLIBC__) && defined(_LIBC)
-#define __SKIP_GNU
-#endif
-
-#ifdef _WIN32 | _WIN64
-#include "../include/bcrypt/ow-crypt.h"
-
-#include "../include/bcrypt/crypt_blowfish.h"
-#include "../include/bcrypt/crypt_gensalt.h"
-#else
-#include "ow-crypt.h"
-
-#include "crypt_blowfish.h"
-#include "crypt_gensalt.h"
-#endif
-
-#if defined(__GLIBC__) && defined(_LIBC)
-/* crypt.h from glibc-crypt-2.1 will define struct crypt_data for us */
-#include "crypt.h"
-extern char *__md5_crypt_r(const char *key, const char *salt,
-	char *buffer, int buflen);
-/* crypt-entry.c needs to be patched to define __des_crypt_r rather than
- * __crypt_r, and not define crypt_r and crypt at all */
-extern char *__des_crypt_r(const char *key, const char *salt,
-	struct crypt_data *data);
-extern struct crypt_data _ufc_foobar;
-#endif
-
-static int _crypt_data_alloc(void **data, int *size, int need)
-{
-	void *updated;
-
-	if (*data && *size >= need) return 0;
-
-	updated = realloc(*data, need);
-
-	if (!updated) {
-#ifndef __GLIBC__
-		/* realloc(3) on glibc sets errno, so we don't need to bother */
-		__set_errno(ENOMEM);
-#endif
-		return -1;
-	}
-
-#if defined(__GLIBC__) && defined(_LIBC)
-	if (need >= sizeof(struct crypt_data))
-		((struct crypt_data *)updated)->initialized = 0;
-#endif
-
-	*data = updated;
-	*size = need;
-
-	return 0;
-}
-
-static char *_crypt_retval_magic(char *retval, const char *setting,
-	char *output, int size)
-{
-	if (retval)
-		return retval;
-
-	if (_crypt_output_magic(setting, output, size))
-		return NULL; /* shouldn't happen */
-
-	return output;
-}
-
-#if defined(__GLIBC__) && defined(_LIBC)
-/*
- * Applications may re-use the same instance of struct crypt_data without
- * resetting the initialized field in order to let crypt_r() skip some of
- * its initialization code.  Thus, it is important that our multiple hashing
- * algorithms either don't conflict with each other in their use of the
- * data area or reset the initialized field themselves whenever required.
- * Currently, the hashing algorithms simply have no conflicts: the first
- * field of struct crypt_data is the 128-byte large DES key schedule which
- * __des_crypt_r() calculates each time it is called while the two other
- * hashing algorithms use less than 128 bytes of the data area.
- */
-
-char *__crypt_rn(__const char *key, __const char *setting,
-	void *data, int size)
-{
-	if (setting[0] == '$' && setting[1] == '2')
-		return _crypt_blowfish_rn(key, setting, (char *)data, size);
-	if (setting[0] == '$' && setting[1] == '1')
-		return __md5_crypt_r(key, setting, (char *)data, size);
-	if (setting[0] == '$' || setting[0] == '_') {
-		__set_errno(EINVAL);
-		return NULL;
-	}
-	if (size >= sizeof(struct crypt_data))
-		return __des_crypt_r(key, setting, (struct crypt_data *)data);
-	__set_errno(ERANGE);
-	return NULL;
-}
-
-char *__crypt_ra(__const char *key, __const char *setting,
-	void **data, int *size)
-{
-	if (setting[0] == '$' && setting[1] == '2') {
-		if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
-			return NULL;
-		return _crypt_blowfish_rn(key, setting, (char *)*data, *size);
-	}
-	if (setting[0] == '$' && setting[1] == '1') {
-		if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
-			return NULL;
-		return __md5_crypt_r(key, setting, (char *)*data, *size);
-	}
-	if (setting[0] == '$' || setting[0] == '_') {
-		__set_errno(EINVAL);
-		return NULL;
-	}
-	if (_crypt_data_alloc(data, size, sizeof(struct crypt_data)))
-		return NULL;
-	return __des_crypt_r(key, setting, (struct crypt_data *)*data);
-}
-
-char *__crypt_r(__const char *key, __const char *setting,
-	struct crypt_data *data)
-{
-	return _crypt_retval_magic(
-		__crypt_rn(key, setting, data, sizeof(*data)),
-		setting, (char *)data, sizeof(*data));
-}
-
-char *__crypt(__const char *key, __const char *setting)
-{
-	return _crypt_retval_magic(
-		__crypt_rn(key, setting, &_ufc_foobar, sizeof(_ufc_foobar)),
-		setting, (char *)&_ufc_foobar, sizeof(_ufc_foobar));
-}
-#else
-char *crypt_rn(const char *key, const char *setting, void *data, int size)
-{
-	return _crypt_blowfish_rn(key, setting, (char *)data, size);
-}
-
-char *crypt_ra(const char *key, const char *setting,
-	void **data, int *size)
-{
-	if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
-		return NULL;
-	return _crypt_blowfish_rn(key, setting, (char *)*data, *size);
-}
-
-char *crypt_r(const char *key, const char *setting, void *data)
-{
-	return _crypt_retval_magic(
-		crypt_rn(key, setting, data, CRYPT_OUTPUT_SIZE),
-		setting, (char *)data, CRYPT_OUTPUT_SIZE);
-}
-
-char *crypt(const char *key, const char *setting)
-{
-	static char output[CRYPT_OUTPUT_SIZE];
-
-	return _crypt_retval_magic(
-		crypt_rn(key, setting, output, sizeof(output)),
-		setting, output, sizeof(output));
-}
-
-#define __crypt_gensalt_rn crypt_gensalt_rn
-#define __crypt_gensalt_ra crypt_gensalt_ra
-#define __crypt_gensalt crypt_gensalt
-#endif
-
-char *__crypt_gensalt_rn(const char *prefix, unsigned long count,
-	const char *input, int size, char *output, int output_size)
-{
-	char *(*use)(const char *_prefix, unsigned long _count,
-		const char *_input, int _size,
-		char *_output, int _output_size);
-
-	/* This may be supported on some platforms in the future */
-	if (!input) {
-		__set_errno(EINVAL);
-		return NULL;
-	}
-
-	if (!strncmp(prefix, "$2a$", 4) || !strncmp(prefix, "$2b$", 4) ||
-	    !strncmp(prefix, "$2y$", 4))
-		use = _crypt_gensalt_blowfish_rn;
-	else
-	if (!strncmp(prefix, "$1$", 3))
-		use = _crypt_gensalt_md5_rn;
-	else
-	if (prefix[0] == '_')
-		use = _crypt_gensalt_extended_rn;
-	else
-	if (!prefix[0] ||
-	    (prefix[0] && prefix[1] &&
-	    memchr(_crypt_itoa64, prefix[0], 64) &&
-	    memchr(_crypt_itoa64, prefix[1], 64)))
-		use = _crypt_gensalt_traditional_rn;
-	else {
-		__set_errno(EINVAL);
-		return NULL;
-	}
-
-	return use(prefix, count, input, size, output, output_size);
-}
-
-char *__crypt_gensalt_ra(const char *prefix, unsigned long count,
-	const char *input, int size)
-{
-	char output[CRYPT_GENSALT_OUTPUT_SIZE];
-	char *retval;
-
-	retval = __crypt_gensalt_rn(prefix, count,
-		input, size, output, sizeof(output));
-
-	if (retval) {
-#ifdef _WIN32 | _WIN64
-		retval = _strdup(retval);
-#else
-		retval = strdup(retval);
-#endif
-#ifndef __GLIBC__
-		/* strdup(3) on glibc sets errno, so we don't need to bother */
-		if (!retval)
-			__set_errno(ENOMEM);
-#endif
-	}
-
-	return retval;
-}
-
-char *__crypt_gensalt(const char *prefix, unsigned long count,
-	const char *input, int size)
-{
-	static char output[CRYPT_GENSALT_OUTPUT_SIZE];
-
-	return __crypt_gensalt_rn(prefix, count,
-		input, size, output, sizeof(output));
-}
-
-#if defined(__GLIBC__) && defined(_LIBC)
-weak_alias(__crypt_rn, crypt_rn)
-weak_alias(__crypt_ra, crypt_ra)
-weak_alias(__crypt_r, crypt_r)
-weak_alias(__crypt, crypt)
-weak_alias(__crypt_gensalt_rn, crypt_gensalt_rn)
-weak_alias(__crypt_gensalt_ra, crypt_gensalt_ra)
-weak_alias(__crypt_gensalt, crypt_gensalt)
-weak_alias(crypt, fcrypt)
-#endif
-
-#ifdef TEST
-static const char *tests[][3] = {
-	{"$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW",
-		"U*U"},
-	{"$2a$05$CCCCCCCCCCCCCCCCCCCCC.VGOzA784oUp/Z0DY336zx7pLYAy0lwK",
-		"U*U*"},
-	{"$2a$05$XXXXXXXXXXXXXXXXXXXXXOAcXxm9kjPGEMsLznoKqmqw7tc8WCx4a",
-		"U*U*U"},
-	{"$2a$05$abcdefghijklmnopqrstuu5s2v8.iXieOjg/.AySBTTZIIVFJeBui",
-		"0123456789abcdefghijklmnopqrstuvwxyz"
-		"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-		"chars after 72 are ignored"},
-	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
-		"\xa3"},
-	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
-		"\xff\xff\xa3"},
-	{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
-		"\xff\xff\xa3"},
-	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.nqd1wy.pTMdcvrRWxyiGL2eMz.2a85.",
-		"\xff\xff\xa3"},
-	{"$2b$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
-		"\xff\xff\xa3"},
-	{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq",
-		"\xa3"},
-	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq",
-		"\xa3"},
-	{"$2b$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq",
-		"\xa3"},
-	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
-		"1\xa3" "345"},
-	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
-		"\xff\xa3" "345"},
-	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
-		"\xff\xa3" "34" "\xff\xff\xff\xa3" "345"},
-	{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
-		"\xff\xa3" "34" "\xff\xff\xff\xa3" "345"},
-	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.ZC1JEJ8Z4gPfpe1JOr/oyPXTWl9EFd.",
-		"\xff\xa3" "34" "\xff\xff\xff\xa3" "345"},
-	{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.nRht2l/HRhr6zmCp9vYUvvsqynflf9e",
-		"\xff\xa3" "345"},
-	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.nRht2l/HRhr6zmCp9vYUvvsqynflf9e",
-		"\xff\xa3" "345"},
-	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS",
-		"\xa3" "ab"},
-	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS",
-		"\xa3" "ab"},
-	{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS",
-		"\xa3" "ab"},
-	{"$2x$05$6bNw2HLQYeqHYyBfLMsv/OiwqTymGIGzFsA4hOTWebfehXHNprcAS",
-		"\xd1\x91"},
-	{"$2x$05$6bNw2HLQYeqHYyBfLMsv/O9LIGgn8OMzuDoHfof8AQimSGfcSWxnS",
-		"\xd0\xc1\xd2\xcf\xcc\xd8"},
-	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.swQOIzjOiJ9GHEPuhEkvqrUyvWhEMx6",
-		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
-		"chars after 72 are ignored as usual"},
-	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.R9xrDjiycxMbQE2bp.vgqlYpW5wx2yy",
-		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
-		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
-		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
-		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
-		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
-		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"},
-	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.9tQZzcJfm3uj2NvJ/n5xkhpqLrMpWCe",
-		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
-		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
-		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
-		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
-		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
-		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"},
-	{"$2a$05$CCCCCCCCCCCCCCCCCCCCC.7uG0VCzI2bS7j6ymqJi9CdcdxiRTWNy",
-		""},
-	{"*0", "", "$2a$03$CCCCCCCCCCCCCCCCCCCCC."},
-	{"*0", "", "$2a$32$CCCCCCCCCCCCCCCCCCCCC."},
-	{"*0", "", "$2c$05$CCCCCCCCCCCCCCCCCCCCC."},
-	{"*0", "", "$2z$05$CCCCCCCCCCCCCCCCCCCCC."},
-	{"*0", "", "$2`$05$CCCCCCCCCCCCCCCCCCCCC."},
-	{"*0", "", "$2{$05$CCCCCCCCCCCCCCCCCCCCC."},
-	{"*1", "", "*0"},
-	{NULL}
-};
-
-#define which				tests[0]
-
-static volatile sig_atomic_t running;
-
-static void handle_timer(int signum)
-{
-	(void) signum;
-	running = 0;
-}
-
-static void *run(void *arg)
-{
-	unsigned long count = 0;
-	int i = 0;
-	void *data = NULL;
-	int size = 0x12345678;
-
-	do {
-		const char *hash = tests[i][0];
-		const char *key = tests[i][1];
-		const char *setting = tests[i][2];
-
-		if (!tests[++i][0])
-			i = 0;
-
-		if (setting && strlen(hash) < 30) /* not for benchmark */
-			continue;
-
-		if (strcmp(crypt_ra(key, hash, &data, &size), hash)) {
-			printf("%d: FAILED (crypt_ra/%d/%lu)\n",
-				(int)((char *)arg - (char *)0), i, count);
-			free(data);
-			return NULL;
-		}
-		count++;
-	} while (running);
-
-	free(data);
-	return count + (char *)0;
-}
-
-int main(void)
-{
-	struct itimerval it;
-	struct tms buf;
-	clock_t clk_tck, start_real, start_virtual, end_real, end_virtual;
-	unsigned long count;
-	void *data;
-	int size;
-	char *setting1, *setting2;
-	int i;
-#ifdef TEST_THREADS
-	pthread_t t[TEST_THREADS];
-	void *t_retval;
-#endif
-
-	data = NULL;
-	size = 0x12345678;
-
-	for (i = 0; tests[i][0]; i++) {
-		const char *hash = tests[i][0];
-		const char *key = tests[i][1];
-		const char *setting = tests[i][2];
-		const char *p;
-		int ok = !setting || strlen(hash) >= 30;
-		int o_size;
-		char s_buf[30], o_buf[61];
-		if (!setting) {
-			memcpy(s_buf, hash, sizeof(s_buf) - 1);
-			s_buf[sizeof(s_buf) - 1] = 0;
-			setting = s_buf;
-		}
-
-		__set_errno(0);
-		p = crypt(key, setting);
-		if ((!ok && !errno) || strcmp(p, hash)) {
-			printf("FAILED (crypt/%d)\n", i);
-			return 1;
-		}
-
-		if (ok && strcmp(crypt(key, hash), hash)) {
-			printf("FAILED (crypt/%d)\n", i);
-			return 1;
-		}
-
-		for (o_size = -1; o_size <= (int)sizeof(o_buf); o_size++) {
-			int ok_n = ok && o_size == (int)sizeof(o_buf);
-			const char *x = "abc";
-			strcpy(o_buf, x);
-			if (o_size >= 3) {
-				x = "*0";
-				if (setting[0] == '*' && setting[1] == '0')
-					x = "*1";
-			}
-			__set_errno(0);
-			p = crypt_rn(key, setting, o_buf, o_size);
-			if ((ok_n && (!p || strcmp(p, hash))) ||
-			    (!ok_n && (!errno || p || strcmp(o_buf, x)))) {
-				printf("FAILED (crypt_rn/%d)\n", i);
-				return 1;
-			}
-		}
-
-		__set_errno(0);
-		p = crypt_ra(key, setting, &data, &size);
-		if ((ok && (!p || strcmp(p, hash))) ||
-		    (!ok && (!errno || p || strcmp((char *)data, hash)))) {
-			printf("FAILED (crypt_ra/%d)\n", i);
-			return 1;
-		}
-	}
-
-	setting1 = crypt_gensalt(which[0], 12, data, size);
-	if (!setting1 || strncmp(setting1, "$2a$12$", 7)) {
-		puts("FAILED (crypt_gensalt)\n");
-		return 1;
-	}
-
-	setting2 = crypt_gensalt_ra(setting1, 12, data, size);
-	if (strcmp(setting1, setting2)) {
-		puts("FAILED (crypt_gensalt_ra/1)\n");
-		return 1;
-	}
-
-	(*(char *)data)++;
-	setting1 = crypt_gensalt_ra(setting2, 12, data, size);
-	if (!strcmp(setting1, setting2)) {
-		puts("FAILED (crypt_gensalt_ra/2)\n");
-		return 1;
-	}
-
-	free(setting1);
-	free(setting2);
-	free(data);
-
-#if defined(_SC_CLK_TCK) || !defined(CLK_TCK)
-	clk_tck = sysconf(_SC_CLK_TCK);
-#else
-	clk_tck = CLK_TCK;
-#endif
-
-	running = 1;
-	signal(SIGALRM, handle_timer);
-
-	memset(&it, 0, sizeof(it));
-	it.it_value.tv_sec = 5;
-	setitimer(ITIMER_REAL, &it, NULL);
-
-	start_real = times(&buf);
-	start_virtual = buf.tms_utime + buf.tms_stime;
-
-	count = (char *)run((char *)0) - (char *)0;
-
-	end_real = times(&buf);
-	end_virtual = buf.tms_utime + buf.tms_stime;
-	if (end_virtual == start_virtual) end_virtual++;
-
-	printf("%.1f c/s real, %.1f c/s virtual\n",
-		(float)count * clk_tck / (end_real - start_real),
-		(float)count * clk_tck / (end_virtual - start_virtual));
-
-#ifdef TEST_THREADS
-	running = 1;
-	it.it_value.tv_sec = 60;
-	setitimer(ITIMER_REAL, &it, NULL);
-	start_real = times(&buf);
-
-	for (i = 0; i < TEST_THREADS; i++)
-	if (pthread_create(&t[i], NULL, run, i + (char *)0)) {
-		perror("pthread_create");
-		return 1;
-	}
-
-	for (i = 0; i < TEST_THREADS; i++) {
-		if (pthread_join(t[i], &t_retval)) {
-			perror("pthread_join");
-			continue;
-		}
-		if (!t_retval) continue;
-		count = (char *)t_retval - (char *)0;
-		end_real = times(&buf);
-		printf("%d: %.1f c/s real\n", i,
-			(float)count * clk_tck / (end_real - start_real));
-	}
-#endif
-
-	return 0;
-}
-#endif
+/*
+ * Written by Solar Designer <solar at openwall.com> in 2000-2014.
+ * No copyright is claimed, and the software is hereby placed in the public
+ * domain.  In case this attempt to disclaim copyright and place the software
+ * in the public domain is deemed null and void, then the software is
+ * Copyright (c) 2000-2014 Solar Designer and it is hereby released to the
+ * general public under the following terms:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted.
+ *
+ * There's ABSOLUTELY NO WARRANTY, express or implied.
+ *
+ * See crypt_blowfish.c for more information.
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include <errno.h>
+#ifndef __set_errno
+#define __set_errno(val) errno = (val)
+#endif
+
+#ifdef TEST
+#include <stdio.h>
+#include <unistd.h>
+#include <signal.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/times.h>
+#ifdef TEST_THREADS
+#include <pthread.h>
+#endif
+#endif
+
+#define CRYPT_OUTPUT_SIZE		(7 + 22 + 31 + 1)
+#define CRYPT_GENSALT_OUTPUT_SIZE	(7 + 22 + 1)
+
+#if defined(__GLIBC__) && defined(_LIBC)
+#define __SKIP_GNU
+#endif
+
+#ifdef _WIN32 | _WIN64
+#include "../include/bcrypt/ow-crypt.h"
+
+#include "../include/bcrypt/crypt_blowfish.h"
+#include "../include/bcrypt/crypt_gensalt.h"
+#else
+#include "ow-crypt.h"
+
+#include "crypt_blowfish.h"
+#include "crypt_gensalt.h"
+#endif
+
+#if defined(__GLIBC__) && defined(_LIBC)
+/* crypt.h from glibc-crypt-2.1 will define struct crypt_data for us */
+#include "crypt.h"
+extern char *__md5_crypt_r(const char *key, const char *salt,
+	char *buffer, int buflen);
+/* crypt-entry.c needs to be patched to define __des_crypt_r rather than
+ * __crypt_r, and not define crypt_r and crypt at all */
+extern char *__des_crypt_r(const char *key, const char *salt,
+	struct crypt_data *data);
+extern struct crypt_data _ufc_foobar;
+#endif
+
+static int _crypt_data_alloc(void **data, int *size, int need)
+{
+	void *updated;
+
+	if (*data && *size >= need) return 0;
+
+	updated = realloc(*data, need);
+
+	if (!updated) {
+#ifndef __GLIBC__
+		/* realloc(3) on glibc sets errno, so we don't need to bother */
+		__set_errno(ENOMEM);
+#endif
+		return -1;
+	}
+
+#if defined(__GLIBC__) && defined(_LIBC)
+	if (need >= sizeof(struct crypt_data))
+		((struct crypt_data *)updated)->initialized = 0;
+#endif
+
+	*data = updated;
+	*size = need;
+
+	return 0;
+}
+
+static char *_crypt_retval_magic(char *retval, const char *setting,
+	char *output, int size)
+{
+	if (retval)
+		return retval;
+
+	if (_crypt_output_magic(setting, output, size))
+		return NULL; /* shouldn't happen */
+
+	return output;
+}
+
+#if defined(__GLIBC__) && defined(_LIBC)
+/*
+ * Applications may re-use the same instance of struct crypt_data without
+ * resetting the initialized field in order to let crypt_r() skip some of
+ * its initialization code.  Thus, it is important that our multiple hashing
+ * algorithms either don't conflict with each other in their use of the
+ * data area or reset the initialized field themselves whenever required.
+ * Currently, the hashing algorithms simply have no conflicts: the first
+ * field of struct crypt_data is the 128-byte large DES key schedule which
+ * __des_crypt_r() calculates each time it is called while the two other
+ * hashing algorithms use less than 128 bytes of the data area.
+ */
+
+char *__crypt_rn(__const char *key, __const char *setting,
+	void *data, int size)
+{
+	if (setting[0] == '$' && setting[1] == '2')
+		return _crypt_blowfish_rn(key, setting, (char *)data, size);
+	if (setting[0] == '$' && setting[1] == '1')
+		return __md5_crypt_r(key, setting, (char *)data, size);
+	if (setting[0] == '$' || setting[0] == '_') {
+		__set_errno(EINVAL);
+		return NULL;
+	}
+	if (size >= sizeof(struct crypt_data))
+		return __des_crypt_r(key, setting, (struct crypt_data *)data);
+	__set_errno(ERANGE);
+	return NULL;
+}
+
+char *__crypt_ra(__const char *key, __const char *setting,
+	void **data, int *size)
+{
+	if (setting[0] == '$' && setting[1] == '2') {
+		if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
+			return NULL;
+		return _crypt_blowfish_rn(key, setting, (char *)*data, *size);
+	}
+	if (setting[0] == '$' && setting[1] == '1') {
+		if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
+			return NULL;
+		return __md5_crypt_r(key, setting, (char *)*data, *size);
+	}
+	if (setting[0] == '$' || setting[0] == '_') {
+		__set_errno(EINVAL);
+		return NULL;
+	}
+	if (_crypt_data_alloc(data, size, sizeof(struct crypt_data)))
+		return NULL;
+	return __des_crypt_r(key, setting, (struct crypt_data *)*data);
+}
+
+char *__crypt_r(__const char *key, __const char *setting,
+	struct crypt_data *data)
+{
+	return _crypt_retval_magic(
+		__crypt_rn(key, setting, data, sizeof(*data)),
+		setting, (char *)data, sizeof(*data));
+}
+
+char *__crypt(__const char *key, __const char *setting)
+{
+	return _crypt_retval_magic(
+		__crypt_rn(key, setting, &_ufc_foobar, sizeof(_ufc_foobar)),
+		setting, (char *)&_ufc_foobar, sizeof(_ufc_foobar));
+}
+#else
+char *crypt_rn(const char *key, const char *setting, void *data, int size)
+{
+	return _crypt_blowfish_rn(key, setting, (char *)data, size);
+}
+
+char *crypt_ra(const char *key, const char *setting,
+	void **data, int *size)
+{
+	if (_crypt_data_alloc(data, size, CRYPT_OUTPUT_SIZE))
+		return NULL;
+	return _crypt_blowfish_rn(key, setting, (char *)*data, *size);
+}
+
+char *crypt_r(const char *key, const char *setting, void *data)
+{
+	return _crypt_retval_magic(
+		crypt_rn(key, setting, data, CRYPT_OUTPUT_SIZE),
+		setting, (char *)data, CRYPT_OUTPUT_SIZE);
+}
+
+char *crypt(const char *key, const char *setting)
+{
+	static char output[CRYPT_OUTPUT_SIZE];
+
+	return _crypt_retval_magic(
+		crypt_rn(key, setting, output, sizeof(output)),
+		setting, output, sizeof(output));
+}
+
+#define __crypt_gensalt_rn crypt_gensalt_rn
+#define __crypt_gensalt_ra crypt_gensalt_ra
+#define __crypt_gensalt crypt_gensalt
+#endif
+
+char *__crypt_gensalt_rn(const char *prefix, unsigned long count,
+	const char *input, int size, char *output, int output_size)
+{
+	char *(*use)(const char *_prefix, unsigned long _count,
+		const char *_input, int _size,
+		char *_output, int _output_size);
+
+	/* This may be supported on some platforms in the future */
+	if (!input) {
+		__set_errno(EINVAL);
+		return NULL;
+	}
+
+	if (!strncmp(prefix, "$2a$", 4) || !strncmp(prefix, "$2b$", 4) ||
+	    !strncmp(prefix, "$2y$", 4))
+		use = _crypt_gensalt_blowfish_rn;
+	else
+	if (!strncmp(prefix, "$1$", 3))
+		use = _crypt_gensalt_md5_rn;
+	else
+	if (prefix[0] == '_')
+		use = _crypt_gensalt_extended_rn;
+	else
+	if (!prefix[0] ||
+	    (prefix[0] && prefix[1] &&
+	    memchr(_crypt_itoa64, prefix[0], 64) &&
+	    memchr(_crypt_itoa64, prefix[1], 64)))
+		use = _crypt_gensalt_traditional_rn;
+	else {
+		__set_errno(EINVAL);
+		return NULL;
+	}
+
+	return use(prefix, count, input, size, output, output_size);
+}
+
+char *__crypt_gensalt_ra(const char *prefix, unsigned long count,
+	const char *input, int size)
+{
+	char output[CRYPT_GENSALT_OUTPUT_SIZE];
+	char *retval;
+
+	retval = __crypt_gensalt_rn(prefix, count,
+		input, size, output, sizeof(output));
+
+	if (retval) {
+#ifdef _WIN32 | _WIN64
+		retval = _strdup(retval);
+#else
+		retval = strdup(retval);
+#endif
+#ifndef __GLIBC__
+		/* strdup(3) on glibc sets errno, so we don't need to bother */
+		if (!retval)
+			__set_errno(ENOMEM);
+#endif
+	}
+
+	return retval;
+}
+
+char *__crypt_gensalt(const char *prefix, unsigned long count,
+	const char *input, int size)
+{
+	static char output[CRYPT_GENSALT_OUTPUT_SIZE];
+
+	return __crypt_gensalt_rn(prefix, count,
+		input, size, output, sizeof(output));
+}
+
+#if defined(__GLIBC__) && defined(_LIBC)
+weak_alias(__crypt_rn, crypt_rn)
+weak_alias(__crypt_ra, crypt_ra)
+weak_alias(__crypt_r, crypt_r)
+weak_alias(__crypt, crypt)
+weak_alias(__crypt_gensalt_rn, crypt_gensalt_rn)
+weak_alias(__crypt_gensalt_ra, crypt_gensalt_ra)
+weak_alias(__crypt_gensalt, crypt_gensalt)
+weak_alias(crypt, fcrypt)
+#endif
+
+#ifdef TEST
+static const char *tests[][3] = {
+	{"$2a$05$CCCCCCCCCCCCCCCCCCCCC.E5YPO9kmyuRGyh0XouQYb4YMJKvyOeW",
+		"U*U"},
+	{"$2a$05$CCCCCCCCCCCCCCCCCCCCC.VGOzA784oUp/Z0DY336zx7pLYAy0lwK",
+		"U*U*"},
+	{"$2a$05$XXXXXXXXXXXXXXXXXXXXXOAcXxm9kjPGEMsLznoKqmqw7tc8WCx4a",
+		"U*U*U"},
+	{"$2a$05$abcdefghijklmnopqrstuu5s2v8.iXieOjg/.AySBTTZIIVFJeBui",
+		"0123456789abcdefghijklmnopqrstuvwxyz"
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+		"chars after 72 are ignored"},
+	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
+		"\xa3"},
+	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
+		"\xff\xff\xa3"},
+	{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
+		"\xff\xff\xa3"},
+	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.nqd1wy.pTMdcvrRWxyiGL2eMz.2a85.",
+		"\xff\xff\xa3"},
+	{"$2b$05$/OK.fbVrR/bpIqNJ5ianF.CE5elHaaO4EbggVDjb8P19RukzXSM3e",
+		"\xff\xff\xa3"},
+	{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq",
+		"\xa3"},
+	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq",
+		"\xa3"},
+	{"$2b$05$/OK.fbVrR/bpIqNJ5ianF.Sa7shbm4.OzKpvFnX1pQLmQW96oUlCq",
+		"\xa3"},
+	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
+		"1\xa3" "345"},
+	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
+		"\xff\xa3" "345"},
+	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
+		"\xff\xa3" "34" "\xff\xff\xff\xa3" "345"},
+	{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.o./n25XVfn6oAPaUvHe.Csk4zRfsYPi",
+		"\xff\xa3" "34" "\xff\xff\xff\xa3" "345"},
+	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.ZC1JEJ8Z4gPfpe1JOr/oyPXTWl9EFd.",
+		"\xff\xa3" "34" "\xff\xff\xff\xa3" "345"},
+	{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.nRht2l/HRhr6zmCp9vYUvvsqynflf9e",
+		"\xff\xa3" "345"},
+	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.nRht2l/HRhr6zmCp9vYUvvsqynflf9e",
+		"\xff\xa3" "345"},
+	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS",
+		"\xa3" "ab"},
+	{"$2x$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS",
+		"\xa3" "ab"},
+	{"$2y$05$/OK.fbVrR/bpIqNJ5ianF.6IflQkJytoRVc1yuaNtHfiuq.FRlSIS",
+		"\xa3" "ab"},
+	{"$2x$05$6bNw2HLQYeqHYyBfLMsv/OiwqTymGIGzFsA4hOTWebfehXHNprcAS",
+		"\xd1\x91"},
+	{"$2x$05$6bNw2HLQYeqHYyBfLMsv/O9LIGgn8OMzuDoHfof8AQimSGfcSWxnS",
+		"\xd0\xc1\xd2\xcf\xcc\xd8"},
+	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.swQOIzjOiJ9GHEPuhEkvqrUyvWhEMx6",
+		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+		"\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa\xaa"
+		"chars after 72 are ignored as usual"},
+	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.R9xrDjiycxMbQE2bp.vgqlYpW5wx2yy",
+		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
+		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
+		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
+		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
+		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"
+		"\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55\xaa\x55"},
+	{"$2a$05$/OK.fbVrR/bpIqNJ5ianF.9tQZzcJfm3uj2NvJ/n5xkhpqLrMpWCe",
+		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
+		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
+		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
+		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
+		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"
+		"\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff\x55\xaa\xff"},
+	{"$2a$05$CCCCCCCCCCCCCCCCCCCCC.7uG0VCzI2bS7j6ymqJi9CdcdxiRTWNy",
+		""},
+	{"*0", "", "$2a$03$CCCCCCCCCCCCCCCCCCCCC."},
+	{"*0", "", "$2a$32$CCCCCCCCCCCCCCCCCCCCC."},
+	{"*0", "", "$2c$05$CCCCCCCCCCCCCCCCCCCCC."},
+	{"*0", "", "$2z$05$CCCCCCCCCCCCCCCCCCCCC."},
+	{"*0", "", "$2`$05$CCCCCCCCCCCCCCCCCCCCC."},
+	{"*0", "", "$2{$05$CCCCCCCCCCCCCCCCCCCCC."},
+	{"*1", "", "*0"},
+	{NULL}
+};
+
+#define which				tests[0]
+
+static volatile sig_atomic_t running;
+
+static void handle_timer(int signum)
+{
+	(void) signum;
+	running = 0;
+}
+
+static void *run(void *arg)
+{
+	unsigned long count = 0;
+	int i = 0;
+	void *data = NULL;
+	int size = 0x12345678;
+
+	do {
+		const char *hash = tests[i][0];
+		const char *key = tests[i][1];
+		const char *setting = tests[i][2];
+
+		if (!tests[++i][0])
+			i = 0;
+
+		if (setting && strlen(hash) < 30) /* not for benchmark */
+			continue;
+
+		if (strcmp(crypt_ra(key, hash, &data, &size), hash)) {
+			printf("%d: FAILED (crypt_ra/%d/%lu)\n",
+				(int)((char *)arg - (char *)0), i, count);
+			free(data);
+			return NULL;
+		}
+		count++;
+	} while (running);
+
+	free(data);
+	return count + (char *)0;
+}
+
+int main(void)
+{
+	struct itimerval it;
+	struct tms buf;
+	clock_t clk_tck, start_real, start_virtual, end_real, end_virtual;
+	unsigned long count;
+	void *data;
+	int size;
+	char *setting1, *setting2;
+	int i;
+#ifdef TEST_THREADS
+	pthread_t t[TEST_THREADS];
+	void *t_retval;
+#endif
+
+	data = NULL;
+	size = 0x12345678;
+
+	for (i = 0; tests[i][0]; i++) {
+		const char *hash = tests[i][0];
+		const char *key = tests[i][1];
+		const char *setting = tests[i][2];
+		const char *p;
+		int ok = !setting || strlen(hash) >= 30;
+		int o_size;
+		char s_buf[30], o_buf[61];
+		if (!setting) {
+			memcpy(s_buf, hash, sizeof(s_buf) - 1);
+			s_buf[sizeof(s_buf) - 1] = 0;
+			setting = s_buf;
+		}
+
+		__set_errno(0);
+		p = crypt(key, setting);
+		if ((!ok && !errno) || strcmp(p, hash)) {
+			printf("FAILED (crypt/%d)\n", i);
+			return 1;
+		}
+
+		if (ok && strcmp(crypt(key, hash), hash)) {
+			printf("FAILED (crypt/%d)\n", i);
+			return 1;
+		}
+
+		for (o_size = -1; o_size <= (int)sizeof(o_buf); o_size++) {
+			int ok_n = ok && o_size == (int)sizeof(o_buf);
+			const char *x = "abc";
+			strcpy(o_buf, x);
+			if (o_size >= 3) {
+				x = "*0";
+				if (setting[0] == '*' && setting[1] == '0')
+					x = "*1";
+			}
+			__set_errno(0);
+			p = crypt_rn(key, setting, o_buf, o_size);
+			if ((ok_n && (!p || strcmp(p, hash))) ||
+			    (!ok_n && (!errno || p || strcmp(o_buf, x)))) {
+				printf("FAILED (crypt_rn/%d)\n", i);
+				return 1;
+			}
+		}
+
+		__set_errno(0);
+		p = crypt_ra(key, setting, &data, &size);
+		if ((ok && (!p || strcmp(p, hash))) ||
+		    (!ok && (!errno || p || strcmp((char *)data, hash)))) {
+			printf("FAILED (crypt_ra/%d)\n", i);
+			return 1;
+		}
+	}
+
+	setting1 = crypt_gensalt(which[0], 12, data, size);
+	if (!setting1 || strncmp(setting1, "$2a$12$", 7)) {
+		puts("FAILED (crypt_gensalt)\n");
+		return 1;
+	}
+
+	setting2 = crypt_gensalt_ra(setting1, 12, data, size);
+	if (strcmp(setting1, setting2)) {
+		puts("FAILED (crypt_gensalt_ra/1)\n");
+		return 1;
+	}
+
+	(*(char *)data)++;
+	setting1 = crypt_gensalt_ra(setting2, 12, data, size);
+	if (!strcmp(setting1, setting2)) {
+		puts("FAILED (crypt_gensalt_ra/2)\n");
+		return 1;
+	}
+
+	free(setting1);
+	free(setting2);
+	free(data);
+
+#if defined(_SC_CLK_TCK) || !defined(CLK_TCK)
+	clk_tck = sysconf(_SC_CLK_TCK);
+#else
+	clk_tck = CLK_TCK;
+#endif
+
+	running = 1;
+	signal(SIGALRM, handle_timer);
+
+	memset(&it, 0, sizeof(it));
+	it.it_value.tv_sec = 5;
+	setitimer(ITIMER_REAL, &it, NULL);
+
+	start_real = times(&buf);
+	start_virtual = buf.tms_utime + buf.tms_stime;
+
+	count = (char *)run((char *)0) - (char *)0;
+
+	end_real = times(&buf);
+	end_virtual = buf.tms_utime + buf.tms_stime;
+	if (end_virtual == start_virtual) end_virtual++;
+
+	printf("%.1f c/s real, %.1f c/s virtual\n",
+		(float)count * clk_tck / (end_real - start_real),
+		(float)count * clk_tck / (end_virtual - start_virtual));
+
+#ifdef TEST_THREADS
+	running = 1;
+	it.it_value.tv_sec = 60;
+	setitimer(ITIMER_REAL, &it, NULL);
+	start_real = times(&buf);
+
+	for (i = 0; i < TEST_THREADS; i++)
+	if (pthread_create(&t[i], NULL, run, i + (char *)0)) {
+		perror("pthread_create");
+		return 1;
+	}
+
+	for (i = 0; i < TEST_THREADS; i++) {
+		if (pthread_join(t[i], &t_retval)) {
+			perror("pthread_join");
+			continue;
+		}
+		if (!t_retval) continue;
+		count = (char *)t_retval - (char *)0;
+		end_real = times(&buf);
+		printf("%d: %.1f c/s real\n", i,
+			(float)count * clk_tck / (end_real - start_real));
+	}
+#endif
+
+	return 0;
+}
+#endif
diff --git a/src/libbcrypt/src/x86.S b/dep/libbcrypt/src/x86.S
similarity index 100%
rename from src/libbcrypt/src/x86.S
rename to dep/libbcrypt/src/x86.S
diff --git a/src/libbcrypt/vs2017/libbcrypt/libbcrypt.sln b/dep/libbcrypt/vs2017/libbcrypt/libbcrypt.sln
similarity index 98%
rename from src/libbcrypt/vs2017/libbcrypt/libbcrypt.sln
rename to dep/libbcrypt/vs2017/libbcrypt/libbcrypt.sln
index 38c2d4047..70256fc2d 100644
--- a/src/libbcrypt/vs2017/libbcrypt/libbcrypt.sln
+++ b/dep/libbcrypt/vs2017/libbcrypt/libbcrypt.sln
@@ -1,41 +1,41 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.136
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbcrypt", "libbcrypt.vcxproj", "{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}"
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test.vcxproj", "{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Debug|x64.ActiveCfg = Debug|x64
-		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Debug|x64.Build.0 = Debug|x64
-		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Debug|x86.ActiveCfg = Debug|Win32
-		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Debug|x86.Build.0 = Debug|Win32
-		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Release|x64.ActiveCfg = Release|x64
-		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Release|x64.Build.0 = Release|x64
-		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Release|x86.ActiveCfg = Release|Win32
-		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Release|x86.Build.0 = Release|Win32
-		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Debug|x64.ActiveCfg = Debug|x64
-		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Debug|x64.Build.0 = Debug|x64
-		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Debug|x86.ActiveCfg = Debug|Win32
-		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Debug|x86.Build.0 = Debug|Win32
-		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Release|x64.ActiveCfg = Release|x64
-		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Release|x64.Build.0 = Release|x64
-		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Release|x86.ActiveCfg = Release|Win32
-		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {2DB786F9-9679-4A72-A4A0-2544E42B78CB}
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.136
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbcrypt", "libbcrypt.vcxproj", "{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "test", "..\test\test.vcxproj", "{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Debug|x64.ActiveCfg = Debug|x64
+		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Debug|x64.Build.0 = Debug|x64
+		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Debug|x86.ActiveCfg = Debug|Win32
+		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Debug|x86.Build.0 = Debug|Win32
+		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Release|x64.ActiveCfg = Release|x64
+		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Release|x64.Build.0 = Release|x64
+		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Release|x86.ActiveCfg = Release|Win32
+		{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}.Release|x86.Build.0 = Release|Win32
+		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Debug|x64.ActiveCfg = Debug|x64
+		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Debug|x64.Build.0 = Debug|x64
+		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Debug|x86.ActiveCfg = Debug|Win32
+		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Debug|x86.Build.0 = Debug|Win32
+		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Release|x64.ActiveCfg = Release|x64
+		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Release|x64.Build.0 = Release|x64
+		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Release|x86.ActiveCfg = Release|Win32
+		{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {2DB786F9-9679-4A72-A4A0-2544E42B78CB}
+	EndGlobalSection
+EndGlobal
diff --git a/src/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj b/dep/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj
similarity index 97%
rename from src/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj
rename to dep/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj
index 577af5635..e97c78180 100644
--- a/src/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj
+++ b/dep/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj
@@ -1,135 +1,135 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}</ProjectGuid>
-    <RootNamespace>libbcrypt</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\bcrypt.c" />
-    <ClCompile Include="..\..\src\crypt_blowfish.c" />
-    <ClCompile Include="..\..\src\crypt_gensalt.c" />
-    <ClCompile Include="..\..\src\wrapper.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\bcrypt\bcrypt.h" />
-    <ClInclude Include="..\..\include\bcrypt\BCrypt.hpp" />
-    <ClInclude Include="..\..\include\bcrypt\crypt.h" />
-    <ClInclude Include="..\..\include\bcrypt\crypt_blowfish.h" />
-    <ClInclude Include="..\..\include\bcrypt\crypt_gensalt.h" />
-    <ClInclude Include="..\..\include\bcrypt\ow-crypt.h" />
-    <ClInclude Include="..\..\include\bcrypt\winbcrypt.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{D6A9A3F3-1312-4494-85B8-7CE7DD4D78F4}</ProjectGuid>
+    <RootNamespace>libbcrypt</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\bcrypt.c" />
+    <ClCompile Include="..\..\src\crypt_blowfish.c" />
+    <ClCompile Include="..\..\src\crypt_gensalt.c" />
+    <ClCompile Include="..\..\src\wrapper.c" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\bcrypt\bcrypt.h" />
+    <ClInclude Include="..\..\include\bcrypt\BCrypt.hpp" />
+    <ClInclude Include="..\..\include\bcrypt\crypt.h" />
+    <ClInclude Include="..\..\include\bcrypt\crypt_blowfish.h" />
+    <ClInclude Include="..\..\include\bcrypt\crypt_gensalt.h" />
+    <ClInclude Include="..\..\include\bcrypt\ow-crypt.h" />
+    <ClInclude Include="..\..\include\bcrypt\winbcrypt.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj.filters b/dep/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj.filters
similarity index 97%
rename from src/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj.filters
rename to dep/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj.filters
index e30024695..8edc396c8 100644
--- a/src/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj.filters
+++ b/dep/libbcrypt/vs2017/libbcrypt/libbcrypt.vcxproj.filters
@@ -1,54 +1,54 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="..\..\src\bcrypt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\crypt_blowfish.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\crypt_gensalt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\src\wrapper.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\..\include\bcrypt\BCrypt.hpp">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\bcrypt\winbcrypt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\bcrypt\bcrypt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\bcrypt\crypt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\bcrypt\crypt_blowfish.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\bcrypt\crypt_gensalt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\include\bcrypt\ow-crypt.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\src\bcrypt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crypt_blowfish.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\crypt_gensalt.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\wrapper.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\include\bcrypt\BCrypt.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\bcrypt\winbcrypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\bcrypt\bcrypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\bcrypt\crypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\bcrypt\crypt_blowfish.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\bcrypt\crypt_gensalt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\include\bcrypt\ow-crypt.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libbcrypt/vs2017/test/main.cpp b/dep/libbcrypt/vs2017/test/main.cpp
similarity index 96%
rename from src/libbcrypt/vs2017/test/main.cpp
rename to dep/libbcrypt/vs2017/test/main.cpp
index fac9b7134..fa8994b20 100644
--- a/src/libbcrypt/vs2017/test/main.cpp
+++ b/dep/libbcrypt/vs2017/test/main.cpp
@@ -1,22 +1,22 @@
-#include "../../include/bcrypt/BCrypt.hpp"
-#include <iostream>
-
-using namespace std;
-
-int main() {
-	string right_password = "right_password";
-	string wrong_password = "wrong_password";
-
-	cout << "generate hash... " << flush;
-	string hash = BCrypt::generateHash(right_password, 12);
-	cout << "done." << endl;
-
-	cout << "checking right password: " << flush
-		<< BCrypt::validatePassword(right_password, hash) << endl;
-
-	cout << "checking wrong password: " << flush
-		<< BCrypt::validatePassword(wrong_password, hash) << endl;
-
-	system("pause");
-	return 0;
-}
+#include "../../include/bcrypt/BCrypt.hpp"
+#include <iostream>
+
+using namespace std;
+
+int main() {
+	string right_password = "right_password";
+	string wrong_password = "wrong_password";
+
+	cout << "generate hash... " << flush;
+	string hash = BCrypt::generateHash(right_password, 12);
+	cout << "done." << endl;
+
+	cout << "checking right password: " << flush
+		<< BCrypt::validatePassword(right_password, hash) << endl;
+
+	cout << "checking wrong password: " << flush
+		<< BCrypt::validatePassword(wrong_password, hash) << endl;
+
+	system("pause");
+	return 0;
+}
diff --git a/src/libbcrypt/vs2017/test/test.vcxproj b/dep/libbcrypt/vs2017/test/test.vcxproj
similarity index 97%
rename from src/libbcrypt/vs2017/test/test.vcxproj
rename to dep/libbcrypt/vs2017/test/test.vcxproj
index a05b3cf6e..566addc6b 100644
--- a/src/libbcrypt/vs2017/test/test.vcxproj
+++ b/dep/libbcrypt/vs2017/test/test.vcxproj
@@ -1,131 +1,131 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\libbcrypt\libbcrypt.vcxproj">
-      <Project>{d6a9a3f3-1312-4494-85b8-7ce7dd4d78f4}</Project>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}</ProjectGuid>
-    <RootNamespace>test</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup />
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>../libbcrypt/Debug/libbcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-    </Link>
-  </ItemDefinitionGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\libbcrypt\libbcrypt.vcxproj">
+      <Project>{d6a9a3f3-1312-4494-85b8-7ce7dd4d78f4}</Project>
+    </ProjectReference>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{C6B1CF6E-88DF-4109-9EF4-06CBA5BD5B68}</ProjectGuid>
+    <RootNamespace>test</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>../libbcrypt/Debug/libbcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/src/libbcrypt/vs2017/test/test.vcxproj.filters b/dep/libbcrypt/vs2017/test/test.vcxproj.filters
similarity index 96%
rename from src/libbcrypt/vs2017/test/test.vcxproj.filters
rename to dep/libbcrypt/vs2017/test/test.vcxproj.filters
index 128a38664..a91ad0ed9 100644
--- a/src/libbcrypt/vs2017/test/test.vcxproj.filters
+++ b/dep/libbcrypt/vs2017/test/test.vcxproj.filters
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="main.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;ipp;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/dep/span-lite/CMakeLists.txt b/dep/span-lite/CMakeLists.txt
new file mode 100644
index 000000000..4d4f9d43f
--- /dev/null
+++ b/dep/span-lite/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_library(span-lite INTERFACE)
+add_library(martinmoene::span-lite ALIAS span-lite)
+
+target_include_directories(span-lite INTERFACE
+  ${CMAKE_CURRENT_SOURCE_DIR}/include)
diff --git a/dep/span-lite/LICENSE.txt b/dep/span-lite/LICENSE.txt
new file mode 100644
index 000000000..36b7cd93c
--- /dev/null
+++ b/dep/span-lite/LICENSE.txt
@@ -0,0 +1,23 @@
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
diff --git a/dep/span-lite/README.md b/dep/span-lite/README.md
new file mode 100644
index 000000000..4b077c889
--- /dev/null
+++ b/dep/span-lite/README.md
@@ -0,0 +1,514 @@
+<a id="top"></a>
+# span lite: A single-file header-only version of a C++20-like span for C++98, C++11 and later
+
+[![Language](https://img.shields.io/badge/C%2B%2B-98/11/14/17/20-blue.svg)](https://en.wikipedia.org/wiki/C%2B%2B#Standardization) [![License](https://img.shields.io/badge/license-BSL-blue.svg)](https://opensource.org/licenses/BSL-1.0) [![Build Status](https://travis-ci.org/martinmoene/span-lite.svg?branch=master)](https://travis-ci.org/martinmoene/span-lite) [![Build status](https://ci.appveyor.com/api/projects/status/1ha3wnxtam547m8p?svg=true)](https://ci.appveyor.com/project/martinmoene/span-lite) [![Version](https://badge.fury.io/gh/martinmoene%2Fspan-lite.svg)](https://github.com/martinmoene/span-lite/releases) [![download](https://img.shields.io/badge/latest-download-blue.svg)](https://github.com/martinmoene/span-lite/blob/master/include/nonstd/span.hpp) [![Conan](https://img.shields.io/badge/on-conan-blue.svg)](https://conan.io/center/span-lite) [![Try it on wandbox](https://img.shields.io/badge/on-wandbox-blue.svg)](https://wandbox.org/permlink/venR3Ko2Q4tlvcVk) [![Try it on godbolt online](https://img.shields.io/badge/on-godbolt-blue.svg)](https://godbolt.org/z/htwpnb)
+
+**Contents**  
+
+- [Example usage](#example-usage)
+- [In a nutshell](#in-a-nutshell)
+- [License](#license)
+- [Dependencies](#dependencies)
+- [Installation and use](#installation-and-use)
+- [Synopsis](#synopsis)
+- [Reported to work with](#reported-to-work-with)
+- [Building the tests](#building-the-tests)
+- [Other implementations of span](#other-implementations-of-span)
+- [Notes and references](#notes-and-references)
+- [Appendix](#appendix)
+
+## Example usage
+
+```cpp
+#include "nonstd/span.hpp"
+#include <array>
+#include <vector>
+#include <iostream>
+
+std::ptrdiff_t size( nonstd::span<const int> spn )
+{
+    return spn.size();
+}
+
+int main()
+{
+    int arr[] = { 1, };
+
+    std::cout << 
+        "C-array:" << size( arr ) <<
+        " array:"  << size( std::array <int, 2>{ 1, 2, } ) <<
+        " vector:" << size( std::vector<int   >{ 1, 2, 3, } );
+}
+```
+
+### Compile and run
+
+```bash
+prompt> g++ -std=c++11 -Wall -I../include -o 01-basic.exe 01-basic.cpp && 01-basic.exe
+C-array:1 array:2 vector:3
+```
+
+## In a nutshell
+
+**span lite** is a single-file header-only library to provide a bounds-safe view for sequences of objects. The library provides a [C++20-like span](http://en.cppreference.com/w/cpp/container/span) for use with C++98 and later. If available, `std::span` is used, unless [configured otherwise](#configuration). *span-lite* can detect the presence of [*byte-lite*](https://github.com/martinmoene/byte-lite) and if present, it provides `as_bytes()` and `as_writable_bytes()` also for C++14 and earlier. 
+
+**Features and properties of span lite** are ease of installation (single header), freedom of dependencies other than the standard library. To compensate for the class template argument deduction that is missing from pre-C++17 compilers, `nonstd::span` can provide `make_span` functions. See [configuration](#configuration).
+
+## License
+
+*span lite* is distributed under the [Boost Software License](https://github.com/martinmoene/span-lite/blob/master/LICENSE.txt).
+
+## Dependencies
+
+*span lite* has no other dependencies than the [C++ standard library](http://en.cppreference.com/w/cpp/header).
+
+## Installation and use
+
+*span lite* is a single-file header-only library. Put `span.hpp` in the [include](include) folder directly into the project source tree or somewhere reachable from your project.
+
+## Synopsis
+
+**Contents**  
+[Documentation of `std::span`](#documentation-of-stdspan)  
+[Later additions](#later-additions)  
+[Non-standard extensions](#non-standard-extensions)  
+[Configuration](#configuration)  
+
+## Documentation of `std::span`
+
+Depending on the compiler and C++-standard used, `nonstd::span` behaves less or more like `std::span`. To get an idea of the capabilities of `nonstd::span` with your configuration, look at the output of the [tests](test/span.t.cpp), issuing `span-main.t --pass @`. For `std::span`, see its [documentation at cppreference](http://en.cppreference.com/w/cpp/container/span).  
+
+## Later additions
+
+### `back()` and `front()`
+
+*span lite* can provide `back()` and `front()` member functions for element access. See the table below and section [configuration](#configuration).
+
+## Non-standard extensions
+
+### Construct from container
+
+To construct a span from a container with compilers that cannot constrain such a single-parameter constructor to containers, *span lite* provides a constructor that takes an additional parameter of type `with_container_t`. Use `with_container` as value for this parameter. See the table below and section [configuration](#configuration).
+
+### Construct from `std::array` with const data
+
+*span lite* can provide construction of a span from a `std::array` with const data. See the table below and section [configuration](#configuration).
+
+### `operator()`
+
+*span lite* can provide member function call `operator()` for element access. It is equivalent to `operator[]` and has been marked `[[deprecated]]`. Its main purpose is to provide a migration path. 
+
+### `at()`
+
+*span lite* can provide member function `at()` for element access. Unless exceptions have been disabled, `at()` throws std::out_of_range if the index falls outside the span. With exceptions disabled, `at(index_t)` delegates bounds checking to `operator[](index_t)`. See the table below and sections [configuration](#configuration) and [disable exceptions](#disable-exceptions).
+
+### `swap()`
+
+*span lite* can provide a `swap()`member function. See the table below and section [configuration](#configuration).
+
+### `operator==()` and other comparison functions
+
+*span lite* can provide functions to compare the content of two spans. However, C++20's span will not provide comparison and _span lite_ will omit comparison at default in the near future. See the table below and section [configuration](#configuration). See also [Revisiting Regular Types](#regtyp).
+
+### `same()`
+
+*span lite* can provide function `same()` to determine if two spans refer as identical spans to the same data via the same type. If `same()` is enabled, `operator==()` incorporates it in its comparison. See the table below and section [configuration](#configuration).
+
+### `first()`, `last()` and `subspan()`
+
+*span lite* can provide functions `first()`, `last()` and `subspan()` to avoid having to use the *dot template* syntax when the span is a dependent type. See the table below and section [configuration](#configuration).
+
+### `make_span()`
+
+*span lite* can provide `make_span()` creator functions to compensate for the class template argument deduction that is missing from pre-C++17 compilers. See the table below and section [configuration](#configuration).
+
+### `byte_span()`
+
+*span lite* can provide `byte_span()` creator functions to represent an object as a span of bytes. This requires the C++17 type `std::byte` to be available. See the table below and section [configuration](#configuration).
+
+| Kind               | std  | Function or method |
+|--------------------|------|--------------------|
+| **Macro**          |&nbsp;| macro **`span_FEATURE_WITH_CONTAINER`**<br>macro **`span_FEATURE_WITH_CONTAINER_TO_STD`** |
+| **Types**          |&nbsp;| **with_container_t** type to disambiguate below constructors |
+| **Objects**        |&nbsp;| **with_container** value to disambiguate below constructors |
+| **Constructors**   |&nbsp;| macro **`span_FEATURE_CONSTRUCTION_FROM_STDARRAY_ELEMENT_TYPE`**|
+| &nbsp;             |&nbsp;| template&lt;class Container><br>constexpr **span**(with_container_t, Container & cont) |
+| &nbsp;             |&nbsp;| template&lt;class Container><br>constexpr **span**(with_container_t, Container const & cont) |
+| &nbsp;             |&nbsp;| &nbsp; |
+| **Methods**        |&nbsp;| macro **`span_FEATURE_MEMBER_CALL_OPERATOR`** |
+| &nbsp;             |&nbsp;| constexpr reference **operator()**(index_t idx) const<br>Equivalent to **operator[]**(), marked `[[deprecated]]` |
+| &nbsp;             |&nbsp;| &nbsp; |
+| **Methods**        |&nbsp;| macro **`span_FEATURE_MEMBER_AT`** |
+| &nbsp;             |&nbsp;| constexpr reference **at**(index_t idx) const<br>May throw std::out_of_range exception |
+| &nbsp;             |&nbsp;| &nbsp; |
+| **Methods**        |&nbsp;| macro **`span_FEATURE_MEMBER_BACK_FRONT`** (on since v0.5.0) |
+| &nbsp;             |&nbsp;| constexpr reference **back()** const noexcept  |
+| &nbsp;             |&nbsp;| constexpr reference **front()** const noexcept |
+| &nbsp;             |&nbsp;| &nbsp; |
+| **Method**         |&nbsp;| macro **`span_FEATURE_MEMBER_SWAP`** |
+| &nbsp;             |&nbsp;| constexpr void **swap**(span & other) noexcept  |
+| &nbsp;             |&nbsp;| &nbsp; |
+| **Free functions** |&nbsp;| macro **`span_FEATURE_COMPARISON`** |
+|<br><br>== != < > <= >= |&nbsp;| template&lt;class T1, index_t E1, class T2, index_t E2><br>constexpr bool<br>**operator==**( span<T1,E1> const & l, span<T2,E2> const & r) noexcept |
+| &nbsp;             |&nbsp;| &nbsp; |
+| **Free function**  |&nbsp;| macro **`span_FEATURE_SAME`** |
+| &nbsp;             |&nbsp;| template&lt;class T1, index_t E1, class T2, index_t E2><br>constexpr bool<br>**same**( span<T1,E1> const & l, span<T2,E2> const & r) noexcept |
+| &nbsp;             |&nbsp;| &nbsp; |
+| **Free functions** |&nbsp;| macro **`span_FEATURE_NON_MEMBER_FIRST_LAST_SUB`** |
+| &nbsp; | >= C++11  | template&lt;extent_t Count, class T><br>constexpr auto<br>**first**(T & t) ->... |
+| &nbsp; | >= C++11  | template&lt;class T><br>constexpr auto<br>**first**(T & t, index_t count) ->... |
+| &nbsp; | >= C++11  | template&lt;extent_t Count, class T><br>constexpr auto<br>**last**(T & t) ->... |
+| &nbsp; | >= C++11  | template&lt;class T><br>constexpr auto<br>**last**(T & t, extent_t count) ->... |
+| &nbsp; | >= C++11  | template&lt;index_t Offset, extent_t Count = dynamic_extent, class T><br>constexpr auto<br>**subspan**(T & t) ->... |
+| &nbsp; | >= C++11  | template&lt;class T><br>constexpr auto<br>**subspan**(T & t, index_t offset, extent_t count = dynamic_extent) ->... |
+| &nbsp; | &nbsp;    | &nbsp; |
+| **Free functions** |&nbsp;| macro **`span_FEATURE_MAKE_SPAN`**<br>macro **`span_FEATURE_MAKE_SPAN_TO_STD`** |
+| &nbsp; | &nbsp;    | template&lt;class T><br>constexpr span&lt;T><br>**make_span**(T \* first, T \* last) noexcept |
+| &nbsp; | &nbsp;    | template&lt;class T><br>constexpr span&lt;T><br>**make_span**(T \* ptr, index_t count) noexcept |
+| &nbsp; | &nbsp;    | template&lt;class T, size_t N><br>constexpr span&lt;T,N><br>**make_span**(T (&arr)[N]) noexcept |
+| &nbsp; | >= C++11  | template&lt;class T, size_t N><br>constexpr span&lt;T,N><br>**make_span**(std::array&lt;T,N> & arr) noexcept |
+| &nbsp; | >= C++11  | template&lt;class T, size_t N><br>constexpr span&lt;const T,N><br>**make_span**(std::array&lt;T,N > const & arr) noexcept |
+| &nbsp; | >= C++11  | template&lt;class Container><br>constexpr auto<br>**make_span**(Container & cont) -><br>&emsp;span&lt;typename Container::value_type> noexcept |
+| &nbsp; | >= C++11  | template&lt;class Container><br>constexpr auto<br>**make_span**(Container const & cont) -><br>&emsp;span&lt;const typename Container::value_type> noexcept |
+| &nbsp; | &nbsp;    | template&lt;class Container><br>span&lt;typename Container::value_type><br>**make_span**( with_container_t, Container & cont ) |
+| &nbsp; | &nbsp;    | template&lt;class Container><br>span&lt;const typename Container::value_type><br>**make_span**( with_container_t, Container const & cont ) |
+| &nbsp; | < C++11   | template&lt;class T, Allocator><br>span&lt;T><br>**make_span**(std::vector&lt;T, Allocator> & cont) |
+| &nbsp; | < C++11   | template&lt;class T, Allocator><br>span&lt;const T><br>**make_span**(std::vector&lt;T, Allocator> const & cont) |
+| &nbsp; | &nbsp;    | &nbsp; |                                       
+| **Free functions** |&nbsp;| macro **`span_FEATURE_BYTE_SPAN`** |
+| &nbsp; | >= C++11  | template&lt;class T><br>span&lt;T, sizeof(T)><br>**byte_span**(T & t) |
+| &nbsp; | >= C++11  | template&lt;class T><br>span&lt;const T, sizeof(T)><br>**byte_span**(T const & t) |
+
+## Configuration
+
+### Tweak header
+
+If the compiler supports [`__has_include()`](https://en.cppreference.com/w/cpp/preprocessor/include), *span lite* supports the [tweak header](https://vector-of-bool.github.io/2020/10/04/lib-configuration.html) mechanism. Provide your *tweak header* as `nonstd/span.tweak.hpp` in a folder in the include-search-path. In the tweak header, provide definitions as documented below, like `#define span_CONFIG_NO_EXCEPTIONS 1`.
+
+### Standard selection macro
+
+\-D<b>span\_CPLUSPLUS</b>=199711L  
+Define this macro to override the auto-detection of the supported C++ standard, if your compiler does not set the `__cplusplus` macro correctly.
+
+### Select `std::span` or `nonstd::span`
+
+At default, *span lite* uses `std::span` if it is available and lets you use it via namespace `nonstd`. You can however override this default and explicitly request to use `std::span` or span lite's `nonstd::span` as `nonstd::span` via the following macros.
+
+-D<b>span\_CONFIG\_SELECT\_SPAN</b>=span_SPAN_DEFAULT  
+Define this to `span_SPAN_STD` to select `std::span` as `nonstd::span`. Define this to `span_SPAN_NONSTD` to select `nonstd::span` as `nonstd::span`. Default is undefined, which has the same effect as defining to `span_SPAN_DEFAULT`.
+
+### Select extent type
+
+-D<b>span_CONFIG_EXTENT_TYPE</b>=std::size_t  
+Define this to `std::ptrdiff_t` to use the signed type. The default is `std::size_t`, as in C++20 (since v0.7.0).
+
+### Select size type
+
+-D<b>span_CONFIG_SIZE_TYPE</b>=std::size_t  
+Define this to `std::ptrdiff_t` to use the signed type. The default is `std::size_t`, as in C++20 (since v0.7.0). Note `span_CONFIG_SIZE_TYPE` replaces `span_CONFIG_INDEX_TYPE` which is deprecated.
+
+### Disable exceptions
+
+-D<b>span_CONFIG_NO_EXCEPTIONS</b>=0  
+Define this to 1 if you want to compile without exceptions. If not defined, the header tries and detect if exceptions have been disabled (e.g. via `-fno-exceptions`). Disabling exceptions will force contract violation to use termination, see [contract violation macros](#contract-violation-response-macros). Default is undefined.
+
+### Provide construction using `with_container_t`
+
+-D<b>span_FEATURE_WITH_CONTAINER</b>=0  
+Define this to 1 to enable constructing a span using `with_container_t`. Note that `span_FEATURE_WITH_CONTAINER` takes precedence over `span_FEATURE_WITH_CONTAINER_TO_STD`. Default is undefined.
+
+-D<b>span_FEATURE_WITH_CONTAINER_TO_STD</b>=*n*  
+Define this to the highest C++ language version for which to enable constructing a span using `with_container_t`, like 98, 03, 11, 14, 17, 20. You can use 99 for inclusion with any standard, but prefer to use `span_FEATURE_WITH_CONTAINER` for this. Note that `span_FEATURE_WITH_CONTAINER` takes precedence over `span_FEATURE_WITH_CONTAINER_TO_STD`. Default is undefined.
+
+### Provide construction from `std::array` with const data
+
+-D<b>span_FEATURE_CONSTRUCTION_FROM_STDARRAY_ELEMENT_TYPE</b>=0  
+Define this to 1 to enable constructing a span from a std::array with const data. Default is undefined.
+
+### Provide `operator()` member function
+
+-D<b>span_FEATURE_MEMBER_CALL_OPERATOR</b>=0  
+Define this to 1 to provide member function `operator()`for element access. It is equivalent to `operator[]` and has been marked `[[deprecated]]`. Its main purpose is to provide a migration path. Default is undefined.
+
+### Provide `at()` member function
+
+-D<b>span_FEATURE_MEMBER_AT</b>=0  
+Define this to 1 to provide member function `at()`. Define this to 2 to include index and size in message of std::out_of_range exception. Default is undefined.
+
+### Provide `back()` and `front()` member functions
+
+-D<b>span_FEATURE_MEMBER_BACK_FRONT</b>=1  _(on since v0.5.0)_  
+Define this to 0 to omit member functions `back()` and `front()`. Default is undefined.
+
+### Provide `swap()` member function
+
+-D<b>span_FEATURE_MEMBER_SWAP</b>=0  
+Define this to 1 to provide member function `swap()`. Default is undefined.
+
+### Provide `operator==()` and other comparison functions
+
+-D<b>span_FEATURE_COMPARISON</b>=0  
+Define this to 1 to include the comparison functions to compare the content of two spans. C++20's span does not provide comparison and _span lite_ omits comparison from v0.7.0. Default is undefined.
+
+### Provide `same()` function
+
+-D<b>span_FEATURE_SAME</b>=0  
+Define this to 1 to provide function `same()` to test if two spans refer as identical spans to the same data via the same type. If `same()` is enabled, `operator==()` incorporates it in its comparison. Default is undefined.
+
+### Provide `first()`, `last()` and `subspan()` functions
+
+-D<b>span_FEATURE_NON_MEMBER_FIRST_LAST_SUB</b>=0  
+Define this to 1 to provide functions `first()`, `last()` and `subspan()`. This implies `span_FEATURE_MAKE_SPAN` to provide functions `make_span()` that are required for this feature. Default is undefined.
+
+### Provide `make_span()` functions
+
+-D<b>span_FEATURE_MAKE_SPAN</b>=0  
+Define this to 1 to provide creator functions `nonstd::make_span()`. This feature is implied by using `span_FEATURE_NON_MEMBER_FIRST_LAST_SUB=1`. Note that `span_FEATURE_MAKE_SPAN` takes precedence over `span_FEATURE_MAKE_SPAN_TO_STD`. Default is undefined.
+
+-D<b>span_FEATURE_MAKE_SPAN_TO_STD</b>=*n*  
+Define this to the highest C++ language version for which to provide creator functions `nonstd::make_span()`, like 98, 03, 11, 14, 17, 20. You can use 99 for inclusion with any standard, but prefer to use `span_FEATURE_MAKE_SPAN` for this. Note that `span_FEATURE_MAKE_SPAN` takes precedence over `span_FEATURE_MAKE_SPAN_TO_STD`. Default is undefined.
+
+### Provide `byte_span()` functions
+
+-D<b>span_FEATURE_BYTE_SPAN</b>=0  
+Define this to 1 to provide creator functions `nonstd::byte_span()`. Default is undefined.
+
+### Contract violation response macros
+
+*span-lite* provides contract violation response control as suggested in proposal [N4415](http://wg21.link/n4415).
+
+\-D<b>span\_CONFIG\_CONTRACT\_LEVEL\_ON</b>  (*default*)  
+Define this macro to include both `span_EXPECTS` and `span_ENSURES` in the code. This is the default case.
+
+\-D<b>span\_CONFIG\_CONTRACT\_LEVEL\_OFF</b>  
+Define this macro to exclude both `span_EXPECTS` and `span_ENSURES` from the code.
+
+\-D<b>span\_CONFIG_CONTRACT\_LEVEL\_EXPECTS\_ONLY</b>  
+Define this macro to include `span_EXPECTS` in the code and exclude `span_ENSURES` from the code.
+
+\-D<b>span\_CONFIG\_CONTRACT\_LEVEL\_ENSURES\_ONLY</b>  
+Define this macro to exclude `span_EXPECTS` from the code and include `span_ENSURES` in the code.
+
+\-D<b>span\_CONFIG\_CONTRACT\_VIOLATION\_TERMINATES</b>  (*default*)  
+Define this macro to call `std::terminate()` on a contract violation in `span_EXPECTS`, `span_ENSURES`. This is the default case.
+
+\-D<b>span\_CONFIG\_CONTRACT\_VIOLATION\_THROWS</b>  
+Define this macro to throw an exception of implementation-defined type that is derived from `std::runtime_exception` instead of calling `std::terminate()` on a contract violation in `span_EXPECTS` and `span_ENSURES`. See also [disable exceptions](#disable-exceptions).
+
+Reported to work with
+--------------------
+The table below mentions the compiler versions *span lite* is reported to work with.
+
+OS           | Compiler   | Where   | Versions |
+------------:|:-----------|:--------|:---------|
+**GNU/Linux**| Clang/LLVM | Travis  | 3.5.0, 3.6.2, 3.7.1, 3.8.0, 3.9.1, 4.0.1  |
+ &nbsp;      | GCC        | Travis  | 5.5.0, 6.4.0, 7.3.0 |
+**OS X**     | ?          | Local   | ?        |
+**Windows**  | Clang/LLVM | Local   | 6.0.0    |
+&nbsp;       | GCC        | Local   | 7.2.0    |
+&nbsp;       | Visual C++<br>(Visual Studio)| Local | 8 (2005), 10 (2010), 11 (2012),<br>12 (2013), 14 (2015), 15 (2017) |
+&nbsp;       | Visual C++<br>(Visual Studio)| AppVeyor | 10 (2010), 11 (2012),<br>12 (2013), 14 (2015), 15 (2017) |
+
+## Building the tests
+
+To build the tests you need:
+
+- [CMake](http://cmake.org), version 3.0 or later to be installed and in your PATH.
+- A [suitable compiler](#reported-to-work-with).
+
+The [*lest* test framework](https://github.com/martinmoene/lest) is included in the [test folder](test).
+
+The following steps assume that the [*span lite* source code](https://github.com/martinmoene/span-lite) has been cloned into a directory named `./span-lite`.
+
+1. Create a directory for the build outputs.
+
+        cd ./span-lite
+        md build && cd build
+
+2. Configure CMake to use the compiler of your choice (run `cmake --help` for a list).
+
+        cmake -G "Unix Makefiles" -DSPAN_LITE_OPT_BUILD_TESTS=ON ..
+
+3. Optional. You can control above configuration through the following options:
+
+    `-DSPAN_LITE_OPT_BUILD_TESTS=ON`: build the tests for span, default off  
+    `-DSPAN_LITE_OPT_BUILD_EXAMPLES=OFF`: build the examples, default off  
+
+4. Build the test suite.
+
+        cmake --build .
+
+5. Run the test suite.
+
+        ctest -V
+
+All tests should pass, indicating your platform is supported and you are ready to use *span lite*.
+
+## Other implementations of span
+
+- *gsl-lite* [span](https://github.com/martinmoene/gsl-lite/blob/73c4f16f2b35fc174fc2f09d44d5ab13e5c638c3/include/gsl/gsl-lite.hpp#L1221).
+- Microsoft GSL [span](https://github.com/Microsoft/GSL/blob/master/include/gsl/span).
+- Google Abseil [span](https://github.com/abseil/abseil-cpp/blob/master/absl/types/span.h).
+- Marshall Clow's [libc++ span snippet](https://github.com/mclow/snippets/blob/master/span.cpp).
+- Tristan Brindle's [Implementation of C++20's std::span for older compilers](https://github.com/tcbrindle/span).
+- [Search _span c++_ on GitHub](https://github.com/search?l=C%2B%2B&q=span+c%2B%2B&type=Repositories&utf8=%E2%9C%93).
+
+## Notes and references
+
+*Interface and specification*
+
+- [span on cppreference](https://en.cppreference.com/w/cpp/container/span).
+- [p0122 - C++20 Proposal](http://wg21.link/p0122).
+- [span in C++20 Working Draft](http://eel.is/c++draft/views).
+
+*Presentations*
+
+- TBD
+
+*Proposals*
+
+- [p0122 - span: bounds-safe views for sequences of objects](http://wg21.link/p0122).
+- [p1024 - Usability Enhancements for std::span](http://wg21.link/p1024).
+- [p1419 - A SFINAE-friendly trait to determine the extent of statically sized containers](http://wg21.link/p1419).  
+- [p0805 - Comparing Containers](http://wg21.link/p0805).
+- [p1085 - Should Span be Regular?](http://wg21.link/p0805).
+- [p0091 - Template argument deduction for class templates](http://wg21.link/p0091).
+- [p0856 - Restrict Access Property for mdspan and span](http://wg21.link/p0856).
+- [p1428 - Subscripts and sizes should be signed](http://wg21.link/p1428).
+- [p1089 - Sizes Should Only span Unsigned](http://wg21.link/p1089).
+- [p1227 - Signed size() functions](http://wg21.link/p1227).
+- [p1872 - span should have size_type, not index_type](http://wg21.link/p1872).
+- [lwg 3101 - span's Container constructors need another constraint](https://cplusplus.github.io/LWG/issue3101).
+- [Reddit - 2018-06 Rapperswil ISO C++ Committee Trip Report](https://www.reddit.com/r/cpp/comments/8prqzm/2018_rapperswil_iso_c_committee_trip_report/)
+- [Reddit - 2018-11 San Diego ISO C++ Committee Trip Report](https://www.reddit.com/r/cpp/comments/9vwvbz/2018_san_diego_iso_c_committee_trip_report_ranges/).
+- [Reddit - 2019-02 Kona ISO C++ Committee Trip Report](https://www.reddit.com/r/cpp/comments/au0c4x/201902_kona_iso_c_committee_trip_report_c20/).
+- [Reddit - 2019-07 Cologne ISO C++ Committee Trip Report](https://www.reddit.com/r/cpp/comments/cfk9de/201907_cologne_iso_c_committee_trip_report_the/)
+- [Reddit - 2019-11 Belfast ISO C++ Committee Trip Report](https://www.reddit.com/r/cpp/comments/dtuov8/201911_belfast_iso_c_committee_trip_report/)
+- <a id="regtyp"></a>Titus Winters. [Revisiting Regular Types](https://abseil.io/blog/20180531-regular-types). Abseil Blog. 31 May 2018.
+
+## Appendix
+
+### A.1 Compile-time information
+
+The version of *span lite* is available via tag `[.version]`. The following tags are available for information on the compiler and on the C++ standard library used: `[.compiler]`, `[.stdc++]`, `[.stdlanguage]` and `[.stdlibrary]`.
+
+### A.2 Span lite test specification
+
+<details>
+<summary>click to expand</summary>
+<p>
+
+```Text
+span<>: Terminates construction from a nullptr and a non-zero size (C++11)
+span<>: Terminates construction from two pointers in the wrong order
+span<>: Terminates construction from a null pointer and a non-zero size
+span<>: Terminates creation of a sub span of the first n elements for n exceeding the span
+span<>: Terminates creation of a sub span of the last n elements for n exceeding the span
+span<>: Terminates creation of a sub span outside the span
+span<>: Terminates access outside the span
+span<>: Throws  on access outside the span via at(): std::out_of_range [span_FEATURE_MEMBER_AT>0][span_CONFIG_NO_EXCEPTIONS=0]
+span<>: Termination throws std::logic_error-derived exception [span_CONFIG_CONTRACT_VIOLATION_THROWS=1]
+span<>: Allows to default-construct
+span<>: Allows to construct from a nullptr and a zero size (C++11)
+span<>: Allows to construct from two pointers
+span<>: Allows to construct from two iterators
+span<>: Allows to construct from two iterators - empty range
+span<>: Allows to construct from an iterator and a size
+span<>: Allows to construct from an iterator and a size - empty range
+span<>: Allows to construct from two pointers to const
+span<>: Allows to construct from a non-null pointer and a size
+span<>: Allows to construct from a non-null pointer to const and a size
+span<>: Allows to construct from a temporary pointer and a size
+span<>: Allows to construct from a temporary pointer to const and a size
+span<>: Allows to construct from any pointer and a zero size (C++98)
+span<>: Allows to construct from a pointer and a size via a deduction guide (C++17)
+span<>: Allows to construct from an iterator and a size via a deduction guide (C++17)
+span<>: Allows to construct from two iterators via a deduction guide (C++17)
+span<>: Allows to construct from a C-array
+span<>: Allows to construct from a C-array via a deduction guide (C++17)
+span<>: Allows to construct from a const C-array
+span<>: Allows to construct from a C-array with size via decay to pointer (potentially dangerous)
+span<>: Allows to construct from a const C-array with size via decay to pointer (potentially dangerous)
+span<>: Allows to construct from a std::initializer_list<> (C++11)
+span<>: Allows to construct from a std::array<> (C++11)
+span<>: Allows to construct from a std::array via a deduction guide (C++17)
+span<>: Allows to construct from a std::array<> with const data (C++11, span_FEATURE_CONSTR..._ELEMENT_TYPE=1)
+span<>: Allows to construct from an empty std::array<> (C++11)
+span<>: Allows to construct from a container (std::vector<>)
+span<>: Allows to construct from a container via a deduction guide (std::vector<>, C++17)
+span<>: Allows to tag-construct from a container (std::vector<>)
+span<>: Allows to tag-construct from a const container (std::vector<>)
+span<>: Allows to copy-construct from another span of the same type
+span<>: Allows to copy-construct from another span of a compatible type
+span<>: Allows to copy-construct from a temporary span of the same type (C++11)
+span<>: Allows to copy-assign from another span of the same type
+span<>: Allows to copy-assign from a temporary span of the same type (C++11)
+span<>: Allows to create a sub span of the first n elements
+span<>: Allows to create a sub span of the last n elements
+span<>: Allows to create a sub span starting at a given offset
+span<>: Allows to create a sub span starting at a given offset with a given length
+span<>: Allows to observe an element via array indexing
+span<>: Allows to observe an element via call indexing
+span<>: Allows to observe an element via at() [span_FEATURE_MEMBER_AT>0]
+span<>: Allows to observe an element via data()
+span<>: Allows to observe the first element via front() [span_FEATURE_MEMBER_BACK_FRONT=1]
+span<>: Allows to observe the last element via back() [span_FEATURE_MEMBER_BACK_FRONT=1]
+span<>: Allows to change an element via array indexing
+span<>: Allows to change an element via call indexing
+span<>: Allows to change an element via at() [span_FEATURE_MEMBER_AT>0]
+span<>: Allows to change an element via data()
+span<>: Allows to change the first element via front() [span_FEATURE_MEMBER_BACK_FRONT=1]
+span<>: Allows to change the last element via back() [span_FEATURE_MEMBER_BACK_FRONT=1]
+span<>: Allows to swap with another span [span_FEATURE_MEMBER_SWAP=1]
+span<>: Allows forward iteration
+span<>: Allows const forward iteration
+span<>: Allows reverse iteration
+span<>: Allows const reverse iteration
+span<>: Allows to identify if a span is the same as another span [span_FEATURE_SAME=1]
+span<>: Allows to compare equal to another span of the same type [span_FEATURE_COMPARISON=1]
+span<>: Allows to compare unequal to another span of the same type [span_FEATURE_COMPARISON=1]
+span<>: Allows to compare less than another span of the same type [span_FEATURE_COMPARISON=1]
+span<>: Allows to compare less than or equal to another span of the same type [span_FEATURE_COMPARISON=1]
+span<>: Allows to compare greater than another span of the same type [span_FEATURE_COMPARISON=1]
+span<>: Allows to compare greater than or equal to another span of the same type [span_FEATURE_COMPARISON=1]
+span<>: Allows to compare to another span of the same type and different cv-ness [span_FEATURE_SAME=0]
+span<>: Allows to compare empty spans as equal [span_FEATURE_COMPARISON=1]
+span<>: Allows to test for empty span via empty(), empty case
+span<>: Allows to test for empty span via empty(), non-empty case
+span<>: Allows to obtain the number of elements via size()
+span<>: Allows to obtain the number of elements via ssize()
+span<>: Allows to obtain the number of bytes via size_bytes()
+span<>: Allows to view the elements as read-only bytes
+span<>: Allows to view and change the elements as writable bytes
+make_span() [span_FEATURE_MAKE_SPAN_TO_STD=99]
+make_span(): Allows building from two pointers
+make_span(): Allows building from two const pointers
+make_span(): Allows building from a non-null pointer and a size
+make_span(): Allows building from a non-null const pointer and a size
+make_span(): Allows building from a C-array
+make_span(): Allows building from a const C-array
+make_span(): Allows building from a std::initializer_list<> (C++11)
+make_span(): Allows building from a std::array<> (C++11)
+make_span(): Allows building from a const std::array<> (C++11)
+make_span(): Allows building from a container (std::vector<>)
+make_span(): Allows building from a const container (std::vector<>)
+make_span(): Allows building from a container (with_container_t, std::vector<>)
+make_span(): Allows building from a const container (with_container_t, std::vector<>)
+byte_span() [span_FEATURE_BYTE_SPAN=1]
+byte_span(): Allows building a span of std::byte from a single object (C++17, byte-lite)
+byte_span(): Allows building a span of const std::byte from a single const object (C++17, byte-lite)
+first(), last(), subspan() [span_FEATURE_NON_MEMBER_FIRST_LAST_SUB=1]
+first(): Allows to create a sub span of the first n elements
+last(): Allows to create a sub span of the last n elements
+subspan(): Allows to create a sub span starting at a given offset
+size(): Allows to obtain the number of elements via size()
+ssize(): Allows to obtain the number of elements via ssize()
+tuple_size<>: Allows to obtain the number of elements via std::tuple_size<> (C++11)
+tuple_element<>: Allows to obtain an element via std::tuple_element<> (C++11)
+tuple_element<>: Allows to obtain an element via std::tuple_element_t<> (C++11)
+get<I>(spn): Allows to access an element via std::get<>()
+tweak header: reads tweak header if supported [tweak]
+```
+
+</p>
+</details>
diff --git a/dep/span-lite/include/span.hpp b/dep/span-lite/include/span.hpp
new file mode 100644
index 000000000..8ec88e0ad
--- /dev/null
+++ b/dep/span-lite/include/span.hpp
@@ -0,0 +1,1817 @@
+//
+// span for C++98 and later.
+// Based on http://wg21.link/p0122r7
+// For more information see https://github.com/martinmoene/span-lite
+//
+// Copyright 2018-2020 Martin Moene
+//
+// Distributed under the Boost Software License, Version 1.0.
+// (See accompanying file LICENSE.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+#ifndef NONSTD_SPAN_HPP_INCLUDED
+#define NONSTD_SPAN_HPP_INCLUDED
+
+#define span_lite_MAJOR  0
+#define span_lite_MINOR  9
+#define span_lite_PATCH  2
+
+#define span_lite_VERSION  span_STRINGIFY(span_lite_MAJOR) "." span_STRINGIFY(span_lite_MINOR) "." span_STRINGIFY(span_lite_PATCH)
+
+#define span_STRINGIFY(  x )  span_STRINGIFY_( x )
+#define span_STRINGIFY_( x )  #x
+
+// span configuration:
+
+#define span_SPAN_DEFAULT  0
+#define span_SPAN_NONSTD   1
+#define span_SPAN_STD      2
+
+// tweak header support:
+
+#ifdef __has_include
+# if __has_include(<nonstd/span.tweak.hpp>)
+#  include <nonstd/span.tweak.hpp>
+# endif
+#define span_HAVE_TWEAK_HEADER  1
+#else
+#define span_HAVE_TWEAK_HEADER  0
+//# pragma message("span.hpp: Note: Tweak header not supported.")
+#endif
+
+// span selection and configuration:
+
+#define span_HAVE( feature )  ( span_HAVE_##feature )
+
+#ifndef  span_CONFIG_SELECT_SPAN
+# define span_CONFIG_SELECT_SPAN  ( span_HAVE_STD_SPAN ? span_SPAN_STD : span_SPAN_NONSTD )
+#endif
+
+#ifndef  span_CONFIG_EXTENT_TYPE
+# define span_CONFIG_EXTENT_TYPE  std::size_t
+#endif
+
+#ifndef  span_CONFIG_SIZE_TYPE
+# define span_CONFIG_SIZE_TYPE  std::size_t
+#endif
+
+#ifdef span_CONFIG_INDEX_TYPE
+# error `span_CONFIG_INDEX_TYPE` is deprecated since v0.7.0; it is replaced by `span_CONFIG_SIZE_TYPE`.
+#endif
+
+// span configuration (features):
+
+#ifndef  span_FEATURE_WITH_CONTAINER
+#ifdef   span_FEATURE_WITH_CONTAINER_TO_STD
+# define span_FEATURE_WITH_CONTAINER  span_IN_STD( span_FEATURE_WITH_CONTAINER_TO_STD )
+#else
+# define span_FEATURE_WITH_CONTAINER  0
+#endif
+#endif
+
+#ifndef  span_FEATURE_CONSTRUCTION_FROM_STDARRAY_ELEMENT_TYPE
+# define span_FEATURE_CONSTRUCTION_FROM_STDARRAY_ELEMENT_TYPE  0
+#endif
+
+#ifndef  span_FEATURE_MEMBER_AT
+# define span_FEATURE_MEMBER_AT  0
+#endif
+
+#ifndef  span_FEATURE_MEMBER_BACK_FRONT
+# define span_FEATURE_MEMBER_BACK_FRONT  1
+#endif
+
+#ifndef  span_FEATURE_MEMBER_CALL_OPERATOR
+# define span_FEATURE_MEMBER_CALL_OPERATOR  0
+#endif
+
+#ifndef  span_FEATURE_MEMBER_SWAP
+# define span_FEATURE_MEMBER_SWAP  0
+#endif
+
+#ifndef  span_FEATURE_NON_MEMBER_FIRST_LAST_SUB
+# define span_FEATURE_NON_MEMBER_FIRST_LAST_SUB  0
+#endif
+
+#ifndef  span_FEATURE_COMPARISON
+# define span_FEATURE_COMPARISON  0  // Note: C++20 does not provide comparison
+#endif
+
+#ifndef  span_FEATURE_SAME
+# define span_FEATURE_SAME  0
+#endif
+
+#if span_FEATURE_SAME && !span_FEATURE_COMPARISON
+# error `span_FEATURE_SAME` requires `span_FEATURE_COMPARISON`
+#endif
+
+#ifndef  span_FEATURE_MAKE_SPAN
+#ifdef   span_FEATURE_MAKE_SPAN_TO_STD
+# define span_FEATURE_MAKE_SPAN  span_IN_STD( span_FEATURE_MAKE_SPAN_TO_STD )
+#else
+# define span_FEATURE_MAKE_SPAN  0
+#endif
+#endif
+
+#ifndef  span_FEATURE_BYTE_SPAN
+# define span_FEATURE_BYTE_SPAN  0
+#endif
+
+// Control presence of exception handling (try and auto discover):
+
+#ifndef span_CONFIG_NO_EXCEPTIONS
+# if _MSC_VER
+#  include <cstddef>    // for _HAS_EXCEPTIONS
+# endif
+# if defined(__cpp_exceptions) || defined(__EXCEPTIONS) || (_HAS_EXCEPTIONS)
+#  define span_CONFIG_NO_EXCEPTIONS  0
+# else
+#  define span_CONFIG_NO_EXCEPTIONS  1
+#  undef  span_CONFIG_CONTRACT_VIOLATION_THROWS
+#  undef  span_CONFIG_CONTRACT_VIOLATION_TERMINATES
+#  define span_CONFIG_CONTRACT_VIOLATION_THROWS  0
+#  define span_CONFIG_CONTRACT_VIOLATION_TERMINATES  1
+# endif
+#endif
+
+// Control pre- and postcondition violation behaviour:
+
+#if    defined( span_CONFIG_CONTRACT_LEVEL_ON )
+# define        span_CONFIG_CONTRACT_LEVEL_MASK  0x11
+#elif  defined( span_CONFIG_CONTRACT_LEVEL_OFF )
+# define        span_CONFIG_CONTRACT_LEVEL_MASK  0x00
+#elif  defined( span_CONFIG_CONTRACT_LEVEL_EXPECTS_ONLY )
+# define        span_CONFIG_CONTRACT_LEVEL_MASK  0x01
+#elif  defined( span_CONFIG_CONTRACT_LEVEL_ENSURES_ONLY )
+# define        span_CONFIG_CONTRACT_LEVEL_MASK  0x10
+#else
+# define        span_CONFIG_CONTRACT_LEVEL_MASK  0x11
+#endif
+
+#if    defined( span_CONFIG_CONTRACT_VIOLATION_THROWS )
+# define        span_CONFIG_CONTRACT_VIOLATION_THROWS_V  span_CONFIG_CONTRACT_VIOLATION_THROWS
+#else
+# define        span_CONFIG_CONTRACT_VIOLATION_THROWS_V  0
+#endif
+
+#if    defined( span_CONFIG_CONTRACT_VIOLATION_THROWS     ) && span_CONFIG_CONTRACT_VIOLATION_THROWS && \
+       defined( span_CONFIG_CONTRACT_VIOLATION_TERMINATES ) && span_CONFIG_CONTRACT_VIOLATION_TERMINATES
+# error Please define none or one of span_CONFIG_CONTRACT_VIOLATION_THROWS and span_CONFIG_CONTRACT_VIOLATION_TERMINATES to 1, but not both.
+#endif
+
+// C++ language version detection (C++20 is speculative):
+// Note: VC14.0/1900 (VS2015) lacks too much from C++14.
+
+#ifndef   span_CPLUSPLUS
+# if defined(_MSVC_LANG ) && !defined(__clang__)
+#  define span_CPLUSPLUS  (_MSC_VER == 1900 ? 201103L : _MSVC_LANG )
+# else
+#  define span_CPLUSPLUS  __cplusplus
+# endif
+#endif
+
+#define span_CPP98_OR_GREATER  ( span_CPLUSPLUS >= 199711L )
+#define span_CPP11_OR_GREATER  ( span_CPLUSPLUS >= 201103L )
+#define span_CPP14_OR_GREATER  ( span_CPLUSPLUS >= 201402L )
+#define span_CPP17_OR_GREATER  ( span_CPLUSPLUS >= 201703L )
+#define span_CPP20_OR_GREATER  ( span_CPLUSPLUS >= 202000L )
+
+// C++ language version (represent 98 as 3):
+
+#define span_CPLUSPLUS_V  ( span_CPLUSPLUS / 100 - (span_CPLUSPLUS > 200000 ? 2000 : 1994) )
+
+#define span_IN_STD( v )  ( ((v) == 98 ? 3 : (v)) >= span_CPLUSPLUS_V )
+
+#define span_CONFIG(         feature )  ( span_CONFIG_##feature )
+#define span_FEATURE(        feature )  ( span_FEATURE_##feature )
+#define span_FEATURE_TO_STD( feature )  ( span_IN_STD( span_FEATURE( feature##_TO_STD ) ) )
+
+// Use C++20 std::span if available and requested:
+
+#if span_CPP20_OR_GREATER && defined(__has_include )
+# if __has_include( <span> )
+#  define span_HAVE_STD_SPAN  1
+# else
+#  define span_HAVE_STD_SPAN  0
+# endif
+#else
+# define  span_HAVE_STD_SPAN  0
+#endif
+
+#define  span_USES_STD_SPAN  ( (span_CONFIG_SELECT_SPAN == span_SPAN_STD) || ((span_CONFIG_SELECT_SPAN == span_SPAN_DEFAULT) && span_HAVE_STD_SPAN) )
+
+//
+// Use C++20 std::span:
+//
+
+#if span_USES_STD_SPAN
+
+#include <span>
+
+namespace nonstd {
+
+using std::span;
+
+// Note: C++20 does not provide comparison
+// using std::operator==;
+// using std::operator!=;
+// using std::operator<;
+// using std::operator<=;
+// using std::operator>;
+// using std::operator>=;
+}  // namespace nonstd
+
+#else  // span_USES_STD_SPAN
+
+#include <algorithm>
+
+// Compiler versions:
+//
+// MSVC++  6.0  _MSC_VER == 1200  span_COMPILER_MSVC_VERSION ==  60  (Visual Studio 6.0)
+// MSVC++  7.0  _MSC_VER == 1300  span_COMPILER_MSVC_VERSION ==  70  (Visual Studio .NET 2002)
+// MSVC++  7.1  _MSC_VER == 1310  span_COMPILER_MSVC_VERSION ==  71  (Visual Studio .NET 2003)
+// MSVC++  8.0  _MSC_VER == 1400  span_COMPILER_MSVC_VERSION ==  80  (Visual Studio 2005)
+// MSVC++  9.0  _MSC_VER == 1500  span_COMPILER_MSVC_VERSION ==  90  (Visual Studio 2008)
+// MSVC++ 10.0  _MSC_VER == 1600  span_COMPILER_MSVC_VERSION == 100  (Visual Studio 2010)
+// MSVC++ 11.0  _MSC_VER == 1700  span_COMPILER_MSVC_VERSION == 110  (Visual Studio 2012)
+// MSVC++ 12.0  _MSC_VER == 1800  span_COMPILER_MSVC_VERSION == 120  (Visual Studio 2013)
+// MSVC++ 14.0  _MSC_VER == 1900  span_COMPILER_MSVC_VERSION == 140  (Visual Studio 2015)
+// MSVC++ 14.1  _MSC_VER >= 1910  span_COMPILER_MSVC_VERSION == 141  (Visual Studio 2017)
+// MSVC++ 14.2  _MSC_VER >= 1920  span_COMPILER_MSVC_VERSION == 142  (Visual Studio 2019)
+
+#if defined(_MSC_VER ) && !defined(__clang__)
+# define span_COMPILER_MSVC_VER      (_MSC_VER )
+# define span_COMPILER_MSVC_VERSION  (_MSC_VER / 10 - 10 * ( 5 + (_MSC_VER < 1900 ) ) )
+#else
+# define span_COMPILER_MSVC_VER      0
+# define span_COMPILER_MSVC_VERSION  0
+#endif
+
+#define span_COMPILER_VERSION( major, minor, patch )  ( 10 * ( 10 * (major) + (minor) ) + (patch) )
+
+#if defined(__clang__)
+# define span_COMPILER_CLANG_VERSION  span_COMPILER_VERSION(__clang_major__, __clang_minor__, __clang_patchlevel__)
+#else
+# define span_COMPILER_CLANG_VERSION  0
+#endif
+
+#if defined(__GNUC__) && !defined(__clang__)
+# define span_COMPILER_GNUC_VERSION  span_COMPILER_VERSION(__GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__)
+#else
+# define span_COMPILER_GNUC_VERSION  0
+#endif
+
+// half-open range [lo..hi):
+#define span_BETWEEN( v, lo, hi )  ( (lo) <= (v) && (v) < (hi) )
+
+// Compiler warning suppression:
+
+#if defined(__clang__)
+# pragma clang diagnostic push
+# pragma clang diagnostic ignored "-Wundef"
+# pragma clang diagnostic ignored "-Wmismatched-tags"
+# define span_RESTORE_WARNINGS()   _Pragma( "clang diagnostic pop" )
+
+#elif defined __GNUC__
+# pragma GCC   diagnostic push
+# pragma GCC   diagnostic ignored "-Wundef"
+# define span_RESTORE_WARNINGS()   _Pragma( "GCC diagnostic pop" )
+
+#elif span_COMPILER_MSVC_VER >= 1900
+# define span_DISABLE_MSVC_WARNINGS(codes)  __pragma(warning(push))  __pragma(warning(disable: codes))
+# define span_RESTORE_WARNINGS()            __pragma(warning(pop ))
+
+// Suppress the following MSVC GSL warnings:
+// - C26439, gsl::f.6 : special function 'function' can be declared 'noexcept'
+// - C26440, gsl::f.6 : function 'function' can be declared 'noexcept'
+// - C26472, gsl::t.1 : don't use a static_cast for arithmetic conversions;
+//                      use brace initialization, gsl::narrow_cast or gsl::narrow
+// - C26473: gsl::t.1 : don't cast between pointer types where the source type and the target type are the same
+// - C26481: gsl::b.1 : don't use pointer arithmetic. Use span instead
+// - C26490: gsl::t.1 : don't use reinterpret_cast
+
+span_DISABLE_MSVC_WARNINGS( 26439 26440 26472 26473 26481 26490 )
+
+#else
+# define span_RESTORE_WARNINGS()  /*empty*/
+#endif
+
+// Presence of language and library features:
+
+#ifdef _HAS_CPP0X
+# define span_HAS_CPP0X  _HAS_CPP0X
+#else
+# define span_HAS_CPP0X  0
+#endif
+
+#define span_CPP11_80   (span_CPP11_OR_GREATER || span_COMPILER_MSVC_VER >= 1400)
+#define span_CPP11_90   (span_CPP11_OR_GREATER || span_COMPILER_MSVC_VER >= 1500)
+#define span_CPP11_100  (span_CPP11_OR_GREATER || span_COMPILER_MSVC_VER >= 1600)
+#define span_CPP11_110  (span_CPP11_OR_GREATER || span_COMPILER_MSVC_VER >= 1700)
+#define span_CPP11_120  (span_CPP11_OR_GREATER || span_COMPILER_MSVC_VER >= 1800)
+#define span_CPP11_140  (span_CPP11_OR_GREATER || span_COMPILER_MSVC_VER >= 1900)
+
+#define span_CPP14_000  (span_CPP14_OR_GREATER)
+#define span_CPP14_120  (span_CPP14_OR_GREATER || span_COMPILER_MSVC_VER >= 1800)
+#define span_CPP14_140  (span_CPP14_OR_GREATER || span_COMPILER_MSVC_VER >= 1900)
+
+#define span_CPP17_000  (span_CPP17_OR_GREATER)
+
+// Presence of C++11 language features:
+
+#define span_HAVE_ALIAS_TEMPLATE            span_CPP11_140
+#define span_HAVE_AUTO                      span_CPP11_100
+#define span_HAVE_CONSTEXPR_11              span_CPP11_140
+#define span_HAVE_DEFAULT_FUNCTION_TEMPLATE_ARG  span_CPP11_120
+#define span_HAVE_EXPLICIT_CONVERSION       span_CPP11_140
+#define span_HAVE_INITIALIZER_LIST          span_CPP11_120
+#define span_HAVE_IS_DEFAULT                span_CPP11_140
+#define span_HAVE_IS_DELETE                 span_CPP11_140
+#define span_HAVE_NOEXCEPT                  span_CPP11_140
+#define span_HAVE_NULLPTR                   span_CPP11_100
+#define span_HAVE_STATIC_ASSERT             span_CPP11_100
+
+// Presence of C++14 language features:
+
+#define span_HAVE_CONSTEXPR_14              span_CPP14_000
+
+// Presence of C++17 language features:
+
+#define span_HAVE_DEPRECATED                span_CPP17_000
+#define span_HAVE_NODISCARD                 span_CPP17_000
+#define span_HAVE_NORETURN                  span_CPP17_000
+
+// MSVC: template parameter deduction guides since Visual Studio 2017 v15.7
+
+#if defined(__cpp_deduction_guides)
+# define span_HAVE_DEDUCTION_GUIDES         1
+#else
+# define span_HAVE_DEDUCTION_GUIDES         (span_CPP17_OR_GREATER && ! span_BETWEEN( span_COMPILER_MSVC_VER, 1, 1913 ))
+#endif
+
+// Presence of C++ library features:
+
+#define span_HAVE_ADDRESSOF                 span_CPP17_000
+#define span_HAVE_ARRAY                     span_CPP11_110
+#define span_HAVE_BYTE                      span_CPP17_000
+#define span_HAVE_CONDITIONAL               span_CPP11_120
+#define span_HAVE_CONTAINER_DATA_METHOD    (span_CPP11_140 || ( span_COMPILER_MSVC_VER >= 1500 && span_HAS_CPP0X ))
+#define span_HAVE_DATA                      span_CPP17_000
+#define span_HAVE_LONGLONG                  span_CPP11_80
+#define span_HAVE_REMOVE_CONST              span_CPP11_110
+#define span_HAVE_SNPRINTF                  span_CPP11_140
+#define span_HAVE_STRUCT_BINDING            span_CPP11_120
+#define span_HAVE_TYPE_TRAITS               span_CPP11_90
+
+// Presence of byte-lite:
+
+#ifdef NONSTD_BYTE_LITE_HPP
+# define span_HAVE_NONSTD_BYTE  1
+#else
+# define span_HAVE_NONSTD_BYTE  0
+#endif
+
+// C++ feature usage:
+
+#if span_HAVE_ADDRESSOF
+# define span_ADDRESSOF(x)  std::addressof(x)
+#else
+# define span_ADDRESSOF(x)  (&x)
+#endif
+
+#if span_HAVE_CONSTEXPR_11
+# define span_constexpr constexpr
+#else
+# define span_constexpr /*span_constexpr*/
+#endif
+
+#if span_HAVE_CONSTEXPR_14
+# define span_constexpr14 constexpr
+#else
+# define span_constexpr14 /*span_constexpr*/
+#endif
+
+#if span_HAVE_EXPLICIT_CONVERSION
+# define span_explicit explicit
+#else
+# define span_explicit /*explicit*/
+#endif
+
+#if span_HAVE_IS_DELETE
+# define span_is_delete = delete
+#else
+# define span_is_delete
+#endif
+
+#if span_HAVE_IS_DELETE
+# define span_is_delete_access public
+#else
+# define span_is_delete_access private
+#endif
+
+#if span_HAVE_NOEXCEPT && ! span_CONFIG_CONTRACT_VIOLATION_THROWS_V
+# define span_noexcept noexcept
+#else
+# define span_noexcept /*noexcept*/
+#endif
+
+#if span_HAVE_NULLPTR
+# define span_nullptr nullptr
+#else
+# define span_nullptr NULL
+#endif
+
+#if span_HAVE_DEPRECATED
+# define span_deprecated(msg) [[deprecated(msg)]]
+#else
+# define span_deprecated(msg) /*[[deprecated]]*/
+#endif
+
+#if span_HAVE_NODISCARD
+# define span_nodiscard [[nodiscard]]
+#else
+# define span_nodiscard /*[[nodiscard]]*/
+#endif
+
+#if span_HAVE_NORETURN
+# define span_noreturn [[noreturn]]
+#else
+# define span_noreturn /*[[noreturn]]*/
+#endif
+
+// Other features:
+
+#define span_HAVE_CONSTRAINED_SPAN_CONTAINER_CTOR  span_HAVE_DEFAULT_FUNCTION_TEMPLATE_ARG
+#define span_HAVE_ITERATOR_CTOR                    span_HAVE_DEFAULT_FUNCTION_TEMPLATE_ARG
+
+// Additional includes:
+
+#if span_HAVE( ADDRESSOF )
+# include <memory>
+#endif
+
+#if span_HAVE( ARRAY )
+# include <array>
+#endif
+
+#if span_HAVE( BYTE )
+# include <cstddef>
+#endif
+
+#if span_HAVE( DATA )
+# include <iterator> // for std::data(), std::size()
+#endif
+
+#if span_HAVE( TYPE_TRAITS )
+# include <type_traits>
+#endif
+
+#if ! span_HAVE( CONSTRAINED_SPAN_CONTAINER_CTOR )
+# include <vector>
+#endif
+
+#if span_FEATURE( MEMBER_AT ) > 1
+# include <cstdio>
+#endif
+
+#if ! span_CONFIG( NO_EXCEPTIONS )
+# include <stdexcept>
+#endif
+
+// Contract violation
+
+#define span_ELIDE_CONTRACT_EXPECTS  ( 0 == ( span_CONFIG_CONTRACT_LEVEL_MASK & 0x01 ) )
+#define span_ELIDE_CONTRACT_ENSURES  ( 0 == ( span_CONFIG_CONTRACT_LEVEL_MASK & 0x10 ) )
+
+#if span_ELIDE_CONTRACT_EXPECTS
+# define span_constexpr_exp    span_constexpr
+# define span_EXPECTS( cond )  /* Expect elided */
+#else
+# define span_constexpr_exp    span_constexpr14
+# define span_EXPECTS( cond )  span_CONTRACT_CHECK( "Precondition", cond )
+#endif
+
+#if span_ELIDE_CONTRACT_ENSURES
+# define span_constexpr_ens    span_constexpr
+# define span_ENSURES( cond )  /* Ensures elided */
+#else
+# define span_constexpr_ens    span_constexpr14
+# define span_ENSURES( cond )  span_CONTRACT_CHECK( "Postcondition", cond )
+#endif
+
+#define span_CONTRACT_CHECK( type, cond ) \
+    cond ? static_cast< void >( 0 ) \
+         : nonstd::span_lite::detail::report_contract_violation( span_LOCATION( __FILE__, __LINE__ ) ": " type " violation." )
+
+#ifdef __GNUG__
+# define span_LOCATION( file, line )  file ":" span_STRINGIFY( line )
+#else
+# define span_LOCATION( file, line )  file "(" span_STRINGIFY( line ) ")"
+#endif
+
+// Method enabling
+
+#if span_HAVE( DEFAULT_FUNCTION_TEMPLATE_ARG )
+
+#define span_REQUIRES_0(VA) \
+    template< bool B = (VA), typename std::enable_if<B, int>::type = 0 >
+
+# if span_BETWEEN( span_COMPILER_MSVC_VERSION, 1, 140 )
+// VS 2013 and earlier seem to have trouble with SFINAE for default non-type arguments
+# define span_REQUIRES_T(VA) \
+    , typename = typename std::enable_if< ( VA ), nonstd::span_lite::detail::enabler >::type
+# else
+# define span_REQUIRES_T(VA) \
+    , typename std::enable_if< (VA), int >::type = 0
+# endif
+
+#define span_REQUIRES_R(R, VA) \
+    typename std::enable_if< (VA), R>::type
+
+#define span_REQUIRES_A(VA) \
+    , typename std::enable_if< (VA), void*>::type = nullptr
+
+#else
+
+# define span_REQUIRES_0(VA)    /*empty*/
+# define span_REQUIRES_T(VA)    /*empty*/
+# define span_REQUIRES_R(R, VA) R
+# define span_REQUIRES_A(VA)    /*empty*/
+
+#endif
+
+namespace nonstd {
+namespace span_lite {
+
+// [views.constants], constants
+
+typedef span_CONFIG_EXTENT_TYPE extent_t;
+typedef span_CONFIG_SIZE_TYPE   size_t;
+
+span_constexpr const extent_t dynamic_extent = static_cast<extent_t>( -1 );
+
+template< class T, extent_t Extent = dynamic_extent >
+class span;
+
+// Tag to select span constructor taking a container (prevent ms-gsl warning C26426):
+
+struct with_container_t { span_constexpr with_container_t() span_noexcept {} };
+const  span_constexpr   with_container_t with_container;
+
+// C++11 emulation:
+
+namespace std11 {
+
+#if span_HAVE( REMOVE_CONST )
+
+using std::remove_cv;
+using std::remove_const;
+using std::remove_volatile;
+
+#else
+
+template< class T > struct remove_const            { typedef T type; };
+template< class T > struct remove_const< T const > { typedef T type; };
+
+template< class T > struct remove_volatile               { typedef T type; };
+template< class T > struct remove_volatile< T volatile > { typedef T type; };
+
+template< class T >
+struct remove_cv
+{
+    typedef typename std11::remove_volatile< typename std11::remove_const< T >::type >::type type;
+};
+
+#endif  // span_HAVE( REMOVE_CONST )
+
+#if span_HAVE( TYPE_TRAITS )
+
+using std::is_same;
+using std::is_signed;
+using std::integral_constant;
+using std::true_type;
+using std::false_type;
+using std::remove_reference;
+
+#else
+
+template< class T, T v > struct integral_constant { enum { value = v }; };
+typedef integral_constant< bool, true  > true_type;
+typedef integral_constant< bool, false > false_type;
+
+template< class T, class U > struct is_same : false_type{};
+template< class T          > struct is_same<T, T> : true_type{};
+
+template< typename T >  struct is_signed : false_type {};
+template<> struct is_signed<signed char> : true_type {};
+template<> struct is_signed<signed int > : true_type {};
+template<> struct is_signed<signed long> : true_type {};
+
+#endif
+
+} // namespace std11
+
+// C++17 emulation:
+
+namespace std17 {
+
+template< bool v > struct bool_constant : std11::integral_constant<bool, v>{};
+
+#if span_CPP11_120
+
+template< class...>
+using void_t = void;
+
+#endif
+
+#if span_HAVE( DATA )
+
+using std::data;
+using std::size;
+
+#elif span_HAVE( CONSTRAINED_SPAN_CONTAINER_CTOR )
+
+template< typename T, std::size_t N >
+inline span_constexpr auto size( const T(&)[N] ) span_noexcept -> size_t
+{
+    return N;
+}
+
+template< typename C >
+inline span_constexpr auto size( C const & cont ) -> decltype( cont.size() )
+{
+    return cont.size();
+}
+
+template< typename T, std::size_t N >
+inline span_constexpr auto data( T(&arr)[N] ) span_noexcept -> T*
+{
+    return &arr[0];
+}
+
+template< typename C >
+inline span_constexpr auto data( C & cont ) -> decltype( cont.data() )
+{
+    return cont.data();
+}
+
+template< typename C >
+inline span_constexpr auto data( C const & cont ) -> decltype( cont.data() )
+{
+    return cont.data();
+}
+
+template< typename E >
+inline span_constexpr auto data( std::initializer_list<E> il ) span_noexcept -> E const *
+{
+    return il.begin();
+}
+
+#endif // span_HAVE( DATA )
+
+#if span_HAVE( BYTE )
+using std::byte;
+#elif span_HAVE( NONSTD_BYTE )
+using nonstd::byte;
+#endif
+
+} // namespace std17
+
+// C++20 emulation:
+
+namespace std20 {
+
+#if span_HAVE( DEDUCTION_GUIDES )
+template< class T >
+using iter_reference_t = decltype( *std::declval<T&>() );
+#endif
+
+} // namespace std20
+
+// Implementation details:
+
+namespace detail {
+
+/*enum*/ struct enabler{};
+
+template< typename T >
+bool is_positive( T x )
+{
+    return std11::is_signed<T>::value ? x >= 0 : true;
+}
+
+#if span_HAVE( TYPE_TRAITS )
+
+template< class Q >
+struct is_span_oracle : std::false_type{};
+
+template< class T, span_CONFIG_EXTENT_TYPE Extent >
+struct is_span_oracle< span<T, Extent> > : std::true_type{};
+
+template< class Q >
+struct is_span : is_span_oracle< typename std::remove_cv<Q>::type >{};
+
+template< class Q >
+struct is_std_array_oracle : std::false_type{};
+
+#if span_HAVE( ARRAY )
+
+template< class T, std::size_t Extent >
+struct is_std_array_oracle< std::array<T, Extent> > : std::true_type{};
+
+#endif
+
+template< class Q >
+struct is_std_array : is_std_array_oracle< typename std::remove_cv<Q>::type >{};
+
+template< class Q >
+struct is_array : std::false_type {};
+
+template< class T >
+struct is_array<T[]> : std::true_type {};
+
+template< class T, std::size_t N >
+struct is_array<T[N]> : std::true_type {};
+
+#if span_CPP11_140 && ! span_BETWEEN( span_COMPILER_GNUC_VERSION, 1, 500 )
+
+template< class, class = void >
+struct has_size_and_data : std::false_type{};
+
+template< class C >
+struct has_size_and_data
+<
+    C, std17::void_t<
+        decltype( std17::size(std::declval<C>()) ),
+        decltype( std17::data(std::declval<C>()) ) >
+> : std::true_type{};
+
+template< class, class, class = void >
+struct is_compatible_element : std::false_type {};
+
+template< class C, class E >
+struct is_compatible_element
+<
+    C, E, std17::void_t<
+        decltype( std17::data(std::declval<C>()) ) >
+> : std::is_convertible< typename std::remove_pointer<decltype( std17::data( std::declval<C&>() ) )>::type(*)[], E(*)[] >{};
+
+template< class C >
+struct is_container : std17::bool_constant
+<
+    ! is_span< C >::value
+    && ! is_array< C >::value
+    && ! is_std_array< C >::value
+    &&   has_size_and_data< C >::value
+>{};
+
+template< class C, class E >
+struct is_compatible_container : std17::bool_constant
+<
+    is_container<C>::value
+    && is_compatible_element<C,E>::value
+>{};
+
+#else // span_CPP11_140
+
+template<
+    class C, class E
+        span_REQUIRES_T((
+            ! is_span< C >::value
+            && ! is_array< C >::value
+            && ! is_std_array< C >::value
+            && ( std::is_convertible< typename std::remove_pointer<decltype( std17::data( std::declval<C&>() ) )>::type(*)[], E(*)[] >::value)
+        //  &&   has_size_and_data< C >::value
+        ))
+        , class = decltype( std17::size(std::declval<C>()) )
+        , class = decltype( std17::data(std::declval<C>()) )
+>
+struct is_compatible_container : std::true_type{};
+
+#endif // span_CPP11_140
+
+#endif // span_HAVE( TYPE_TRAITS )
+
+#if ! span_CONFIG( NO_EXCEPTIONS )
+#if   span_FEATURE( MEMBER_AT ) > 1
+
+// format index and size:
+
+#if defined(__clang__)
+# pragma clang diagnostic ignored "-Wlong-long"
+#elif defined __GNUC__
+# pragma GCC   diagnostic ignored "-Wformat=ll"
+# pragma GCC   diagnostic ignored "-Wlong-long"
+#endif
+
+inline void throw_out_of_range( size_t idx, size_t size )
+{
+    const char fmt[] = "span::at(): index '%lli' is out of range [0..%lli)";
+    char buffer[ 2 * 20 + sizeof fmt ];
+    sprintf( buffer, fmt, static_cast<long long>(idx), static_cast<long long>(size) );
+
+    throw std::out_of_range( buffer );
+}
+
+#else // MEMBER_AT
+
+inline void throw_out_of_range( size_t /*idx*/, size_t /*size*/ )
+{
+    throw std::out_of_range( "span::at(): index outside span" );
+}
+#endif  // MEMBER_AT
+#endif  // NO_EXCEPTIONS
+
+#if span_CONFIG( CONTRACT_VIOLATION_THROWS_V )
+
+struct contract_violation : std::logic_error
+{
+    explicit contract_violation( char const * const message )
+        : std::logic_error( message )
+    {}
+};
+
+inline void report_contract_violation( char const * msg )
+{
+    throw contract_violation( msg );
+}
+
+#else // span_CONFIG( CONTRACT_VIOLATION_THROWS_V )
+
+span_noreturn inline void report_contract_violation( char const * /*msg*/ ) span_noexcept
+{
+    std::terminate();
+}
+
+#endif // span_CONFIG( CONTRACT_VIOLATION_THROWS_V )
+
+}  // namespace detail
+
+// Prevent signed-unsigned mismatch:
+
+#define span_sizeof(T)  static_cast<extent_t>( sizeof(T) )
+
+template< class T >
+inline span_constexpr size_t to_size( T size )
+{
+    return static_cast<size_t>( size );
+}
+
+//
+// [views.span] - A view over a contiguous, single-dimension sequence of objects
+//
+template< class T, extent_t Extent /*= dynamic_extent*/ >
+class span
+{
+public:
+    // constants and types
+
+    typedef T element_type;
+    typedef typename std11::remove_cv< T >::type value_type;
+
+    typedef T &       reference;
+    typedef T *       pointer;
+    typedef T const * const_pointer;
+    typedef T const & const_reference;
+
+    typedef size_t    size_type;
+    typedef extent_t  extent_type;
+
+    typedef pointer        iterator;
+    typedef const_pointer  const_iterator;
+
+    typedef std::ptrdiff_t difference_type;
+
+    typedef std::reverse_iterator< iterator >       reverse_iterator;
+    typedef std::reverse_iterator< const_iterator > const_reverse_iterator;
+
+//    static constexpr extent_type extent = Extent;
+    enum { extent = Extent };
+
+    // 26.7.3.2 Constructors, copy, and assignment [span.cons]
+
+    span_REQUIRES_0(
+        ( Extent == 0 ) ||
+        ( Extent == dynamic_extent )
+    )
+    span_constexpr span() span_noexcept
+        : data_( span_nullptr )
+        , size_( 0 )
+    {
+        // span_EXPECTS( data() == span_nullptr );
+        // span_EXPECTS( size() == 0 );
+    }
+
+#if span_HAVE( ITERATOR_CTOR )
+    // Didn't yet succeed in combining the next two constructors:
+
+    span_constexpr_exp span( std::nullptr_t, size_type count )
+        : data_( span_nullptr )
+        , size_( count )
+    {
+        span_EXPECTS( data_ == span_nullptr && count == 0 );
+    }
+
+    template< typename It
+        span_REQUIRES_T((
+            std::is_convertible<decltype(*std::declval<It&>()), element_type>::value
+        ))
+    >
+    span_constexpr_exp span( It first, size_type count )
+        : data_( to_address( first ) )
+        , size_( count )
+    {
+        span_EXPECTS(
+            ( data_ == span_nullptr && count == 0 ) ||
+            ( data_ != span_nullptr && detail::is_positive( count ) )
+        );
+    }
+#else
+    span_constexpr_exp span( pointer ptr, size_type count )
+        : data_( ptr )
+        , size_( count )
+    {
+        span_EXPECTS(
+            ( ptr == span_nullptr && count == 0 ) ||
+            ( ptr != span_nullptr && detail::is_positive( count ) )
+        );
+    }
+#endif
+
+#if span_HAVE( ITERATOR_CTOR )
+    template< typename It, typename End
+        span_REQUIRES_T((
+            std::is_convertible<decltype(*std::declval<It&>()), element_type>::value
+            && ! std::is_convertible<End, std::size_t>::value
+        ))
+     >
+    span_constexpr_exp span( It first, End last )
+        : data_( to_address( first ) )
+        , size_( to_size( last - first ) )
+    {
+        span_EXPECTS(
+             last - first >= 0
+        );
+    }
+#else
+    span_constexpr_exp span( pointer first, pointer last )
+        : data_( first )
+        , size_( to_size( last - first ) )
+    {
+        span_EXPECTS(
+            last - first >= 0
+        );
+    }
+#endif
+
+    template< std::size_t N
+        span_REQUIRES_T((
+            (Extent == dynamic_extent || Extent == static_cast<extent_t>(N))
+            && std::is_convertible< value_type(*)[], element_type(*)[] >::value
+        ))
+    >
+    span_constexpr span( element_type ( &arr )[ N ] ) span_noexcept
+        : data_( span_ADDRESSOF( arr[0] ) )
+        , size_( N  )
+    {}
+
+#if span_HAVE( ARRAY )
+
+    template< std::size_t N
+        span_REQUIRES_T((
+            (Extent == dynamic_extent || Extent == static_cast<extent_t>(N))
+            && std::is_convertible< value_type(*)[], element_type(*)[] >::value
+        ))
+    >
+# if span_FEATURE( CONSTRUCTION_FROM_STDARRAY_ELEMENT_TYPE )
+        span_constexpr span( std::array< element_type, N > & arr ) span_noexcept
+# else
+        span_constexpr span( std::array< value_type, N > & arr ) span_noexcept
+# endif
+        : data_( arr.data() )
+        , size_( to_size( arr.size() ) )
+    {}
+
+    template< std::size_t N
+# if span_HAVE( DEFAULT_FUNCTION_TEMPLATE_ARG )
+        span_REQUIRES_T((
+            (Extent == dynamic_extent || Extent == static_cast<extent_t>(N))
+            && std::is_convertible< value_type(*)[], element_type(*)[] >::value
+        ))
+# endif
+    >
+    span_constexpr span( std::array< value_type, N> const & arr ) span_noexcept
+        : data_( arr.data() )
+        , size_( to_size( arr.size() ) )
+    {}
+
+#endif // span_HAVE( ARRAY )
+
+#if span_HAVE( CONSTRAINED_SPAN_CONTAINER_CTOR )
+    template< class Container
+        span_REQUIRES_T((
+            detail::is_compatible_container< Container, element_type >::value
+        ))
+    >
+    span_constexpr span( Container & cont )
+        : data_( std17::data( cont ) )
+        , size_( to_size( std17::size( cont ) ) )
+    {}
+
+    template< class Container
+        span_REQUIRES_T((
+            std::is_const< element_type >::value
+            && detail::is_compatible_container< Container, element_type >::value
+        ))
+    >
+    span_constexpr span( Container const & cont )
+        : data_( std17::data( cont ) )
+        , size_( to_size( std17::size( cont ) ) )
+    {}
+
+#endif // span_HAVE( CONSTRAINED_SPAN_CONTAINER_CTOR )
+
+#if span_FEATURE( WITH_CONTAINER )
+
+    template< class Container >
+    span_constexpr span( with_container_t, Container & cont )
+        : data_( cont.size() == 0 ? span_nullptr : span_ADDRESSOF( cont[0] ) )
+        , size_( to_size( cont.size() ) )
+    {}
+
+    template< class Container >
+    span_constexpr span( with_container_t, Container const & cont )
+        : data_( cont.size() == 0 ? span_nullptr : const_cast<pointer>( span_ADDRESSOF( cont[0] ) ) )
+        , size_( to_size( cont.size() ) )
+    {}
+#endif
+
+#if span_HAVE( IS_DEFAULT )
+    span_constexpr span( span const & other ) span_noexcept = default;
+
+    ~span() span_noexcept = default;
+
+    span_constexpr14 span & operator=( span const & other ) span_noexcept = default;
+#else
+    span_constexpr span( span const & other ) span_noexcept
+        : data_( other.data_ )
+        , size_( other.size_ )
+    {}
+
+    ~span() span_noexcept
+    {}
+
+    span_constexpr14 span & operator=( span const & other ) span_noexcept
+    {
+        data_ = other.data_;
+        size_ = other.size_;
+
+        return *this;
+    }
+#endif
+
+    template< class OtherElementType, extent_type OtherExtent
+        span_REQUIRES_T((
+            (Extent == dynamic_extent || Extent == OtherExtent)
+            && std::is_convertible<OtherElementType(*)[], element_type(*)[]>::value
+        ))
+    >
+    span_constexpr_exp span( span<OtherElementType, OtherExtent> const & other ) span_noexcept
+        : data_( reinterpret_cast<pointer>( other.data() ) )
+        , size_( other.size() )
+    {
+        span_EXPECTS( OtherExtent == dynamic_extent || other.size() == to_size(OtherExtent) );
+    }
+
+    // 26.7.3.3 Subviews [span.sub]
+
+    template< extent_type Count >
+    span_constexpr_exp span< element_type, Count >
+    first() const
+    {
+        span_EXPECTS( detail::is_positive( Count ) && Count <= size() );
+
+        return span< element_type, Count >( data(), Count );
+    }
+
+    template< extent_type Count >
+    span_constexpr_exp span< element_type, Count >
+    last() const
+    {
+        span_EXPECTS( detail::is_positive( Count ) && Count <= size() );
+
+        return span< element_type, Count >( data() + (size() - Count), Count );
+    }
+
+#if span_HAVE( DEFAULT_FUNCTION_TEMPLATE_ARG )
+    template< size_type Offset, extent_type Count = dynamic_extent >
+#else
+    template< size_type Offset, extent_type Count /*= dynamic_extent*/ >
+#endif
+    span_constexpr_exp span< element_type, Count >
+    subspan() const
+    {
+        span_EXPECTS(
+            ( detail::is_positive( Offset ) && Offset <= size() ) &&
+            ( Count == dynamic_extent || (detail::is_positive( Count ) && Count + Offset <= size()) )
+        );
+
+        return span< element_type, Count >(
+            data() + Offset, Count != dynamic_extent ? Count : (Extent != dynamic_extent ? Extent - Offset : size() - Offset) );
+    }
+
+    span_constexpr_exp span< element_type, dynamic_extent >
+    first( size_type count ) const
+    {
+        span_EXPECTS( detail::is_positive( count ) && count <= size() );
+
+        return span< element_type, dynamic_extent >( data(), count );
+    }
+
+    span_constexpr_exp span< element_type, dynamic_extent >
+    last( size_type count ) const
+    {
+        span_EXPECTS( detail::is_positive( count ) && count <= size() );
+
+        return span< element_type, dynamic_extent >( data() + ( size() - count ), count );
+    }
+
+    span_constexpr_exp span< element_type, dynamic_extent >
+    subspan( size_type offset, size_type count = static_cast<size_type>(dynamic_extent) ) const
+    {
+        span_EXPECTS(
+            ( ( detail::is_positive( offset ) && offset <= size() ) ) &&
+            ( count == static_cast<size_type>(dynamic_extent) || ( detail::is_positive( count ) && offset + count <= size() ) )
+        );
+
+        return span< element_type, dynamic_extent >(
+            data() + offset, count == static_cast<size_type>(dynamic_extent) ? size() - offset : count );
+    }
+
+    // 26.7.3.4 Observers [span.obs]
+
+    span_constexpr size_type size() const span_noexcept
+    {
+        return size_;
+    }
+
+    span_constexpr std::ptrdiff_t ssize() const span_noexcept
+    {
+        return static_cast<std::ptrdiff_t>( size_ );
+    }
+
+    span_constexpr size_type size_bytes() const span_noexcept
+    {
+        return size() * to_size( sizeof( element_type ) );
+    }
+
+    span_nodiscard span_constexpr bool empty() const span_noexcept
+    {
+        return size() == 0;
+    }
+
+    // 26.7.3.5 Element access [span.elem]
+
+    span_constexpr_exp reference operator[]( size_type idx ) const
+    {
+        span_EXPECTS( detail::is_positive( idx ) && idx < size() );
+
+        return *( data() + idx );
+    }
+
+#if span_FEATURE( MEMBER_CALL_OPERATOR )
+    span_deprecated("replace operator() with operator[]")
+
+    span_constexpr_exp reference operator()( size_type idx ) const
+    {
+        span_EXPECTS( detail::is_positive( idx ) && idx < size() );
+
+        return *( data() + idx );
+    }
+#endif
+
+#if span_FEATURE( MEMBER_AT )
+    span_constexpr14 reference at( size_type idx ) const
+    {
+#if span_CONFIG( NO_EXCEPTIONS )
+        return this->operator[]( idx );
+#else
+        if ( !detail::is_positive( idx ) || size() <= idx )
+        {
+            detail::throw_out_of_range( idx, size() );
+        }
+        return *( data() + idx );
+#endif
+    }
+#endif
+
+    span_constexpr pointer data() const span_noexcept
+    {
+        return data_;
+    }
+
+#if span_FEATURE( MEMBER_BACK_FRONT )
+
+    span_constexpr_exp reference front() const span_noexcept
+    {
+        span_EXPECTS( ! empty() );
+
+        return *data();
+    }
+
+    span_constexpr_exp reference back() const span_noexcept
+    {
+        span_EXPECTS( ! empty() );
+
+        return *( data() + size() - 1 );
+    }
+
+#endif
+
+    // xx.x.x.x Modifiers [span.modifiers]
+
+#if span_FEATURE( MEMBER_SWAP )
+
+    span_constexpr14 void swap( span & other ) span_noexcept
+    {
+        using std::swap;
+        swap( data_, other.data_ );
+        swap( size_, other.size_ );
+    }
+#endif
+
+    // 26.7.3.6 Iterator support [span.iterators]
+
+    span_constexpr iterator begin() const span_noexcept
+    {
+#if span_CPP11_OR_GREATER
+        return { data() };
+#else
+        return iterator( data() );
+#endif
+    }
+
+    span_constexpr iterator end() const span_noexcept
+    {
+#if span_CPP11_OR_GREATER
+        return { data() + size() };
+#else
+        return iterator( data() + size() );
+#endif
+    }
+
+    span_constexpr const_iterator cbegin() const span_noexcept
+    {
+#if span_CPP11_OR_GREATER
+        return { data() };
+#else
+        return const_iterator( data() );
+#endif
+    }
+
+    span_constexpr const_iterator cend() const span_noexcept
+    {
+#if span_CPP11_OR_GREATER
+        return { data() + size() };
+#else
+        return const_iterator( data() + size() );
+#endif
+    }
+
+    span_constexpr reverse_iterator rbegin() const span_noexcept
+    {
+        return reverse_iterator( end() );
+    }
+
+    span_constexpr reverse_iterator rend() const span_noexcept
+    {
+        return reverse_iterator( begin() );
+    }
+
+    span_constexpr const_reverse_iterator crbegin() const span_noexcept
+    {
+        return const_reverse_iterator ( cend() );
+    }
+
+    span_constexpr const_reverse_iterator crend() const span_noexcept
+    {
+        return const_reverse_iterator( cbegin() );
+    }
+
+private:
+
+    // Note: C++20 has std::pointer_traits<Ptr>::to_address( it );
+
+#if span_HAVE( ITERATOR_CTOR )
+    static inline span_constexpr pointer to_address( std::nullptr_t ) span_noexcept
+    {
+        return nullptr;
+    }
+
+    template< typename U >
+    static inline span_constexpr U * to_address( U * p ) span_noexcept
+    {
+        return p;
+    }
+
+    template< typename Ptr
+        span_REQUIRES_T(( ! std::is_pointer<Ptr>::value ))
+    >
+    static inline span_constexpr pointer to_address( Ptr const & it ) span_noexcept
+    {
+        return to_address( it.operator->() );
+    }
+#endif // span_HAVE( ITERATOR_CTOR )
+
+private:
+    pointer   data_;
+    size_type size_;
+};
+
+// class template argument deduction guides:
+
+#if span_HAVE( DEDUCTION_GUIDES )
+
+template< class T, size_t N >
+span( T (&)[N] ) -> span<T, static_cast<extent_t>(N)>;
+
+template< class T, size_t N >
+span( std::array<T, N> & ) -> span<T, static_cast<extent_t>(N)>;
+
+template< class T, size_t N >
+span( std::array<T, N> const & ) -> span<const T, static_cast<extent_t>(N)>;
+
+#if span_HAVE( CONSTRAINED_SPAN_CONTAINER_CTOR )
+
+template< class Container >
+span( Container& ) -> span<typename Container::value_type>;
+
+template< class Container >
+span( Container const & ) -> span<const typename Container::value_type>;
+
+#endif
+
+// iterator: constraints: It satisfies contiguous_­iterator.
+
+template< class It, class EndOrSize >
+span( It, EndOrSize ) -> span< typename std11::remove_reference< typename std20::iter_reference_t<It> >::type >;
+
+#endif // span_HAVE( DEDUCTION_GUIDES )
+
+// 26.7.3.7 Comparison operators [span.comparison]
+
+#if span_FEATURE( COMPARISON )
+#if span_FEATURE( SAME )
+
+template< class T1, extent_t E1, class T2, extent_t E2  >
+inline span_constexpr bool same( span<T1,E1> const & l, span<T2,E2> const & r ) span_noexcept
+{
+    return std11::is_same<T1, T2>::value
+        && l.size() == r.size()
+        && static_cast<void const*>( l.data() ) == r.data();
+}
+
+#endif
+
+template< class T1, extent_t E1, class T2, extent_t E2  >
+inline span_constexpr bool operator==( span<T1,E1> const & l, span<T2,E2> const & r )
+{
+    return
+#if span_FEATURE( SAME )
+        same( l, r ) ||
+#endif
+        ( l.size() == r.size() && std::equal( l.begin(), l.end(), r.begin() ) );
+}
+
+template< class T1, extent_t E1, class T2, extent_t E2  >
+inline span_constexpr bool operator<( span<T1,E1> const & l, span<T2,E2> const & r )
+{
+    return std::lexicographical_compare( l.begin(), l.end(), r.begin(), r.end() );
+}
+
+template< class T1, extent_t E1, class T2, extent_t E2  >
+inline span_constexpr bool operator!=( span<T1,E1> const & l, span<T2,E2> const & r )
+{
+    return !( l == r );
+}
+
+template< class T1, extent_t E1, class T2, extent_t E2  >
+inline span_constexpr bool operator<=( span<T1,E1> const & l, span<T2,E2> const & r )
+{
+    return !( r < l );
+}
+
+template< class T1, extent_t E1, class T2, extent_t E2  >
+inline span_constexpr bool operator>( span<T1,E1> const & l, span<T2,E2> const & r )
+{
+    return ( r < l );
+}
+
+template< class T1, extent_t E1, class T2, extent_t E2  >
+inline span_constexpr bool operator>=( span<T1,E1> const & l, span<T2,E2> const & r )
+{
+    return !( l < r );
+}
+
+#endif // span_FEATURE( COMPARISON )
+
+// 26.7.2.6 views of object representation [span.objectrep]
+
+#if span_HAVE( BYTE ) || span_HAVE( NONSTD_BYTE )
+
+// Avoid MSVC 14.1 (1910), VS 2017: warning C4307: '*': integral constant overflow:
+
+template< typename T, extent_t Extent >
+struct BytesExtent
+{
+#if span_CPP11_OR_GREATER
+    enum ET : extent_t { value = span_sizeof(T) * Extent };
+#else
+    enum ET { value = span_sizeof(T) * Extent };
+#endif
+};
+
+template< typename T >
+struct BytesExtent< T, dynamic_extent >
+{
+#if span_CPP11_OR_GREATER
+    enum ET : extent_t { value = dynamic_extent };
+#else
+    enum ET { value = dynamic_extent };
+#endif
+};
+
+template< class T, extent_t Extent >
+inline span_constexpr span< const std17::byte, BytesExtent<T, Extent>::value >
+as_bytes( span<T,Extent> spn ) span_noexcept
+{
+#if 0
+    return { reinterpret_cast< std17::byte const * >( spn.data() ), spn.size_bytes() };
+#else
+    return span< const std17::byte, BytesExtent<T, Extent>::value >(
+        reinterpret_cast< std17::byte const * >( spn.data() ), spn.size_bytes() );  // NOLINT
+#endif
+}
+
+template< class T, extent_t Extent >
+inline span_constexpr span< std17::byte, BytesExtent<T, Extent>::value >
+as_writable_bytes( span<T,Extent> spn ) span_noexcept
+{
+#if 0
+    return { reinterpret_cast< std17::byte * >( spn.data() ), spn.size_bytes() };
+#else
+    return span< std17::byte, BytesExtent<T, Extent>::value >(
+        reinterpret_cast< std17::byte * >( spn.data() ), spn.size_bytes() );  // NOLINT
+#endif
+}
+
+#endif // span_HAVE( BYTE ) || span_HAVE( NONSTD_BYTE )
+
+// extensions: non-member views:
+// this feature implies the presence of make_span()
+
+#if span_FEATURE( NON_MEMBER_FIRST_LAST_SUB ) && span_CPP11_120
+
+template< extent_t Count, class T >
+span_constexpr auto
+first( T & t ) -> decltype( make_span(t).template first<Count>() )
+{
+    return make_span( t ).template first<Count>();
+}
+
+template< class T >
+span_constexpr auto
+first( T & t, size_t count ) -> decltype( make_span(t).first(count) )
+{
+    return make_span( t ).first( count );
+}
+
+template< extent_t Count, class T >
+span_constexpr auto
+last( T & t ) -> decltype( make_span(t).template last<Count>() )
+{
+    return make_span(t).template last<Count>();
+}
+
+template< class T >
+span_constexpr auto
+last( T & t, extent_t count ) -> decltype( make_span(t).last(count) )
+{
+    return make_span( t ).last( count );
+}
+
+template< size_t Offset, extent_t Count = dynamic_extent, class T >
+span_constexpr auto
+subspan( T & t ) -> decltype( make_span(t).template subspan<Offset, Count>() )
+{
+    return make_span( t ).template subspan<Offset, Count>();
+}
+
+template< class T >
+span_constexpr auto
+subspan( T & t, size_t offset, extent_t count = dynamic_extent ) -> decltype( make_span(t).subspan(offset, count) )
+{
+    return make_span( t ).subspan( offset, count );
+}
+
+#endif // span_FEATURE( NON_MEMBER_FIRST_LAST_SUB )
+
+// 27.8 Container and view access [iterator.container]
+
+template< class T, extent_t Extent /*= dynamic_extent*/ >
+span_constexpr std::size_t size( span<T,Extent> const & spn )
+{
+    return static_cast<std::size_t>( spn.size() );
+}
+
+template< class T, extent_t Extent /*= dynamic_extent*/ >
+span_constexpr std::ptrdiff_t ssize( span<T,Extent> const & spn )
+{
+    return static_cast<std::ptrdiff_t>( spn.size() );
+}
+
+}  // namespace span_lite
+}  // namespace nonstd
+
+// make available in nonstd:
+
+namespace nonstd {
+
+using span_lite::dynamic_extent;
+
+using span_lite::span;
+
+using span_lite::with_container;
+
+#if span_FEATURE( COMPARISON )
+#if span_FEATURE( SAME )
+using span_lite::same;
+#endif
+
+using span_lite::operator==;
+using span_lite::operator!=;
+using span_lite::operator<;
+using span_lite::operator<=;
+using span_lite::operator>;
+using span_lite::operator>=;
+#endif
+
+#if span_HAVE( BYTE )
+using span_lite::as_bytes;
+using span_lite::as_writable_bytes;
+#endif
+
+using span_lite::size;
+using span_lite::ssize;
+
+}  // namespace nonstd
+
+#endif  // span_USES_STD_SPAN
+
+// make_span() [span-lite extension]:
+
+#if span_FEATURE( MAKE_SPAN ) || span_FEATURE( NON_MEMBER_FIRST_LAST_SUB )
+
+#if span_USES_STD_SPAN
+# define  span_constexpr  constexpr
+# define  span_noexcept   noexcept
+# define  span_nullptr    nullptr
+# ifndef  span_CONFIG_EXTENT_TYPE
+#  define span_CONFIG_EXTENT_TYPE  std::size_t
+# endif
+using extent_t = span_CONFIG_EXTENT_TYPE;
+#endif  // span_USES_STD_SPAN
+
+namespace nonstd {
+namespace span_lite {
+
+template< class T >
+inline span_constexpr span<T>
+make_span( T * ptr, size_t count ) span_noexcept
+{
+    return span<T>( ptr, count );
+}
+
+template< class T >
+inline span_constexpr span<T>
+make_span( T * first, T * last ) span_noexcept
+{
+    return span<T>( first, last );
+}
+
+template< class T, std::size_t N >
+inline span_constexpr span<T, static_cast<extent_t>(N)>
+make_span( T ( &arr )[ N ] ) span_noexcept
+{
+    return span<T, static_cast<extent_t>(N)>( &arr[ 0 ], N );
+}
+
+#if span_USES_STD_SPAN || span_HAVE( ARRAY )
+
+template< class T, std::size_t N >
+inline span_constexpr span<T, static_cast<extent_t>(N)>
+make_span( std::array< T, N > & arr ) span_noexcept
+{
+    return span<T, static_cast<extent_t>(N)>( arr );
+}
+
+template< class T, std::size_t N >
+inline span_constexpr span< const T, static_cast<extent_t>(N) >
+make_span( std::array< T, N > const & arr ) span_noexcept
+{
+    return span<const T, static_cast<extent_t>(N)>( arr );
+}
+
+#endif // span_HAVE( ARRAY )
+
+#if span_USES_STD_SPAN
+
+template< class Container, class EP = decltype( std::data(std::declval<Container&>())) >
+inline span_constexpr auto
+make_span( Container & cont ) span_noexcept -> span< typename std::remove_pointer<EP>::type >
+{
+    return span< typename std::remove_pointer<EP>::type >( cont );
+}
+
+template< class Container, class EP = decltype( std::data(std::declval<Container&>())) >
+inline span_constexpr auto
+make_span( Container const & cont ) span_noexcept -> span< const typename std::remove_pointer<EP>::type >
+{
+    return span< const typename std::remove_pointer<EP>::type >( cont );
+}
+
+#elif span_HAVE( CONSTRAINED_SPAN_CONTAINER_CTOR ) && span_HAVE( AUTO )
+
+template< class Container, class EP = decltype( std17::data(std::declval<Container&>())) >
+inline span_constexpr auto
+make_span( Container & cont ) span_noexcept -> span< typename std::remove_pointer<EP>::type >
+{
+    return span< typename std::remove_pointer<EP>::type >( cont );
+}
+
+template< class Container, class EP = decltype( std17::data(std::declval<Container&>())) >
+inline span_constexpr auto
+make_span( Container const & cont ) span_noexcept -> span< const typename std::remove_pointer<EP>::type >
+{
+    return span< const typename std::remove_pointer<EP>::type >( cont );
+}
+
+#else
+
+template< class T >
+inline span_constexpr span<T>
+make_span( span<T> spn ) span_noexcept
+{
+    return spn;
+}
+
+template< class T, class Allocator >
+inline span_constexpr span<T>
+make_span( std::vector<T, Allocator> & cont ) span_noexcept
+{
+    return span<T>( with_container, cont );
+}
+
+template< class T, class Allocator >
+inline span_constexpr span<const T>
+make_span( std::vector<T, Allocator> const & cont ) span_noexcept
+{
+    return span<const T>( with_container, cont );
+}
+
+#endif // span_USES_STD_SPAN || ( ... )
+
+#if ! span_USES_STD_SPAN && span_FEATURE( WITH_CONTAINER )
+
+template< class Container >
+inline span_constexpr span<typename Container::value_type>
+make_span( with_container_t, Container & cont ) span_noexcept
+{
+    return span< typename Container::value_type >( with_container, cont );
+}
+
+template< class Container >
+inline span_constexpr span<const typename Container::value_type>
+make_span( with_container_t, Container const & cont ) span_noexcept
+{
+    return span< const typename Container::value_type >( with_container, cont );
+}
+
+#endif // ! span_USES_STD_SPAN && span_FEATURE( WITH_CONTAINER )
+
+
+}  // namespace span_lite
+}  // namespace nonstd
+
+// make available in nonstd:
+
+namespace nonstd {
+using span_lite::make_span;
+}  // namespace nonstd
+
+#endif // #if span_FEATURE_TO_STD( MAKE_SPAN )
+
+#if span_CPP11_OR_GREATER && span_FEATURE( BYTE_SPAN ) && ( span_HAVE( BYTE ) || span_HAVE( NONSTD_BYTE ) )
+
+namespace nonstd {
+namespace span_lite {
+
+template< class T >
+inline span_constexpr auto
+byte_span( T & t ) span_noexcept -> span< std17::byte, span_sizeof(T) >
+{
+    return span< std17::byte, span_sizeof(t) >( reinterpret_cast< std17::byte * >( &t ), span_sizeof(T) );
+}
+
+template< class T >
+inline span_constexpr auto
+byte_span( T const & t ) span_noexcept -> span< const std17::byte, span_sizeof(T) >
+{
+    return span< const std17::byte, span_sizeof(t) >( reinterpret_cast< std17::byte const * >( &t ), span_sizeof(T) );
+}
+
+}  // namespace span_lite
+}  // namespace nonstd
+
+// make available in nonstd:
+
+namespace nonstd {
+using span_lite::byte_span;
+}  // namespace nonstd
+
+#endif // span_FEATURE( BYTE_SPAN )
+
+#if span_HAVE( STRUCT_BINDING )
+
+#if   span_CPP14_OR_GREATER
+# include <tuple>
+#elif span_CPP11_OR_GREATER
+# include <tuple>
+namespace std {
+    template< std::size_t I, typename T >
+    using tuple_element_t = typename tuple_element<I, T>::type;
+}
+#else
+namespace std {
+    template< typename T >
+    class tuple_size; /*undefined*/
+
+    template< std::size_t I, typename T >
+    class tuple_element; /* undefined */
+}
+#endif // span_CPP14_OR_GREATER
+
+namespace std {
+
+// 26.7.X Tuple interface
+
+// std::tuple_size<>:
+
+template< typename ElementType, nonstd::span_lite::extent_t Extent >
+class tuple_size< nonstd::span<ElementType, Extent> > : public integral_constant<size_t, static_cast<size_t>(Extent)> {};
+
+// std::tuple_size<>: Leave undefined for dynamic extent:
+
+template< typename ElementType >
+class tuple_size< nonstd::span<ElementType, nonstd::dynamic_extent> >;
+
+// std::tuple_element<>:
+
+template< size_t I, typename ElementType, nonstd::span_lite::extent_t Extent >
+class tuple_element< I, nonstd::span<ElementType, Extent> >
+{
+public:
+#if span_HAVE( STATIC_ASSERT )
+    static_assert( Extent != nonstd::dynamic_extent && I < Extent, "tuple_element<I,span>: dynamic extent or index out of range" );
+#endif
+    using type = ElementType;
+};
+
+// std::get<>(), 2 variants:
+
+template< size_t I, typename ElementType, nonstd::span_lite::extent_t Extent >
+span_constexpr ElementType & get( nonstd::span<ElementType, Extent> & spn ) span_noexcept
+{
+#if span_HAVE( STATIC_ASSERT )
+    static_assert( Extent != nonstd::dynamic_extent && I < Extent, "get<>(span): dynamic extent or index out of range" );
+#endif
+    return spn[I];
+}
+
+template< size_t I, typename ElementType, nonstd::span_lite::extent_t Extent >
+span_constexpr ElementType const & get( nonstd::span<ElementType, Extent> const & spn ) span_noexcept
+{
+#if span_HAVE( STATIC_ASSERT )
+    static_assert( Extent != nonstd::dynamic_extent && I < Extent, "get<>(span): dynamic extent or index out of range" );
+#endif
+    return spn[I];
+}
+
+} // end namespace std
+
+#endif // span_HAVE( STRUCT_BINDING )
+
+#if ! span_USES_STD_SPAN
+span_RESTORE_WARNINGS()
+#endif  // span_USES_STD_SPAN
+
+#endif  // NONSTD_SPAN_HPP_INCLUDED
diff --git a/distros/beowulf/control b/distros/beowulf/control
index dd410c0ba..28135f583 100644
--- a/distros/beowulf/control
+++ b/distros/beowulf/control
@@ -5,7 +5,6 @@ Maintainer: Isaac Connor <isaac@zoneminder.com>
 Uploaders: Isaac Connor <isaac@zoneminder.com>
 Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2
               ,cmake
-              ,libx264-dev, libmp4v2-dev
               ,libavdevice-dev
               ,libavcodec-dev
               ,libavformat-dev
@@ -34,7 +33,6 @@ Build-Depends: debhelper, sphinx-doc, dh-linktree, dh-apache2
               ,libdata-entropy-perl
 # Unbundled (dh_linktree):
         ,libjs-jquery
-        ,libjs-mootools
 Standards-Version: 3.9.8
 Homepage: http://www.zoneminder.com/
 Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
@@ -44,7 +42,6 @@ Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,javascript-common
-        ,libmp4v2-2, libx264-155
         ,libswscale5
         ,libswresample3
         ,ffmpeg
diff --git a/distros/beowulf/copyright b/distros/beowulf/copyright
index c48025a25..a932efa2f 100644
--- a/distros/beowulf/copyright
+++ b/distros/beowulf/copyright
@@ -9,7 +9,6 @@ Comment:
  <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
 Files-Excluded:
     web/skins/*/js/jquery-*
-    web/tools/mootools/*-yc.js
 
 Files: *
 Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
@@ -37,11 +36,6 @@ Comment:
  Includes Sizzle.js http://sizzlejs.com/
  Released under the MIT, BSD, and GPL Licenses.
 
-Files: web/tools/mootools/*.js
-Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
-           2006-2010 Valerio Proietti (http://mad4milk.net/)
-License: Expat
-
 Files: web/api/*
 Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
 License: Expat
diff --git a/distros/beowulf/source/lintian-overrides b/distros/beowulf/source/lintian-overrides
index 3669e5de8..f905a5a2f 100644
--- a/distros/beowulf/source/lintian-overrides
+++ b/distros/beowulf/source/lintian-overrides
@@ -1,9 +1,5 @@
-## Actually sources are there: "*-nc.js".
-source-is-missing web/tools/mootools/mootools-*-yc.js
-
 ## We're using "libjs-jquery" instead.
-source-is-missing web/skins/*/js/jquery-1.4.2.min.js
+source-is-missing web/skins/*/js/jquery-3.5.1.min.js
 
 ## Acknowledged, will repack eventually.
-source-contains-prebuilt-javascript-object web/tools/mootools/mootools-*-yc.js
-source-contains-prebuilt-javascript-object web/skins/*/js/jquery-1.4.2.min.js
+source-contains-prebuilt-javascript-object web/skins/*/js/jquery-3.5.1.min.js
diff --git a/distros/beowulf/zoneminder.linktrees b/distros/beowulf/zoneminder.linktrees
index 2e843bbf1..8a9ca2723 100644
--- a/distros/beowulf/zoneminder.linktrees
+++ b/distros/beowulf/zoneminder.linktrees
@@ -1,14 +1,6 @@
 ## cakephp
 #replace  /usr/share/php/Cake					/usr/share/zoneminder/www/api/lib/Cake
 
-## libjs-mootools
-replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core.js
-replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-nc.js
-replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-yc.js
-replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more.js
-replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-nc.js
-replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-yc.js
-
 ## libjs-jquery
-replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/classic/js/jquery-1.4.2.min.js
-replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/flat/js/jquery-1.4.2.min.js
+replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/classic/js/jquery-3.5.1.min.js
+replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/flat/js/jquery-3.5.1.min.js
diff --git a/distros/beowulf/zoneminder.postinst b/distros/beowulf/zoneminder.postinst
index 603786ff6..032595355 100644
--- a/distros/beowulf/zoneminder.postinst
+++ b/distros/beowulf/zoneminder.postinst
@@ -39,9 +39,9 @@ if [ "$1" = "configure" ]; then
             exit 1;
           fi
           # This creates the user.
-          echo "grant lock tables, alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+          echo "grant lock tables, alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute, REFERENCES on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
         else
-          echo "grant lock tables, alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+          echo "grant lock tables, alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute, REFERENCES on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
         fi
 
         zmupdate.pl --nointeractive
diff --git a/distros/redhat/CMakeLists.txt b/distros/redhat/CMakeLists.txt
index 45cafe57d..e3e05c54e 100644
--- a/distros/redhat/CMakeLists.txt
+++ b/distros/redhat/CMakeLists.txt
@@ -7,12 +7,12 @@
 
 # Display a message to show the RHEL build options are being processed.
 if(ZM_TARGET_DISTRO MATCHES "^el")
-    message([STATUS] "Starting RHEL Build Options" ...)
+  message([STATUS] "Starting RHEL Build Options" ...)
 elseif(ZM_TARGET_DISTRO MATCHES "^fc")
-    message([STATUS] "Starting Fedora Build Options" ...)
-else(ZM_TARGET_DISTRO MATCHES "^el")
-    message([WARNING] "Unknown Build Option Detected" ...)
-endif(ZM_TARGET_DISTRO MATCHES "^el")
+  message([STATUS] "Starting Fedora Build Options" ...)
+else()
+  message([WARNING] "Unknown Build Option Detected" ...)
+endif()
 
 #
 # CONFIGURE STAGE
diff --git a/distros/redhat/readme/README.httpd b/distros/redhat/readme/README.httpd
index 1ba0ee688..32004a92d 100644
--- a/distros/redhat/readme/README.httpd
+++ b/distros/redhat/readme/README.httpd
@@ -15,9 +15,11 @@ NOTE: EL7 users should replace "dnf" with "yum" in the instructions below.
    set during the previous step, you will need to create the ZoneMinder
    database and configure a database account for ZoneMinder to use:
 
-     mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
-     mysql -uroot -p -e "grant all on zm.* to \
-                        'zmuser'@localhost identified by 'zmpass';"
+     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
+     mysql -u root -p -e "CREATE USER 'zmuser'@'localhost' \
+                          IDENTIFIED BY 'zmpass';"
+     mysql -u root -p -e "GRANT ALL PRIVILEGES ON zm.* TO \
+                         'zmuser'@localhost;"
      mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
diff --git a/distros/redhat/readme/README.nginx b/distros/redhat/readme/README.nginx
index 8bc3bbdc1..2a15d9544 100644
--- a/distros/redhat/readme/README.nginx
+++ b/distros/redhat/readme/README.nginx
@@ -13,9 +13,11 @@ New installs
    set during the previous step, you will need to create the ZoneMinder
    database and configure a database account for ZoneMinder to use:
 
-     mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
-     mysql -uroot -p -e "grant all on zm.* to \
-                        'zmuser'@localhost identified by 'zmpass';"
+     mysql -u root -p < /usr/share/zoneminder/db/zm_create.sql
+     mysql -u root -p -e "CREATE USER 'zmuser'@'localhost' \
+                          IDENTIFIED BY 'zmpass';"
+     mysql -u root -p -e "GRANT ALL PRIVILEGES ON zm.* TO \
+                         'zmuser'@localhost;"
      mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
@@ -44,10 +46,7 @@ New installs
 
 5. Disable SELinux 
 
-   We currently do not have the resources to create and maintain an accurate
-   SELinux policy for ZoneMinder on Fedora. We will gladly accept pull
-   reqeusts from anyone who wishes to do the work. In the meantime, SELinux
-   will need to be disabled or put into permissive mode.
+   SELinux must be disabled or put into permissive mode. This is not optional!
    
    To immediately disbale SELinux for the current seesion, issue the following
    from the command line:
@@ -78,11 +77,20 @@ New installs
      sudo ln -sf /etc/zm/www/zoneminder.nginx.conf /etc/nginx/conf.d/
      sudo ln -sf /etc/zm/www/redirect.nginx.conf /etc/nginx/default.d/
 
-7. Edit /etc/sysconfig/fcgiwrap and set DAEMON_PROCS to the maximum number of
+7. Configure and start fcgiwrap
+
+   Edit /etc/sysconfig/fcgiwrap and set DAEMON_PROCS to the maximum number of
    simulatneous streams the server should support. Generally, a good minimum 
    value for this equals the total number of cameras you expect to view at the
    same time.
 
+   Enable the fcgiwrap *socket* in the following manner:
+
+     sudo systemctl enable --now fcgiwrap@nginx.socket
+
+   Do NOT try to start the fcgiwrap service! It must be triggered by the
+   socket to work properly.
+
 8. Now start the web server:
 
      sudo systemctl enable nginx
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 9e876324e..8c0773911 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -3,11 +3,14 @@
 %global zmgid_final apache
 
 # Crud is configured as a git submodule
-%global crud_version 3.1.0-zm
+%global crud_version 3.2.0
 
 # CakePHP-Enum-Behavior is configured as a git submodule
 %global ceb_version 1.0-zm
 
+# RtspServer is configured as a git submodule
+%global rtspserver_commit     cd7fd49becad6010a1b8466bfebbd93999a39878
+
 %global sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
 %global sslkey %{_sysconfdir}/pki/tls/private/localhost.key
 
@@ -28,11 +31,10 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.35.6
+Version: 1.35.28
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
-# Mootools is under the MIT license: http://mootools.net/
 # jQuery is under the MIT license: https://jquery.org/license/
 # CakePHP is under the MIT license: https://github.com/cakephp/cakephp
 # Crud is under the MIT license: https://github.com/FriendsOfCake/crud
@@ -40,12 +42,14 @@ Group: System Environment/Daemons
 # Bootstrap is under the MIT license: https://getbootstrap.com/docs/4.5/about/license/
 # Bootstrap-table is under the MIT license: https://bootstrap-table.com/docs/about/license/
 # font-awesome is under CC-BY license: https://fontawesome.com/license/free
+# RtspServer is under the MIT license: https://github.com/PHZ76/RtspServer/blob/master/LICENSE
 License: GPLv2+ and LGPLv2+ and MIT
 URL: http://www.zoneminder.com/
 
 Source0: https://github.com/ZoneMinder/ZoneMinder/archive/%{version}.tar.gz#/zoneminder-%{version}.tar.gz
-Source1: https://github.com/ZoneMinder/crud/archive/v%{crud_version}.tar.gz#/crud-%{crud_version}.tar.gz
+Source1: https://github.com/FriendsOfCake/crud/archive/v%{crud_version}.tar.gz#/crud-%{crud_version}.tar.gz
 Source2: https://github.com/ZoneMinder/CakePHP-Enum-Behavior/archive/%{ceb_version}.tar.gz#/cakephp-enum-behavior-%{ceb_version}.tar.gz
+Source3: https://github.com/ZoneMinder/RtspServer/archive/%{rtspserver_commit}.tar.gz#/RtspServer-%{rtspserver_commit}.tar.gz
 
 %{?rhel:BuildRequires: epel-rpm-macros}
 BuildRequires: systemd-devel
@@ -89,10 +93,6 @@ BuildRequires: zlib-devel
 BuildRequires: ffmpeg
 BuildRequires: ffmpeg-devel
 
-# Required for mp4 container support
-BuildRequires: libmp4v2-devel
-BuildRequires: x264-devel
-
 # Allow existing user base to seamlessly transition to sub-packages
 Requires: %{name}-common%{?_isa} = %{version}-%{release}
 Requires: %{name}-httpd%{?_isa} = %{version}-%{release}
@@ -202,12 +202,14 @@ gzip -dc %{_sourcedir}/cakephp-enum-behavior-%{ceb_version}.tar.gz | tar -xvvf -
 rm -rf ./web/api/app/Plugin/CakePHP-Enum-Behavior
 mv -f CakePHP-Enum-Behavior-%{ceb_version} ./web/api/app/Plugin/CakePHP-Enum-Behavior
 
+gzip -dc %{_sourcedir}/RtspServer-%{rtspserver_commit}.tar.gz | tar -xvvf -
+rm -rf ./dep/RtspServer
+mv -f RtspServer-%{rtspserver_commit} ./dep/RtspServer
+
 # Change the following default values
 ./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
 ./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
 ./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
-./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
-./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no
 
 %build
 # Disable LTO due to top level asm
@@ -263,6 +265,32 @@ fi
 echo -e "\nVERY IMPORTANT: Before starting ZoneMinder, you must read the README file\nto finish the installation or upgrade!"
 echo -e "\nThe README file is located here: %{_pkgdocdir}-common/README\n"
 
+# Neither the Apache nor Nginx packages create an SSL certificate anymore, so lets do that here
+if [ -f %{sslkey} -o -f %{sslcert} ]; then
+   exit 0
+fi
+
+umask 077
+%{_bindir}/openssl genrsa -rand /proc/cpuinfo:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/uptime 2048 > %{sslkey} 2> /dev/null
+
+FQDN=`hostname`
+# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress
+if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then
+   FQDN=localhost.localdomain
+fi
+
+cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
+         -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \
+         -out %{sslcert} 2>/dev/null
+--
+SomeState
+SomeCity
+SomeOrganization
+SomeOrganizationalUnit
+${FQDN}
+root@${FQDN}
+EOF
+
 %post httpd
 # For the case of changing from nginx <-> httpd, files in these folders must change ownership if they exist
 %{_bindir}/chown -R %{zmuid_final}:%{zmgid_final} %{_sharedstatedir}/php/session/* >/dev/null 2>&1 || :
@@ -294,32 +322,6 @@ ln -sf %{_sysconfdir}/zm/www/zoneminder.nginx.conf %{_sysconfdir}/zm/www/zonemin
 %{_bindir}/gpasswd -a nginx video >/dev/null 2>&1 || :
 %{_bindir}/gpasswd -a nginx dialout >/dev/null 2>&1 || :
 
-# Nginx does not create an SSL certificate like the apache package does so lets do that here
-if [ -f %{sslkey} -o -f %{sslcert} ]; then
-   exit 0
-fi
-
-umask 077
-%{_bindir}/openssl genrsa -rand /proc/apm:/proc/cpuinfo:/proc/dma:/proc/filesystems:/proc/interrupts:/proc/ioports:/proc/pci:/proc/rtc:/proc/uptime 2048 > %{sslkey} 2> /dev/null
-
-FQDN=`hostname`
-# A >59 char FQDN means "root@FQDN" exceeds 64-char max length for emailAddress
-if [ "x${FQDN}" = "x" -o ${#FQDN} -gt 59 ]; then
-   FQDN=localhost.localdomain
-fi
-
-cat << EOF | %{_bindir}/openssl req -new -key %{sslkey} \
-         -x509 -sha256 -days 365 -set_serial $RANDOM -extensions v3_req \
-         -out %{sslcert} 2>/dev/null
---
-SomeState
-SomeCity
-SomeOrganization
-SomeOrganizationalUnit
-${FQDN}
-root@${FQDN}
-EOF
-
 %preun
 %systemd_preun %{name}.service
 
@@ -348,7 +350,6 @@ EOF
 %{_datadir}/polkit-1/actions/com.zoneminder.systemctl.policy
 %{_bindir}/zmsystemctl.pl
 
-%{_bindir}/zma
 %{_bindir}/zmaudit.pl
 %{_bindir}/zmc
 %{_bindir}/zmcontrol.pl
@@ -368,6 +369,7 @@ EOF
 %{_bindir}/zmonvif-trigger.pl
 %{_bindir}/zmstats.pl
 %{_bindir}/zmrecover.pl
+%{_bindir}/zm_rtsp_server
 
 %{perl_vendorlib}/ZoneMinder*
 %{perl_vendorlib}/ONVIF*
@@ -423,6 +425,10 @@ EOF
 %dir %attr(755,nginx,nginx) %{_localstatedir}/log/zoneminder
 
 %changelog
+* Wed Apr 07 2021 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.35.23-1
+- 1.35.23 Development snapshot
+- Build against rtspserver
+
 * Tue Feb 04 2020 Andrew Bauer <zonexpertconsulting@outlook.com> - 1.34.2-1
 - 1.34.2 Release
 
diff --git a/distros/ubuntu1504_cmake_split_packages/control b/distros/ubuntu1504_cmake_split_packages/control
index b24d67cf2..d4be60413 100644
--- a/distros/ubuntu1504_cmake_split_packages/control
+++ b/distros/ubuntu1504_cmake_split_packages/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9), po-debconf (>= 1.0), autoconf, automake, libtoo
 , libvlccore-dev, libvlc-dev
 , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
 , libgcrypt11-dev | libgcrypt20-dev, libpolkit-gobject-1-dev
-, libdbi-perl, libnet-sftp-foreign-perl, libexpect-perl, libmime-tools-perl, libx264-dev, libmp4v2-dev
+, libdbi-perl, libnet-sftp-foreign-perl, libexpect-perl, libmime-tools-perl
 Standards-Version: 3.9.6
 Homepage: http://www.zoneminder.com/
 
@@ -75,7 +75,7 @@ Depends: libzoneminder-perl (= ${source:Version}),
  libdbi-perl, libmodule-load-conditional-perl, libmime-lite-perl,
  libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
  debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, zip,
- policykit-1, apache2, libmp4v2-2, libpcre++0
+ policykit-1, apache2, libpcre++0
 , libsys-cpu-perl, libsys-meminfo-perl
 , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
 Description: Core binaries and perl scripts for ZoneMinder
diff --git a/distros/ubuntu1504_cmake_split_packages/rules b/distros/ubuntu1504_cmake_split_packages/rules
index f6169c495..4cf1e0c58 100755
--- a/distros/ubuntu1504_cmake_split_packages/rules
+++ b/distros/ubuntu1504_cmake_split_packages/rules
@@ -15,7 +15,6 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 CFLAGS = -Wall
-CPPFLAGS = -D__STDC_CONSTANT_MACROS
 CXXFLAGS = -DHAVE_LIBCRYPTO
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
@@ -73,7 +72,7 @@ override_dh_auto_test:
 override_dh_clean:
 	# Add here commands to clean up after the build process.
 	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean src/zm_config_defines.h
+	dh_clean zm_config_defines.h
 	#
 	# Delete remaining auto-generated Makefile if Makefile.in exists
 	find $(CURDIR)/ -type f -name "Makefile" | while read file; do \
diff --git a/distros/ubuntu1604/control b/distros/ubuntu1604/control
index 34af7cef1..0def73f60 100644
--- a/distros/ubuntu1604/control
+++ b/distros/ubuntu1604/control
@@ -3,9 +3,8 @@ Section: net
 Priority: optional
 Maintainer: Isaac Connor <isaac@zoneminder.com>
 Uploaders: Isaac Connor <isaac@zoneminder.com>
-Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree, dh-systemd, dh-apache2
+Build-Depends: debhelper (>= 9), dh-systemd, python3-sphinx, apache2-dev, dh-linktree, dh-systemd, dh-apache2
               ,cmake
-              ,libx264-dev, libmp4v2-dev
               ,libavdevice-dev (>= 6:10~)
               ,libavcodec-dev (>= 6:10~)
               ,libavformat-dev  (>= 6:10~)
@@ -34,9 +33,6 @@ Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apa
               ,libcrypt-eksblowfish-perl
               ,libdata-entropy-perl
               ,libvncserver-dev
-# Unbundled (dh_linktree):
-        ,libjs-jquery
-        ,libjs-mootools
 Standards-Version: 3.9.8
 Homepage: http://www.zoneminder.com/
 Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
@@ -46,7 +42,6 @@ Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,javascript-common
-        ,libmp4v2-2, libx264-142|libx264-148|libx264-152|libx264-155
         ,libswscale-ffmpeg3|libswscale4|libswscale3|libswscale5
         ,libswresample2|libswresample3|libswresample24|libswresample-ffmpeg1
         ,ffmpeg | libav-tools
@@ -134,7 +129,7 @@ Package: zoneminder-doc
 Section: doc
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python-sphinx-rtd-theme | python3-sphinx-rtd-theme
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python3-sphinx-rtd-theme
 Suggests: www-browser
 Description: ZoneMinder documentation
  ZoneMinder is intended for use in single or multi-camera video security
diff --git a/distros/ubuntu1604/copyright b/distros/ubuntu1604/copyright
index c48025a25..a932efa2f 100644
--- a/distros/ubuntu1604/copyright
+++ b/distros/ubuntu1604/copyright
@@ -9,7 +9,6 @@ Comment:
  <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
 Files-Excluded:
     web/skins/*/js/jquery-*
-    web/tools/mootools/*-yc.js
 
 Files: *
 Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
@@ -37,11 +36,6 @@ Comment:
  Includes Sizzle.js http://sizzlejs.com/
  Released under the MIT, BSD, and GPL Licenses.
 
-Files: web/tools/mootools/*.js
-Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
-           2006-2010 Valerio Proietti (http://mad4milk.net/)
-License: Expat
-
 Files: web/api/*
 Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
 License: Expat
diff --git a/distros/ubuntu1604/source/lintian-overrides b/distros/ubuntu1604/source/lintian-overrides
index 3669e5de8..f905a5a2f 100644
--- a/distros/ubuntu1604/source/lintian-overrides
+++ b/distros/ubuntu1604/source/lintian-overrides
@@ -1,9 +1,5 @@
-## Actually sources are there: "*-nc.js".
-source-is-missing web/tools/mootools/mootools-*-yc.js
-
 ## We're using "libjs-jquery" instead.
-source-is-missing web/skins/*/js/jquery-1.4.2.min.js
+source-is-missing web/skins/*/js/jquery-3.5.1.min.js
 
 ## Acknowledged, will repack eventually.
-source-contains-prebuilt-javascript-object web/tools/mootools/mootools-*-yc.js
-source-contains-prebuilt-javascript-object web/skins/*/js/jquery-1.4.2.min.js
+source-contains-prebuilt-javascript-object web/skins/*/js/jquery-3.5.1.min.js
diff --git a/distros/ubuntu1604/zoneminder.dirs b/distros/ubuntu1604/zoneminder.dirs
index 6db3d5a95..3c7237bf3 100644
--- a/distros/ubuntu1604/zoneminder.dirs
+++ b/distros/ubuntu1604/zoneminder.dirs
@@ -5,5 +5,6 @@ var/cache/zoneminder/images
 var/cache/zoneminder/temp
 var/cache/zoneminder/cache
 usr/share/zoneminder/db
+usr/share/zoneminder/fonts
 etc/zm/
 etc/zm/conf.d
diff --git a/distros/ubuntu1604/zoneminder.install b/distros/ubuntu1604/zoneminder.install
index 67b135de5..17364c744 100644
--- a/distros/ubuntu1604/zoneminder.install
+++ b/distros/ubuntu1604/zoneminder.install
@@ -5,6 +5,7 @@ usr/lib/zoneminder
 usr/share/polkit-1
 usr/share/zoneminder/db
 usr/share/zoneminder/www
+usr/share/zoneminder/fonts
 
 # libzoneminder-perl files:
 usr/share/man/man3
diff --git a/distros/ubuntu1604/zoneminder.linktrees b/distros/ubuntu1604/zoneminder.linktrees
index 2e843bbf1..61edb4173 100644
--- a/distros/ubuntu1604/zoneminder.linktrees
+++ b/distros/ubuntu1604/zoneminder.linktrees
@@ -1,14 +1,6 @@
 ## cakephp
 #replace  /usr/share/php/Cake					/usr/share/zoneminder/www/api/lib/Cake
 
-## libjs-mootools
-replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core.js
-replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-nc.js
-replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-yc.js
-replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more.js
-replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-nc.js
-replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-yc.js
-
 ## libjs-jquery
-replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/classic/js/jquery-1.4.2.min.js
-replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/flat/js/jquery-1.4.2.min.js
+#replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/classic/js/jquery-3.5.1.min.js
+#replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/flat/js/jquery-3.5.1.min.js
diff --git a/distros/ubuntu1604/zoneminder.postinst b/distros/ubuntu1604/zoneminder.postinst
index 7b7af708b..ae362a495 100644
--- a/distros/ubuntu1604/zoneminder.postinst
+++ b/distros/ubuntu1604/zoneminder.postinst
@@ -12,9 +12,7 @@ if [ "$1" = "configure" ]; then
   # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
   chown www-data:root /var/log/zm
   chown www-data:www-data /var/lib/zm
-  if [ -z "$2" ]; then
-    chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
-  fi
+  chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
   if [ ! -e "/etc/apache2/mods-enabled/cgi.load" ] && [ "$(command -v a2enmod)" != "" ]; then
     echo "The cgi module is not enabled in apache2.  I am enabling it using a2enmod cgi."
     a2enmod cgi
@@ -67,11 +65,19 @@ if [ "$1" = "configure" ]; then
             # This creates the user.
             echo "CREATE USER '${ZM_DB_USER}'@localhost IDENTIFIED BY '${ZM_DB_PASS}';" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
         fi
-        echo "Updating permissions"
-        echo "grant lock tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute  on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+        echo "Updating permissions for user ${ZM_DB_USER}@localhost"
+        echo "GRANT LOCK TABLES,ALTER,DROP,SELECT,INSERT,UPDATE,DELETE,CREATE,INDEX,ALTER ROUTINE,CREATE ROUTINE, TRIGGER,EXECUTE,REFERENCES ON ${ZM_DB_NAME}.* TO '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
 
-        zmupdate.pl --nointeractive
+        zmupdate.pl -s --nointeractive
+        if [ $? -ne 0 ]; then
+          echo "Error updating db."
+          exit 1;
+        fi
         zmupdate.pl --nointeractive -f
+        if [ $? -ne 0 ]; then
+          echo "Error updating config."
+          exit 1;
+        fi
 
         # Add any new PTZ control configurations to the database (will not overwrite)
         zmcamtool.pl --import >/dev/null 2>&1
@@ -86,6 +92,8 @@ if [ "$1" = "configure" ]; then
   else
     echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)."
   fi
+
+  echo "Done Updating; starting ZoneMinder."
   deb-systemd-invoke restart zoneminder.service
 
 fi
diff --git a/distros/ubuntu2004/TODO.Debian b/distros/ubuntu2004/TODO
similarity index 100%
rename from distros/ubuntu2004/TODO.Debian
rename to distros/ubuntu2004/TODO
diff --git a/distros/ubuntu2004/compat b/distros/ubuntu2004/compat
index ec635144f..48082f72f 100644
--- a/distros/ubuntu2004/compat
+++ b/distros/ubuntu2004/compat
@@ -1 +1 @@
-9
+12
diff --git a/distros/ubuntu2004/conf/apache2/zoneminder.conf b/distros/ubuntu2004/conf/apache2/zoneminder.conf
index e3164d36c..ae9f0dc3b 100644
--- a/distros/ubuntu2004/conf/apache2/zoneminder.conf
+++ b/distros/ubuntu2004/conf/apache2/zoneminder.conf
@@ -16,11 +16,6 @@ Alias /zm/cache /var/cache/zoneminder/cache
         # Apache 2.4
         Require all granted
     </IfModule>
-    <IfModule !mod_authz_core.c>
-        # Apache 2.2
-        Order deny,allow
-        Allow from all
-    </IfModule>
 </Directory>
 
 Alias /zm /usr/share/zoneminder/www
diff --git a/distros/ubuntu2004/control b/distros/ubuntu2004/control
index 0a1f9e0de..01c3a8472 100644
--- a/distros/ubuntu2004/control
+++ b/distros/ubuntu2004/control
@@ -2,10 +2,8 @@ Source: zoneminder
 Section: net
 Priority: optional
 Maintainer: Isaac Connor <isaac@zoneminder.com>
-Uploaders: Isaac Connor <isaac@zoneminder.com>
-Build-Depends: debhelper, dh-systemd, sphinx-doc, python3-sphinx, dh-linktree, dh-systemd, dh-apache2
+Build-Depends: debhelper (>= 12), sphinx-doc, python3-sphinx, dh-linktree, dh-apache2
               ,cmake
-              ,libx264-dev, libmp4v2-dev
               ,libavdevice-dev
               ,libavcodec-dev
               ,libavformat-dev
@@ -17,6 +15,7 @@ Build-Depends: debhelper, dh-systemd, sphinx-doc, python3-sphinx, dh-linktree, d
               ,libbz2-dev
               ,libgcrypt20-dev
               ,libcurl4-gnutls-dev
+              ,libjpeg-turbo8-dev | libjpeg62-turbo-dev | libjpeg8-dev | libjpeg9-dev
               ,libturbojpeg0-dev
               ,default-libmysqlclient-dev | libmysqlclient-dev | libmariadbclient-dev-compat
               ,libpcre3-dev
@@ -32,19 +31,15 @@ Build-Depends: debhelper, dh-systemd, sphinx-doc, python3-sphinx, dh-linktree, d
               ,libssl-dev
               ,libcrypt-eksblowfish-perl
               ,libdata-entropy-perl
-# Unbundled (dh_linktree):
-        ,libjs-jquery
-        ,libjs-mootools
-Standards-Version: 3.9.8
-Homepage: http://www.zoneminder.com/
-Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git
+              ,libvncserver-dev
+              ,libjwt-gnutls-dev
+Standards-Version: 4.5.0
+Homepage: https://www.zoneminder.com/
 
 Package: zoneminder
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,javascript-common
-        ,libmp4v2-2, libx264-155
         ,libswscale5
         ,libswresample3
         ,ffmpeg
@@ -71,8 +66,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libdata-uuid-perl
         ,libnumber-bytes-human-perl
         ,libfile-slurp-perl
-        ,mysql-client | mariadb-client | virtual-mysql-client
-        ,perl-modules
+        ,default-mysql-client | mariadb-client | virtual-mysql-client
         ,php-mysql, php-gd, php-apcu, php-apc | php-apcu-bc, php-json
         ,policykit-1
         ,rsyslog | system-log-daemon
@@ -80,11 +74,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
         ,libpcre3
         ,libcrypt-eksblowfish-perl
         ,libdata-entropy-perl
+        ,libvncclient1|libvncclient0
+        ,libjwt-gnutls0
 Recommends: ${misc:Recommends}
            ,libapache2-mod-php | php-fpm
-           ,mysql-server | mariadb-server | virtual-mysql-server
+           ,default-mysql-server | mariadb-server | virtual-mysql-server
            ,zoneminder-doc (>= ${source:Version})
-           ,ffmpeg
 Suggests: fcgiwrap, logrotate
 Description: video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security
@@ -148,7 +143,7 @@ Description: ZoneMinder documentation
 
 Package: zoneminder-dbg
 Section: debug
-Priority: extra
+Priority: optional
 Architecture: any
 Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
 Description: Zoneminder -- debugging symbols
diff --git a/distros/ubuntu2004/copyright b/distros/ubuntu2004/copyright
index c48025a25..64189b0f4 100644
--- a/distros/ubuntu2004/copyright
+++ b/distros/ubuntu2004/copyright
@@ -1,6 +1,6 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: ZoneMinder
-Upstream-Contact: Philip Coombes <philip.coombes@zoneminder.com>
+Upstream-Contact: Isaac Connor <isaac@zoneminder.com>
 Source: https://github.com/ZoneMinder/ZoneMinder
 Comment:
  This package was originally debianized by matrix <matrix@cecilia>
@@ -9,7 +9,6 @@ Comment:
  <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
 Files-Excluded:
     web/skins/*/js/jquery-*
-    web/tools/mootools/*-yc.js
 
 Files: *
 Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
@@ -37,11 +36,6 @@ Comment:
  Includes Sizzle.js http://sizzlejs.com/
  Released under the MIT, BSD, and GPL Licenses.
 
-Files: web/tools/mootools/*.js
-Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
-           2006-2010 Valerio Proietti (http://mad4milk.net/)
-License: Expat
-
 Files: web/api/*
 Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
 License: Expat
diff --git a/distros/ubuntu2004/rules b/distros/ubuntu2004/rules
index 5a1cdb500..c137a9da2 100755
--- a/distros/ubuntu2004/rules
+++ b/distros/ubuntu2004/rules
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
@@ -12,13 +11,14 @@ ARGS:= -DZM_NO_MMAP=ON
 endif
 
 %:
-	dh $@ --parallel --buildsystem=cmake --builddirectory=dbuild \
-            --with systemd,sphinxdoc,apache2,linktree
+	dh $@ --buildsystem=cmake --builddirectory=dbuild \
+            --with sphinxdoc,apache2,linktree
 
 override_dh_auto_configure:
 	dh_auto_configure -- $(ARGS)                  \
             -DCMAKE_VERBOSE_MAKEFILE=ON                \
             -DCMAKE_BUILD_TYPE=Release                 \
+						-DBUILD_MAN=0 \
             -DZM_CONFIG_DIR="/etc/zm"                  \
             -DZM_CONFIG_SUBDIR="/etc/zm/conf.d"        \
             -DZM_RUNDIR="/run/zm"                  \
@@ -34,11 +34,26 @@ override_dh_clean:
 	dh_clean $(MANPAGES1)
 	$(RM) -r docs/_build
 
-build-indep:
-	#$(MAKE) -C docs text
+override_dh_auto_build-indep:
 	$(MAKE) -C docs html
+	 dh_auto_build
+
+MANPAGES1 = \
+		dbuild/scripts/zmupdate.pl.1 \
+    dbuild/scripts/zmaudit.pl.1     \
+    dbuild/scripts/zmcamtool.pl.1   \
+    dbuild/scripts/zmcontrol.pl.1   \
+    dbuild/scripts/zmdc.pl.1        \
+    dbuild/scripts/zmfilter.pl.1    \
+    dbuild/scripts/zmpkg.pl.1       \
+    dbuild/scripts/zmsystemctl.pl.1 \
+    dbuild/scripts/zmtelemetry.pl.1 \
+    dbuild/scripts/zmtrack.pl.1     \
+    dbuild/scripts/zmtrigger.pl.1   \
+    dbuild/scripts/zmvideo.pl.1     \
+    dbuild/scripts/zmwatch.pl.1     \
+    dbuild/scripts/zmx10.pl.1
 
-MANPAGES1 = dbuild/scripts/zmupdate.pl.1
 $(MANPAGES1):
 	# generate man page(s):
 	pod2man -s1 --stderr --utf8 $(patsubst %.1, %, $@) $@
@@ -51,7 +66,7 @@ override_dh_installman: $(MANPAGES1)
 	dh_installman --language=C $(MANPAGES1)
 
 override_dh_auto_install:
-	dh_auto_install --destdir=$(CURDIR)/debian/tmp
+	dh_auto_install --arch --destdir=$(CURDIR)/debian/tmp
 	# remove worthless files:
 	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*/*/.packlist
 	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*.in
@@ -67,11 +82,11 @@ override_dh_fixperms:
 	chown root:www-data $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
 	chmod 640 $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
 
-override_dh_systemd_start:
-	dh_systemd_start --no-start
+override_dh_installinit:
+	dh_installinit --no-start
 
-override_dh_systemd_enable:
-	dh_systemd_enable --no-enable
+override_dh_installsystemd:
+	dh_installsystemd --no-enable --no-start
 
 override_dh_apache2:
 	dh_apache2 --noenable
@@ -81,16 +96,3 @@ override_dh_strip:
         && dh_strip --dbg-package=zoneminder-dbg \
         || dh_strip
 
-#%:
-#	dh $@ --parallel --buildsystem=autoconf --with autoreconf
-#
-#override_dh_auto_configure:
-#	dh_auto_configure -- \
-#            --sysconfdir=/etc/zm \
-#            --with-mysql=/usr \
-#            --with-webdir=/usr/share/zoneminder \
-#            --with-ffmpeg=/usr \
-#            --with-cgidir=/usr/lib/cgi-bin \
-#            --with-webuser=www-data \
-#            --with-webgroup=www-data \
-#            --enable-mmap=yes
diff --git a/distros/ubuntu2004/source/lintian-overrides b/distros/ubuntu2004/source/lintian-overrides
index 3669e5de8..f905a5a2f 100644
--- a/distros/ubuntu2004/source/lintian-overrides
+++ b/distros/ubuntu2004/source/lintian-overrides
@@ -1,9 +1,5 @@
-## Actually sources are there: "*-nc.js".
-source-is-missing web/tools/mootools/mootools-*-yc.js
-
 ## We're using "libjs-jquery" instead.
-source-is-missing web/skins/*/js/jquery-1.4.2.min.js
+source-is-missing web/skins/*/js/jquery-3.5.1.min.js
 
 ## Acknowledged, will repack eventually.
-source-contains-prebuilt-javascript-object web/tools/mootools/mootools-*-yc.js
-source-contains-prebuilt-javascript-object web/skins/*/js/jquery-1.4.2.min.js
+source-contains-prebuilt-javascript-object web/skins/*/js/jquery-3.5.1.min.js
diff --git a/distros/ubuntu2004/zoneminder.dirs b/distros/ubuntu2004/zoneminder.dirs
index 6db3d5a95..3c7237bf3 100644
--- a/distros/ubuntu2004/zoneminder.dirs
+++ b/distros/ubuntu2004/zoneminder.dirs
@@ -5,5 +5,6 @@ var/cache/zoneminder/images
 var/cache/zoneminder/temp
 var/cache/zoneminder/cache
 usr/share/zoneminder/db
+usr/share/zoneminder/fonts
 etc/zm/
 etc/zm/conf.d
diff --git a/distros/ubuntu2004/zoneminder.init b/distros/ubuntu2004/zoneminder.init
new file mode 100644
index 000000000..6132481f3
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.init
@@ -0,0 +1,91 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          zoneminder
+# Required-Start:    $network $remote_fs $syslog
+# Required-Stop:     $network $remote_fs $syslog
+# Should-Start:      mysql
+# Should-Stop:       mysql
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description:  Control ZoneMinder as a Service
+# Description: ZoneMinder CCTV recording and surveillance system
+### END INIT INFO
+# chkconfig: 2345 20 20
+
+# Source function library.
+. /lib/lsb/init-functions
+
+prog=ZoneMinder
+ZM_PATH_BIN="/usr/bin"
+RUNDIR="/run/zm"
+TMPDIR="/tmp/zm"
+command="$ZM_PATH_BIN/zmpkg.pl"
+
+start() {
+	echo -n "Starting $prog: "
+	export TZ=:/etc/localtime
+	mkdir -p "$RUNDIR" && chown www-data:www-data "$RUNDIR"
+	mkdir -p "$TMPDIR" && chown www-data:www-data "$TMPDIR"
+	$command start
+	RETVAL=$?
+	[ $RETVAL = 0 ] && echo success
+	[ $RETVAL != 0 ] && echo failure
+	echo
+	[ $RETVAL = 0 ] && touch /var/lock/zm
+	return $RETVAL
+}
+stop() {
+	echo -n "Stopping $prog: "
+	#
+	# Why is this status check being done?
+	# as $command stop returns 1 if zoneminder
+	# is stopped, which will result in
+	# this returning 1, which will stuff
+	# dpkg when it tries to stop zoneminder before
+	# uninstalling . . .
+	#
+	result=`$command status`
+	if [ ! "$result" = "running" ]; then
+		echo "Zoneminder already stopped"
+		echo
+		RETVAL=0
+	else
+		$command stop
+		RETVAL=$?
+		[ $RETVAL = 0 ] && echo success
+		[ $RETVAL != 0 ] && echo failure
+		echo
+		[ $RETVAL = 0 ] && rm -f /var/lock/zm
+	fi
+}
+status() {
+	result=`$command status`
+	if [ "$result" = "running" ]; then
+		echo "ZoneMinder is running"
+		RETVAL=0
+	else
+		echo "ZoneMinder is stopped"
+		RETVAL=1
+	fi
+}
+
+case "$1" in
+'start')
+	start
+	;;
+'stop')
+	stop
+	;;
+'restart' | 'force-reload')
+	stop
+	start
+	;;
+'status')
+	status
+	;;
+*)
+	echo "Usage: $0 { start | stop | restart | status }"
+	RETVAL=1
+	;;
+esac
+exit $RETVAL
diff --git a/distros/ubuntu2004/zoneminder.install b/distros/ubuntu2004/zoneminder.install
index 67b135de5..aa672d29b 100644
--- a/distros/ubuntu2004/zoneminder.install
+++ b/distros/ubuntu2004/zoneminder.install
@@ -5,7 +5,10 @@ usr/lib/zoneminder
 usr/share/polkit-1
 usr/share/zoneminder/db
 usr/share/zoneminder/www
+usr/share/zoneminder/fonts
+usr/share/zoneminder/icons
+usr/share/applications/*
 
 # libzoneminder-perl files:
-usr/share/man/man3
+#usr/share/man/man3
 usr/share/perl5
diff --git a/distros/ubuntu2004/zoneminder.linktrees b/distros/ubuntu2004/zoneminder.linktrees
deleted file mode 100644
index 2e843bbf1..000000000
--- a/distros/ubuntu2004/zoneminder.linktrees
+++ /dev/null
@@ -1,14 +0,0 @@
-## cakephp
-#replace  /usr/share/php/Cake					/usr/share/zoneminder/www/api/lib/Cake
-
-## libjs-mootools
-replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core.js
-replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-nc.js
-replace  /usr/share/javascript/mootools/mootools.js		/usr/share/zoneminder/www/tools/mootools/mootools-core-1.3.2-yc.js
-replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more.js
-replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-nc.js
-replace  /usr/share/javascript/mootools/mootools-more.js	/usr/share/zoneminder/www/tools/mootools/mootools-more-1.3.2.1-yc.js
-
-## libjs-jquery
-replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/classic/js/jquery-1.4.2.min.js
-replace  /usr/share/javascript/jquery/jquery.min.js		/usr/share/zoneminder/www/skins/flat/js/jquery-1.4.2.min.js
diff --git a/distros/ubuntu2004/zoneminder.postinst b/distros/ubuntu2004/zoneminder.postinst
index 5d5ddd6ff..4be136a71 100644
--- a/distros/ubuntu2004/zoneminder.postinst
+++ b/distros/ubuntu2004/zoneminder.postinst
@@ -2,34 +2,88 @@
 
 set +e
 
+create_db () {
+  echo "Checking for db"
+  mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+  # test if database if already present...
+  if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+    echo "Creating zm db"
+    cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+    if [ $? -ne 0 ]; then
+      echo "Error creating db."
+      exit 1;
+    fi
+  else
+    echo "Db exists."
+  fi
+}
+
+create_update_user () {
+  USER_EXISTS="$(mysql --defaults-file=/etc/mysql/debian.cnf  -sse "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = '$ZM_DB_USER')")"
+  if [ $USER_EXISTS -ne 1 ]; then
+    echo "Creating zm user $ZM_DB_USER"
+    # This creates the user.
+    echo "CREATE USER '${ZM_DB_USER}'@${ZM_DB_HOST} IDENTIFIED BY '${ZM_DB_PASS}';" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+  fi
+  echo "Updating permissions for user ${ZM_DB_USER}@${ZM_DB_HOST}"
+  echo "GRANT LOCK tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine,trigger,execute,REFERENCES ON ${ZM_DB_NAME}.* TO '${ZM_DB_USER}'@${ZM_DB_HOST};" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+}
+
+update_db () {
+
+  zmupdate.pl -s --nointeractive
+  if [ $? -ne 0 ]; then
+    echo "Error updating db."
+    exit 1;
+  fi
+  zmupdate.pl --nointeractive -f
+  if [ $? -ne 0 ]; then
+    echo "Error updating config."
+    exit 1;
+  fi
+
+  # Add any new PTZ control configurations to the database (will not overwrite)
+  zmcamtool.pl --import >/dev/null 2>&1
+  echo "Done Updating"
+}
+
 if [ "$1" = "configure" ]; then
-    
+
   . /etc/zm/zm.conf
   for CONFFILE in /etc/zm/conf.d/*.conf; do
     . "$CONFFILE"
   done
-  
+
   # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
   chown www-data:root /var/log/zm
   chown www-data:www-data /var/lib/zm
-  if [ -z "$2" ]; then
-    chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
-  fi
+  chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
   if [ ! -e "/etc/apache2/mods-enabled/cgi.load" ] && [ "$(command -v a2enmod)" != "" ]; then
     echo "The cgi module is not enabled in apache2.  I am enabling it using a2enmod cgi."
-    a2enmod cgi
+    if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
+        . /usr/share/apache2/apache2-maintscript-helper
+        apache2_invoke enmod cgi || exit $?
+    fi
+  fi
+
+  SYSTEMD=0
+  if [ -e "/run/systemd/system" ]; then
+    SYSTEMD=1
+    echo "detected systemd"
+    # Ensure zoneminder is stopped
+    deb-systemd-invoke stop zoneminder.service || exit $?
+  else
+    # Ensure zoneminder is stopped
+    invoke-rc.d zoneminder stop || true
   fi
 
   if [ "$ZM_DB_HOST" = "localhost" ]; then
 
-    if [ -e "/lib/systemd/system/mysql.service" ] || [ -e "/lib/systemd/system/mariadb.service" ] || [ -e "/etc/init.d/mysql" ]; then
-      # Ensure zoneminder is stopped
-      deb-systemd-invoke stop zoneminder.service || exit $?
-          
+    if [ $SYSTEMD -eq 1 ] && ([ -e "/lib/systemd/system/mysql.service" ] || [ -e "/lib/systemd/system/mariadb.service" ]); then
       #
       # Get mysql started if it isn't running
       #
-      
+
       if [ -e "/lib/systemd/system/mariadb.service" ]; then
         DBSERVICE="mariadb.service"
       else
@@ -42,48 +96,50 @@ if [ "$1" = "configure" ]; then
         echo "run sudo systemctl restart $DBSERVICE then run sudo dpkg-reconfigure zoneminder."
         exit 1
       fi
-      
+
       if ! systemctl is-active --quiet mysql.service mariadb.service; then
         # Due to /etc/init.d service autogeneration, mysql.service always returns the status of mariadb.service
         # However, mariadb.service will not return the status of mysql.service.
         deb-systemd-invoke start $DBSERVICE
       fi
-      
+
       # Make sure systemctl status exit code is 0; i.e. the DB is running
       if systemctl is-active --quiet "$DBSERVICE"; then
-        mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
-        # test if database if already present...
-        if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
-            echo "Creating zm db"
-            cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
-            if [ $? -ne 0 ]; then
-              echo "Error creating db."
-              exit 1;
-            fi
-            # This creates the user.
-            echo "CREATE USER '${ZM_DB_USER}'@${ZM_DB_HOST} IDENTIFIED BY '${ZM_DB_PASS}';" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-        fi
-        echo "Updating permissions"
-        echo "GRANT LOCK tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine,trigger,execute ON ${ZM_DB_NAME}.* TO '${ZM_DB_USER}'@${ZM_DB_HOST};" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-
-        zmupdate.pl --nointeractive
-        zmupdate.pl --nointeractive -f
-
-        # Add any new PTZ control configurations to the database (will not overwrite)
-        zmcamtool.pl --import >/dev/null 2>&1
-        echo "Done Updating; starting ZoneMinder."
+        create_db
+        create_update_user
+        update_db
       else
         echo 'NOTE: MySQL/MariaDB not running; please start mysql and run dpkg-reconfigure zoneminder when it is running.'
       fi
+
+    elif [ -e "/etc/init.d/mysql" ]; then
+      #
+      # Get mysql started if it isn't
+      #
+      if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+        service mysql start
+      fi
+      if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+        create_db
+        create_update_user
+        update_db
+      else
+        echo 'NOTE: MySQL/MariaDB not running; please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+      fi
+
     else
       echo 'MySQL/MariaDB not found; assuming remote server.'
     fi
-
-  else
-    echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)."
   fi
-  deb-systemd-invoke restart zoneminder.service
 
+else
+  echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)."
+fi
+
+if [ $SYSTEMD -eq 1 ]; then
+  deb-systemd-invoke restart zoneminder.service
+#else
+  #service zoneminder start || true
 fi
 
 #DEBHELPER#
diff --git a/distros/ubuntu2004/zoneminder.tmpfile b/distros/ubuntu2004/zoneminder.tmpfiles
similarity index 100%
rename from distros/ubuntu2004/zoneminder.tmpfile
rename to distros/ubuntu2004/zoneminder.tmpfiles
diff --git a/docs/conf.py b/docs/conf.py
index 9de7bd820..37ccd9d68 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -15,9 +15,6 @@
 import sys
 import os
 
-def setup(app):
-	app.add_stylesheet('zmstyle.css')
-
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -134,7 +131,9 @@ html_theme = 'default'
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
 html_static_path = ['_static']
-#html_style='zmstyles.css'
+
+html_css_files = [ 'zmstyle.css' ]
+
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
diff --git a/docs/faq.rst b/docs/faq.rst
index 56b67d082..1db30e05f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -27,7 +27,7 @@ After you've done that, you changes will automatically be loaded into zmfilter w
 Check the ``zmfilter.log`` file to make sure it is running as sometimes missing perl modules mean that it never runs but people don't always realize.
 
 **Purge By Age**
-To delete events that are older than 7 days, create a new filter with "Date" set to "less than" and a value of "-7 days", sort by "date/time" in "asc"ending order, then enable the checkbox "delete all matches". You can also use a value of week or week and days: "-2 week"  or "-2 week 4 day"
+To delete events that are older than 7 days, create a new filter with "End Date" set to "less than" and a value of "-7 days", sort by "date/time" in "asc"ending order, then enable the checkbox "delete all matches". You can also use a value of week or week and days: "-2 week"  or "-2 week 4 day"
 
 Save with 'Run Filter In Background' enabled to have it run automatically.
 Optional skip archived events:  click on the plus sign next to -7 days to add another condition.  "and" "archive status" equal to "unarchived only".
@@ -534,4 +534,4 @@ The GPL license allows you produce systems based on GPL software provided your s
 
 I am having issues with zmNinja and/or Event Notification Server
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-zmNinja and the Event Notification Server are 3rd party solutions. The developer maintains exhaustive `documentation and FAQs <https://zmninja.readthedocs.io/en/latest/>`__. Please direct your questions there.
\ No newline at end of file
+zmNinja and the Event Notification Server are 3rd party solutions. The developer maintains exhaustive `documentation and FAQs <https://zmninja.readthedocs.io/en/latest/>`__. Please direct your questions there.
diff --git a/docs/installationguide/debian.rst b/docs/installationguide/debian.rst
index d09423bd9..2244177e6 100644
--- a/docs/installationguide/debian.rst
+++ b/docs/installationguide/debian.rst
@@ -60,7 +60,8 @@ Add the following to the /etc/apt/sources.list.d/zoneminder.list file
 
 You can do this using:
 
-::
+.. code-block::
+
     echo "deb https://zmrepo.zoneminder.com/debian/release-1.34 buster/" | sudo tee /etc/apt/sources.list.d/zoneminder.list
 
 Because ZoneMinder's package repository provides a secure connection through HTTPS, apt must be enabled for HTTPS.
diff --git a/docs/installationguide/multiserver.rst b/docs/installationguide/multiserver.rst
index 14e52d29f..ce1cd26e6 100644
--- a/docs/installationguide/multiserver.rst
+++ b/docs/installationguide/multiserver.rst
@@ -21,6 +21,10 @@ New installs
 
 1. Follow the normal instructions for your distro for installing ZoneMinder onto all the ZoneMinder servers in the normal fashion. Only a single database will be needed either as standalone, or on one of the ZoneMinder Servers.
 
+.. sidebar :: Note
+
+    For systemd based linux distros, inspect the zoneminder service file, typically found under /lib/systemd/system. Changes may be required for multiserver to function correctly. For example, the service file may check for a running instance of mysql or mariadb running locally on the server. This check will need to be removed. Rather than edit the service file directly, copy the service file to /etc/systemd/system and edit the file in that location.
+
 2. On each ZoneMinder server, edit zm.conf. Find the ZM_DB_HOST variable and set it to the name or ip address of your Database Server. Find the ZM_SERVER_HOST and enter a name for this ZoneMinder server. Use a name easily recognizable by you. This name is not used by ZoneMinder for dns or any other form of network conectivity.
 
 3. Copy the file /usr/share/zoneminder/db/zm_create.sql from one of the ZoneMinder Servers to the machine targeted as the Database Server.
@@ -46,7 +50,9 @@ Note that these commands are just an example and might not be secure enough for
 
 9. From each ZoneMinder Server, mount the shared events folder on the Storage Server to the events folder on the local ZoneMinder Server.
 
-NOTE: The location of this folder varies by distro. This folder is often found under "/var/lib/zoneminder/events" for RedHat based distros and "/var/cache/zoneminder/events" for Debain based distros. This folder is NOT a Symbolic Link!
+.. sidebar :: Note
+
+    The location of the ZoneMinder events folder varies by distro. This folder is often found under "/var/lib/zoneminder/events" for RedHat based distros and "/var/cache/zoneminder/events" for Debain based distros. This folder is NOT a Symbolic Link!
 
 10. Open your browser and point it to the web console on any of the ZoneMinder Servers (they will all be the same). Open Options, click the Servers tab,and populate this screen with all of your ZoneMinder Servers. Each server has a field for its name and its hostname. The name is what you used for ZM_SERVER_HOST in step 2. The hostname is the network name or ip address ZoneMinder should use.
 
diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
index c18a3412a..b19080865 100644
--- a/docs/installationguide/redhat.rst
+++ b/docs/installationguide/redhat.rst
@@ -45,15 +45,47 @@ The following notes are based on real problems which have occurred by those who
 How to Install ZoneMinder
 -------------------------
 
-ZoneMinder releases are now being hosted at RPM Fusion. New users should navigate the `RPM Fusion site <https://rpmfusion.org>`__ then follow the instructions to enable that repo. RHEL/CentOS users must also navaigate to the `EPEL Site <https://fedoraproject.org/wiki/EPEL>`_ and enable that repo as well. Once enabled, install ZoneMinder from the commandline:
+ZoneMinder releases are hosted at RPM Fusion. New users should navigate to the `RPM Fusion site <https://rpmfusion.org>`__ then follow the instructions to enable that repo.
+
+.. sidebar :: Note
+
+    RHEL/CentOS 7 users should use *yum* instead of *dnf*
+
+RHEL/CentOS 7 & 8 users must enable the EPEL repo:
 
 ::
 
-    sudo dnf install zoneminder
+    sudo dnf install epel-release
+    
+RHEL/CentOS 8 users must also enable the PowerTools repo:
 
-Note that RHEL/CentOS 7 users should use yum instead of dnf.
+::
 
-Once ZoneMinder has been installed, it is critically important that you read the README file under /usr/share/doc/zoneminder-common. ZoneMinder will not run without completing the steps outlined in the README.
+    sudo dnf install dnf-plugins-core
+    sudo dnf config-manager --set-enabled PowerTools
+
+Once the additional repos are enabled, install ZoneMinder from the commandline. Choose the package that matches the desired web server.
+
+Install ZoneMinder for Apache web server:
+
+.. sidebar :: Note
+
+    A virtual package called zoneminder exists. This package contains no files and will pull in the zoneminder-httpd package for backwards compatiblity.
+
+::
+
+    sudo dnf install zoneminder-httpd
+
+Install ZoneMinder for Nginx web server:
+
+::
+
+    sudo dnf install zoneminder-nginx
+
+ 
+Once ZoneMinder has been installed, you must read the README file to complete the installation. Fedora users can find the README under /usr/share/doc/zoneminder-common. RHEL/CentOS users can find the README under /usr/share/doc/zoneminder-common-x.xx where x.xx is the version of zoneminder.
+
+ZoneMinder will *NOT* run without completing the steps shown in the README!
 
 How to Install Nightly Development Builds
 -----------------------------------------
@@ -62,21 +94,6 @@ ZoneMinder development packages, which represent the most recent build from our
 
 The feedback we get from those who use these development packages is extremely helpful. However, please understand these packages are intended for testing the latest master branch only. They are not intended to be used on any production system. There will be new bugs, and new features may not be documented. This is bleeding edge, and there might be breakage. Please keep that in mind when using this repo. We know from our user forum that this can't be stated enough. 
 
-How to Change from Zmrepo to RPM Fusion
----------------------------------------
-
-As mentioned above, the place to get the latest ZoneMinder release is now `RPM Fusion <https://rpmfusion.org>`__. If you are currently using ZoneMinder release packages from Zmrepo, then the following steps will change you over to RPM Fusion:
-
-- Navigate to the `RPM Fusion site <https://rpmfusion.org>`__ and enable RPM Fusion on your system
-- Now issue the following from the command line:
-
-::
-
-    sudo dnf remove zmrepo
-    sudo dnf update
-
-Note that RHEL/CentOS 7 users should use yum instead of dnf.
-
 How to Build Your Own ZoneMinder Package
 ------------------------------------------
 
diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
index 7b714e51a..7f2a01eb2 100644
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@@ -18,7 +18,6 @@ achieve the same result by running:
     sudo apt-get install tasksel
     sudo tasksel install lamp-server
 
-During installation it will ask you to set up a master/root password for the MySQL.
 Installing LAMP is not ZoneMinder specific so you will find plenty of resources to 
 guide you with a quick search.
 
@@ -57,7 +56,7 @@ Update repo and upgrade.
 
 .. sidebar :: Note
 
-    The MySQL default configuration file (/etc/mysql/mysql.cnf)is read through
+    The MySQL default configuration file (/etc/mysql/mysql.cnf) is read through
     several symbolic links beginning with /etc/mysql/my.cnf as follows:
 
     | /etc/mysql/my.cnf -> /etc/alternatives/my.cnf
@@ -66,7 +65,7 @@ Update repo and upgrade.
 
 Certain new defaults in MySQL 5.7 cause some issues with ZoneMinder < 1.32.0,
 the workaround is to modify the sql_mode setting of MySQL. Please note that these 
-changes are NOT required for ZoneMinder 1.32.0 and some people have reported them 
+changes are NOT required for ZoneMinder 1.32+ and some people have reported them 
 causing problems in 1.32.0.
 
 To better manage the MySQL server it is recommended to copy the sample config file and
@@ -113,7 +112,7 @@ This step should not be required on ZoneMinder 1.32.0.
 ::
 
 	mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
-	mysql -uroot -p -e "grant lock tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute on zm.* to 'zmuser'@localhost identified by 'zmpass';"
+	mysql -uroot -p -e "grant lock tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine, trigger,execute,references on zm.* to 'zmuser'@localhost identified by 'zmpass';"
 
 
 **Step 6:** Set permissions
@@ -148,23 +147,6 @@ You may also want to enable to following modules to improve caching performance
         systemctl enable zoneminder
         systemctl start zoneminder
 
-**Step 9:** Edit Timezone in PHP
-
-::
-
-        nano /etc/php/7.2/apache2/php.ini
-
-Search for [Date] (Ctrl + w then type Date and press Enter) and change
-date.timezone for your time zone, see [this](https://www.php.net/manual/en/timezones.php).
-**Don't forget to remove the ; from in front of date.timezone**
-
-::
-
-        [Date]
-        ; Defines the default timezone used by the date functions
-        ; http://php.net/date.timezone
-        date.timezone = America/New_York
-
 CTRL+o then [Enter] to save
 
 CTRL+x to exit
@@ -186,8 +168,8 @@ CTRL+x to exit
     ::
 
             {
-                "version": "1.29.0",
-                "apiversion": "1.29.0.1"
+                "version": "1.34.0",
+                "apiversion": "1.34.0.1"
             }
 
 **Congratulations**  Your installation is complete
@@ -339,27 +321,6 @@ You may also want to enable to following modules to improve caching performance
         systemctl enable zoneminder
         systemctl start zoneminder
 
-**Step 9:** Edit Timezone in PHP
-
-::
-
-        nano /etc/php/7.0/apache2/php.ini
-
-Search for [Date] (Ctrl + w then type Date and press Enter) and change
-date.timezone for your time zone, see [this](https://www.php.net/manual/en/timezones.php).
-**Don't forget to remove the ; from in front of date.timezone**
-
-::
-
-        [Date]
-        ; Defines the default timezone used by the date functions
-        ; http://php.net/date.timezone
-        date.timezone = America/New_York
-
-CTRL+o then [Enter] to save
-
-CTRL+x to exit
-
 **Step 10:** Reload Apache service
 
 ::
@@ -377,102 +338,14 @@ CTRL+x to exit
     ::
 
             {
-                "version": "1.29.0",
-                "apiversion": "1.29.0.1"
+                "version": "1.34.0",
+                "apiversion": "1.34.0.1"
             }
 
 **Congratulations**  Your installation is complete
 
 PPA install may need some tweaking of ZMS_PATH in ZoneMinder options. `Socket_sendto or no live streaming`_
 
-Easy Way: Ubuntu 14.x (Trusty)
-------------------------------
-**These instructions are for a brand new ubuntu 14.x system which does not have ZM installed.**
-
-**Step 1:** Either run commands in this install using sudo or use the below to become root
-
-::
-
-    sudo -i
-
-**Step 2:** Install ZoneMinder
-
-::
-
-	add-apt-repository ppa:iconnor/zoneminder
-	apt-get update
-	apt-get install zoneminder
-
-(just press OK for the prompts you get)
-
-**Step 3:** Set up DB
-
-::
-
-	mysql -uroot -p < /usr/share/zoneminder/db/zm_create.sql
-	mysql -uroot -p -e "grant select,insert,update,delete,create,alter,index,lock tables on zm.* to 'zmuser'@localhost identified by 'zmpass';"
-
-**Step 4:** Set up Apache
-
-::
-
-	a2enconf zoneminder
-	a2enmod rewrite
-	a2enmod cgi
-
-**Step 5:** Make zm.conf readable by web user.
-
-::
-
-	sudo chown www-data:www-data /etc/zm/zm.conf
-
-
-**Step 6:** Edit Timezone in PHP
-
-::
-
-        nano /etc/php5/apache2/php.ini
-
-Search for [Date] (Ctrl + w then type Date and press Enter) and change
-date.timezone for your time zone, see [this](https://www.php.net/manual/en/timezones.php).
-**Don't forget to remove the ; from in front of date.timezone**
-
-::
-
-        [Date]
-        ; Defines the default timezone used by the date functions
-        ; http://php.net/date.timezone
-        date.timezone = America/New_York
-
-CTRL+o then [Enter] to save
-
-CTRL+x to exit
-
-**Step 7:** Restart Apache service and start ZoneMinder
-
-::
-
-	service apache2 reload
-        service zoneminder start
-
-
-**Step 8:** Making sure ZoneMinder works
-
-1. Open up a browser and go to ``http://hostname_or_ip/zm`` - should bring up ZoneMinder Console
-
-2. (Optional API Check)Open up a tab in the same browser and go to ``http://hostname_or_ip/zm/api/host/getVersion.json``
-
-    If it is working correctly you should get version information similar to the example below:
-
-    ::
-
-            {
-                "version": "1.29.0",
-                "apiversion": "1.29.0.1"
-            }
-
-**Congratulations**  Your installation is complete
-
 Harder Way: Build Package From Source
 -------------------------------------
 (These instructions assume installation from source on a ubuntu 15.x+ system)
@@ -509,7 +382,7 @@ To build the latest stable release:
 
 
 Note that the distribution will be guessed using ``lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'``
-which simply extracts your distribution name - like "vivid", "trusty" etc. You
+which simply extracts your distribution name - like "xenial", "bionic" etc. You
 can always specify it using --distro=your distro name if you know it. As far as the script
 goes, it checks if your distro is "trusty" in which case it pulls in pre-systemd
 release configurations and if its not "trusty" it assumes its based on systemd
@@ -528,7 +401,7 @@ This should now create a bunch of .deb files
 ::
 
 	sudo gdebi zoneminder_<version>_<arch>.deb
-	(example sudo gdebi zoneminder_1.29.0-vivid-2016012001_amd64.deb)
+	(example sudo gdebi zoneminder_1.34.0-bionic-2021020801_amd64.deb)
 
 
 **This will report DB errors - ignore - you need to configure the DB and some other stuff**
diff --git a/docs/userguide/filterevents.rst b/docs/userguide/filterevents.rst
index 436034da0..ae1b4b132 100644
--- a/docs/userguide/filterevents.rst
+++ b/docs/userguide/filterevents.rst
@@ -70,13 +70,17 @@ Here is what the filter window looks like
     *    %EPS%      Path to the event stream
     *    %EPF1%     Path to the frame view for the first alarmed event image
     *    %EPFM%     Path to the frame view for the (first) event image with the highest score
-    *    %EFMOD%    Path to image containing object detection, in frame view
+    *    %EPFMOD%   Path to image containing object detection, in frame view
+    *    %EPFMODG%  Path to image containing object detection animated gif version, in frame view
     *    %EPI%      Path to the event images
     *    %EPI1%     Path to the first alarmed event image, suitable for use in img tags
     *    %EPIM%     Path to the (first) event image with the highest score, suitable for use in img tags
-    *    %EIMOD%    Path to image containing object detection, suitable for use in img tags
+    *    %EPIMOD%   Path to image containing object detection, suitable for use in img tags
+    *    %EPIMODG%  Path to image containing object detection animated gif version, suitable for use in img tags
     *    %EI1%      Attach first alarmed event image
     *    %EIM%      Attach (first) event image with the highest score
+    *    %EIMOD%    Attach image containing object detection
+    *    %EIMODG%   Attach image containing object detection animated gif version
     *    %EV%       Attach event mpeg video
     *    %MN%       Name of the monitor
     *    %MET%      Total number of events for the monitor
diff --git a/docs/userguide/gettingstarted.rst b/docs/userguide/gettingstarted.rst
index 0b40d7fb9..99f2ea4ba 100644
--- a/docs/userguide/gettingstarted.rst
+++ b/docs/userguide/gettingstarted.rst
@@ -51,7 +51,7 @@ This screen is called the "console" screen in ZoneMinder and shows a summary of
 
 * **A**: The options menu lets you configure many aspects of ZoneMinder. Refer to :doc:`options`.
 * **B**: This brings up a color coded log window that shows various system and component level logs. This window is useful if you are trying to diagnose issues. Refer to :doc:`logging`.
-* **C**: ZoneMinder allows you to group monitors gor logical separation. This option lets you create new groups, associate monitors to them and edit/delete existing groups.
+* **C**: ZoneMinder allows you to group monitors for logical separation. This option lets you create new groups, associate monitors to them and edit/delete existing groups.
 * **D**: Filters are a powerful mechanism to perform actions when certain conditions are met. ZoneMinder comes with some preset filters that keep a tab of disk space and others. Many users create their own filters for more advanced actions like sending emails when certain events occur and more. Refer to :doc:`filterevents`.
 * **E**: The Cycle option allows you to rotate between live views of each cofigured monitor.
 * **F**: The Montage option shows a collage of your monitors. You can customize them including moving them around.
diff --git a/fonts/CMakeLists.txt b/fonts/CMakeLists.txt
new file mode 100644
index 000000000..0d54e8174
--- /dev/null
+++ b/fonts/CMakeLists.txt
@@ -0,0 +1,4 @@
+# Glob all database upgrade scripts
+file(GLOB fontfileslist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "*.zmfnt")
+# Install the fonts
+install(FILES ${fontfileslist} DESTINATION "${ZM_FONTDIR}")
diff --git a/fonts/default.zmfnt b/fonts/default.zmfnt
new file mode 100644
index 000000000..e13998a39
Binary files /dev/null and b/fonts/default.zmfnt differ
diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
index f794241a8..e51636771 100644
--- a/misc/CMakeLists.txt
+++ b/misc/CMakeLists.txt
@@ -17,7 +17,8 @@ configure_file(zm-sudo.in "${CMAKE_CURRENT_BINARY_DIR}/zm-sudo" @ONLY)
 
 # Install Policykit rules and actions into the proper folders only on systems with systemd
 if(WITH_SYSTEMD)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
-endif(WITH_SYSTEMD)
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.policy" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/actions")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/com.zoneminder.systemctl.rules" DESTINATION "${PC_POLKIT_PREFIX}/${CMAKE_INSTALL_DATAROOTDIR}/polkit-1/rules.d")
+endif()
+
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zoneminder.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
diff --git a/onvif/modules/CMakeLists.txt b/onvif/modules/CMakeLists.txt
index d7ddbf466..502970af9 100644
--- a/onvif/modules/CMakeLists.txt
+++ b/onvif/modules/CMakeLists.txt
@@ -2,14 +2,14 @@
 
 # If this is an out-of-source build, copy the files we need to the binary directory
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
+endif()
 
 # MAKEMAKER_NOECHO_COMMAND previously defined in /scripts/zoneminder/CMakeLists.txt
 
 # Add build target for the perl modules
-add_custom_target(zmonvifmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
+add_custom_target(zmonvifmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS_FULL} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
 
 # Add install target for the perl modules
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
diff --git a/onvif/modules/lib/ONVIF/Client.pm b/onvif/modules/lib/ONVIF/Client.pm
index c7ce21092..738621ded 100644
--- a/onvif/modules/lib/ONVIF/Client.pm
+++ b/onvif/modules/lib/ONVIF/Client.pm
@@ -123,14 +123,19 @@ sub get_service_urls {
   );
   if ( $result ) {
     print "Have results from GetServices\n" if $verbose;
-    foreach my $svc ( @{ $result->get_Service() } ) {
-      my $short_name = $namespace_map{$svc->get_Namespace()};    
-      my $url_svc = $svc->get_XAddr()->get_value();
-      if ( defined $short_name && defined $url_svc ) {
-        print "Got $short_name service $url_svc\n" if $verbose;
-        $self->set_service($short_name, 'url', $url_svc);
-      }
-    }
+    my $services = $result->get_Service();
+    if ( $services ) {
+      foreach my $svc ( @{ $services } ) {
+        my $short_name = $namespace_map{$svc->get_Namespace()};    
+        my $url_svc = $svc->get_XAddr()->get_value();
+        if ( defined $short_name && defined $url_svc ) {
+          print "Got $short_name service $url_svc\n" if $verbose;
+          $self->set_service($short_name, 'url', $url_svc);
+        }
+      } # end foreach service
+    } else {
+      print "No services from GetServices\n" if $verbose;
+    } # end if services
   } else {
     print "No results from GetServices\n" if $verbose;
   }
diff --git a/onvif/proxy/CMakeLists.txt b/onvif/proxy/CMakeLists.txt
index 1a40c0ffb..779b4d47e 100644
--- a/onvif/proxy/CMakeLists.txt
+++ b/onvif/proxy/CMakeLists.txt
@@ -2,14 +2,14 @@
 
 # If this is an out-of-source build, copy the files we need to the binary directory
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
+endif()
 
 # MAKEMAKER_NOECHO_COMMAND previously defined in /scripts/zoneminder/CMakeLists.txt
 
 # Add build target for the perl modules
-add_custom_target(zmonvifproxy ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
+add_custom_target(zmonvifproxy ALL perl Makefile.PL ${ZM_PERL_MM_PARMS_FULL} FIRST_MAKEFILE=MakefilePerl DESTDIR=${CMAKE_CURRENT_BINARY_DIR}/output ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
 
 # Add install target for the perl modules
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 5502a42a8..79df1f03a 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -22,22 +22,24 @@ configure_file(zmcamtool.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmcamtool.pl" @ONLY)
 configure_file(zmsystemctl.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" @ONLY)
 configure_file(zmtelemetry.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmtelemetry.pl" @ONLY)
 if(NOT ZM_NO_X10)
-	configure_file(zmx10.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" @ONLY)
-endif(NOT ZM_NO_X10)
+  configure_file(zmx10.pl.in "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" @ONLY)
+endif()
 #configure_file(zmdbbackup.in zmdbbackup @ONLY)
 #configure_file(zmdbrestore.in zmdbrestore @ONLY)
 configure_file(zm.in "${CMAKE_CURRENT_BINARY_DIR}/zm" @ONLY)
 #configure_file(zmeventdump.in zmeventdump @ONLY)
 
 # Generate man files for the perl scripts destined for the bin folder
-file(GLOB perlscripts "${CMAKE_CURRENT_BINARY_DIR}/*.pl")
-FOREACH(PERLSCRIPT ${perlscripts})
+if(BUILD_MAN)
+  file(GLOB perlscripts "${CMAKE_CURRENT_BINARY_DIR}/*.pl")
+  foreach(PERLSCRIPT ${perlscripts})
     get_filename_component(PERLSCRIPTNAME ${PERLSCRIPT} NAME)
     POD2MAN(${PERLSCRIPT} ${PERLSCRIPTNAME} 8 ${ZM_MANPAGE_DEST_PREFIX})
-ENDFOREACH(PERLSCRIPT ${perlscripts})
+  endforeach(PERLSCRIPT ${perlscripts})
+endif()
 
 # Install the perl scripts
-install(FILES 
+install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/zmaudit.pl"
   "${CMAKE_CURRENT_BINARY_DIR}/zmcontrol.pl"
   "${CMAKE_CURRENT_BINARY_DIR}/zmdc.pl"
@@ -56,9 +58,9 @@ install(FILES
   "${CMAKE_CURRENT_BINARY_DIR}/zmstats.pl"
   DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 if(NOT ZM_NO_X10)
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-endif(NOT ZM_NO_X10)
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmx10.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+endif()
 
 if(WITH_SYSTEMD)
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-endif(WITH_SYSTEMD)
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zmsystemctl.pl" DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+endif()
diff --git a/scripts/ZoneMinder/CMakeLists.txt b/scripts/ZoneMinder/CMakeLists.txt
index 876a33da3..2a8708d2f 100644
--- a/scripts/ZoneMinder/CMakeLists.txt
+++ b/scripts/ZoneMinder/CMakeLists.txt
@@ -2,14 +2,14 @@
 
 # If this is an out-of-source build, copy the files we need to the binary directory
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Changes" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/MANIFEST" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/META.yml" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/README" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/t" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
-	file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Changes" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/MANIFEST" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/META.yml" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/README" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/t" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}")
+  file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/lib" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}" PATTERN "*.in" EXCLUDE)
+endif()
 
 # Create files from the .in files
 configure_file(lib/ZoneMinder/Base.pm.in "${CMAKE_CURRENT_BINARY_DIR}/lib/ZoneMinder/Base.pm" @ONLY)
@@ -19,13 +19,13 @@ configure_file(lib/ZoneMinder/ConfigData.pm.in "${CMAKE_CURRENT_BINARY_DIR}/lib/
 configure_file(lib/ZoneMinder/ONVIF.pm.in "${CMAKE_CURRENT_BINARY_DIR}/lib/ZoneMinder/ONVIF.pm" @ONLY)
 
 if(CMAKE_VERBOSE_MAKEFILE)
-	set(MAKEMAKER_NOECHO_COMMAND "")
-else(CMAKE_VERBOSE_MAKEFILE)
-	set(MAKEMAKER_NOECHO_COMMAND "NOECHO=\"1>/dev/null\"")
-endif(CMAKE_VERBOSE_MAKEFILE)
+  set(MAKEMAKER_NOECHO_COMMAND "")
+else()
+  set(MAKEMAKER_NOECHO_COMMAND "NOECHO=\"1>/dev/null\"")
+endif()
 
 # Add build target for the perl modules
-add_custom_target(zmperlmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
+add_custom_target(zmperlmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS_FULL} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
 
 # Add install target for the perl modules
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index cf2b59c85..a1d9521f6 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -1,6 +1,6 @@
 # ==========================================================================
 #
-# ZoneMinder Config Data Module, $Date: 2011-01-20 18:49:42 +0000 (Thu, 20 Jan 2011) $, $Revision: 3230 $
+# ZoneMinder Config Data Module
 # Copyright (C) 2001-2008  Philip Coombes
 #
 # This program is free software; you can redistribute it and/or
@@ -479,9 +479,36 @@ our @options = (
     type        => $types{string},
     category    => 'system',
   },
+  {
+    name        =>  'ZM_OPT_USE_GEOLOCATION',
+    description =>  'Add geolocation features to ZoneMinder.',
+    help        =>  'Whether or not to enable Latitude/Longitude settings on Monitors and enable mapping options.',
+    type        =>  $types{boolean},
+    category    =>  'system',
+  },
+  {
+    name        =>  'ZM_OPT_GEOLOCATION_TILE_PROVIDER',
+    description =>  'Tile provider to use for maps.',
+    help        =>  'OpenStreetMaps does not itself provide the images to use in the map. There are many to choose from.  Mapbox.com is one example that offers free tiles and has been tested during development of this feature.',
+    requires    =>  [
+                     {name=>'ZM_OPT_USE_GEOLOCATION', value=>'yes'}
+                   ],
+    type        => $types{string},
+    category    => 'system',
+  },
+  {
+    name        =>  'ZM_OPT_GEOLOCATION_ACCESS_TOKEN',
+    description =>  'Access Token for the tile provider used for maps.',
+    help        =>  'OpenStreetMaps does not itself provide the images to use in the map. There are many to choose from.  Mapbox.com is one example that offers free tiles and has been tested during development of this feature. You must go to mapbox.com and sign up and get an access token and cutnpaste it here.',
+    requires    =>  [
+                     {name=>'ZM_OPT_USE_GEOLOCATION', value=>'yes'}
+                   ],
+    type        => $types{string},
+    category    => 'system',
+  },
   {
     name        =>  'ZM_SYSTEM_SHUTDOWN',
-    default     =>  'true',
+    default     =>  'yes',
     description =>  'Allow Admin users to power off or restart the system from the ZoneMinder UI.',
     help        =>  'The system will need to have sudo installed and the following added to /etc/sudoers~~
     ~~
@@ -491,6 +518,14 @@ our @options = (
     type      =>  $types{boolean},
     category  =>  'system',
   },
+  {
+    name        =>  'ZM_FEATURES_SNAPSHOTS',
+    default     =>  'no',
+    description =>  'Enable snapshot functionality.',
+    help        =>  'Snapshots are a collection of events.  They can be created using the snapshot button in montage view.  All visible monitors will have a short event created, archived and added to the Snapshot.',
+    type      =>  $types{boolean},
+    category  =>  'hidden',
+  },
   {
     name        => 'ZM_USE_DEEP_STORAGE',
     default     => 'yes',
@@ -920,6 +955,19 @@ our @options = (
     type  =>  $types{integer},
     category  => 'network',
   },
+  {
+    name        =>  'ZM_MIN_RTSP_PORT',
+    default     =>  '',
+    description =>  'Start of port range to contact for RTSP streaming video.',
+    help        =>  q`
+      The beginng of a port range that will be used to offer
+      RTSP streaming of live captured video.
+      Each monitor will use this value plus the Monitor Id to stream
+      content.  So a value of 2000 here will cause a stream for Monitor 1 to
+      hit port 2001.`,
+    type  =>  $types{integer},
+    category  => 'network',
+  },
   {
     name        => 'ZM_MIN_RTP_PORT',
     default     => '40200',
@@ -2621,7 +2669,7 @@ our @options = (
   },
   {
     name        => 'ZM_WEB_EVENT_SORT_FIELD',
-    default     => 'StartDateTime',
+    default     => 'StartTime',
     description => 'Default field the event lists are sorted by',
     help        => q`
       Events in lists can be initially ordered in any way you want.
@@ -2633,7 +2681,7 @@ our @options = (
       `,
     type        => {
       db_type     =>'string',
-      hint        =>'Id|Name|Cause|DiskSpace|MonitorName|StartDateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore',
+      hint        =>'Id|Name|Cause|DiskSpace|MonitorName|StartTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore',
       pattern     =>qr|.|,
       format      =>q( $1 )
     },
@@ -2721,6 +2769,19 @@ our @options = (
     requires    => [ { name => 'ZM_WEB_LIST_THUMBS', value => 'yes' } ],
     category    => 'web',
   },
+  {
+    name        => 'ZM_WEB_ANIMATE_THUMBS',
+    default     => 'yes',
+    description => 'Enlarge and show the live stream when a thumbnail is hovered over',
+    help        => q`
+      Enabling this option causes the static thumbnail, shown on certain
+      views, to enlarge and show the live stream, when the thumbnail is
+      hovered over by the mouse.
+      `,
+    type        => $types{boolean},
+    requires    => [ { name => 'ZM_WEB_LIST_THUMBS', value => 'yes' } ],
+    category    => 'web',
+  },
   {
     name        => 'ZM_WEB_USE_OBJECT_TAGS',
     default     => 'yes',
@@ -3740,6 +3801,14 @@ our @options = (
     type        => $types{boolean},
     category    => 'logging',
   },
+  {
+    name        => 'ZM_FONT_FILE_LOCATION',
+    default     => '@ZM_FONTDIR@/default.zmfnt',
+    description => 'Font file location',
+    help        => 'This font is used for timestamp labels.',
+    type        => $types{string},
+    category    => 'config',
+  },
 );
 
 our %options_hash = map { ( $_->{name}, $_ ) } @options;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
index acce8eb4a..feb12a0ca 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control.pm
@@ -29,6 +29,7 @@ use strict;
 use warnings;
 
 require ZoneMinder::Base;
+require ZoneMinder::Monitor;
 
 our $VERSION = $ZoneMinder::Base::VERSION;
 
@@ -95,8 +96,8 @@ sub close {
 sub loadMonitor {
   my $self = shift;
   if ( !$self->{Monitor} ) {
-    if ( !($self->{Monitor} = zmDbGetMonitor($self->{id})) ) {
-      Fatal('Monitor id '.$self->{id}.' not found or not controllable');
+    if ( !($self->{Monitor} = ZoneMinder::Monitor->find_one(Id=>$self->{id})) ) {
+      Fatal('Monitor id '.$self->{id}.' not found');
     }
     if ( defined($self->{Monitor}->{AutoStopTimeout}) ) {
 # Convert to microseconds.
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm
index 59e4f7511..df3a538ea 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Amcrest_HTTP.pm
@@ -75,7 +75,7 @@ sub open {
   }
 
   # Detect REALM, has to be /cgi-bin/ptz.cgi because just / accepts no auth
-  my $res = $self->{ua}->get($$self{base_url}.'cgi-bin/ptz.cgi');
+  my $res = $self->{ua}->get($$self{base_url}.'cgi-bin/magicBox.cgi?action=getDeviceType');
 
   if ( $res->is_success ) {
     $self->{state} = 'open';
@@ -121,7 +121,7 @@ sub open {
       Debug('No headers line');
     } # end if headers
   } else {
-    Error("Failed to get $$self{base_url}cgi-bin/ptz.cgi ".$res->status_line());
+    Error("Failed to get $$self{base_url}cgi-bin/magicBox.cgi?action=getDeviceType ".$res->status_line());
 
   } # end if $res->status_line() eq '401 Unauthorized'
 
@@ -187,67 +187,65 @@ sub moveAbs ## Up, Down, Left, Right, etc. ??? Doesn't make sense here...
 sub moveConUp {
   my $self = shift;
   Debug('Move Up');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Up&channel=0&arg1=0&arg2=1&arg3=0');
-  usleep(500); ##XXX Should this be passed in as a "speed" parameter?
-  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Up&channel=0&arg1=0&arg2=1&arg3=0');
+  $$self{Monitor}->suspendMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  $$self{LastCmd} = 'code=Up&channel=0&arg1=0&arg2=1&arg3=0';
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&'.$$self{LastCmd});
 }
 
 sub moveConDown {
   my $self = shift;
   Debug('Move Down');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Down&channel=0&arg1=0&arg2=1&arg3=0');
-  usleep(500);
-  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Down&channel=0&arg1=0&arg2=1&arg3=0');
+  $$self{Monitor}->suspendMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  $$self{LastCmd} = 'code=Down&channel=0&arg1=0&arg2=1&arg3=0';
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&'.$$self{LastCmd});
 }
 
 sub moveConLeft {
   my $self = shift;
   Debug('Move Left');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Left&channel=0&arg1=0&arg2=1&arg3=0');
-  usleep(500);
-  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Left&channel=0&arg1=0&arg2=1&arg3=0');
+  $$self{Monitor}->suspendMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  $$self{LastCmd} = 'code=Left&channel=0&arg1=0&arg2=1&arg3=0';
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&'.$$self{LastCmd});
 }
 
 sub moveConRight {
   my $self = shift;
   Debug('Move Right');
-  #    $self->sendCmd( 'cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=270&arg2=5&arg3=0' );
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=Right&channel=0&arg1=0&arg2=1&arg3=0');
-  usleep(500);
-  Debug('Move Right Stop');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=Right&channel=0&arg1=0&arg2=1&arg3=0');
+  $$self{Monitor}->suspendMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  $$self{LastCmd} = 'code=Right&channel=0&arg1=0&arg2=1&arg3=0';
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&'.$$self{LastCmd});
 }
 
 sub moveConUpRight {
   my $self = shift;
   Debug('Move Diagonally Up Right');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=RightUp&channel=0&arg1=1&arg2=1&arg3=0');
-  usleep(500);
-  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=RightUp&channel=0&arg1=0&arg2=1&arg3=0');
+  $$self{Monitor}->suspendMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  $$self{LastCmd} = 'code=RightUp&channel=0&arg1=0&arg2=1&arg3=0';
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&'.$$self{LastCmd});
 }
 
 sub moveConDownRight {
   my $self = shift;
   Debug('Move Diagonally Down Right');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=RightDown&channel=0&arg1=1&arg2=1&arg3=0');
-  usleep(500);
-  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=RightDown&channel=0&arg1=0&arg2=1&arg3=0');
+  $$self{LastCmd} = 'code=RightDown&channel=0&arg1=0&arg2=1&arg3=0';
+  $$self{Monitor}->suspendMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&'.$$self{LastCmd});
 }
 
 sub moveConUpLeft {
   my $self = shift;
   Debug('Move Diagonally Up Left');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=LeftUp&channel=0&arg1=1&arg2=1&arg3=0');
-  usleep(500);
-  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=LeftUp&channel=0&arg1=0&arg2=1&arg3=0');
+  $$self{Monitor}->suspendMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  $$self{LastCmd} = 'code=LeftUp&channel=0&arg1=0&arg2=1&arg3=0';
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&'.$$self{LastCmd});
 }
 
 sub moveConDownLeft {
   my $self = shift;
   Debug('Move Diagonally Down Left');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=LeftDown&channel=0&arg1=1&arg2=1&arg3=0');
-  usleep (500);
-  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&code=LeftDown&channel=0&arg1=0&arg2=1&arg3=0');
+  $$self{Monitor}->suspendMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  $$self{LastCmd} = 'code=LeftDown&channel=0&arg1=0&arg2=1&arg3=0';
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&'.$$self{LastCmd});
 }
 
 # Stop is not "correctly" implemented as control_functions.php translates this to "Center"
@@ -256,8 +254,15 @@ sub moveConDownLeft {
 
 sub moveStop {
   my $self = shift;
-  Debug('Move Stop/Center');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=0&arg2=0&arg3=0&arg4=1');
+  if ($$self{LastCmd}) {
+    Debug('Move Stop '.$$self{LastCmd});
+    $self->sendCmd('cgi-bin/ptz.cgi?action=stop&'.$$self{LastCmd});
+    $$self{LastCmd} = '';
+    $$self{Monitor}->resumeMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  } else {
+    Debug('Move Stop/Center');
+    $self->sendCmd('cgi-bin/ptz.cgi?action=start&code=PositionABS&channel=0&arg1=0&arg2=0&arg3=0&arg4=1');
+  }
 }
 
 # Move Camera to Home Position
@@ -307,17 +312,17 @@ sub moveMap {
 sub zoomConTele {
   my $self = shift;
   Debug('Zoom continuous tele');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=ZoomTele&arg1=0&arg2=0&arg3=0&arg4=0');
-  usleep(100000);
-  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&channel=0&code=ZoomTele&arg1=0&arg2=0&arg3=0&arg4=0');
+  $$self{Monitor}->suspendMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  $$self{LastCmd} = 'code=ZoomTele&channel=0&arg1=0&arg2=0&arg3=0&arg4=0';
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&'.$$self{LastCmd});
 }
 
 sub zoomConWide {
   my $self = shift;
   Debug('Zoom continuous wide');
-  $self->sendCmd('cgi-bin/ptz.cgi?action=start&channel=0&code=ZoomWide&arg1=0&arg2=0&arg3=0&arg4=0');
-  usleep (100000);
-  $self->sendCmd('cgi-bin/ptz.cgi?action=stop&channel=0&code=ZoomWide&arg1=0&arg2=0&arg3=0&arg4=0');
+  $$self{Monitor}->suspendMotionDetection() if !$self->{Monitor}->{ModectDuringPTZ};
+  $$self{LastCmd} = 'code=ZoomWide&channel=0&arg1=0&arg2=0&arg3=0&arg4=0';
+  $self->sendCmd('cgi-bin/ptz.cgi?action=start&'.$$self{LastCmd});
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/FoscamCGI.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/FoscamCGI.pm
new file mode 100644
index 000000000..57e44ccf8
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/FoscamCGI.pm
@@ -0,0 +1,354 @@
+# ==========================================================================
+#
+# ZoneMinder FoscamCGI Control Protocol Module
+# Copyright (C) Jan M. Hochstein
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# ==========================================================================
+#
+# This module actually contains an implementation of the Foscam CGI device control protocol
+#
+package ZoneMinder::Control::FoscamCGI;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Control;
+
+our @ISA = qw(ZoneMinder::Control);
+
+our %CamParams = ();
+
+# ==========================================================================
+#
+# On ControlAddress use the format :
+#   USERNAME:PASSWORD@ADDRESS:PORT
+#   eg : admin:@10.1.2.1:80
+#        zoneminder:zonepass@10.0.100.1:40000
+#
+# ==========================================================================
+
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Config qw(:all);
+
+use Time::HiRes qw( usleep );
+
+sub open {
+  my $self = shift;
+
+  $self->loadMonitor();
+
+  use LWP::UserAgent;
+  $self->{ua} = LWP::UserAgent->new;
+  $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION);
+
+  $self->{state} = 'open';
+}
+
+sub sendCmd {
+  my $self = shift;
+  my $cmd = shift;
+  my $result = undef;
+  $self->printMsg($cmd, 'Tx');
+
+  my $req = HTTP::Request->new(GET=>'http://'.$self->{Monitor}->{ControlAddress}.'/'.$cmd);
+  my $res = $self->{ua}->request($req);
+
+  if ( $res->is_success ) {
+    $result = !undef;
+  } else {
+    Error("Error check failed:'".$res->status_line()."'" );
+  }
+
+  return $result;
+}
+
+sub getCamParams {
+  my $self = shift;
+
+  my $req = HTTP::Request->new(GET=>'http://'.$self->{Monitor}->{ControlAddress}.'/get_camera_params.cgi');
+  my $res = $self->{ua}->request($req);
+
+  if ( $res->is_success ) {
+    # Parse results setting values in %FCParams
+    my $content = $res->decoded_content;
+
+    while ($content =~ s/var\s+([^=]+)=([^;]+);//ms) {
+      $CamParams{$1} = $2;
+    }
+  } else {
+    Error("Error check failed:'".$res->status_line()."'");
+  }
+}
+
+#autoStop
+#This makes use of the ZoneMinder Auto Stop Timeout on the Control Tab
+sub autoStop {
+  my $self = shift;
+  my $stop_command = shift;
+  my $autostop = shift;
+  if ( $stop_command && $autostop ) {
+    Debug('Auto Stop');
+    usleep($autostop);
+    my $cmd = 'decoder_control.cgi?command='.$stop_command;
+    $self->sendCmd($cmd);
+  }
+}
+
+# Reset the Camera
+sub reset {
+  my $self = shift;
+  Debug('Camera Reset');
+  my $cmd = 'reboot.cgi?';
+  $self->sendCmd($cmd);
+}
+
+#Up Arrow
+sub moveConUp
+{
+  my $self = shift;
+  my $stop_command = "1";
+  Debug( "Move Up" );
+  my $cmd = "decoder_control.cgi?command=0";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Down Arrow
+sub moveConDown
+{
+  my $self = shift;
+  my $stop_command = "3";
+  Debug( "Move Down" );
+  my $cmd = "decoder_control.cgi?command=2";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Left Arrow
+sub moveConLeft
+{
+  my $self = shift;
+  my $stop_command = "5";
+  Debug( "Move Left" );
+  my $cmd = "decoder_control.cgi?command=4";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Right Arrow
+sub moveConRight
+{
+  my $self = shift;
+  my $stop_command = "7";
+  Debug( "Move Right" );
+  my $cmd = "decoder_control.cgi?command=6";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Zoom In
+sub zoomConTele
+{
+  my $self = shift;
+  my $stop_command = "17";
+  Debug( "Zoom Tele" );
+  my $cmd = "decoder_control.cgi?command=18";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Zoom Out
+sub zoomConWide
+{
+  my $self = shift;
+  my $stop_command = "19";
+  Debug( "Zoom Wide" );
+  my $cmd = "decoder_control.cgi?command=16";
+  $self->sendCmd( $cmd );
+  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+}
+
+#Diagonally Up Right Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConUpRight
+{
+  my $self = shift;
+  Debug( "Move Diagonally Up Right" );
+  $self->moveConUp( );
+  $self->moveConRight( );
+}
+
+#Diagonally Down Right Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConDownRight
+{
+  my $self = shift;
+  Debug( "Move Diagonally Down Right" );
+  $self->moveConDown( );
+  $self->moveConRight( );
+}
+
+#Diagonally Up Left Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConUpLeft
+{
+  my $self = shift;
+  Debug( "Move Diagonally Up Left" );
+  $self->moveConUp( );
+  $self->moveConLeft( );
+}
+
+#Diagonally Down Left Arrow
+#This camera does not have builtin diagonal commands so we emulate them
+sub moveConDownLeft
+{
+  my $self = shift;
+  Debug( "Move Diagonally Down Left" );
+  $self->moveConDown( );
+  $self->moveConLeft( );
+}
+
+#Stop
+sub moveStop
+{
+  my $self = shift;
+  Debug( "Move Stop" );
+  my $cmd = "decoder_control.cgi?command=1";
+  $self->sendCmd( $cmd );
+}
+
+#Set Camera Preset
+#Presets must be translated into values internal to the camera
+#Those values are: 30,32,34,36,38,40,42,44 for presets 1-8 respectively
+sub presetSet
+{
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam( $params, 'preset' );
+  Debug( "Set Preset $preset" );
+
+  if (( $preset >= 1 ) && ( $preset <= 8 )) {
+    my $cmd = "decoder_control.cgi?command=".(($preset*2) + 28);
+    $self->sendCmd( $cmd );
+  }
+}
+
+#Recall Camera Preset
+#Presets must be translated into values internal to the camera
+#Those values are: 31,33,35,37,39,41,43,45 for presets 1-8 respectively
+sub presetGoto
+{
+  my $self = shift;
+  my $params = shift;
+  my $preset = $self->getParam( $params, 'preset' );
+  Debug( "Goto Preset $preset" );
+
+  if (( $preset >= 1 ) && ( $preset <= 8 )) {
+    my $cmd = "decoder_control.cgi?command=".(($preset*2) + 29);
+    $self->sendCmd( $cmd );
+  }
+
+  if ( $preset == 9 ) {
+    $self->horizontalPatrol();
+  }
+
+  if ( $preset == 10 ) {
+    $self->horizontalPatrolStop();
+  }
+}
+
+#Horizontal Patrol - Vertical Patrols are not supported
+sub horizontalPatrol
+{
+  my $self = shift;
+  Debug( "Horizontal Patrol" );
+  my $cmd = "decoder_control.cgi?command=20";
+  $self->sendCmd( $cmd );
+}
+
+#Horizontal Patrol Stop
+sub horizontalPatrolStop
+{
+  my $self = shift;
+  Debug( "Horizontal Patrol Stop" );
+  my $cmd = "decoder_control.cgi?command=21";
+  $self->sendCmd( $cmd );
+}
+
+# Increase Brightness
+sub irisAbsOpen
+{
+  my $self = shift;
+  my $params = shift;
+  $self->getCamParams() unless($CamParams{'brightness'});
+  my $step = $self->getParam( $params, 'step' );
+
+  $CamParams{'brightness'} += $step;
+  $CamParams{'brightness'} = 255 if ($CamParams{'brightness'} > 255);
+  Debug( "Iris $CamParams{'brightness'}" );
+  my $cmd = "camera_control.cgi?param=1&value=".$CamParams{'brightness'};
+  $self->sendCmd( $cmd );
+}
+
+# Decrease Brightness
+sub irisAbsClose
+{
+  my $self = shift;
+  my $params = shift;
+  $self->getCamParams() unless($CamParams{'brightness'});
+  my $step = $self->getParam( $params, 'step' );
+
+  $CamParams{'brightness'} -= $step;
+  $CamParams{'brightness'} = 0 if ($CamParams{'brightness'} < 0);
+  Debug( "Iris $CamParams{'brightness'}" );
+  my $cmd = "camera_control.cgi?param=1&value=".$CamParams{'brightness'};
+  $self->sendCmd( $cmd );
+}
+
+# Increase Contrast
+sub whiteAbsIn
+{
+  my $self = shift;
+  my $params = shift;
+  $self->getCamParams() unless($CamParams{'contrast'});
+  my $step = $self->getParam( $params, 'step' );
+
+  $CamParams{'contrast'} += $step;
+  $CamParams{'contrast'} = 6 if ($CamParams{'contrast'} > 6);
+  Debug( "Iris $CamParams{'contrast'}" );
+  my $cmd = "camera_control.cgi?param=2&value=".$CamParams{'contrast'};
+  $self->sendCmd( $cmd );
+}
+
+# Decrease Contrast
+sub whiteAbsOut
+{
+  my $self = shift;
+  my $params = shift;
+  $self->getCamParams() unless($CamParams{'contrast'});
+  my $step = $self->getParam( $params, 'step' );
+
+  $CamParams{'contrast'} -= $step;
+  $CamParams{'contrast'} = 0 if ($CamParams{'contrast'} < 0);
+  Debug( "Iris $CamParams{'contrast'}" );
+  my $cmd = "camera_control.cgi?param=2&value=".$CamParams{'contrast'};
+  $self->sendCmd( $cmd );
+}
+
+1;
+
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/HikVision.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/HikVision.pm
index a62c756d8..8e5b2c9e3 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/HikVision.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/HikVision.pm
@@ -184,6 +184,7 @@ sub moveVector {
   # Send it to the camera
   $self->PutCmd($command,$xml);
 }
+sub zoomStop         { $_[0]->moveVector(  0,  0, 0, splice(@_,1)); }
 sub moveStop         { $_[0]->moveVector(  0,  0, 0, splice(@_,1)); }
 sub moveConUp        { $_[0]->moveVector(  0,  1, 0, splice(@_,1)); }
 sub moveConUpRight   { $_[0]->moveVector(  1,  1, 0, splice(@_,1)); }
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
index ab7bc03ec..f10b7aabb 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Netcat.pm
@@ -122,7 +122,17 @@ sub authentificationHeader {
   my $nonceBase64 = encode_base64($nonce, '');
   my $currentDate = DateTime->now()->iso8601().'Z';
 
-  return '<s:Header><Security s:mustUnderstand="1" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><UsernameToken xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><Username>' . $username . '</Username><Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">' . digestBase64($nonce, $currentDate, $password) . '</Password><Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">' . $nonceBase64 . '</Nonce><Created xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">' . $currentDate . '</Created></UsernameToken></Security></s:Header>';
+  return '
+<s:Header>
+  <Security s:mustUnderstand="1" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+    <UsernameToken xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+      <Username>' . $username . '</Username>
+      <Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">' . digestBase64($nonce, $currentDate, $password) . '</Password>
+      <Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">' . $nonceBase64 . '</Nonce>
+      <Created xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">' . $currentDate . '</Created>
+    </UsernameToken>
+  </Security>
+</s:Header>';
 }
 
 sub sendCmd {
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
index 84b3c8a14..8bdf1db42 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/Trendnet.pm
@@ -3,6 +3,7 @@ package ZoneMinder::Control::Trendnet;
 use 5.006;
 use strict;
 use warnings;
+use Time::HiRes qw(usleep);
 
 require ZoneMinder::Base;
 require ZoneMinder::Control;
@@ -101,16 +102,22 @@ sub open {
 } # end sub open
 
 sub sendCmd {
-
   # This routine is used for all moving, which are all GET commands...
-
   my $self = shift;
-  my $cmd = shift;
 
+  if (!$self->{Monitor}->{ModectDuringPTZ}) {
+    $$self{Monitor}->suspendMotionDetection();
+  }
+
+  my $cmd = shift;
   my $url = $PROTOCOL.$ADDRESS.'/cgi/ptdc.cgi?command='.$cmd;
   my $res = $self->{ua}->get($url);
-
   Debug('sendCmd command: ' . $url);
+
+  if (!$self->{Monitor}->{ModectDuringPTZ}) {
+    usleep(10000);
+    $$self{Monitor}->resumeMotionDetection();
+  }
   if ( $res->is_success ) {
     Debug($res->content);
     return !undef;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
index c830d28aa..12a78144c 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Control/onvif.pm
@@ -1,7 +1,7 @@
 # ==========================================================================
 #
-# ZoneMinder ONVIF Control Protocol Module
-# Copyright (C) Jan M. Hochstein
+# ZoneMinder ONVIF Control Protocol Module, $Date: 2021-02-25 22:07:00 +0000 (Thu, 25 Feb 2021) $, $Revision: 0001 $
+# Based on the Netcat onvif script by Andrew Bauer (knnniggett@users.sourceforge.net)
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -19,28 +19,55 @@
 #
 # ==========================================================================
 #
-# This module contains the implementation of the ONVIF device control protocol
+# This module contains the implementation of onvif protocol
 #
 package ZoneMinder::Control::onvif;
 
 use 5.006;
 use strict;
 use warnings;
+use MIME::Base64;
+use Digest::SHA;
+use DateTime;
+use URI;
+use Data::Dumper;
 
+require ZoneMinder::Base;
 require ZoneMinder::Control;
 
 our @ISA = qw(ZoneMinder::Control);
 
 our %CamParams = ();
 
+our ($profileToken, $address, $port, %identity);
+my ( $controlUri, $scheme );
+
 # ==========================================================================
 #
-# ONVIF Control Protocol
+# This script sends ONVIF compliant commands and may work with other cameras
 #
-# On ControlAddress use the format :
-#   USERNAME:PASSWORD@ADDRESS:PORT
-#   eg : admin:@10.1.2.1:80
-#        zoneminder:zonepass@10.0.100.1:40000
+# Configuration options (Source->Control tab)
+# - Control Type: ONVIF
+# - Control Device: prof0 - this is dependant on camera. It maybe required to sniff the traffic using Wireshark to find this out. If left empty value of "000" will be used.
+# - Control Address: <scheme>://[<user>:<password>@]<ip_or_host_of_onvif_enabled_camera>[:port][control_uri]
+# - Auto Stop Timeout: 1.00 - how long shold the camera move for when move command is issued. Value of 1.00 means 1s.
+# - Track Motion: NOT IMPLEMENTED - this suppose to be a feature for automatic camera scrolling (moving).
+# - Track Delay: NOT IMPLEMENTED
+# - Return Location: Home|Preset 1 - NOT IMPLEMENTED
+#
+# Absolute minimum required supported "Control Address" would be:
+#   - 192.168.1.199
+# This will use the following defaults:
+#   - port: 80
+#   - Control Device: 000
+#   - Control URI: /onvif/PTZ
+#   - No authentication
+#   - No Auto Stop Timeout (on movement command the camera will keep moving until it reaches it's edge)
+#
+# Example Control Address values:
+#   - http://user:password@192.168.1.199:888/onvif/device_control :Connect to camera at IP: 192.168.1.199 on port 888 with "username" and "password" credentials using /onvif/device_control URI
+#   - user:password@192.168.1.199                                 :Connect to camera at IP: 192.168.1.199 on default port 80 with "username" and "password" credentials using default /onvif/PTZ URI
+#   - 192.168.1.199                                               :Connect to camera at IP: 192.168.1.199 without any authentication and use the default /onvif/PTZ URI over HTTP.
 #
 # ==========================================================================
 
@@ -54,6 +81,11 @@ sub open {
 
   $self->loadMonitor();
 
+  $profileToken = $self->{Monitor}->{ControlDevice};
+  if ($profileToken eq '') { $profileToken = '000'; }
+
+  parseControlAddress($self->{Monitor}->{ControlAddress});
+
   use LWP::UserAgent;
   $self->{ua} = LWP::UserAgent->new;
   $self->{ua}->agent('ZoneMinder Control Agent/'.ZoneMinder::Base::ZM_VERSION);
@@ -61,39 +93,140 @@ sub open {
   $self->{state} = 'open';
 }
 
+sub parseControlAddress {
+    
+    my $controlAddress = shift;
+    
+    #make sure url start with a scheme
+    if ( $controlAddress !~ m'^https?://') {
+        $scheme = "http";
+        $controlAddress = $scheme."://".$controlAddress;
+    }     
+
+    my $url = URI->new($controlAddress);
+
+    #set the scheme
+    $scheme = $url->scheme;
+
+    #If we have authinfo
+    if ($url->userinfo){
+        my ($username , $password) = split /:/, $url->userinfo;
+        %identity = (username => $username, password => $password);
+    }
+    
+    #If we have no explicitly defined port
+    if (!$url->port){
+        $port = $url->default_port;
+    } else {
+        $port = $url->port;
+    }
+    
+    if (!$url->path){
+        $controlUri = "/onvif/PTZ";
+    } else {
+        $controlUri = $url->path;
+    }
+
+    $address = $url->host;
+}
+
+sub digestBase64 {
+  my ($nonce, $date, $password) = @_;
+  my $shaGenerator = Digest::SHA->new(1);
+  $shaGenerator->add($nonce . $date . $password);
+  return encode_base64($shaGenerator->digest, '');
+}
+
+sub authentificationHeader {
+  my ($username, $password) = @_;
+  my @set = ('0' ..'9', 'A' .. 'Z', 'a' .. 'z');
+  my $nonce = join '' => map $set[rand @set], 1 .. 20;
+ 
+  my $nonceBase64 = encode_base64($nonce, '');
+  my $currentDate = DateTime->now()->iso8601().'Z';
+
+  return '
+<s:Header>
+  <Security s:mustUnderstand="1" xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+    <UsernameToken xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd">
+      <Username>' . $username . '</Username>
+      <Password Type="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-username-token-profile-1.0#PasswordDigest">' . digestBase64($nonce, $currentDate, $password) . '</Password>
+      <Nonce EncodingType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary">' . $nonceBase64 . '</Nonce>
+      <Created xmlns="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">' . $currentDate . '</Created>
+    </UsernameToken>
+  </Security>
+</s:Header>';
+}
+
 sub sendCmd {
   my $self = shift;
   my $cmd = shift;
+  my $msg_body = shift;
+  my $content_type = shift;
   my $result = undef;
-  printMsg($cmd, 'Tx');
+  
+  my $msg = '
+    <s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">'. 
+        ((%identity) ? authentificationHeader($identity{username}, $identity{password}) : '') .
+    $msg_body . '
+    </s:Envelope>';
+
+  $self->printMsg($cmd, 'Tx');
+
+  my $server_endpoint = $scheme.'://'.$address.':'.$port.$controlUri;
+  my $req = HTTP::Request->new(POST => $server_endpoint);
+  $req->header('content-type' => $content_type);
+  $req->header('Host' => $address . ':' . $port);
+  $req->header('content-length' => length($msg));
+  $req->header('accept-encoding' => 'gzip, deflate');
+  $req->header('connection' => 'Close');
+  $req->content($msg);
 
-  my $req = HTTP::Request->new(GET=>'http://'.$self->{Monitor}->{ControlAddress}.'/'.$cmd);
   my $res = $self->{ua}->request($req);
 
   if ( $res->is_success ) {
     $result = !undef;
   } else {
-    Error("Error check failed:'".$res->status_line()."'" );
+    Error("After sending PTZ command, camera returned the following error:'".$res->status_line()."'\nMSG:$msg\nResponse:".$res->content);
   }
-
   return $result;
 }
 
 sub getCamParams {
   my $self = shift;
+  my $msg = '
+	<s:Envelope xmlns:s="http://www.w3.org/2003/05/soap-envelope">
+		<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+			<GetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl">
+				<VideoSourceToken>000</VideoSourceToken>
+			</GetImagingSettings>
+		</s:Body>
+	</s:Envelope>';
+
+  my $server_endpoint = $scheme.'://'.$address.':'.$port.'/onvif/imaging';
+  
+  my $req = HTTP::Request->new(POST => $server_endpoint);
+  $req->header('content-type' => 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/GetImagingSettings"');
+  $req->header('Host' => $address . ':' . $port);
+  $req->header('content-length' => length($msg));
+  $req->header('accept-encoding' => 'gzip, deflate');
+  $req->header('connection' => 'Close');
+  $req->content($msg);
 
-  my $req = HTTP::Request->new(GET=>'http://'.$self->{Monitor}->{ControlAddress}.'/get_camera_params.cgi');
   my $res = $self->{ua}->request($req);
 
   if ( $res->is_success ) {
-    # Parse results setting values in %FCParams
+    # We should really use an xml or soap library to parse the xml tags
     my $content = $res->decoded_content;
 
-    while ($content =~ s/var\s+([^=]+)=([^;]+);//ms) {
+    if ( $content =~ /.*<tt:(Brightness)>(.+)<\/tt:Brightness>.*/ ) {
+      $CamParams{$1} = $2;
+    }
+    if ( $content =~ /.*<tt:(Contrast)>(.+)<\/tt:Contrast>.*/ ) {
       $CamParams{$1} = $2;
     }
   } else {
-    Error("Error check failed:'".$res->status_line()."'");
+    Error("Unable to retrieve camera image settings:'".$res->status_line()."'");
   }
 }
 
@@ -101,256 +234,463 @@ sub getCamParams {
 #This makes use of the ZoneMinder Auto Stop Timeout on the Control Tab
 sub autoStop {
   my $self = shift;
-  my $stop_command = shift;
   my $autostop = shift;
-  if ( $stop_command && $autostop ) {
+
+  if ( $autostop ) {
     Debug('Auto Stop');
+    my $cmd = $controlUri;
+    my $msg_body = '
+	    <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+            	<Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+                	<ProfileToken>'.$profileToken.'</ProfileToken>
+                	<PanTilt>
+                	    true
+                	</PanTilt>
+                	<Zoom>
+                	    false
+                	</Zoom>
+                </Stop>
+            </s:Body>';
+
+    my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
     usleep($autostop);
-    my $cmd = 'decoder_control.cgi?command='.$stop_command;
-    $self->sendCmd($cmd);
+    $self->sendCmd($cmd, $msg_body, $content_type);
   }
 }
 
-# Reset the Camera
-sub reset {
+# Reboot
+sub reboot {
+  Debug('Camera reboot');
   my $self = shift;
+  my $cmd = '';
+  my $msg_body = << "END_MESSAGE";
+        <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+                <SystemReboot xmlns="http://www.onvif.org/ver10/device/wsdl"/>
+        </s:Body>
+END_MESSAGE
+
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver10/device/wsdl/SystemReboot"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+
+}
+
+# Reset(Reboot) the Camera
+sub reset {
   Debug('Camera Reset');
-  my $cmd = 'reboot.cgi?';
-  $self->sendCmd($cmd);
+  my $self = shift;
+  my $cmd = '';
+  my $msg_body = << "END_MESSAGE"; 
+ 	<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+		<SystemReboot xmlns="http://www.onvif.org/ver10/device/wsdl"/>
+	</s:Body>
+END_MESSAGE
+
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver10/device/wsdl/SystemReboot"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+}
+
+sub moveMap {
+  my $self = shift;
+  my $params = shift;
+  my $x = $self->getParam($params,'xcoord');
+  my $y = $self->getParam($params,'ycoord');
+  Debug("Move map to $x x $y");
+
+  my $cmd = $controlUri;
+  my $msg_body ='
+    <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+        <AbsoluteMove xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+            <ProfileToken>' . $profileToken . '</ProfileToken>
+            <Position>
+                <PanTilt x="'.$x.'" y="'.$y.'" xmlns="http://www.onvif.org/ver10/schema"/>
+            </Position>
+            <Speed>
+                <Zoom x="1" xmlns="http://www.onvif.org/ver10/schema"/>
+            </Speed>
+        </AbsoluteMove>
+    </s:Body>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+}
+
+sub moveRel {
+  my $self = shift;
+  my $params = shift;
+  my $x = $self->getParam($params,'xcoord');
+  my $speed = $self->getParam($params,'speed');
+  my $y = $self->getParam($params,'ycoord');
+  Debug("Move rel to $x x $y");
+
+  my $cmd = $controlUri;
+  my $msg_body ='
+    <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+        <RelativeMove xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+            <ProfileToken>' . $profileToken . '</ProfileToken>
+            <Translation>
+                <PanTilt x="'.$x.'" y="'.$y.'" xmlns="http://www.onvif.org/ver10/schema" space="http://www.onvif.org/ver10/tptz/PanTiltSpaces/PositionGenericSpace"/>
+                <Zoom x="1"/>
+            </Translation>
+        </RelativeMove>
+    </s:Body>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+}
+
+sub moveCamera {
+  my $type = shift;
+  my $x = shift;
+  my $y = shift;
+  my $msg_move_body = "";
+
+  if ( $type == "move" ){
+  	$msg_move_body = '
+  	    <s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+  	        <ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+                <ProfileToken>'.$profileToken.'</ProfileToken>
+                    <Velocity>
+                        <PanTilt
+  	                      x="'.$x.'"
+  	                      y="'.$y.'"
+  	                      xmlns="http://www.onvif.org/ver10/schema"/>
+                    </Velocity>
+            </ContinuousMove>
+        </s:Body>';
+
+  } elsif ( $type == "zoom" ) {
+  	$msg_move_body = '
+		<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+			<ContinuousMove xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+				<ProfileToken>'.$profileToken.'</ProfileToken>
+				<Velocity>
+					<Zoom 
+						x="'.$x.'" 
+						xmlns="http://www.onvif.org/ver10/schema"/>
+				</Velocity>
+			</ContinuousMove>
+        </s:Body>';
+  }
+
+  return $msg_move_body;
+
 }
 
 #Up Arrow
-sub moveConUp
-{
+sub moveConUp {
+  Debug('Move Up');
   my $self = shift;
-  my $stop_command = "1";
-  Debug( "Move Up" );
-  my $cmd = "decoder_control.cgi?command=0";
-  $self->sendCmd( $cmd );
-  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $cmd = $controlUri;
+  my $msg_body = moveCamera("move", "0","0.5");
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
 }
 
+
 #Down Arrow
-sub moveConDown
-{
+sub moveConDown {
+  Debug('Move Down');
   my $self = shift;
-  my $stop_command = "3";
-  Debug( "Move Down" );
-  my $cmd = "decoder_control.cgi?command=2";
-  $self->sendCmd( $cmd );
-  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $cmd = $controlUri;
+  my $msg_body = moveCamera("move","0","-0.5");
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
 }
 
 #Left Arrow
-sub moveConLeft
-{
+sub moveConLeft {
+  Debug('Move Left');
   my $self = shift;
-  my $stop_command = "5";
-  Debug( "Move Left" );
-  my $cmd = "decoder_control.cgi?command=4";
-  $self->sendCmd( $cmd );
-  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $cmd = $controlUri;
+  my $msg_body = moveCamera("move","-0.49","0");
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
 }
 
 #Right Arrow
-sub moveConRight
-{
+sub moveConRight {
+  Debug('Move Right');
   my $self = shift;
-  my $stop_command = "7";
-  Debug( "Move Right" );
-  my $cmd = "decoder_control.cgi?command=6";
-  $self->sendCmd( $cmd );
-  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $cmd = $controlUri;
+  my $msg_body = moveCamera("move","0.49","0");
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
 }
 
 #Zoom In
-sub zoomConTele
-{
+sub zoomConTele {
+  Debug('Zoom Tele');
   my $self = shift;
-  my $stop_command = "17";
-  Debug( "Zoom Tele" );
-  my $cmd = "decoder_control.cgi?command=18";
-  $self->sendCmd( $cmd );
-  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $cmd = $controlUri;
+  my $msg_body = moveCamera("zoom","0.49","0");
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
 }
 
 #Zoom Out
-sub zoomConWide
-{
+sub zoomConWide {
+  Debug('Zoom Wide');
   my $self = shift;
-  my $stop_command = "19";
-  Debug( "Zoom Wide" );
-  my $cmd = "decoder_control.cgi?command=16";
-  $self->sendCmd( $cmd );
-  $self->autoStop( $stop_command, $self->{Monitor}->{AutoStopTimeout} );
+  my $cmd = $controlUri;
+  my $msg_body = moveCamera("zoom","-0.49","0");
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
 }
 
 #Diagonally Up Right Arrow
 #This camera does not have builtin diagonal commands so we emulate them
-sub moveConUpRight
-{
+sub moveConUpRight {
+  Debug('Move Diagonally Up Right');
   my $self = shift;
-  Debug( "Move Diagonally Up Right" );
-  $self->moveConUp( );
-  $self->moveConRight( );
+  my $cmd = $controlUri;
+  my $msg_body = moveCamera("move","0.5","0.5");
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
 }
 
 #Diagonally Down Right Arrow
 #This camera does not have builtin diagonal commands so we emulate them
-sub moveConDownRight
-{
+sub moveConDownRight {
+  Debug('Move Diagonally Down Right');
   my $self = shift;
-  Debug( "Move Diagonally Down Right" );
-  $self->moveConDown( );
-  $self->moveConRight( );
+  my $cmd = $controlUri;
+  my $msg_body = moveCamera("move","0.5","-0.5");
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
 }
 
 #Diagonally Up Left Arrow
 #This camera does not have builtin diagonal commands so we emulate them
-sub moveConUpLeft
-{
+sub moveConUpLeft {
+  Debug('Move Diagonally Up Left');
   my $self = shift;
-  Debug( "Move Diagonally Up Left" );
-  $self->moveConUp( );
-  $self->moveConLeft( );
+  my $cmd = $controlUri;
+  my $msg_body = moveCamera("move","-0.5","0.5");
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
 }
 
 #Diagonally Down Left Arrow
 #This camera does not have builtin diagonal commands so we emulate them
-sub moveConDownLeft
-{
+sub moveConDownLeft {
+  Debug('Move Diagonally Down Left');
   my $self = shift;
-  Debug( "Move Diagonally Down Left" );
-  $self->moveConDown( );
-  $self->moveConLeft( );
+  my $cmd = $controlUri;
+  my $msg_body = moveCamera("move","-0.5","-0.5");
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
+  $self->autoStop($self->{Monitor}->{AutoStopTimeout});
 }
 
 #Stop
-sub moveStop
-{
+sub moveStop {
+  Debug('Move Stop');
   my $self = shift;
-  Debug( "Move Stop" );
-  my $cmd = "decoder_control.cgi?command=1";
-  $self->sendCmd( $cmd );
+  my $cmd = $controlUri;
+  my $msg_body = '
+	<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+		<Stop xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+			<ProfileToken>'.$profileToken.'</ProfileToken>
+				<PanTilt>true</PanTilt>
+				<Zoom>false</Zoom>
+		</Stop>
+	</s:Body>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/ContinuousMove"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
 }
 
 #Set Camera Preset
-#Presets must be translated into values internal to the camera
-#Those values are: 30,32,34,36,38,40,42,44 for presets 1-8 respectively
-sub presetSet
-{
+sub presetSet {
   my $self = shift;
   my $params = shift;
-  my $preset = $self->getParam( $params, 'preset' );
-  Debug( "Set Preset $preset" );
-
-  if (( $preset >= 1 ) && ( $preset <= 8 )) {
-    my $cmd = "decoder_control.cgi?command=".(($preset*2) + 28);
-    $self->sendCmd( $cmd );
-  }
+  my $preset = $self->getParam($params, 'preset');
+  Debug("Set Preset $preset");
+  my $cmd = $controlUri;
+  my $msg_body ='
+	<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+		<SetPreset xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+			<ProfileToken>' . $profileToken . '</ProfileToken>
+			<PresetToken>'.$preset.'</PresetToken>
+		</SetPreset>
+	</s:Body>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/SetPreset"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
 }
 
 #Recall Camera Preset
-#Presets must be translated into values internal to the camera
-#Those values are: 31,33,35,37,39,41,43,45 for presets 1-8 respectively
-sub presetGoto
-{
+sub presetGoto {
   my $self = shift;
   my $params = shift;
-  my $preset = $self->getParam( $params, 'preset' );
-  Debug( "Goto Preset $preset" );
+  my $preset = $self->getParam($params, 'preset');
 
-  if (( $preset >= 1 ) && ( $preset <= 8 )) {
-    my $cmd = "decoder_control.cgi?command=".(($preset*2) + 29);
-    $self->sendCmd( $cmd );
-  }
-
-  if ( $preset == 9 ) {
-    $self->horizontalPatrol();
-  }
-
-  if ( $preset == 10 ) {
-    $self->horizontalPatrolStop();
-  }
+  Debug("Goto Preset $preset");
+  my $cmd = $controlUri;
+  my $msg_body ='
+	<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+		<GotoPreset xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+			<ProfileToken>' . $profileToken . '</ProfileToken>
+			<PresetToken>'.$preset.'</PresetToken>
+		</GotoPreset>
+	</s:Body>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/GotoPreset"';
+  $self->sendCmd( $cmd, $msg_body, $content_type );
 }
 
-#Horizontal Patrol - Vertical Patrols are not supported
-sub horizontalPatrol
-{
+#Recall Camera Preset
+sub presetHome {
   my $self = shift;
-  Debug( "Horizontal Patrol" );
-  my $cmd = "decoder_control.cgi?command=20";
-  $self->sendCmd( $cmd );
+  my $params = shift;
+
+  Debug("Goto Home preset");
+  my $cmd = $controlUri;
+  my $msg_body ='
+	<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+		<GotoHomePosition xmlns="http://www.onvif.org/ver20/ptz/wsdl">
+			<ProfileToken>' . $profileToken . '</ProfileToken>
+		</GotoHomePosition>
+	</s:Body>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/ptz/wsdl/GotoPreset"';
+  $self->sendCmd( $cmd, $msg_body, $content_type );
+}
+
+#Horizontal Patrol
+#To be determined if this camera supports this feature
+sub horizontalPatrol {
+  Debug('Horizontal Patrol');
+  my $self = shift;
+  my $cmd = '';
+  my $msg ='';
+  my $content_type = '';
+  # $self->sendCmd( $cmd, $msg, $content_type );
+  Error('PTZ Command not implemented in control script.');
 }
 
 #Horizontal Patrol Stop
-sub horizontalPatrolStop
-{
+#To be determined if this camera supports this feature
+sub horizontalPatrolStop {
+  Debug('Horizontal Patrol Stop');
   my $self = shift;
-  Debug( "Horizontal Patrol Stop" );
-  my $cmd = "decoder_control.cgi?command=21";
-  $self->sendCmd( $cmd );
+  my $cmd = '';
+  my $msg ='';
+  my $content_type = '';
+  #    $self->sendCmd( $cmd, $msg, $content_type );
+  Error('PTZ Command not implemented in control script.');
 }
 
 # Increase Brightness
-sub irisAbsOpen
-{
+sub irisAbsOpen {
+  Debug("Iris $CamParams{Brightness}");
   my $self = shift;
   my $params = shift;
-  $self->getCamParams() unless($CamParams{'brightness'});
-  my $step = $self->getParam( $params, 'step' );
+  $self->getCamParams() unless($CamParams{Brightness});
+  my $step = $self->getParam($params, 'step');
+  my $max = 100;
 
-  $CamParams{'brightness'} += $step;
-  $CamParams{'brightness'} = 255 if ($CamParams{'brightness'} > 255);
-  Debug( "Iris $CamParams{'brightness'}" );
-  my $cmd = "camera_control.cgi?param=1&value=".$CamParams{'brightness'};
-  $self->sendCmd( $cmd );
+  $CamParams{Brightness} += $step;
+  $CamParams{Brightness} = $max if ($CamParams{Brightness} > $max);
+
+  my $cmd = 'onvif/imaging';
+  my $msg_body ='
+	<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+		<SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl">
+			<VideoSourceToken>000</VideoSourceToken>
+			<ImagingSettings>
+				<Brightness xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{Brightness}.'</Brightness>
+			</ImagingSettings>
+			<ForcePersistence>true</ForcePersistence>
+		</SetImagingSettings>
+	</s:Body>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
 }
 
 # Decrease Brightness
-sub irisAbsClose
-{
+sub irisAbsClose {
+  Debug("Iris $CamParams{Brightness}");
   my $self = shift;
   my $params = shift;
-  $self->getCamParams() unless($CamParams{'brightness'});
-  my $step = $self->getParam( $params, 'step' );
+  $self->getCamParams() unless($CamParams{brightness});
+  my $step = $self->getParam($params, 'step');
+  my $min = 0;
 
-  $CamParams{'brightness'} -= $step;
-  $CamParams{'brightness'} = 0 if ($CamParams{'brightness'} < 0);
-  Debug( "Iris $CamParams{'brightness'}" );
-  my $cmd = "camera_control.cgi?param=1&value=".$CamParams{'brightness'};
-  $self->sendCmd( $cmd );
+  $CamParams{Brightness} -= $step;
+  $CamParams{Brightness} = $min if ($CamParams{Brightness} < $min);
+
+  my $cmd = 'onvif/imaging';
+  my $msg_body ='
+	<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+		<SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl">
+			<VideoSourceToken>000</VideoSourceToken>
+			<ImagingSettings>
+				<Brightness xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{Brightness}.'</Brightness>
+			</ImagingSettings>
+			<ForcePersistence>true</ForcePersistence>
+		</SetImagingSettings>
+	</s:Body>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
 }
 
 # Increase Contrast
-sub whiteAbsIn
-{
+sub whiteAbsIn {
+  Debug("Iris $CamParams{Contrast}");
   my $self = shift;
   my $params = shift;
-  $self->getCamParams() unless($CamParams{'contrast'});
-  my $step = $self->getParam( $params, 'step' );
+  $self->getCamParams() unless($CamParams{Contrast});
+  my $step = $self->getParam($params, 'step');
+  my $max = 100;
 
-  $CamParams{'contrast'} += $step;
-  $CamParams{'contrast'} = 6 if ($CamParams{'contrast'} > 6);
-  Debug( "Iris $CamParams{'contrast'}" );
-  my $cmd = "camera_control.cgi?param=2&value=".$CamParams{'contrast'};
-  $self->sendCmd( $cmd );
+  $CamParams{Contrast} += $step;
+  $CamParams{Contrast} = $max if ($CamParams{Contrast} > $max);
+
+  my $cmd = 'onvif/imaging';
+  my $msg_body ='
+	<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+		<SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl">
+			<VideoSourceToken>000</VideoSourceToken>
+			<ImagingSettings>
+				<Contrast xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{Contrast}.'</Contrast>
+			</ImagingSettings>
+			<ForcePersistence>true</ForcePersistence>
+		</SetImagingSettings>
+    </s:Body>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
 }
 
 # Decrease Contrast
-sub whiteAbsOut
-{
+sub whiteAbsOut {
+  Debug("Iris $CamParams{Contrast}");
   my $self = shift;
   my $params = shift;
-  $self->getCamParams() unless($CamParams{'contrast'});
-  my $step = $self->getParam( $params, 'step' );
+  $self->getCamParams() unless($CamParams{Contrast});
+  my $step = $self->getParam($params, 'step');
+  my $min = 0;
 
-  $CamParams{'contrast'} -= $step;
-  $CamParams{'contrast'} = 0 if ($CamParams{'contrast'} < 0);
-  Debug( "Iris $CamParams{'contrast'}" );
-  my $cmd = "camera_control.cgi?param=2&value=".$CamParams{'contrast'};
-  $self->sendCmd( $cmd );
+  $CamParams{Contrast} -= $step;
+  $CamParams{Contrast} = $min if ($CamParams{Contrast} < $min);
+
+  my $cmd = 'onvif/imaging';
+  my $msg_body ='
+	<s:Body xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+		<SetImagingSettings xmlns="http://www.onvif.org/ver20/imaging/wsdl">
+			<VideoSourceToken>000</VideoSourceToken>
+			<ImagingSettings>
+				<Contrast xmlns="http://www.onvif.org/ver10/schema">'.$CamParams{Contrast}.'</Contrast>
+			</ImagingSettings>
+			<ForcePersistence>true</ForcePersistence>
+		</SetImagingSettings>
+	</s:Body>';
+  my $content_type = 'application/soap+xml; charset=utf-8; action="http://www.onvif.org/ver20/imaging/wsdl/SetImagingSettings"';
+  $self->sendCmd($cmd, $msg_body, $content_type);
 }
 
 1;
-
+__END__
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index 827936b86..18df301f3 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -146,15 +146,15 @@ sub zmDbGetMonitors {
 
   if ( $function ) {
     if ( $function == DB_MON_CAPT ) {
-      $sql .= " where `Function` >= 'Monitor'";
+      $sql .= " WHERE `Function` >= 'Monitor'";
     } elsif ( $function == DB_MON_ACTIVE ) {
-      $sql .= " where `Function` > 'Monitor'";
+      $sql .= " WHERE `Function` > 'Monitor'";
     } elsif ( $function == DB_MON_MOTION ) {
-      $sql .= " where `Function` = 'Modect' or Function = 'Mocord'";
+      $sql .= " WHERE `Function` = 'Modect' OR `Function` = 'Mocord'";
     } elsif ( $function == DB_MON_RECORD ) {
-      $sql .= " where `Function` = 'Record' or Function = 'Mocord'";
+      $sql .= " WHERE `Function` = 'Record' OR `Function` = 'Mocord'";
     } elsif ( $function == DB_MON_PASSIVE ) {
-      $sql .= " where `Function` = 'Nodect'";
+      $sql .= " WHERE `Function` = 'Nodect'";
     }
   }
   my $sth = $dbh->prepare_cached( $sql );
@@ -266,15 +266,14 @@ sub end_transaction {
 } # end sub end_transaction
 
 # Basic execution of $dbh->do but with some pretty logging of the sql on error.
-# Returns 1 on success, 0 on error
 sub zmDbDo {
 	my $sql = shift;
-	if ( ! $dbh->do($sql, undef, @_) ) {
+  my $rows = $dbh->do($sql, undef, @_);
+	if ( ! defined $rows ) {
 		$sql =~ s/\?/'%s'/;
 		Error(sprintf("Failed $sql :", @_).$dbh->errstr());
-    return 0;
 	}
-  return 1;
+  return $rows;
 }
 
 1;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
index 0af41b2ca..48544a911 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
@@ -32,6 +32,7 @@ require ZoneMinder::Base;
 require ZoneMinder::Object;
 require ZoneMinder::Storage;
 require ZoneMinder::Frame;
+require ZoneMinder::Monitor;
 require Date::Manip;
 require File::Find;
 require File::Path;
@@ -41,7 +42,7 @@ require Number::Bytes::Human;
 require Date::Parse;
 require POSIX;
 use Date::Format qw(time2str);
-use Time::HiRes qw(gettimeofday tv_interval);
+use Time::HiRes qw(gettimeofday tv_interval stat);
 
 #our @ISA = qw(ZoneMinder::Object);
 use parent qw(ZoneMinder::Object);
@@ -68,8 +69,8 @@ $serial = $primary_key = 'Id';
   SecondaryStorageId
   Name
   Cause
-  StartTime
-  EndTime
+  StartDateTime
+  EndDateTime
   Width
   Height
   Length
@@ -111,8 +112,8 @@ sub Time {
     $_[0]{Time} = $_[1];
   }
   if ( ! defined $_[0]{Time} ) {
-    if ( $_[0]{StartTime} ) {
-      $_[0]{Time} = Date::Parse::str2time( $_[0]{StartTime} );
+    if ( $_[0]{StartDateTime} ) {
+      $_[0]{Time} = Date::Parse::str2time( $_[0]{StartDateTime} );
     }
   }
   return $_[0]{Time};
@@ -349,6 +350,10 @@ sub GenerateVideo {
   return;
 } # end sub GenerateVideo
 
+# Note about transactions, this function may be called with rows locked and hence in a transaction.
+# So we will detect if we are in a transaction, and if not, start one.  We will NOT do rollback or 
+# commits unless we started the transaction.
+
 sub delete {
   my $event = $_[0];
 
@@ -360,11 +365,11 @@ sub delete {
   my $in_zmaudit = ( $0 =~ 'zmaudit.pl$');
 
   if ( ! $in_zmaudit ) {
-    if ( ! ( $event->{Id} and $event->{MonitorId} and $event->{StartTime} ) ) {
+    if ( ! ( $event->{Id} and $event->{MonitorId} and $event->{StartDateTime} ) ) {
       # zmfilter shouldn't delete anything in an odd situation. zmaudit will though.
       my ( $caller, undef, $line ) = caller;
-      Warning("$0 Can't Delete event $event->{Id} from Monitor $event->{MonitorId} StartTime:".
-        (defined($event->{StartTime})?$event->{StartTime}:'undef')." from $caller:$line");
+      Warning("$0 Can't Delete event $event->{Id} from Monitor $event->{MonitorId} StartDateTime:".
+        (defined($event->{StartDateTime})?$event->{StartDateTime}:'undef')." from $caller:$line");
       return;
     }
     if ( !($event->Storage()->Path() and -e $event->Storage()->Path()) ) {
@@ -375,26 +380,28 @@ sub delete {
 
   if ( $$event{Id} ) {
     # Need to have an event Id if we are to delete from the db.  
-    Info("Deleting event $event->{Id} from Monitor $event->{MonitorId} StartTime:$event->{StartTime} from ".$event->Path());
+    Info("Deleting event $event->{Id} from Monitor $event->{MonitorId} StartDateTime:$event->{StartDateTime} from ".$event->Path());
     $ZoneMinder::Database::dbh->ping();
 
-    $ZoneMinder::Database::dbh->begin_work();
-    #$event->lock_and_load();
+    my $in_transaction = $ZoneMinder::Database::dbh->{AutoCommit} ? 0 : 1;
 
-    ZoneMinder::Database::zmDbDo('DELETE FROM Frames WHERE EventId=?', $$event{Id});
-    if ( $ZoneMinder::Database::dbh->errstr() ) {
-      $ZoneMinder::Database::dbh->commit();
-      return;
-    }
+    $ZoneMinder::Database::dbh->begin_work() if ! $in_transaction;
+
+    # Going to delete in order of least value to greatest value. Stats is least and references Frames
     ZoneMinder::Database::zmDbDo('DELETE FROM Stats WHERE EventId=?', $$event{Id});
     if ( $ZoneMinder::Database::dbh->errstr() ) {
-      $ZoneMinder::Database::dbh->commit();
+      $ZoneMinder::Database::dbh->commit() if ! $in_transaction;
+      return;
+    }
+    ZoneMinder::Database::zmDbDo('DELETE FROM Frames WHERE EventId=?', $$event{Id});
+    if ( $ZoneMinder::Database::dbh->errstr() ) {
+      $ZoneMinder::Database::dbh->commit() if ! $in_transaction;
       return;
     }
 
     # Do it individually to avoid locking up the table for new events
     ZoneMinder::Database::zmDbDo('DELETE FROM Events WHERE Id=?', $$event{Id});
-    $ZoneMinder::Database::dbh->commit();
+    $ZoneMinder::Database::dbh->commit() if ! $in_transaction;
   }
 
   if ( ( $in_zmaudit or (!$Config{ZM_OPT_FAST_DELETE})) and $event->Storage()->DoDelete() ) {
@@ -785,44 +792,50 @@ sub recover_timestamps {
     return;
   }
   my @contents = readdir(DIR);
-  Debug('Have ' . @contents . " files in $path");
+  Debug('Have ' . @contents . ' files in '.$path);
   closedir(DIR);
 
-  my @mp4_files = grep( /^\d+\-video\.mp4$/, @contents);
+  my @mp4_files = grep(/^\d+\-video\.mp4$/, @contents);
   if ( @mp4_files ) {
     $$Event{DefaultVideo} = $mp4_files[0];
   }
 
-  my @analyse_jpgs = grep( /^\d+\-analyse\.jpg$/, @contents);
+  my @analyse_jpgs = grep(/^\d+\-analyse\.jpg$/, @contents);
   if ( @analyse_jpgs ) {
-    $$Event{Save_JPEGs} |= 2;
+    $$Event{SaveJPEGs} |= 2;
   }
 
-  my @capture_jpgs = grep( /^\d+\-capture\.jpg$/, @contents);
+  my @capture_jpgs = grep(/^\d+\-capture\.jpg$/, @contents);
   if ( @capture_jpgs ) {
     $$Event{Frames} = scalar @capture_jpgs;
-    $$Event{Save_JPEGs} |= 1;
+    $$Event{SaveJPEGs} |= 1;
     # can get start and end times from stat'ing first and last jpg
     @capture_jpgs = sort { $a cmp $b } @capture_jpgs;
     my $first_file = "$path/$capture_jpgs[0]";
     ( $first_file ) = $first_file =~ /^(.*)$/;
     my $first_timestamp = (stat($first_file))[9];
 
-    my $last_file = "$path/$capture_jpgs[@capture_jpgs-1]";
+    my $last_file = $path.'/'.$capture_jpgs[@capture_jpgs-1];
     ( $last_file ) = $last_file =~ /^(.*)$/;
     my $last_timestamp = (stat($last_file))[9];
 
     my $duration = $last_timestamp - $first_timestamp;
     $Event->Length($duration);
-    $Event->StartTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $first_timestamp) );
-    $Event->EndTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $last_timestamp) );
-    Debug("From capture Jpegs have duration $duration = $last_timestamp - $first_timestamp : $$Event{StartTime} to $$Event{EndTime}");
+    $Event->StartDateTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $first_timestamp) );
+    if ( $Event->Scheme() eq 'Deep' and $Event->RelativePath(undef) and ($path ne $Event->Path(undef)) ) {
+      my ( $year, $month, $day, $hour, $minute, $second ) =
+      ($path =~ /(\d{2})\/(\d{2})\/(\d{2})\/(\d{2})\/(\d{2})\/(\d{2})$/);
+      Error("Updating starttime to $path $year/$month/$day $hour:$minute:$second");
+      $Event->StartDateTime(sprintf('%.4d-%.2d-%.2d %.2d:%.2d:%.2d', 2000+$year, $month, $day, $hour, $minute, $second));
+    }
+    $Event->EndDateTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $last_timestamp) );
+    Debug("From capture Jpegs have duration $duration = $last_timestamp - $first_timestamp : $$Event{StartDateTime} to $$Event{EndDateTime}");
     $ZoneMinder::Database::dbh->begin_work();
     foreach my $jpg ( @capture_jpgs ) {
       my ( $id ) = $jpg =~ /^(\d+)\-capture\.jpg$/;
 
-      if ( ! ZoneMinder::Frame->find_one( EventId=>$$Event{Id}, FrameId=>$id ) ) {
-        my $file = "$path/$jpg";
+      if ( ! ZoneMinder::Frame->find_one(EventId=>$$Event{Id}, FrameId=>$id) ) {
+        my $file = $path.'/'.$jpg;
         ( $file ) = $file =~ /^(.*)$/;
         my $timestamp = (stat($file))[9];
         my $Frame = new ZoneMinder::Frame();
@@ -833,11 +846,11 @@ sub recover_timestamps {
             Type=>'Normal',
             Score=>0,
           });
-      }
-    }
+      } # end if Frame not found
+    } # end foreach capture jpg
     $ZoneMinder::Database::dbh->commit();
   } elsif ( @mp4_files ) {
-    my $file = "$path/$mp4_files[0]";
+    my $file = $path.'/'.$mp4_files[0];
     ( $file ) = $file =~ /^(.*)$/;
 
     my $first_timestamp = (stat($file))[9];
@@ -852,8 +865,8 @@ sub recover_timestamps {
       }
     my $seconds = ($h*60*60)+($m*60)+$s;
     $Event->Length($seconds.'.'.$u);
-    $Event->StartTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $first_timestamp) );
-    $Event->EndTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $first_timestamp+$seconds) );
+    $Event->StartDateTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $first_timestamp) );
+    $Event->EndDateTime( Date::Format::time2str('%Y-%m-%d %H:%M:%S', $first_timestamp+$seconds) );
   }
   if ( @mp4_files ) {
     $Event->DefaultVideo($mp4_files[0]);
@@ -903,6 +916,15 @@ sub canEdit {
   return 0;
 } # end sub canEdit
 
+sub Monitor {
+  my $self = shift;
+  $$self{Monitor} = shift if @_;
+  if ( !$$self{Monitor} ) {
+    $$self{Monitor} = new ZoneMinder::Monitor($$self{MonitorId});
+  }
+  return $$self{Monitor};
+}
+
 1;
 __END__
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
index b48946d1f..5711437f2 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -58,6 +58,7 @@ Id
 Name
 Query_json
 AutoArchive
+AutoUnarchive
 AutoVideo
 AutoUpload
 AutoEmail
@@ -76,6 +77,7 @@ UpdateDiskSpace
 UserId
 Background
 Concurrent
+LockRows
 );
 
 sub Execute {
@@ -90,11 +92,13 @@ sub Execute {
   }
 
   if ( $self->{HasDiskPercent} ) {
-		my $disk_percent = getDiskPercent($$self{Storage} ? $$self{Storage}->Path() : ());
+    $$self{Storage} = ZoneMinder::Storage->find_one() if ! $$self{Storage};
+		my $disk_percent = getDiskPercent($$self{Storage} ? $$self{Storage}->Path() : $Config{ZM_DIR_EVENTS});
     $sql =~ s/zmDiskPercent/$disk_percent/g;
   }
   if ( $self->{HasDiskBlocks} ) {
-    my $disk_blocks = getDiskBlocks();
+    $$self{Storage} = ZoneMinder::Storage->find_one() if ! $$self{Storage};
+		my $disk_blocks = getDiskBlocks($$self{Storage} ? $$self{Storage}->Path() : $Config{ZM_DIR_EVENTS});
     $sql =~ s/zmDiskBlocks/$disk_blocks/g;
   }
   if ( $self->{HasSystemLoad} ) {
@@ -102,6 +106,8 @@ sub Execute {
     $sql =~ s/zmSystemLoad/$load/g;
   }
 
+  $sql .= ' FOR UPDATE' if $$self{LockRows};
+
   Debug("Filter::Execute SQL ($sql)");
   my $sth = $ZoneMinder::Database::dbh->prepare_cached($sql)
     or Fatal("Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr());
@@ -144,25 +150,19 @@ sub Sql {
     }
 
     my $filter_expr = ZoneMinder::General::jsonDecode($self->{Query_json});
-    my $sql = 'SELECT E.*,
-       unix_timestamp(E.StartTime) as Time,
-       M.Name as MonitorName,
-       M.DefaultRate,
-       M.DefaultScale
-         FROM Events as E
-         INNER JOIN Monitors as M on M.Id = E.MonitorId
-         LEFT JOIN Storage as S on S.Id = E.StorageId
-         ';
+    my $sql = 'SELECT E.*, unix_timestamp(E.StartDateTime) as Time
+         FROM Events as E';
 
     if ( $filter_expr->{terms} ) {
       foreach my $term ( @{$filter_expr->{terms}} ) {
 
         # See getFilterQueryConjunctionTypes()
         if ( exists($term->{cnj}) and $term->{cnj} =~ /^(and|or)$/ ) {
-          $self->{Sql} .= ' '.$term->{cnj}.' ';
+          $self->{Sql} .= ' '.$term->{cnj};
         }
+        $self->{Sql} .= ' ';
         if ( exists($term->{obr}) ) {
-          $self->{Sql} .= ' '.str_repeat('(', $term->{obr}).' ';
+          $self->{Sql} .= str_repeat('(', $term->{obr}).' ';
         }
         my $value = $term->{val};
         my @value_list;
@@ -170,165 +170,165 @@ sub Sql {
 					if ( $term->{attr} eq 'AlarmedZoneId' ) {
 						$term->{op} = 'EXISTS';
           } elsif ( $term->{attr} =~ /^Monitor/ ) {
+            $sql = 'SELECT E.*, unix_timestamp(E.StartDateTime) as Time, M.Name as MonitorName
+         FROM Events as E INNER JOIN Monitors as M on M.Id = E.MonitorId';
             my ( $temp_attr_name ) = $term->{attr} =~ /^Monitor(.+)$/;
             $self->{Sql} .= 'M.'.$temp_attr_name;
           } elsif ( $term->{attr} eq 'ServerId' or $term->{attr} eq 'MonitorServerId' ) {
+            $sql = 'SELECT E.*, unix_timestamp(E.StartDateTime) as Time, M.Name as MonitorName
+         FROM Events as E INNER JOIN Monitors as M on M.Id = E.MonitorId';
             $self->{Sql} .= 'M.ServerId';
           } elsif ( $term->{attr} eq 'StorageServerId' ) {
-            $self->{Sql} .= 'S.ServerId';
+            $self->{Sql} .= '(SELECT Storage.ServerId FROM Storage WHERE Storage.Id=E.StorageId)';
           } elsif ( $term->{attr} eq 'FilterServerId' ) {
             $self->{Sql} .= $Config{ZM_SERVER_ID};
 # StartTime options
           } elsif ( $term->{attr} eq 'DateTime' ) {
-            $self->{Sql} .= 'E.StartTime';
-          } elsif ( $term->{attr} eq 'StartDateTime' ) {
-            $self->{Sql} .= 'E.StartTime';
+            $self->{Sql} .= 'E.StartDateTime';
           } elsif ( $term->{attr} eq 'Date' ) {
-            $self->{Sql} .= 'to_days( E.StartTime )';
+            $self->{Sql} .= 'to_days( E.StartDateTime )';
           } elsif ( $term->{attr} eq 'StartDate' ) {
-            $self->{Sql} .= 'to_days( E.StartTime )';
+            $self->{Sql} .= 'to_days( E.StartDateTime )';
           } elsif ( $term->{attr} eq 'Time' or $term->{attr} eq 'StartTime' ) {
-            $self->{Sql} .= 'extract( hour_second from E.StartTime )';
+            $self->{Sql} .= 'extract( hour_second from E.StartDateTime )';
           } elsif ( $term->{attr} eq 'Weekday' or $term->{attr} eq 'StartWeekday' ) {
-            $self->{Sql} .= 'weekday( E.StartTime )';
+            $self->{Sql} .= 'weekday( E.StartDateTime )';
 
 # EndTIme options
           } elsif ( $term->{attr} eq 'EndDateTime' ) {
-            $self->{Sql} .= 'E.EndTime';
+            $self->{Sql} .= 'E.EndDateTime';
           } elsif ( $term->{attr} eq 'EndDate' ) {
-            $self->{Sql} .= 'to_days( E.EndTime )';
-          } elsif ( $term->{attr} eq 'EndTime' ) {
-            $self->{Sql} .= 'extract( hour_second from E.EndTime )';
+            $self->{Sql} .= 'to_days( E.EndDateTime )';
+          } elsif ( $term->{attr} eq 'EndDateTime' ) {
+            $self->{Sql} .= 'extract( hour_second from E.EndDateTime )';
           } elsif ( $term->{attr} eq 'EndWeekday' ) {
-            $self->{Sql} .= "weekday( E.EndTime )";
-
-# 
+            $self->{Sql} .= "weekday( E.EndDateTime )";
           } elsif ( $term->{attr} eq 'ExistsInFileSystem' ) {
             push @{$self->{PostSQLConditions}}, $term;
-          } elsif ( $term->{attr} eq 'DiskSpace' ) {
-            $self->{Sql} .= 'E.DiskSpace';
+            $self->{Sql} .= 'TRUE /* ExistsInFileSystem */';
           } elsif ( $term->{attr} eq 'DiskPercent' ) {
             $self->{Sql} .= 'zmDiskPercent';
             $self->{HasDiskPercent} = !undef;
-            $self->{HasPreCondition} = !undef;
           } elsif ( $term->{attr} eq 'DiskBlocks' ) {
             $self->{Sql} .= 'zmDiskBlocks';
             $self->{HasDiskBlocks} = !undef;
-            $self->{HasPreCondition} = !undef;
           } elsif ( $term->{attr} eq 'SystemLoad' ) {
             $self->{Sql} .= 'zmSystemLoad';
             $self->{HasSystemLoad} = !undef;
-            $self->{HasPreCondition} = !undef;
           } else {
             $self->{Sql} .= 'E.'.$term->{attr};
           }
 
-          ( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/;
-          foreach my $temp_value ( split( /["'\s]*?,["'\s]*?/, $stripped_value ) ) {
-	
-            if ( $term->{attr} eq 'AlarmedZoneId' ) {
-							$value = '(SELECT * FROM Stats WHERE EventId=E.Id AND ZoneId='.$value.')';
-            } elsif ( $term->{attr} =~ /^MonitorName/ ) {
-              $value = "'$temp_value'";
-            } elsif ( $term->{attr} =~ /ServerId/) {
-              Debug("ServerId, temp_value is ($temp_value) ($ZoneMinder::Config::Config{ZM_SERVER_ID})");
-              if ( $temp_value eq 'ZM_SERVER_ID' ) {
-                $value = "'$ZoneMinder::Config::Config{ZM_SERVER_ID}'";
-                # This gets used later, I forget for what
-                $$self{Server} = new ZoneMinder::Server($ZoneMinder::Config::Config{ZM_SERVER_ID});
-              } elsif ( $temp_value eq 'NULL' ) {
-                $value = $temp_value;
-              } else {
+          if ( $term->{attr} eq 'ExistsInFileSystem' ) {
+            # PostCondition, so no further SQL
+          } else {
+            ( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/;
+            foreach my $temp_value ( split( /["'\s]*?,["'\s]*?/, $stripped_value ) ) {
+
+              if ( $term->{attr} eq 'AlarmedZoneId' ) {
+                $value = '(SELECT * FROM Stats WHERE EventId=E.Id AND Score > 0 AND ZoneId='.$value.')';
+              } elsif ( $term->{attr} =~ /^MonitorName/ ) {
                 $value = "'$temp_value'";
-                # This gets used later, I forget for what
-                $$self{Server} = new ZoneMinder::Server($temp_value);
-              }
-						} elsif ( $term->{attr} eq 'StorageId' ) {
-							$value = "'$temp_value'";
-							$$self{Storage} = new ZoneMinder::Storage($temp_value);
-            } elsif ( $term->{attr} eq 'Name'
+              } elsif ( $term->{attr} =~ /ServerId/) {
+                Debug("ServerId, temp_value is ($temp_value) ($ZoneMinder::Config::Config{ZM_SERVER_ID})");
+                if ( $temp_value eq 'ZM_SERVER_ID' ) {
+                  $value = "'$ZoneMinder::Config::Config{ZM_SERVER_ID}'";
+                  # This gets used later, I forget for what
+                  $$self{Server} = new ZoneMinder::Server($ZoneMinder::Config::Config{ZM_SERVER_ID});
+                } elsif ( $temp_value eq 'NULL' ) {
+                  $value = $temp_value;
+                } else {
+                  $value = "'$temp_value'";
+                  # This gets used later, I forget for what
+                  $$self{Server} = new ZoneMinder::Server($temp_value);
+                }
+              } elsif ( $term->{attr} eq 'StorageId' ) {
+                $value = "'$temp_value'";
+                $$self{Storage} = new ZoneMinder::Storage($temp_value);
+              } elsif ( $term->{attr} eq 'Name'
                 || $term->{attr} eq 'Cause'
                 || $term->{attr} eq 'Notes'
-                ) {
+              ) {
                 if ( $term->{op} eq 'LIKE'
-                || $term->{op} eq 'NOT LIKE'
+                  || $term->{op} eq 'NOT LIKE'
                 ) {
-                $temp_value = '%'.$temp_value.'%' if $temp_value !~ /%/;
+                  $temp_value = '%'.$temp_value.'%' if $temp_value !~ /%/;
+                }
+                $value = "'$temp_value'";
+              } elsif ( $term->{attr} eq 'DateTime' or $term->{attr} eq 'StartDateTime' or $term->{attr} eq 'EndDateTime' ) {
+                if ( $temp_value eq 'NULL' ) {
+                  $value = $temp_value;
+                } else {
+                  $value = DateTimeToSQL($temp_value);
+                  if ( !$value ) {
+                    Error("Error parsing date/time '$temp_value', skipping filter '$self->{Name}'");
+                    return;
+                  }
+                  $value = "'$value'";
+                }
+              } elsif ( $term->{attr} eq 'Date' or $term->{attr} eq 'StartDate' or $term->{attr} eq 'EndDate' ) {
+                if ( $temp_value eq 'NULL' ) {
+                  $value = $temp_value;
+                } elsif ( $temp_value eq 'CURDATE()' or $temp_value eq 'NOW()' ) {
+                  $value = 'to_days('.$temp_value.')';
+                } else {
+                  $value = DateTimeToSQL($temp_value);
+                  if ( !$value ) {
+                    Error("Error parsing date/time '$temp_value', skipping filter '$self->{Name}'");
+                    return;
+                  }
+                  $value = "to_days( '$value' )";
+                }
+              } elsif ( $term->{attr} eq 'Time' or $term->{attr} eq 'StartTime' or $term->{attr} eq 'EndTime' ) {
+                if ( $temp_value eq 'NULL' ) {
+                  $value = $temp_value;
+                } else {
+                  $value = DateTimeToSQL($temp_value);
+                  if ( !$value ) {
+                    Error("Error parsing date/time '$temp_value', skipping filter '$self->{Name}'");
+                    return;
+                  }
+                  $value = "extract( hour_second from '$value' )";
                 }
-              $value = "'$temp_value'";
-            } elsif ( $term->{attr} eq 'DateTime' or $term->{attr} eq 'StartDateTime' or $term->{attr} eq 'EndDateTime' ) {
-              if ( $temp_value eq 'NULL' ) {
-                $value = $temp_value;
               } else {
-                $value = DateTimeToSQL($temp_value);
-                if ( !$value ) {
-                  Error("Error parsing date/time '$temp_value', skipping filter '$self->{Name}'");
-                  return;
-                }
-                $value = "'$value'";
-              }
-            } elsif ( $term->{attr} eq 'Date' or $term->{attr} eq 'StartDate' or $term->{attr} eq 'EndDate' ) {
-              if ( $temp_value eq 'NULL' ) {
                 $value = $temp_value;
-							} elsif ( $temp_value eq 'CURDATE()' or $temp_value eq 'NOW()' ) {
-								$value = 'to_days('.$temp_value.')';
-              } else {
-                $value = DateTimeToSQL($temp_value);
-                if ( !$value ) {
-                  Error("Error parsing date/time '$temp_value', skipping filter '$self->{Name}'");
-                  return;
-                }
-                $value = "to_days( '$value' )";
               }
-            } elsif ( $term->{attr} eq 'Time' or $term->{attr} eq 'StartTime' or $term->{attr} eq 'EndTime' ) {
-              if ( $temp_value eq 'NULL' ) {
-                $value = $temp_value;
+              push @value_list, $value;
+            } # end foreach temp_value
+          } # end if has an attr
+
+          if ( $term->{op} ) {
+            if ( $term->{op} eq '=~' ) {
+              $self->{Sql} .= ' REGEXP '.$value;
+            } elsif ( $term->{op} eq '!~' ) {
+              $self->{Sql} .= ' NOT REGEXP '.$value;
+            } elsif ( $term->{op} eq 'IS' ) {
+              if ( $value eq 'Odd' ) {
+                $self->{Sql} .= ' % 2 = 1';
+              } elsif ( $value eq 'Even' ) {
+                $self->{Sql} .= ' % 2 = 0';
               } else {
-                $value = DateTimeToSQL($temp_value);
-                if ( !$value ) {
-                  Error("Error parsing date/time '$temp_value', skipping filter '$self->{Name}'");
-                  return;
-                }
-                $value = "extract( hour_second from '$value' )";
+                $self->{Sql} .= ' IS '.$value;
               }
+            } elsif ( $term->{op} eq 'EXISTS' ) {
+              $self->{Sql} .= ' EXISTS '.$value;
+            } elsif ( $term->{op} eq 'IS NOT' ) {
+              $self->{Sql} .= ' IS NOT '.$value;
+            } elsif ( $term->{op} eq '=[]' or $term->{op} eq 'IN' ) {
+              $self->{Sql} .= ' IN ('.join(',', @value_list).")";
+            } elsif ( $term->{op} eq '![]' ) {
+              $self->{Sql} .= ' NOT IN ('.join(',', @value_list).')';
+            } elsif ( $term->{op} eq 'LIKE' ) {
+              $self->{Sql} .= ' LIKE '.$value;
+            } elsif ( $term->{op} eq 'NOT LIKE' ) {
+              $self->{Sql} .= ' NOT LIKE '.$value;
             } else {
-              $value = $temp_value;
+              $self->{Sql} .= ' '.$term->{op}.' '.$value;
             }
-            push @value_list, $value;
-          } # end foreach temp_value
-        } # end if has an attr
-        if ( $term->{op} ) {
-          if ( $term->{op} eq '=~' ) {
-            $self->{Sql} .= " regexp $value";
-          } elsif ( $term->{op} eq '!~' ) {
-            $self->{Sql} .= " not regexp $value";
-          } elsif ( $term->{op} eq 'IS' ) {
-            if ( $value eq 'Odd' ) {
-              $self->{Sql} .= ' % 2 = 1';
-            } elsif ( $value eq 'Even' ) {
-              $self->{Sql} .= ' % 2 = 0';
-            } else {
-              $self->{Sql} .= " IS $value";
-            }
-          } elsif ( $term->{op} eq 'EXISTS' ) {
-            $self->{Sql} .= " EXISTS $value";
-          } elsif ( $term->{op} eq 'IS NOT' ) {
-            $self->{Sql} .= " IS NOT $value";
-          } elsif ( $term->{op} eq '=[]' ) {
-            $self->{Sql} .= ' IN ('.join(',', @value_list).')';
-          } elsif ( $term->{op} eq '!~' ) {
-            $self->{Sql} .= ' NOT IN ('.join(',', @value_list).')';
-          } elsif ( $term->{op} eq 'LIKE' ) {
-            $self->{Sql} .= " LIKE $value";
-          } elsif ( $term->{op} eq 'NOT LIKE' ) {
-            $self->{Sql} .= " NOT LIKE $value";
-          } else {
-            $self->{Sql} .= ' '.$term->{op}.' '.$value;
-          }
-        } # end if has an operator
-        if ( exists($term->{cbr}) ) {
-          $self->{Sql} .= ' '.str_repeat(')', $term->{cbr}).' ';
-        }
+          } # end if has an operator
+        } # end if Pre/Post or SQL
+        $self->{Sql} .= ' '.str_repeat(')', $term->{cbr}) if exists($term->{cbr});
+        $self->{Sql} .= "\n";
       } # end foreach term
     } # end if terms
 
@@ -341,6 +341,9 @@ sub Sql {
     if ( $self->{AutoArchive} ) {
       push @auto_terms, 'E.Archived = 0';
     }
+    if ( $self->{AutoUnarchive} ) {
+      push @auto_terms, 'E.Archived = 1';
+    }
     # Don't do this, it prevents re-generation and concatenation.
     # If the file already exists, then the video won't be re-recreated
     if ( $self->{AutoVideo} ) {
@@ -362,20 +365,26 @@ sub Sql {
       $sql .= ' AND ( '.join(' or ', @auto_terms).' )';
     }
     if ( !$filter_expr->{sort_field} ) {
-      $filter_expr->{sort_field} = 'StartTime';
+      $filter_expr->{sort_field} = 'StartDateTime';
       $filter_expr->{sort_asc} = 0;
     }
     my $sort_column = '';
     if ( $filter_expr->{sort_field} eq 'Id' ) {
       $sort_column = 'E.Id';
     } elsif ( $filter_expr->{sort_field} eq 'MonitorName' ) {
+            $sql = 'SELECT E.*, unix_timestamp(E.StartDateTime) as Time, M.Name as MonitorName
+         FROM Events as E INNER JOIN Monitors as M on M.Id = E.MonitorId';
       $sort_column = 'M.Name';
     } elsif ( $filter_expr->{sort_field} eq 'Name' ) {
       $sort_column = 'E.Name';
+    } elsif ( $filter_expr->{sort_field} eq 'StartDateTime' ) {
+      $sort_column = 'E.StartDateTime';
     } elsif ( $filter_expr->{sort_field} eq 'StartTime' ) {
-      $sort_column = 'E.StartTime';
+      $sort_column = 'E.StartDateTime';
     } elsif ( $filter_expr->{sort_field} eq 'EndTime' ) {
-      $sort_column = 'E.EndTime';
+      $sort_column = 'E.EndDateTime';
+    } elsif ( $filter_expr->{sort_field} eq 'EndDateTime' ) {
+      $sort_column = 'E.EndDateTime';
     } elsif ( $filter_expr->{sort_field} eq 'Secs' ) {
       $sort_column = 'E.Length';
     } elsif ( $filter_expr->{sort_field} eq 'Frames' ) {
@@ -391,10 +400,10 @@ sub Sql {
     } elsif ( $filter_expr->{sort_field} eq 'DiskSpace' ) {
       $sort_column = 'E.DiskSpace';
     } else {
-      $sort_column = 'E.StartTime';
+      $sort_column = 'E.StartDateTime';
     }
     my $sort_order = $filter_expr->{sort_asc} ? 'ASC' : 'DESC';
-    $sql .= ' ORDER BY '.$sort_column." ".$sort_order;
+    $sql .= ' ORDER BY '.$sort_column.' '.$sort_order;
     if ( $filter_expr->{limit} ) {
       $sql .= ' LIMIT 0,'.$filter_expr->{limit};
     }
@@ -414,7 +423,7 @@ sub getDiskPercent {
 }
 
 sub getDiskBlocks {
-  my $command = 'df .';
+  my $command = 'df ' . ($_[0] ? $_[0] : '.');
   my $df = qx( $command );
   my $space = -1;
   if ( $df =~ /\s(\d+)\s+\d+\s+\d+%/ms ) {
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/General.pm b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
index 0d3784185..d68967fa9 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/General.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
@@ -262,21 +262,21 @@ sub createEvent {
     }
     $frame->{Type} = $frame->{Score}>0?'Alarm':'Normal' unless( $frame->{Type} );
     $frame->{Delta} = $lastTimestamp?($frame->{TimeStamp}-$lastTimestamp):0.0;
-    $event->{StartTime} = $frame->{TimeStamp} unless ( $event->{StartTime} );
+    $event->{StartDateTime} = $frame->{TimeStamp} unless ( $event->{StartDateTime} );
     $event->{TotScore} += $frame->{Score};
     $event->{MaxScore} = $frame->{Score} if ( $frame->{Score} > $event->{MaxScore} );
     $event->{AlarmFrames}++ if ( $frame->{Type} eq 'Alarm' );
-    $event->{EndTime} = $frame->{TimeStamp};
+    $event->{EndDateTime} = $frame->{TimeStamp};
     $lastTimestamp = $frame->{TimeStamp};
   }
   $event->{Width} = $event->{monitor}->{Width} unless( $event->{Width} );
   $event->{Height} = $event->{monitor}->{Height} unless( $event->{Height} );
   $event->{AvgScore} = $event->{TotScore}/int($event->{AlarmFrames});
-  $event->{Length} = $event->{EndTime} - $event->{StartTime};
+  $event->{Length} = $event->{EndDateTime} - $event->{StartDateTime};
 
   my %formats = (
-      StartTime => 'from_unixtime(?)',
-      EndTime => 'from_unixtime(?)',
+      StartDateTime => 'from_unixtime(?)',
+      EndDateTime => 'from_unixtime(?)',
       );
 
   my ( @fields, @formats, @values );
@@ -297,7 +297,7 @@ sub createEvent {
   $event->{Id} = $dbh->{mysql_insertid};
   Info( "Created event ".$event->{Id} );
 
-  if ( $event->{EndTime} ) {
+  if ( $event->{EndDateTime} ) {
     $event->{Name} = $event->{monitor}->{EventPrefix}.$event->{Id}
     if ( $event->{Name} eq 'New Event' );
     my $sql = "update Events set Name = ? where Id = ?";
@@ -383,8 +383,8 @@ sub updateEvent {
   if ( $event->{Name} eq 'New Event' );
 
   my %formats = (
-      StartTime => 'from_unixtime(?)',
-      EndTime => 'from_unixtime(?)',
+      StartDateTime => 'from_unixtime(?)',
+      EndDateTime => 'from_unixtime(?)',
       );
 
   my ( @values, @sets );
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
index 0513f563e..43ae38e72 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Logger.pm
@@ -42,6 +42,15 @@ our @ISA = qw(Exporter ZoneMinder::Base);
 # will save memory.
 our %EXPORT_TAGS = (
     constants => [ qw(
+      DEBUG9
+      DEBUG8
+      DEBUG7
+      DEBUG6
+      DEBUG5
+      DEBUG4
+      DEBUG3
+      DEBUG2
+      DEBUG1
       DEBUG
       INFO
       WARNING
@@ -98,6 +107,15 @@ use Time::HiRes qw/gettimeofday/;
 use Sys::Syslog;
 
 use constant {
+  DEBUG9 => 9,
+  DEBUG8 => 8,
+  DEBUG7 => 7,
+  DEBUG6 => 6,
+  DEBUG5 => 5,
+  DEBUG4 => 4,
+  DEBUG3 => 3,
+  DEBUG2 => 2,
+  DEBUG1 => 1,
   DEBUG => 1,
   INFO => 0,
   WARNING => -1,
@@ -108,7 +126,16 @@ use constant {
 };
 
 our %codes = (
-    &DEBUG => 'DBG',
+    &DEBUG9 => 'DB9',
+    &DEBUG8 => 'DB8',
+    &DEBUG7 => 'DB7',
+    &DEBUG6 => 'DB6',
+    &DEBUG5 => 'DB5',
+    &DEBUG4 => 'DB4',
+    &DEBUG3 => 'DB3',
+    &DEBUG2 => 'DB2',
+    &DEBUG1 => 'DB1',
+    &DEBUG => 'DB1',
     &INFO => 'INF',
     &WARNING => 'WAR',
     &ERROR => 'ERR',
@@ -159,7 +186,7 @@ sub new {
   ( $this->{fileName} = $0 ) =~ s|^.*/||;
   $this->{logPath} = $ZoneMinder::Config::Config{ZM_PATH_LOGS};
   $this->{logFile} = $this->{logPath}.'/'.$this->{id}.'.log';
-  ($this->{logFile}) = $this->{logFile} =~ /^([\w\.\/]+)$/;
+  ($this->{logFile}) = $this->{logFile} =~ /^([_\-\w\.\/]+)$/;
 
   $this->{trace} = 0;
 
@@ -332,9 +359,9 @@ sub reinitialise {
 sub limit {
   my $this = shift;
   my $level = shift;
-  return(DEBUG) if $level > DEBUG;
-  return(NOLOG) if $level < NOLOG;
-  return($level);
+  return DEBUG9 if $level > DEBUG9;
+  return NOLOG if $level < NOLOG;
+  return $level;
 }
 
 sub getTargettedEnv {
@@ -504,9 +531,9 @@ sub openFile {
     $LOGFILE->autoflush() if $this->{autoFlush};
 
     my $webUid = (getpwnam($ZoneMinder::Config::Config{ZM_WEB_USER}))[2];
-    Error("Can't get uid for $ZoneMinder::Config::Config{ZM_WEB_USER}") if ! defined $webUid;
+    Error('Can\'t get uid for '.$ZoneMinder::Config::Config{ZM_WEB_USER}) if ! defined $webUid;
     my $webGid = (getgrnam($ZoneMinder::Config::Config{ZM_WEB_GROUP}))[2];
-    Error("Can't get gid for $ZoneMinder::Config::Config{ZM_WEB_USER}") if ! defined $webGid;
+    Error('Can\'t get gid for '.$ZoneMinder::Config::Config{ZM_WEB_USER}) if ! defined $webGid;
     if ( $> == 0 ) {
       # If we are root, we want to make sure that www-data or whatever owns the file
       chown($webUid, $webGid, $this->{logFile} ) or
@@ -610,6 +637,7 @@ sub logInit( ;@ ) {
   my %options = @_ ? @_ : ();
   $logger = ZoneMinder::Logger->new() if !$logger;
   $logger->initialise(%options);
+  logSetSignal();
 }
 
 sub logReinit {
@@ -626,12 +654,26 @@ sub logHupHandler {
   $do_log_rotate = 1;
 }
 
+sub logUSR1Handler {
+  $logger->level($logger->level()+1);
+  Info('Logger - Level changed to '. $logger->level() . '=>'.$codes{$logger->level()});
+}
+
+sub logUSR2Handler {
+  $logger->level($logger->level()-1);
+  Info('Logger - Level changed to '. $logger->level() . '=>'.$codes{$logger->level()});
+}
+
 sub logSetSignal {
   $SIG{HUP} = \&logHupHandler;
+  $SIG{USR1} = \&logUSR1Handler;
+  $SIG{USR2} = \&logUSR2Handler;
 }
 
 sub logClearSignal {
   $SIG{HUP} = 'DEFAULT';
+  $SIG{USR1} = 'DEFAULT';
+  $SIG{USR2} = 'DEFAULT';
 }
 
 sub logLevel {
@@ -674,38 +716,34 @@ sub Dump {
 
 sub debug {
   my $log = shift;
-  $log->logPrint(DEBUG, @_, caller);
+  $log->logPrint(DEBUG1, @_, caller);
 }
 
-sub Debug( @ ) {
-  fetch()->logPrint(DEBUG, @_, caller);
+sub Debug {
+  fetch()->logPrint(
+    (@_ == 1 ? (DEBUG1, @_) : @_),
+    caller);
 }
 
-sub Info( @ ) {
-  fetch()->logPrint(INFO, @_, caller);
-}
+sub Info { fetch()->logPrint(INFO, @_, caller); }
 sub info {
   my $log = shift;
   $log->logPrint(INFO, @_, caller);
 }
 
-sub Warning( @ ) {
-  fetch()->logPrint(WARNING, @_, caller);
-}
+sub Warning { fetch()->logPrint(WARNING, @_, caller); }
 sub warn {
   my $log = shift;
   $log->logPrint(WARNING, @_, caller);
 }
 
-sub Error( @ ) {
-  fetch()->logPrint(ERROR, @_, caller);
-}
+sub Error { fetch()->logPrint(ERROR, @_, caller); }
 sub error {
   my $log = shift;
   $log->logPrint(ERROR, @_, caller);
 }
 
-sub Fatal( @ ) {
+sub Fatal {
   my $this = fetch();
   $this->logPrint(FATAL, @_, caller);
   if ( $SIG{TERM} and ( $SIG{TERM} ne 'DEFAULT' ) ) {
@@ -720,7 +758,7 @@ sub Fatal( @ ) {
   exit(-1);
 }
 
-sub Panic( @ ) {
+sub Panic {
   fetch()->logPrint(PANIC, @_, caller);
   confess($_[0]);
 }
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
index c52a12309..e7fdcd35f 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory.pm.in
@@ -144,9 +144,11 @@ our $mem_seq = 0;
 our $mem_data = {
   shared_data => { type=>'SharedData', seq=>$mem_seq++, contents=> {
     size             => { type=>'uint32', seq=>$mem_seq++ },
-    last_write_index => { type=>'uint32', seq=>$mem_seq++ },
-    last_read_index  => { type=>'uint32', seq=>$mem_seq++ },
+    last_write_index => { type=>'int32', seq=>$mem_seq++ },
+    last_read_index  => { type=>'int32', seq=>$mem_seq++ },
     state            => { type=>'uint32', seq=>$mem_seq++ },
+    capture_fps      => { type=>'double', seq=>$mem_seq++ },
+    analysis_fps     => { type=>'double', seq=>$mem_seq++ },
     last_event       => { type=>'uint64', seq=>$mem_seq++ },
     action           => { type=>'uint32', seq=>$mem_seq++ },
     brightness       => { type=>'int32', seq=>$mem_seq++ },
@@ -160,14 +162,17 @@ our $mem_data = {
     signal           => { type=>'uint8', seq=>$mem_seq++ },
     format           => { type=>'uint8', seq=>$mem_seq++ },
     imagesize        => { type=>'uint32', seq=>$mem_seq++ },
-    epadding1        => { type=>'uint32', seq=>$mem_seq++ },
+    last_frame_score => { type=>'uint32', seq=>$mem_seq++ },
+    audio_frequency  => { type=>'uint32', seq=>$mem_seq++ },
+    audio_channels   => { type=>'uint32', seq=>$mem_seq++ },
     startup_time     => { type=>'time_t64', seq=>$mem_seq++ },
     zmc_heartbeat_time  => { type=>'time_t64', seq=>$mem_seq++ },
-    zma_heartbeat_time  => { type=>'time_t64', seq=>$mem_seq++ },
     last_write_time  => { type=>'time_t64', seq=>$mem_seq++ },
     last_read_time   => { type=>'time_t64', seq=>$mem_seq++ },
     control_state    => { type=>'uint8[256]', seq=>$mem_seq++ },
     alarm_cause      => { type=>'int8[256]', seq=>$mem_seq++ },
+    video_fifo       => { type=>'int8[64]', seq=>$mem_seq++ },
+    audio_fifo       => { type=>'int8[64]', seq=>$mem_seq++ },
   }
   },
   trigger_data => { type=>'TriggerData', seq=>$mem_seq++, 'contents'=> {
@@ -214,7 +219,7 @@ sub zmMemInit {
           || $member_data->{type} eq 'bool4'
           ) {
         $member_data->{size} = $member_data->{align} = 4;
-      } elsif ($member_data->{type} eq 'int16'
+      } elsif ( $member_data->{type} eq 'int16'
           || $member_data->{type} eq 'uint16'
           ) {
         $member_data->{size} = $member_data->{align} = 2;
@@ -223,6 +228,8 @@ sub zmMemInit {
           || $member_data->{type} eq 'bool1'
           ) {
         $member_data->{size} = $member_data->{align} = 1;
+      } elsif ( $member_data->{type} eq 'double' ) {
+        $member_data->{size} = $member_data->{align} = 8;
       } elsif ( $member_data->{type} =~ /^u?int8\[(\d+)\]$/ ) {
         $member_data->{size} = $1;
         $member_data->{align} = 1;
@@ -236,7 +243,7 @@ sub zmMemInit {
         $offset += ($member_data->{align} - ($offset%$member_data->{align}));
       }
       $member_data->{offset} = $offset;
-      $offset += $member_data->{size}
+      $offset += $member_data->{size};
     }
     $section_data->{size} = $offset - $section_data->{offset};
   }
@@ -299,7 +306,7 @@ sub zmMemVerify {
     Error("Shared data not valid for monitor $$monitor{Id}");
     return undef;
   } else {
-    Debug("Shared data appears valid for monitor $$monitor{Id}: $valid");
+    Debug(3, "Shared data appears valid for monitor $$monitor{Id}: $valid");
   }
 
   return !undef;
@@ -322,7 +329,7 @@ sub zmMemRead {
     my $size = $mem_data->{$section}->{contents}->{$element}->{size};
 
     if (!defined $offset || !defined $type || !defined $size) {
-        Error('Invalid field:'.$field.' setting to undef and exiting zmMemRead');
+        Error('Invalid field:'.$field.' setting to undef and exiting zmMemRead offset:'.$offset.' type:'.$type.' size:'.$size);
         zmMemInvalidate($monitor);
         return undef;
     }   
@@ -355,7 +362,9 @@ sub zmMemRead {
     } elsif ( $type eq 'int8' ) {
       ( $value ) = unpack('c', $data);
     } elsif ( $type eq 'uint8' || $type eq 'bool1' ) {
-      ( $value ) = unpack( 'C', $data );
+      ( $value ) = unpack('C', $data);
+    } elsif ( $type eq 'double' ) {
+      ( $value ) = unpack('d', $data);
     } elsif ( $type =~ /^int8\[\d+\]$/ ) {
       ( $value ) = unpack('Z'.$size, $data);
     } elsif ( $type =~ /^uint8\[\d+\]$/ ) {
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
index cb7920913..d76bbae9a 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm
@@ -81,7 +81,7 @@ sub zmMemAttach {
     return undef;
   }
   if ( defined($monitor->{MMapAddr}) ) {
-    Debug("zmMemAttach already attached at $monitor->{MMapAddr} for $$monitor{Id}");
+    Debug(3, "zmMemAttach already attached at $monitor->{MMapAddr} for $$monitor{Id}");
     return !undef;
   }
 
@@ -168,11 +168,11 @@ sub zmMemPut {
 }
 
 sub zmMemClean {
-  Debug('Removing memory map files');
+  Debug(3, 'Removing memory map files');
   my $mapPath = $Config{ZM_PATH_MAP}.'/zm.mmap.*';
   foreach my $mapFile( glob( $mapPath ) ) {
     ( $mapFile ) = $mapFile =~ /^(.+)$/;
-    Debug("Removing memory map file '$mapFile'");
+    Debug(3, "Removing memory map file '$mapFile'");
     unlink($mapFile);
   }
 }
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm
index fe2cfe115..a0aeafab0 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Memory/Shared.pm
@@ -151,14 +151,14 @@ sub zmMemPut
 
 sub zmMemClean
 {
-    Debug( "Removing shared memory\n" );
+    Debug(2, 'Removing shared memory');
     # Find ZoneMinder shared memory
-    my $command = "ipcs -m | grep '^"
-                  .substr( sprintf( "0x%x", hex($Config{ZM_SHM_KEY}) ), 0, -2 )
-                  ."'"
+    my $command = 'ipcs -m | grep \'^'
+                  .substr( sprintf( '0x%x', hex($Config{ZM_SHM_KEY}) ), 0, -2 )
+                  .'\''
     ;
-    Debug( "Checking for shared memory with '$command'\n" );
-    open( my $CMD, '<', "$command |" )
+    Debug(2, 'Checking for shared memory with '.$command);
+    open( my $CMD, '<', $command.' |' )
         or Fatal( "Can't execute '$command': $!" );
     while( <$CMD> )
     {
@@ -167,8 +167,8 @@ sub zmMemClean
         if ( $id =~ /^(\d+)/ )
         {
             $id = $1;
-            $command = "ipcrm shm $id";
-            Debug( "Removing shared memory with '$command'\n" );
+            $command = 'ipcrm shm '.$id;
+            Debug(2, 'Removing shared memory with '.$command);
             qx( $command );
         }
     }
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
index 963f75638..de29b8dd0 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor.pm
@@ -27,11 +27,15 @@ package ZoneMinder::Monitor;
 use 5.006;
 use strict;
 use warnings;
+use Time::HiRes qw(usleep);
 
 require ZoneMinder::Base;
 require ZoneMinder::Object;
 require ZoneMinder::Storage;
 require ZoneMinder::Server;
+require ZoneMinder::Memory;
+require ZoneMinder::Monitor_Status;
+require ZoneMinder::Zone;
 
 #our @ISA = qw(Exporter ZoneMinder::Base);
 use parent qw(ZoneMinder::Object);
@@ -114,6 +118,7 @@ $serial = $primary_key = 'Id';
   TrackDelay
   ReturnLocation
   ReturnDelay
+  ModectDuringPTZ
   DefaultRate
   DefaultScale
   SignalCheckPoints
@@ -121,6 +126,11 @@ $serial = $primary_key = 'Id';
   WebColour
   Exif
   Sequence
+  ZoneCount
+  Refresh
+  DefaultCodec
+  Latitude
+  Longitude
   );
 
 %defaults = (
@@ -194,6 +204,7 @@ $serial = $primary_key = 'Id';
     TrackDelay      =>  undef,
     ReturnLocation  =>  -1,
     ReturnDelay     =>  undef,
+    ModectDuringPTZ =>  0,
     DefaultRate =>  100,
     DefaultScale  =>  100,
     SignalCheckPoints =>  0,
@@ -201,6 +212,11 @@ $serial = $primary_key = 'Id';
     WebColour   =>  '#ff0000',
     Exif    =>  0,
     Sequence  =>  undef,
+    ZoneCount =>  0,
+    Refresh => undef,
+    DefaultCodec  => 'auto',
+    Latitude  =>  undef,
+    Longitude =>  undef,
     );
 
 sub Server {
@@ -211,6 +227,76 @@ sub Storage {
 	return new ZoneMinder::Storage( $_[0]{StorageId} );
 } # end sub Storage
 
+sub Zones {
+  if (! exists $_[0]{Zones}) {
+    $_[0]{Zones} = [ $_[0]{Id} ? ZoneMinder::Zone->find(MonitorId=>$_[0]{Id}) : () ];
+  }
+  return wantarray ? @{$_[0]{Zones}} : $_[0]{Zones};
+}
+
+sub control {
+  my $monitor = shift;
+  my $command = shift;
+  my $process = shift;
+
+  if ( $command eq 'stop' or $command eq 'restart' ) {
+    if ( $process ) {
+      `/usr/bin/zmdc.pl stop $process -m $$monitor{Id}`;
+    } else {
+      `/usr/bin/zmdc.pl stop zma -m $$monitor{Id}`;
+      `/usr/bin/zmdc.pl stop zmc -m $$monitor{Id}`;
+    }
+  }
+  if ( $command eq 'start' or $command eq 'restart' ) {
+    if ( $process ) {
+      `/usr/bin/zmdc.pl start $process -m $$monitor{Id}`;
+    } else {
+      `/usr/bin/zmdc.pl start zmc -m $$monitor{Id}`;
+      `/usr/bin/zmdc.pl start zma -m $$monitor{Id}`;
+    } # end if
+  }
+} # end sub control
+
+sub Status {
+  my $self = shift;
+  $$self{Status} = shift if @_;
+  if ( ! $$self{Status} ) {
+    $$self{Status} = ZoneMinder::Monitor_Status->find_one(MonitorId=>$$self{Id});
+  }
+  return $$self{Status};
+}
+
+sub connect {
+  my $self = shift;
+  return ZoneMinder::Memory::zmMemVerify($self);
+}
+
+sub disconnect {
+  my $self = shift;
+  ZoneMinder::Memory::zmMemInvalidate($self); # Close our file handle to the zmc process we are about to end
+}
+
+sub suspendMotionDetection {
+  my $self = shift;
+  return 0 if ! ZoneMinder::Memory::zmMemVerify($self);
+  while (ZoneMinder::Memory::zmMemRead($self, 'shared_data:active', 1)) {
+    ZoneMinder::Logger::Debug(1, 'Suspending motion detection');
+    ZoneMinder::Memory::zmMonitorSuspend($self);
+    usleep(100000);
+  }
+  ZoneMinder::Logger::Debug(1,ZoneMinder::Memory::zmMemRead($self, 'shared_data:active', 1));
+}
+
+sub resumeMotionDetection {
+  my $self = shift;
+  return 0 if ! ZoneMinder::Memory::zmMemVerify($self);
+  #while (zmMemRead($self, 'shared_data:active', 1)) {
+    ZoneMinder::Logger::Debug(1, 'Resuming motion detection');
+  ZoneMinder::Memory::zmMonitorResume($self);
+    #}
+  return 1;
+}
+
 1;
 __END__
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Monitor_Status.pm b/scripts/ZoneMinder/lib/ZoneMinder/Monitor_Status.pm
new file mode 100644
index 000000000..9a9077653
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Monitor_Status.pm
@@ -0,0 +1,107 @@
+# ==========================================================================
+#
+# ZoneMinder Monitor_STatus Module
+# Copyright (C) 2020 ZoneMinder
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# ==========================================================================
+#
+# This module contains the common definitions and functions used by the rest
+# of the ZoneMinder scripts
+#
+package ZoneMinder::Monitor_Status;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Object;
+
+#our @ISA = qw(Exporter ZoneMinder::Base);
+use parent qw(ZoneMinder::Object);
+
+use vars qw/ $table $primary_key %fields $serial %defaults $debug/;
+$table = 'Monitor_Status';
+$serial = $primary_key = 'MonitorId';
+%fields = map { $_ => $_ } qw(
+  MonitorId
+  Status
+  CaptureFPS
+  AnalysisFPS
+  CaptureBandwidth
+  TotalEvents
+  TotalEventDiskSpace
+  HourEvents
+  HourEventDiskSpace
+  DayEvents
+  DayEventDiskSpace
+  WeekEvents
+  WeekEventDiskSpace
+  MonthEvents
+  MonthEventDiskSpace
+  ArchivedEvents
+  ArchivedEventDiskSpace
+  );
+
+%defaults = (
+    Status => 'Unknown',
+    CaptureFPS => undef,
+    AnalysisFPS => undef,
+    CaptureBandwidth => undef,
+    TotalEvents => undef,
+    TotalEventDiskSpace => undef,
+    HourEvents =>   undef,
+    HourEventDiskSpace =>  undef,
+    DayEvents =>  undef,
+    DayEventDiskSpace =>  undef,
+    WeekEvents =>  undef,
+    WeekEventDiskSpace =>  undef,
+    MonthEvents =>  undef,
+    MonthEventDiskSpace =>  undef,
+    ArchivedEvents =>  undef,
+    ArchivedEventDiskSpace =>  undef,
+    );
+
+sub Monitor {
+	return new ZoneMinder::Monitor( $_[0]{MonitorId} );
+} # end sub Monitor
+
+1;
+__END__
+
+=head1 NAME
+
+ZoneMinder::Monitor_Status - Perl Class for Monitor Status
+
+=head1 SYNOPSIS
+
+use ZoneMinder::Monitor_Status;
+
+=head1 AUTHOR
+
+Isaac Connor, E<lt>isaac@zoneminder.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2017  ZoneMinder LLC
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Object.pm b/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
index 569b3de9d..f3d750338 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Object.pm
@@ -22,6 +22,12 @@
 # This module contains the common definitions and functions used by the rest
 # of the ZoneMinder scripts
 #
+
+sub array_diff(\@\@) {
+  my %e = map { $_ => undef } @{$_[1]};
+  return @{[ ( grep { (exists $e{$_}) ? ( delete $e{$_} ) : ( 1 ) } @{ $_[0] } ), keys %e ] };
+}
+
 package ZoneMinder::Object;
 
 use 5.006;
@@ -40,6 +46,10 @@ our @ISA = qw(ZoneMinder::Base);
 #
 # ==========================================================================
 
+sub def_or_undef {
+  return defined($_[0]) ? $_[0] : 'undef';
+}
+
 use ZoneMinder::Config qw(:all);
 use ZoneMinder::Logger qw(:all);
 use ZoneMinder::Database qw(:all);
@@ -370,40 +380,29 @@ sub set {
 		$log->error("$type -> set called with non-hash params from $caller $line");
 	}
 
-	foreach my $field ( keys %fields ) {
-    if ( $params ) {
-      $log->debug("field: $field, param: ".$$params{$field}) if $debug;
-      if ( exists $$params{$field} ) {
-        $log->debug("field: $field, $$self{$field} =? param: ".$$params{$field}) if $debug;
-        if ( ( ! defined $$self{$field} ) or ($$self{$field} ne $params->{$field}) ) {
-# Only make changes to fields that have changed
-          if ( defined $fields{$field} ) {
-            $$self{$field} = $$params{$field} if defined $fields{$field};
-            push @set_fields, $fields{$field}, $$params{$field};	#mark for sql updating
-          } # end if
-          $log->debug("Running $field with $$params{$field}") if $debug;
-          if ( my $func = $self->can( $field ) ) {
-            $func->( $self, $$params{$field} );
-          } # end if
-        } # end if
-      } # end if
-		} # end if $params
-
-		if ( defined $fields{$field} ) {
-			if ( $$self{$field} ) {
-				$$self{$field} = transform( $type, $field, $$self{$field} );
-			} # end if $$self{field}
-		}
-	} # end foreach field
+  if ( $params ) {
+    foreach my $field ( keys %{$params} ) {
+      $log->debug("field: $field, ".def_or_undef($$self{$field}).' =? param: '.def_or_undef($$params{$field})) if $debug;
+      if ( ( ! defined $$self{$field} ) or ($$self{$field} ne $params->{$field}) ) {
+        # Only make changes to fields that have changed
+        if ( defined $fields{$field} ) {
+          $$self{$field} = $$params{$field};
+          push @set_fields, $fields{$field}, $$params{$field};	#mark for sql updating
+        } # end if has a column
+        $log->debug("Running $field with $$params{$field}") if $debug;
+        if ( my $func = $self->can( $field ) ) {
+          $func->( $self, $$params{$field} );
+        } # end if has function
+      } # end if has change
+    } # end foreach field
+  } # end if $params
 
 	foreach my $field ( keys %defaults ) {
-
 		if ( ( ! exists $$self{$field} ) or (!defined $$self{$field}) or ( $$self{$field} eq '' ) ) {
-			$log->debug("Setting default ($field) ($$self{$field}) ($defaults{$field}) ") if $debug;
+			$log->debug("Setting default ($field) (".def_or_undef($$self{$field}).') ('.def_or_undef($defaults{$field}).') ') if $debug;
 			if ( defined $defaults{$field} ) {
-				$log->debug("Default $field is defined: $defaults{$field}") if $debug;
-				if ( $defaults{$field} eq 'NOW()' ) {
-					$$self{$field} = 'NOW()';
+				if ( $defaults{$field} eq '' or $defaults{$field} eq 'NOW()' ) {
+					$$self{$field} = $defaults{$field};
 				} else {
 					$$self{$field} = eval($defaults{$field});
 					$log->error( "Eval error of object default $field default ($defaults{$field}) Reason: " . $@ ) if $@;
@@ -411,8 +410,9 @@ sub set {
 			} else {
 				$$self{$field} = $defaults{$field};
 			} # end if
-#$$self{$field} = ( defined $defaults{$field} ) ? eval($defaults{$field}) : $defaults{$field};
-			$log->debug("Setting default for ($field) using ($defaults{$field}) to ($$self{$field}) ") if $debug;
+			$log->debug("Setting default for ($field) using (".def_or_undef($defaults{$field}).') to ('.def_or_undef($$self{$field}).') ') if $debug;
+    } elsif ( defined $fields{$field} and $$self{$field} ) {
+      $$self{$field} = transform( $type, $field, $$self{$field} );
 		} # end if
 	} # end foreach default
 	return @set_fields;
@@ -852,6 +852,42 @@ sub find_sql {
 	return \%sql;
 } # end sub find_sql
 
+sub changes {
+  my ( $self, $params ) = @_;
+
+  my $type = ref $self;
+  if ( ! $type ) {
+    my ( $caller, undef, $line ) = caller;
+    $log->error("No type in Object::changes. self:$self from  $caller:$line");
+  }
+  my $fields = eval ('\%'.$type.'::fields');
+  if (!$fields) {
+    $log->warn('Object::changes called on an object with no fields');
+    return;
+  } # end if
+  my @results;
+
+  foreach my $field (sort keys %$fields) {
+    next if ! exists $$params{$field};
+
+    if ( ref $$self{$field} eq 'ARRAY' ) {
+      my @second = ref $$params{$field} eq 'ARRAY' ? @{$$params{$field}} : ($$params{$field});
+      if (array_diff(@{$$self{$field}}, @second)) {
+        push @results, [ $field, $$self{$field}, $$params{$field} ];
+      }
+    } elsif (
+      (!defined($$self{$field}) and defined($$params{$field}))
+        or
+      (defined($$self{$field}) and !defined($$params{$field}))
+    ) {
+      push @results, $field;
+    } elsif ( defined($$self{$field}) and defined($$params{$field}) and ($$self{$field} ne $$params{$field}) ) {
+      push @results, $field;
+    }
+  }
+  return @results;
+}
+
 sub AUTOLOAD {
   my $type = ref($_[0]);
   Carp::cluck("No type in autoload") if ! $type;
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Zone.pm b/scripts/ZoneMinder/lib/ZoneMinder/Zone.pm
new file mode 100644
index 000000000..986c5a4dc
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Zone.pm
@@ -0,0 +1,105 @@
+# ==========================================================================
+#
+# ZoneMinder Zone Module
+# Copyright (C) 2020 ZoneMinder LLC
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# ==========================================================================
+
+package ZoneMinder::Zone;
+
+use 5.006;
+use strict;
+use warnings;
+
+require ZoneMinder::Base;
+require ZoneMinder::Object;
+
+#our @ISA = qw(Exporter ZoneMinder::Base);
+use parent qw(ZoneMinder::Object);
+
+use vars qw/ $table $primary_key %fields $serial %defaults $debug/;
+$table = 'Zones';
+$serial = $primary_key = 'Id';
+%fields = map { $_ => $_ } qw(
+  Id
+  Name
+  MonitorId 
+  Type
+  Units
+  CheckMethod
+  MinPixelThreshold
+  MaxPixelThreshold
+  MinAlarmPixels
+  MaxAlarmPixels
+  FilterX
+  FilterY
+  MinFilterPixels
+  MaxFilterPixels
+  MinBlobPixels
+  MaxBlobPixels
+  MinBlobs
+  MaxBlobs
+  OverloadFrames
+  ExtendAlarmFrames
+  );
+
+%defaults = (
+  Name                => '',
+  Type => 'Active',
+  Units => 'Pixels',
+  CheckMethod => 'Blobs',
+  MinPixelThreshold => undef,
+  MaxPixelThreshold => undef,
+  MinAlarmPixels => undef,
+  MaxAlarmPixels => undef,
+  FilterX => undef,
+  FilterY => undef,
+  MinFilterPixels => undef,
+  MaxFilterPixels => undef,
+  MinBlobPixels => undef,
+  MaxBlobPixels => undef,
+  MinBlobs => undef,
+  MaxBlobs => undef,
+  OverloadFrames => 0,
+  ExtendAlarmFrames => 0,
+);
+
+1;
+__END__
+
+=head1 NAME
+
+ZoneMinder::Zone - Perl Class for Zones
+
+=head1 SYNOPSIS
+
+use ZoneMinder::Zone;
+
+=head1 AUTHOR
+
+Isaac Connor, E<lt>isaac@zoneminder.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2017  ZoneMinder LLC
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut
diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 80a227e2b..180aee58f 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -205,7 +205,7 @@ MAIN: while( $loop ) {
   my $monitorSelectSth = $dbh->prepare_cached( $monitorSelectSql )
     or Fatal( "Can't prepare '$monitorSelectSql': ".$dbh->errstr() );
 
-  my $eventSelectSql = 'SELECT `Id`, (unix_timestamp() - unix_timestamp(`StartTime`)) AS Age
+  my $eventSelectSql = 'SELECT `Id`, (unix_timestamp() - unix_timestamp(`StartDateTime`)) AS Age
     FROM `Events` WHERE `MonitorId` = ?'.(@Storage_Areas ? ' AND `StorageId` IN ('.join(',',map { '?'} @Storage_Areas).')' : '' ). ' ORDER BY `Id`';
   my $eventSelectSth = $dbh->prepare_cached( $eventSelectSql )
     or Fatal( "Can't prepare '$eventSelectSql': ".$dbh->errstr() );
@@ -308,7 +308,7 @@ MAIN: while( $loop ) {
 							} else {
 								my $full_path = join('/', $Storage->Path(), $day_dir, $event_path);
 # Check storage id
-								if ( !$Event->Storage()->Id() ) {
+								if ( $Storage->Id() and !$Event->Storage()->Id() ) {
 									Info("Correcting StorageId for event $$Event{Id} from $$Event{StorageId} $$Event{Path} to $$Storage{Id} $full_path");
 									$Event->save({ StorageId=>$Storage->Id() });
 									$Event->Path(undef);
@@ -397,13 +397,13 @@ MAIN: while( $loop ) {
               my ( undef, $year, $month, $day ) = split('/', $day_dir);
               $year += 2000;
               my ( $hour, $minute, $second ) = split('/', $event_dir);
-              my $StartTime =sprintf('%.4d-%.2d-%.2d %.2d:%.2d:%.2d', $year, $month, $day, $hour, $minute, $second);
+              my $StartDateTime =sprintf('%.4d-%.2d-%.2d %.2d:%.2d:%.2d', $year, $month, $day, $hour, $minute, $second);
               my $Event = ZoneMinder::Event->find_one(
                 MonitorId=>$monitor_dir,
-                StartTime=>$StartTime,
+                StartDateTime=>$StartDateTime,
               );
               if ( $Event ) {
-                Debug("Found event matching starttime on monitor $monitor_dir at $StartTime: " . $Event->to_string());
+                Debug("Found event matching StartDateTime on monitor $monitor_dir at $StartDateTime: " . $Event->to_string());
                 next;
               }
               aud_print("Deleting event directories with no event id information at $day_dir/$event_dir");
@@ -440,7 +440,7 @@ MAIN: while( $loop ) {
           $Event->Path();
           $Event->age();
           Debug("Have event $$Event{Id} at $$Event{Path}");
-          $Event->StartTime(POSIX::strftime('%Y-%m-%d %H:%M:%S', gmtime(time_of_youngest_file($Event->Path()))));
+          $Event->StartDateTime(POSIX::strftime('%Y-%m-%d %H:%M:%S', gmtime(time_of_youngest_file($Event->Path()))));
         } # end foreach event
       }
 
@@ -592,7 +592,7 @@ EVENT: while ( my ( $db_event, $age ) = each( %$db_events ) ) {
           Warning("Event $$Event{Id} is Archived. Taking no further action on it.");
           next;
         }
-        if ( !$Event->StartTime() ) {
+        if ( !$Event->StartDateTime() ) {
           aud_print("Event $$Event{Id} has no start time.");
           if ( confirm() ) {
             $Event->delete();
@@ -600,7 +600,7 @@ EVENT: while ( my ( $db_event, $age ) = each( %$db_events ) ) {
           }
           next;
         } 
-        if ( ! $Event->EndTime() ) {
+        if ( ! $Event->EndDateTime() ) {
           if ( $age > $Config{ZM_AUDIT_MIN_AGE} ) {
             aud_print("Event $$Event{Id} has no end time and is $age seconds old. Deleting it.");
             if ( confirm() ) {
@@ -639,9 +639,9 @@ EVENT: while ( my ( $db_event, $age ) = each( %$db_events ) ) {
             Info("Updating storage area on event $$Event{Id} from $$Event{StorageId} to $$fs_events{$db_event}{StorageId}");
             $Event->StorageId($$fs_events{$db_event}->StorageId());
           }
-          if ( ! $Event->StartTime() ) {
-            Info("Updating StartTime on event $$Event{Id} from $$Event{StartTime} to $$fs_events{$db_event}{StartTime}");
-            $Event->StartTime($$fs_events{$db_event}->StartTime());
+          if ( ! $Event->StartDateTime() ) {
+            Info("Updating StartDateTime on event $$Event{Id} from $$Event{StartDateTime} to $$fs_events{$db_event}{StartDateTime}");
+            $Event->StartDateTime($$fs_events{$db_event}->StartDateTime());
           }
 
           $Event->save();
@@ -683,12 +683,12 @@ if ( $level > 1 ) {
 # Remove empty events (with no frames)
   $cleaned = 0;
   Debug("Checking for Events with no Frames");
-  my $selectEmptyEventsSql = 'SELECT `E`.`Id` AS `Id`, `E`.`StartTime`, `F`.`EventId` FROM `Events` AS E LEFT JOIN `Frames` AS F ON (`E`.`Id` = `F`.`EventId`)
-    WHERE isnull(`F`.`EventId`) AND now() - interval '.$Config{ZM_AUDIT_MIN_AGE}.' second > `E`.`StartTime`';
+  my $selectEmptyEventsSql = 'SELECT `E`.`Id` AS `Id`, `E`.`StartDateTime`, `F`.`EventId` FROM `Events` AS E LEFT JOIN `Frames` AS F ON (`E`.`Id` = `F`.`EventId`)
+    WHERE isnull(`F`.`EventId`) AND now() - interval '.$Config{ZM_AUDIT_MIN_AGE}.' second > `E`.`StartDateTime`';
   if ( my $selectEmptyEventsSth = $dbh->prepare_cached( $selectEmptyEventsSql ) ) {
     if ( $res = $selectEmptyEventsSth->execute() ) {
       while( my $event = $selectEmptyEventsSth->fetchrow_hashref() ) {
-        aud_print("Found empty event with no frame records '$event->{Id}' at $$event{StartTime}");
+        aud_print("Found empty event with no frame records '$event->{Id}' at $$event{StartDateTime}");
         if ( confirm() ) {
           if ( $res = $deleteEventSth->execute($event->{Id}) ) {
             $cleaned = 1;
@@ -750,7 +750,7 @@ if ( $level > 1 ) {
 #"SELECT E.Id, ANY_VALUE(E.MonitorId),
 #
 #max(F.TimeStamp) as EndTime,
-#unix_timestamp(max(F.TimeStamp)) - unix_timestamp(E.StartTime) as Length,
+#unix_timestamp(max(F.TimeStamp)) - unix_timestamp(E.StartDateTime) as Length,
 #max(F.FrameId) as Frames,
 #count(if(F.Score>0,1,NULL)) as AlarmFrames,
 #sum(F.Score) as TotScore,
@@ -760,11 +760,11 @@ if ( $level > 1 ) {
 #WHERE isnull(E.Frames) or isnull(E.EndTime)
 #GROUP BY E.Id HAVING EndTime < (now() - interval ".$Config{ZM_AUDIT_MIN_AGE}.' second)'
 #;
-    'SELECT *, unix_timestamp(`StartTime`) AS `TimeStamp` FROM `Events` WHERE `EndTime` IS NULL AND `StartTime` < (now() - interval '.$Config{ZM_AUDIT_MIN_AGE}.' second)'.($monitor_id?' AND MonitorId=?':'');
+    'SELECT *, unix_timestamp(`StartDateTime`) AS `TimeStamp` FROM `Events` WHERE `EndDateTime` IS NULL AND `StartDateTime` < (now() - interval '.$Config{ZM_AUDIT_MIN_AGE}.' second)'.($monitor_id?' AND MonitorId=?':'');
 
   my $selectFrameDataSql = '
 SELECT
-  max(`TimeStamp`) AS `EndTime`,
+  max(`TimeStamp`) AS `EndDateTime`,
   unix_timestamp(max(`TimeStamp`)) AS `EndTimeStamp`,
   max(`FrameId`) AS `Frames`,
   count(if(`Score`>0,1,NULL)) AS `AlarmFrames`,
@@ -779,7 +779,7 @@ FROM `Frames` WHERE `EventId`=?';
   my $updateUnclosedEventsSql =
     "UPDATE low_priority `Events`
     SET `Name` = ?,
-        `EndTime` = ?,
+        `EndDateTime` = ?,
         `Length` = ?,
         `Frames` = ?,
         `AlarmFrames` = ?,
@@ -794,7 +794,7 @@ FROM `Frames` WHERE `EventId`=?';
   $res = $selectUnclosedEventsSth->execute($monitor_id?$monitor_id:())
     or Fatal("Can't execute: ".$selectUnclosedEventsSth->errstr());
   while( my $event = $selectUnclosedEventsSth->fetchrow_hashref() ) {
-    aud_print("Found open event '$event->{Id}' on Monitor $event->{MonitorId} at $$event{StartTime}");
+    aud_print("Found open event '$event->{Id}' on Monitor $event->{MonitorId} at $$event{StartDateTime}");
     if ( confirm('close', 'closing') ) {
       if ( ! ( $res = $selectFrameDataSth->execute($event->{Id}) ) ) {
         Error("Can't execute: $selectFrameDataSql:".$selectFrameDataSth->errstr());
@@ -808,7 +808,7 @@ FROM `Frames` WHERE `EventId`=?';
              $event->{Id},
              RECOVER_TAG
              ),
-           $frame->{EndTime},
+           $frame->{EndDateTime},
            $frame->{EndTimeStamp} - $event->{TimeStamp},
            $frame->{Frames},
            $frame->{AlarmFrames},
@@ -885,11 +885,11 @@ FROM `Frames` WHERE `EventId`=?';
   $loop = $continuous;
 
   my $eventcounts_sql = '
-  UPDATE `Monitors` SET
-  `TotalEvents`=(SELECT COUNT(`Id`) FROM `Events` WHERE `MonitorId`=`Monitors`.`Id`),
-  `TotalEventDiskSpace`=(SELECT SUM(`DiskSpace`) FROM `Events` WHERE `MonitorId`=`Monitors`.`Id` AND `DiskSpace` IS NOT NULL),
-  `ArchivedEvents`=(SELECT COUNT(`Id`) FROM `Events` WHERE `MonitorId`=`Monitors`.`Id` AND `Archived`=1),
-  `ArchivedEventDiskSpace`=(SELECT SUM(`DiskSpace`) FROM `Events` WHERE `MonitorId`=`Monitors`.`Id` AND `Archived`=1 AND `DiskSpace` IS NOT NULL)
+  UPDATE `Event_Summaries` SET
+  `TotalEvents`=(SELECT COUNT(`Id`) FROM `Events` WHERE `MonitorId`=`Event_Summaries`.`MonitorId`),
+  `TotalEventDiskSpace`=(SELECT SUM(`DiskSpace`) FROM `Events` WHERE `MonitorId`=`Event_Summaries`.`MonitorId` AND `DiskSpace` IS NOT NULL),
+  `ArchivedEvents`=(SELECT COUNT(`Id`) FROM `Events` WHERE `MonitorId`=`Event_Summaries`.`MonitorId` AND `Archived`=1),
+  `ArchivedEventDiskSpace`=(SELECT SUM(`DiskSpace`) FROM `Events` WHERE `MonitorId`=`Event_Summaries`.`MonitorId` AND `Archived`=1 AND `DiskSpace` IS NOT NULL)
   ';
 
   my $eventcounts_sth = $dbh->prepare_cached( $eventcounts_sql );
@@ -897,40 +897,40 @@ FROM `Frames` WHERE `EventId`=?';
   $eventcounts_sth->finish();
 
   my $eventcounts_hour_sql = '
-  UPDATE `Monitors` INNER JOIN (
+  UPDATE `Event_Summaries` INNER JOIN (
   SELECT  `MonitorId`, COUNT(*) AS `HourEvents`, SUM(COALESCE(`DiskSpace`,0)) AS `HourEventDiskSpace`
   FROM `Events_Hour` GROUP BY `MonitorId`
-  ) AS `E` ON `E`.`MonitorId`=`Monitors`.`Id` SET
-  `Monitors`.`HourEvents` = `E`.`HourEvents`,
-  `Monitors`.`HourEventDiskSpace` = `E`.`HourEventDiskSpace`
+  ) AS `E` ON `E`.`MonitorId`=`Event_Summaries`.`MonitorId` SET
+  `Event_Summaries`.`HourEvents` = `E`.`HourEvents`,
+  `Event_Summaries`.`HourEventDiskSpace` = `E`.`HourEventDiskSpace`
   ';
 
 
   my $eventcounts_day_sql = '
-  UPDATE `Monitors` INNER JOIN (
+  UPDATE `Event_Summaries` INNER JOIN (
   SELECT  `MonitorId`, COUNT(*) AS `DayEvents`, SUM(COALESCE(`DiskSpace`,0)) AS `DayEventDiskSpace`
   FROM `Events_Day` GROUP BY `MonitorId`
-  ) AS `E` ON `E`.`MonitorId`=`Monitors`.`Id` SET
-  `Monitors`.`DayEvents` = `E`.`DayEvents`,
-  `Monitors`.`DayEventDiskSpace` = `E`.`DayEventDiskSpace`
+  ) AS `E` ON `E`.`MonitorId`=`Event_Summaries`.`MonitorId` SET
+  `Event_Summaries`.`DayEvents` = `E`.`DayEvents`,
+  `Event_Summaries`.`DayEventDiskSpace` = `E`.`DayEventDiskSpace`
   ';
 
   my $eventcounts_week_sql = '
-  UPDATE `Monitors` INNER JOIN (
+  UPDATE `Event_Summaries` INNER JOIN (
   SELECT  `MonitorId`, COUNT(*) AS `WeekEvents`, SUM(COALESCE(`DiskSpace`,0)) AS `WeekEventDiskSpace`
   FROM `Events_Week` GROUP BY `MonitorId`
-  ) AS `E` ON `E`.`MonitorId`=`Monitors`.`Id` SET
-  `Monitors`.`WeekEvents` = `E`.`WeekEvents`,
-  `Monitors`.`WeekEventDiskSpace` = `E`.`WeekEventDiskSpace`
+  ) AS `E` ON `E`.`MonitorId`=`Event_Summaries`.`MonitorId` SET
+  `Event_Summaries`.`WeekEvents` = `E`.`WeekEvents`,
+  `Event_Summaries`.`WeekEventDiskSpace` = `E`.`WeekEventDiskSpace`
   ';
 
   my $eventcounts_month_sql = '
-  UPDATE `Monitors` INNER JOIN (
+  UPDATE `Event_Summaries` INNER JOIN (
   SELECT  `MonitorId`, COUNT(*) AS `MonthEvents`, SUM(COALESCE(`DiskSpace`,0)) AS `MonthEventDiskSpace`
   FROM `Events_Month` GROUP BY `MonitorId`
-  ) AS `E` ON `E`.`MonitorId`=`Monitors`.`Id` SET
-  `Monitors`.`MonthEvents` = `E`.`MonthEvents`,
-  `Monitors`.`MonthEventDiskSpace` = `E`.`MonthEventDiskSpace`
+  ) AS `E` ON `E`.`MonitorId`=`Event_Summaries`.`MonitorId` SET
+  `Event_Summaries`.`MonthEvents` = `E`.`MonthEvents`,
+  `Event_Summaries`.`MonthEventDiskSpace` = `E`.`MonthEventDiskSpace`
   ';
   my $eventcounts_hour_sth = $dbh->prepare_cached($eventcounts_hour_sql);
   my $eventcounts_day_sth = $dbh->prepare_cached($eventcounts_day_sql);
diff --git a/scripts/zmcontrol.pl.in b/scripts/zmcontrol.pl.in
index 74886b4d4..d1f50cf43 100644
--- a/scripts/zmcontrol.pl.in
+++ b/scripts/zmcontrol.pl.in
@@ -27,7 +27,7 @@ use strict;
 use ZoneMinder;
 use Getopt::Long;
 use autouse 'Pod::Usage'=>qw(pod2usage);
-use POSIX qw/strftime EPIPE/;
+use POSIX qw/strftime EPIPE EINTR/;
 use Socket;
 use Data::Dumper;
 use Module::Load::Conditional qw{can_load};
@@ -83,7 +83,7 @@ if ( $options{command} ) {
   my $server_up;
   while ( $tries and ! ( $server_up = connect(CLIENT, $saddr) ) ) {
     Debug("Failed to connect to zmcontrol server at $sock_file");
-    runCommand("zmdc.pl start zmcontrol.pl --id=$id");
+    runCommand("zmdc.pl start zmcontrol.pl --id $id");
     sleep 1;
     $tries -= 1;
   }
@@ -138,13 +138,21 @@ if ( $options{command} ) {
     Fatal("Can't load ZoneMinder::Control::$protocol\n$Module::Load::Conditional::ERROR");
   }
 
+  my $zm_terminate = 0;
+  sub TermHandler {
+    Info('Received TERM, exiting');
+    $zm_terminate = 1;
+  }
+  $SIG{TERM} = \&TermHandler;
+  $SIG{INT} = \&TermHandler;
+
   Info("Control server $id/$protocol starting at "
     .strftime('%y/%m/%d %H:%M:%S', localtime())
   );
 
-  $0 = $0." --id=$id";
+  $0 = $0.' --id '.$id;
 
-  my $control = "ZoneMinder::Control::$protocol"->new($id);
+  my $control = ('ZoneMinder::Control::'.$protocol)->new($id);
   my $control_key = $control->getKey();
   $control->loadMonitor();
 
@@ -162,24 +170,24 @@ if ( $options{command} ) {
   listen(SERVER, SOMAXCONN) or Fatal("Can't listen: $!");
 
   my $rin = '';
-  vec( $rin, fileno(SERVER), 1 ) = 1;
+  vec($rin, fileno(SERVER), 1) = 1;
   my $win = $rin;
   my $ein = $win;
   my $timeout = MAX_COMMAND_WAIT;
-  while( 1 ) {
+  while (!$zm_terminate) {
     my $nfound = select(my $rout = $rin, undef, undef, $timeout);
     if ( $nfound > 0 ) {
-      if ( vec( $rout, fileno(SERVER), 1 ) ) {
+      if ( vec($rout, fileno(SERVER), 1) ) {
         my $paddr = accept(CLIENT, SERVER);
         my $message = <CLIENT>;
+        close(CLIENT);
 
         next if !$message;
 
         my $params = jsonDecode($message);
-        Debug( Dumper( $params ) );
+        Debug(Dumper($params));
 
         my $command = $params->{command};
-        close(CLIENT);
         if ( $command eq 'quit' ) {
           last;
         } elsif ( $command ) {
@@ -191,23 +199,23 @@ if ( $options{command} ) {
         Fatal('Bogus descriptor');
       }
     } elsif ( $nfound < 0 ) {
-      if ( $! == EPIPE ) {
+      if ( $! == EINTR ) {
+        # Likely just SIGHUP
+        Debug("Can't select: $!");
+      } elsif ( $! == EPIPE ) {
         Error("Can't select: $!");
       } else {
         Fatal("Can't select: $!");
       }
     } else {
-      #print( "Select timed out\n" );
-      last;
+      Debug('Select timed out');
     }
-  } # end while forever
+  } # end while !$zm_terminate
   Info("Control server $id/$protocol exiting");
   unlink($sock_file);
   $control->close();
-  exit(0);
 } # end if !server up
 
-
 exit(0);
 
 1;
diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index 3ab910469..5cf866e56 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -92,7 +92,6 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 my @daemons = (
     'zmc',
-    'zma',
     'zmfilter.pl',
     'zmaudit.pl',
     'zmtrigger.pl',
@@ -102,11 +101,12 @@ my @daemons = (
     'zmstats.pl',
     'zmtrack.pl',
     'zmcontrol.pl',
+    'zm_rtsp_server',
     'zmtelemetry.pl'
     );
 
 if ( $Config{ZM_OPT_USE_EVENTNOTIFICATION} ) {
-	push @daemons,'zmeventnotification.pl';
+	push @daemons, 'zmeventnotification.pl';
 }
 
 my $command = shift @ARGV;
@@ -239,7 +239,7 @@ use Sys::MemInfo qw(totalmem freemem totalswap freeswap);
 use ZoneMinder::Server qw(CpuLoad);
 #use Data::Dumper;
 
-use constant KILL_DELAY => 60; # seconds to wait between sending TERM and sending KILL
+use constant KILL_DELAY => 10; # seconds to wait between sending TERM and sending KILL
 
 our %cmd_hash;
 our %pid_hash;
@@ -436,18 +436,19 @@ sub start {
     return;
   }
 
+  # We have to block SIGCHLD during fork to prevent races while we setup our records for it
   my $sigset = POSIX::SigSet->new;
   my $blockset = POSIX::SigSet->new(SIGCHLD);
   sigprocmask(SIG_BLOCK, $blockset, $sigset) or Fatal("Can't block SIGCHLD: $!");
   # Apparently the child closing the db connection can affect the parent.
   zmDbDisconnect();
-  if ( my $cpid = fork() ) {
+  if ( my $child_pid = fork() ) {
 
     $dbh = zmDbConnect(1);
     # This logReinit is required.  Not sure why.
     logReinit();
 
-    $process->{pid} = $cpid;
+    $process->{pid} = $child_pid;
     $process->{started} = time();
     delete $process->{pending};
 
@@ -456,9 +457,9 @@ sub start {
         .", pid = $process->{pid}\n"
         );
 
-    $cmd_hash{$process->{command}} = $pid_hash{$cpid} = $process;
+    $cmd_hash{$process->{command}} = $pid_hash{$child_pid} = $process;
     sigprocmask(SIG_SETMASK, $sigset) or Fatal("Can't restore SIGCHLD: $!");
-  } elsif ( defined($cpid) ) {
+  } elsif ( defined($child_pid) ) {
     # Child process
     
     # Force reconnection to the db. $dbh got copied, but isn't really valid anymore.
@@ -490,7 +491,7 @@ sub start {
     zmDbDisconnect();
 
     my $fd = 3; # leave stdin,stdout,stderr open.  Closing them causes problems with libx264
-    while( $fd < POSIX::sysconf(&POSIX::_SC_OPEN_MAX) ) {
+    while ( $fd < POSIX::sysconf(&POSIX::_SC_OPEN_MAX) ) {
       POSIX::close($fd++);
     }
 
@@ -611,6 +612,7 @@ sub restart {
   # Start will be handled by the reaper...
   # unless it was already pending in which case send_stop will return () so we should start it
   if ( !send_stop(0, $process) ) {
+    dPrint(ZoneMinder::Logger::WARNING, "!send_stop so starting '$command'\n");
     start($daemon, @args);
   }
   return;
diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 5ff316078..60d6293b4 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -98,6 +98,7 @@ use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)
   ;
 
 logInit($filter_id?(id=>'zmfilter_'.$filter_id):());
+
 sub HupHandler {
   # This idea at this time is to just exit, freeing up the memory. 
   # zmfilter.pl will be respawned by zmdc.
@@ -162,16 +163,17 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 my $delay = $Config{ZM_FILTER_EXECUTE_INTERVAL};
 my $event_id = 0;
 
-if ( ! EVENT_PATH ) {
-  Error("No event path defined. Config was $Config{ZM_DIR_EVENTS}");
+if ( !EVENT_PATH ) {
+  Error('No event path defined. Config was '.$Config{ZM_DIR_EVENTS});
   die;
 }
 
 # In future, should not be neccessary wrt StorageAreas
-chdir( EVENT_PATH );
+chdir(EVENT_PATH);
 
 # Should not be neccessary... but nice to get a local var.  What if it fails?
 my $dbh = zmDbConnect();
+$dbh->do('SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED');
 
 if ( $filter_name ) {
   Info("Scanning for events using filter '$filter_name'");
@@ -236,6 +238,7 @@ sub getFilters {
     $sql .= ' `Background` = 1 AND';
   }
   $sql .= '( `AutoArchive` = 1
+    or `AutoUnarchive` = 1
     or `AutoVideo` = 1
     or `AutoUpload` = 1
     or `AutoEmail` = 1
@@ -275,6 +278,7 @@ FILTER: while( my $db_filter = $sth->fetchrow_hashref() ) {
 sub checkFilter {
   my $filter = shift;
 
+  my $in_transaction = ZoneMinder::Database::start_transaction($dbh) if $$filter{LockRows}; 
   my @Events = $filter->Execute();
   Debug(
       join(' ',
@@ -282,6 +286,7 @@ sub checkFilter {
         join(', ', 
           ($filter->{AutoDelete}?'delete':()),
           ($filter->{AutoArchive}?'archive':()),
+          ($filter->{AutoUnarchive}?'unarchive':()),
           ($filter->{AutoVideo}?'video':()),
           ($filter->{AutoUpload}?'upload':()),
           ($filter->{AutoEmail}?'email':()),
@@ -299,7 +304,7 @@ sub checkFilter {
     last if $zm_terminate;
     my $Event = new ZoneMinder::Event($$event{Id}, $event);
 
-    Debug("Checking event $Event->{Id}");
+    Debug('Checking event '.$Event->{Id});
     my $delete_ok = !undef;
     $dbh->ping();
     if ( $filter->{AutoArchive} ) {
@@ -311,6 +316,15 @@ sub checkFilter {
       my $res = $sth->execute($Event->{Id})
         or Error("Unable to execute '$sql': ".$dbh->errstr());
     }
+    if ( $filter->{AutoUnarchive} ) {
+      Info("Unarchiving event $Event->{Id}");
+      # Do it individually to avoid locking up the table for new events
+      my $sql = 'UPDATE `Events` SET `Archived` = 0 WHERE `Id` = ?';
+      my $sth = $dbh->prepare_cached($sql)
+        or Fatal("Unable to prepare '$sql': ".$dbh->errstr());
+      my $res = $sth->execute($Event->{Id})
+        or Error("Unable to execute '$sql': ".$dbh->errstr());
+    }
     if ( $Config{ZM_OPT_FFMPEG} && $filter->{AutoVideo} ) {
       if ( !$Event->{Videoed} ) {
         $delete_ok = undef if !generateVideo($filter, $Event);
@@ -346,6 +360,7 @@ sub checkFilter {
 
     if ( $filter->{AutoMove} ) {
       my $NewStorage = new ZoneMinder::Storage($filter->{AutoMoveTo});
+      Info("Moving event $Event->{Id} to datastore $filter->{AutoMoveTo}");
       $_ = $Event->MoveTo($NewStorage);
       Error($_) if $_;
     }
@@ -354,6 +369,7 @@ sub checkFilter {
       # So we still need to update the Event object with the new SecondaryStorageId
       my $NewStorage = ZoneMinder::Storage->find_one(Id=>$filter->{AutoCopyTo});
       if ( $NewStorage ) {
+        Info("Copying event $Event->{Id} to datastore $filter->{AutoCopyTo}");
         $_ = $Event->CopyTo($NewStorage);
         if ( $_ ) {
           $ZoneMinder::Database::dbh->commit();
@@ -368,8 +384,10 @@ sub checkFilter {
     } # end if AutoCopy
 
     if ( $filter->{UpdateDiskSpace} ) {
-      $ZoneMinder::Database::dbh->begin_work();
-      $Event->lock_and_load();
+      if ( $$filter{LockRows} ) {
+        $ZoneMinder::Database::dbh->begin_work();
+        $Event->lock_and_load();
+      }
 
       my $old_diskspace = $$Event{DiskSpace};
 			my $new_diskspace = $Event->DiskSpace(undef);
@@ -381,9 +399,10 @@ sub checkFilter {
 					) {
         $Event->save();
       }
-      $ZoneMinder::Database::dbh->commit();
+      $ZoneMinder::Database::dbh->commit() if !$$filter{LockRows};
     } # end if UpdateDiskSpace
   } # end foreach event
+  ZoneMinder::Database::end_transaction($dbh, $in_transaction) if $$filter{LockRows}; 
 } # end sub checkFilter
 
 sub generateVideo {
@@ -391,8 +410,9 @@ sub generateVideo {
   my $Event = shift;
   my $phone = shift;
 
-  my $rate = $Event->{DefaultRate}/100;
-  my $scale = $Event->{DefaultScale}/100;
+  my $Monitor = $Event->Monitor();
+  my $rate = $$Monitor{DefaultRate}/100;
+  my $scale = $$Monitor{DefaultScale}/100;
   my $format;
 
   my @ffmpeg_formats = split(/\s+/, $Config{ZM_FFMPEG_FORMATS});
@@ -641,12 +661,14 @@ sub substituteTags {
 # First we'd better check what we need to get
 # We have a filter and an event, do we need any more
 # monitor information?
-  my $need_monitor = $text =~ /%(?:MET|MEH|MED|MEW|MEN|MEA)%/;
+  my $need_monitor = $text =~ /%(?:MN|MET|MEH|MED|MEW|MEN|MEA)%/;
+  my $need_status = $text =~ /%(?:MET|MEH|MED|MEW|MEN|MEA)%/;
 
   my $Monitor = $Event->Monitor() if $need_monitor;
+  my $Status = $Monitor->Status() if $need_status;
 
 # Do we need the image information too?
-  my $need_images = $text =~ /%(?:EPI1|EPIM|EI1|EIM|EI1A|EIMA|EIMOD)%/;
+  my $need_images = $text =~ /%(?:EPI1|EPIM|EI1|EIM|EI1A|EIMA|EIMOD|EIMODG)%/;
   my $first_alarm_frame;
   my $max_alarm_frame;
   my $max_alarm_score = 0;
@@ -673,13 +695,13 @@ sub substituteTags {
 
   my $url = $Config{ZM_URL};
   $text =~ s/%ZP%/$url/g;
-  $text =~ s/%MN%/$Event->{MonitorName}/g;
-  $text =~ s/%MET%/$Monitor->{TotalEvents}/g;
-  $text =~ s/%MEH%/$Monitor->{HourEvents}/g;
-  $text =~ s/%MED%/$Monitor->{DayEvents}/g;
-  $text =~ s/%MEW%/$Monitor->{WeekEvents}/g;
-  $text =~ s/%MEM%/$Monitor->{MonthEvents}/g;
-  $text =~ s/%MEA%/$Monitor->{ArchivedEvents}/g;
+  $text =~ s/%MN%/$Monitor->{Name}/g;
+  $text =~ s/%MET%/$Status->{TotalEvents}/g;
+  $text =~ s/%MEH%/$Status->{HourEvents}/g;
+  $text =~ s/%MED%/$Status->{DayEvents}/g;
+  $text =~ s/%MEW%/$Status->{WeekEvents}/g;
+  $text =~ s/%MEM%/$Status->{MonthEvents}/g;
+  $text =~ s/%MEA%/$Status->{ArchivedEvents}/g;
   $text =~ s/%MP%/$url?view=watch&mid=$Event->{MonitorId}/g;
   $text =~ s/%MPS%/$url?view=watch&mid=$Event->{MonitorId}&mode=stream/g;
   $text =~ s/%MPI%/$url?view=watch&mid=$Event->{MonitorId}&mode=still/g;
@@ -690,7 +712,7 @@ sub substituteTags {
   $text =~ s/%EN%/$Event->{Name}/g;
   $text =~ s/%EC%/$Event->{Cause}/g;
   $text =~ s/%ED%/$Event->{Notes}/g;
-  $text =~ s/%ET%/$Event->{StartTime}/g;
+  $text =~ s/%ET%/$Event->{StartDateTime}/g;
   $text =~ s/%EVF%/$$Event{DefaultVideo}/g; # Event video filename
   $text =~ s/%EL%/$Event->{Length}/g;
   $text =~ s/%EF%/$Event->{Frames}/g;
@@ -704,6 +726,11 @@ sub substituteTags {
     $text =~ s/%EPFM%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$max_alarm_frame->{FrameId}/g;
     $text =~ s/%EPI1%/$url?view=image&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$first_alarm_frame->{FrameId}/g;
     $text =~ s/%EPIM%/$url?view=image&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=$max_alarm_frame->{FrameId}/g;
+    $text =~ s/%EPFMOD%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=objdetect/g;
+    $text =~ s/%EPIMOD%/$url?view=image&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=objdetect/g;
+    $text =~ s/%EPFMODG%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=objdetect_gif/g;
+    $text =~ s/%EPIMODG%/$url?view=image&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=objdetect_gif/g;
+
     if ( $attachments_ref ) {
       if ( $text =~ s/%EI1%//g ) {
         my $path = generateImage($Event, $first_alarm_frame);
@@ -751,9 +778,7 @@ sub substituteTags {
         }
       }
 
-      if ( $text =~ s/%EIMOD%//g or $text =~ s/%EFMOD%//g ) {
-        $text =~ s/%EFMOD%/$url?view=frame&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=objdetect/g;
-        $text =~ s/%EIMOD%/$url?view=image&mid=$Event->{MonitorId}&eid=$Event->{Id}&fid=objdetect/g;
+      if ( $text =~ s/%EIMOD%//g ) {
         my $path = $Event->Path().'/objdetect.jpg';
         if ( -e $path ) {
           push @$attachments_ref, { type=>'image/jpeg', path=>$path };
@@ -762,6 +787,15 @@ sub substituteTags {
         }
       }
 
+      if ( $text =~ s/%EIMODG%//g ) {
+        my $path = $Event->Path().'/objdetect.gif';
+        if ( -e $path ) {
+          push @$attachments_ref, { type=>'image/gif', path=>$path };
+        } else {
+          Warning('No image for MODG at '.$path);
+        }
+      }
+
     } # end if attachments_ref
   } # end if $first_alarm_frame
 
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 4b2032a8d..2f6708fc8 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -171,12 +171,21 @@ if ( $command =~ /^(?:start|restart)$/ ) {
     if ( $Config{ZM_DYN_DB_VERSION}
         and ( $Config{ZM_DYN_DB_VERSION} ne ZM_VERSION )
        ) {
-      Fatal('Version mismatch, system is version '.ZM_VERSION
-          .', database is '.$Config{ZM_DYN_DB_VERSION}
-          .', please run zmupdate.pl to update.'
-          );
-      exit(-1);
-    }
+         my ( $db_major, $db_minor, $db_micro ) = split(/\./, $Config{ZM_DYN_DB_VERSION});
+         my ( $major, $minor, $micro ) = split(/\./, ZM_VERSION);
+         if ( $db_major != $major or $db_minor != $minor ) {
+           Fatal('Version mismatch, system is version '.ZM_VERSION
+             .', database is '.$Config{ZM_DYN_DB_VERSION}
+             .', please run zmupdate.pl to update.'
+           );
+           exit(-1);
+         } else {
+           Error('Version mismatch, system is version '.ZM_VERSION
+             .', database is '.$Config{ZM_DYN_DB_VERSION}
+             .', please run zmupdate.pl to update.'
+           );
+         }
+    } # end if version mismatch
 
 # Recreate the temporary directory if it's been wiped
     verifyFolder('@ZM_TMPDIR@');
@@ -216,9 +225,6 @@ if ( $command =~ /^(?:start|restart)$/ ) {
           } else {
             runCommand("zmdc.pl start zmc -m $monitor->{Id}");
           }
-          if ( $monitor->{Function} ne 'Monitor' ) {
-            runCommand("zmdc.pl start zma -m $monitor->{Id}");
-          }
           if ( $Config{ZM_OPT_CONTROL} ) {
             if ( $monitor->{Controllable} ) {
               runCommand("zmdc.pl start zmcontrol.pl --id $monitor->{Id}");
@@ -289,6 +295,9 @@ if ( $command =~ /^(?:start|restart)$/ ) {
     } else {
       runCommand('zmdc.pl start zmstats.pl');
     }
+    if ( $Config{ZM_MIN_RTSP_PORT} ) {
+      runCommand('zmdc.pl start zm_rtsp_server');
+    }
   } else {
     $retval = 1;
   }
diff --git a/scripts/zmrecover.pl.in b/scripts/zmrecover.pl.in
index 58647b946..d6fe578f6 100644
--- a/scripts/zmrecover.pl.in
+++ b/scripts/zmrecover.pl.in
@@ -224,6 +224,7 @@ Debug("@Monitors");
                 $$Event{RelativePath} = join('/', $day_dir, $event_path);
                 $$Event{Scheme} = 'Deep';
                 $$Event{Name} = "Event $event_id recovered";
+                $$Event{StateId} = 1;
                 $Event->MonitorId( $monitor_dir );
                 $Event->StorageId( $Storage->Id() );
                 $Event->DiskSpace( undef );
@@ -231,7 +232,7 @@ Debug("@Monitors");
                 $Event->Height( $Monitor->Height() );
                 $Event->Orientation( $Monitor->Orientation() );
                 $Event->recover_timestamps();
-                if ( $$Event{StartTime} ) {
+                if ( $$Event{StartDateTime} ) {
                   $Event->save({}, 1);
                   Info("Event resurrected as " . $Event->to_string() );
                 } else {
@@ -287,6 +288,7 @@ Debug("@Monitors");
                 $$Event{RelativePath} = join('/', $day_dir, $event_dir);
                 $$Event{Scheme} = 'Deep';
                 $$Event{Name} = "Event $event_id recovered";
+                $$Event{StateId} = 1;
                 $Event->MonitorId( $monitor_dir );
                 $Event->Width( $Monitor->Width() );
                 $Event->Height( $Monitor->Height() );
@@ -294,7 +296,7 @@ Debug("@Monitors");
                 $Event->StorageId( $Storage->Id() );
                 $Event->DiskSpace( undef );
                 $Event->recover_timestamps();
-                if ( $$Event{StartTime} ) {
+                if ( $$Event{StartDateTime} ) {
                   $Event->save({}, 1);
                   Info("Event resurrected as " . $Event->to_string() );
                 } else {
@@ -309,13 +311,13 @@ Debug("@Monitors");
             my ( undef, $year, $month, $day ) = split('/', $day_dir);
             $year += 2000;
             my ( $hour, $minute, $second ) = split('/', $event_dir);
-            my $StartTime =sprintf('%.4d-%.2d-%.2d %.2d:%.2d:%.2d', $year, $month, $day, $hour, $minute, $second);
+            my $StartDateTime =sprintf('%.4d-%.2d-%.2d %.2d:%.2d:%.2d', $year, $month, $day, $hour, $minute, $second);
             my $Event = ZoneMinder::Event->find_one(
               MonitorId=>$monitor_dir,
-              StartTime=>$StartTime,
+              StartDateTime=>$StartDateTime,
             );
             if ( $Event ) {
-              Debug("Found event matching starttime on monitor $monitor_dir at $StartTime: " . $Event->to_string());
+              Debug("Found event matching starttime on monitor $monitor_dir at $StartDateTime: " . $Event->to_string());
               next;
             }
 
@@ -352,13 +354,14 @@ Debug("@Monitors");
             $$Event{Scheme} = 'Medium';
             $$Event{RelativePath} = $event_dir;
             $$Event{Name} = "Event $event_id recovered";
+            $$Event{StateId} = 1;
             $Event->MonitorId( $monitor_dir );
             $Event->Width( $Monitor->Width() );
             $Event->Height( $Monitor->Height() );
             $Event->Orientation( $Monitor->Orientation() );
             $Event->StorageId( $Storage->Id() );
             $Event->recover_timestamps();
-            if ( $$Event{StartTime} ) {
+            if ( $$Event{StartDateTime} ) {
               $Event->save({}, 1);
               Info("Event resurrected as " . $Event->to_string() );
             } else {
@@ -393,6 +396,7 @@ Debug("@Monitors");
         if ( confirm() ) {
           $$Event{Scheme} = 'Shallow';
           $$Event{Name} = "Event $event recovered";
+          $$Event{StateId} = 1;
           #$$Event{Path} = $event_path;
           $Event->MonitorId( $monitor_dir );
           $Event->Width( $Monitor->Width() );
@@ -400,7 +404,7 @@ Debug("@Monitors");
           $Event->Orientation( $Monitor->Orientation() );
           $Event->StorageId( $Storage->Id() );
           $Event->recover_timestamps();
-          if ( $$Event{StartTime} ) {
+          if ( $$Event{StartDateTime} ) {
             $Event->save({}, 1);
             Info("Event resurrected as " . $Event->to_string() );
           } else {
diff --git a/scripts/zmstats.pl.in b/scripts/zmstats.pl.in
index 555d9c602..3c86aada6 100644
--- a/scripts/zmstats.pl.in
+++ b/scripts/zmstats.pl.in
@@ -28,13 +28,20 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 logInit();
 logSetSignal();
+my $zm_terminate = 0;
+sub TermHandler {
+  Info('Received TERM, exiting');
+  $zm_terminate = 1;
+}
+$SIG{TERM} = \&TermHandler;
+$SIG{INT} = \&TermHandler;
 
 Info('Stats Daemon starting in '.START_DELAY.' seconds');
 sleep(START_DELAY);
 
 my $dbh = zmDbConnect();
 
-while( 1 ) {
+while (!$zm_terminate) {
   while ( ! ( $dbh and $dbh->ping() ) ) {
     Info('Reconnecting to db');
     if ( !($dbh = zmDbConnect()) ) {
@@ -43,10 +50,10 @@ while( 1 ) {
     }
   }
 
-  $dbh->do('DELETE FROM Events_Hour WHERE StartTime < DATE_SUB(NOW(), INTERVAL 1 hour)') or Error($dbh->errstr());
-  $dbh->do('DELETE FROM Events_Day WHERE StartTime < DATE_SUB(NOW(), INTERVAL 1 day)') or Error($dbh->errstr());
-  $dbh->do('DELETE FROM Events_Week WHERE StartTime < DATE_SUB(NOW(), INTERVAL 1 week)') or Error($dbh->errstr());
-  $dbh->do('DELETE FROM Events_Month WHERE StartTime < DATE_SUB(NOW(), INTERVAL 1 month)') or Error($dbh->errstr());
+  $dbh->do('DELETE FROM Events_Hour WHERE StartDateTime < DATE_SUB(NOW(), INTERVAL 1 hour)') or Error($dbh->errstr());
+  $dbh->do('DELETE FROM Events_Day WHERE StartDateTime < DATE_SUB(NOW(), INTERVAL 1 day)') or Error($dbh->errstr());
+  $dbh->do('DELETE FROM Events_Week WHERE StartDateTime < DATE_SUB(NOW(), INTERVAL 1 week)') or Error($dbh->errstr());
+  $dbh->do('DELETE FROM Events_Month WHERE StartDateTime < DATE_SUB(NOW(), INTERVAL 1 month)') or Error($dbh->errstr());
 
   # Prune the Logs table if required
   if ( $Config{ZM_LOG_DATABASE_LIMIT} ) {
@@ -60,14 +67,8 @@ while( 1 ) {
       my $row = $selectLogRowCountSth->fetchrow_hashref();
       my $logRows = $row->{Rows};
       if ( $logRows > $Config{ZM_LOG_DATABASE_LIMIT} ) {
-        my $deleteLogByRowsSql = 'DELETE low_priority FROM `Logs` ORDER BY `TimeKey` ASC LIMIT ?';
-        my $deleteLogByRowsSth = $dbh->prepare_cached( $deleteLogByRowsSql )
-          or Fatal("Can't prepare '$deleteLogByRowsSql': ".$dbh->errstr());
-        $res = $deleteLogByRowsSth->execute( $logRows - $Config{ZM_LOG_DATABASE_LIMIT} )
-          or Fatal("Can't execute: ".$deleteLogByRowsSth->errstr());
-        if ( $deleteLogByRowsSth->rows() ) {
-          Debug('Deleted '.$deleteLogByRowsSth->rows().' log table entries by count');
-        }
+        my $rows = zmDbDo('DELETE low_priority FROM `Logs` ORDER BY `TimeKey` ASC LIMIT ?', $logRows - $Config{ZM_LOG_DATABASE_LIMIT});
+        Debug('Deleted '.$rows.' log table entries by count') if defined $rows;
       }
     } else {
       # Time of record
@@ -76,23 +77,19 @@ while( 1 ) {
       if ( $Config{ZM_LOG_DATABASE_LIMIT} =~ /^(.*)s$/ ) {
         $Config{ZM_LOG_DATABASE_LIMIT} = $1;
       }
-      my $deleted_rows;
+      my $rows;
       do {
-        my $deleteLogByTimeSql =
-        'DELETE FROM `Logs`
-        WHERE `TimeKey` < unix_timestamp(now() - interval '.$Config{ZM_LOG_DATABASE_LIMIT}.') LIMIT 100';
-        my $deleteLogByTimeSth = $dbh->prepare_cached( $deleteLogByTimeSql )
-          or Fatal("Can't prepare '$deleteLogByTimeSql': ".$dbh->errstr());
-        my $res = $deleteLogByTimeSth->execute()
-          or Fatal("Can't execute: ".$deleteLogByTimeSth->errstr());
-        $deleted_rows = $deleteLogByTimeSth->rows();
-        Debug("Deleted $deleted_rows log table entries by time");
-      } while ( $deleted_rows );
+        my $rows = zmDbDo('DELETE FROM `Logs` WHERE `TimeKey` < unix_timestamp(now() - interval '.$Config{ZM_LOG_DATABASE_LIMIT}.') LIMIT 100');
+        Debug("Deleted $rows log table entries by time") if defined $rows;
+      } while ($rows);
     }
   } # end if ZM_LOG_DATABASE_LIMIT
 
+	# Delete any sessions that are more ethan a week old. Limiting to 100 because mysql sucks
+	zmDbDo('DELETE FROM Sessions WHERE access < ? LIMIT 100', time - (60*60*24*7));
+
   sleep($Config{ZM_STATS_UPDATE_INTERVAL});
-} # end while (1)
+} # end while (!$zm_terminate)
 
 Info('Stats Daemon exiting');
 exit();
diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index 1ee392c1e..041d1c449 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -87,6 +87,13 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 logInit();
 logSetSignal();
+my $zm_terminate = 0;
+sub TermHandler {
+  Info('Received TERM, exiting');
+  $zm_terminate = 1;
+}
+$SIG{TERM} = \&TermHandler;
+$SIG{INT} = \&TermHandler;
 
 Info('Trigger daemon starting');
 
@@ -118,7 +125,7 @@ my $win = $rin;
 my $ein = $win;
 my $timeout = SELECT_TIMEOUT;
 my %actions;
-while (1) {
+while (!$zm_terminate) {
   $rin = $base_rin;
 # Add the file descriptors of any spawned connections
   foreach my $fileno ( keys %spawned_connections ) {
@@ -187,7 +194,7 @@ while (1) {
     } else {
       Fatal("Can't select: $!");
     }
-  } # end if select returned activitiy
+  } # end if select returned activity
 
 # Check polled connections
   foreach my $connection ( @in_poll_connections ) {
@@ -219,10 +226,10 @@ while (1) {
 
 #print( "$monitor->{Id}: S:$state, LE:$last_event" );
 #print( "$monitor->{Id}: mS:$monitor->{LastState}, mLE:$monitor->{LastEvent}" );
-    if ( $state == STATE_ALARM || $state == STATE_ALERT ) {
+    if ( $state == STATE_ALARM or $state == STATE_ALERT ) {
 # In alarm state
       if ( !defined($monitor->{LastEvent})
-          || ($last_event != $monitor->{LastEvent})
+          or ($last_event != $monitor->{LastEvent})
          ) {
 # A new event
         push @out_messages, $monitor->{Id}.'|on|'.time().'|'.$last_event;
@@ -231,9 +238,9 @@ while (1) {
 # Do nothing
       }
     } elsif ( 
-        ($state == STATE_IDLE && $monitor->{LastState} != STATE_IDLE)
-        ||
-        ($state == STATE_TAPE && $monitor->{LastState} != STATE_TAPE)
+        (($state == STATE_IDLE) and ($monitor->{LastState} != STATE_IDLE))
+          or
+        (($state == STATE_TAPE) and ($monitor->{LastState} != STATE_TAPE))
         ) {
 # Out of alarm state
       push @out_messages, $monitor->{Id}.'|off|'.time().'|'.$last_event;
@@ -266,7 +273,7 @@ while (1) {
     Debug('Checking for timed actions');
     my $now = time();
     foreach my $action_time ( sort( grep { $_ < $now } @action_times ) ) {
-      Info("Found " . scalar @{$actions{$action_time}} . "actions expiring at $action_time");
+      Info('Found '.(scalar @{$actions{$action_time}}).'actions expiring at '.$action_time);
       foreach my $action ( @{$actions{$action_time}} ) {
         my $connection = $action->{connection};
         Info("Found action '$$action{message}'");
@@ -312,14 +319,14 @@ while (1) {
 
   # zmDbConnect will ping and reconnect if neccessary
   $dbh = zmDbConnect();
-} # end while ( 1 )
+} # end while (!$zm_terminate)
 Info('Trigger daemon exiting');
 exit;
 
 sub loadMonitor {
   my $monitor = shift;
 
-  Debug("Loading monitor $monitor");
+  Debug('Loading monitor '.$monitor);
   zmMemInvalidate($monitor);
 
   if ( zmMemVerify($monitor) ) { # This will re-init shared memory
@@ -334,7 +341,7 @@ sub loadMonitors {
   my %new_monitors = ();
 
   my $sql = 'SELECT * FROM `Monitors`
-    WHERE find_in_set( `Function`, \'Modect,Mocord,Nodect\' )'.
+    WHERE find_in_set( `Function`, \'Modect,Mocord,Nodect,Record\' )'.
     ( $Config{ZM_SERVER_ID} ? ' AND `ServerId`=?' : '' )
     ;
   my $sth = $dbh->prepare_cached( $sql )
@@ -350,7 +357,7 @@ sub loadMonitors {
     $new_monitors{$monitor->{Id}} = $monitor;
   } # end while fetchrow
   %monitors = %new_monitors;
-}
+} # end sub loadMonitors
 
 sub handleMessage {
   my $connection = shift;
@@ -369,12 +376,17 @@ sub handleMessage {
 
   my $monitor = $monitors{$id};
   if ( !$monitor ) {
-    Warning("Can't find monitor '$id' for message '$message'");
+    loadMonitors();
+    $monitor = $monitors{$id};
+    if ( !$monitor ) {
+      Warning("Can't find monitor '$id' for message '$message'");
+      return;
+    }
+  }
+  if ( !zmMemVerify($monitor) ) {
+    Warning("Can't verify monitor '$id' for message '$message'");
     return;
   }
-  Debug("Found monitor for id '$id'");
-
-  next if !zmMemVerify($monitor);
 
   Debug("Handling action '$action'");
   if ( $action =~ /^(enable|disable)(?:[\+ ](\d+))?$/ ) {
@@ -387,21 +399,25 @@ sub handleMessage {
     }
 # Force a reload
     $monitor_reload_time = 0;
-    Info("Set monitor to $state");
+    Info('Set monitor to '.$state);
     if ( $delay ) {
-      my $action_text = $id.'|'.( ($state eq 'enable')
-          ? 'disable'
-          : 'enable'
-          );
+      my $action_text = $id.'|'.(($state eq 'enable') ? 'disable' : 'enable');
       handleDelay($delay, $connection, $action_text);
     }
   } elsif ( $action =~ /^(on|off)(?:[ \+](\d+))?$/ ) {
-    next if !$monitor->{Enabled};
+    if ( !$monitor->{Enabled} ) {
+      Info('Motion detection not enabled on monitor '.$id);
+      return;
+    }
 
     my $trigger = $1;
     my $delay = $2;
     my $trigger_data;
     if ( $trigger eq 'on' ) {
+      if ( $score <= 0 ) {
+        Warning('Triggering on with invalid score will have no result.');
+        return;
+      }
       zmTriggerEventOn($monitor, $score, $cause, $text);
       zmTriggerShowtext($monitor, $showtext) if defined($showtext);
       Info("Trigger '$trigger' '$cause'");
diff --git a/scripts/zmupdate.pl.in b/scripts/zmupdate.pl.in
index b89f6a8f8..8226af37d 100644
--- a/scripts/zmupdate.pl.in
+++ b/scripts/zmupdate.pl.in
@@ -40,10 +40,11 @@ configuring upgrades etc, including on the fly upgrades.
 -c, --check                      - Check for updated versions of ZoneMinder
 -f, --freshen                    - Freshen the configuration in the database. Equivalent of old zmconfig.pl -noi
 --migrate-events                 - Update database structures as per USE_DEEP_STORAGE setting.
--v<version>, --version=<version> - Force upgrade to the current version from <version>
--u<dbuser>, --user=<dbuser>      - Alternate DB user with privileges to alter DB
--p<dbpass>, --pass=<dbpass>      - Password of alternate DB user with privileges to alter DB
--d<dir>,--dir=<dir>              - Directory containing update files if not in default build location
+-v <version>, --version=<version> - Force upgrade to the current version from <version>
+-u <dbuser>, --user=<dbuser>      - Alternate DB user with privileges to alter DB
+-p <dbpass>, --pass=<dbpass>      - Password of alternate DB user with privileges to alter DB
+-s, --super                      - Use system maintenance account on debian based systems instead of unprivileged account
+-d <dir>, --dir=<dir>              - Directory containing update files if not in default build location
 -interactive                     - interact with the user
 -nointeractive                   - do not interact with the user
 
@@ -103,6 +104,7 @@ my $migrateEvents = 0;
 my $version = '';
 my $dbUser = $Config{ZM_DB_USER};
 my $dbPass = $Config{ZM_DB_PASS};
+my $super = 0;
 my $updateDir = '';
 
 GetOptions(
@@ -115,6 +117,7 @@ GetOptions(
     'interactive!'   =>\$interactive,
     'user:s'         =>\$dbUser,
     'pass:s'         =>\$dbPass,
+    'super'          =>\$super,
     'dir:s'          =>\$updateDir
     ) or pod2usage(-exitstatus => -1);
 
@@ -406,6 +409,12 @@ if ( $version ) {
     if ( $response =~ /^[yY]$/ ) {
       my ( $host, $portOrSocket ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ );
       my $command = 'mysqldump';
+      if ($super) {
+        $command .= ' --defaults-file=/etc/mysql/debian.cnf';
+      } elsif ($dbUser) {
+        $command .= ' -u'.$dbUser;
+        $command .= ' -p\''.$dbPass.'\'' if $dbPass;
+      }
       if ( defined($portOrSocket) ) {
         if ( $portOrSocket =~ /^\// ) {
           $command .= ' -S'.$portOrSocket;
@@ -415,10 +424,6 @@ if ( $version ) {
       } else {
         $command .= ' -h'.$host; 
       }
-      if ( $dbUser ) {
-        $command .= ' -u'.$dbUser;
-        $command .= ' -p\''.$dbPass.'\'' if $dbPass;
-      }
       my $backup = '@ZM_TMPDIR@/'.$Config{ZM_DB_NAME}.'-'.$version.'.dump';
       $command .= ' --add-drop-table --databases '.$Config{ZM_DB_NAME}.' > '.$backup;
       print("Creating backup to $backup. This may take several minutes.\n");
@@ -1001,6 +1006,12 @@ sub patchDB {
 
   my ( $host, $portOrSocket ) = ( $Config{ZM_DB_HOST} =~ /^([^:]+)(?::(.+))?$/ ) if $Config{ZM_DB_HOST};
   my $command = 'mysql';
+  if ($super) {
+    $command .= ' --defaults-file=/etc/mysql/debian.cnf';
+  } elsif ($dbUser) {
+    $command .= ' -u'.$dbUser;
+    $command .= ' -p\''.$dbPass.'\'' if $dbPass;
+  }
   if ( defined($portOrSocket) ) {
     if ( $portOrSocket =~ /^\// ) {
       $command .= ' -S'.$portOrSocket;
@@ -1010,10 +1021,6 @@ sub patchDB {
   } elsif ( $host ) {
     $command .= ' -h'.$host;
   }
-  if ( $dbUser ) {
-    $command .= ' -u'.$dbUser;
-    $command .= ' -p\''.$dbPass.'\'' if $dbPass;
-  }
   $command .= ' '.$Config{ZM_DB_NAME}.' < ';
   if ( $updateDir ) {
     $command .= $updateDir;
diff --git a/scripts/zmvideo.pl.in b/scripts/zmvideo.pl.in
index 04cfabb04..c676eb164 100644
--- a/scripts/zmvideo.pl.in
+++ b/scripts/zmvideo.pl.in
@@ -201,7 +201,7 @@ if ( $event_id ) {
 
 my $sql = " SELECT (SELECT max(Delta) FROM Frames WHERE EventId=Events.Id)-(SELECT min(Delta) FROM Frames WHERE EventId=Events.Id) as FullLength,
    Events.*,
-   unix_timestamp(Events.StartTime) as Time,
+   unix_timestamp(Events.StartDateTime) as Time,
    M.Name as MonitorName,
    M.Palette
    FROM Events
diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 1302039ee..f1fbd16b4 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -68,6 +68,13 @@ delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 logInit();
 logSetSignal();
+my $zm_terminate = 0;
+sub TermHandler {
+  Info('Received TERM, exiting');
+  $zm_terminate = 1;
+}
+$SIG{TERM} = \&TermHandler;
+$SIG{INT} = \&TermHandler;
 
 Info('Watchdog starting, pausing for '.START_DELAY.' seconds');
 sleep(START_DELAY);
@@ -77,7 +84,7 @@ my $sql = $Config{ZM_SERVER_ID} ? 'SELECT * FROM Monitors WHERE ServerId=?' : 'S
 my $sth = $dbh->prepare_cached($sql)
     or Fatal("Can't prepare '$sql': ".$dbh->errstr());
 
-while( 1 ) {
+while (!$zm_terminate) {
   while ( ! ( $dbh and $dbh->ping() ) ) {
     if ( ! ( $dbh = zmDbConnect() ) ) {
       sleep($Config{ZM_WATCH_CHECK_INTERVAL});
@@ -123,7 +130,7 @@ while( 1 ) {
         ) ? (3/$monitor->{MaxFPS})
         : $Config{ZM_WATCH_MAX_DELAY}
         ;
-        my $image_delay = $now-$capture_time;
+        my $image_delay = $now - $capture_time;
         Debug("Monitor $monitor->{Id} last captured $image_delay seconds ago, max is $max_image_delay");
         if ( $image_delay > $max_image_delay ) {
           Warning("Restarting capture daemon for "
@@ -138,9 +145,6 @@ while( 1 ) {
     }
 
     if ( $restart ) {
-      # Because zma depends on zmc, and zma can hold the shm in place, preventing zmc from using the space in /dev/shm,
-      # we need to stop zma before restarting zmc.
-      runCommand("zmdc.pl stop zma -m $$monitor{Id}") if $monitor->{Function} ne 'Monitor';
       my $command;
       if ( $monitor->{Type} eq 'Local' ) {
         $command = "zmdc.pl restart zmc -d $monitor->{Device}";
@@ -148,7 +152,6 @@ while( 1 ) {
         $command = "zmdc.pl restart zmc -m $monitor->{Id}";
       }
       runCommand($command);
-      runCommand("zmdc.pl start zma -m $$monitor{Id}") if $monitor->{Function} ne 'Monitor';
     } elsif ( $monitor->{Function} ne 'Monitor' ) {
 # Now check analysis daemon
       $restart = 0;
@@ -160,7 +163,7 @@ while( 1 ) {
         Error("Error reading shared data for $$monitor{Id} $$monitor{Name}");
       } elsif ( !$image_time ) {
 # We can't get the last capture time so can't be sure it's died.
-        $restart = 1;
+        #$restart = 1;
         Error("Last analyse time for $$monitor{Id} $$monitor{Name} was zero.");
       } else {
 
@@ -181,8 +184,13 @@ while( 1 ) {
       }
 
       if ( $restart ) {
-        Info("Restarting analysis daemon for $$monitor{Id} $$monitor{Name}");
-        my $command = 'zmdc.pl restart zma -m '.$monitor->{Id};
+        Info("Restarting analysis daemon for $$monitor{Id} $$monitor{Name}\n");
+        my $command;
+        if ( $monitor->{Type} eq 'Local' ) {
+          $command = "zmdc.pl restart zmc -d $monitor->{Device}";
+        } else {
+          $command = "zmdc.pl restart zmc -m $monitor->{Id}";
+        }
         runCommand($command);
       } # end if restart
     } # end if check analysis daemon
@@ -191,7 +199,7 @@ while( 1 ) {
   } # end foreach monitor
 
   sleep($Config{ZM_WATCH_CHECK_INTERVAL});
-} # end while (1)
+} # end while (!$zm_terminate)
 
 Info("Watchdog exiting");
 exit();
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bf7bf0bc5..281c7ba34 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,37 +1,141 @@
 # CMakeLists.txt for the ZoneMinder binaries
 
 # Create files from the .in files
-configure_file(zm_config_data.h.in "${CMAKE_CURRENT_BINARY_DIR}/zm_config_data.h" @ONLY)
-
-# Group together all the source files that are used by all the binaries (zmc, zma, zmu, zms etc)
-set(ZM_BIN_SRC_FILES zm_box.cpp zm_buffer.cpp zm_camera.cpp zm_comms.cpp zm_config.cpp zm_coord.cpp zm_curl_camera.cpp zm.cpp zm_db.cpp zm_logger.cpp zm_event.cpp zm_frame.cpp zm_eventstream.cpp zm_exception.cpp zm_file_camera.cpp zm_ffmpeg_input.cpp zm_ffmpeg_camera.cpp zm_group.cpp zm_image.cpp zm_jpeg.cpp zm_libvlc_camera.cpp zm_libvnc_camera.cpp zm_local_camera.cpp zm_monitor.cpp zm_monitorstream.cpp zm_ffmpeg.cpp zm_mpeg.cpp zm_packet.cpp zm_packetqueue.cpp zm_poly.cpp zm_regexp.cpp zm_remote_camera.cpp zm_remote_camera_http.cpp zm_remote_camera_nvsocket.cpp zm_remote_camera_rtsp.cpp zm_rtp.cpp zm_rtp_ctrl.cpp zm_rtp_data.cpp zm_rtp_source.cpp zm_rtsp.cpp zm_rtsp_auth.cpp zm_sdp.cpp zm_signal.cpp zm_stream.cpp zm_swscale.cpp zm_thread.cpp zm_time.cpp zm_timer.cpp zm_user.cpp zm_utils.cpp zm_video.cpp zm_videostore.cpp zm_zone.cpp zm_storage.cpp zm_fifo.cpp zm_crypt.cpp)
+configure_file(zm_config_data.h.in "${CMAKE_BINARY_DIR}/zm_config_data.h" @ONLY)
 
+# Group together all the source files that are used by all the binaries (zmc, zmu, zms etc)
+set(ZM_BIN_SRC_FILES
+  zm_analysis_thread.cpp
+  zm_box.cpp
+  zm_buffer.cpp
+  zm_camera.cpp
+  zm_comms.cpp
+  zm_config.cpp
+  zm_coord.cpp
+  zm_curl_camera.cpp
+  zm_crypt.cpp
+  zm.cpp
+  zm_db.cpp
+  zm_decoder_thread.cpp
+  zm_logger.cpp
+  zm_event.cpp
+  zm_eventstream.cpp
+  zm_exception.cpp
+  zm_fifo.cpp
+  zm_fifo_debug.cpp
+  zm_fifo_stream.cpp
+  zm_file_camera.cpp
+  zm_font.cpp
+  zm_frame.cpp
+  zm_group.cpp
+  zm_image.cpp
+  zm_jpeg.cpp
+  zm_libvlc_camera.cpp
+  zm_libvnc_camera.cpp
+  zm_local_camera.cpp
+  zm_monitor.cpp
+  zm_monitorstream.cpp
+  zm_ffmpeg.cpp
+  zm_ffmpeg_camera.cpp
+  zm_ffmpeg_input.cpp
+  zm_mpeg.cpp
+  zm_packet.cpp
+  zm_packetqueue.cpp
+  zm_poly.cpp
+  zm_regexp.cpp
+  zm_remote_camera.cpp
+  zm_remote_camera_http.cpp
+  zm_remote_camera_nvsocket.cpp
+  zm_remote_camera_rtsp.cpp
+  zm_rtp.cpp
+  zm_rtp_ctrl.cpp
+  zm_rtp_data.cpp
+  zm_rtp_source.cpp
+  zm_rtsp.cpp
+  zm_rtsp_auth.cpp
+  zm_rtsp_server_fifo_source.cpp
+  zm_rtsp_server_fifo_adts_source.cpp
+  zm_rtsp_server_fifo_h264_source.cpp
+  zm_rtsp_server_fifo_audio_source.cpp
+  zm_rtsp_server_fifo_video_source.cpp
+  zm_sdp.cpp
+  zm_signal.cpp
+  zm_stream.cpp
+  zm_swscale.cpp
+  zm_time.cpp
+  zm_user.cpp
+  zm_utils.cpp
+  zm_videostore.cpp
+  zm_zone.cpp
+  zm_storage.cpp)
 
 # A fix for cmake recompiling the source files for every target.
 add_library(zm STATIC ${ZM_BIN_SRC_FILES})
-link_directories(libbcrypt)
+
+target_include_directories(zm
+  PUBLIC
+    ${CMAKE_BINARY_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(zm
+  PUBLIC
+    libbcrypt::bcrypt
+    jwt-cpp::jwt-cpp
+    RtspServer::RtspServer
+    martinmoene::span-lite
+  PRIVATE
+    zm-core-interface)
 
 add_executable(zmc zmc.cpp)
-add_executable(zma zma.cpp)
-add_executable(zmu zmu.cpp)
 add_executable(zms zms.cpp)
+add_executable(zmu zmu.cpp)
 
-# JWT is a header only library. 
-include_directories(libbcrypt/include/bcrypt)
-include_directories(jwt-cpp/include/jwt-cpp)
+target_link_libraries(zmc
+  PRIVATE
+    zm-core-interface
+    zm
+    ${ZM_EXTRA_LIBS}
+    ${ZM_BIN_LIBS}
+    ${CMAKE_DL_LIBS})
 
-target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})
-target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS})
-target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS} bcrypt)
-target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS} ${CMAKE_DL_LIBS} bcrypt)
+target_link_libraries(zms
+  PRIVATE
+    zm-core-interface
+    zm
+    ${ZM_EXTRA_LIBS}
+    ${ZM_BIN_LIBS}
+    ${CMAKE_DL_LIBS})
+
+target_link_libraries(zmu
+  PRIVATE
+    zm-core-interface
+    zm
+    ${ZM_EXTRA_LIBS}
+    ${ZM_BIN_LIBS}
+    ${CMAKE_DL_LIBS}
+    bcrypt)
 
 # Generate man files for the binaries destined for the bin folder
-FOREACH(CBINARY zma zmc zmu)
+if(BUILD_MAN)
+  foreach(CBINARY zmc zmu)
     POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp ${CBINARY} 8 ${ZM_MANPAGE_DEST_PREFIX})
-ENDFOREACH(CBINARY zma zmc zmu)
+  endforeach(CBINARY zmc zmu)
+endif()
 
-install(TARGETS zmc zma zmu RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(TARGETS zmc zmu RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(TARGETS zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})" )
+install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})")
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nph-zms DESTINATION "${ZM_CGIDIR}")
 
+if(HAVE_RTSP_SERVER)
+  add_executable(zm_rtsp_server zm_rtsp_server.cpp)
+  target_link_libraries(zm_rtsp_server
+    PRIVATE
+      zm-core-interface
+      zm
+      ${ZM_EXTRA_LIBS}
+      ${ZM_BIN_LIBS}
+      ${CMAKE_DL_LIBS}
+      bcrypt)
+  install(TARGETS zm_rtsp_server RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+endif()
diff --git a/src/jwt-cpp/BaseTest.cpp b/src/jwt-cpp/BaseTest.cpp
deleted file mode 100644
index aceeb38d4..000000000
--- a/src/jwt-cpp/BaseTest.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <gtest/gtest.h>
-#include "include/jwt-cpp/base.h"
-
-TEST(BaseTest, Base64Decode) {
-	ASSERT_EQ("1", jwt::base::decode<jwt::alphabet::base64>("MQ=="));
-	ASSERT_EQ("12", jwt::base::decode<jwt::alphabet::base64>("MTI="));
-	ASSERT_EQ("123", jwt::base::decode<jwt::alphabet::base64>("MTIz"));
-	ASSERT_EQ("1234", jwt::base::decode<jwt::alphabet::base64>("MTIzNA=="));
-}
-
-TEST(BaseTest, Base64DecodeURL) {
-	ASSERT_EQ("1", jwt::base::decode<jwt::alphabet::base64url>("MQ%3d%3d"));
-	ASSERT_EQ("12", jwt::base::decode<jwt::alphabet::base64url>("MTI%3d"));
-	ASSERT_EQ("123", jwt::base::decode<jwt::alphabet::base64url>("MTIz"));
-	ASSERT_EQ("1234", jwt::base::decode<jwt::alphabet::base64url>("MTIzNA%3d%3d"));
-}
-
-TEST(BaseTest, Base64Encode) {
-	ASSERT_EQ("MQ==", jwt::base::encode<jwt::alphabet::base64>("1"));
-	ASSERT_EQ("MTI=", jwt::base::encode<jwt::alphabet::base64>("12"));
-	ASSERT_EQ("MTIz", jwt::base::encode<jwt::alphabet::base64>("123"));
-	ASSERT_EQ("MTIzNA==", jwt::base::encode<jwt::alphabet::base64>("1234"));
-}
-
-TEST(BaseTest, Base64EncodeURL) {
-	ASSERT_EQ("MQ%3d%3d", jwt::base::encode<jwt::alphabet::base64url>("1"));
-	ASSERT_EQ("MTI%3d", jwt::base::encode<jwt::alphabet::base64url>("12"));
-	ASSERT_EQ("MTIz", jwt::base::encode<jwt::alphabet::base64url>("123"));
-	ASSERT_EQ("MTIzNA%3d%3d", jwt::base::encode<jwt::alphabet::base64url>("1234"));
-}
\ No newline at end of file
diff --git a/src/jwt-cpp/ClaimTest.cpp b/src/jwt-cpp/ClaimTest.cpp
deleted file mode 100644
index 749edf2ef..000000000
--- a/src/jwt-cpp/ClaimTest.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-#include <gtest/gtest.h>
-#include "include/jwt-cpp/jwt.h"
-
-TEST(ClaimTest, AudienceAsString) {
-	std::string token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJ0ZXN0In0.WZnM3SIiSRHsbO3O7Z2bmIzTJ4EC32HRBKfLznHhrh4";
-	auto decoded = jwt::decode(token);
-
-	ASSERT_TRUE(decoded.has_algorithm());
-	ASSERT_TRUE(decoded.has_type());
-	ASSERT_FALSE(decoded.has_content_type());
-	ASSERT_FALSE(decoded.has_key_id());
-	ASSERT_FALSE(decoded.has_issuer());
-	ASSERT_FALSE(decoded.has_subject());
-	ASSERT_TRUE(decoded.has_audience());
-	ASSERT_FALSE(decoded.has_expires_at());
-	ASSERT_FALSE(decoded.has_not_before());
-	ASSERT_FALSE(decoded.has_issued_at());
-	ASSERT_FALSE(decoded.has_id());
-
-	ASSERT_EQ("HS256", decoded.get_algorithm());
-	ASSERT_EQ("JWT", decoded.get_type());
-	auto aud = decoded.get_audience();
-	ASSERT_EQ(1, aud.size());
-	ASSERT_EQ("test", *aud.begin());
-}
-
-TEST(ClaimTest, SetAudienceAsString) {
-	auto token = jwt::create()
-		.set_type("JWT")
-		.set_audience("test")
-		.sign(jwt::algorithm::hs256("test"));
-	ASSERT_EQ("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJhdWQiOiJ0ZXN0In0.ny5Fa0vzAg7tNL95KWg_ecBNd3XP3tdAzq0SFA6diY4", token);
-}
diff --git a/src/jwt-cpp/HelperTest.cpp b/src/jwt-cpp/HelperTest.cpp
deleted file mode 100644
index f998e1289..000000000
--- a/src/jwt-cpp/HelperTest.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-#include <gtest/gtest.h>
-#include "include/jwt-cpp/jwt.h"
-
-namespace {
-    extern std::string google_cert;
-    extern std::string google_cert_key;
-}
-
-TEST(HelperTest, Cert2Pubkey) {
-    auto key = jwt::helper::extract_pubkey_from_cert(google_cert);
-    ASSERT_EQ(google_cert_key, key);
-}
-
-namespace {
-    std::string google_cert = R"(-----BEGIN CERTIFICATE-----
-MIIF8DCCBVmgAwIBAgIKYFOB9QABAACIvTANBgkqhkiG9w0BAQUFADBGMQswCQYD
-VQQGEwJVUzETMBEGA1UEChMKR29vZ2xlIEluYzEiMCAGA1UEAxMZR29vZ2xlIElu
-dGVybmV0IEF1dGhvcml0eTAeFw0xMzA1MjIxNTQ5MDRaFw0xMzEwMzEyMzU5NTla
-MGYxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1N
-b3VudGFpbiBWaWV3MRMwEQYDVQQKEwpHb29nbGUgSW5jMRUwEwYDVQQDFAwqLmdv
-b2dsZS5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAARmSpIUbCqhUBq1UwnR
-Ai7/TNSk6W8JmasR+I0r/NLDYv5yApbAz8HXXN8hDdurMRP6Jy1Q0UIKmyls8HPH
-exoCo4IECjCCBAYwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAsGA1Ud
-DwQEAwIHgDAdBgNVHQ4EFgQUU3jT0NVNRgU5ZinRHGrlyoGEnoYwHwYDVR0jBBgw
-FoAUv8Aw6/VDET5nup6R+/xq2uNrEiQwWwYDVR0fBFQwUjBQoE6gTIZKaHR0cDov
-L3d3dy5nc3RhdGljLmNvbS9Hb29nbGVJbnRlcm5ldEF1dGhvcml0eS9Hb29nbGVJ
-bnRlcm5ldEF1dGhvcml0eS5jcmwwZgYIKwYBBQUHAQEEWjBYMFYGCCsGAQUFBzAC
-hkpodHRwOi8vd3d3LmdzdGF0aWMuY29tL0dvb2dsZUludGVybmV0QXV0aG9yaXR5
-L0dvb2dsZUludGVybmV0QXV0aG9yaXR5LmNydDAMBgNVHRMBAf8EAjAAMIICwwYD
-VR0RBIICujCCAraCDCouZ29vZ2xlLmNvbYINKi5hbmRyb2lkLmNvbYIWKi5hcHBl
-bmdpbmUuZ29vZ2xlLmNvbYISKi5jbG91ZC5nb29nbGUuY29tghYqLmdvb2dsZS1h
-bmFseXRpY3MuY29tggsqLmdvb2dsZS5jYYILKi5nb29nbGUuY2yCDiouZ29vZ2xl
-LmNvLmlugg4qLmdvb2dsZS5jby5qcIIOKi5nb29nbGUuY28udWuCDyouZ29vZ2xl
-LmNvbS5hcoIPKi5nb29nbGUuY29tLmF1gg8qLmdvb2dsZS5jb20uYnKCDyouZ29v
-Z2xlLmNvbS5jb4IPKi5nb29nbGUuY29tLm14gg8qLmdvb2dsZS5jb20udHKCDyou
-Z29vZ2xlLmNvbS52boILKi5nb29nbGUuZGWCCyouZ29vZ2xlLmVzggsqLmdvb2ds
-ZS5mcoILKi5nb29nbGUuaHWCCyouZ29vZ2xlLml0ggsqLmdvb2dsZS5ubIILKi5n
-b29nbGUucGyCCyouZ29vZ2xlLnB0gg8qLmdvb2dsZWFwaXMuY26CFCouZ29vZ2xl
-Y29tbWVyY2UuY29tgg0qLmdzdGF0aWMuY29tggwqLnVyY2hpbi5jb22CECoudXJs
-Lmdvb2dsZS5jb22CFioueW91dHViZS1ub2Nvb2tpZS5jb22CDSoueW91dHViZS5j
-b22CFioueW91dHViZWVkdWNhdGlvbi5jb22CCyoueXRpbWcuY29tggthbmRyb2lk
-LmNvbYIEZy5jb4IGZ29vLmdsghRnb29nbGUtYW5hbHl0aWNzLmNvbYIKZ29vZ2xl
-LmNvbYISZ29vZ2xlY29tbWVyY2UuY29tggp1cmNoaW4uY29tggh5b3V0dS5iZYIL
-eW91dHViZS5jb22CFHlvdXR1YmVlZHVjYXRpb24uY29tMA0GCSqGSIb3DQEBBQUA
-A4GBAAMn0K3j3yhC+X+uyh6eABa2Eq7xiY5/mUB886Ir19vxluSMNKD6n/iY8vHj
-trn0BhuW8/vmJyudFkIcEDUYE4ivQMlsfIL7SOGw6OevVLmm02aiRHWj5T20Ds+S
-OpueYUG3NBcHP/5IzhUYIQJbGzlQaUaZBMaQeC8ZslMNLWI2
------END CERTIFICATE-----)";
-
-    std::string google_cert_key = R"(-----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEZkqSFGwqoVAatVMJ0QIu/0zUpOlv
-CZmrEfiNK/zSw2L+cgKWwM/B11zfIQ3bqzET+ictUNFCCpspbPBzx3saAg==
------END PUBLIC KEY-----
-)";
-}
\ No newline at end of file
diff --git a/src/jwt-cpp/README.md b/src/jwt-cpp/README.md
deleted file mode 100644
index 7636f9f67..000000000
--- a/src/jwt-cpp/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# jwt-cpp
-
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/5f7055e294744901991fd0a1620b231d)](https://app.codacy.com/app/Thalhammer/jwt-cpp?utm_source=github.com&utm_medium=referral&utm_content=Thalhammer/jwt-cpp&utm_campaign=Badge_Grade_Settings)
-
-A header only library for creating and validating json web tokens in c++.
-
-## Signature algorithms
-As of version 0.2.0 jwt-cpp supports all algorithms defined by the spec. The modular design of jwt-cpp allows one to add additional algorithms without any problems. If you need any feel free to open a pull request.
-For the sake of completeness, here is a list of all supported algorithms:
-* HS256
-* HS384
-* HS512
-* RS256
-* RS384
-* RS512
-* ES256
-* ES384
-* ES512
-* PS256
-* PS384
-* PS512
-
-## Examples
-Simple example of decoding a token and printing all claims:
-```c++
-#include <jwt-cpp/jwt.h>
-#include <iostream>
-
-int main(int argc, const char** argv) {
-	std::string token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.AbIJTDMFc7yUa5MhvcP03nJPyCPzZtQcGEp-zWfOkEE";
-	auto decoded = jwt::decode(token);
-
-	for(auto& e : decoded.get_payload_claims())
-		std::cout << e.first << " = " << e.second.to_json() << std::endl;
-}
-```
-
-In order to verify a token you first build a verifier and use it to verify a decoded token.
-```c++
-auto verifier = jwt::verify()
-	.allow_algorithm(jwt::algorithm::hs256{ "secret" })
-	.with_issuer("auth0");
-
-verifier.verify(decoded_token);
-```
-The created verifier is stateless so you can reuse it for different tokens.
-
-Creating a token (and signing) is equally easy.
-```c++
-auto token = jwt::create()
-	.set_issuer("auth0")
-	.set_type("JWS")
-	.set_payload_claim("sample", std::string("test"))
-	.sign(jwt::algorithm::hs256{"secret"});
-```
-
-Here is a simple example of creating a token that will expire in 2 hours:
-
-```c++
-
-	// Note to @Thalhammer: please replace with a better example if this is not a good way
-        auto token = jwt::create()
-         .set_issuer("auth0")
-         .set_issued_at(jwt::date(std::chrono::system_clock::now()))
-         .set_expires_at(jwt::date(std::chrono::system_clock::now()+ std::chrono::seconds{3600}))
-         .sign(jwt::algorithm::hs256{"secret"}
-
-
-```
-
-## Contributing
-If you have an improvement or found a bug feel free to [open an issue](https://github.com/Thalhammer/jwt-cpp/issues/new) or add the change and create a pull request. If you file a bug please make sure to include as much information about your environment (compiler version, etc.) as possible to help reproduce the issue. If you add a new feature please make sure to also include test cases for it.
-
-## Dependencies
-In order to use jwt-cpp you need the following tools.
-* libcrypto (openssl or compatible)
-* libssl-dev (for the header files)
-* a compiler supporting at least c++11
-* basic stl support
-
-In order to build the test cases you also need
-* gtest installed in linker path
-* pthread
-
-## Troubleshooting
-#### Expired tokens
-If you are generating tokens that seem to immediately expire, you are likely not using UTC. Specifically,
-if you use `get_time` to get the current time, it likely uses localtime, while this library uses UTC, which may be why your token is immediately expiring. Please see example above on the right way to use current time.
-
-#### Missing _HMAC amd _EVP_sha256 symbols on Mac
-There seems to exists a problem with the included openssl library of MacOS. Make sure you link to one provided by brew.
-See [here](https://github.com/Thalhammer/jwt-cpp/issues/6) for more details.
-#### Building on windows fails with syntax errors
-The header "Windows.h", which is often included in windowsprojects, defines macros for MIN and MAX which screw up std::numeric_limits.
-See [here](https://github.com/Thalhammer/jwt-cpp/issues/5) for more details. To fix this do one of the following things:
-* define NOMINMAX, which suppresses this behaviour
-* include this library before you include windows.h
-* place ```#undef max``` and ```#undef min``` before you include this library
diff --git a/src/jwt-cpp/TestMain.cpp b/src/jwt-cpp/TestMain.cpp
deleted file mode 100644
index b8b7262bc..000000000
--- a/src/jwt-cpp/TestMain.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <gtest/gtest.h>
-
-int main(int argc, char *argv[])
-{
-	::testing::InitGoogleTest(&argc, argv);
-	return RUN_ALL_TESTS();
-}
\ No newline at end of file
diff --git a/src/jwt-cpp/TokenFormatTest.cpp b/src/jwt-cpp/TokenFormatTest.cpp
deleted file mode 100644
index e670a82c8..000000000
--- a/src/jwt-cpp/TokenFormatTest.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include <gtest/gtest.h>
-#include "include/jwt-cpp/jwt.h"
-
-TEST(TokenFormatTest, MissingDot) {
-	ASSERT_THROW(jwt::decode("eyJhbGciOiJub25lIiwidHlwIjoiSldTIn0.eyJpc3MiOiJhdXRoMCJ9"), std::invalid_argument);
-	ASSERT_THROW(jwt::decode("eyJhbGciOiJub25lIiwidHlwIjoiSldTIn0eyJpc3MiOiJhdXRoMCJ9."), std::invalid_argument);
-}
-
-TEST(TokenFormatTest, InvalidChar) {
-	ASSERT_THROW(jwt::decode("eyJhbGciOiJub25lIiwidHlwIjoiSldTIn0().eyJpc3MiOiJhdXRoMCJ9."), std::runtime_error);
-}
-
-TEST(TokenFormatTest, InvalidJSON) {
-	ASSERT_THROW(jwt::decode("YXsiYWxnIjoibm9uZSIsInR5cCI6IkpXUyJ9YQ.eyJpc3MiOiJhdXRoMCJ9."), std::runtime_error);
-}
\ No newline at end of file
diff --git a/src/jwt-cpp/TokenTest.cpp b/src/jwt-cpp/TokenTest.cpp
deleted file mode 100644
index 6d2d004c3..000000000
--- a/src/jwt-cpp/TokenTest.cpp
+++ /dev/null
@@ -1,420 +0,0 @@
-#include <gtest/gtest.h>
-#include "include/jwt-cpp/jwt.h"
-
-namespace {
-	extern std::string rsa_priv_key;
-	extern std::string rsa_pub_key;
-	extern std::string rsa_pub_key_invalid;
-	extern std::string rsa512_priv_key;
-	extern std::string rsa512_pub_key;
-	extern std::string rsa512_pub_key_invalid;
-	extern std::string ecdsa_priv_key;
-	extern std::string ecdsa_pub_key;
-	extern std::string ecdsa_pub_key_invalid;
-}
-
-TEST(TokenTest, DecodeToken) {
-	std::string token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.AbIJTDMFc7yUa5MhvcP03nJPyCPzZtQcGEp-zWfOkEE";
-	auto decoded = jwt::decode(token);
-
-	ASSERT_TRUE(decoded.has_algorithm());
-	ASSERT_TRUE(decoded.has_type());
-	ASSERT_FALSE(decoded.has_content_type());
-	ASSERT_FALSE(decoded.has_key_id());
-	ASSERT_TRUE(decoded.has_issuer());
-	ASSERT_FALSE(decoded.has_subject());
-	ASSERT_FALSE(decoded.has_audience());
-	ASSERT_FALSE(decoded.has_expires_at());
-	ASSERT_FALSE(decoded.has_not_before());
-	ASSERT_FALSE(decoded.has_issued_at());
-	ASSERT_FALSE(decoded.has_id());
-
-	ASSERT_EQ("HS256", decoded.get_algorithm());
-	ASSERT_EQ("JWS", decoded.get_type());
-	ASSERT_EQ("auth0", decoded.get_issuer());
-}
-
-TEST(TokenTest, CreateToken) {
-	auto token = jwt::create()
-		.set_issuer("auth0")
-		.set_type("JWS")
-		.sign(jwt::algorithm::none{});
-	ASSERT_EQ("eyJhbGciOiJub25lIiwidHlwIjoiSldTIn0.eyJpc3MiOiJhdXRoMCJ9.", token);
-}
-
-TEST(TokenTest, CreateTokenHS256) {
-	auto token = jwt::create()
-		.set_issuer("auth0")
-		.set_type("JWS")
-		.sign(jwt::algorithm::hs256{"secret"});
-	ASSERT_EQ("eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.AbIJTDMFc7yUa5MhvcP03nJPyCPzZtQcGEp-zWfOkEE", token);
-}
-
-TEST(TokenTest, CreateTokenRS256) {
-	auto token = jwt::create()
-		.set_issuer("auth0")
-		.set_type("JWS")
-		.sign(jwt::algorithm::rs256(rsa_pub_key, rsa_priv_key, "", ""));
-
-	ASSERT_EQ(
-		"eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.VA2i1ui1cnoD6I3wnji1WAVCf29EekysvevGrT2GXqK1dDMc8"
-		"HAZCTQxa1Q8NppnpYV-hlqxh-X3Bb0JOePTGzjynpNZoJh2aHZD-GKpZt7OO1Zp8AFWPZ3p8Cahq8536fD8RiBES9jRsvChZvOqA7gMcFc4"
-		"YD0iZhNIcI7a654u5yPYyTlf5kjR97prCf_OXWRn-bYY74zna4p_bP9oWCL4BkaoRcMxi-IR7kmVcCnvbYqyIrKloXP2qPO442RBGqU7Ov9"
-		"sGQxiVqtRHKXZR9RbfvjrErY1KGiCp9M5i2bsUHadZEY44FE2jiOmx-uc2z5c05CCXqVSpfCjWbh9gQ", token);
-}
-
-TEST(TokenTest, CreateTokenRS512) {
-	auto token = jwt::create()
-		.set_issuer("auth0")
-		.set_type("JWS")
-		.sign(jwt::algorithm::rs512(rsa512_pub_key, rsa512_priv_key, "", ""));
-
-	ASSERT_EQ(
-		"eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.GZhnjtsvBl2_KDSxg4JW6xnmNjr2mWhYSZSSQyLKvI0"
-		"TK86sJKchkt_HDy2IC5l5BGRhq_Xv9pHdA1umidQZG3a7gWvHsujqybCBgBraMTd1wJrCl4QxFg2RYHhHbRqb9BnPJgFD_vryd4GB"
-		"hfGgejPBCBlGrQtqFGFdHHOjNHY", token);
-}
-
-TEST(TokenTest, CreateTokenPS256) {
-	auto token = jwt::create()
-		.set_issuer("auth0")
-		.set_type("JWS")
-		.sign(jwt::algorithm::ps256(rsa_pub_key, rsa_priv_key, "", ""));
-
-	// TODO: Find a better way to check if generated signature is valid
-	// Can't do simple check for equal since pss adds random salt.
-}
-
-TEST(TokenTest, CreateTokenPS384) {
-	auto token = jwt::create()
-		.set_issuer("auth0")
-		.set_type("JWS")
-		.sign(jwt::algorithm::ps384(rsa_pub_key, rsa_priv_key, "", ""));
-
-	// TODO: Find a better way to check if generated signature is valid
-	// Can't do simple check for equal since pss adds random salt.
-}
-
-TEST(TokenTest, CreateTokenPS512) {
-	auto token = jwt::create()
-		.set_issuer("auth0")
-		.set_type("JWS")
-		.sign(jwt::algorithm::ps512(rsa_pub_key, rsa_priv_key, "", ""));
-
-	// TODO: Find a better way to check if generated signature is valid
-	// Can't do simple check for equal since pss adds random salt.
-}
-
-TEST(TokenTest, CreateTokenES256) {
-	
-	auto token = jwt::create()
-		.set_issuer("auth0")
-		.set_type("JWS")
-		.sign(jwt::algorithm::es256("", ecdsa_priv_key, "", ""));
-
-	auto decoded = jwt::decode(token);
-
-	ASSERT_THROW(jwt::verify().allow_algorithm(jwt::algorithm::es256(ecdsa_pub_key_invalid, "", "", "")).verify(decoded), jwt::signature_verification_exception);
-	ASSERT_NO_THROW(jwt::verify().allow_algorithm(jwt::algorithm::es256(ecdsa_pub_key, "", "", "")).verify(decoded));
-}
-
-TEST(TokenTest, CreateTokenES256NoPrivate) {
-	
-	ASSERT_THROW([](){
-		auto token = jwt::create()
-			.set_issuer("auth0")
-			.set_type("JWS")
-			.sign(jwt::algorithm::es256(ecdsa_pub_key, "", "", ""));
-	}(), jwt::signature_generation_exception);
-}
-
-TEST(TokenTest, VerifyTokenRS256) {
-	std::string token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.VA2i1ui1cnoD6I3wnji1WAVCf29EekysvevGrT2GXqK1dDMc8"
-		"HAZCTQxa1Q8NppnpYV-hlqxh-X3Bb0JOePTGzjynpNZoJh2aHZD-GKpZt7OO1Zp8AFWPZ3p8Cahq8536fD8RiBES9jRsvChZvOqA7gMcFc4"
-		"YD0iZhNIcI7a654u5yPYyTlf5kjR97prCf_OXWRn-bYY74zna4p_bP9oWCL4BkaoRcMxi-IR7kmVcCnvbYqyIrKloXP2qPO442RBGqU7Ov9"
-		"sGQxiVqtRHKXZR9RbfvjrErY1KGiCp9M5i2bsUHadZEY44FE2jiOmx-uc2z5c05CCXqVSpfCjWbh9gQ";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::rs256(rsa_pub_key, rsa_priv_key, "", ""))
-		.with_issuer("auth0");
-
-	auto decoded_token = jwt::decode(token);
-
-	verify.verify(decoded_token);
-}
-
-TEST(TokenTest, VerifyTokenRS256PublicOnly) {
-	std::string token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.VA2i1ui1cnoD6I3wnji1WAVCf29EekysvevGrT2GXqK1dDMc8"
-		"HAZCTQxa1Q8NppnpYV-hlqxh-X3Bb0JOePTGzjynpNZoJh2aHZD-GKpZt7OO1Zp8AFWPZ3p8Cahq8536fD8RiBES9jRsvChZvOqA7gMcFc4"
-		"YD0iZhNIcI7a654u5yPYyTlf5kjR97prCf_OXWRn-bYY74zna4p_bP9oWCL4BkaoRcMxi-IR7kmVcCnvbYqyIrKloXP2qPO442RBGqU7Ov9"
-		"sGQxiVqtRHKXZR9RbfvjrErY1KGiCp9M5i2bsUHadZEY44FE2jiOmx-uc2z5c05CCXqVSpfCjWbh9gQ";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::rs256(rsa_pub_key, "", "", ""))
-		.with_issuer("auth0");
-
-	auto decoded_token = jwt::decode(token);
-
-	verify.verify(decoded_token);
-}
-
-TEST(TokenTest, VerifyTokenRS256Fail) {
-	std::string token = "eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.VA2i1ui1cnoD6I3wnji1WAVCf29EekysvevGrT2GXqK1dDMc8"
-		"HAZCTQxa1Q8NppnpYV-hlqxh-X3Bb0JOePTGzjynpNZoJh2aHZD-GKpZt7OO1Zp8AFWPZ3p8Cahq8536fD8RiBES9jRsvChZvOqA7gMcFc4"
-		"YD0iZhNIcI7a654u5yPYyTlf5kjR97prCf_OXWRn-bYY74zna4p_bP9oWCL4BkaoRcMxi-IR7kmVcCnvbYqyIrKloXP2qPO442RBGqU7Ov9"
-		"sGQxiVqtRHKXZR9RbfvjrErY1KGiCp9M5i2bsUHadZEY44FE2jiOmx-uc2z5c05CCXqVSpfCjWbh9gQ";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::rs256(rsa_pub_key_invalid, "", "", ""))
-		.with_issuer("auth0");
-
-	auto decoded_token = jwt::decode(token);
-
-	ASSERT_THROW(verify.verify(decoded_token), jwt::signature_verification_exception);
-}
-
-TEST(TokenTest, VerifyTokenRS512) {
-	std::string token = "eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.GZhnjtsvBl2_KDSxg4JW6xnmNjr2mWhYSZ"
-		"SSQyLKvI0TK86sJKchkt_HDy2IC5l5BGRhq_Xv9pHdA1umidQZG3a7gWvHsujqybCBgBraMTd1wJrCl4QxFg2RYHhHbRqb9BnPJgFD_vryd4"
-		"GBhfGgejPBCBlGrQtqFGFdHHOjNHY";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::rs512(rsa512_pub_key, rsa512_priv_key, "", ""))
-		.with_issuer("auth0");
-
-	auto decoded_token = jwt::decode(token);
-
-	verify.verify(decoded_token);
-}
-
-TEST(TokenTest, VerifyTokenRS512PublicOnly) {
-	std::string token = "eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.GZhnjtsvBl2_KDSxg4JW6xnmNjr2mWhYSZ"
-		"SSQyLKvI0TK86sJKchkt_HDy2IC5l5BGRhq_Xv9pHdA1umidQZG3a7gWvHsujqybCBgBraMTd1wJrCl4QxFg2RYHhHbRqb9BnPJgFD_vryd4"
-		"GBhfGgejPBCBlGrQtqFGFdHHOjNHY";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::rs512(rsa512_pub_key, "", "", ""))
-		.with_issuer("auth0");
-
-	auto decoded_token = jwt::decode(token);
-
-	verify.verify(decoded_token);
-}
-
-TEST(TokenTest, VerifyTokenRS512Fail) {
-	std::string token = "eyJhbGciOiJSUzUxMiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.GZhnjtsvBl2_KDSxg4JW6xnmNjr2mWhYSZ"
-		"SSQyLKvI0TK86sJKchkt_HDy2IC5l5BGRhq_Xv9pHdA1umidQZG3a7gWvHsujqybCBgBraMTd1wJrCl4QxFg2RYHhHbRqb9BnPJgFD_vryd4"
-		"GBhfGgejPBCBlGrQtqFGFdHHOjNHY";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::rs512(rsa_pub_key_invalid, "", "", ""))
-		.with_issuer("auth0");
-
-	auto decoded_token = jwt::decode(token);
-
-	ASSERT_THROW(verify.verify(decoded_token), jwt::signature_verification_exception);
-}
-
-TEST(TokenTest, VerifyTokenHS256) {
-	std::string token = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.AbIJTDMFc7yUa5MhvcP03nJPyCPzZtQcGEp-zWfOkEE";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::hs256{ "secret" })
-		.with_issuer("auth0");
-
-	auto decoded_token = jwt::decode(token);
-	verify.verify(decoded_token);
-}
-
-TEST(TokenTest, VerifyFail) {
-	auto token = jwt::create()
-		.set_issuer("auth0")
-		.set_type("JWS")
-		.sign(jwt::algorithm::none{});
-
-	auto decoded_token = jwt::decode(token);
-
-	{
-		auto verify = jwt::verify()
-			.allow_algorithm(jwt::algorithm::none{})
-			.with_issuer("auth");
-		ASSERT_THROW(verify.verify(decoded_token), jwt::token_verification_exception);
-	}
-	{
-		auto verify = jwt::verify()
-			.allow_algorithm(jwt::algorithm::none{})
-			.with_issuer("auth0")
-			.with_audience({ "test" });
-		ASSERT_THROW(verify.verify(decoded_token), jwt::token_verification_exception);
-	}
-	{
-		auto verify = jwt::verify()
-			.allow_algorithm(jwt::algorithm::none{})
-			.with_issuer("auth0")
-			.with_subject("test");
-		ASSERT_THROW(verify.verify(decoded_token), jwt::token_verification_exception);
-	}
-	{
-		auto verify = jwt::verify()
-			.allow_algorithm(jwt::algorithm::none{})
-			.with_issuer("auth0")
-			.with_claim("myclaim", jwt::claim(std::string("test")));
-		ASSERT_THROW(verify.verify(decoded_token), jwt::token_verification_exception);
-	}
-}
-
-TEST(TokenTest, VerifyTokenES256) {
-	const std::string token = "eyJhbGciOiJFUzI1NiJ9.eyJpc3MiOiJhdXRoMCJ9.4iVk3-Y0v4RT4_9IaQlp-8dZ_4fsTzIylgrPTDLrEvTHBTyVS3tgPbr2_IZfLETtiKRqCg0aQ5sh9eIsTTwB1g";
-
-	auto verify = jwt::verify().allow_algorithm(jwt::algorithm::es256(ecdsa_pub_key, "", "", ""));
-	auto decoded_token = jwt::decode(token);
-
-	verify.verify(decoded_token);
-}
-
-TEST(TokenTest, VerifyTokenES256Fail) {
-	const std::string token = "eyJhbGciOiJFUzI1NiJ9.eyJpc3MiOiJhdXRoMCJ9.4iVk3-Y0v4RT4_9IaQlp-8dZ_4fsTzIylgrPTDLrEvTHBTyVS3tgPbr2_IZfLETtiKRqCg0aQ5sh9eIsTTwB1g";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::es256(ecdsa_pub_key_invalid, "", "", ""));
-	auto decoded_token = jwt::decode(token);
-
-	ASSERT_THROW(verify.verify(decoded_token), jwt::signature_verification_exception);
-}
-
-TEST(TokenTest, VerifyTokenPS256) {
-	std::string token = "eyJhbGciOiJQUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.CJ4XjVWdbV6vXGZkD4GdJbtYc80SN9cmPOqRhZBRzOyDRqTFE"
-		"4MsbdKyQuhAWcvuMOjn-24qOTjVMR_P_uTC1uG6WPLcucxZyLnbb56zbKnEklW2SX0mQnCGewr-93a_vDaFT6Cp45MsF_OwFPRCMaS5CJg-"
-		"N5KY67UrVSr3s9nkuK9ZTQkyODHfyEUh9F_FhRCATGrb5G7_qHqBYvTvaPUXqzhhpCjN855Tocg7A24Hl0yMwM-XdasucW5xNdKjG_YCkis"
-		"HX7ax--JiF5GNYCO61eLFteO4THUg-3Z0r4OlGqlppyWo5X5tjcxOZCvBh7WDWfkxA48KFZPRv0nlKA";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::ps256(rsa_pub_key, rsa_priv_key, "", ""))
-		.with_issuer("auth0");
-
-	auto decoded_token = jwt::decode(token);
-
-	verify.verify(decoded_token);
-}
-
-TEST(TokenTest, VerifyTokenPS256PublicOnly) {
-	std::string token = "eyJhbGciOiJQUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.CJ4XjVWdbV6vXGZkD4GdJbtYc80SN9cmPOqRhZBRzOyDRqTFE"
-		"4MsbdKyQuhAWcvuMOjn-24qOTjVMR_P_uTC1uG6WPLcucxZyLnbb56zbKnEklW2SX0mQnCGewr-93a_vDaFT6Cp45MsF_OwFPRCMaS5CJg-"
-		"N5KY67UrVSr3s9nkuK9ZTQkyODHfyEUh9F_FhRCATGrb5G7_qHqBYvTvaPUXqzhhpCjN855Tocg7A24Hl0yMwM-XdasucW5xNdKjG_YCkis"
-		"HX7ax--JiF5GNYCO61eLFteO4THUg-3Z0r4OlGqlppyWo5X5tjcxOZCvBh7WDWfkxA48KFZPRv0nlKA";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::ps256(rsa_pub_key, "", "", ""))
-		.with_issuer("auth0");
-
-	auto decoded_token = jwt::decode(token);
-
-	verify.verify(decoded_token);
-}
-
-TEST(TokenTest, VerifyTokenPS256Fail) {
-	std::string token = "eyJhbGciOiJQUzI1NiIsInR5cCI6IkpXUyJ9.eyJpc3MiOiJhdXRoMCJ9.CJ4XjVWdbV6vXGZkD4GdJbtYc80SN9cmPOqRhZBRzOyDRqTFE"
-		"4MsbdKyQuhAWcvuMOjn-24qOTjVMR_P_uTC1uG6WPLcucxZyLnbb56zbKnEklW2SX0mQnCGewr-93a_vDaFT6Cp45MsF_OwFPRCMaS5CJg-"
-		"N5KY67UrVSr3s9nkuK9ZTQkyODHfyEUh9F_FhRCATGrb5G7_qHqBYvTvaPUXqzhhpCjN855Tocg7A24Hl0yMwM-XdasucW5xNdKjG_YCkis"
-		"HX7ax--JiF5GNYCO61eLFteO4THUg-3Z0r4OlGqlppyWo5X5tjcxOZCvBh7WDWfkxA48KFZPRv0nlKA";
-
-	auto verify = jwt::verify()
-		.allow_algorithm(jwt::algorithm::ps256(rsa_pub_key_invalid, "", "", ""))
-		.with_issuer("auth0");
-
-	auto decoded_token = jwt::decode(token);
-
-	ASSERT_THROW(verify.verify(decoded_token), jwt::signature_verification_exception);
-}
-
-namespace {
-	std::string rsa_priv_key = R"(-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC4ZtdaIrd1BPIJ
-tfnF0TjIK5inQAXZ3XlCrUlJdP+XHwIRxdv1FsN12XyMYO/6ymLmo9ryoQeIrsXB
-XYqlET3zfAY+diwCb0HEsVvhisthwMU4gZQu6TYW2s9LnXZB5rVtcBK69hcSlA2k
-ZudMZWxZcj0L7KMfO2rIvaHw/qaVOE9j0T257Z8Kp2CLF9MUgX0ObhIsdumFRLaL
-DvDUmBPr2zuh/34j2XmWwn1yjN/WvGtdfhXW79Ki1S40HcWnygHgLV8sESFKUxxQ
-mKvPUTwDOIwLFL5WtE8Mz7N++kgmDcmWMCHc8kcOIu73Ta/3D4imW7VbKgHZo9+K
-3ESFE3RjAgMBAAECggEBAJTEIyjMqUT24G2FKiS1TiHvShBkTlQdoR5xvpZMlYbN
-tVWxUmrAGqCQ/TIjYnfpnzCDMLhdwT48Ab6mQJw69MfiXwc1PvwX1e9hRscGul36
-ryGPKIVQEBsQG/zc4/L2tZe8ut+qeaK7XuYrPp8bk/X1e9qK5m7j+JpKosNSLgJj
-NIbYsBkG2Mlq671irKYj2hVZeaBQmWmZxK4fw0Istz2WfN5nUKUeJhTwpR+JLUg4
-ELYYoB7EO0Cej9UBG30hbgu4RyXA+VbptJ+H042K5QJROUbtnLWuuWosZ5ATldwO
-u03dIXL0SH0ao5NcWBzxU4F2sBXZRGP2x/jiSLHcqoECgYEA4qD7mXQpu1b8XO8U
-6abpKloJCatSAHzjgdR2eRDRx5PMvloipfwqA77pnbjTUFajqWQgOXsDTCjcdQui
-wf5XAaWu+TeAVTytLQbSiTsBhrnoqVrr3RoyDQmdnwHT8aCMouOgcC5thP9vQ8Us
-rVdjvRRbnJpg3BeSNimH+u9AHgsCgYEA0EzcbOltCWPHRAY7B3Ge/AKBjBQr86Kv
-TdpTlxePBDVIlH+BM6oct2gaSZZoHbqPjbq5v7yf0fKVcXE4bSVgqfDJ/sZQu9Lp
-PTeV7wkk0OsAMKk7QukEpPno5q6tOTNnFecpUhVLLlqbfqkB2baYYwLJR3IRzboJ
-FQbLY93E8gkCgYB+zlC5VlQbbNqcLXJoImqItgQkkuW5PCgYdwcrSov2ve5r/Acz
-FNt1aRdSlx4176R3nXyibQA1Vw+ztiUFowiP9WLoM3PtPZwwe4bGHmwGNHPIfwVG
-m+exf9XgKKespYbLhc45tuC08DATnXoYK7O1EnUINSFJRS8cezSI5eHcbQKBgQDC
-PgqHXZ2aVftqCc1eAaxaIRQhRmY+CgUjumaczRFGwVFveP9I6Gdi+Kca3DE3F9Pq
-PKgejo0SwP5vDT+rOGHN14bmGJUMsX9i4MTmZUZ5s8s3lXh3ysfT+GAhTd6nKrIE
-kM3Nh6HWFhROptfc6BNusRh1kX/cspDplK5x8EpJ0QKBgQDWFg6S2je0KtbV5PYe
-RultUEe2C0jYMDQx+JYxbPmtcopvZQrFEur3WKVuLy5UAy7EBvwMnZwIG7OOohJb
-vkSpADK6VPn9lbqq7O8cTedEHttm6otmLt8ZyEl3hZMaL3hbuRj6ysjmoFKx6CrX
-rK0/Ikt5ybqUzKCMJZg2VKGTxg==
------END PRIVATE KEY-----)";
-	std::string rsa_pub_key = R"(-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuGbXWiK3dQTyCbX5xdE4
-yCuYp0AF2d15Qq1JSXT/lx8CEcXb9RbDddl8jGDv+spi5qPa8qEHiK7FwV2KpRE9
-83wGPnYsAm9BxLFb4YrLYcDFOIGULuk2FtrPS512Qea1bXASuvYXEpQNpGbnTGVs
-WXI9C+yjHztqyL2h8P6mlThPY9E9ue2fCqdgixfTFIF9Dm4SLHbphUS2iw7w1JgT
-69s7of9+I9l5lsJ9cozf1rxrXX4V1u/SotUuNB3Fp8oB4C1fLBEhSlMcUJirz1E8
-AziMCxS+VrRPDM+zfvpIJg3JljAh3PJHDiLu902v9w+Iplu1WyoB2aPfitxEhRN0
-YwIDAQAB
------END PUBLIC KEY-----)";
-	std::string rsa_pub_key_invalid = R"(-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxzYuc22QSst/dS7geYYK
-5l5kLxU0tayNdixkEQ17ix+CUcUbKIsnyftZxaCYT46rQtXgCaYRdJcbB3hmyrOa
-vkhTpX79xJZnQmfuamMbZBqitvscxW9zRR9tBUL6vdi/0rpoUwPMEh8+Bw7CgYR0
-FK0DhWYBNDfe9HKcyZEv3max8Cdq18htxjEsdYO0iwzhtKRXomBWTdhD5ykd/fAC
-VTr4+KEY+IeLvubHVmLUhbE5NgWXxrRpGasDqzKhCTmsa2Ysf712rl57SlH0Wz/M
-r3F7aM9YpErzeYLrl0GhQr9BVJxOvXcVd4kmY+XkiCcrkyS1cnghnllh+LCwQu1s
-YwIDAQAB
------END PUBLIC KEY-----)";
-	std::string rsa512_priv_key = R"(-----BEGIN RSA PRIVATE KEY-----
-MIICWwIBAAKBgQDdlatRjRjogo3WojgGHFHYLugdUWAY9iR3fy4arWNA1KoS8kVw
-33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQsHUfQrSDv+MuSUMAe8jzKE4qW
-+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5Do2kQ+X5xK9cipRgEKwIDAQAB
-AoGAD+onAtVye4ic7VR7V50DF9bOnwRwNXrARcDhq9LWNRrRGElESYYTQ6EbatXS
-3MCyjjX2eMhu/aF5YhXBwkppwxg+EOmXeh+MzL7Zh284OuPbkglAaGhV9bb6/5Cp
-uGb1esyPbYW+Ty2PC0GSZfIXkXs76jXAu9TOBvD0ybc2YlkCQQDywg2R/7t3Q2OE
-2+yo382CLJdrlSLVROWKwb4tb2PjhY4XAwV8d1vy0RenxTB+K5Mu57uVSTHtrMK0
-GAtFr833AkEA6avx20OHo61Yela/4k5kQDtjEf1N0LfI+BcWZtxsS3jDM3i1Hp0K
-Su5rsCPb8acJo5RO26gGVrfAsDcIXKC+bQJAZZ2XIpsitLyPpuiMOvBbzPavd4gY
-6Z8KWrfYzJoI/Q9FuBo6rKwl4BFoToD7WIUS+hpkagwWiz+6zLoX1dbOZwJACmH5
-fSSjAkLRi54PKJ8TFUeOP15h9sQzydI8zJU+upvDEKZsZc/UhT/SySDOxQ4G/523
-Y0sz/OZtSWcol/UMgQJALesy++GdvoIDLfJX5GBQpuFgFenRiRDabxrE9MNUZ2aP
-FaFp+DyAe+b4nDwuJaW2LURbr8AEZga7oQj0uYxcYw==
------END RSA PRIVATE KEY-----)";
-	std::string rsa512_pub_key = R"(-----BEGIN PUBLIC KEY-----
-MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDdlatRjRjogo3WojgGHFHYLugd
-UWAY9iR3fy4arWNA1KoS8kVw33cJibXr8bvwUAUparCwlvdbH6dvEOfou0/gCFQs
-HUfQrSDv+MuSUMAe8jzKE4qW+jK+xQU9a03GUnKHkkle+Q0pX/g6jXZ7r1/xAK5D
-o2kQ+X5xK9cipRgEKwIDAQAB
------END PUBLIC KEY-----)";
-	std::string rsa512_pub_key_invalid = R"(-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxzYuc22QSst/dS7geYYK
-5l5kLxU0tayNdixkEQ17ix+CUcUbKIsnyftZxaCYT46rQtXgCaYRdJcbB3hmyrOa
-vkhTpX79xJZnQmfuamMbZBqitvscxW9zRR9tBUL6vdi/0rpoUwPMEh8+Bw7CgYR0
-FK0DhWYBNDfe9HKcyZEv3max8Cdq18htxjEsdYO0iwzhtKRXomBWTdhD5ykd/fAC
-VTr4+KEY+IeLvubHVmLUhbE5NgWXxrRpGasDqzKhCTmsa2Ysf712rl57SlH0Wz/M
-r3F7aM9YpErzeYLrl0GhQr9BVJxOvXcVd4kmY+XkiCcrkyS1cnghnllh+LCwQu1s
-YwIDAQAB
------END PUBLIC KEY-----)";
-	std::string ecdsa_priv_key = R"(-----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgPGJGAm4X1fvBuC1z
-SpO/4Izx6PXfNMaiKaS5RUkFqEGhRANCAARCBvmeksd3QGTrVs2eMrrfa7CYF+sX
-sjyGg+Bo5mPKGH4Gs8M7oIvoP9pb/I85tdebtKlmiCZHAZE5w4DfJSV6
------END PRIVATE KEY-----)";
-	std::string ecdsa_pub_key = R"(-----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEQgb5npLHd0Bk61bNnjK632uwmBfr
-F7I8hoPgaOZjyhh+BrPDO6CL6D/aW/yPObXXm7SpZogmRwGROcOA3yUleg==
------END PUBLIC KEY-----)";
-	std::string ecdsa_pub_key_invalid = R"(-----BEGIN PUBLIC KEY-----
-MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEoBUyo8CQAFPeYPvv78ylh5MwFZjT
-CLQeb042TjiMJxG+9DLFmRSMlBQ9T/RsLLc+PmpB1+7yPAR+oR5gZn3kJQ==
------END PUBLIC KEY-----)";
-}
diff --git a/src/jwt-cpp/include/jwt-cpp/base.h b/src/jwt-cpp/include/jwt-cpp/base.h
deleted file mode 100644
index dfca7fc08..000000000
--- a/src/jwt-cpp/include/jwt-cpp/base.h
+++ /dev/null
@@ -1,168 +0,0 @@
-#pragma once
-#include <string>
-#include <array>
-
-namespace jwt {
-	namespace alphabet {
-		struct base64 {
-			static const std::array<char, 64>& data() {
-                            static std::array<char, 64> data = {
-                                {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-                                 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-                                 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-                                 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '+', '/'}};
-                            return data;
-			};
-			static const std::string& fill() {
-				static std::string fill = "=";
-				return fill;
-			}
-		};
-		struct base64url {
-			static const std::array<char, 64>& data() {
-                            static std::array<char, 64> data = {
-                                {'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P',
-                                 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f',
-                                 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-                                 'w', 'x', 'y', 'z', '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '-', '_'}};
-                            return data;
-			};
-			static const std::string& fill() {
-				static std::string fill = "%3d";
-				return fill;
-			}
-		};
-	}
-
-	class base {
-	public:
-		template<typename T>
-		static std::string encode(const std::string& bin) {
-			return encode(bin, T::data(), T::fill());
-		}
-		template<typename T>
-		static std::string decode(const std::string& base) {
-			return decode(base, T::data(), T::fill());
-		}
-
-	private:
-		static std::string encode(const std::string& bin, const std::array<char, 64>& alphabet, const std::string& fill) {
-			size_t size = bin.size();
-			std::string res;
-
-			// clear incomplete bytes
-			size_t fast_size = size - size % 3;
-			for (size_t i = 0; i < fast_size;) {
-				uint32_t octet_a = (unsigned char)bin[i++];
-				uint32_t octet_b = (unsigned char)bin[i++];
-				uint32_t octet_c = (unsigned char)bin[i++];
-
-				uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
-
-				res += alphabet[(triple >> 3 * 6) & 0x3F];
-				res += alphabet[(triple >> 2 * 6) & 0x3F];
-				res += alphabet[(triple >> 1 * 6) & 0x3F];
-				res += alphabet[(triple >> 0 * 6) & 0x3F];
-			}
-
-			if (fast_size == size)
-				return res;
-
-			size_t mod = size % 3;
-
-			uint32_t octet_a = fast_size < size ? (unsigned char)bin[fast_size++] : 0;
-			uint32_t octet_b = fast_size < size ? (unsigned char)bin[fast_size++] : 0;
-			uint32_t octet_c = fast_size < size ? (unsigned char)bin[fast_size++] : 0;
-
-			uint32_t triple = (octet_a << 0x10) + (octet_b << 0x08) + octet_c;
-
-			switch (mod) {
-			case 1:
-				res += alphabet[(triple >> 3 * 6) & 0x3F];
-				res += alphabet[(triple >> 2 * 6) & 0x3F];
-				res += fill;
-				res += fill;
-				break;
-			case 2:
-				res += alphabet[(triple >> 3 * 6) & 0x3F];
-				res += alphabet[(triple >> 2 * 6) & 0x3F];
-				res += alphabet[(triple >> 1 * 6) & 0x3F];
-				res += fill;
-				break;
-			default:
-				break;
-			}
-
-			return res;
-		}
-
-		static std::string decode(const std::string& base, const std::array<char, 64>& alphabet, const std::string& fill) {
-			size_t size = base.size();
-
-			size_t fill_cnt = 0;
-			while (size > fill.size()) {
-				if (base.substr(size - fill.size(), fill.size()) == fill) {
-					fill_cnt++;
-					size -= fill.size();
-					if(fill_cnt > 2)
-						throw std::runtime_error("Invalid input");
-				}
-				else break;
-			}
-
-			if ((size + fill_cnt) % 4 != 0)
-				throw std::runtime_error("Invalid input");
-
-			size_t out_size = size / 4 * 3;
-			std::string res;
-			res.reserve(out_size);
-
-			auto get_sextet = [&](size_t offset) {
-				for (size_t i = 0; i < alphabet.size(); i++) {
-					if (alphabet[i] == base[offset])
-						return i;
-				}
-				throw std::runtime_error("Invalid input");
-			};
-
-			
-			size_t fast_size = size - size % 4;
-			for (size_t i = 0; i < fast_size;) {
-				uint32_t sextet_a = get_sextet(i++);
-				uint32_t sextet_b = get_sextet(i++);
-				uint32_t sextet_c = get_sextet(i++);
-				uint32_t sextet_d = get_sextet(i++);
-
-				uint32_t triple = (sextet_a << 3 * 6)
-					+ (sextet_b << 2 * 6)
-					+ (sextet_c << 1 * 6)
-					+ (sextet_d << 0 * 6);
-
-				res += (triple >> 2 * 8) & 0xFF;
-				res += (triple >> 1 * 8) & 0xFF;
-				res += (triple >> 0 * 8) & 0xFF;
-			}
-
-			if (fill_cnt == 0)
-				return res;
-
-			uint32_t triple = (get_sextet(fast_size) << 3 * 6)
-				+ (get_sextet(fast_size + 1) << 2 * 6);
-
-			switch (fill_cnt) {
-			case 1:
-				triple |= (get_sextet(fast_size + 2) << 1 * 6);
-				res += (triple >> 2 * 8) & 0xFF;
-				res += (triple >> 1 * 8) & 0xFF;
-				break;
-			case 2:
-				res += (triple >> 2 * 8) & 0xFF;
-				break;
-			default:
-				break;
-			}
-
-			return res;
-		}
-	};
-}
diff --git a/src/jwt-cpp/include/jwt-cpp/jwt_cpp.h b/src/jwt-cpp/include/jwt-cpp/jwt_cpp.h
deleted file mode 100644
index c8c3c8719..000000000
--- a/src/jwt-cpp/include/jwt-cpp/jwt_cpp.h
+++ /dev/null
@@ -1,1593 +0,0 @@
-#pragma once
-#define PICOJSON_USE_INT64
-#include "picojson.h"
-#include "base.h"
-#include <set>
-#include <chrono>
-#include <unordered_map>
-#include <memory>
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/pem.h>
-#include <openssl/ec.h>
-#include <openssl/err.h>
-
-//If openssl version less than 1.1
-#if OPENSSL_VERSION_NUMBER < 269484032
-#define OPENSSL10
-#endif
-
-#ifndef JWT_CLAIM_EXPLICIT
-#define JWT_CLAIM_EXPLICIT 0
-#endif
-
-namespace jwt {
-	using date = std::chrono::system_clock::time_point;
-
-	struct signature_verification_exception : public std::runtime_error {
-		signature_verification_exception()
-			: std::runtime_error("signature verification failed")
-		{}
-		explicit signature_verification_exception(const std::string& msg)
-			: std::runtime_error(msg)
-		{}
-		explicit signature_verification_exception(const char* msg)
-			: std::runtime_error(msg)
-		{}
-	};
-	struct signature_generation_exception : public std::runtime_error {
-		signature_generation_exception()
-			: std::runtime_error("signature generation failed")
-		{}
-		explicit signature_generation_exception(const std::string& msg)
-			: std::runtime_error(msg)
-		{}
-		explicit signature_generation_exception(const char* msg)
-			: std::runtime_error(msg)
-		{}
-	};
-	struct rsa_exception : public std::runtime_error {
-		explicit rsa_exception(const std::string& msg)
-			: std::runtime_error(msg)
-		{}
-		explicit rsa_exception(const char* msg)
-			: std::runtime_error(msg)
-		{}
-	};
-	struct ecdsa_exception : public std::runtime_error {
-		explicit ecdsa_exception(const std::string& msg)
-			: std::runtime_error(msg)
-		{}
-		explicit ecdsa_exception(const char* msg)
-			: std::runtime_error(msg)
-		{}
-	};
-	struct token_verification_exception : public std::runtime_error {
-		token_verification_exception()
-			: std::runtime_error("token verification failed")
-		{}
-		explicit token_verification_exception(const std::string& msg)
-			: std::runtime_error("token verification failed: " + msg)
-		{}
-	};
-
-	namespace helper {
-		inline
-		std::string extract_pubkey_from_cert(const std::string& certstr, const std::string& pw = "") {
-			// TODO: Cannot find the exact version this change happended
-#if OPENSSL_VERSION_NUMBER <= 0x1000114fL
-			std::unique_ptr<BIO, decltype(&BIO_free_all)> certbio(BIO_new_mem_buf(const_cast<char*>(certstr.data()), certstr.size()), BIO_free_all);
-#else
-			std::unique_ptr<BIO, decltype(&BIO_free_all)> certbio(BIO_new_mem_buf(certstr.data(), certstr.size()), BIO_free_all);
-#endif
-			std::unique_ptr<BIO, decltype(&BIO_free_all)> keybio(BIO_new(BIO_s_mem()), BIO_free_all);
-
-			std::unique_ptr<X509, decltype(&X509_free)> cert(PEM_read_bio_X509(certbio.get(), nullptr, nullptr, const_cast<char*>(pw.c_str())), X509_free);
-			if (!cert) throw rsa_exception("Error loading cert into memory");
-			std::unique_ptr<EVP_PKEY, decltype(&EVP_PKEY_free)> key(X509_get_pubkey(cert.get()), EVP_PKEY_free);
-			if(!key) throw rsa_exception("Error getting public key from certificate");
-			if(!PEM_write_bio_PUBKEY(keybio.get(), key.get())) throw rsa_exception("Error writing public key data in PEM format");
-			char* ptr = nullptr;
-			auto len = BIO_get_mem_data(keybio.get(), &ptr);
-			if(len <= 0 || ptr == nullptr) throw rsa_exception("Failed to convert pubkey to pem");
-			std::string res(ptr, len);
-			return res;
-		}
-	}
-
-	namespace algorithm {
-		/**
-		 * "none" algorithm.
-		 * 
-		 * Returns and empty signature and checks if the given signature is empty.
-		 */
-		struct none {
-			/// Return an empty string
-			std::string sign(const std::string&) const {
-				return "";
-			}
-			/// Check if the given signature is empty. JWT's with "none" algorithm should not contain a signature.
-			void verify(const std::string&, const std::string& signature) const {
-				if (!signature.empty())
-					throw signature_verification_exception();
-			}
-			/// Get algorithm name
-			std::string name() const {
-				return "none";
-			}
-		};
-		/**
-		 * Base class for HMAC family of algorithms
-		 */
-		struct hmacsha {
-			/**
-			 * Construct new hmac algorithm
-			 * \param key Key to use for HMAC
-			 * \param md Pointer to hash function
-			 * \param name Name of the algorithm
-			 */
-			hmacsha(std::string key, const EVP_MD*(*md)(), const std::string& name)
-				: secret(std::move(key)), md(md), alg_name(name)
-			{}
-			/**
-			 * Sign jwt data
-			 * \param data The data to sign
-			 * \return HMAC signature for the given data
-			 * \throws signature_generation_exception
-			 */
-			std::string sign(const std::string& data) const {
-				std::string res;
-				res.resize(EVP_MAX_MD_SIZE);
-				unsigned int len = res.size();
-				if (HMAC(md(), secret.data(), secret.size(), (const unsigned char*)data.data(), data.size(), (unsigned char*)res.data(), &len) == nullptr)
-					throw signature_generation_exception();
-				res.resize(len);
-				return res;
-			}
-			/**
-			 * Check if signature is valid
-			 * \param data The data to check signature against
-			 * \param signature Signature provided by the jwt
-			 * \throws signature_verification_exception If the provided signature does not match
-			 */
-			void verify(const std::string& data, const std::string& signature) const {
-				try {
-					auto res = sign(data);
-					bool matched = true;
-					for (size_t i = 0; i < std::min<size_t>(res.size(), signature.size()); i++)
-						if (res[i] != signature[i])
-							matched = false;
-					if (res.size() != signature.size())
-						matched = false;
-					if (!matched)
-						throw signature_verification_exception();
-				}
-				catch (const signature_generation_exception&) {
-					throw signature_verification_exception();
-				}
-			}
-			/**
-			 * Returns the algorithm name provided to the constructor
-			 * \return Algorithmname
-			 */
-			std::string name() const {
-				return alg_name;
-			}
-		private:
-			/// HMAC secrect
-			const std::string secret;
-			/// HMAC hash generator
-			const EVP_MD*(*md)();
-			/// Algorithmname
-			const std::string alg_name;
-		};
-		/**
-		 * Base class for RSA family of algorithms
-		 */
-		struct rsa {
-			/**
-			 * Construct new rsa algorithm
-			 * \param public_key RSA public key in PEM format
-			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 * \param md Pointer to hash function
-			 * \param name Name of the algorithm
-			 */
-			rsa(const std::string& public_key, const std::string& private_key, const std::string& public_key_password, const std::string& private_key_password, const EVP_MD*(*md)(), const std::string& name)
-				: md(md), alg_name(name)
-			{
-				
-				std::unique_ptr<BIO, decltype(&BIO_free_all)> pubkey_bio(BIO_new(BIO_s_mem()), BIO_free_all);
-				
-				if(public_key.substr(0, 27) == "-----BEGIN CERTIFICATE-----") {
-					auto pkey = helper::extract_pubkey_from_cert(public_key, public_key_password);
-					if ((size_t)BIO_write(pubkey_bio.get(), pkey.data(), pkey.size()) != pkey.size())
-						throw rsa_exception("failed to load public key: bio_write failed");
-				} else  {
-					if ((size_t)BIO_write(pubkey_bio.get(), public_key.data(), public_key.size()) != public_key.size())
-						throw rsa_exception("failed to load public key: bio_write failed");
-				}
-				pkey.reset(PEM_read_bio_PUBKEY(pubkey_bio.get(), nullptr, nullptr, (void*)public_key_password.c_str()), EVP_PKEY_free);
-				if (!pkey)
-					throw rsa_exception("failed to load public key: PEM_read_bio_PUBKEY failed");
-
-				if (!private_key.empty()) {
-					std::unique_ptr<BIO, decltype(&BIO_free_all)> privkey_bio(BIO_new(BIO_s_mem()), BIO_free_all);
-					if ((size_t)BIO_write(privkey_bio.get(), private_key.data(), private_key.size()) != private_key.size())
-						throw rsa_exception("failed to load private key: bio_write failed");
-					RSA* privkey = PEM_read_bio_RSAPrivateKey(privkey_bio.get(), nullptr, nullptr, (void*)private_key_password.c_str());
-					if (privkey == nullptr)
-						throw rsa_exception("failed to load private key: PEM_read_bio_RSAPrivateKey failed");
-					if (EVP_PKEY_assign_RSA(pkey.get(), privkey) == 0) {
-						RSA_free(privkey);
-						throw rsa_exception("failed to load private key: EVP_PKEY_assign_RSA failed");
-					}
-				}
-			}
-			/**
-			 * Sign jwt data
-			 * \param data The data to sign
-			 * \return RSA signature for the given data
-			 * \throws signature_generation_exception
-			 */
-			std::string sign(const std::string& data) const {
-#ifdef OPENSSL10
-				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_destroy)> ctx(EVP_MD_CTX_create(), EVP_MD_CTX_destroy);
-#else
-				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> ctx(EVP_MD_CTX_create(), EVP_MD_CTX_free);
-#endif
-				if (!ctx)
-					throw signature_generation_exception("failed to create signature: could not create context");
-				if (!EVP_SignInit(ctx.get(), md()))
-					throw signature_generation_exception("failed to create signature: SignInit failed");
-
-				std::string res;
-				res.resize(EVP_PKEY_size(pkey.get()));
-				unsigned int len = 0;
-
-				if (!EVP_SignUpdate(ctx.get(), data.data(), data.size()))
-					throw signature_generation_exception();
-				if (!EVP_SignFinal(ctx.get(), (unsigned char*)res.data(), &len, pkey.get()))
-					throw signature_generation_exception();
-
-				res.resize(len);
-				return res;
-			}
-			/**
-			 * Check if signature is valid
-			 * \param data The data to check signature against
-			 * \param signature Signature provided by the jwt
-			 * \throws signature_verification_exception If the provided signature does not match
-			 */
-			void verify(const std::string& data, const std::string& signature) const {
-#ifdef OPENSSL10
-				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_destroy)> ctx(EVP_MD_CTX_create(), EVP_MD_CTX_destroy);
-#else
-				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> ctx(EVP_MD_CTX_create(), EVP_MD_CTX_free);
-#endif
-				if (!ctx)
-					throw signature_verification_exception("failed to verify signature: could not create context");
-				if (!EVP_VerifyInit(ctx.get(), md()))
-					throw signature_verification_exception("failed to verify signature: VerifyInit failed");
-				if (!EVP_VerifyUpdate(ctx.get(), data.data(), data.size()))
-					throw signature_verification_exception("failed to verify signature: VerifyUpdate failed");
-				if (!EVP_VerifyFinal(ctx.get(), (const unsigned char*)signature.data(), signature.size(), pkey.get()))
-					throw signature_verification_exception();
-			}
-			/**
-			 * Returns the algorithm name provided to the constructor
-			 * \return Algorithmname
-			 */
-			std::string name() const {
-				return alg_name;
-			}
-		private:
-			/// OpenSSL structure containing converted keys
-			std::shared_ptr<EVP_PKEY> pkey;
-			/// Hash generator
-			const EVP_MD*(*md)();
-			/// Algorithmname
-			const std::string alg_name;
-		};
-		/**
-		 * Base class for ECDSA family of algorithms
-		 */
-		struct ecdsa {
-			/**
-			 * Construct new ecdsa algorithm
-			 * \param public_key ECDSA public key in PEM format
-			 * \param private_key ECDSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 * \param md Pointer to hash function
-			 * \param name Name of the algorithm
-			 */
-			ecdsa(const std::string& public_key, const std::string& private_key, const std::string& public_key_password, const std::string& private_key_password, const EVP_MD*(*md)(), const std::string& name)
-				: md(md), alg_name(name)
-			{
-				if (private_key.empty()) {
-					std::unique_ptr<BIO, decltype(&BIO_free_all)> pubkey_bio(BIO_new(BIO_s_mem()), BIO_free_all);
-					if(public_key.substr(0, 27) == "-----BEGIN CERTIFICATE-----") {
-						auto pkey = helper::extract_pubkey_from_cert(public_key, public_key_password);
-						if ((size_t)BIO_write(pubkey_bio.get(), pkey.data(), pkey.size()) != pkey.size())
-							throw ecdsa_exception("failed to load public key: bio_write failed");
-					} else  {
-						if ((size_t)BIO_write(pubkey_bio.get(), public_key.data(), public_key.size()) != public_key.size())
-							throw ecdsa_exception("failed to load public key: bio_write failed");
-					}
-
-					pkey.reset(PEM_read_bio_EC_PUBKEY(pubkey_bio.get(), nullptr, nullptr, (void*)public_key_password.c_str()), EC_KEY_free);
-					if (!pkey)
-						throw ecdsa_exception("failed to load public key: PEM_read_bio_EC_PUBKEY failed");
-				} else {
-					std::unique_ptr<BIO, decltype(&BIO_free_all)> privkey_bio(BIO_new(BIO_s_mem()), BIO_free_all);
-					if ((size_t)BIO_write(privkey_bio.get(), private_key.data(), private_key.size()) != private_key.size())
-						throw ecdsa_exception("failed to load private key: bio_write failed");
-					pkey.reset(PEM_read_bio_ECPrivateKey(privkey_bio.get(), nullptr, nullptr, (void*)private_key_password.c_str()), EC_KEY_free);
-					if (!pkey)
-						throw ecdsa_exception("failed to load private key: PEM_read_bio_RSAPrivateKey failed");
-				}
-
-				if(EC_KEY_check_key(pkey.get()) == 0)
-					throw ecdsa_exception("failed to load key: key is invalid");
-			}
-			/**
-			 * Sign jwt data
-			 * \param data The data to sign
-			 * \return ECDSA signature for the given data
-			 * \throws signature_generation_exception
-			 */
-			std::string sign(const std::string& data) const {
-				const std::string hash = generate_hash(data);
-
-				std::unique_ptr<ECDSA_SIG, decltype(&ECDSA_SIG_free)>
-					sig(ECDSA_do_sign((const unsigned char*)hash.data(), hash.size(), pkey.get()), ECDSA_SIG_free);
-				if(!sig)
-					throw signature_generation_exception();
-#ifdef OPENSSL10
-
-				return bn2raw(sig->r) + bn2raw(sig->s);
-#else
-				const BIGNUM *r;
-				const BIGNUM *s;
-				ECDSA_SIG_get0(sig.get(), &r, &s);
-				return bn2raw(r) + bn2raw(s);
-#endif
-			}
-			/**
-			 * Check if signature is valid
-			 * \param data The data to check signature against
-			 * \param signature Signature provided by the jwt
-			 * \throws signature_verification_exception If the provided signature does not match
-			 */
-			void verify(const std::string& data, const std::string& signature) const {
-				const std::string hash = generate_hash(data);
-				auto r = raw2bn(signature.substr(0, signature.size() / 2));
-				auto s = raw2bn(signature.substr(signature.size() / 2));
-
-#ifdef OPENSSL10
-				ECDSA_SIG sig;
-				sig.r = r.get();
-				sig.s = s.get();
-
-				if(ECDSA_do_verify((const unsigned char*)hash.data(), hash.size(), &sig, pkey.get()) != 1)
-					throw signature_verification_exception("Invalid signature");
-#else
-				ECDSA_SIG *sig = ECDSA_SIG_new();
-
-				ECDSA_SIG_set0(sig, r.get(), s.get());
-
-				if(ECDSA_do_verify((const unsigned char*)hash.data(), hash.size(), sig, pkey.get()) != 1)
-					throw signature_verification_exception("Invalid signature");
-#endif
-			}
-			/**
-			 * Returns the algorithm name provided to the constructor
-			 * \return Algorithmname
-			 */
-			std::string name() const {
-				return alg_name;
-			}
-		private:
-			/**
-			 * Convert a OpenSSL BIGNUM to a std::string
-			 * \param bn BIGNUM to convert
-			 * \return bignum as string
-			 */
-#ifdef OPENSSL10
-			static std::string bn2raw(BIGNUM* bn)
-#else
-			static std::string bn2raw(const BIGNUM* bn)
-#endif
-			{
-				std::string res;
-				res.resize(BN_num_bytes(bn));
-				BN_bn2bin(bn, (unsigned char*)res.data());
-				if(res.size()%2 == 1 && res[0] == 0x00)
-					return res.substr(1);
-				return res;
-			}
-			/**
-			 * Convert an std::string to a OpenSSL BIGNUM
-			 * \param raw String to convert
-			 * \return BIGNUM representation
-			 */
-			static std::unique_ptr<BIGNUM, decltype(&BN_free)> raw2bn(const std::string& raw) {
-				if(static_cast<uint8_t>(raw[0]) >= 0x80) {
-					std::string str(1, 0x00);
-					str += raw;
-					return std::unique_ptr<BIGNUM, decltype(&BN_free)>(BN_bin2bn((const unsigned char*)str.data(), str.size(), nullptr), BN_free);
-				}
-				return std::unique_ptr<BIGNUM, decltype(&BN_free)>(BN_bin2bn((const unsigned char*)raw.data(), raw.size(), nullptr), BN_free);
-			}
-
-			/**
-			 * Hash the provided data using the hash function specified in constructor
-			 * \param data Data to hash
-			 * \return Hash of data
-			 */
-			std::string generate_hash(const std::string& data) const {
-#ifdef OPENSSL10
-				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_destroy)> ctx(EVP_MD_CTX_create(), &EVP_MD_CTX_destroy);
-#else
-				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> ctx(EVP_MD_CTX_new(), EVP_MD_CTX_free);
-#endif
-				if(EVP_DigestInit(ctx.get(), md()) == 0)
-					throw signature_generation_exception("EVP_DigestInit failed");
-				if(EVP_DigestUpdate(ctx.get(), data.data(), data.size()) == 0)
-					throw signature_generation_exception("EVP_DigestUpdate failed");
-				unsigned int len = 0;
-				std::string res;
-				res.resize(EVP_MD_CTX_size(ctx.get()));
-				if(EVP_DigestFinal(ctx.get(), (unsigned char*)res.data(), &len) == 0)
-					throw signature_generation_exception("EVP_DigestFinal failed");
-				res.resize(len);
-				return res;
-			}
-
-			/// OpenSSL struct containing keys
-			std::shared_ptr<EC_KEY> pkey;
-			/// Hash generator function
-			const EVP_MD*(*md)();
-			/// Algorithmname
-			const std::string alg_name;
-		};
-
-		/**
-		 * Base class for PSS-RSA family of algorithms
-		 */
-		struct pss {
-			/**
-			 * Construct new pss algorithm
-			 * \param public_key RSA public key in PEM format
-			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 * \param md Pointer to hash function
-			 * \param name Name of the algorithm
-			 */
-			pss(const std::string& public_key, const std::string& private_key, const std::string& public_key_password, const std::string& private_key_password, const EVP_MD*(*md)(), const std::string& name)
-				: md(md), alg_name(name)
-			{
-				std::unique_ptr<BIO, decltype(&BIO_free_all)> pubkey_bio(BIO_new(BIO_s_mem()), BIO_free_all);
-				if(public_key.substr(0, 27) == "-----BEGIN CERTIFICATE-----") {
-					auto pkey = helper::extract_pubkey_from_cert(public_key, public_key_password);
-					if ((size_t)BIO_write(pubkey_bio.get(), pkey.data(), pkey.size()) != pkey.size())
-						throw rsa_exception("failed to load public key: bio_write failed");
-				} else  {
-					if ((size_t)BIO_write(pubkey_bio.get(), public_key.data(), public_key.size()) != public_key.size())
-						throw rsa_exception("failed to load public key: bio_write failed");
-				}
-				pkey.reset(PEM_read_bio_PUBKEY(pubkey_bio.get(), nullptr, nullptr, (void*)public_key_password.c_str()), EVP_PKEY_free);
-				if (!pkey)
-					throw rsa_exception("failed to load public key: PEM_read_bio_PUBKEY failed");
-
-				if (!private_key.empty()) {
-					std::unique_ptr<BIO, decltype(&BIO_free_all)> privkey_bio(BIO_new(BIO_s_mem()), BIO_free_all);
-					if ((size_t)BIO_write(privkey_bio.get(), private_key.data(), private_key.size()) != private_key.size())
-						throw rsa_exception("failed to load private key: bio_write failed");
-					RSA* privkey = PEM_read_bio_RSAPrivateKey(privkey_bio.get(), nullptr, nullptr, (void*)private_key_password.c_str());
-					if (privkey == nullptr)
-						throw rsa_exception("failed to load private key: PEM_read_bio_RSAPrivateKey failed");
-					if (EVP_PKEY_assign_RSA(pkey.get(), privkey) == 0) {
-						RSA_free(privkey);
-						throw rsa_exception("failed to load private key: EVP_PKEY_assign_RSA failed");
-					}
-				}
-			}
-			/**
-			 * Sign jwt data
-			 * \param data The data to sign
-			 * \return ECDSA signature for the given data
-			 * \throws signature_generation_exception
-			 */
-			std::string sign(const std::string& data) const {
-				auto hash = this->generate_hash(data);
-
-				std::unique_ptr<RSA, decltype(&RSA_free)> key(EVP_PKEY_get1_RSA(pkey.get()), RSA_free);
-				const int size = RSA_size(key.get());
-
-				std::string padded(size, 0x00);
-				if (!RSA_padding_add_PKCS1_PSS_mgf1(key.get(), (unsigned char*)padded.data(), (const unsigned char*)hash.data(), md(), md(), -1))  
-					throw signature_generation_exception("failed to create signature: RSA_padding_add_PKCS1_PSS_mgf1 failed");
-
-				std::string res(size, 0x00);
-				if (RSA_private_encrypt(size, (const unsigned char*)padded.data(), (unsigned char*)res.data(), key.get(), RSA_NO_PADDING) < 0)
-					throw signature_generation_exception("failed to create signature: RSA_private_encrypt failed");
-				return res;
-			}
-			/**
-			 * Check if signature is valid
-			 * \param data The data to check signature against
-			 * \param signature Signature provided by the jwt
-			 * \throws signature_verification_exception If the provided signature does not match
-			 */
-			void verify(const std::string& data, const std::string& signature) const {
-				auto hash = this->generate_hash(data);
-
-				std::unique_ptr<RSA, decltype(&RSA_free)> key(EVP_PKEY_get1_RSA(pkey.get()), RSA_free);
-				const int size = RSA_size(key.get());
-				
-				std::string sig(size, 0x00);
-				if(!RSA_public_decrypt(signature.size(), (const unsigned char*)signature.data(), (unsigned char*)sig.data(), key.get(), RSA_NO_PADDING))
-					throw signature_verification_exception("Invalid signature");
-				
-				if(!RSA_verify_PKCS1_PSS_mgf1(key.get(), (const unsigned char*)hash.data(), md(), md(), (const unsigned char*)sig.data(), -1))
-					throw signature_verification_exception("Invalid signature");
-			}
-			/**
-			 * Returns the algorithm name provided to the constructor
-			 * \return Algorithmname
-			 */
-			std::string name() const {
-				return alg_name;
-			}
-		private:
-			/**
-			 * Hash the provided data using the hash function specified in constructor
-			 * \param data Data to hash
-			 * \return Hash of data
-			 */
-			std::string generate_hash(const std::string& data) const {
-#ifdef OPENSSL10
-				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_destroy)> ctx(EVP_MD_CTX_create(), &EVP_MD_CTX_destroy);
-#else
-				std::unique_ptr<EVP_MD_CTX, decltype(&EVP_MD_CTX_free)> ctx(EVP_MD_CTX_new(), EVP_MD_CTX_free);
-#endif
-				if(EVP_DigestInit(ctx.get(), md()) == 0)
-					throw signature_generation_exception("EVP_DigestInit failed");
-				if(EVP_DigestUpdate(ctx.get(), data.data(), data.size()) == 0)
-					throw signature_generation_exception("EVP_DigestUpdate failed");
-				unsigned int len = 0;
-				std::string res;
-				res.resize(EVP_MD_CTX_size(ctx.get()));
-				if(EVP_DigestFinal(ctx.get(), (unsigned char*)res.data(), &len) == 0)
-					throw signature_generation_exception("EVP_DigestFinal failed");
-				res.resize(len);
-				return res;
-			}
-			
-			/// OpenSSL structure containing keys
-			std::shared_ptr<EVP_PKEY> pkey;
-			/// Hash generator function
-			const EVP_MD*(*md)();
-			/// Algorithmname
-			const std::string alg_name;
-		};
-
-		/**
-		 * HS256 algorithm
-		 */
-		struct hs256 : public hmacsha {
-			/**
-			 * Construct new instance of algorithm
-			 * \param key HMAC signing key
-			 */
-			explicit hs256(std::string key)
-				: hmacsha(std::move(key), EVP_sha256, "HS256")
-			{}
-		};
-		/**
-		 * HS384 algorithm
-		 */
-		struct hs384 : public hmacsha {
-			/**
-			 * Construct new instance of algorithm
-			 * \param key HMAC signing key
-			 */
-			explicit hs384(std::string key)
-				: hmacsha(std::move(key), EVP_sha384, "HS384")
-			{}
-		};
-		/**
-		 * HS512 algorithm
-		 */
-		struct hs512 : public hmacsha {
-			/**
-			 * Construct new instance of algorithm
-			 * \param key HMAC signing key
-			 */
-			explicit hs512(std::string key)
-				: hmacsha(std::move(key), EVP_sha512, "HS512")
-			{}
-		};
-		/**
-		 * RS256 algorithm
-		 */
-		struct rs256 : public rsa {
-			/**
-			 * Construct new instance of algorithm
-			 * \param public_key RSA public key in PEM format
-			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 */
-			rs256(const std::string& public_key, const std::string& private_key = "", const std::string& public_key_password = "", const std::string& private_key_password = "")
-				: rsa(public_key, private_key, public_key_password, private_key_password, EVP_sha256, "RS256")
-			{}
-		};
-		/**
-		 * RS384 algorithm
-		 */
-		struct rs384 : public rsa {
-			/**
-			 * Construct new instance of algorithm
-			 * \param public_key RSA public key in PEM format
-			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 */
-			rs384(const std::string& public_key, const std::string& private_key = "", const std::string& public_key_password = "", const std::string& private_key_password = "")
-				: rsa(public_key, private_key, public_key_password, private_key_password, EVP_sha384, "RS384")
-			{}
-		};
-		/**
-		 * RS512 algorithm
-		 */
-		struct rs512 : public rsa {
-			/**
-			 * Construct new instance of algorithm
-			 * \param public_key RSA public key in PEM format
-			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 */
-			rs512(const std::string& public_key, const std::string& private_key = "", const std::string& public_key_password = "", const std::string& private_key_password = "")
-				: rsa(public_key, private_key, public_key_password, private_key_password, EVP_sha512, "RS512")
-			{}
-		};
-		/**
-		 * ES256 algorithm
-		 */
-		struct es256 : public ecdsa {
-			/**
-			 * Construct new instance of algorithm
-			 * \param public_key ECDSA public key in PEM format
-			 * \param private_key ECDSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 */
-			es256(const std::string& public_key, const std::string& private_key = "", const std::string& public_key_password = "", const std::string& private_key_password = "")
-				: ecdsa(public_key, private_key, public_key_password, private_key_password, EVP_sha256, "ES256")
-			{}
-		};
-		/**
-		 * ES384 algorithm
-		 */
-		struct es384 : public ecdsa {
-			/**
-			 * Construct new instance of algorithm
-			 * \param public_key ECDSA public key in PEM format
-			 * \param private_key ECDSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 */
-			es384(const std::string& public_key, const std::string& private_key = "", const std::string& public_key_password = "", const std::string& private_key_password = "")
-				: ecdsa(public_key, private_key, public_key_password, private_key_password, EVP_sha384, "ES384")
-			{}
-		};
-		/**
-		 * ES512 algorithm
-		 */
-		struct es512 : public ecdsa {
-			/**
-			 * Construct new instance of algorithm
-			 * \param public_key ECDSA public key in PEM format
-			 * \param private_key ECDSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 */
-			es512(const std::string& public_key, const std::string& private_key = "", const std::string& public_key_password = "", const std::string& private_key_password = "")
-				: ecdsa(public_key, private_key, public_key_password, private_key_password, EVP_sha512, "ES512")
-			{}
-		};
-
-		/**
-		 * PS256 algorithm
-		 */
-		struct ps256 : public pss {
-			/**
-			 * Construct new instance of algorithm
-			 * \param public_key RSA public key in PEM format
-			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 */
-			ps256(const std::string& public_key, const std::string& private_key = "", const std::string& public_key_password = "", const std::string& private_key_password = "")
-				: pss(public_key, private_key, public_key_password, private_key_password, EVP_sha256, "PS256")
-			{}
-		};
-		/**
-		 * PS384 algorithm
-		 */
-		struct ps384 : public pss {
-			/**
-			 * Construct new instance of algorithm
-			 * \param public_key RSA public key in PEM format
-			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 */
-			ps384(const std::string& public_key, const std::string& private_key = "", const std::string& public_key_password = "", const std::string& private_key_password = "")
-				: pss(public_key, private_key, public_key_password, private_key_password, EVP_sha384, "PS384")
-			{}
-		};
-		/**
-		 * PS512 algorithm
-		 */
-		struct ps512 : public pss {
-			/**
-			 * Construct new instance of algorithm
-			 * \param public_key RSA public key in PEM format
-			 * \param private_key RSA private key or empty string if not available. If empty, signing will always fail.
-			 * \param public_key_password Password to decrypt public key pem.
-			 * \param privat_key_password Password to decrypt private key pem.
-			 */
-			ps512(const std::string& public_key, const std::string& private_key = "", const std::string& public_key_password = "", const std::string& private_key_password = "")
-				: pss(public_key, private_key, public_key_password, private_key_password, EVP_sha512, "PS512")
-			{}
-		};
-	}
-
-	/**
-	 * Convenience wrapper for JSON value
-	 */
-	class claim {
-		picojson::value val;
-	public:
-		enum class type {
-			null,
-			boolean,
-			number,
-			string,
-			array,
-			object,
-			int64
-		};
-
-		claim()
-			: val()
-		{}
-#if JWT_CLAIM_EXPLICIT
-		explicit claim(std::string s)
-			: val(std::move(s))
-		{}
-		explicit claim(const date& s)
-			: val(int64_t(std::chrono::system_clock::to_time_t(s)))
-		{}
-		explicit claim(const std::set<std::string>& s)
-			: val(picojson::array(s.cbegin(), s.cend()))
-		{}
-		explicit claim(const picojson::value& val)
-			: val(val)
-		{}
-#else
-		claim(std::string s)
-			: val(std::move(s))
-		{}
-		claim(const date& s)
-			: val(int64_t(std::chrono::system_clock::to_time_t(s)))
-		{}
-		claim(const std::set<std::string>& s)
-			: val(picojson::array(s.cbegin(), s.cend()))
-		{}
-		claim(const picojson::value& val)
-			: val(val)
-		{}
-#endif
-
-		/**
-		 * Get wrapped json object
-		 * \return Wrapped json object
-		 */
-		picojson::value to_json() const {
-			return val;
-		}
-
-		/**
-		 * Get type of contained object
-		 * \return Type
-		 * \throws std::logic_error An internal error occured
-		 */
-		type get_type() const {
-			if (val.is<picojson::null>()) return type::null;
-			else if (val.is<bool>()) return type::boolean;
-			else if (val.is<int64_t>()) return type::int64;
-			else if (val.is<double>()) return type::number;
-			else if (val.is<std::string>()) return type::string;
-			else if (val.is<picojson::array>()) return type::array;
-			else if (val.is<picojson::object>()) return type::object;
-			else throw std::logic_error("internal error");
-		}
-
-		/**
-		 * Get the contained object as a string
-		 * \return content as string
-		 * \throws std::bad_cast Content was not a string
-		 */
-		const std::string& as_string() const {
-			if (!val.is<std::string>())
-				throw std::bad_cast();
-			return val.get<std::string>();
-		}
-		/**
-		 * Get the contained object as a date
-		 * \return content as date
-		 * \throws std::bad_cast Content was not a date
-		 */
-		date as_date() const {
-			return std::chrono::system_clock::from_time_t(as_int());
-		}
-		/**
-		 * Get the contained object as an array
-		 * \return content as array
-		 * \throws std::bad_cast Content was not an array
-		 */
-		const picojson::array& as_array() const {
-			if (!val.is<picojson::array>())
-				throw std::bad_cast();
-			return val.get<picojson::array>();
-		}
-		/**
-		 * Get the contained object as a set of strings
-		 * \return content as set of strings
-		 * \throws std::bad_cast Content was not a set
-		 */
-		const std::set<std::string> as_set() const {
-			std::set<std::string> res;
-			for(auto& e : as_array()) {
-				if(!e.is<std::string>())
-					throw std::bad_cast();
-				res.insert(e.get<std::string>());
-			}
-			return res;
-		}
-		/**
-		 * Get the contained object as an integer
-		 * \return content as int
-		 * \throws std::bad_cast Content was not an int
-		 */
-		int64_t as_int() const {
-			if (!val.is<int64_t>())
-				throw std::bad_cast();
-			return val.get<int64_t>();
-		}
-		/**
-		 * Get the contained object as a bool
-		 * \return content as bool
-		 * \throws std::bad_cast Content was not a bool
-		 */
-		bool as_bool() const {
-			if (!val.is<bool>())
-				throw std::bad_cast();
-			return val.get<bool>();
-		}
-		/**
-		 * Get the contained object as a number
-		 * \return content as double
-		 * \throws std::bad_cast Content was not a number
-		 */
-		double as_number() const {
-			if (!val.is<double>())
-				throw std::bad_cast();
-			return val.get<double>();
-		}
-	};
-
-	/**
-	 * Base class that represents a token payload.
-	 * Contains Convenience accessors for common claims.
-	 */
-	class payload {
-	protected:
-		std::unordered_map<std::string, claim> payload_claims;
-	public:
-		/**
-		 * Check if issuer is present ("iss")
-		 * \return true if present, false otherwise
-		 */
-		bool has_issuer() const noexcept { return has_payload_claim("iss"); }
-		/**
-		 * Check if subject is present ("sub")
-		 * \return true if present, false otherwise
-		 */
-		bool has_subject() const noexcept { return has_payload_claim("sub"); }
-		/**
-		 * Check if audience is present ("aud")
-		 * \return true if present, false otherwise
-		 */
-		bool has_audience() const noexcept { return has_payload_claim("aud"); }
-		/**
-		 * Check if expires is present ("exp")
-		 * \return true if present, false otherwise
-		 */
-		bool has_expires_at() const noexcept { return has_payload_claim("exp"); }
-		/**
-		 * Check if not before is present ("nbf")
-		 * \return true if present, false otherwise
-		 */
-		bool has_not_before() const noexcept { return has_payload_claim("nbf"); }
-		/**
-		 * Check if issued at is present ("iat")
-		 * \return true if present, false otherwise
-		 */
-		bool has_issued_at() const noexcept { return has_payload_claim("iat"); }
-		/**
-		 * Check if token id is present ("jti")
-		 * \return true if present, false otherwise
-		 */
-		bool has_id() const noexcept { return has_payload_claim("jti"); }
-		/**
-		 * Get issuer claim
-		 * \return issuer as string
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a string (Should not happen in a valid token)
-		 */
-		const std::string& get_issuer() const { return get_payload_claim("iss").as_string(); }
-		/**
-		 * Get subject claim
-		 * \return subject as string
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a string (Should not happen in a valid token)
-		 */
-		const std::string& get_subject() const { return get_payload_claim("sub").as_string(); }
-		/**
-		 * Get audience claim
-		 * \return audience as a set of strings
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a set (Should not happen in a valid token)
-		 */
-		std::set<std::string> get_audience() const { 
-			auto aud = get_payload_claim("aud");
-			if(aud.get_type() == jwt::claim::type::string) return { aud.as_string()};
-			else return aud.as_set();
-		}
-		/**
-		 * Get expires claim
-		 * \return expires as a date in utc
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a date (Should not happen in a valid token)
-		 */
-		const date get_expires_at() const { return get_payload_claim("exp").as_date(); }
-		/**
-		 * Get not valid before claim
-		 * \return nbf date in utc
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a date (Should not happen in a valid token)
-		 */
-		const date get_not_before() const { return get_payload_claim("nbf").as_date(); }
-		/**
-		 * Get issued at claim
-		 * \return issued at as date in utc
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a date (Should not happen in a valid token)
-		 */
-		const date get_issued_at() const { return get_payload_claim("iat").as_date(); }
-		/**
-		 * Get id claim
-		 * \return id as string
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a string (Should not happen in a valid token)
-		 */
-		const std::string& get_id() const { return get_payload_claim("jti").as_string(); }
-		/**
-		 * Check if a payload claim is present
-		 * \return true if claim was present, false otherwise
-		 */
-		bool has_payload_claim(const std::string& name) const noexcept { return payload_claims.count(name) != 0; }
-		/**
-		 * Get payload claim
-		 * \return Requested claim
-		 * \throws std::runtime_error If claim was not present
-		 */
-		const claim& get_payload_claim(const std::string& name) const {
-			if (!has_payload_claim(name))
-				throw std::runtime_error("claim not found");
-			return payload_claims.at(name);
-		}
-		/**
-		 * Get all payload claims
-		 * \return map of claims
-		 */
-		std::unordered_map<std::string, claim> get_payload_claims() const { return payload_claims; }
-	};
-
-	/**
-	 * Base class that represents a token header.
-	 * Contains Convenience accessors for common claims.
-	 */
-	class header {
-	protected:
-		std::unordered_map<std::string, claim> header_claims;
-	public:
-		/**
-		 * Check if algortihm is present ("alg")
-		 * \return true if present, false otherwise
-		 */
-		bool has_algorithm() const noexcept { return has_header_claim("alg"); }
-		/**
-		 * Check if type is present ("typ")
-		 * \return true if present, false otherwise
-		 */
-		bool has_type() const noexcept { return has_header_claim("typ"); }
-		/**
-		 * Check if content type is present ("cty")
-		 * \return true if present, false otherwise
-		 */
-		bool has_content_type() const noexcept { return has_header_claim("cty"); }
-		/**
-		 * Check if key id is present ("kid")
-		 * \return true if present, false otherwise
-		 */
-		bool has_key_id() const noexcept { return has_header_claim("kid"); }
-		/**
-		 * Get algorithm claim
-		 * \return algorithm as string
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a string (Should not happen in a valid token)
-		 */
-		const std::string& get_algorithm() const { return get_header_claim("alg").as_string(); }
-		/**
-		 * Get type claim
-		 * \return type as a string
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a string (Should not happen in a valid token)
-		 */
-		const std::string& get_type() const { return get_header_claim("typ").as_string(); }
-		/**
-		 * Get content type claim
-		 * \return content type as string
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a string (Should not happen in a valid token)
-		 */
-		const std::string& get_content_type() const { return get_header_claim("cty").as_string(); }
-		/**
-		 * Get key id claim
-		 * \return key id as string
-		 * \throws std::runtime_error If claim was not present
-		 * \throws std::bad_cast Claim was present but not a string (Should not happen in a valid token)
-		 */
-		const std::string& get_key_id() const { return get_header_claim("kid").as_string(); }
-		/**
-		 * Check if a header claim is present
-		 * \return true if claim was present, false otherwise
-		 */
-		bool has_header_claim(const std::string& name) const noexcept { return header_claims.count(name) != 0; }
-		/**
-		 * Get header claim
-		 * \return Requested claim
-		 * \throws std::runtime_error If claim was not present
-		 */
-		const claim& get_header_claim(const std::string& name) const {
-			if (!has_header_claim(name))
-				throw std::runtime_error("claim not found");
-			return header_claims.at(name);
-		}
-		/**
-		 * Get all header claims
-		 * \return map of claims
-		 */
-		std::unordered_map<std::string, claim> get_header_claims() const { return header_claims; }
-	};
-
-	/**
-	 * Class containing all information about a decoded token
-	 */
-	class decoded_jwt : public header, public payload {
-	protected:
-		/// Unmodifed token, as passed to constructor
-		const std::string token;
-		/// Header part decoded from base64
-		std::string header;
-		/// Unmodified header part in base64
-		std::string header_base64;
-		/// Payload part decoded from base64
-		std::string payload;
-		/// Unmodified payload part in base64
-		std::string payload_base64;
-		/// Signature part decoded from base64
-		std::string signature;
-		/// Unmodified signature part in base64
-		std::string signature_base64;
-	public:
-		/**
-		 * Constructor 
-		 * Parses a given token
-		 * \param token The token to parse
-		 * \throws std::invalid_argument Token is not in correct format
-		 * \throws std::runtime_error Base64 decoding failed or invalid json
-		 */
-		explicit decoded_jwt(const std::string& token)
-			: token(token)
-		{
-			auto hdr_end = token.find('.');
-			if (hdr_end == std::string::npos)
-				throw std::invalid_argument("invalid token supplied");
-			auto payload_end = token.find('.', hdr_end + 1);
-			if (payload_end == std::string::npos)
-				throw std::invalid_argument("invalid token supplied");
-			header = header_base64 = token.substr(0, hdr_end);
-			payload = payload_base64 = token.substr(hdr_end + 1, payload_end - hdr_end - 1);
-			signature = signature_base64 = token.substr(payload_end + 1);
-
-			// Fix padding: JWT requires padding to get removed
-			auto fix_padding = [](std::string& str) {
-				switch (str.size() % 4) {
-				case 1:
-					str += alphabet::base64url::fill();
-#ifdef __has_cpp_attribute
-#if __has_cpp_attribute(fallthrough)
-					[[fallthrough]];
-#endif
-#endif
-				case 2:
-					str += alphabet::base64url::fill();
-#ifdef __has_cpp_attribute
-#if __has_cpp_attribute(fallthrough)
-					[[fallthrough]];
-#endif
-#endif
-				case 3:
-					str += alphabet::base64url::fill();
-#ifdef __has_cpp_attribute
-#if __has_cpp_attribute(fallthrough)
-					[[fallthrough]];
-#endif
-#endif
-				default:
-					break;
-				}
-			};
-			fix_padding(header);
-			fix_padding(payload);
-			fix_padding(signature);
-
-			header = base::decode<alphabet::base64url>(header);
-			payload = base::decode<alphabet::base64url>(payload);
-			signature = base::decode<alphabet::base64url>(signature);
-
-			auto parse_claims = [](const std::string& str) {
-				std::unordered_map<std::string, claim> res;
-				picojson::value val;
-				if (!picojson::parse(val, str).empty())
-					throw std::runtime_error("Invalid json");
-
-				for (auto& e : val.get<picojson::object>()) { res.insert({ e.first, claim(e.second) }); }
-
-				return res;
-			};
-
-			header_claims = parse_claims(header);
-			payload_claims = parse_claims(payload);
-		}
-
-		/**
-		 * Get token string, as passed to constructor
-		 * \return token as passed to constructor
-		 */
-		const std::string& get_token() const { return token; }
-		/**
-		 * Get header part as json string
-		 * \return header part after base64 decoding
-		 */
-		const std::string& get_header() const { return header; }
-		/**
-		 * Get payload part as json string
-		 * \return payload part after base64 decoding
-		 */
-		const std::string& get_payload() const { return payload; }
-		/**
-		 * Get signature part as json string
-		 * \return signature part after base64 decoding
-		 */
-		const std::string& get_signature() const { return signature; }
-		/**
-		 * Get header part as base64 string
-		 * \return header part before base64 decoding
-		 */
-		const std::string& get_header_base64() const { return header_base64; }
-		/**
-		 * Get payload part as base64 string
-		 * \return payload part before base64 decoding
-		 */
-		const std::string& get_payload_base64() const { return payload_base64; }
-		/**
-		 * Get signature part as base64 string
-		 * \return signature part before base64 decoding
-		 */
-		const std::string& get_signature_base64() const { return signature_base64; }
-
-	};
-
-	/**
-	 * Builder class to build and sign a new token
-	 * Use jwt::create() to get an instance of this class.
-	 */
-	class builder {
-		std::unordered_map<std::string, claim> header_claims;
-		std::unordered_map<std::string, claim> payload_claims;
-
-		builder() {}
-		friend builder create();
-	public:
-		/**
-		 * Set a header claim.
-		 * \param id Name of the claim
-		 * \param c Claim to add
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_header_claim(const std::string& id, claim c) { header_claims[id] = std::move(c); return *this; }
-		/**
-		 * Set a payload claim.
-		 * \param id Name of the claim
-		 * \param c Claim to add
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_payload_claim(const std::string& id, claim c) { payload_claims[id] = std::move(c); return *this; }
-		/**
-		 * Set algorithm claim
-		 * You normally don't need to do this, as the algorithm is automatically set if you don't change it.
-		 * \param str Name of algorithm
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_algorithm(const std::string& str) { return set_header_claim("alg", claim(str)); }
-		/**
-		 * Set type claim
-		 * \param str Type to set
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_type(const std::string& str) { return set_header_claim("typ", claim(str)); }
-		/**
-		 * Set content type claim
-		 * \param str Type to set
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_content_type(const std::string& str) { return set_header_claim("cty", claim(str)); }
-		/**
-		 * Set key id claim
-		 * \param str Key id to set
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_key_id(const std::string& str) { return set_header_claim("kid", claim(str)); }
-		/**
-		 * Set issuer claim
-		 * \param str Issuer to set
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_issuer(const std::string& str) { return set_payload_claim("iss", claim(str)); }
-		/**
-		 * Set subject claim
-		 * \param str Subject to set
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_subject(const std::string& str) { return set_payload_claim("sub", claim(str)); }
-		/**
-		 * Set audience claim
-		 * \param l Audience set
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_audience(const std::set<std::string>& l) { return set_payload_claim("aud", claim(l)); }
-		/**
-		 * Set audience claim
-		 * \param aud Single audience
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_audience(const std::string& aud) { return set_payload_claim("aud", claim(aud)); }
-		/**
-		 * Set expires at claim
-		 * \param d Expires time
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_expires_at(const date& d) { return set_payload_claim("exp", claim(d)); }
-		/**
-		 * Set not before claim
-		 * \param d First valid time
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_not_before(const date& d) { return set_payload_claim("nbf", claim(d)); }
-		/**
-		 * Set issued at claim
-		 * \param d Issued at time, should be current time
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_issued_at(const date& d) { return set_payload_claim("iat", claim(d)); }
-		/**
-		 * Set id claim
-		 * \param str ID to set
-		 * \return *this to allow for method chaining
-		 */
-		builder& set_id(const std::string& str) { return set_payload_claim("jti", claim(str)); }
-
-		/**
-		 * Sign token and return result
-		 * \param algo Instance of an algorithm to sign the token with
-		 * \return Final token as a string
-		 */
-		template<typename T>
-		std::string sign(const T& algo) {
-			this->set_algorithm(algo.name());
-
-			picojson::object obj_header;
-			for (auto& e : header_claims) {
-				obj_header.insert({ e.first, e.second.to_json() });
-			}
-			picojson::object obj_payload;
-			for (auto& e : payload_claims) {
-				obj_payload.insert({ e.first, e.second.to_json() });
-			}
-
-			auto encode = [](const std::string& data) {
-				auto base = base::encode<alphabet::base64url>(data);
-				auto pos = base.find(alphabet::base64url::fill());
-				base = base.substr(0, pos);
-				return base;
-			};
-
-			std::string header = encode(picojson::value(obj_header).serialize());
-			std::string payload = encode(picojson::value(obj_payload).serialize());
-
-			std::string token = header + "." + payload;
-
-			return token + "." + encode(algo.sign(token));
-		}
-	};
-
-	/**
-	 * Verifier class used to check if a decoded token contains all claims required by your application and has a valid signature.
-	 */
-	template<typename Clock>
-	class verifier {
-		struct algo_base {
-			virtual ~algo_base() {}
-			virtual void verify(const std::string& data, const std::string& sig) = 0;
-		};
-		template<typename T>
-		struct algo : public algo_base {
-			T alg;
-			explicit algo(T a) : alg(a) {}
-			virtual void verify(const std::string& data, const std::string& sig) override {
-				alg.verify(data, sig);
-			}
-		};
-
-		/// Required claims
-		std::unordered_map<std::string, claim> claims;
-		/// Leeway time for exp, nbf and iat
-		size_t default_leeway = 0;
-		/// Instance of clock type
-		Clock clock;
-		/// Supported algorithms
-		std::unordered_map<std::string, std::shared_ptr<algo_base>> algs;
-	public:
-		/**
-		 * Constructor for building a new verifier instance
-		 * \param c Clock instance
-		 */
-		explicit verifier(Clock c) : clock(c) {}
-
-		/**
-		 * Set default leeway to use.
-		 * \param leeway Default leeway to use if not specified otherwise
-		 * \return *this to allow chaining
-		 */
-		verifier& leeway(size_t leeway) { default_leeway = leeway; return *this; }
-		/**
-		 * Set leeway for expires at.
-		 * If not specified the default leeway will be used.
-		 * \param leeway Set leeway to use for expires at.
-		 * \return *this to allow chaining
-		 */
-		verifier& expires_at_leeway(size_t leeway) { return with_claim("exp", claim(std::chrono::system_clock::from_time_t(leeway))); }
-		/**
-		 * Set leeway for not before.
-		 * If not specified the default leeway will be used.
-		 * \param leeway Set leeway to use for not before.
-		 * \return *this to allow chaining
-		 */
-		verifier& not_before_leeway(size_t leeway) { return with_claim("nbf", claim(std::chrono::system_clock::from_time_t(leeway))); }
-		/**
-		 * Set leeway for issued at.
-		 * If not specified the default leeway will be used.
-		 * \param leeway Set leeway to use for issued at.
-		 * \return *this to allow chaining
-		 */
-		verifier& issued_at_leeway(size_t leeway) { return with_claim("iat", claim(std::chrono::system_clock::from_time_t(leeway))); }
-		/**
-		 * Set an issuer to check for.
-		 * Check is casesensitive.
-		 * \param iss Issuer to check for.
-		 * \return *this to allow chaining
-		 */
-		verifier& with_issuer(const std::string& iss) { return with_claim("iss", claim(iss)); }
-		/**
-		 * Set a subject to check for.
-		 * Check is casesensitive.
-		 * \param sub Subject to check for.
-		 * \return *this to allow chaining
-		 */
-		verifier& with_subject(const std::string& sub) { return with_claim("sub", claim(sub)); }
-		/**
-		 * Set an audience to check for.
-		 * If any of the specified audiences is not present in the token the check fails.
-		 * \param aud Audience to check for.
-		 * \return *this to allow chaining
-		 */
-		verifier& with_audience(const std::set<std::string>& aud) { return with_claim("aud", claim(aud)); }
-		/**
-		 * Set an id to check for.
-		 * Check is casesensitive.
-		 * \param id ID to check for.
-		 * \return *this to allow chaining
-		 */
-		verifier& with_id(const std::string& id) { return with_claim("jti", claim(id)); }
-		/**
-		 * Specify a claim to check for.
-		 * \param name Name of the claim to check for
-		 * \param c Claim to check for
-		 * \return *this to allow chaining
-		 */
-		verifier& with_claim(const std::string& name, claim c) { claims[name] = c; return *this; }
-
-		/**
-		 * Add an algorithm available for checking.
-		 * \param alg Algorithm to allow
-		 * \return *this to allow chaining
-		 */
-		template<typename Algorithm>
-		verifier& allow_algorithm(Algorithm alg) {
-			algs[alg.name()] = std::make_shared<algo<Algorithm>>(alg);
-			return *this;
-		}
-
-		/**
-		 * Verify the given token.
-		 * \param jwt Token to check
-		 * \throws token_verification_exception Verification failed
-		 */
-		void verify(const decoded_jwt& jwt) const {
-			const std::string data = jwt.get_header_base64() + "." + jwt.get_payload_base64();
-			const std::string sig = jwt.get_signature();
-			const std::string& algo = jwt.get_algorithm();
-			if (algs.count(algo) == 0)
-				throw token_verification_exception("wrong algorithm");
-			algs.at(algo)->verify(data, sig);
-
-			auto assert_claim_eq = [](const decoded_jwt& jwt, const std::string& key, const claim& c) {
-				if (!jwt.has_payload_claim(key))
-					throw token_verification_exception("decoded_jwt is missing " + key + " claim");
-				auto& jc = jwt.get_payload_claim(key);
-				if (jc.get_type() != c.get_type())
-					throw token_verification_exception("claim " + key + " type mismatch");
-				if (c.get_type() == claim::type::int64) {
-					if (c.as_date() != jc.as_date())
-						throw token_verification_exception("claim " + key + " does not match expected");
-				}
-				else if (c.get_type() == claim::type::array) {
-					auto s1 = c.as_set();
-					auto s2 = jc.as_set();
-					if (s1.size() != s2.size())
-						throw token_verification_exception("claim " + key + " does not match expected");
-					auto it1 = s1.cbegin();
-					auto it2 = s2.cbegin();
-					while (it1 != s1.cend() && it2 != s2.cend()) {
-						if (*it1++ != *it2++)
-							throw token_verification_exception("claim " + key + " does not match expected");
-					}
-				}
-				else if (c.get_type() == claim::type::string) {
-					if (c.as_string() != jc.as_string())
-						throw token_verification_exception("claim " + key + " does not match expected");
-				}
-				else throw token_verification_exception("internal error");
-			};
-
-			auto time = clock.now();
-
-			if (jwt.has_expires_at()) {
-				auto leeway = claims.count("exp") == 1 ? std::chrono::system_clock::to_time_t(claims.at("exp").as_date()) : default_leeway;
-				auto exp = jwt.get_expires_at();
-				if (time > exp + std::chrono::seconds(leeway))
-					throw token_verification_exception("token expired");
-			}
-			if (jwt.has_issued_at()) {
-				auto leeway = claims.count("iat") == 1 ? std::chrono::system_clock::to_time_t(claims.at("iat").as_date()) : default_leeway;
-				auto iat = jwt.get_issued_at();
-				if (time < iat - std::chrono::seconds(leeway))
-					throw token_verification_exception("token expired");
-			}
-			if (jwt.has_not_before()) {
-				auto leeway = claims.count("nbf") == 1 ? std::chrono::system_clock::to_time_t(claims.at("nbf").as_date()) : default_leeway;
-				auto nbf = jwt.get_not_before();
-				if (time < nbf - std::chrono::seconds(leeway))
-					throw token_verification_exception("token expired");
-			}
-			for (auto& c : claims)
-			{
-				if (c.first == "exp" || c.first == "iat" || c.first == "nbf") {
-					// Nothing to do here, already checked
-				}
-				else if (c.first == "aud") {
-					if (!jwt.has_audience())
-						throw token_verification_exception("token doesn't contain the required audience");
-					auto aud = jwt.get_audience();
-					auto expected = c.second.as_set();
-					for (auto& e : expected)
-						if (aud.count(e) == 0)
-							throw token_verification_exception("token doesn't contain the required audience");
-				}
-				else {
-					assert_claim_eq(jwt, c.first, c.second);
-				}
-			}
-		}
-	};
-
-	/**
-	 * Create a verifier using the given clock
-	 * \param c Clock instance to use
-	 * \return verifier instance
-	 */
-	template<typename Clock>
-	verifier<Clock> verify(Clock c) {
-		return verifier<Clock>(c);
-	}
-
-	/**
-	 * Default clock class using std::chrono::system_clock as a backend.
-	 */
-	struct default_clock {
-		std::chrono::system_clock::time_point now() const {
-			return std::chrono::system_clock::now();
-		}
-	};
-
-	/**
-	 * Create a verifier using the default clock
-	 * \return verifier instance
-	 */
-    inline
-	verifier<default_clock> verify() {
-		return verify<default_clock>({});
-	}
-
-	/**
-	 * Return a builder instance to create a new token
-	 */
-    inline
-	builder create() {
-		return builder();
-	}
-
-	/**
-	 * Decode a token
-	 * \param token Token to decode
-	 * \return Decoded token
-	 * \throws std::invalid_argument Token is not in correct format
-	 * \throws std::runtime_error Base64 decoding failed or invalid json
-	 */
-    inline
-	decoded_jwt decode(const std::string& token) {
-		return decoded_jwt(token);
-	}
-}
diff --git a/src/jwt-cpp/jwt-cpp.sln b/src/jwt-cpp/jwt-cpp.sln
deleted file mode 100644
index ef5abc2a6..000000000
--- a/src/jwt-cpp/jwt-cpp.sln
+++ /dev/null
@@ -1,28 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jwt-cpp", "jwt-cpp.vcxproj", "{1CA8C676-7F8E-434C-9069-8F20A562E6E9}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{1CA8C676-7F8E-434C-9069-8F20A562E6E9}.Debug|x64.ActiveCfg = Debug|x64
-		{1CA8C676-7F8E-434C-9069-8F20A562E6E9}.Debug|x64.Build.0 = Debug|x64
-		{1CA8C676-7F8E-434C-9069-8F20A562E6E9}.Debug|x86.ActiveCfg = Debug|Win32
-		{1CA8C676-7F8E-434C-9069-8F20A562E6E9}.Debug|x86.Build.0 = Debug|Win32
-		{1CA8C676-7F8E-434C-9069-8F20A562E6E9}.Release|x64.ActiveCfg = Release|x64
-		{1CA8C676-7F8E-434C-9069-8F20A562E6E9}.Release|x64.Build.0 = Release|x64
-		{1CA8C676-7F8E-434C-9069-8F20A562E6E9}.Release|x86.ActiveCfg = Release|Win32
-		{1CA8C676-7F8E-434C-9069-8F20A562E6E9}.Release|x86.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
diff --git a/src/jwt-cpp/jwt-cpp.vcxproj b/src/jwt-cpp/jwt-cpp.vcxproj
deleted file mode 100644
index 7d791a4d4..000000000
--- a/src/jwt-cpp/jwt-cpp.vcxproj
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{1CA8C676-7F8E-434C-9069-8F20A562E6E9}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>jwtcpp</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>gtest.lib;gtest_main.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>gtest.lib;gtest_main.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>gtest.lib;gtest_main.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>gtest.lib;gtest_main.lib;%(AdditionalDependencies)</AdditionalDependencies>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="include\jwt-cpp\base.h" />
-    <ClInclude Include="include\jwt-cpp\jwt.h" />
-    <ClInclude Include="include\jwt-cpp\picojson.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="BaseTest.cpp" />
-    <ClCompile Include="TokenTest.cpp" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/src/jwt-cpp/jwt-cpp.vcxproj.filters b/src/jwt-cpp/jwt-cpp.vcxproj.filters
deleted file mode 100644
index 6419b2d22..000000000
--- a/src/jwt-cpp/jwt-cpp.vcxproj.filters
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Quelldateien">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Headerdateien">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Ressourcendateien">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="include\jwt-cpp\jwt.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="include\jwt-cpp\picojson.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-    <ClInclude Include="include\jwt-cpp\base.h">
-      <Filter>Headerdateien</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="BaseTest.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-    <ClCompile Include="TokenTest.cpp">
-      <Filter>Quelldateien</Filter>
-    </ClCompile>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/src/jwt-cpp/vcpkg/CONTROL b/src/jwt-cpp/vcpkg/CONTROL
deleted file mode 100644
index d29834fc6..000000000
--- a/src/jwt-cpp/vcpkg/CONTROL
+++ /dev/null
@@ -1,3 +0,0 @@
-Source: jwt-cpp
-Version: 2019-04-20
-Description: A header only library for creating and validating json web tokens in c++
\ No newline at end of file
diff --git a/src/jwt-cpp/vcpkg/fix-picojson.patch b/src/jwt-cpp/vcpkg/fix-picojson.patch
deleted file mode 100644
index 44c04fe58..000000000
--- a/src/jwt-cpp/vcpkg/fix-picojson.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/include/jwt-cpp/jwt.h b/include/jwt-cpp/jwt.h
-index ec56810..a26fd97 100644
---- a/include/jwt-cpp/jwt.h
-+++ b/include/jwt-cpp/jwt.h
-@@ -1,6 +1,6 @@
- #pragma once
- #define PICOJSON_USE_INT64
--#include "picojson.h"
-+#include "picojson/picojson.h"
- #include "base.h"
- #include <set>
- #include <chrono>
diff --git a/src/jwt-cpp/vcpkg/fix-warning.patch b/src/jwt-cpp/vcpkg/fix-warning.patch
deleted file mode 100644
index d013a7782..000000000
--- a/src/jwt-cpp/vcpkg/fix-warning.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/include/jwt-cpp/base.h b/include/jwt-cpp/base.h
-index dfca7fc..4d05c0b 100644
---- a/include/jwt-cpp/base.h
-+++ b/include/jwt-cpp/base.h
-@@ -2,6 +2,10 @@
- #include <string>
- #include <array>
- 
-+#ifdef _MSC_VER
-+#pragma warning(disable : 4267)
-+#endif
-+
- namespace jwt {
- 	namespace alphabet {
- 		struct base64 {
-diff --git a/include/jwt-cpp/jwt.h b/include/jwt-cpp/jwt.h
-index ec56810..313cef2 100644
---- a/include/jwt-cpp/jwt.h
-+++ b/include/jwt-cpp/jwt.h
-@@ -12,6 +12,11 @@
- #include <openssl/ec.h>
- #include <openssl/err.h>
- 
-+#ifdef _MSC_VER
-+#pragma warning(disable : 4267)
-+#pragma warning(disable : 4067)
-+#endif
-+
- //If openssl version less than 1.1
- #if OPENSSL_VERSION_NUMBER < 269484032
- #define OPENSSL10
diff --git a/src/jwt-cpp/vcpkg/portfile.cmake b/src/jwt-cpp/vcpkg/portfile.cmake
deleted file mode 100644
index 1e10e3c21..000000000
--- a/src/jwt-cpp/vcpkg/portfile.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#header-only library
-include(vcpkg_common_functions)
-
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/jwt-cpp)
-
-vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
-    REPO Thalhammer/jwt-cpp
-    REF f0e37a79f605312686065405dd720fc197cc3df0
-    SHA512 ae83c205dbb340dedc58d0d3f0e2453c4edcf5ce43b401f49d02692dc8a2a4b7260f1ced05ddfa7c1d5d6f92446e232629ddbdf67a58a119b50c5c8163591598
-    HEAD_REF master
-    PATCHES fix-picojson.patch
-            fix-warning.patch)
-
-# Copy the constexpr header files
-file(GLOB HEADER_FILES ${SOURCE_PATH}/include/jwt-cpp/*)
-file(COPY ${HEADER_FILES}
-     DESTINATION ${CURRENT_PACKAGES_DIR}/include/jwt-cpp
-     REGEX "\.(gitattributes|gitignore|picojson.h)$" EXCLUDE)
-
-# Put the licence file where vcpkg expects it
-file(COPY ${SOURCE_PATH}/LICENSE
-     DESTINATION ${CURRENT_PACKAGES_DIR}/share/jwt-cpp)
-file(RENAME ${CURRENT_PACKAGES_DIR}/share/jwt-cpp/LICENSE ${CURRENT_PACKAGES_DIR}/share/jwt-cpp/copyright)
\ No newline at end of file
diff --git a/src/libbcrypt/CMakeLists.txt b/src/libbcrypt/CMakeLists.txt
deleted file mode 100644
index a0883eec5..000000000
--- a/src/libbcrypt/CMakeLists.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-###################################################################################
-#
-#  Copyright (c) 2014, webvariants GmbH, http://www.webvariants.de
-#
-#  This file is released under the terms of the MIT license. You can find the
-#  complete text in the attached LICENSE file or online at:
-#
-#  http://www.opensource.org/licenses/mit-license.php
-#
-#  @author: Tino Rusch (tino.rusch@webvariants.de)
-#
-###################################################################################
-
-cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-
-project(bcrypt)
-
-enable_language(ASM)
-
-set(MYLIB_VERSION_MAJOR 1)
-set(MYLIB_VERSION_MINOR 0)
-set(MYLIB_VERSION_PATCH 0)
-set(MYLIB_VERSION_STRING ${MYLIB_VERSION_MAJOR}.${MYLIB_VERSION_MINOR}.${MYLIB_VERSION_PATCH})
-
-# just doing cmake . will build a shared or static lib and honor existing environment setting
-# to force build static, cmake . -DBUILD_SHARED_LIBS=Off
-# to force build shared, cmake . -DBUILD_SHARED_LIBS=On
-
-if (NOT BUILD_SHARED_LIBS)
-	message ("Building a static library")
-else ()
-	message ("Building a shared library")
-endif ()
-
-
-set( CMAKE_COLOR_MAKEFILE ON )
-
-set( CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} -Wall --std=c++11 -O3" )
-set( CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} -Wall -O3" )
-
-set( CMAKE_ASM_FLAGS "${CXXFLAGS} -x assembler-with-cpp")
-
-set( SRCFILES
-	${CMAKE_CURRENT_SOURCE_DIR}/src/bcrypt.c
-	${CMAKE_CURRENT_SOURCE_DIR}/src/crypt_blowfish.c
-	${CMAKE_CURRENT_SOURCE_DIR}/src/crypt_gensalt.c
-	${CMAKE_CURRENT_SOURCE_DIR}/src/wrapper.c
-	${CMAKE_CURRENT_SOURCE_DIR}/src/x86.S
-)
-
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include/bcrypt)
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/include)
-
-add_library(
-	${PROJECT_NAME}
-	${SRCFILES}
-)
-
-set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${MYLIB_VERSION_STRING} SOVERSION ${MYLIB_VERSION_MAJOR})
-
-set_target_properties(${PROJECT_NAME} PROPERTIES PUBLIC_HEADER include/bcrypt/BCrypt.hpp)
-
-target_include_directories(${PROJECT_NAME} PRIVATE include)
-target_include_directories(${PROJECT_NAME} PRIVATE src)
-
-add_executable( ${PROJECT_NAME}_test ${CMAKE_CURRENT_SOURCE_DIR}/src/main.cpp)
-
-target_link_libraries( ${PROJECT_NAME}_test ${PROJECT_NAME})
-
-include(GNUInstallDirs)
-
-install(TARGETS ${PROJECT_NAME}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/bcrypt)
-
-install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/include/ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-	FILES_MATCHING PATTERN "*.h")
-
-SET(CPACK_GENERATOR "DEB")
-SET(CPACK_SET_DESTDIR ON)
-
-SET(CPACK_DEBIAN_PACKAGE_MAINTAINER "Manuel Romei")
-SET(CPACK_PACKAGE_VERSION "1.0.0")
-SET(CPACK_PACKAGE_VERSION_MAJOR "1")
-SET(CPACK_PACKAGE_VERSION_MINOR "0")
-SET(CPACK_PACKAGE_VERSION_PATCH "0")
-
-INCLUDE(CPack)
diff --git a/src/zm.h b/src/zm.h
index 60fa67711..46d6edf08 100644
--- a/src/zm.h
+++ b/src/zm.h
@@ -21,18 +21,6 @@
 #ifndef ZM_H
 #define ZM_H
 
-#include "zm_config.h"
-#include "zm_signal.h"
-#ifdef SOLARIS
-#undef DEFAULT_TYPE  // pthread defines this which breaks StreamType DEFAULT_TYPE
-#include <string.h>  // define strerror() and friends
-#endif
-#include "zm_logger.h"
-
-#include <stdint.h>
-
-#include <iostream>
-
-extern const char* self;
+extern const char *self;
 
 #endif // ZM_H
diff --git a/src/zm_analysis_thread.cpp b/src/zm_analysis_thread.cpp
new file mode 100644
index 000000000..74d677316
--- /dev/null
+++ b/src/zm_analysis_thread.cpp
@@ -0,0 +1,61 @@
+#include "zm_analysis_thread.h"
+
+#include "zm_monitor.h"
+#include "zm_signal.h"
+#include "zm_utils.h"
+
+AnalysisThread::AnalysisThread(Monitor *monitor) :
+    monitor_(monitor), terminate_(false) {
+  thread_ = std::thread(&AnalysisThread::Run, this);
+}
+
+AnalysisThread::~AnalysisThread() {
+  Stop();
+  if (thread_.joinable()) thread_.join();
+}
+
+void AnalysisThread::Start() {
+  if (thread_.joinable()) thread_.join();
+  terminate_ = false;
+  Debug(3, "Starting analysis thread");
+  thread_ = std::thread(&AnalysisThread::Run, this);
+}
+
+void AnalysisThread::Run() {
+  Microseconds analysis_rate = Microseconds(monitor_->GetAnalysisRate());
+  Seconds analysis_update_delay = Seconds(monitor_->GetAnalysisUpdateDelay());
+  Debug(2, "AnalysisThread::Run() has an update delay of %" PRId64 "s",
+        static_cast<int64>(analysis_update_delay.count()));
+
+  monitor_->UpdateAdaptiveSkip();
+
+  TimePoint last_analysis_update_time = std::chrono::steady_clock::now();
+  TimePoint cur_time;
+
+  while (!(terminate_ or zm_terminate)) {
+    // Some periodic updates are required for variable capturing framerate
+    if (analysis_update_delay != Seconds::zero()) {
+      cur_time = std::chrono::steady_clock::now();
+      Debug(2, "Updating adaptive skip");
+      if ((cur_time - last_analysis_update_time) > analysis_update_delay) {
+        analysis_rate = Microseconds(monitor_->GetAnalysisRate());
+        monitor_->UpdateAdaptiveSkip();
+        last_analysis_update_time = cur_time;
+      }
+    }
+
+    Debug(2, "Analyzing");
+    if (!monitor_->Analyse()) {
+      if (!(terminate_ or zm_terminate)) {
+        Microseconds sleep_for = monitor_->Active() ? Microseconds(ZM_SAMPLE_RATE) : Microseconds(ZM_SUSPENDED_RATE);
+        Debug(2, "Sleeping for %" PRId64 "us", int64(sleep_for.count()));
+        std::this_thread::sleep_for(sleep_for);
+      }
+    } else if (analysis_rate != Microseconds::zero()) {
+      Debug(2, "Sleeping for %" PRId64 " us", int64(analysis_rate.count()));
+      std::this_thread::sleep_for(analysis_rate);
+    } else {
+      Debug(2, "Not sleeping");
+    }
+  }
+}
diff --git a/src/zm_analysis_thread.h b/src/zm_analysis_thread.h
new file mode 100644
index 000000000..f949aa729
--- /dev/null
+++ b/src/zm_analysis_thread.h
@@ -0,0 +1,29 @@
+#ifndef ZM_ANALYSIS_THREAD_H
+#define ZM_ANALYSIS_THREAD_H
+
+#include <atomic>
+#include <memory>
+#include <thread>
+
+class Monitor;
+
+class AnalysisThread {
+ public:
+  explicit AnalysisThread(Monitor *monitor);
+  ~AnalysisThread();
+  AnalysisThread(AnalysisThread &rhs) = delete;
+  AnalysisThread(AnalysisThread &&rhs) = delete;
+
+  void Start();
+  void Stop() { terminate_ = true; }
+  bool Stopped() const { return terminate_; }
+
+ private:
+  void Run();
+
+  Monitor *monitor_;
+  std::atomic<bool> terminate_;
+  std::thread thread_;
+};
+
+#endif
diff --git a/src/zm_bigfont.h b/src/zm_bigfont.h
deleted file mode 100644
index 96ba479dd..000000000
--- a/src/zm_bigfont.h
+++ /dev/null
@@ -1,6155 +0,0 @@
-/***********************************************************/
-/*                             */
-/*     Font file generated by schrorg          */
-/*     based on the font file generated by rthelen     */
-/*     using utils/mk_bigfont.pl             */
-/*                             */
-/***********************************************************/
-
-static unsigned int bigfontdata[] = {
-
-  /* 0 0x00 '^A' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 1 0x01 '^B' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 2 0x02 '^C' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 3 0x03 '^D' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 4 0x04 '^E' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 5 0x05 '^F' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 6 0x06 '^G' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 7 0x07 '^H' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 8 0x08 '^I' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 9 0x09 '^J' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 10 0x0a '^K' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 11 0x0b '^L' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 12 0x0c '^M' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 13 0x0d '^N' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 14 0x0e '^O' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 15 0x0f '^P' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 16 0x10 '^Q' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 17 0x11 '^R' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 18 0x12 '^S' */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 19 0x13 '^T' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 20 0x14 '^U' */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 21 0x15 '^V' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 22 0x16 '^W' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 23 0x17 '^X' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 24 0x18 '^Y' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 25 0x19 '^Z' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 26 0x1a '^[' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 27 0x1b '^\' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 28 0x1c '^]' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 29 0x1d '^^' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 30 0x1e '^_' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 31 0x1f '^`' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 32 0x20 ' ' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 33 0x21 '!' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 34 0x22 '"' */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 35 0x23 '#' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 36 0x24 '$' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 37 0x25 '%' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 38 0x26 '&' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 39 0x27 ''' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 40 0x28 '(' */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 41 0x29 ')' */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 42 0x2a '*' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 43 0x2b '+' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 44 0x2c ',' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 45 0x2d '-' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 46 0x2e '.' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 47 0x2f '/' */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 48 0x30 '0' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 49 0x31 '1' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x3f0, /* 000000    0000 */
-     0x3f0, /* 000000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 50 0x32 '2' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 51 0x33 '3' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 52 0x34 '4' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x3f0, /* 000000    0000 */
-     0x3f0, /* 000000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 53 0x35 '5' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 54 0x36 '6' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 55 0x37 '7' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 56 0x38 '8' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 57 0x39 '9' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 58 0x3a ':' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 59 0x3b ';' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 60 0x3c '<' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 61 0x3d '=' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 62 0x3e '>' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 63 0x3f '?' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 64 0x40 '@' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3f30, /* 00    00  0000 */
-    0x3f30, /* 00    00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 65 0x41 'A' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 66 0x42 'B' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 67 0x43 'C' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 68 0x44 'D' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 69 0x45 'E' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 70 0x46 'F' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 71 0x47 'G' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 72 0x48 'H' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 73 0x49 'I' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 74 0x4a 'J' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 75 0x4b 'K' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3c00, /* 00  0000000000 */
-    0x3c00, /* 00  0000000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 76 0x4c 'L' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 77 0x4d 'M' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3cf0, /* 00  00  0000 */
-    0x3cf0, /* 00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 78 0x4e 'N' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 79 0x4f 'O' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 80 0x50 'P' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 81 0x51 'Q' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 82 0x52 'R' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 83 0x53 'S' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 84 0x54 'T' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 85 0x55 'U' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 86 0x56 'V' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 87 0x57 'W' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3cf0, /* 00  00  0000 */
-    0x3cf0, /* 00  00  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 88 0x58 'X' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 89 0x59 'Y' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 90 0x5a 'Z' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 91 0x5b '[' */
-      0xf0, /* 00000000  0000 */
-      0xf0, /* 00000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xf0, /* 00000000  0000 */
-      0xf0, /* 00000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 92 0x5c '\' */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-       0xc, /* 000000000000  00 */
-       0xc, /* 000000000000  00 */
-       0xc, /* 000000000000  00 */
-       0xc, /* 000000000000  00 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 93 0x5d ']' */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 94 0x5e '^' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 95 0x5f '_' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ffc, /* 00      00 */
-    0x3ffc, /* 00      00 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 96 0x60 '`' */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 97 0x61 'a' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 98 0x62 'b' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 99 0x63 'c' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 100 0x64 'd' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 101 0x65 'e' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 102 0x66 'f' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0xf0, /* 00000000  0000 */
-      0xf0, /* 00000000  0000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 103 0x67 'g' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 104 0x68 'h' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 105 0x69 'i' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 106 0x6a 'j' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3c00, /* 00  0000000000 */
-    0x3c00, /* 00  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 107 0x6b 'k' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3f00, /* 00    00000000 */
-    0x3f00, /* 00    00000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 108 0x6c 'l' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 109 0x6d 'm' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 110 0x6e 'n' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 111 0x6f 'o' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 112 0x70 'p' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 113 0x71 'q' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 114 0x72 'r' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 115 0x73 's' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 116 0x74 't' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xf0, /* 00000000  0000 */
-      0xf0, /* 00000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 117 0x75 'u' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 118 0x76 'v' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 119 0x77 'w' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 120 0x78 'x' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 121 0x79 'y' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 122 0x7a 'z' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 123 0x7b '{' */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 124 0x7c '|' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 125 0x7d '}' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 126 0x7e '~' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 127 0x7f '^?' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 128 0x80 '\200' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 129 0x81 '\201' */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 130 0x82 '\202' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 131 0x83 '\203' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 132 0x84 '\204' */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 133 0x85 '\205' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 134 0x86 '\206' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 135 0x87 '\207' */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 136 0x88 '\210' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 137 0x89 '\211' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 138 0x8a '\212' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 139 0x8b '\213' */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 140 0x8c '\214' */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 141 0x8d '\215' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 142 0x8e '\216' */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 143 0x8f '\217' */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 144 0x90 '\220' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 145 0x91 '\221' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 146 0x92 '\222' */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 147 0x93 '\223' */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 148 0x94 '\224' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 149 0x95 '\225' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 150 0x96 '\226' */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 151 0x97 '\227' */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 152 0x98 '\230' */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 153 0x99 '\231' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 154 0x9a '\232' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 155 0x9b '\233' */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 156 0x9c '\234' */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 157 0x9d '\235' */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 158 0x9e '\236' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 159 0x9f '\237' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 160 0xa0 '\240' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 161 0xa1 '\241' */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 162 0xa2 '\242' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 163 0xa3 '\243' */
-     0xf00, /* 0000  00000000 */
-     0xf00, /* 0000  00000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3f00, /* 00    00000000 */
-    0x3f00, /* 00    00000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 164 0xa4 '\244' */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 165 0xa5 '\245' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 166 0xa6 '\246' */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 167 0xa7 '\247' */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 168 0xa8 '\250' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3f00, /* 00    00000000 */
-    0x3f00, /* 00    00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 169 0xa9 '\251' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3f00, /* 00    00000000 */
-    0x3f00, /* 00    00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xf30, /* 0000  00  0000 */
-     0xf30, /* 0000  00  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-    0x3f00, /* 00    00000000 */
-    0x3f00, /* 00    00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 170 0xaa '\252' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3fcc, /* 00    00  00 */
-    0x3fcc, /* 00    00  00 */
-     0xcfc, /* 0000  00    00 */
-     0xcfc, /* 0000  00    00 */
-     0xcfc, /* 0000  00    00 */
-     0xcfc, /* 0000  00    00 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 171 0xab '\253' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 172 0xac '\254' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 173 0xad '\255' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 174 0xae '\256' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3fc0, /* 00    000000 */
-    0x3fc0, /* 00    000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x33f0, /* 00  00    0000 */
-    0x33f0, /* 00  00    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 175 0xaf '\257' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 176 0xb0 '\260' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3cf0, /* 00  00  0000 */
-    0x3cf0, /* 00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3cf0, /* 00  00  0000 */
-    0x3cf0, /* 00  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 177 0xb1 '\261' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 178 0xb2 '\262' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 179 0xb3 '\263' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x3f0, /* 000000    0000 */
-     0x3f0, /* 000000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 180 0xb4 '\264' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 181 0xb5 '\265' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x3f30, /* 00    00  0000 */
-    0x3f30, /* 00    00  0000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 182 0xb6 '\266' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xf0, /* 00000000  0000 */
-      0xf0, /* 00000000  0000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 183 0xb7 '\267' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 184 0xb8 '\270' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 185 0xb9 '\271' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 186 0xba '\272' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3c00, /* 00  0000000000 */
-    0x3c00, /* 00  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 187 0xbb '\273' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x3f0, /* 000000    0000 */
-     0x3f0, /* 000000    0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0x3f0, /* 000000    0000 */
-     0x3f0, /* 000000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 188 0xbc '\274' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 189 0xbd '\275' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3cf0, /* 00  00  0000 */
-    0x3cf0, /* 00  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 190 0xbe '\276' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x33f0, /* 00  00    0000 */
-    0x33f0, /* 00  00    0000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 191 0xbf '\277' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x30f0, /* 00  0000  0000 */
-    0x30f0, /* 00  0000  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3c30, /* 00  0000  0000 */
-    0x3c30, /* 00  0000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 192 0xc0 '\300' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 193 0xc1 '\301' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 194 0xc2 '\302' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 195 0xc3 '\303' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0xf0, /* 00000000  0000 */
-      0xf0, /* 00000000  0000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-     0xc00, /* 0000  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 196 0xc4 '\304' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-    0x3c00, /* 00  0000000000 */
-    0x3c00, /* 00  0000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 197 0xc5 '\305' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3000, /* 00  000000000000 */
-    0x3000, /* 00  000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 198 0xc6 '\306' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 199 0xc7 '\307' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 200 0xc8 '\310' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-     0xc30, /* 0000  0000  0000 */
-    0x30c0, /* 00  0000  000000 */
-    0x30c0, /* 00  0000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 201 0xc9 '\311' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 202 0xca '\312' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 203 0xcb '\313' */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 204 0xcc '\314' */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 205 0xcd '\315' */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 206 0xce '\316' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x33c0, /* 00  00  000000 */
-    0x33c0, /* 00  00  000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 207 0xcf '\317' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3330, /* 00  00  00  0000 */
-    0x3330, /* 00  00  00  0000 */
-    0x33f0, /* 00  00    0000 */
-    0x33f0, /* 00  00    0000 */
-    0x3300, /* 00  00  00000000 */
-    0x3300, /* 00  00  00000000 */
-     0xcf0, /* 0000  00  0000 */
-     0xcf0, /* 0000  00  0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 208 0xd0 '\320' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 209 0xd1 '\321' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ffc, /* 00      00 */
-    0x3ffc, /* 00      00 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 210 0xd2 '\322' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 211 0xd3 '\323' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-     0x330, /* 000000  00  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 212 0xd4 '\324' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 213 0xd5 '\325' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x3c0, /* 000000  000000 */
-     0x3c0, /* 000000  000000 */
-      0xc0, /* 00000000  000000 */
-      0xc0, /* 00000000  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 214 0xd6 '\326' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ff0, /* 00      0000 */
-    0x3ff0, /* 00      0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 215 0xd7 '\327' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-     0x300, /* 000000  00000000 */
-     0x300, /* 000000  00000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 216 0xd8 '\330' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xcc0, /* 0000  00  000000 */
-     0xcc0, /* 0000  00  000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-    0x3030, /* 00  000000  0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-      0x30, /* 0000000000  0000 */
-      0x30, /* 0000000000  0000 */
-     0xfc0, /* 0000    000000 */
-     0xfc0, /* 0000    000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 217 0xd9 '\331' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ffc, /* 00      00 */
-    0x3ffc, /* 00      00 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ffc, /* 00      00 */
-    0x3ffc, /* 00      00 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-    0x3ffc, /* 00      00 */
-    0x3ffc, /* 00      00 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 218 0xda '\332' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 219 0xdb '\333' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 220 0xdc '\334' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 221 0xdd '\335' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 222 0xde '\336' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 223 0xdf '\337' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 224 0xe0 '\340' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 225 0xe1 '\341' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 226 0xe2 '\342' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 227 0xe3 '\343' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 228 0xe4 '\344' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 229 0xe5 '\345' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 230 0xe6 '\346' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 231 0xe7 '\347' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 232 0xe8 '\350' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 233 0xe9 '\351' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 234 0xea '\352' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 235 0xeb '\353' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 236 0xec '\354' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 237 0xed '\355' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 238 0xee '\356' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 239 0xef '\357' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 240 0xf0 '\360' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 241 0xf1 '\361' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 242 0xf2 '\362' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 243 0xf3 '\363' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 244 0xf4 '\364' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 245 0xf5 '\365' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 246 0xf6 '\366' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 247 0xf7 '\367' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 248 0xf8 '\370' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 249 0xf9 '\371' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 250 0xfa '\372' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 251 0xfb '\373' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 252 0xfc '\374' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 253 0xfd '\375' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 254 0xfe '\376' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-  /* 255 0xff '\377' */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-     0xff0, /* 0000    0000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-       0x0, /* 0000000000000000 */
-
-};
diff --git a/src/zm_box.cpp b/src/zm_box.cpp
index 4a69fbf6d..6129b7a29 100644
--- a/src/zm_box.cpp
+++ b/src/zm_box.cpp
@@ -15,9 +15,8 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
+//
 
-#include "zm.h"
 #include "zm_box.h"
 
 // This section deliberately left blank
diff --git a/src/zm_box.h b/src/zm_box.h
index efc12cb18..20e30bcd1 100644
--- a/src/zm_box.h
+++ b/src/zm_box.h
@@ -20,14 +20,8 @@
 #ifndef ZM_BOX_H
 #define ZM_BOX_H
 
-#include "zm.h"
 #include "zm_coord.h"
-
-#ifndef SOLARIS
-#include <math.h>
-#else
 #include <cmath>
-#endif
 
 //
 // Class used for storing a box, which is defined as a region
@@ -39,26 +33,30 @@ private:
   Coord size;
 
 public:
-  inline Box() { }
-  explicit inline Box( int p_size ) : lo( 0, 0 ), hi ( p_size-1, p_size-1 ), size( Coord::Range( hi, lo ) ) { }
+  inline Box() : lo(0,0), hi(0,0), size(0,0) { }
+  explicit inline Box(unsigned int p_size) : lo(0, 0), hi(p_size-1, p_size-1), size(Coord::Range(hi, lo)) { }
   inline Box( int p_x_size, int p_y_size ) : lo( 0, 0 ), hi ( p_x_size-1, p_y_size-1 ), size( Coord::Range( hi, lo ) ) { }
   inline Box( int lo_x, int lo_y, int hi_x, int hi_y ) : lo( lo_x, lo_y ), hi( hi_x, hi_y ), size( Coord::Range( hi, lo ) ) { }
   inline Box( const Coord &p_lo, const Coord &p_hi ) : lo( p_lo ), hi( p_hi ), size( Coord::Range( hi, lo ) ) { }
 
   inline const Coord &Lo() const { return lo; }
   inline int LoX() const { return lo.X(); }
+  inline int LoX(int p_lo_x) { return lo.X(p_lo_x); }
   inline int LoY() const { return lo.Y(); }
+  inline int LoY(int p_lo_y) { return lo.Y(p_lo_y); }
   inline const Coord &Hi() const { return hi; }
   inline int HiX() const { return hi.X(); }
+  inline int HiX(int p_hi_x) { return hi.X(p_hi_x); }
   inline int HiY() const { return hi.Y(); }
+  inline int HiY(int p_hi_y) { return hi.Y(p_hi_y); }
   inline const Coord &Size() const { return size; }
   inline int Width() const { return size.X(); }
   inline int Height() const { return size.Y(); }
   inline int Area() const { return size.X()*size.Y(); }
 
   inline const Coord Centre() const {
-    int mid_x = int(round(lo.X()+(size.X()/2.0)));
-    int mid_y = int(round(lo.Y()+(size.Y()/2.0)));
+    int mid_x = int(std::round(lo.X()+(size.X()/2.0)));
+    int mid_y = int(std::round(lo.Y()+(size.Y()/2.0)));
     return Coord( mid_x, mid_y );
   }
   inline bool Inside( const Coord &coord ) const
diff --git a/src/zm_buffer.cpp b/src/zm_buffer.cpp
index 73c9603e1..b4b970eb3 100644
--- a/src/zm_buffer.cpp
+++ b/src/zm_buffer.cpp
@@ -17,65 +17,74 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */ 
 
-#include <string.h>
-#include <fcntl.h>
-
-#include "zm.h"
 #include "zm_buffer.h"
 
-unsigned int Buffer::assign( const unsigned char *pStorage, unsigned int pSize )
-{
-  if ( mAllocation < pSize )
-  {
+#include <unistd.h>
+
+unsigned int Buffer::assign(const unsigned char *pStorage, unsigned int pSize) {
+  if ( mAllocation < pSize ) {
     delete[] mStorage;
     mAllocation = pSize;
     mHead = mStorage = new unsigned char[pSize];
   }
   mSize = pSize;
-  memcpy( mStorage, pStorage, mSize );
+  memcpy(mStorage, pStorage, mSize);
   mHead = mStorage;
   mTail = mHead + mSize;
-  return( mSize );
+  return mSize;
 }
 
-unsigned int Buffer::expand( unsigned int count )
-{
+unsigned int Buffer::expand(unsigned int count) {
   int spare = mAllocation - mSize;
   int headSpace = mHead - mStorage;
   int tailSpace = spare - headSpace;
   int width = mTail - mHead;
-  if ( spare > (int)count )
-  {
-    if ( tailSpace < (int)count )
-    {
-      memmove( mStorage, mHead, mSize );
+  if ( spare >= static_cast<int>(count) ) {
+    // There is enough space in the allocation might need to shift everything over though
+    //
+    if ( tailSpace < static_cast<int>(count) ) {
+      // if there is extra space at the head, shift everything over
+      memmove(mStorage, mHead, mSize);
       mHead = mStorage;
       mTail = mHead + width;
     }
-  }
-  else
-  {
+  } else {
     mAllocation += count;
     unsigned char *newStorage = new unsigned char[mAllocation];
-    if ( mStorage )
-    {
-      memcpy( newStorage, mHead, mSize );
+    if ( mStorage ) {
+      memcpy(newStorage, mHead, mSize);
       delete[] mStorage;
     }
     mStorage = newStorage;
     mHead = mStorage;
     mTail = mHead + width;
   }
-  return( mSize );
+  return mSize;
 }
 
-int Buffer::read_into( int sd, unsigned int bytes ) {
+int Buffer::read_into(int sd, unsigned int bytes) {
   // Make sure there is enough space
   this->expand(bytes);
-  int bytes_read = read( sd, mTail, bytes );
-  if ( bytes_read > 0 ) {
+  Debug(3, "Reading %u btes", bytes);
+  int bytes_read = ::read(sd, mTail, bytes);
+  if (bytes_read > 0) {
     mTail += bytes_read;
     mSize += bytes_read;
   }
   return bytes_read;
 }
+
+int Buffer::read_into(int sd, unsigned int bytes, struct timeval timeout) {
+  fd_set set;
+  FD_ZERO(&set); /* clear the set */
+  FD_SET(sd, &set); /* add our file descriptor to the set */
+  int rv = select(sd + 1, &set, NULL, NULL, &timeout);
+  if (rv == -1) {
+    Error("Error %d %s from select", errno, strerror(errno));
+    return rv;
+  } else if (rv == 0) {
+    Debug(1, "timeout"); /* a timeout occured */
+    return 0;
+  }
+  return read_into(sd, bytes);
+}
diff --git a/src/zm_buffer.h b/src/zm_buffer.h
index a4b373b6b..c2b509e13 100644
--- a/src/zm_buffer.h
+++ b/src/zm_buffer.h
@@ -20,159 +20,174 @@
 #ifndef ZM_BUFFER_H
 #define ZM_BUFFER_H
 
-#include "zm.h"
+#include "zm_logger.h"
+#include <cstring>
 
-#include <string.h>
-
-class Buffer
-{
-protected:
+class Buffer {
+ protected:
   unsigned char *mStorage;
   unsigned int mAllocation;
   unsigned int mSize;
   unsigned char *mHead;
   unsigned char *mTail;
 
-public:
-  Buffer() : mStorage( nullptr ), mAllocation( 0 ), mSize( 0 ), mHead( nullptr ), mTail( nullptr ) {
+ public:
+  Buffer() :
+    mStorage(nullptr),
+    mAllocation(0),
+    mSize(0),
+    mHead(nullptr),
+    mTail(nullptr) {
   }
-  explicit Buffer( unsigned int pSize ) : mAllocation( pSize ), mSize( 0 ) {
+  explicit Buffer(unsigned int pSize) : mAllocation(pSize), mSize(0) {
     mHead = mStorage = new unsigned char[mAllocation];
+    if (mAllocation) *mHead = '\0';
     mTail = mHead;
   }
-  Buffer( const unsigned char *pStorage, unsigned int pSize ) : mAllocation( pSize ), mSize( pSize ) {
+  Buffer(const unsigned char *pStorage, unsigned int pSize) :
+    mAllocation(pSize), mSize(pSize) {
     mHead = mStorage = new unsigned char[mSize];
-    memcpy( mStorage, pStorage, mSize );
+    std::memcpy(mStorage, pStorage, mSize);
     mTail = mHead + mSize;
   }
-  Buffer( const Buffer &buffer ) : mAllocation( buffer.mSize ), mSize( buffer.mSize ) {
+  Buffer(const Buffer &buffer) :
+    mAllocation(buffer.mSize),
+    mSize(buffer.mSize) {
     mHead = mStorage = new unsigned char[mSize];
-    memcpy( mStorage, buffer.mHead, mSize );
+    std::memcpy(mStorage, buffer.mHead, mSize);
     mTail = mHead + mSize;
   }
   ~Buffer() {
     delete[] mStorage;
   }
-  unsigned char *head() const { return( mHead ); }
-  unsigned char *tail() const { return( mTail ); }
-  unsigned int size() const { return( mSize ); }
+  unsigned char *head() const { return mHead; }
+  unsigned char *tail() const { return mTail; }
+  unsigned int size() const { return mSize; }
   bool empty() const { return( mSize == 0 ); }
   unsigned int size( unsigned int pSize ) {
     if ( mSize < pSize ) {
-      expand( pSize-mSize );
+      expand(pSize-mSize);
     }
-    return( mSize );
+    return mSize;
   }
-  //unsigned int Allocation() const { return( mAllocation ); }
+  // unsigned int Allocation() const { return( mAllocation ); }
 
   void clear() {
     mSize = 0;
     mHead = mTail = mStorage;
   }
 
-  unsigned int assign( const unsigned char *pStorage, unsigned int pSize );
-  unsigned int assign( const Buffer &buffer ) {
-    return( assign( buffer.mHead, buffer.mSize ) );
+  unsigned int assign(const unsigned char *pStorage, unsigned int pSize);
+  unsigned int assign(const Buffer &buffer) {
+    return assign(buffer.mHead, buffer.mSize);
   }
 
   // Trim from the front of the buffer
-  unsigned int consume( unsigned int count ) {
-    if ( count > mSize ) {
-      Warning( "Attempt to consume %d bytes of buffer, size is only %d bytes", count, mSize );
+  unsigned int consume(unsigned int count) {
+    if (count > mSize) {
+      Warning("Attempt to consume %d bytes of buffer, size is only %d bytes",
+          count, mSize);
       count = mSize;
     }
     mHead += count;
     mSize -= count;
-    tidy( 0 );
-    return( count );
+    tidy(0);
+    return count;
   }
   // Trim from the end of the buffer
-  unsigned int shrink( unsigned int count ) {
-    if ( count > mSize ) {
-      Warning( "Attempt to shrink buffer by %d bytes, size is only %d bytes", count, mSize );
+  unsigned int shrink(unsigned int count) {
+    if (count > mSize) {
+      Warning("Attempt to shrink buffer by %d bytes, size is only %d bytes",
+          count, mSize);
       count = mSize;
     }
     mSize -= count;
-    if ( mTail > (mHead + mSize) )
+    if (mTail > (mHead + mSize))
       mTail = mHead + mSize;
-    tidy( 0 );
-    return( count );
+    tidy(0);
+    return count;
   }
   // Add to the end of the buffer
-  unsigned int expand( unsigned int count );
+  unsigned int expand(unsigned int count);
 
   // Return pointer to the first pSize bytes and advance the head
-  unsigned char *extract( unsigned int pSize ) {
-    if ( pSize > mSize ) {
-      Warning( "Attempt to extract %d bytes of buffer, size is only %d bytes", pSize, mSize );
+  // We don't call tidy here because it is assumed the ram will be used afterwards
+  // This differs from consume
+  unsigned char *extract(unsigned int pSize) {
+    if (pSize > mSize) {
+      Warning("Attempt to extract %d bytes of buffer, size is only %d bytes",
+          pSize, mSize);
       pSize = mSize;
     }
     unsigned char *oldHead = mHead;
     mHead += pSize;
     mSize -= pSize;
-    tidy( 0 );
-    return( oldHead );
+    return oldHead;
   }
   // Add bytes to the end of the buffer
-  unsigned int append( const unsigned char *pStorage, unsigned int pSize ) {
-    expand( pSize );
-    memcpy( mTail, pStorage, pSize );
+  unsigned int append(const unsigned char *pStorage, unsigned int pSize) {
+    expand(pSize);
+    std::memcpy(mTail, pStorage, pSize);
     mTail += pSize;
     mSize += pSize;
-    return( mSize );
+    return mSize;
   }
-  unsigned int append( const char *pStorage, unsigned int pSize ) {
-    return( append( (const unsigned char *)pStorage, pSize ) );
+  unsigned int append(const char *pStorage, unsigned int pSize) {
+    return append((const unsigned char *)pStorage, pSize);
   }
-  unsigned int append( const Buffer &buffer ) {
-    return( append( buffer.mHead, buffer.mSize ) );
+  unsigned int append(const Buffer &buffer) {
+    return append(buffer.mHead, buffer.mSize);
   }
-  void tidy( bool level=0 ) {
-    if ( mHead != mStorage ) {
-      if ( mSize == 0 )
+  void tidy(bool level=0) {
+    if (mHead != mStorage) {
+      if (mSize == 0) {
         mHead = mTail = mStorage;
-      else if ( level ) {
-        if ( ((uintptr_t)mHead-(uintptr_t)mStorage) > mSize ) {
-          memcpy( mStorage, mHead, mSize );
+//*mHead = '\0';
+      } else if (level) {
+        if (((uintptr_t)mHead-(uintptr_t)mStorage) > mSize) {
+          std::memcpy(mStorage, mHead, mSize);
           mHead = mStorage;
           mTail = mHead + mSize;
         }
       }
+    } else if (mSize == 0) {
+      *mHead = '\0';
     }
   }
 
-  Buffer &operator=( const Buffer &buffer ) {
-    assign( buffer );
-    return( *this );
+  Buffer &operator=(const Buffer &buffer) {
+    assign(buffer);
+    return *this;
   }
-  Buffer &operator+=( const Buffer &buffer ) {
-    append( buffer );
-    return( *this );
+  Buffer &operator+=(const Buffer &buffer) {
+    append(buffer);
+    return *this;
   }
-  Buffer &operator+=( unsigned int count ) {
-    expand( count );
-    return( *this );
+  Buffer &operator+=(unsigned int count) {
+    expand(count);
+    return *this;
   }
-  Buffer &operator-=( unsigned int count ) {
-    consume( count );
-    return( *this );
+  Buffer &operator-=(unsigned int count) {
+    consume(count);
+    return *this;
   }
   operator unsigned char *() const {
-    return( mHead );
+    return mHead;
   }
   operator char *() const {
-    return( (char *)mHead );
+    return reinterpret_cast<char *>(mHead);
   }
   unsigned char *operator+(int offset) const {
-    return( (unsigned char *)(mHead+offset) );
+    return (unsigned char *)(mHead+offset);
   }
   unsigned char operator[](int index) const {
-    return( *(mHead+index) );
+    return *(mHead+index);
   }
   operator int () const {
-    return( (int)mSize );
+    return static_cast<int>(mSize);
   }
-  int read_into( int sd, unsigned int bytes );
+  int read_into(int sd, unsigned int bytes);
+  int read_into(int sd, unsigned int bytes, struct timeval timeout);
 };
 
 #endif // ZM_BUFFER_H
diff --git a/src/zm_camera.cpp b/src/zm_camera.cpp
index 0b4b208a8..c56cc34c7 100644
--- a/src/zm_camera.cpp
+++ b/src/zm_camera.cpp
@@ -17,11 +17,12 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-#include "zm.h"
 #include "zm_camera.h"
 
+#include "zm_monitor.h"
+
 Camera::Camera(
-    unsigned int p_monitor_id,
+    const Monitor *monitor,
     SourceType p_type,
     unsigned int p_width,
     unsigned int p_height,
@@ -34,18 +35,30 @@ Camera::Camera(
     bool p_capture,
     bool p_record_audio
     ) :
-    monitor_id(p_monitor_id),
+    monitor(monitor),
     type(p_type),
     width(p_width),
     height(p_height),
     colours(p_colours),
-    subpixelorder(p_subpixelorder),
+    subpixelorder(p_subpixelorder),    
     brightness(p_brightness),
     hue(p_hue),
     colour(p_colour),
     contrast(p_contrast),
     capture(p_capture),
     record_audio(p_record_audio),
+    mVideoStreamId(-1),
+    mAudioStreamId(-1),
+    mVideoCodecContext(nullptr),
+    mAudioCodecContext(nullptr),
+    mVideoStream(nullptr),
+    mAudioStream(nullptr),
+    mFormatContext(nullptr),
+    mSecondFormatContext(nullptr),
+    mFirstVideoPTS(0),
+    mFirstAudioPTS(0),
+    mLastVideoPTS(0),
+    mLastAudioPTS(0),
     bytes(0)
 {
   linesize = width * colours;
@@ -53,21 +66,48 @@ Camera::Camera(
   imagesize = height * linesize;
 
   Debug(2, "New camera id: %d width: %d line size: %d height: %d colours: %d subpixelorder: %d capture: %d",
-      monitor_id, width, linesize, height, colours, subpixelorder, capture);
-
-  monitor = nullptr;
+      monitor->Id(), width, linesize, height, colours, subpixelorder, capture);
 }
 
 Camera::~Camera() {
+  if ( mFormatContext ) {
+    // Should also free streams
+    avformat_free_context(mFormatContext);
+  }
+  if ( mSecondFormatContext ) {
+    // Should also free streams
+    avformat_free_context(mSecondFormatContext);
+  }
+  mVideoStream = nullptr;
+  mAudioStream = nullptr;
 }
 
-Monitor *Camera::getMonitor() {
-  if ( ! monitor )
-    monitor = Monitor::Load(monitor_id, false, Monitor::QUERY);
-  return monitor;
-}
-
-void Camera::setMonitor(Monitor *p_monitor) {
-  monitor = p_monitor;
-  monitor_id = monitor->Id();
+AVStream *Camera::getVideoStream() {
+  if ( !mVideoStream ) {
+    if ( !mFormatContext )
+      mFormatContext = avformat_alloc_context();
+    Debug(1, "Allocating avstream");
+    mVideoStream = avformat_new_stream(mFormatContext, nullptr);
+    if ( mVideoStream ) {
+      mVideoStream->time_base = (AVRational){1, 1000000}; // microseconds as base frame rate
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      mVideoStream->codecpar->width = width;
+      mVideoStream->codecpar->height = height;
+      mVideoStream->codecpar->format = GetFFMPEGPixelFormat(colours, subpixelorder);
+      mVideoStream->codecpar->codec_type = AVMEDIA_TYPE_VIDEO;
+      mVideoStream->codecpar->codec_id = AV_CODEC_ID_NONE;
+    Debug(1, "Allocating avstream %p %p %d", mVideoStream, mVideoStream->codecpar, mVideoStream->codecpar->codec_id);
+#else
+      mVideoStream->codec->width = width;
+      mVideoStream->codec->height = height;
+      mVideoStream->codec->pix_fmt = GetFFMPEGPixelFormat(colours, subpixelorder);
+      mVideoStream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+      mVideoStream->codec->codec_id = AV_CODEC_ID_NONE;
+#endif
+    } else {
+      Error("Can't create video stream");
+    }
+    mVideoStreamId = mVideoStream->index;
+  }
+  return mVideoStream;
 }
diff --git a/src/zm_camera.h b/src/zm_camera.h
index 7f0ab0796..fb117dcfb 100644
--- a/src/zm_camera.h
+++ b/src/zm_camera.h
@@ -20,14 +20,12 @@
 #ifndef ZM_CAMERA_H
 #define ZM_CAMERA_H
 
-#include <sys/types.h>
-#include <sys/ioctl.h>
-
 #include "zm_image.h"
+#include <sys/ioctl.h>
+#include <sys/types.h>
 
-class Camera;
-
-#include "zm_monitor.h"
+class Monitor;
+class ZMPacket;
 
 //
 // Abstract base class for cameras. This is intended just to express
@@ -37,8 +35,7 @@ class Camera {
 protected:
   typedef enum { LOCAL_SRC, REMOTE_SRC, FILE_SRC, FFMPEG_SRC, LIBVLC_SRC, CURL_SRC, VNC_SRC } SourceType;
 
-  unsigned int  monitor_id;
-  Monitor *     monitor; // Null on instantiation, set as soon as possible.
+  const Monitor *monitor;
   SourceType    type;
   unsigned int  width;
   unsigned int  linesize;
@@ -53,15 +50,37 @@ protected:
   int           contrast;
   bool          capture;
   bool          record_audio;
+  int                 mVideoStreamId;
+  int                 mAudioStreamId;
+  AVCodecContext      *mVideoCodecContext;
+  AVCodecContext      *mAudioCodecContext;
+  AVStream *mVideoStream;
+  AVStream *mAudioStream;
+  AVFormatContext *mFormatContext; // One for video, one for audio
+  AVFormatContext *mSecondFormatContext; // One for video, one for audio
+  int64_t     mFirstVideoPTS;
+  int64_t     mFirstAudioPTS;
+  int64_t     mLastVideoPTS;
+  int64_t     mLastAudioPTS;
   unsigned int  bytes;
 
 public:
-  Camera( unsigned int p_monitor_id, SourceType p_type, unsigned int p_width, unsigned int p_height, int p_colours, int p_subpixelorder, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  Camera(
+      const Monitor* monitor,
+      SourceType p_type,
+      unsigned int p_width,
+      unsigned int p_height,
+      int p_colours,
+      int p_subpixelorder,
+      int p_brightness,
+      int p_contrast,
+      int p_hue,
+      int p_colour,
+      bool p_capture,
+      bool p_record_audio
+      );
   virtual ~Camera();
 
-  unsigned int getId() const { return monitor_id; }
-  Monitor *getMonitor();
-  void  setMonitor( Monitor *p_monitor );
   SourceType Type() const { return type; }
   bool IsLocal() const { return type == LOCAL_SRC; }
   bool IsRemote() const { return type == REMOTE_SRC; }
@@ -78,6 +97,20 @@ public:
   unsigned int Pixels() const { return pixels; }
   unsigned long long ImageSize() const { return imagesize; }
   unsigned int Bytes() const { return bytes; };
+  int getFrequency() {
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+    return mAudioStream ? mAudioStream->codecpar->sample_rate : -1;
+#else
+    return mAudioStream ? mAudioStream->codec->sample_rate : -1;
+#endif
+  }
+  int getChannels() {
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+    return mAudioStream ? mAudioStream->codecpar->channels : -1;
+#else
+    return mAudioStream ? mAudioStream->codec->channels : -1;
+#endif
+  }
 
   virtual int Brightness( int/*p_brightness*/=-1 ) { return -1; }
   virtual int Hue( int/*p_hue*/=-1 ) { return -1; }
@@ -91,11 +124,17 @@ public:
     //return (type == FFMPEG_SRC )||(type == REMOTE_SRC);
   }
 
+  virtual AVStream      *getVideoStream();
+  virtual AVStream      *getAudioStream() { return mAudioStream; };
+  virtual AVCodecContext     *getVideoCodecContext() { return mVideoCodecContext; };
+  virtual AVCodecContext     *getAudioCodecContext() { return mAudioCodecContext; };
+  int            getVideoStreamId() { return mVideoStreamId; };
+  int            getAudioStreamId() { return mAudioStreamId; };
+
   virtual int PrimeCapture() { return 0; }
   virtual int PreCapture() = 0;
-  virtual int Capture(Image &image) = 0;
+  virtual int Capture(ZMPacket &p) = 0;
   virtual int PostCapture() = 0;
-  virtual int CaptureAndRecord(Image &image, timeval recording, char* event_directory) = 0;
   virtual int Close() = 0;
 };
 
diff --git a/src/zm_comms.cpp b/src/zm_comms.cpp
index b7231d4fd..7f933d16f 100644
--- a/src/zm_comms.cpp
+++ b/src/zm_comms.cpp
@@ -20,858 +20,722 @@
 #include "zm_comms.h"
 
 #include "zm_logger.h"
-
-#include <errno.h>
+#include <arpa/inet.h>   // for debug output
+#include <cerrno>
+#include <cstdarg>
+#include <cstdio>       // for snprintf
 #include <fcntl.h>
-#include <stdarg.h>
-//#include <memory.h>
-#if defined(BSD)
-#include <stdlib.h>
-#else
-#include <alloca.h>
-#endif
-
-//#include <unistd.h>
+#include <netinet/tcp.h>
 #include <sys/ioctl.h>
 #include <sys/param.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>   // for debug output
-#include <stdio.h>       // for snprintf
+#include <utility>
 
 #ifdef SOLARIS
 #include <sys/filio.h> // define FIONREAD
 #endif
 
-int CommsBase::readV( int iovcnt, /* const void *, int, */ ... ) {
+int ZM::CommsBase::readV(int iovcnt, /* const void *, int, */ ...) {
   va_list arg_ptr;
-  struct iovec iov[iovcnt];
-  //struct iovec *iov = (struct iovec *)alloca( sizeof(struct iovec)*iovcnt );
+  iovec iov[iovcnt];
 
-  va_start( arg_ptr, iovcnt );
-  for ( int i = 0; i < iovcnt; i++ )
-  {
-    iov[i].iov_base = va_arg( arg_ptr, void * );
-    iov[i].iov_len = va_arg( arg_ptr, int );
+  va_start(arg_ptr, iovcnt);
+  for (int i = 0; i < iovcnt; i++) {
+    iov[i].iov_base = va_arg(arg_ptr, void *);
+    iov[i].iov_len = va_arg(arg_ptr, int);
   }
-  va_end( arg_ptr );
+  va_end(arg_ptr);
 
-  int nBytes = ::readv( mRd, iov, iovcnt );
-  if ( nBytes < 0 )
-    Debug( 1, "Readv of %d buffers max on rd %d failed: %s", iovcnt, mRd, strerror(errno) );
-  return( nBytes );
+  int nBytes = ::readv(mRd, iov, iovcnt);
+  if (nBytes < 0) {
+    Debug(1, "Readv of %d buffers max on rd %d failed: %s", iovcnt, mRd, strerror(errno));
+  }
+  return nBytes;
 }
 
-int CommsBase::writeV( int iovcnt, /* const void *, int, */ ... ) {
+int ZM::CommsBase::writeV(int iovcnt, /* const void *, int, */ ...) {
   va_list arg_ptr;
-  struct iovec iov[iovcnt];
-  //struct iovec *iov = (struct iovec *)alloca( sizeof(struct iovec)*iovcnt );
+  iovec iov[iovcnt];
 
-  va_start( arg_ptr, iovcnt );
-  for ( int i = 0; i < iovcnt; i++ )
-  {
-    iov[i].iov_base = va_arg( arg_ptr, void * );
-    iov[i].iov_len = va_arg( arg_ptr, int );
+  va_start(arg_ptr, iovcnt);
+  for (int i = 0; i < iovcnt; i++) {
+    iov[i].iov_base = va_arg(arg_ptr, void *);
+    iov[i].iov_len = va_arg(arg_ptr, int);
   }
-  va_end( arg_ptr );
+  va_end(arg_ptr);
 
-  ssize_t nBytes = ::writev( mWd, iov, iovcnt );
-  if ( nBytes < 0 )
-    Debug( 1, "Writev of %d buffers on wd %d failed: %s", iovcnt, mWd, strerror(errno) );
-  return( nBytes );
+  ssize_t nBytes = ::writev(mWd, iov, iovcnt);
+  if (nBytes < 0) {
+    Debug(1, "Writev of %d buffers on wd %d failed: %s", iovcnt, mWd, strerror(errno));
+  }
+  return nBytes;
 }
 
-bool Pipe::open()
-{
-  if ( ::pipe( mFd ) < 0 )
-  {
-    Error( "pipe(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+bool ZM::Pipe::open() {
+  if (::pipe(mFd) < 0) {
+    Error("pipe(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
 
-  return( true );
+  return true;
 }
 
-bool Pipe::close()
-{
-  if ( mFd[0] > -1 ) ::close( mFd[0] );
+bool ZM::Pipe::close() {
+  if (mFd[0] > -1) {
+    ::close(mFd[0]);
+  }
   mFd[0] = -1;
-  if ( mFd[1] > -1 ) ::close( mFd[1] );
+  if (mFd[1] > -1) {
+    ::close(mFd[1]);
+  }
   mFd[1] = -1;
-  return( true );
+  return true;
 }
 
-bool Pipe::setBlocking( bool blocking )
-{
+bool ZM::Pipe::setBlocking(bool blocking) {
   int flags;
 
   /* Now set it for non-blocking I/O */
-  if ( (flags = fcntl( mFd[1], F_GETFL )) < 0 )
-  {
-    Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+  if ((flags = fcntl(mFd[1], F_GETFL)) < 0) {
+    Error("fcntl(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
-  if ( blocking )
-  {
+  if (blocking) {
     flags &= ~O_NONBLOCK;
-  }
-  else
-  {
+  } else {
     flags |= O_NONBLOCK;
   }
-  if ( fcntl( mFd[1], F_SETFL, flags ) < 0 )
-  {
-    Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+  if (fcntl(mFd[1], F_SETFL, flags) < 0) {
+    Error("fcntl(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
 
-  return( true );
+  return true;
 }
 
-SockAddr::SockAddr( const struct sockaddr *addr ) : mAddr( addr )
-{
-}
+ZM::SockAddr *ZM::SockAddr::newSockAddr(const sockaddr &addr, socklen_t len) {
+  if ((addr.sa_family == AF_INET) && (len == SockAddrInet::addrSize())) {
+    return new SockAddrInet((const sockaddr_in *) &addr);
+  } else if ((addr.sa_family == AF_UNIX) && (len == SockAddrUnix::addrSize())) {
+    return new SockAddrUnix((const sockaddr_un *) &addr);
+  }
 
-SockAddr *SockAddr::newSockAddr( const struct sockaddr &addr, socklen_t len )
-{
-  if ( addr.sa_family == AF_INET && len == SockAddrInet::addrSize() )
-  {
-    return( new SockAddrInet( (const struct sockaddr_in *)&addr ) );
-  }
-  else if ( addr.sa_family == AF_UNIX && len == SockAddrUnix::addrSize() )
-  {
-    return( new SockAddrUnix( (const struct sockaddr_un *)&addr ) );
-  }
-  Error( "Unable to create new SockAddr from addr family %d with size %d", addr.sa_family, len );
+  Error("Unable to create new SockAddr from addr family %d with size %d", addr.sa_family, len);
   return nullptr;
 }
 
-SockAddr *SockAddr::newSockAddr( const SockAddr *addr )
-{
-  if ( !addr )
+ZM::SockAddr *ZM::SockAddr::newSockAddr(const SockAddr *addr) {
+  if (!addr) {
     return nullptr;
+  }
 
-  if ( addr->getDomain() == AF_INET )
-  {
-    return( new SockAddrInet( *(SockAddrInet *)addr ) );
+  if (addr->getDomain() == AF_INET) {
+    return new SockAddrInet(*(SockAddrInet *) addr);
+  } else if (addr->getDomain() == AF_UNIX) {
+    return new SockAddrUnix(*(SockAddrUnix *) addr);
   }
-  else if ( addr->getDomain() == AF_UNIX )
-  {
-    return( new SockAddrUnix( *(SockAddrUnix *)addr ) );
-  }
-  Error( "Unable to create new SockAddr from addr family %d", addr->getDomain() );
+
+  Error("Unable to create new SockAddr from addr family %d", addr->getDomain());
   return nullptr;
 }
 
-SockAddrInet::SockAddrInet() : SockAddr( (struct sockaddr *)&mAddrIn )
-{
-}
+bool ZM::SockAddrInet::resolve(const char *host, const char *serv, const char *proto) {
+  memset(&mAddrIn, 0, sizeof(mAddrIn));
 
-bool SockAddrInet::resolve( const char *host, const char *serv, const char *proto )
-{
-  memset( &mAddrIn, 0, sizeof(mAddrIn) );
-
-  struct hostent *hostent=nullptr;
-  if ( !(hostent = ::gethostbyname( host ) ) )
-  {
-    Error( "gethostbyname( %s ), h_errno = %d", host, h_errno );
-    return( false );
+  hostent *hostent = nullptr;
+  if (!(hostent = ::gethostbyname(host))) {
+    Error("gethostbyname(%s), h_errno = %d", host, h_errno);
+    return false;
   }
 
-  struct servent *servent=nullptr;
-  if ( !(servent = ::getservbyname( serv, proto ) ) )
-  {
-    Error( "getservbyname( %s ), errno = %d, error = %s", serv, errno, strerror(errno) );
-    return( false );
+  servent *servent = nullptr;
+  if (!(servent = ::getservbyname(serv, proto))) {
+    Error("getservbyname( %s ), errno = %d, error = %s", serv, errno, strerror(errno));
+    return false;
   }
 
   mAddrIn.sin_port = servent->s_port;
   mAddrIn.sin_family = AF_INET;
-  mAddrIn.sin_addr.s_addr = ((struct in_addr *)(hostent->h_addr))->s_addr;
+  mAddrIn.sin_addr.s_addr = ((in_addr *) (hostent->h_addr))->s_addr;
 
-  return( true );
+  return true;
 }
 
-bool SockAddrInet::resolve( const char *host, int port, const char *proto )
-{
-  memset( &mAddrIn, 0, sizeof(mAddrIn) );
+bool ZM::SockAddrInet::resolve(const char *host, int port, const char *proto) {
+  memset(&mAddrIn, 0, sizeof(mAddrIn));
 
-  struct hostent *hostent=nullptr;
-  if ( !(hostent = ::gethostbyname( host ) ) )
-  {
-    Error( "gethostbyname( %s ), h_errno = %d", host, h_errno );
-    return( false );
+  hostent *hostent = nullptr;
+  if (!(hostent = ::gethostbyname(host))) {
+    Error("gethostbyname(%s), h_errno = %d", host, h_errno);
+    return false;
   }
 
   mAddrIn.sin_port = htons(port);
   mAddrIn.sin_family = AF_INET;
-  mAddrIn.sin_addr.s_addr = ((struct in_addr *)(hostent->h_addr))->s_addr;
-  return( true );
+  mAddrIn.sin_addr.s_addr = ((in_addr *) (hostent->h_addr))->s_addr;
+  return true;
 }
 
-bool SockAddrInet::resolve( const char *serv, const char *proto )
-{
-  memset( &mAddrIn, 0, sizeof(mAddrIn) );
+bool ZM::SockAddrInet::resolve(const char *serv, const char *proto) {
+  memset(&mAddrIn, 0, sizeof(mAddrIn));
 
-  struct servent *servent=nullptr;
-  if ( !(servent = ::getservbyname( serv, proto ) ) )
-  {
-    Error( "getservbyname( %s ), errno = %d, error = %s", serv, errno, strerror(errno) );
-    return( false );
+  servent *servent = nullptr;
+  if (!(servent = ::getservbyname(serv, proto))) {
+    Error("getservbyname(%s), errno = %d, error = %s", serv, errno, strerror(errno));
+    return false;
   }
 
   mAddrIn.sin_port = servent->s_port;
   mAddrIn.sin_family = AF_INET;
   mAddrIn.sin_addr.s_addr = INADDR_ANY;
 
-  return( true );
+  return true;
 }
 
-bool SockAddrInet::resolve( int port, const char *proto )
-{
-  memset( &mAddrIn, 0, sizeof(mAddrIn) );
+bool ZM::SockAddrInet::resolve(int port, const char *proto) {
+  memset(&mAddrIn, 0, sizeof(mAddrIn));
 
   mAddrIn.sin_port = htons(port);
   mAddrIn.sin_family = AF_INET;
   mAddrIn.sin_addr.s_addr = INADDR_ANY;
 
-  return( true );
+  return true;
 }
 
-SockAddrUnix::SockAddrUnix() : SockAddr( (struct sockaddr *)&mAddrUn )
-{
-}
+bool ZM::SockAddrUnix::resolve(const char *path, const char *proto) {
+  memset(&mAddrUn, 0, sizeof(mAddrUn));
 
-bool SockAddrUnix::resolve( const char *path, const char *proto )
-{
-  memset( &mAddrUn, 0, sizeof(mAddrUn) );
-
-  strncpy( mAddrUn.sun_path, path, sizeof(mAddrUn.sun_path) );
+  strncpy(mAddrUn.sun_path, path, sizeof(mAddrUn.sun_path));
   mAddrUn.sun_family = AF_UNIX;
 
-  return( true );
+  return true;
 }
 
-bool Socket::socket()
-{
-  if ( mSd >= 0 )
-    return( true );
+bool ZM::Socket::socket() {
+  if (mSd >= 0) {
+    return true;
+  }
 
-  if ( (mSd = ::socket( getDomain(), getType(), 0 ) ) < 0 )
-  {
-    Error( "socket(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+  if ((mSd = ::socket(getDomain(), getType(), 0)) < 0) {
+    Error("socket(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
 
   int val = 1;
 
-  (void)::setsockopt( mSd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val) );
-  (void)::setsockopt( mSd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val) );
+  ::setsockopt(mSd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+  ::setsockopt(mSd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val));
 
   mState = DISCONNECTED;
-
-  return( true );
+  return true;
 }
 
-bool Socket::connect()
-{
-  if ( !socket() ) 
-    return( false );
+bool ZM::Socket::connect() {
+  if (!socket()) {
+    return false;
+  }
 
-  if ( ::connect( mSd, mRemoteAddr->getAddr(), getAddrSize() ) == -1 )
-  {
-    Error( "connect(), errno = %d, error = %s", errno, strerror(errno) );
+  if (::connect(mSd, mRemoteAddr->getAddr(), getAddrSize()) == -1) {
+    Error("connect(), errno = %d, error = %s", errno, strerror(errno));
     close();
-    return( false );
+    return false;
   }
 
   mState = CONNECTED;
-
-  return( true );
+  return true;
 }
 
-bool Socket::bind()
-{
-  if ( !socket() )
-    return( false );
-
-  if ( ::bind( mSd, mLocalAddr->getAddr(), getAddrSize() ) == -1 )
-  {
-    Error( "bind(), errno = %d, error = %s", errno, strerror(errno) );
-    close();
-    return( false );
+bool ZM::Socket::bind() {
+  if (!socket()) {
+    return false;
   }
-  return( true );
+
+  if (::bind(mSd, mLocalAddr->getAddr(), getAddrSize()) == -1) {
+    Error("bind(), errno = %d, error = %s", errno, strerror(errno));
+    close();
+    return false;
+  }
+  return true;
 }
 
-bool Socket::listen()
-{
-  if ( ::listen( mSd, SOMAXCONN ) == -1 )
-  {
-    Error( "listen(), errno = %d, error = %s", errno, strerror(errno) );
+bool ZM::Socket::listen() {
+  if (::listen(mSd, SOMAXCONN) == -1) {
+    Error("listen(), errno = %d, error = %s", errno, strerror(errno));
     close();
-    return( false );
+    return false;
   }
 
   mState = LISTENING;
-
-  return( true );
+  return true;
 }
 
-bool Socket::accept()
-{
-  struct sockaddr *rem_addr = mLocalAddr->getTempAddr();
+bool ZM::Socket::accept() {
+  sockaddr rem_addr = {};
   socklen_t rem_addr_size = getAddrSize();
 
   int newSd = -1;
-  if ( (newSd = ::accept( mSd, rem_addr, &rem_addr_size )) == -1 )
-  {
-    Error( "accept(), errno = %d, error = %s", errno, strerror(errno) );
+  if ((newSd = ::accept(mSd, &rem_addr, &rem_addr_size)) == -1) {
+    Error("accept(), errno = %d, error = %s", errno, strerror(errno));
     close();
-    return( false );
+    return false;
   }
 
-  ::close( mSd );
+  ::close(mSd);
   mSd = newSd;
 
   mState = CONNECTED;
-
-  return( true );
+  return true;
 }
 
-bool Socket::accept( int &newSd )
-{
-  struct sockaddr *rem_addr = mLocalAddr->getTempAddr();
+bool ZM::Socket::accept(int &newSd) {
+  sockaddr rem_addr = {};
   socklen_t rem_addr_size = getAddrSize();
 
   newSd = -1;
-  if ( (newSd = ::accept( mSd, rem_addr, &rem_addr_size )) == -1 )
-  {
-    Error( "accept(), errno = %d, error = %s", errno, strerror(errno) );
+  if ((newSd = ::accept(mSd, &rem_addr, &rem_addr_size)) == -1) {
+    Error("accept(), errno = %d, error = %s", errno, strerror(errno));
     close();
-    return( false );
+    return false;
   }
 
-  return( true );
+  return true;
 }
 
-bool Socket::close()
-{
-  if ( mSd > -1 ) ::close( mSd );
+bool ZM::Socket::close() {
+  if (mSd > -1) {
+    ::close(mSd);
+  }
+
   mSd = -1;
   mState = CLOSED;
-  return( true );
+  return true;
 }
 
-int Socket::bytesToRead() const
-{
+int ZM::Socket::bytesToRead() const {
   int bytes_to_read = 0;
 
-  if ( ioctl( mSd, FIONREAD, &bytes_to_read ) < 0 )
-  {
-    Error( "ioctl(), errno = %d, error = %s", errno, strerror(errno) );
-    return( -1 );
+  if (ioctl(mSd, FIONREAD, &bytes_to_read) < 0) {
+    Error("ioctl(), errno = %d, error = %s", errno, strerror(errno));
+    return -1;
   }
-  return( bytes_to_read );
+  return bytes_to_read;
 }
 
-bool Socket::getBlocking( bool &blocking )
-{
+bool ZM::Socket::getBlocking(bool &blocking) {
   int flags;
 
-  if ( (flags = fcntl( mSd, F_GETFL )) < 0 )
-  {
-    Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+  if ((flags = fcntl(mSd, F_GETFL)) < 0) {
+    Error("fcntl(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
-  blocking = (flags & O_NONBLOCK);
-  return( true );
+  blocking = flags & O_NONBLOCK;
+  return true;
 }
 
-bool Socket::setBlocking( bool blocking )
-{
-#if 0
-  // ioctl is apparently not recommended
-  int ioctl_arg = !blocking;
-  if ( ioctl( mSd, FIONBIO, &ioctl_arg ) < 0 )
-  {
-    Error( "ioctl(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
-  }
-  return( true );
-#endif
-
+bool ZM::Socket::setBlocking(bool blocking) {
   int flags;
 
   /* Now set it for non-blocking I/O */
-  if ( (flags = fcntl( mSd, F_GETFL )) < 0 )
-  {
-    Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+  if ((flags = fcntl(mSd, F_GETFL)) < 0) {
+    Error("fcntl(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
-  if ( blocking )
-  {
+  if (blocking) {
     flags &= ~O_NONBLOCK;
-  }
-  else
-  {
+  } else {
     flags |= O_NONBLOCK;
   }
-  if ( fcntl( mSd, F_SETFL, flags ) < 0 )
-  {
-    Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+  if (fcntl(mSd, F_SETFL, flags) < 0) {
+    Error("fcntl(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
 
-  return( true );
+  return true;
 }
 
-bool Socket::getSendBufferSize( int &buffersize ) const
-{
+int ZM::Socket::getSendBufferSize(int &buffersize) const {
   socklen_t optlen = sizeof(buffersize);
-  if ( getsockopt( mSd, SOL_SOCKET, SO_SNDBUF, &buffersize, &optlen ) < 0 )
-  {
-    Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-    return( -1 );
+  if (getsockopt(mSd, SOL_SOCKET, SO_SNDBUF, &buffersize, &optlen) < 0) {
+    Error("getsockopt(), errno = %d, error = %s", errno, strerror(errno));
+    return -1;
   }
-  return( buffersize );
+  return buffersize;
 }
 
-bool Socket::getRecvBufferSize( int &buffersize ) const
-{
+int ZM::Socket::getRecvBufferSize(int &buffersize) const {
   socklen_t optlen = sizeof(buffersize);
-  if ( getsockopt( mSd, SOL_SOCKET, SO_RCVBUF, &buffersize, &optlen ) < 0 )
-  {
-    Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-    return( -1 );
+  if (getsockopt(mSd, SOL_SOCKET, SO_RCVBUF, &buffersize, &optlen) < 0) {
+    Error("getsockopt(), errno = %d, error = %s", errno, strerror(errno));
+    return -1;
   }
-  return( buffersize );
+  return buffersize;
 }
 
-bool Socket::setSendBufferSize( int buffersize )
-{
-  if ( setsockopt( mSd, SOL_SOCKET, SO_SNDBUF, (char *)&buffersize, sizeof(buffersize)) < 0 )
-  {
-    Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+bool ZM::Socket::setSendBufferSize(int buffersize) {
+  if (setsockopt(mSd, SOL_SOCKET, SO_SNDBUF, (char *) &buffersize, sizeof(buffersize)) < 0) {
+    Error("setsockopt(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
-  return( true );
+  return true;
 }
 
-bool Socket::setRecvBufferSize( int buffersize )
-{
-  if ( setsockopt( mSd, SOL_SOCKET, SO_RCVBUF, (char *)&buffersize, sizeof(buffersize)) < 0 )
-  {
-    Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+bool ZM::Socket::setRecvBufferSize(int buffersize) {
+  if (setsockopt(mSd, SOL_SOCKET, SO_RCVBUF, (char *) &buffersize, sizeof(buffersize)) < 0) {
+    Error("setsockopt(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
-  return( true );
+  return true;
 }
 
-bool Socket::getRouting( bool &route ) const
-{
+bool ZM::Socket::getRouting(bool &route) const {
   int dontRoute;
   socklen_t optlen = sizeof(dontRoute);
-  if ( getsockopt( mSd, SOL_SOCKET, SO_DONTROUTE, &dontRoute, &optlen ) < 0 )
-  {
-    Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+  if (getsockopt(mSd, SOL_SOCKET, SO_DONTROUTE, &dontRoute, &optlen) < 0) {
+    Error("getsockopt(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
   route = !dontRoute;
-  return( true );
+  return true;
 }
 
-bool Socket::setRouting( bool route )
-{
+bool ZM::Socket::setRouting(bool route) {
   int dontRoute = !route;
-  if ( setsockopt( mSd, SOL_SOCKET, SO_DONTROUTE, (char *)&dontRoute, sizeof(dontRoute)) < 0 )
-  {
-    Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+  if (setsockopt(mSd, SOL_SOCKET, SO_DONTROUTE, (char *) &dontRoute, sizeof(dontRoute)) < 0) {
+    Error("setsockopt(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
-  return( true );
+  return true;
 }
 
-bool Socket::getNoDelay( bool &nodelay ) const
-{
+bool ZM::Socket::getNoDelay(bool &nodelay) const {
   int int_nodelay;
   socklen_t optlen = sizeof(int_nodelay);
-  if ( getsockopt( mSd, IPPROTO_TCP, TCP_NODELAY, &int_nodelay, &optlen ) < 0 )
-  {
-    Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+  if (getsockopt(mSd, IPPROTO_TCP, TCP_NODELAY, &int_nodelay, &optlen) < 0) {
+    Error("getsockopt(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
   nodelay = int_nodelay;
-  return( true );
+  return true;
 }
 
-bool Socket::setNoDelay( bool nodelay )
-{
+bool ZM::Socket::setNoDelay(bool nodelay) {
   int int_nodelay = nodelay;
 
-  if ( setsockopt( mSd, IPPROTO_TCP, TCP_NODELAY, (char *)&int_nodelay, sizeof(int_nodelay)) < 0 )
-  {
-    Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-    return( false );
+  if (setsockopt(mSd, IPPROTO_TCP, TCP_NODELAY, (char *) &int_nodelay, sizeof(int_nodelay)) < 0) {
+    Error("setsockopt(), errno = %d, error = %s", errno, strerror(errno));
+    return false;
   }
-  return( true );
+  return true;
 }
 
-bool InetSocket::connect( const char *host, const char *serv )
-{
-    struct addrinfo hints;
-    struct addrinfo *result, *rp;
-    int s;
-    char buf[255];
+bool ZM::InetSocket::connect(const char *host, const char *serv) {
+  addrinfo hints;
+  addrinfo *result, *rp;
+  int s;
+  char buf[255];
 
+  mAddressFamily = AF_UNSPEC;
+  memset(&hints, 0, sizeof(addrinfo));
+  hints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
+  hints.ai_socktype = getType();
+  hints.ai_flags = 0;
+  hints.ai_protocol = 0;          /* Any protocol */
+
+  s = getaddrinfo(host, serv, &hints, &result);
+  if (s != 0) {
+    Error("connect(): getaddrinfo: %s", gai_strerror(s));
+    return false;
+  }
+
+  /* getaddrinfo() returns a list of address structures.
+   * Try each address until we successfully connect(2).
+   * If socket(2) (or connect(2)) fails, we (close the socket
+   * and) try the next address. */
+
+  for (rp = result; rp != nullptr; rp = rp->ai_next) {
+    if (mSd != -1) {
+      if (::connect(mSd, rp->ai_addr, rp->ai_addrlen) != -1) {
+        break;                  /* Success */
+      }
+      continue;
+    }
+
+    memset(&buf, 0, sizeof(buf));
+    if (rp->ai_family == AF_INET) {
+      inet_ntop(AF_INET, &((sockaddr_in *) rp->ai_addr)->sin_addr, buf, sizeof(buf) - 1);
+    } else if (rp->ai_family == AF_INET6) {
+      inet_ntop(AF_INET6, &((sockaddr_in6 *) rp->ai_addr)->sin6_addr, buf, sizeof(buf) - 1);
+    } else {
+      strncpy(buf, "n/a", sizeof(buf) - 1);
+    }
+
+    Debug(1, "connect(): Trying '%s', family '%d', proto '%d'", buf, rp->ai_family, rp->ai_protocol);
+    mSd = ::socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+    if (mSd == -1) {
+      continue;
+    }
+
+    int val = 1;
+
+    ::setsockopt(mSd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val));
+    ::setsockopt(mSd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val));
+    mAddressFamily = rp->ai_family;         /* save AF_ for ctrl and data connections */
+
+    if (::connect(mSd, rp->ai_addr, rp->ai_addrlen) != -1) {
+      break;                  /* Success */
+    }
+
+    ::close(mSd);
+  }
+
+  freeaddrinfo(result);   /* No longer needed */
+
+  if (rp == nullptr) {               /* No address succeeded */
+    Error("connect(), Could not connect");
     mAddressFamily = AF_UNSPEC;
-    memset(&hints, 0, sizeof(struct addrinfo));
-    hints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
-    hints.ai_socktype = getType();
-    hints.ai_flags = 0;
-    hints.ai_protocol = 0;          /* Any protocol */
+    return false;
+  }
 
-    s = getaddrinfo(host, serv, &hints, &result);
-    if (s != 0) {
-        Error( "connect(): getaddrinfo: %s", gai_strerror(s) );
-        return( false );
-    }
-
-    /* getaddrinfo() returns a list of address structures.
-     * Try each address until we successfully connect(2).
-     * If socket(2) (or connect(2)) fails, we (close the socket
-     * and) try the next address. */
-
-    for (rp = result; rp != nullptr; rp = rp->ai_next) {
-        if (mSd != -1) {
-            if (::connect(mSd, rp->ai_addr, rp->ai_addrlen) != -1)
-                break;                  /* Success */
-            continue;
-        }
-        memset(&buf, 0, sizeof(buf));
-        if (rp->ai_family == AF_INET) {
-            inet_ntop(AF_INET, &((struct sockaddr_in *)rp->ai_addr)->sin_addr, buf, sizeof(buf)-1);
-        }
-        else if (rp->ai_family == AF_INET6) {
-            inet_ntop(AF_INET6, &((struct sockaddr_in6 *)rp->ai_addr)->sin6_addr, buf, sizeof(buf)-1);
-        }
-        else {
-            strncpy(buf, "n/a", sizeof(buf)-1);
-        }
-        Debug( 1, "connect(): Trying '%s', family '%d', proto '%d'", buf, rp->ai_family, rp->ai_protocol);
-        mSd = ::socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-        if (mSd == -1)
-            continue;
-
-        int val = 1;
-
-        (void)::setsockopt( mSd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val) );
-        (void)::setsockopt( mSd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val) );
-        mAddressFamily = rp->ai_family;         /* save AF_ for ctrl and data connections */
-
-        if (::connect(mSd, rp->ai_addr, rp->ai_addrlen) != -1)
-            break;                  /* Success */
-
-        ::close(mSd);
-    }
-
-    freeaddrinfo(result);   /* No longer needed */
-
-    if (rp == nullptr) {               /* No address succeeded */
-        Error( "connect(), Could not connect" );
-        mAddressFamily = AF_UNSPEC;
-        return( false );
-    }
-
-    mState = CONNECTED;
-
-    return( true );
+  mState = CONNECTED;
+  return true;
 }
 
-bool InetSocket::connect( const char *host, int port )
-{
-    char serv[8];
-    snprintf(serv, sizeof(serv), "%d", port);
+bool ZM::InetSocket::connect(const char *host, int port) {
+  char serv[8];
+  snprintf(serv, sizeof(serv), "%d", port);
 
-    return connect( host, serv );
+  return connect(host, serv);
 }
 
-bool InetSocket::bind( const char * host, const char * serv )
-{
-    struct addrinfo hints;
-    struct addrinfo *result, *rp;
-    int s;
-    char buf[255];
+bool ZM::InetSocket::bind(const char *host, const char *serv) {
+  addrinfo hints;
 
-    memset(&hints, 0, sizeof(struct addrinfo));
-    hints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
-    hints.ai_socktype = getType();
-    hints.ai_flags = AI_PASSIVE;    /* For wildcard IP address */
-    hints.ai_protocol = 0;          /* Any protocol */
-    hints.ai_canonname = nullptr;
-    hints.ai_addr = nullptr;
-    hints.ai_next = nullptr;
+  memset(&hints, 0, sizeof(addrinfo));
+  hints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
+  hints.ai_socktype = getType();
+  hints.ai_flags = AI_PASSIVE;    /* For wildcard IP address */
+  hints.ai_protocol = 0;          /* Any protocol */
+  hints.ai_canonname = nullptr;
+  hints.ai_addr = nullptr;
+  hints.ai_next = nullptr;
 
-    s = getaddrinfo(host, serv, &hints, &result);
-    if (s != 0) {
-        Error( "bind(): getaddrinfo: %s", gai_strerror(s) );
-        return( false );
+  addrinfo *result, *rp;
+  int s = getaddrinfo(host, serv, &hints, &result);
+  if (s != 0) {
+    Error("bind(): getaddrinfo: %s", gai_strerror(s));
+    return false;
+  }
+
+  char buf[255];
+  /* getaddrinfo() returns a list of address structures.
+   * Try each address until we successfully bind(2).
+   * If socket(2) (or bind(2)) fails, we (close the socket
+   * and) try the next address. */
+  for (rp = result; rp != nullptr; rp = rp->ai_next) {
+    memset(&buf, 0, sizeof(buf));
+    if (rp->ai_family == AF_INET) {
+      inet_ntop(AF_INET, &((sockaddr_in *) rp->ai_addr)->sin_addr, buf, sizeof(buf) - 1);
+    } else if (rp->ai_family == AF_INET6) {
+      inet_ntop(AF_INET6, &((sockaddr_in6 *) rp->ai_addr)->sin6_addr, buf, sizeof(buf) - 1);
+    } else {
+      strncpy(buf, "n/a", sizeof(buf) - 1);
     }
 
-   /* getaddrinfo() returns a list of address structures.
-    * Try each address until we successfully bind(2).
-    * If socket(2) (or bind(2)) fails, we (close the socket
-    * and) try the next address. */
-    for (rp = result; rp != nullptr; rp = rp->ai_next) {
-        memset(&buf, 0, sizeof(buf));
-        if (rp->ai_family == AF_INET) {
-            inet_ntop(AF_INET, &((struct sockaddr_in *)rp->ai_addr)->sin_addr, buf, sizeof(buf)-1);
-        }
-        else if (rp->ai_family == AF_INET6) {
-            inet_ntop(AF_INET6, &((struct sockaddr_in6 *)rp->ai_addr)->sin6_addr, buf, sizeof(buf)-1);
-        }
-        else {
-            strncpy(buf, "n/a", sizeof(buf)-1);
-        }
-        Debug( 1, "bind(): Trying '%s', family '%d', proto '%d'", buf, rp->ai_family, rp->ai_protocol);
-        mSd = ::socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-        if (mSd == -1)
-            continue;
+    Debug(1, "bind(): Trying '%s', family '%d', proto '%d'", buf, rp->ai_family, rp->ai_protocol);
+    mSd = ::socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
+    if (mSd == -1) {
+      continue;
+    }
 
     mState = DISCONNECTED;
-        if (::bind(mSd, rp->ai_addr, rp->ai_addrlen) == 0)
-            break;                  /* Success */
-
-        ::close(mSd);
-        mSd = -1;
+    if (::bind(mSd, rp->ai_addr, rp->ai_addrlen) == 0) {
+      break;                  /* Success */
     }
 
-    if (rp == nullptr) {               /* No address succeeded */
-        Error( "bind(), Could not bind" );
-        return( false );
-    }
+    ::close(mSd);
+    mSd = -1;
+  }
 
-    freeaddrinfo(result);   /* No longer needed */
+  if (rp == nullptr) {               /* No address succeeded */
+    Error("bind(), Could not bind");
+    return false;
+  }
 
-    return( true );
+  freeaddrinfo(result);   /* No longer needed */
+  return true;
 }
 
-bool InetSocket::bind( const char * serv )
-{
-    return bind( nullptr, serv);
+bool ZM::InetSocket::bind(const char *serv) {
+  return bind(nullptr, serv);
 }
 
-bool InetSocket::bind( const char * host, int port )
-{
-    char serv[8];
-    snprintf(serv, sizeof(serv), "%d", port);
+bool ZM::InetSocket::bind(const char *host, int port) {
+  char serv[8];
+  snprintf(serv, sizeof(serv), "%d", port);
 
-    return bind( host, serv );
+  return bind(host, serv);
 }
 
-bool InetSocket::bind( int port )
-{
-    char serv[8];
-    snprintf(serv, sizeof(serv), "%d", port);
+bool ZM::InetSocket::bind(int port) {
+  char serv[8];
+  snprintf(serv, sizeof(serv), "%d", port);
 
-    return bind( nullptr, serv );
+  return bind(nullptr, serv);
 }
 
-bool TcpInetServer::listen()
-{
-  return( Socket::listen() );
+bool ZM::TcpInetServer::listen() {
+  return Socket::listen();
 }
 
-bool TcpInetServer::accept()
-{
-  return( Socket::accept() );
+bool ZM::TcpInetServer::accept() {
+  return Socket::accept();
 }
 
-bool TcpInetServer::accept( TcpInetSocket *&newSocket )
-{
+bool ZM::TcpInetServer::accept(TcpInetSocket *&newSocket) {
   int newSd = -1;
   newSocket = nullptr;
 
-  if ( !Socket::accept( newSd ) )
-    return( false );
+  if (!Socket::accept(newSd)) {
+    return false;
+  }
 
-  newSocket = new TcpInetSocket( *this, newSd );
-
-  return( true );
+  newSocket = new TcpInetSocket(*this, newSd);
+  return true;
 }
 
-bool TcpUnixServer::accept( TcpUnixSocket *&newSocket )
-{
+bool ZM::TcpUnixServer::accept(TcpUnixSocket *&newSocket) {
   int newSd = -1;
   newSocket = nullptr;
 
-  if ( !Socket::accept( newSd ) )
-    return( false );
+  if (!Socket::accept(newSd)) {
+    return false;
+  }
 
-  newSocket = new TcpUnixSocket( *this, newSd );
-
-  return( true );
+  newSocket = new TcpUnixSocket(*this, newSd);
+  return true;
 }
 
-Select::Select() : mHasTimeout( false ), mMaxFd( -1 )
-{
-}
-
-Select::Select( struct timeval timeout ) : mMaxFd( -1 )
-{
-  setTimeout( timeout );
-}
-
-Select::Select( int timeout ) : mMaxFd( -1 )
-{
-  setTimeout( timeout );
-}
-
-Select::Select( double timeout ) : mMaxFd( -1 )
-{
-  setTimeout( timeout );
-}
-
-void Select::setTimeout( int timeout )
-{
+void ZM::Select::setTimeout(int timeout) {
   mTimeout.tv_sec = timeout;
   mTimeout.tv_usec = 0;
   mHasTimeout = true;
 }
 
-void Select::setTimeout( double timeout )
-{
+void ZM::Select::setTimeout(double timeout) {
   mTimeout.tv_sec = int(timeout);
-  mTimeout.tv_usec = suseconds_t((timeout-mTimeout.tv_sec)*1000000.0);
+  mTimeout.tv_usec = suseconds_t((timeout - mTimeout.tv_sec) * 1000000.0);
   mHasTimeout = true;
 }
 
-void Select::setTimeout( struct timeval timeout )
-{
+void ZM::Select::setTimeout(timeval timeout) {
   mTimeout = timeout;
   mHasTimeout = true;
 }
 
-void Select::clearTimeout()
-{
+void ZM::Select::clearTimeout() {
   mHasTimeout = false;
 }
 
-void Select::calcMaxFd()
-{
+void ZM::Select::calcMaxFd() {
   mMaxFd = -1;
-  for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); ++iter )
-    if ( (*iter)->getMaxDesc() > mMaxFd )
+  for (CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); ++iter) {
+    if ((*iter)->getMaxDesc() > mMaxFd)
       mMaxFd = (*iter)->getMaxDesc();
-  for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); ++iter )
-    if ( (*iter)->getMaxDesc() > mMaxFd )
+  }
+  for (CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); ++iter) {
+    if ((*iter)->getMaxDesc() > mMaxFd)
       mMaxFd = (*iter)->getMaxDesc();
+  }
 }
 
-bool Select::addReader( CommsBase *comms )
-{
-  if ( !comms->isOpen() )
-  {
-    Error( "Unable to add closed reader" );
-    return( false );
+bool ZM::Select::addReader(CommsBase *comms) {
+  if (!comms->isOpen()) {
+    Error("Unable to add closed reader");
+    return false;
   }
-  std::pair<CommsSet::iterator,bool> result = mReaders.insert( comms );
-  if ( result.second )
-    if ( comms->getMaxDesc() > mMaxFd )
+  std::pair<CommsSet::iterator, bool> result = mReaders.insert(comms);
+  if (result.second) {
+    if (comms->getMaxDesc() > mMaxFd) {
       mMaxFd = comms->getMaxDesc();
-  return( result.second );
+    }
+  }
+  return result.second;
 }
 
-bool Select::deleteReader( CommsBase *comms )
-{
-  if ( !comms->isOpen() )
-  {
-    Error( "Unable to add closed reader" );
-    return( false );
+bool ZM::Select::deleteReader(CommsBase *comms) {
+  if (!comms->isOpen()) {
+    Error("Unable to add closed reader");
+    return false;
   }
-  if ( mReaders.erase( comms ) )
-  {
+  if (mReaders.erase(comms)) {
     calcMaxFd();
-    return( true );
+    return true;
   }
-  return( false );
+  return false;
 }
 
-void Select::clearReaders()
-{
+void ZM::Select::clearReaders() {
   mReaders.clear();
   mMaxFd = -1;
 }
 
-bool Select::addWriter( CommsBase *comms )
-{
-  std::pair<CommsSet::iterator,bool> result = mWriters.insert( comms );
-  if ( result.second )
-    if ( comms->getMaxDesc() > mMaxFd )
+bool ZM::Select::addWriter(CommsBase *comms) {
+  std::pair<CommsSet::iterator, bool> result = mWriters.insert(comms);
+  if (result.second) {
+    if (comms->getMaxDesc() > mMaxFd) {
       mMaxFd = comms->getMaxDesc();
-  return( result.second );
-}
-
-bool Select::deleteWriter( CommsBase *comms )
-{
-  if ( mWriters.erase( comms ) )
-  {
-    calcMaxFd();
-    return( true );
+    }
   }
-  return( false );
+  return result.second;
 }
 
-void Select::clearWriters()
-{
+bool ZM::Select::deleteWriter(CommsBase *comms) {
+  if (mWriters.erase(comms)) {
+    calcMaxFd();
+    return true;
+  }
+  return false;
+}
+
+void ZM::Select::clearWriters() {
   mWriters.clear();
   mMaxFd = -1;
 }
 
-int Select::wait()
-{
-  struct timeval tempTimeout = mTimeout;
-  struct timeval *selectTimeout = mHasTimeout?&tempTimeout:nullptr;
+int ZM::Select::wait() {
+  timeval tempTimeout = mTimeout;
+  timeval *selectTimeout = mHasTimeout ? &tempTimeout : nullptr;
 
   fd_set rfds;
   fd_set wfds;
 
   mReadable.clear();
   FD_ZERO(&rfds);
-  for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); ++iter )
-    FD_SET((*iter)->getReadDesc(),&rfds);
+  for (CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); ++iter) {
+    FD_SET((*iter)->getReadDesc(), &rfds);
+  }
 
   mWriteable.clear();
   FD_ZERO(&wfds);
-  for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); ++iter )
-    FD_SET((*iter)->getWriteDesc(),&wfds);
-
-  int nFound = select( mMaxFd+1, &rfds, &wfds, nullptr, selectTimeout );
-  if( nFound == 0 )
-  {
-    Debug( 1, "Select timed out" );
+  for (CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); ++iter) {
+    FD_SET((*iter)->getWriteDesc(), &wfds);
   }
-  else if ( nFound < 0)
-  {
-    Error( "Select error: %s", strerror(errno) );
-  }
-  else
-  {
-    for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); ++iter )
-      if ( FD_ISSET((*iter)->getReadDesc(),&rfds) )
-        mReadable.push_back( *iter );
-    for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); ++iter )
-      if ( FD_ISSET((*iter)->getWriteDesc(),&rfds) )
-        mWriteable.push_back( *iter );
-  }
-  return( nFound );
-}
 
-const Select::CommsList &Select::getReadable() const
-{
-  return( mReadable );
-}
-
-const Select::CommsList &Select::getWriteable() const
-{
-  return( mWriteable );
+  int nFound = select(mMaxFd + 1, &rfds, &wfds, nullptr, selectTimeout);
+  if (nFound == 0) {
+    Debug(1, "Select timed out");
+  } else if (nFound < 0) {
+    Error("Select error: %s", strerror(errno));
+  } else {
+    for (CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); ++iter) {
+      if (FD_ISSET((*iter)->getReadDesc(), &rfds)) {
+        mReadable.push_back(*iter);
+      }
+    }
+    for (CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); ++iter) {
+      if (FD_ISSET((*iter)->getWriteDesc(), &rfds)) {
+        mWriteable.push_back(*iter);
+      }
+    }
+  }
+  return nFound;
 }
diff --git a/src/zm_comms.h b/src/zm_comms.h
index 46face33c..9126e5373 100644
--- a/src/zm_comms.h
+++ b/src/zm_comms.h
@@ -20,632 +20,580 @@
 #ifndef ZM_COMMS_H
 #define ZM_COMMS_H
 
-#include "zm_logger.h"
 #include "zm_exception.h"
-
-#include <string.h>
-#include <unistd.h>
+#include "zm_logger.h"
+#include <cerrno>
 #include <netdb.h>
-#include <errno.h>
-#include <sys/un.h>
-
 #include <set>
-#include <vector>
 #include <sys/uio.h>
+#include <sys/un.h>
+#include <unistd.h>
+#include <vector>
 
 #if defined(BSD)
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif
 
+namespace ZM {
+
 class CommsException : public Exception {
-public:
-  explicit CommsException( const std::string &message ) : Exception( message ) { }
+ public:
+  explicit CommsException(const std::string &message) : Exception(message) {}
 };
 
 class CommsBase {
-protected:
-  const int  &mRd;
-  const int  &mWd;
+ protected:
+  CommsBase(const int &rd, const int &wd) : mRd(rd), mWd(wd) {}
+  virtual ~CommsBase() = default;
 
-protected:
-  CommsBase( int &rd, int &wd ) : mRd( rd ), mWd( wd ) {
-  }
-  virtual ~CommsBase() {
+ public:
+  virtual bool close() = 0;
+  virtual bool isOpen() const = 0;
+  virtual bool isClosed() const = 0;
+  virtual bool setBlocking(bool blocking) = 0;
+
+ public:
+  virtual int getReadDesc() const { return mRd; }
+  virtual int getWriteDesc() const { return mWd; }
+  int getMaxDesc() const { return mRd > mWd ? mRd : mWd; }
+
+  virtual int read(void *msg, int len) {
+    ssize_t nBytes = ::read(mRd, msg, len);
+    if (nBytes < 0) {
+      Debug(1, "Read of %d bytes max on rd %d failed: %s", len, mRd, strerror(errno));
+    }
+    return nBytes;
   }
 
-public:
-  virtual bool close()=0;
-  virtual bool isOpen() const=0;
-  virtual bool isClosed() const=0;
-  virtual bool setBlocking( bool blocking )=0;
-
-public:
-  int getReadDesc() const {
-    return( mRd );
-  }
-  int getWriteDesc() const {
-    return( mWd );
-  }
-  int getMaxDesc() const {
-    return( mRd>mWd?mRd:mWd );
+  virtual int write(const void *msg, int len) {
+    ssize_t nBytes = ::write(mWd, msg, len);
+    if (nBytes < 0) {
+      Debug(1, "Write of %d bytes on wd %d failed: %s", len, mWd, strerror(errno));
+    }
+    return nBytes;
   }
 
-  virtual int read( void *msg, int len ) {
-    ssize_t nBytes = ::read( mRd, msg, len );
-    if ( nBytes < 0 )
-      Debug( 1, "Read of %d bytes max on rd %d failed: %s", len, mRd, strerror(errno) );
-    return( nBytes );
+  virtual int readV(const iovec *iov, int iovcnt) {
+    int nBytes = ::readv(mRd, iov, iovcnt);
+    if (nBytes < 0) {
+      Debug(1, "Readv of %d buffers max on rd %d failed: %s", iovcnt, mRd, strerror(errno));
+    }
+    return nBytes;
   }
-  virtual int write( const void *msg, int len ) {
-    ssize_t nBytes = ::write( mWd, msg, len );
-    if ( nBytes < 0 )
-      Debug( 1, "Write of %d bytes on wd %d failed: %s", len, mWd, strerror(errno) );
-    return( nBytes );
+
+  virtual int writeV(const iovec *iov, int iovcnt) {
+    ssize_t nBytes = ::writev(mWd, iov, iovcnt);
+    if (nBytes < 0) {
+      Debug(1, "Writev of %d buffers on wd %d failed: %s", iovcnt, mWd, strerror(errno));
+    }
+    return nBytes;
   }
-  virtual int readV( const struct iovec *iov, int iovcnt ) {
-    int nBytes = ::readv( mRd, iov, iovcnt );
-    if ( nBytes < 0 )
-      Debug( 1, "Readv of %d buffers max on rd %d failed: %s", iovcnt, mRd, strerror(errno) );
-    return( nBytes );
-  }
-  virtual int writeV( const struct iovec *iov, int iovcnt ) {
-    ssize_t nBytes = ::writev( mWd, iov, iovcnt );
-    if ( nBytes < 0 )
-      Debug( 1, "Writev of %d buffers on wd %d failed: %s", iovcnt, mWd, strerror(errno) );
-    return( nBytes );
-  }
-  virtual int readV( int iovcnt, /* const void *msg1, int len1, */ ... );
-  virtual int writeV( int iovcnt, /* const void *msg1, int len1, */ ... );
+
+  virtual int readV(int iovcnt, /* const void *msg1, int len1, */ ...);
+  virtual int writeV(int iovcnt, /* const void *msg1, int len1, */ ...);
+
+ protected:
+  const int &mRd;
+  const int &mWd;
 };
 
 class Pipe : public CommsBase {
-protected:
-  int mFd[2];
-
-public:
-  Pipe() : CommsBase( mFd[0], mFd[1] ) {
+ public:
+  Pipe() : CommsBase(mFd[0], mFd[1]) {
     mFd[0] = -1;
     mFd[1] = -1;
   }
-  ~Pipe() {
-    close();
-  }
 
-public:
+  ~Pipe() override { close(); }
+
   bool open();
-  bool close();
+  bool close() override;
 
-  bool isOpen() const
-  {
-    return( mFd[0] != -1 && mFd[1] != -1 );
-  }
-  int getReadDesc() const
-  {
-    return( mFd[0] );
-  }
-  int getWriteDesc() const
-  {
-    return( mFd[1] );
-  }
+  bool isOpen() const override { return mFd[0] != -1 && mFd[1] != -1; }
+  bool isClosed() const override { return !isOpen(); }
+  int getReadDesc() const override { return mFd[0]; }
+  int getWriteDesc() const override { return mFd[1]; }
 
-  bool setBlocking( bool blocking );
+  bool setBlocking(bool blocking) override;
+
+ protected:
+  int mFd[2];
 };
 
 class SockAddr {
-private:
-  const struct sockaddr *mAddr;
+ public:
+  explicit SockAddr(const sockaddr *addr) : mAddr(addr) {}
+  virtual ~SockAddr() = default;
 
-public:
-  explicit SockAddr( const struct sockaddr *addr );
-  virtual ~SockAddr() {
-  }
+  static SockAddr *newSockAddr(const sockaddr &addr, socklen_t len);
+  static SockAddr *newSockAddr(const SockAddr *addr);
 
-  static SockAddr *newSockAddr( const struct sockaddr &addr, socklen_t len );
-  static SockAddr *newSockAddr( const SockAddr *addr );
+  int getDomain() const { return mAddr ? mAddr->sa_family : AF_UNSPEC; }
+  const sockaddr *getAddr() const { return mAddr; }
 
-  int getDomain() const {
-    return( mAddr?mAddr->sa_family:AF_UNSPEC );
-  }
+  virtual socklen_t getAddrSize() const = 0;
+  virtual sockaddr *getTempAddr() const = 0;
 
-  const struct sockaddr *getAddr() const {
-    return( mAddr );
-  }
-  virtual socklen_t getAddrSize() const=0;
-  virtual struct sockaddr *getTempAddr() const=0;
+ private:
+  const sockaddr *mAddr;
 };
 
 class SockAddrInet : public SockAddr {
-private:
-  struct sockaddr_in  mAddrIn;
-  struct sockaddr_in  mTempAddrIn;
+ public:
+  SockAddrInet() : SockAddr((sockaddr *) &mAddrIn) {}
+  explicit SockAddrInet(const SockAddrInet &addr)
+      : SockAddr((const sockaddr *) &mAddrIn), mAddrIn(addr.mAddrIn) {}
+  explicit SockAddrInet(const sockaddr_in *addr)
+      : SockAddr((const sockaddr *) &mAddrIn), mAddrIn(*addr) {}
 
-public:
-  SockAddrInet();
-  explicit SockAddrInet( const SockAddrInet &addr ) : SockAddr( (const struct sockaddr *)&mAddrIn ), mAddrIn( addr.mAddrIn ) {
-  }
-  explicit SockAddrInet( const struct sockaddr_in *addr ) : SockAddr( (const struct sockaddr *)&mAddrIn ), mAddrIn( *addr ) {
-  }
+  bool resolve(const char *host, const char *serv, const char *proto);
+  bool resolve(const char *host, int port, const char *proto);
+  bool resolve(const char *serv, const char *proto);
+  bool resolve(int port, const char *proto);
 
+  socklen_t getAddrSize() const override { return sizeof(mAddrIn); }
+  sockaddr *getTempAddr() const override { return (sockaddr *) &mTempAddrIn; }
 
-  bool resolve( const char *host, const char *serv, const char *proto );
-  bool resolve( const char *host, int port, const char *proto );
-  bool resolve( const char *serv, const char *proto );
-  bool resolve( int port, const char *proto );
+  static socklen_t addrSize() { return sizeof(sockaddr_in); }
 
-  socklen_t getAddrSize() const {
-    return( sizeof(mAddrIn) );
-  }
-  struct sockaddr *getTempAddr() const {
-    return( (sockaddr *)&mTempAddrIn );
-  }
-
-public:
-  static socklen_t addrSize() {
-    return( sizeof(sockaddr_in) );
-  }
+ private:
+  sockaddr_in mAddrIn;
+  sockaddr_in mTempAddrIn;
 };
 
 class SockAddrUnix : public SockAddr {
-private:
-  struct sockaddr_un  mAddrUn;
-  struct sockaddr_un  mTempAddrUn;
+ public:
+  SockAddrUnix() : SockAddr((sockaddr *) &mAddrUn) {}
+  SockAddrUnix(const SockAddrUnix &addr)
+      : SockAddr((const sockaddr *) &mAddrUn), mAddrUn(addr.mAddrUn) {}
+  explicit SockAddrUnix(const sockaddr_un *addr)
+      : SockAddr((const sockaddr *) &mAddrUn), mAddrUn(*addr) {}
 
-public:
-  SockAddrUnix();
-  SockAddrUnix( const SockAddrUnix &addr ) : SockAddr( (const struct sockaddr *)&mAddrUn ), mAddrUn( addr.mAddrUn ) {
-  }
-  explicit SockAddrUnix( const struct sockaddr_un *addr ) : SockAddr( (const struct sockaddr *)&mAddrUn ), mAddrUn( *addr ) {
-  }
+  bool resolve(const char *path, const char *proto);
 
-  bool resolve( const char *path, const char *proto );
+  socklen_t getAddrSize() const override { return sizeof(mAddrUn); }
+  sockaddr *getTempAddr() const override { return (sockaddr *) &mTempAddrUn; }
 
-  socklen_t getAddrSize() const {
-    return( sizeof(mAddrUn) );
-  }
-  struct sockaddr *getTempAddr() const {
-    return( (sockaddr *)&mTempAddrUn );
-  }
+  static socklen_t addrSize() { return sizeof(sockaddr_un); }
 
-public:
-  static socklen_t addrSize() {
-    return( sizeof(sockaddr_un) );
-  }
+ private:
+  sockaddr_un mAddrUn;
+  sockaddr_un mTempAddrUn;
 };
 
 class Socket : public CommsBase {
-protected:
-  typedef enum { CLOSED, DISCONNECTED, LISTENING, CONNECTED } State;
+ protected:
+  enum State { CLOSED, DISCONNECTED, LISTENING, CONNECTED };
 
-protected:
-  int  mSd;
-  State mState;
-  SockAddr *mLocalAddr;
-  SockAddr *mRemoteAddr;
+  Socket() : CommsBase(mSd, mSd),
+             mSd(-1),
+             mState(CLOSED),
+             mLocalAddr(nullptr),
+             mRemoteAddr(nullptr) {}
+  Socket(const Socket &socket, int newSd) : CommsBase(mSd, mSd),
+                                            mSd(newSd),
+                                            mState(CONNECTED),
+                                            mLocalAddr(nullptr),
+                                            mRemoteAddr(nullptr) {
+    if (socket.mLocalAddr)
+      mLocalAddr = SockAddr::newSockAddr(mLocalAddr);
+    if (socket.mRemoteAddr)
+      mRemoteAddr = SockAddr::newSockAddr(mRemoteAddr);
+  }
 
-protected:
-  Socket() : CommsBase( mSd, mSd ), mSd( -1 ), mState( CLOSED ), mLocalAddr( 0 ), mRemoteAddr( 0 ) {
-  }
-  Socket( const Socket &socket, int newSd ) : CommsBase( mSd, mSd ), mSd( newSd ), mState( CONNECTED ), mLocalAddr( 0 ), mRemoteAddr( 0 ) {
-    if ( socket.mLocalAddr )
-      mLocalAddr = SockAddr::newSockAddr( mLocalAddr );
-    if ( socket.mRemoteAddr )
-      mRemoteAddr = SockAddr::newSockAddr( mRemoteAddr );
-  }
   virtual ~Socket() {
     close();
     delete mLocalAddr;
     delete mRemoteAddr;
   }
 
-public:
-  bool isOpen() const {
-    return( !isClosed() );
-  }
-  bool isClosed() const {
-    return( mState == CLOSED );
-  }
-  bool isDisconnected() const {
-    return( mState == DISCONNECTED );
-  }
-  bool isConnected() const {
-    return( mState == CONNECTED );
-  }
-  virtual bool close();
+ public:
+  bool isOpen() const override { return !isClosed(); }
+  bool isClosed() const override { return mState == CLOSED; }
+  bool isDisconnected() const { return mState == DISCONNECTED; }
+  bool isConnected() const { return mState == CONNECTED; }
+  bool close() override;
 
-protected:
-  bool isListening() const {
-    return( mState == LISTENING );
+  virtual int send(const void *msg, int len) const {
+    ssize_t nBytes = ::send(mSd, msg, len, 0);
+    if (nBytes < 0) {
+      Debug(1, "Send of %d bytes on sd %d failed: %s", len, mSd, strerror(errno));
+    }
+    return nBytes;
   }
 
-protected:
-  virtual bool socket();
-  virtual bool bind();
+  virtual int recv(void *msg, int len) const {
+    ssize_t nBytes = ::recv(mSd, msg, len, 0);
+    if (nBytes < 0) {
+      Debug(1, "Recv of %d bytes max on sd %d failed: %s", len, mSd, strerror(errno));
+    }
+    return nBytes;
+  }
 
-protected:
-  virtual bool connect();
-  virtual bool listen();
-  virtual bool accept();
-  virtual bool accept( int & );
+  virtual int send(const std::string &msg) const {
+    ssize_t nBytes = ::send(mSd, msg.data(), msg.size(), 0);
+    if (nBytes < 0) {
+      Debug(1, "Send of string '%s' (%zd bytes) on sd %d failed: %s",
+            msg.c_str(),
+            msg.size(),
+            mSd,
+            strerror(errno));
+    }
+    return nBytes;
+  }
 
-public:
-  virtual int send( const void *msg, int len ) const {
-    ssize_t nBytes = ::send( mSd, msg, len, 0 );
-    if ( nBytes < 0 )
-      Debug( 1, "Send of %d bytes on sd %d failed: %s", len, mSd, strerror(errno) );
-    return( nBytes );
-  }
-  virtual int recv( void *msg, int len ) const {
-    ssize_t nBytes = ::recv( mSd, msg, len, 0 );
-    if ( nBytes < 0 )
-      Debug( 1, "Recv of %d bytes max on sd %d failed: %s", len, mSd, strerror(errno) );
-    return( nBytes );
-  }
-  virtual int send( const std::string &msg ) const {
-    ssize_t nBytes = ::send( mSd, msg.data(), msg.size(), 0 );
-    if ( nBytes < 0 )
-      Debug( 1, "Send of string '%s' (%zd bytes) on sd %d failed: %s", msg.c_str(), msg.size(), mSd, strerror(errno) );
-    return( nBytes );
-  }
-  virtual int recv( std::string &msg ) const {
+  virtual int recv(std::string &msg) const {
     char buffer[msg.capacity()];
     int nBytes = 0;
-    if ( (nBytes = ::recv( mSd, buffer, sizeof(buffer), 0 )) < 0 ) {
-      Debug( 1, "Recv of %zd bytes max to string on sd %d failed: %s", sizeof(buffer), mSd, strerror(errno) );
-      return( nBytes );
+    if ((nBytes = ::recv(mSd, buffer, sizeof(buffer), 0)) < 0) {
+      Debug(1, "Recv of %zd bytes max to string on sd %d failed: %s", sizeof(buffer), mSd, strerror(errno));
+      return nBytes;
     }
     buffer[nBytes] = '\0';
     msg = buffer;
-    return( nBytes );
+    return nBytes;
   }
-  virtual int recv( std::string &msg, size_t maxLen ) const {
+
+  virtual int recv(std::string &msg, size_t maxLen) const {
     char buffer[maxLen];
     int nBytes = 0;
-    if ( (nBytes = ::recv( mSd, buffer, sizeof(buffer), 0 )) < 0 ) {
-      Debug( 1, "Recv of %zd bytes max to string on sd %d failed: %s", maxLen, mSd, strerror(errno) );
-      return( nBytes );
+    if ((nBytes = ::recv(mSd, buffer, sizeof(buffer), 0)) < 0) {
+      Debug(1, "Recv of %zd bytes max to string on sd %d failed: %s", maxLen, mSd, strerror(errno));
+      return nBytes;
     }
     buffer[nBytes] = '\0';
     msg = buffer;
-    return( nBytes );
+    return nBytes;
   }
+
   virtual int bytesToRead() const;
 
-  int getDesc() const {
-    return( mSd );
-  }
+  int getDesc() const { return mSd; }
   //virtual bool isOpen() const
   //{
-    //return( mSd != -1 );
+  //return( mSd != -1 );
   //}
 
-  virtual int getDomain() const=0;
-  virtual int getType() const=0;
-  virtual const char *getProtocol() const=0;
+  virtual int getDomain() const = 0;
+  virtual int getType() const = 0;
+  virtual const char *getProtocol() const = 0;
 
-  const SockAddr *getLocalAddr() const {
-    return( mLocalAddr );
-  }
-  const SockAddr *getRemoteAddr() const {
-    return( mRemoteAddr );
-  }
-  virtual socklen_t getAddrSize() const=0;
+  const SockAddr *getLocalAddr() const { return mLocalAddr; }
+  const SockAddr *getRemoteAddr() const { return mRemoteAddr; }
+  virtual socklen_t getAddrSize() const = 0;
 
-  bool getBlocking( bool &blocking );
-  bool setBlocking( bool blocking );
+  bool getBlocking(bool &blocking);
+  bool setBlocking(bool blocking) override;
 
-  bool getSendBufferSize( int & ) const;
-  bool getRecvBufferSize( int & ) const;
+  int getSendBufferSize(int &) const;
+  int getRecvBufferSize(int &) const;
 
-  bool setSendBufferSize( int );
-  bool setRecvBufferSize( int );
+  bool setSendBufferSize(int);
+  bool setRecvBufferSize(int);
 
-  bool getRouting( bool & ) const;
-  bool setRouting( bool );
+  bool getRouting(bool &) const;
+  bool setRouting(bool);
 
-  bool getNoDelay( bool & ) const;
-  bool setNoDelay( bool );
+  bool getNoDelay(bool &) const;
+  bool setNoDelay(bool);
+
+ protected:
+  virtual bool isListening() const { return mState == LISTENING; }
+
+  bool socket();
+  bool bind();
+
+  bool connect();
+  virtual bool listen();
+  virtual bool accept();
+  bool accept(int &);
+
+  int mSd;
+  State mState;
+  SockAddr *mLocalAddr;
+  SockAddr *mRemoteAddr;
 };
 
-class InetSocket : virtual public Socket
-{
-protected:
-    int mAddressFamily;
+class InetSocket : virtual public Socket {
+ public:
+  int getDomain() const override { return mAddressFamily; }
+  socklen_t getAddrSize() const override { return SockAddrInet::addrSize(); }
 
-public:
-int getDomain() const {
-  return( mAddressFamily );
-}
-virtual socklen_t getAddrSize() const {
-  return( SockAddrInet::addrSize() );
-}
+ protected:
+  bool connect(const char *host, const char *serv);
+  bool connect(const char *host, int port);
 
-protected:
-  bool connect( const char *host, const char *serv );
-  bool connect( const char *host, int port );
+  bool bind(const char *host, const char *serv);
+  bool bind(const char *host, int port);
+  bool bind(const char *serv);
+  bool bind(int port);
 
-  bool bind( const char *host, const char *serv );
-  bool bind( const char *host, int port );
-  bool bind( const char *serv );
-  bool bind( int port );
+  int mAddressFamily;
 };
 
 class UnixSocket : virtual public Socket {
-public:
-  int getDomain() const {
-    return( AF_UNIX );
-  }
-  virtual socklen_t getAddrSize() const {
-    return( SockAddrUnix::addrSize() );
-  }
+ public:
+  int getDomain() const override { return AF_UNIX; }
+  socklen_t getAddrSize() const override { return SockAddrUnix::addrSize(); }
 
-protected:
-  bool resolveLocal( const char *serv, const char *proto ) {
+ protected:
+  bool resolveLocal(const char *serv, const char *proto) {
     SockAddrUnix *addr = new SockAddrUnix;
     mLocalAddr = addr;
-    return( addr->resolve( serv, proto ) );
+    return addr->resolve(serv, proto);
   }
 
-  bool resolveRemote( const char *path, const char *proto ) {
+  bool resolveRemote(const char *path, const char *proto) {
     SockAddrUnix *addr = new SockAddrUnix;
     mRemoteAddr = addr;
-    return( addr->resolve( path, proto ) );
+    return addr->resolve(path, proto);
   }
 
-protected:
-  bool bind( const char *path ) {
-    if ( !UnixSocket::resolveLocal( path, getProtocol() ) )
-      return( false );
-    return( Socket::bind() );
+  bool bind(const char *path) {
+    if (!UnixSocket::resolveLocal(path, getProtocol()))
+      return false;
+    return Socket::bind();
   }
 
-  bool connect( const char *path ) {
-    if ( !UnixSocket::resolveRemote( path, getProtocol() ) )
-      return( false );
-    return( Socket::connect() );
+  bool connect(const char *path) {
+    if (!UnixSocket::resolveRemote(path, getProtocol()))
+      return false;
+    return Socket::connect();
   }
 };
 
 class UdpSocket : virtual public Socket {
-public:
-  int getType() const {
-    return( SOCK_DGRAM );
-  }
-  const char *getProtocol() const {
-    return( "udp" );
+ public:
+  int getType() const override { return SOCK_DGRAM; }
+  const char *getProtocol() const override { return "udp"; }
+
+  virtual int sendto(const void *msg, int len, const SockAddr *addr = nullptr) const {
+    ssize_t nBytes = ::sendto(mSd, msg, len, 0, addr ? addr->getAddr() : nullptr, addr ? addr->getAddrSize() : 0);
+    if (nBytes < 0) {
+      Debug(1, "Sendto of %d bytes on sd %d failed: %s", len, mSd, strerror(errno));
+    }
+    return nBytes;
   }
 
-public:
-  virtual int sendto( const void *msg, int len, const SockAddr *addr=nullptr ) const {
-    ssize_t nBytes = ::sendto( mSd, msg, len, 0, addr?addr->getAddr():nullptr, addr?addr->getAddrSize():0 );
-    if ( nBytes < 0 )
-      Debug( 1, "Sendto of %d bytes on sd %d failed: %s", len, mSd, strerror(errno) );
-    return( nBytes );
-  }
-  virtual int recvfrom( void *msg, int len, SockAddr *addr=0 ) const {
+  virtual int recvfrom(void *msg, int len, SockAddr *addr = nullptr) const {
     ssize_t nBytes = 0;
-    if ( addr ) {
-      struct sockaddr sockAddr;
+    if (addr) {
+      sockaddr sockAddr = {};
       socklen_t sockLen;
-      nBytes = ::recvfrom( mSd, msg, len, 0, &sockAddr, &sockLen );
-      if ( nBytes < 0 ) {
-        Debug( 1, "Recvfrom of %d bytes max on sd %d (with address) failed: %s", len, mSd, strerror(errno) );
+      nBytes = ::recvfrom(mSd, msg, len, 0, &sockAddr, &sockLen);
+      if (nBytes < 0) {
+        Debug(1, "Recvfrom of %d bytes max on sd %d (with address) failed: %s", len, mSd, strerror(errno));
       }
     } else {
-      nBytes = ::recvfrom( mSd, msg, len, 0, nullptr, 0 );
-      if ( nBytes < 0 )
-        Debug( 1, "Recvfrom of %d bytes max on sd %d (no address) failed: %s", len, mSd, strerror(errno) );
+      nBytes = ::recvfrom(mSd, msg, len, 0, nullptr, nullptr);
+      if (nBytes < 0) {
+        Debug(1, "Recvfrom of %d bytes max on sd %d (no address) failed: %s", len, mSd, strerror(errno));
+      }
     }
-    return( nBytes );
+    return nBytes;
   }
 };
 
 class UdpInetSocket : virtual public UdpSocket, virtual public InetSocket {
-public:
-  bool bind( const char *host, const char *serv ) {
-    return( InetSocket::bind( host, serv ) );
-  }
-  bool bind( const char *host, int port ) {
-    return( InetSocket::bind( host, port ) );
-  }
-  bool bind( const char *serv ) {
-    return( InetSocket::bind( serv ) );
-  }
-  bool bind( int port ) {
-    return( InetSocket::bind( port ) );
+ public:
+  bool bind(const char *host, const char *serv) {
+    return InetSocket::bind(host, serv);
   }
 
-  bool connect( const char *host, const char *serv ) {
-    return( InetSocket::connect( host, serv ) );
+  bool bind(const char *host, int port) {
+    return InetSocket::bind(host, port);
   }
-  bool connect( const char *host, int port ) {
-    return( InetSocket::connect( host, port ) );
+
+  bool bind(const char *serv) {
+    return InetSocket::bind(serv);
+  }
+
+  bool bind(int port) {
+    return InetSocket::bind(port);
+  }
+
+  bool connect(const char *host, const char *serv) {
+    return InetSocket::connect(host, serv);
+  }
+
+  bool connect(const char *host, int port) {
+    return InetSocket::connect(host, port);
   }
 };
 
 class UdpUnixSocket : virtual public UdpSocket, virtual public UnixSocket {
-public:
-  bool bind( const char *path ) {
-    return( UnixSocket::bind( path ) );
+ public:
+  bool bind(const char *path) {
+    return UnixSocket::bind(path);
   }
 
-  bool connect( const char *path ) {
-    return( UnixSocket::connect( path ) );
+  bool connect(const char *path) {
+    return UnixSocket::connect(path);
   }
 };
 
 class UdpInetClient : public UdpInetSocket {
-public:
-  bool connect( const char *host, const char *serv ) {
-    return( UdpInetSocket::connect( host, serv ) );
+ public:
+  bool connect(const char *host, const char *serv) {
+    return UdpInetSocket::connect(host, serv);
   }
-  bool connect( const char *host, int port ) {
-    return( UdpInetSocket::connect( host, port ) );
+
+  bool connect(const char *host, int port) {
+    return UdpInetSocket::connect(host, port);
   }
 };
 
 class UdpUnixClient : public UdpUnixSocket {
-public:
-  bool bind( const char *path ) {
-    return( UdpUnixSocket::bind( path ) );
+ public:
+  bool bind(const char *path) {
+    return UdpUnixSocket::bind(path);
   }
 
-public:
-  bool connect( const char *path ) {
-    return( UdpUnixSocket::connect( path) );
+  bool connect(const char *path) {
+    return UdpUnixSocket::connect(path);
   }
 };
 
 class UdpInetServer : public UdpInetSocket {
-public:
-  bool bind( const char *host, const char *serv ) {
-    return( UdpInetSocket::bind( host, serv ) );
-  }
-  bool bind( const char *host, int port ) {
-    return( UdpInetSocket::bind( host, port ) );
-  }
-  bool bind( const char *serv ) {
-    return( UdpInetSocket::bind( serv ) );
-  }
-  bool bind( int port ) {
-    return( UdpInetSocket::bind( port ) );
+ public:
+  bool bind(const char *host, const char *serv) {
+    return UdpInetSocket::bind(host, serv);
   }
 
-protected:
-  bool connect( const char *host, const char *serv ) {
-    return( UdpInetSocket::connect( host, serv ) );
+  bool bind(const char *host, int port) {
+    return UdpInetSocket::bind(host, port);
   }
-  bool connect( const char *host, int port ) {
-    return( UdpInetSocket::connect( host, port ) );
+
+  bool bind(const char *serv) {
+    return UdpInetSocket::bind(serv);
+  }
+
+  bool bind(int port) {
+    return UdpInetSocket::bind(port);
+  }
+
+ protected:
+  bool connect(const char *host, const char *serv) {
+    return UdpInetSocket::connect(host, serv);
+  }
+
+  bool connect(const char *host, int port) {
+    return UdpInetSocket::connect(host, port);
   }
 };
 
 class UdpUnixServer : public UdpUnixSocket {
-public:
-  bool bind( const char *path ) {
-    return( UdpUnixSocket::bind( path ) );
+ public:
+  bool bind(const char *path) {
+    return UdpUnixSocket::bind(path);
   }
 
-protected:
-  bool connect( const char *path ) {
-    return( UdpUnixSocket::connect( path ) );
+ protected:
+  bool connect(const char *path) {
+    return UdpUnixSocket::connect(path);
   }
 };
 
 class TcpSocket : virtual public Socket {
-public:
-  TcpSocket() {
-  }
-  TcpSocket( const TcpSocket &socket, int newSd ) : Socket( socket, newSd ) {
-  }
+ public:
+  TcpSocket() = default;
+  TcpSocket(const TcpSocket &socket, int newSd) : Socket(socket, newSd) {}
 
-public:
-  int getType() const {
-    return( SOCK_STREAM );
-  }
-  const char *getProtocol() const {
-    return( "tcp" );
-  }
+  int getType() const override { return SOCK_STREAM; }
+  const char *getProtocol() const override { return "tcp"; }
 };
 
 class TcpInetSocket : virtual public TcpSocket, virtual public InetSocket {
-public:
-  TcpInetSocket() {
-  }
-  TcpInetSocket( const TcpInetSocket &socket, int newSd ) : TcpSocket( socket, newSd ) {
-  }
+ public:
+  TcpInetSocket() = default;
+  TcpInetSocket(const TcpInetSocket &socket, int newSd)
+      : TcpSocket(socket, newSd) {}
 };
 
 class TcpUnixSocket : virtual public TcpSocket, virtual public UnixSocket {
-public:
-  TcpUnixSocket() {
-  }
-  TcpUnixSocket( const TcpUnixSocket &socket, int newSd ) : TcpSocket( socket, newSd ) {
-  }
+ public:
+  TcpUnixSocket() = default;
+  TcpUnixSocket(const TcpUnixSocket &socket, int newSd)
+      : TcpSocket(socket, newSd) {}
 };
 
 class TcpInetClient : public TcpInetSocket {
-public:
-  bool connect( const char *host, const char *serv ) {
-    return( TcpInetSocket::connect( host, serv ) );
+ public:
+  bool connect(const char *host, const char *serv) {
+    return TcpInetSocket::connect(host, serv);
   }
-  bool connect( const char *host, int port ) {
-    return( TcpInetSocket::connect( host, port ) );
+
+  bool connect(const char *host, int port) {
+    return TcpInetSocket::connect(host, port);
   }
 };
 
 class TcpUnixClient : public TcpUnixSocket {
-public:
-  bool connect( const char *path ) {
-    return( TcpUnixSocket::connect( path) );
-  }
+ public:
+  bool connect(const char *path) { return TcpUnixSocket::connect(path); }
 };
 
 class TcpInetServer : public TcpInetSocket {
-public:
-  bool bind( int port ) {
-    return( TcpInetSocket::bind( port ) );
-  }
+ public:
+  bool bind(int port) { return TcpInetSocket::bind(port); }
 
-public:
-  bool isListening() const { return( Socket::isListening() ); }
-  bool listen();
-  bool accept();
-  bool accept( TcpInetSocket *&newSocket );
+  bool isListening() const override { return Socket::isListening(); }
+  bool listen() override;
+  bool accept() override;
+  bool accept(TcpInetSocket *&newSocket);
 };
 
 class TcpUnixServer : public TcpUnixSocket {
-public:
-  bool bind( const char *path ) {
-    return( TcpUnixSocket::bind( path ) );
-  }
+ public:
+  bool bind(const char *path) { return TcpUnixSocket::bind(path); }
 
-public:
-  bool isListening() const { return( Socket::isListening() ); }
-  bool listen();
-  bool accept();
-  bool accept( TcpUnixSocket *&newSocket );
+  bool isListening() const override { return Socket::isListening(); }
+  bool listen() override;
+  bool accept() override;
+  bool accept(TcpUnixSocket *&newSocket);
 };
 
 class Select {
-public:
+ public:
   typedef std::set<CommsBase *> CommsSet;
   typedef std::vector<CommsBase *> CommsList;
 
-protected:
-  CommsSet    mReaders;
-  CommsSet    mWriters;
-  CommsList     mReadable;
-  CommsList     mWriteable;
-  bool      mHasTimeout;
-  struct timeval  mTimeout;
-  int       mMaxFd;
+  Select() : mHasTimeout(false), mMaxFd(-1) {}
+  explicit Select(timeval timeout) : mMaxFd(-1) { setTimeout(timeout); }
+  explicit Select(int timeout) : mMaxFd(-1) { setTimeout(timeout); }
+  explicit Select(double timeout) : mMaxFd(-1) { setTimeout(timeout); }
 
-public:
-  Select();
-  explicit Select( struct timeval timeout );
-  explicit Select( int timeout );
-  explicit Select( double timeout );
-
-  void setTimeout( int timeout );
-  void setTimeout( double timeout );
-  void setTimeout( struct timeval timeout );
+  void setTimeout(int timeout);
+  void setTimeout(double timeout);
+  void setTimeout(timeval timeout);
   void clearTimeout();
 
   void calcMaxFd();
 
-  bool addReader( CommsBase *comms );
-  bool deleteReader( CommsBase *comms );
+  bool addReader(CommsBase *comms);
+  bool deleteReader(CommsBase *comms);
   void clearReaders();
 
-  bool addWriter( CommsBase *comms );
-  bool deleteWriter( CommsBase *comms );
+  bool addWriter(CommsBase *comms);
+  bool deleteWriter(CommsBase *comms);
   void clearWriters();
 
   int wait();
 
-  const CommsList &getReadable() const;
-  const CommsList &getWriteable() const;
+  const CommsList &getReadable() const { return mReadable; }
+  const CommsList &getWriteable() const { return mWriteable; }
+
+ protected:
+  CommsSet mReaders;
+  CommsSet mWriters;
+  CommsList mReadable;
+  CommsList mWriteable;
+  bool mHasTimeout;
+  timeval mTimeout;
+  int mMaxFd;
 };
 
+}
+
 #endif // ZM_COMMS_H
diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index 015095472..97e2f8c2a 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -15,95 +15,97 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
+//
+
+#include "zm_config.h"
 
-#include "zm.h"
 #include "zm_db.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
+#include "zm_logger.h"
+#include "zm_utils.h"
+#include <cerrno>
+#include <cstring>
 #include <dirent.h>
 #include <glob.h>
 
-#include "zm_utils.h"
-
 // Note that Error and Debug calls won't actually go anywhere unless you 
 // set the relevant ENV vars because the logger gets it's setting from the 
 // config.
 
-void zmLoadConfig() {
-
+void zmLoadStaticConfig() {
   // Process name, value pairs from the main config file first
   process_configfile(ZM_CONFIG);
 
   // Search for user created config files. If one or more are found then
   // update the Config hash with those values
-  DIR* configSubFolder = opendir(ZM_CONFIG_SUBDIR);
-  if ( configSubFolder ) { // subfolder exists and is readable
+  DIR *configSubFolder = opendir(ZM_CONFIG_SUBDIR);
+  if (configSubFolder) { // subfolder exists and is readable
     char glob_pattern[PATH_MAX] = "";
     snprintf(glob_pattern, sizeof(glob_pattern), "%s/*.conf", ZM_CONFIG_SUBDIR);
 
     glob_t pglob;
-    int glob_status = glob(glob_pattern, 0, 0, &pglob);
-    if ( glob_status != 0 ) {
-      if ( glob_status < 0 ) {
+    int glob_status = glob(glob_pattern, 0, nullptr, &pglob);
+    if (glob_status != 0) {
+      if (glob_status < 0) {
         Error("Can't glob '%s': %s", glob_pattern, strerror(errno));
       } else {
         Debug(1, "Can't glob '%s': %d", glob_pattern, glob_status);
       }
     } else {
-      for ( unsigned int i = 0; i < pglob.gl_pathc; i++ ) {
+      for (unsigned int i = 0; i < pglob.gl_pathc; i++) {
         process_configfile(pglob.gl_pathv[i]);
       }
     }
     globfree(&pglob);
     closedir(configSubFolder);
   }
+}
 
-  if ( !zmDbConnect() ) {
-    Fatal("Can't connect to db. Can't continue.");
+void zmLoadDBConfig() {
+  if (!zmDbConnected) {
+    Fatal("Not connected to the database. Can't continue.");
   }
   config.Load();
   config.Assign();
 
   // Populate the server config entries
-  if ( !staticConfig.SERVER_ID ) {
-    if ( !staticConfig.SERVER_NAME.empty() ) {
+  if (!staticConfig.SERVER_ID) {
+    if (!staticConfig.SERVER_NAME.empty()) {
 
       Debug(1, "Fetching ZM_SERVER_ID For Name = %s", staticConfig.SERVER_NAME.c_str());
       std::string sql = stringtf("SELECT `Id` FROM `Servers` WHERE `Name`='%s'",
-          staticConfig.SERVER_NAME.c_str());
+                                 staticConfig.SERVER_NAME.c_str());
       zmDbRow dbrow;
-      if ( dbrow.fetch(sql.c_str()) ) {
+      if (dbrow.fetch(sql.c_str())) {
         staticConfig.SERVER_ID = atoi(dbrow[0]);
       } else {
         Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str());
       }
 
     } // end if has SERVER_NAME
-  } else if ( staticConfig.SERVER_NAME.empty() ) {
+  } else if (staticConfig.SERVER_NAME.empty()) {
     Debug(1, "Fetching ZM_SERVER_NAME For Id = %d", staticConfig.SERVER_ID);
     std::string sql = stringtf("SELECT `Name` FROM `Servers` WHERE `Id`='%d'", staticConfig.SERVER_ID);
-    
+
     zmDbRow dbrow;
-    if ( dbrow.fetch(sql.c_str()) ) {
+    if (dbrow.fetch(sql.c_str())) {
       staticConfig.SERVER_NAME = std::string(dbrow[0]);
     } else {
       Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID);
     }
 
-    if ( staticConfig.SERVER_ID ) {
-			Debug(3, "Multi-server configuration detected. Server is %d.", staticConfig.SERVER_ID);
-		} else {
-			Debug(3, "Single server configuration assumed because no Server ID or Name was specified.");
-		}
+    if (staticConfig.SERVER_ID) {
+      Debug(3, "Multi-server configuration detected. Server is %d.", staticConfig.SERVER_ID);
+    } else {
+      Debug(3, "Single server configuration assumed because no Server ID or Name was specified.");
+    }
   }
 
-  snprintf(staticConfig.capture_file_format, sizeof(staticConfig.capture_file_format), "%%s/%%0%dd-capture.jpg", config.event_image_digits);
-  snprintf(staticConfig.analyse_file_format, sizeof(staticConfig.analyse_file_format), "%%s/%%0%dd-analyse.jpg", config.event_image_digits);
-  snprintf(staticConfig.general_file_format, sizeof(staticConfig.general_file_format), "%%s/%%0%dd-%%s", config.event_image_digits);
+  snprintf(staticConfig.capture_file_format, sizeof(staticConfig.capture_file_format), "%%s/%%0%dd-capture.jpg",
+           config.event_image_digits);
+  snprintf(staticConfig.analyse_file_format, sizeof(staticConfig.analyse_file_format), "%%s/%%0%dd-analyse.jpg",
+           config.event_image_digits);
+  snprintf(staticConfig.general_file_format, sizeof(staticConfig.general_file_format), "%%s/%%0%dd-%%s",
+           config.event_image_digits);
   snprintf(staticConfig.video_file_format, sizeof(staticConfig.video_file_format), "%%s/%%s");
 }
 
@@ -324,10 +326,7 @@ const char *ConfigItem::StringValue() const {
   return cfg_value.string_value;
 }
 
-Config::Config() {
-  n_items = 0;
-  items = 0;
-}
+Config::Config() : n_items(0), items(nullptr) { }
 
 Config::~Config() {
   if ( items ) {
@@ -341,19 +340,11 @@ Config::~Config() {
 }
 
 void Config::Load() {
-  static char sql[ZM_SQL_SML_BUFSIZ];
-   
-  strncpy(sql, "SELECT `Name`, `Value`, `Type` FROM `Config` ORDER BY `Id`", sizeof(sql) );
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't run query: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
+  MYSQL_RES *result = zmDbFetch("SELECT `Name`, `Value`, `Type` FROM `Config` ORDER BY `Id`");
+  if (!result) {
+    exit(-1);
   }
 
-  MYSQL_RES *result = mysql_store_result(&dbconn);
-  if ( !result ) {
-    Error("Can't use query result: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
-  }
   n_items = mysql_num_rows(result);
 
   if ( n_items <= ZM_MAX_CFG_ID ) {
@@ -362,7 +353,7 @@ void Config::Load() {
   }
 
   items = new ConfigItem *[n_items];
-  for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
+  for ( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
     items[i] = new ConfigItem(dbrow[0], dbrow[1], dbrow[2]);
   }
   mysql_free_result(result);
diff --git a/src/zm_config.h b/src/zm_config.h
index d348f38e9..daea8e14c 100644
--- a/src/zm_config.h
+++ b/src/zm_config.h
@@ -20,16 +20,15 @@
 #ifndef ZM_CONFIG_H
 #define ZM_CONFIG_H
 
+#include "config.h"
+#include "zm_config_data.h"
+#include "zm_config_defines.h"
+#include <string>
+
 #if !defined(PATH_MAX)
 #define PATH_MAX 1024
 #endif
 
-#include "config.h"
-#include "zm_config_defines.h"
-#include "zm_config_data.h"
-
-#include <string>
-
 #ifdef HAVE_LIBAVFORMAT
 #define ZM_HAS_FFMPEG       1
 #endif // HAVE_LIBAVFORMAT
@@ -54,7 +53,8 @@
 #define ZM_SAMPLE_RATE      int(1000000/ZM_MAX_FPS) // A general nyquist sample frequency for delays etc
 #define ZM_SUSPENDED_RATE     int(1000000/4) // A slower rate for when disabled etc
 
-extern void zmLoadConfig();
+void zmLoadStaticConfig();
+void zmLoadDBConfig();
 
 extern void process_configfile(char const *configFile);
 
@@ -112,8 +112,9 @@ public:
   double DecimalValue() const;
   const char *StringValue() const;
 
-  ConfigItem &operator=(const ConfigItem item) {
-    Copy(item);return *this;
+  ConfigItem &operator=(const ConfigItem &item) {
+    Copy(item);
+    return *this;
   }
   inline operator bool() const {
     return BooleanValue();
diff --git a/src/zm_coord.cpp b/src/zm_coord.cpp
index df9bc0a87..0b7ab0e71 100644
--- a/src/zm_coord.cpp
+++ b/src/zm_coord.cpp
@@ -17,7 +17,6 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-#include "zm.h"
 #include "zm_coord.h"
 
 // This section deliberately left blank
diff --git a/src/zm_coord.h b/src/zm_coord.h
index c6234fb1c..b7e8fd046 100644
--- a/src/zm_coord.h
+++ b/src/zm_coord.h
@@ -20,7 +20,7 @@
 #ifndef ZM_COORD_H
 #define ZM_COORD_H
 
-#include "zm.h"
+#include "zm_define.h"
 
 //
 // Class used for storing an x,y pair, i.e. a coordinate
@@ -38,22 +38,22 @@ public:
     y = coord.y;
     return *this;
   }
-  inline int &X() { return( x ); }
-  inline const int &X() const { return( x ); }
-  inline int &Y() { return( y ); }
-  inline const int &Y() const { return( y ); }
+  inline int &X(int p_x) { x=p_x; return x; }
+  inline const int &X() const { return x; }
+  inline int &Y(int p_y) { y=p_y; return y; }
+  inline const int &Y() const { return y; }
 
   inline static Coord Range( const Coord &coord1, const Coord &coord2 ) {
     Coord result( (coord1.x-coord2.x)+1, (coord1.y-coord2.y)+1 );
-    return( result );
+    return result;
   }
 
-  inline bool operator==( const Coord &coord ) { return( x == coord.x && y == coord.y ); }
-  inline bool operator!=( const Coord &coord ) { return( x != coord.x || y != coord.y ); }
-  inline bool operator>( const Coord &coord ) { return( x > coord.x && y > coord.y ); }
-  inline bool operator>=( const Coord &coord ) { return( !(operator<(coord)) ); }
-  inline bool operator<( const Coord &coord ) { return( x < coord.x && y < coord.y ); }
-  inline bool operator<=( const Coord &coord ) { return( !(operator>(coord)) ); }
+  inline bool operator==( const Coord &coord ) const { return( x == coord.x && y == coord.y ); }
+  inline bool operator!=( const Coord &coord ) const { return( x != coord.x || y != coord.y ); }
+  inline bool operator>( const Coord &coord ) const { return( x > coord.x && y > coord.y ); }
+  inline bool operator>=( const Coord &coord ) const { return( !(operator<(coord)) ); }
+  inline bool operator<( const Coord &coord ) const { return( x < coord.x && y < coord.y ); }
+  inline bool operator<=( const Coord &coord ) const { return( !(operator>(coord)) ); }
   inline Coord &operator+=( const Coord &coord ) { x += coord.x; y += coord.y; return( *this ); }
   inline Coord &operator-=( const Coord &coord ) { x -= coord.x; y -= coord.y; return( *this ); }
 
diff --git a/src/zm_crypt.cpp b/src/zm_crypt.cpp
index 8e42b3b3c..583f5d8c2 100644
--- a/src/zm_crypt.cpp
+++ b/src/zm_crypt.cpp
@@ -1,19 +1,22 @@
-#include "zm.h"
 #include "zm_crypt.h"
+
+#include "zm_logger.h"
 #include "BCrypt.hpp"
+#include <algorithm>
+#include <cstring>
+
 #if HAVE_LIBJWT
 #include <jwt.h>
 #else
-#include "jwt_cpp.h"
+#include <jwt-cpp/jwt.h>
 #endif
-#include <algorithm>
+
 #if HAVE_LIBCRYPTO
 #include <openssl/sha.h>
 #elif HAVE_GNUTLS_GNUTLS_H
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>
 #endif
-#include <string.h>
 
 // returns username if valid, "" if not
 #if HAVE_LIBJWT
@@ -24,38 +27,39 @@ std::pair <std::string, unsigned int> verifyToken(std::string jwt_token_str, std
   jwt_t *jwt = nullptr;
 
   err = jwt_new(&jwt);
-  if( err ) {
+  if (err) {
     Error("Unable to Allocate JWT object");
     return std::make_pair("", 0);
   }
 
   err = jwt_set_alg(jwt, JWT_ALG_HS256, (const unsigned char*)key.c_str(), key.length());
-  if( err ) {
+  if (err) {
     jwt_free(jwt);
     Error("Error setting Algorithm for JWT decode");
     return std::make_pair("", 0);
   }
   
-  err = jwt_decode(&jwt, jwt_token_str.c_str(), nullptr, 0);
-  if( err ) {
+  err = jwt_decode(&jwt, jwt_token_str.c_str(),
+      reinterpret_cast<const unsigned char *>(key.c_str()), key.length());
+  if (err) {
     jwt_free(jwt);
     Error("Could not decode JWT");
     return std::make_pair("", 0);
   }
   
   const char *c_type = jwt_get_grant(jwt, (const char*)"type");
-  if ( !c_type ) {
+  if (!c_type) {
     jwt_free(jwt);
     Error("Missing token type. This should not happen");
     return std::make_pair("", 0);
-  } else if ( std::string(c_type) != "access" ) {
+  } else if (std::string(c_type) != "access") {
     jwt_free(jwt);
     Error("Only access tokens are allowed. Please do not use refresh tokens");
     return std::make_pair("", 0);
   }
 
   const char *c_username = jwt_get_grant(jwt, (const char*)"user");
-  if( !c_username ) {
+  if (!c_username) {
     jwt_free(jwt);
     Error("User not found in claim");
     return std::make_pair("", 0);
@@ -65,7 +69,7 @@ std::pair <std::string, unsigned int> verifyToken(std::string jwt_token_str, std
   Debug(1, "Got %s as user claim from token", username.c_str());
   
   token_issued_at = (unsigned int)jwt_get_grant_int(jwt, "iat");
-  if ( errno == ENOENT ) {
+  if (errno == ENOENT) {
     jwt_free(jwt);
     Error("IAT not found in claim. This should not happen");
     return std::make_pair("", 0);
@@ -90,26 +94,27 @@ std::pair <std::string, unsigned int> verifyToken(std::string jwt_token_str, std
     verifier.verify(decoded);
 
     // make sure it has fields we need
-    if ( decoded.has_payload_claim("type") ) {
+    if (decoded.has_payload_claim("type")) {
       std::string type = decoded.get_payload_claim("type").as_string();
-      if ( type != "access" ) {
+      if (type != "access") {
         Error("Only access tokens are allowed. Please do not use refresh tokens");
         return std::make_pair("", 0);
       }
     } else {
       // something is wrong. All ZM tokens have type
       Error("Missing token type. This should not happen");
-      return std::make_pair("",0);
+      return std::make_pair("", 0);
     }
-    if ( decoded.has_payload_claim("user") ) {
-      username  = decoded.get_payload_claim("user").as_string();
+
+    if (decoded.has_payload_claim("user")) {
+      username = decoded.get_payload_claim("user").as_string();
       Debug(1, "Got %s as user claim from token", username.c_str());
     } else {
       Error("User not found in claim");
       return std::make_pair("", 0);
     }
 
-    if ( decoded.has_payload_claim("iat") ) {
+    if (decoded.has_payload_claim("iat")) {
       token_issued_at = (unsigned int) (decoded.get_payload_claim("iat").as_int());
       Debug(1, "Got IAT token=%u", token_issued_at);
     } else {
@@ -117,13 +122,13 @@ std::pair <std::string, unsigned int> verifyToken(std::string jwt_token_str, std
       return std::make_pair("", 0);
     }
   } // try
-  catch ( const std::exception &e ) {
-      Error("Unable to verify token: %s", e.what());
-      return std::make_pair("", 0);
+  catch (const std::exception &e) {
+    Error("Unable to verify token: %s", e.what());
+    return std::make_pair("", 0);
   }
   catch (...) {
-     Error("unknown exception");
-     return std::make_pair("", 0);
+    Error("unknown exception");
+    return std::make_pair("", 0);
   }
   return std::make_pair(username, token_issued_at);
 }
@@ -143,11 +148,10 @@ bool verifyPassword(const char *username, const char *input_password, const char
     #ifndef SHA_DIGEST_LENGTH
       #define SHA_DIGEST_LENGTH 20
     #endif
-  
-    unsigned char digest_interim[SHA_DIGEST_LENGTH];
-    unsigned char digest_final[SHA_DIGEST_LENGTH];
     
 #if HAVE_LIBCRYPTO
+    unsigned char digest_interim[SHA_DIGEST_LENGTH];
+    unsigned char digest_final[SHA_DIGEST_LENGTH];
     SHA_CTX ctx1, ctx2;
     
     //get first iteration
@@ -158,8 +162,10 @@ bool verifyPassword(const char *username, const char *input_password, const char
     //2nd iteration
     SHA1_Init(&ctx2);
     SHA1_Update(&ctx2, digest_interim,SHA_DIGEST_LENGTH);
-    SHA1_Final (digest_final, &ctx2);
+    SHA1_Final(digest_final, &ctx2);
 #elif HAVE_GNUTLS_GNUTLS_H
+    unsigned char digest_interim[SHA_DIGEST_LENGTH];
+    unsigned char digest_final[SHA_DIGEST_LENGTH];
     //get first iteration
     gnutls_hash_fast(GNUTLS_DIG_SHA1, input_password, strlen(input_password), digest_interim);
     //2nd iteration
@@ -188,7 +194,6 @@ bool verifyPassword(const char *username, const char *input_password, const char
     // BCRYPT 
     Debug(1, "%s is using a bcrypt encoded password", username);
     BCrypt bcrypt;
-    std::string input_hash = bcrypt.generateHash(std::string(input_password));
     password_correct = bcrypt.validatePassword(std::string(input_password), std::string(db_password_hash));
   } else if ( strncmp(db_password_hash, "-ZM-",4) == 0 ) {
     Error("Authentication failed - migration of password not complete. Please log into web console for this user and retry this operation");
diff --git a/src/zm_crypt.h b/src/zm_crypt.h
index 340abc36c..15dbc9332 100644
--- a/src/zm_crypt.h
+++ b/src/zm_crypt.h
@@ -20,10 +20,8 @@
 #ifndef ZM_CRYPT_H
 #define ZM_CRYPT_H
 
-
-#include <string.h>
-
-
+#include <string>
+#include <utility>
 
 bool verifyPassword( const char *username, const char *input_password, const char *db_password_hash);
 
diff --git a/src/zm_curl_camera.cpp b/src/zm_curl_camera.cpp
index 421863101..a107d78eb 100644
--- a/src/zm_curl_camera.cpp
+++ b/src/zm_curl_camera.cpp
@@ -17,12 +17,10 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-#include <dlfcn.h>
-#include "zm.h"
-
 #include "zm_curl_camera.h"
 
-#include "zm_packetqueue.h"
+#include "zm_packet.h"
+#include <dlfcn.h>
 
 #if HAVE_LIBCURL
 
@@ -48,15 +46,19 @@ size_t content_type_match_len;
 
 void bind_libcurl_symbols() {
 
-  if(curl_lib)
+  if (curl_lib)
     return;
 
   curl_lib = dlopen("libcurl.so", RTLD_LAZY | RTLD_GLOBAL);
-  if(!curl_lib)
-    curl_lib = dlopen("libcurl-gnutls.so.4", RTLD_LAZY | RTLD_GLOBAL);
   if (!curl_lib) {
-    Error("Could not load libcurl: %s", dlerror());
-    return;
+    curl_lib = dlopen("libcurl.so.4", RTLD_LAZY | RTLD_GLOBAL);
+    if (!curl_lib) {
+      curl_lib = dlopen("libcurl-gnutls.so.4", RTLD_LAZY | RTLD_GLOBAL);
+      if (!curl_lib) {
+        Error("Could not load libcurl: %s", dlerror());
+        return;
+      }
+    }
   }
 
   // Load up all required symbols here
@@ -71,8 +73,8 @@ void bind_libcurl_symbols() {
   *(void**) (&curl_easy_cleanup_f) = dlsym(curl_lib, "curl_easy_cleanup");
 }
 
-cURLCamera::cURLCamera( int p_id, const std::string &p_path, const std::string &p_user, const std::string &p_pass, unsigned int p_width, unsigned int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
-  Camera( p_id, CURL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
+cURLCamera::cURLCamera( const Monitor* monitor, const std::string &p_path, const std::string &p_user, const std::string &p_pass, unsigned int p_width, unsigned int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
+  Camera( monitor, CURL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
   mPath( p_path ), mUser( p_user ), mPass ( p_pass ), bTerminate( false ), bReset( false ), mode ( MODE_UNSET )
 {
 
@@ -98,7 +100,7 @@ void cURLCamera::Initialise() {
   /* cURL initialization */
   CURLcode cRet = (*curl_global_init_f)(CURL_GLOBAL_ALL);
   if(cRet != CURLE_OK) {
-    Error("libcurl initialization failed: ", (*curl_easy_strerror_f)(cRet));
+    Error("libcurl initialization failed: %s", (*curl_easy_strerror_f)(cRet));
     dlclose(curl_lib);
     return;
   }
@@ -163,7 +165,7 @@ int cURLCamera::PreCapture() {
     return( 0 );
 }
 
-int cURLCamera::Capture( Image &image ) {
+int cURLCamera::Capture( ZMPacket &zm_packet ) {
   bool frameComplete = false;
 
   /* MODE_STREAM specific variables */
@@ -192,7 +194,7 @@ int cURLCamera::Capture( Image &image ) {
       nRet = pthread_cond_wait(&data_available_cond,&shareddata_mutex);
       if ( nRet != 0 ) {
         Error("Failed waiting for available data condition variable: %s",strerror(nRet));
-        return -20;
+        return -1;
       }
     }
 
@@ -212,7 +214,7 @@ int cURLCamera::Capture( Image &image ) {
         }
      
         /* Find crlf start */
-        crlf_start = memcspn(databuffer,"\r\n",databuffer.size());
+        crlf_start = memcspn(reinterpret_cast<const char *>(databuffer.head()),"\r\n",databuffer.size());
         if ( crlf_start == databuffer.size() ) {
           /* Not found, wait for more data */
           need_more_data = true;
@@ -295,7 +297,7 @@ int cURLCamera::Capture( Image &image ) {
           need_more_data = true;
         } else {
           /* All good. decode the image */
-          image.DecodeJpeg(databuffer.extract(frame_content_length), frame_content_length, colours, subpixelorder);
+          zm_packet.image->DecodeJpeg(databuffer.extract(frame_content_length), frame_content_length, colours, subpixelorder);
           frameComplete = true;
         }
       }
@@ -305,7 +307,7 @@ int cURLCamera::Capture( Image &image ) {
         nRet = pthread_cond_wait(&data_available_cond,&shareddata_mutex);
         if(nRet != 0) {
           Error("Failed waiting for available data condition variable: %s",strerror(nRet));
-          return -18;
+          return -1;
         }
         need_more_data = false;
       }
@@ -315,7 +317,7 @@ int cURLCamera::Capture( Image &image ) {
       if (!single_offsets.empty()) {
         if( (single_offsets.front() > 0) && (databuffer.size() >= single_offsets.front()) ) {
           /* Extract frame */
-          image.DecodeJpeg(databuffer.extract(single_offsets.front()), single_offsets.front(), colours, subpixelorder);
+          zm_packet.image->DecodeJpeg(databuffer.extract(single_offsets.front()), single_offsets.front(), colours, subpixelorder);
           single_offsets.pop_front();
           frameComplete = true;
         } else {
@@ -329,7 +331,7 @@ int cURLCamera::Capture( Image &image ) {
         nRet = pthread_cond_wait(&request_complete_cond,&shareddata_mutex);
         if(nRet != 0) {
           Error("Failed waiting for request complete condition variable: %s",strerror(nRet));
-          return -19;
+          return -1;
         }
       }
     } else {
@@ -344,7 +346,7 @@ int cURLCamera::Capture( Image &image ) {
   unlock();
 
   if(!frameComplete)
-    return -1;
+    return 0;
 
   return 1;
 }
@@ -354,12 +356,6 @@ int cURLCamera::PostCapture() {
     return( 0 );
 }
 
-int cURLCamera::CaptureAndRecord( Image &image, struct timeval recording, char* event_directory ) {
-  Error("Capture and Record not implemented for the cURL camera type");
-  // Nothing to do here
-  return( 0 );
-}
-
 size_t cURLCamera::data_callback(void *buffer, size_t size, size_t nmemb, void *userdata) {
   lock();
 
@@ -436,7 +432,7 @@ void* cURLCamera::thread_func() {
   /* Set URL */
   cRet = (*curl_easy_setopt_f)(c, CURLOPT_URL, mPath.c_str());
   if(cRet != CURLE_OK) {
-    Error("Failed setting libcurl URL: %s", *(curl_easy_strerror_f)(cRet));
+    Error("Failed setting libcurl URL: %s", (*curl_easy_strerror_f)(cRet));
     tRet = -52;
     return (void*)tRet;
   }
@@ -472,7 +468,7 @@ void* cURLCamera::thread_func() {
   /* Progress callback */
   cRet = (*curl_easy_setopt_f)(c, CURLOPT_NOPROGRESS, 0);
   if(cRet != CURLE_OK) {
-    Error("Failed enabling libcurl progress callback function: %s", (*curl_easy_strerror_f)(cRet));  
+    Error("Failed enabling libcurl progress callback function: %s", (*curl_easy_strerror_f)(cRet));
     tRet = -57;
     return (void*)tRet;
   }
diff --git a/src/zm_curl_camera.h b/src/zm_curl_camera.h
index 816937a65..bd2266d5f 100644
--- a/src/zm_curl_camera.h
+++ b/src/zm_curl_camera.h
@@ -20,16 +20,13 @@
 #ifndef ZM_CURL_CAMERA_H
 #define ZM_CURL_CAMERA_H
 
-#if HAVE_LIBCURL
-
-#include "zm_camera.h"
-#include "zm_ffmpeg.h"
+#include "zm_config.h"
 #include "zm_buffer.h"
-#include "zm_regexp.h"
-#include "zm_utils.h"
-#include "zm_signal.h"
-#include <string>
+#include "zm_camera.h"
 #include <deque>
+#include <string>
+
+#if HAVE_LIBCURL
 
 #if HAVE_CURL_CURL_H
 #include <curl/curl.h>
@@ -64,22 +61,35 @@ protected:
   pthread_cond_t request_complete_cond;
 
 public:
-  cURLCamera( int p_id, const std::string &path, const std::string &username, const std::string &password, unsigned int p_width, unsigned int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  cURLCamera(
+      const Monitor* monitor,
+      const std::string &path,
+      const std::string &username,
+      const std::string &password,
+      unsigned int p_width,
+      unsigned int p_height,
+      int p_colours,
+      int p_brightness,
+      int p_contrast,
+      int p_hue,
+      int p_colour,
+      bool p_capture,
+      bool p_record_audio
+      );
   ~cURLCamera();
 
-  const std::string &Path() const { return( mPath ); }
-  const std::string &Username() const { return( mUser ); }
-  const std::string &Password() const { return( mPass ); }
+  const std::string &Path() const { return mPath; }
+  const std::string &Username() const { return mUser; }
+  const std::string &Password() const { return mPass; }
 
   void Initialise();
   void Terminate();
-  int Close() { return 0; };
+  int Close() override { return 0; };
 
-  int PrimeCapture();
-  int PreCapture();
-  int Capture( Image &image );
-  int PostCapture();
-  int CaptureAndRecord( Image &image, struct timeval recording, char* event_directory );
+  int PrimeCapture() override;
+  int PreCapture() override;
+  int Capture(ZMPacket &p)override;
+  int PostCapture()override ;
 
   size_t data_callback(void *buffer, size_t size, size_t nmemb, void *userdata);
   size_t header_callback(void *buffer, size_t size, size_t nmemb, void *userdata);
diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index 37c3cd0f7..b296c571b 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -16,15 +16,15 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
-
-#include <stdlib.h>
-#include <string.h>
-
-#include "zm.h"
 #include "zm_db.h"
 
+#include "zm_logger.h"
+#include "zm_signal.h"
+#include <cstdlib>
+
 MYSQL dbconn;
-RecursiveMutex db_mutex;
+std::mutex db_mutex;
+zmDbQueue  dbQueue;
 
 bool zmDbConnected = false;
 
@@ -40,87 +40,104 @@ bool zmDbConnect() {
     Error("Can't initialise database connection: %s", mysql_error(&dbconn));
     return false;
   }
+
   bool reconnect = 1;
   if ( mysql_options(&dbconn, MYSQL_OPT_RECONNECT, &reconnect) )
     Error("Can't set database auto reconnect option: %s", mysql_error(&dbconn));
-  if ( !staticConfig.DB_SSL_CA_CERT.empty() )
+
+  if ( !staticConfig.DB_SSL_CA_CERT.empty() ) {
     mysql_ssl_set(&dbconn,
         staticConfig.DB_SSL_CLIENT_KEY.c_str(),
         staticConfig.DB_SSL_CLIENT_CERT.c_str(),
         staticConfig.DB_SSL_CA_CERT.c_str(),
         nullptr, nullptr);
+  }
+
   std::string::size_type colonIndex = staticConfig.DB_HOST.find(":");
   if ( colonIndex == std::string::npos ) {
-    if ( !mysql_real_connect(&dbconn, staticConfig.DB_HOST.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), nullptr, 0, nullptr, 0) ) {
-      Error( "Can't connect to server: %s", mysql_error(&dbconn));
+    if ( !mysql_real_connect(
+          &dbconn,
+          staticConfig.DB_HOST.c_str(),
+          staticConfig.DB_USER.c_str(),
+          staticConfig.DB_PASS.c_str(),
+          nullptr, 0, nullptr, 0) ) {
+      Error("Can't connect to server: %s", mysql_error(&dbconn));
+      mysql_close(&dbconn);
       return false;
     }
   } else {
-    std::string dbHost = staticConfig.DB_HOST.substr( 0, colonIndex );
-    std::string dbPortOrSocket = staticConfig.DB_HOST.substr( colonIndex+1 );
+    std::string dbHost = staticConfig.DB_HOST.substr(0, colonIndex);
+    std::string dbPortOrSocket = staticConfig.DB_HOST.substr(colonIndex+1);
     if ( dbPortOrSocket[0] == '/' ) {
-      if ( !mysql_real_connect(&dbconn, nullptr, staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), nullptr, 0, dbPortOrSocket.c_str(), 0) ) {
+      if ( !mysql_real_connect(
+            &dbconn,
+            nullptr,
+            staticConfig.DB_USER.c_str(),
+            staticConfig.DB_PASS.c_str(),
+            nullptr, 0, dbPortOrSocket.c_str(), 0) ) {
         Error("Can't connect to server: %s", mysql_error(&dbconn));
+        mysql_close(&dbconn);
         return false;
       }
     } else {
-      if ( !mysql_real_connect( &dbconn, dbHost.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), nullptr, atoi(dbPortOrSocket.c_str()), nullptr, 0 ) ) {
-        Error( "Can't connect to server: %s", mysql_error( &dbconn ) );
+      if ( !mysql_real_connect(
+            &dbconn,
+            dbHost.c_str(),
+            staticConfig.DB_USER.c_str(),
+            staticConfig.DB_PASS.c_str(),
+            nullptr,
+            atoi(dbPortOrSocket.c_str()),
+            nullptr, 0) ) {
+        Error("Can't connect to server: %s", mysql_error(&dbconn));
+        mysql_close(&dbconn);
         return false;
       }
     }
   }
-  if ( mysql_select_db( &dbconn, staticConfig.DB_NAME.c_str() ) ) {
-    Error( "Can't select database: %s", mysql_error( &dbconn ) );
+  if ( mysql_select_db(&dbconn, staticConfig.DB_NAME.c_str()) ) {
+    Error("Can't select database: %s", mysql_error(&dbconn));
+    mysql_close(&dbconn);
     return false;
   }
+  if ( mysql_query(&dbconn, "SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED") ) {
+    Error("Can't set isolation level: %s", mysql_error(&dbconn));
+  }
   zmDbConnected = true;
   return zmDbConnected;
 }
 
 void zmDbClose() {
-  if ( zmDbConnected ) {
-    db_mutex.lock();
+  if (zmDbConnected) {
+    std::lock_guard<std::mutex> lck(db_mutex);
     mysql_close(&dbconn);
     // mysql_init() call implicitly mysql_library_init() but
     // mysql_close() does not call mysql_library_end()
-    // We get segfaults and a hang when we call this.  So just don't.
-    //mysql_library_end();
+    mysql_library_end();
     zmDbConnected = false;
-    db_mutex.unlock();
   }
 }
 
 MYSQL_RES * zmDbFetch(const char * query) {
-  if ( !zmDbConnected ) {
-    Error("Not connected.");
-    return nullptr;
-  }
-  db_mutex.lock();
-  // Might have been disconnected while we waited for the lock
-  if ( !zmDbConnected ) {
-    db_mutex.unlock();
+  std::lock_guard<std::mutex> lck(db_mutex);
+  if (!zmDbConnected) {
     Error("Not connected.");
     return nullptr;
   }
 
-  if ( mysql_query(&dbconn, query) ) {
-    db_mutex.unlock();
+  if (mysql_query(&dbconn, query)) {
     Error("Can't run query: %s", mysql_error(&dbconn));
     return nullptr;
   }
-  Debug(4, "Success running query: %s", query);
   MYSQL_RES *result = mysql_store_result(&dbconn);
-  if ( !result ) {
+  if (!result) {
     Error("Can't use query result: %s for query %s", mysql_error(&dbconn), query);
   }
-  db_mutex.unlock();
   return result;
 } // end MYSQL_RES * zmDbFetch(const char * query);
 
 zmDbRow *zmDbFetchOne(const char *query) {
   zmDbRow *row = new zmDbRow();
-  if ( row->fetch(query) ) {
+  if (row->fetch(query)) {
     return row;
   } 
   delete row;
@@ -129,10 +146,10 @@ zmDbRow *zmDbFetchOne(const char *query) {
 
 MYSQL_RES *zmDbRow::fetch(const char *query) {
   result_set = zmDbFetch(query);
-  if ( ! result_set ) return result_set;
+  if (!result_set) return result_set;
 
   int n_rows = mysql_num_rows(result_set);
-  if ( n_rows != 1 ) {
+  if (n_rows != 1) {
     Error("Bogus number of lines return from query, %d returned for query %s.", n_rows, query);
     mysql_free_result(result_set);
     result_set = nullptr;
@@ -140,7 +157,7 @@ MYSQL_RES *zmDbRow::fetch(const char *query) {
   }
 
   row = mysql_fetch_row(result_set);
-  if ( ! row ) {
+  if (!row) {
     mysql_free_result(result_set);
     result_set = nullptr;
     Error("Error getting row from query %s. Error is %s", query, mysql_error(&dbconn));
@@ -150,9 +167,100 @@ MYSQL_RES *zmDbRow::fetch(const char *query) {
   return result_set;
 }
 
+int zmDbDo(const char *query) {
+  std::lock_guard<std::mutex> lck(db_mutex);
+  if (!zmDbConnected)
+    return 0;
+  int rc;
+  while ((rc = mysql_query(&dbconn, query)) and !zm_terminate) {
+    Logger *logger = Logger::fetch();
+    Logger::Level oldLevel = logger->databaseLevel();
+    logger->databaseLevel(Logger::NOLOG);
+    Error("Can't run query %s: %s", query, mysql_error(&dbconn));
+    logger->databaseLevel(oldLevel);
+    if ( (mysql_errno(&dbconn) != ER_LOCK_WAIT_TIMEOUT) ) {
+      return rc;
+    }
+  }
+  Logger *logger = Logger::fetch();
+  Logger::Level oldLevel = logger->databaseLevel();
+  logger->databaseLevel(Logger::NOLOG);
+
+  Debug(1, "Success running sql query %s", query);
+  logger->databaseLevel(oldLevel);
+  return 1;
+}
+
+int zmDbDoInsert(const char *query) {
+  std::lock_guard<std::mutex> lck(db_mutex);
+  if (!zmDbConnected) return 0;
+  int rc;
+  while ( (rc = mysql_query(&dbconn, query)) and !zm_terminate) {
+    Error("Can't run query %s: %s", query, mysql_error(&dbconn));
+    if ( (mysql_errno(&dbconn) != ER_LOCK_WAIT_TIMEOUT) )
+      return 0;
+  }
+  int id = mysql_insert_id(&dbconn);
+  Debug(2, "Success running sql insert %s. Resulting id is %d", query, id);
+  return id;
+}
+
+int zmDbDoUpdate(const char *query) {
+  std::lock_guard<std::mutex> lck(db_mutex);
+  if (!zmDbConnected) return 0;
+  int rc;
+  while ( (rc = mysql_query(&dbconn, query)) and !zm_terminate) {
+    Error("Can't run query %s: %s", query, mysql_error(&dbconn));
+    if ( (mysql_errno(&dbconn) != ER_LOCK_WAIT_TIMEOUT) )
+      return -rc;
+  }
+  int affected = mysql_affected_rows(&dbconn);
+  Debug(2, "Success running sql update %s. Rows modified %d", query, affected);
+  return affected;
+}
+
 zmDbRow::~zmDbRow() {
-  if ( result_set ) {
+  if (result_set) {
     mysql_free_result(result_set);
     result_set = nullptr;
   }
+  row = nullptr;
+}
+
+zmDbQueue::zmDbQueue() :
+  mThread(&zmDbQueue::process, this),
+  mTerminate(false)
+{ }
+
+zmDbQueue::~zmDbQueue() {
+  stop();
+}
+
+void zmDbQueue::stop() {
+  mTerminate = true;
+  mCondition.notify_all();
+  if (mThread.joinable()) mThread.join();
+}
+
+void zmDbQueue::process() {
+  std::unique_lock<std::mutex> lock(mMutex);
+
+  while (!mTerminate and !zm_terminate) {
+    if (mQueue.empty()) {
+      mCondition.wait(lock);
+    }
+    if (!mQueue.empty()) {
+      std::string sql = mQueue.front();
+      mQueue.pop();
+      lock.unlock();
+      zmDbDo(sql.c_str());
+      lock.lock();
+    }
+  }
+}  // end void zmDbQueue::process()
+
+void zmDbQueue::push(std::string &&sql) {
+  std::unique_lock<std::mutex> lock(mMutex);
+  mQueue.push(std::move(sql));
+  mCondition.notify_all();
 }
diff --git a/src/zm_db.h b/src/zm_db.h
index 11fc9faaa..c243aa6d6 100644
--- a/src/zm_db.h
+++ b/src/zm_db.h
@@ -20,17 +20,38 @@
 #ifndef ZM_DB_H
 #define ZM_DB_H
 
+#include <condition_variable>
+#include <mutex>
 #include <mysql/mysql.h>
-#include "zm_thread.h"
+#include <mysql/mysqld_error.h>
+#include <queue>
+#include <string>
+#include <thread>
+
+class zmDbQueue {
+  private:
+  std::queue<std::string> mQueue;
+  std::thread             mThread;
+  std::mutex              mMutex;
+  std::condition_variable mCondition;
+  bool                    mTerminate;
+  public:
+  zmDbQueue();
+  ~zmDbQueue();
+  void push(const char *sql) { return push(std::string(sql)); };
+  void push(std::string &&sql);
+  void process();
+  void stop();
+};
 
 class zmDbRow {
   private:
     MYSQL_RES *result_set;
     MYSQL_ROW row;
   public:
-    zmDbRow() { result_set = nullptr; row = nullptr; };
-    MYSQL_RES *fetch( const char *query );
-    zmDbRow( MYSQL_RES *, MYSQL_ROW *row );
+    zmDbRow() : result_set(nullptr), row(nullptr) { };
+    MYSQL_RES *fetch(const char *query);
+    zmDbRow(MYSQL_RES *, MYSQL_ROW *row);
     ~zmDbRow();
 
     MYSQL_ROW mysql_row() const { return row; };
@@ -41,12 +62,20 @@ class zmDbRow {
 };
 
 extern MYSQL dbconn;
-extern RecursiveMutex db_mutex;
+extern std::mutex db_mutex;
+extern zmDbQueue  dbQueue;
+
+extern bool zmDbConnected;
+
+extern bool zmDbConnected;
 
 bool zmDbConnect();
 void zmDbClose();
+int zmDbDo(const char *query);
+int zmDbDoInsert(const char *query);
+int zmDbDoUpdate(const char *query);
 
-MYSQL_RES * zmDbFetch( const char *query );
-zmDbRow *zmDbFetchOne( const char *query );
+MYSQL_RES * zmDbFetch(const char *query);
+zmDbRow *zmDbFetchOne(const char *query);
 
 #endif // ZM_DB_H
diff --git a/src/zm_decoder_thread.cpp b/src/zm_decoder_thread.cpp
new file mode 100644
index 000000000..d32a578c7
--- /dev/null
+++ b/src/zm_decoder_thread.cpp
@@ -0,0 +1,27 @@
+#include "zm_decoder_thread.h"
+
+#include "zm_monitor.h"
+#include "zm_signal.h"
+
+DecoderThread::DecoderThread(Monitor *monitor) :
+    monitor_(monitor), terminate_(false) {
+  thread_ = std::thread(&DecoderThread::Run, this);
+}
+
+DecoderThread::~DecoderThread() {
+  Stop();
+  if (thread_.joinable()) thread_.join();
+}
+
+void DecoderThread::Start() {
+  if (thread_.joinable()) thread_.join();
+  terminate_ = false;
+  thread_ = std::thread(&DecoderThread::Run, this);
+}
+void DecoderThread::Run() {
+  Debug(2, "DecoderThread::Run() for %d", monitor_->Id());
+
+  while (!(terminate_ or zm_terminate)) {
+    monitor_->Decode();
+  }
+}
diff --git a/src/zm_decoder_thread.h b/src/zm_decoder_thread.h
new file mode 100644
index 000000000..62b2f0d23
--- /dev/null
+++ b/src/zm_decoder_thread.h
@@ -0,0 +1,28 @@
+#ifndef ZM_DECODER_THREAD_H
+#define ZM_DECODER_THREAD_H
+
+#include <atomic>
+#include <memory>
+#include <thread>
+
+class Monitor;
+
+class DecoderThread {
+ public:
+  explicit DecoderThread(Monitor *monitor);
+  ~DecoderThread();
+  DecoderThread(DecoderThread &rhs) = delete;
+  DecoderThread(DecoderThread &&rhs) = delete;
+
+  void Start();
+  void Stop() { terminate_ = true; }
+
+ private:
+  void Run();
+
+  Monitor *monitor_;
+  std::atomic<bool> terminate_;
+  std::thread thread_;
+};
+
+#endif
diff --git a/src/zm_define.h b/src/zm_define.h
new file mode 100644
index 000000000..45ace017e
--- /dev/null
+++ b/src/zm_define.h
@@ -0,0 +1,52 @@
+/*
+ * This file is part of the ZoneMinder Project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#ifndef ZONEMINDER_SRC_ZM_DEFINE_H_
+#define ZONEMINDER_SRC_ZM_DEFINE_H_
+
+// These macros have not been adopted by the C++11 standard.
+// However glibc 2.17 (CentOS 7) still depends on them to provide the macros which are guarded by these defines.
+#if !defined(__STDC_FORMAT_MACROS)
+#  define __STDC_FORMAT_MACROS
+#endif
+#if !defined(__STDC_CONSTANT_MACROS)
+#  define __STDC_CONSTANT_MACROS
+#endif
+
+#include <cinttypes>
+
+typedef std::int64_t int64;
+typedef std::int32_t int32;
+typedef std::int16_t int16;
+typedef std::int8_t int8;
+typedef std::uint64_t uint64;
+typedef std::uint32_t uint32;
+typedef std::uint16_t uint16;
+typedef std::uint8_t uint8;
+
+#ifndef FALLTHROUGH
+#if defined(__clang__)
+#define FALLTHROUGH [[clang::fallthrough]]
+#elif defined(__GNUC__) && __GNUC__ >= 7
+#define FALLTHROUGH [[gnu::fallthrough]]
+#else
+#define FALLTHROUGH
+#endif
+#endif
+
+#endif // ZONEMINDER_SRC_ZM_DEFINE_H_
diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 76156c3a5..103320536 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -1,5 +1,5 @@
 //
-// ZoneMinder Event Class Implementation, $Date$, $Revision$
+// ZoneMinder Event Class Implementation
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -17,77 +17,101 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <sys/un.h>
-#include <sys/uio.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <getopt.h>
-#include <arpa/inet.h>
-#include <glob.h>
-#include <cinttypes>
-
-#include "zm.h"
-#include "zm_db.h"
-#include "zm_time.h"
-#include "zm_signal.h"
 #include "zm_event.h"
+
+#include "zm_camera.h"
+#include "zm_db.h"
+#include "zm_frame.h"
+#include "zm_logger.h"
 #include "zm_monitor.h"
+#include "zm_signal.h"
+#include "zm_videostore.h"
+
+#include <cstring>
+#include <list>
+#include <sys/stat.h>
+#include <unistd.h>
 
 //#define USE_PREPARED_SQL 1
 
 const char * Event::frame_type_names[3] = { "Normal", "Bulk", "Alarm" };
+#define MAX_DB_FRAMES 100
 
 int Event::pre_alarm_count = 0;
 
-Event::PreAlarmData Event::pre_alarm_data[MAX_PRE_ALARM_FRAMES] = { { 0 } };
+Event::PreAlarmData Event::pre_alarm_data[MAX_PRE_ALARM_FRAMES] = {};
 
 Event::Event(
     Monitor *p_monitor,
     struct timeval p_start_time,
     const std::string &p_cause,
-    const StringSetMap &p_noteSetMap,
-    bool p_videoEvent ) :
+    const StringSetMap &p_noteSetMap
+    ) :
+  id(0),
   monitor(p_monitor),
   start_time(p_start_time),
+  end_time({0,0}),
   cause(p_cause),
   noteSetMap(p_noteSetMap),
-  videoEvent(p_videoEvent),
-  videowriter(nullptr)
+  frames(0),
+  alarm_frames(0),
+  alarm_frame_written(false),
+  tot_score(0),
+  max_score(0),
+  //path(""),
+  //snapshit_file(),
+  //alarm_file(""),
+  videoStore(nullptr),
+  //video_name(""),
+  //video_file(""),
+  last_db_frame(0),
+  have_video_keyframe(false),
+  //scheme
+  save_jpegs(0)
 {
-
   std::string notes;
   createNotes(notes);
 
-  struct timeval now;
-  gettimeofday(&now, 0);
+  timeval now = {};
+  gettimeofday(&now, nullptr);
 
-  bool untimedEvent = false;
   if ( !start_time.tv_sec ) {
-    untimedEvent = true;
+    Warning("Event has zero time, setting to now");
     start_time = now;
   } else if ( start_time.tv_sec > now.tv_sec ) {
-    Error(
-        "StartTime in the future %u.%u > %u.%u",
-        start_time.tv_sec, start_time.tv_usec, now.tv_sec, now.tv_usec
-        );
+    char buffer[26];
+    char buffer_now[26];
+    tm tm_info = {};
+
+    localtime_r(&start_time.tv_sec, &tm_info);
+    strftime(buffer, 26, "%Y:%m:%d %H:%M:%S", &tm_info);
+    localtime_r(&now.tv_sec, &tm_info);
+    strftime(buffer_now, 26, "%Y:%m:%d %H:%M:%S", &tm_info);
+
+    Error("StartDateTime in the future starttime %ld.%06ld >? now %ld.%06ld difference %" PRIi64 "\nstarttime: %s\nnow: %s",
+          start_time.tv_sec, start_time.tv_usec, now.tv_sec, now.tv_usec,
+          static_cast<int64>(now.tv_sec - start_time.tv_sec),
+          buffer, buffer_now);
     start_time = now;
   }
 
-  Storage * storage = monitor->getStorage();
-  scheme = storage->Scheme();
-
   unsigned int state_id = 0;
-  zmDbRow dbrow;
-  if ( dbrow.fetch("SELECT Id FROM States WHERE IsActive=1") ) {
-    state_id = atoi(dbrow[0]);
+  {
+    zmDbRow dbrow;
+    if (dbrow.fetch("SELECT Id FROM States WHERE IsActive=1")) {
+      state_id = atoi(dbrow[0]);
+    }
   }
 
-  char sql[ZM_SQL_MED_BUFSIZ];
-  struct tm *stime = localtime(&start_time.tv_sec);
-  snprintf(sql, sizeof(sql), "INSERT INTO Events ( MonitorId, StorageId, Name, StartTime, Width, Height, Cause, Notes, StateId, Orientation, Videoed, DefaultVideo, SaveJPEGs, Scheme ) VALUES ( %d, %d, 'New Event', from_unixtime( %ld ), %d, %d, '%s', '%s', %d, %d, %d, '%s', %d, '%s' )",
+  // Copy it in case opening the mp4 doesn't work we can set it to another value
+  save_jpegs = monitor->GetOptSaveJPEGs();
+  Storage * storage = monitor->getStorage();
+
+  std::string sql = stringtf(
+      "INSERT INTO `Events` "
+      "( `MonitorId`, `StorageId`, `Name`, `StartDateTime`, `Width`, `Height`, `Cause`, `Notes`, `StateId`, `Orientation`, `Videoed`, `DefaultVideo`, `SaveJPEGs`, `Scheme` )"
+      " VALUES "
+      "( %d, %d, 'New Event', from_unixtime( %ld ), %d, %d, '%s', '%s', %d, %d, %d, '%s', %d, '%s' )",
       monitor->Id(), 
       storage->Id(),
       start_time.tv_sec,
@@ -97,99 +121,65 @@ Event::Event(
       notes.c_str(), 
       state_id,
       monitor->getOrientation(),
-      videoEvent,
-			( monitor->GetOptVideoWriter() != 0 ? "video.mp4" : "" ),
-      monitor->GetOptSaveJPEGs(),
+      0,
+			"",
+      save_jpegs,
       storage->SchemeString().c_str()
       );
-  db_mutex.lock();
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't insert event: %s. sql was (%s)", mysql_error(&dbconn), sql);
-    db_mutex.unlock();
-    return;
-  }
-  id = mysql_insert_id(&dbconn);
 
-  db_mutex.unlock();
-  if ( untimedEvent ) {
-    Warning("Event %d has zero time, setting to current", id);
-  }
-  end_time.tv_sec = 0;
-  frames = 0;
-  alarm_frames = 0;
-  tot_score = 0;
-  max_score = 0;
-  alarm_frame_written = false;
+  id = zmDbDoInsert(sql.c_str());
 
-  std::string id_file;
+  if ( !SetPath(storage) ) {
+    // Try another
+    Warning("Failed creating event dir at %s", storage->Path());
 
-  path = stringtf("%s/%d", storage->Path(), monitor->Id());
-  // Try to make the Monitor Dir.  Normally this would exist, but in odd cases might not.
-  if ( mkdir(path.c_str(), 0755) ) {
-    if ( errno != EEXIST )
-      Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
-  }
+    sql = stringtf("SELECT `Id` FROM `Storage` WHERE `Id` != %u", storage->Id());
+    if ( monitor->ServerId() )
+      sql += stringtf(" AND ServerId=%u", monitor->ServerId());
 
-  if ( storage->Scheme() == Storage::DEEP ) {
+    Debug(1, "%s", sql.c_str());
+    storage = nullptr;
 
-    int dt_parts[6];
-    dt_parts[0] = stime->tm_year-100;
-    dt_parts[1] = stime->tm_mon+1;
-    dt_parts[2] = stime->tm_mday;
-    dt_parts[3] = stime->tm_hour;
-    dt_parts[4] = stime->tm_min;
-    dt_parts[5] = stime->tm_sec;
+    MYSQL_RES *result = zmDbFetch(sql.c_str());
+    if ( result ) {
+      for ( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
+        storage = new Storage(atoi(dbrow[0]));
+        if ( SetPath(storage) )
+          break;
+        delete storage;
+        storage = nullptr;
+      }  // end foreach row of Storage
+      mysql_free_result(result);
+      result = nullptr;
+    }
+    if ( !storage ) {
+      Info("No valid local storage area found.  Trying all other areas.");
+      // Try remote
+      sql = "SELECT `Id` FROM `Storage` WHERE ServerId IS NULL";
+      if ( monitor->ServerId() )
+        sql += stringtf(" OR ServerId != %u", monitor->ServerId());
 
-    std::string date_path;
-    std::string time_path;
-
-    for ( unsigned int i = 0; i < sizeof(dt_parts)/sizeof(*dt_parts); i++ ) {
-      path += stringtf("/%02d", dt_parts[i]);
-
-      if ( mkdir(path.c_str(), 0755) ) {
-        // FIXME This should not be fatal.  Should probably move to a different storage area.
-        if ( errno != EEXIST )
-          Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
+      result = zmDbFetch(sql.c_str());
+      if ( result ) {
+        for ( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
+          storage = new Storage(atoi(dbrow[0]));
+          if ( SetPath(storage) )
+            break;
+          delete storage;
+          storage = nullptr;
+        }  // end foreach row of Storage
+        mysql_free_result(result);
+        result = nullptr;
       }
-      if ( i == 2 )
-				date_path = path;
     }
-		time_path = stringtf("%02d/%02d/%02d", stime->tm_hour, stime->tm_min, stime->tm_sec);
-
-    // Create event id symlink
-    id_file = stringtf("%s/.%" PRIu64, date_path.c_str(), id);
-    if ( symlink(time_path.c_str(), id_file.c_str()) < 0 )
-      Error("Can't symlink %s -> %s: %s", id_file.c_str(), time_path.c_str(), strerror(errno));
-  } else if ( storage->Scheme() == Storage::MEDIUM ) {
-    path += stringtf("/%04d-%02d-%02d",
-        stime->tm_year+1900, stime->tm_mon+1, stime->tm_mday
-        );
-    if ( mkdir(path.c_str(), 0755) ) {
-      if ( errno != EEXIST )
-        Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
+    if ( !storage ) {
+      storage = new Storage();
+      Warning("Failed to find a storage area to save events.");
     }
-    path += stringtf("/%" PRIu64, id);
-    if ( mkdir(path.c_str(), 0755) ) {
-      if ( errno != EEXIST )
-        Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
-    }
-  } else {
-    path += stringtf("/%" PRIu64, id);
-    if ( mkdir(path.c_str(), 0755) ) {
-      if ( errno != EEXIST )
-        Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
-    }
-
-    // Create empty id tag file
-    id_file = stringtf("%s/.%" PRIu64, path.c_str(), id);
-    if ( FILE *id_fp = fopen(id_file.c_str(), "w") ) {
-      fclose(id_fp);
-    } else {
-      Error("Can't fopen %s: %s", id_file.c_str(), strerror(errno));
-		}
-  } // deep storage or not
-
-  last_db_frame = 0;
+    sql = stringtf("UPDATE Events SET StorageId = '%d' WHERE Id=%" PRIu64, storage->Id(), id);
+    zmDbDo(sql.c_str());
+  }  // end if ! setPath(Storage)
+  Debug(1, "Using storage area at %s", path.c_str());
 
   video_name = "";
 
@@ -199,102 +189,84 @@ Event::Event(
   /* Save as video */
 
   if ( monitor->GetOptVideoWriter() != 0 ) {
-    video_name = stringtf("%" PRIu64 "-%s", id, "video.mp4");
-    snprintf(sql, sizeof(sql), "UPDATE Events SET DefaultVideo = '%s' WHERE Id=%" PRIu64, video_name.c_str(), id);
-    if ( mysql_query(&dbconn, sql) ) {
-      Error("Can't update event: %s. sql was (%s)", mysql_error(&dbconn), sql);
-      db_mutex.unlock();
-      return;
+    std::string container = monitor->OutputContainer();
+    if ( container == "auto" || container == "" ) {
+      container = "mp4";
     }
+        
+    video_name = stringtf("%" PRIu64 "-%s.%s", id, "video", container.c_str());
     video_file = path + "/" + video_name;
-			Debug(1, "Writing video file to %s", video_file.c_str());
+    Debug(1, "Writing video file to %s", video_file.c_str());
+    videoStore = new VideoStore(
+        video_file.c_str(),
+        container.c_str(),
+        monitor->GetVideoStream(),
+        monitor->GetVideoCodecContext(),
+        ( monitor->RecordAudio() ? monitor->GetAudioStream() : nullptr ),
+        ( monitor->RecordAudio() ? monitor->GetAudioCodecContext() : nullptr ),
+        monitor );
 
-    /* X264 MP4 video writer */
-    if ( monitor->GetOptVideoWriter() == Monitor::X264ENCODE ) {
-#if ZM_HAVE_VIDEOWRITER_X264MP4
-      videowriter = new X264MP4Writer(video_file.c_str(),
-          monitor->Width(),
-          monitor->Height(),
-          monitor->Colours(),
-          monitor->SubpixelOrder(),
-					monitor->GetOptEncoderParamsVec());
-#else
-      Error("ZoneMinder was not compiled with the X264 MP4 video writer, check dependencies (x264 and mp4v2)");
-#endif
-
-			if ( videowriter != nullptr ) {
-				/* Open the video stream */
-				int nRet = videowriter->Open();
-				if ( nRet != 0 ) {
-					Error("Failed opening video stream");
-					delete videowriter;
-					videowriter = nullptr;
-				}
-			}
-		}
-  } else {
-    /* No video object */
-    videowriter = nullptr;
-  }
+    if ( !videoStore->open() ) {
+      Warning("Failed to open videostore, turning on jpegs");
+      delete videoStore;
+      videoStore = nullptr;
+      if ( ! ( save_jpegs & 1 ) ) {
+        save_jpegs |= 1; // Turn on jpeg storage
+        sql = stringtf("UPDATE Events SET SaveJpegs=%d WHERE Id=%" PRIu64, save_jpegs, id);
+        zmDbDo(sql.c_str());
+      }
+    } else {
+      sql = stringtf("UPDATE Events SET Videoed=1, DefaultVideo = '%s' WHERE Id=%" PRIu64, video_name.c_str(), id);
+      zmDbDo(sql.c_str());
+    }
+  }  // end if GetOptVideoWriter
 } // Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string &p_cause, const StringSetMap &p_noteSetMap, bool p_videoEvent )
 
 Event::~Event() {
   // We close the videowriter first, because if we finish the event, we might try to view the file, but we aren't done writing it yet.
 
   /* Close the video file */
-  if ( videowriter != nullptr ) {
-    int nRet = videowriter->Close();
-    if ( nRet != 0 ) {
-      Error("Failed closing video stream");
-    }
-    delete videowriter;
-    videowriter = nullptr;
+  if ( videoStore != nullptr ) {
+    Debug(4, "Deleting video store");
+    delete videoStore;
+    videoStore = nullptr;
   }
 
+  // endtime is set in AddFrame, so SHOULD be set to the value of the last frame timestamp.
+  if ( !end_time.tv_sec ) {
+    Warning("Empty endtime for event.  Should not happen.  Setting to now.");
+    gettimeofday(&end_time, nullptr);
+  }
   struct DeltaTimeval delta_time;
   DELTA_TIMEVAL(delta_time, end_time, start_time, DT_PREC_2);
-  Debug(2, "start_time:%d.%d end_time%d.%d", start_time.tv_sec, start_time.tv_usec, end_time.tv_sec, end_time.tv_usec);
+  Debug(2, "start_time: %" PRIi64 ".% " PRIi64 " end_time: %" PRIi64 ".%" PRIi64,
+        static_cast<int64>(start_time.tv_sec),
+        static_cast<int64>(start_time.tv_usec),
+        static_cast<int64>(end_time.tv_sec),
+        static_cast<int64>(end_time.tv_usec));
 
-#if 0  // This closing frame has no image. There is no point in adding a db record for it, I think. ICON
-  if ( frames > last_db_frame ) {
-    frames ++;
-    Debug(1, "Adding closing frame %d to DB", frames);
-    frame_data.push(new Frame(id, frames, NORMAL, end_time, delta_time, 0));
-  }
-#endif
-  if ( frame_data.size() )
-    WriteDbFrames();
-
-  // update frame deltas to refer to video start time which may be a few frames before event start
-  struct timeval video_offset = {0};
-  struct timeval video_start_time  = monitor->GetVideoWriterStartTime();
-  if ( video_start_time.tv_sec > 0 ) {
-     timersub(&video_start_time, &start_time, &video_offset);
-     Debug(1, "Updating frames delta by %d sec %d usec",
-           video_offset.tv_sec, video_offset.tv_usec);
-     UpdateFramesDelta(video_offset.tv_sec + video_offset.tv_usec*1e-6);
-  } else {
-     Debug(3, "Video start_time %d sec %d usec not valid -- frame deltas not updated",
-           video_start_time.tv_sec, video_start_time.tv_usec);
-  }
+  if (frame_data.size()) WriteDbFrames();
 
   // Should not be static because we might be multi-threaded
   char sql[ZM_SQL_LGE_BUFSIZ];
-  snprintf(sql, sizeof(sql), 
-      "UPDATE Events SET Name='%s%" PRIu64 "', EndTime = from_unixtime(%ld), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %" PRIu64,
+  snprintf(sql, sizeof(sql),
+      "UPDATE Events SET Name='%s%" PRIu64 "', EndDateTime = from_unixtime(%ld), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %" PRIu64 " AND Name='New Event'",
       monitor->EventPrefix(), id, end_time.tv_sec,
       delta_time.positive?"":"-", delta_time.sec, delta_time.fsec,
       frames, alarm_frames,
       tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score,
       id);
-  db_mutex.lock();
-  while ( mysql_query(&dbconn, sql) && !zm_terminate ) {
-    db_mutex.unlock();
-    Error("Can't update event: %s reason: %s", sql, mysql_error(&dbconn));
-    sleep(1);
-    db_mutex.lock();
-  }
-  db_mutex.unlock();
+  if (!zmDbDoUpdate(sql)) {
+    // Name might have been changed during recording, so just do the update without changing the name.
+    snprintf(sql, sizeof(sql),
+        "UPDATE Events SET EndDateTime = from_unixtime(%ld), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %" PRIu64,
+        end_time.tv_sec,
+        delta_time.positive?"":"-", delta_time.sec, delta_time.fsec,
+        frames, alarm_frames,
+        tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score,
+        id);
+    zmDbDoUpdate(sql);
+  }  // end if no changed rows due to Name change during recording
 }  // Event::~Event()
 
 void Event::createNotes(std::string &notes) {
@@ -315,7 +287,7 @@ bool Event::WriteFrameImage(
     Image *image,
     struct timeval timestamp,
     const char *event_file,
-    bool alarm_frame) {
+    bool alarm_frame) const {
 
   int thisquality = 
     (alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality)) ?
@@ -337,38 +309,12 @@ bool Event::WriteFrameImage(
   }
 
   return rc;
-}
+}  // end Event::WriteFrameImage( Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame )
 
-bool Event::WriteFrameVideo(
-    const Image *image,
-    const struct timeval timestamp,
-    VideoWriter* videow) {
-  const Image* frameimg = image;
-  Image ts_image;
-
-  /* Checking for invalid parameters */
-  if ( videow == nullptr ) {
-    Error("NULL Video object");
+bool Event::WritePacket(ZMPacket &packet) {
+  
+  if ( videoStore->writePacket(&packet) < 0 )
     return false;
-  }
-
-  /* If the image does not contain a timestamp, add the timestamp */
-  if ( !config.timestamp_on_capture ) {
-    ts_image = *image;
-    monitor->TimestampImage(&ts_image, &timestamp);
-    frameimg = &ts_image;
-  }
-
-  /* Calculate delta time */
-  struct DeltaTimeval delta_time3;
-  DELTA_TIMEVAL(delta_time3, timestamp, start_time, DT_PREC_3);
-  unsigned int timeMS = (delta_time3.sec * delta_time3.prec) + delta_time3.fsec;
-
-  /* Encode and write the frame */
-  if ( videowriter->Encode(frameimg, timeMS) != 0 ) {
-    Error("Failed encoding video frame");
-  }
-
   return true;
 }  // bool Event::WriteFrameVideo
 
@@ -416,8 +362,7 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
     std::string notes;
     createNotes(notes);
 
-    Debug(2, "Updating notes for event %d, '%s'", id, notes.c_str());
-    static char sql[ZM_SQL_LGE_BUFSIZ];
+    Debug(2, "Updating notes for event %" PRIu64 ", '%s'", id, notes.c_str());
 #if USE_PREPARED_SQL
     static MYSQL_STMT *stmt = 0;
 
@@ -456,7 +401,7 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
       if ( mysql_stmt_bind_param(stmt, bind) ) {
         Error("Unable to bind sql '%s': %s", sql, mysql_stmt_error(stmt));
       }
-    }
+    } // end if ! stmt
 
     strncpy(notesStr, notes.c_str(), sizeof(notesStr));
 
@@ -464,211 +409,196 @@ void Event::updateNotes(const StringSetMap &newNoteSetMap) {
       Error("Unable to execute sql '%s': %s", sql, mysql_stmt_error(stmt));
     }
 #else
+    char sql[ZM_SQL_LGE_BUFSIZ];
     static char escapedNotes[ZM_SQL_MED_BUFSIZ];
 
     mysql_real_escape_string(&dbconn, escapedNotes, notes.c_str(), notes.length());
 
     snprintf(sql, sizeof(sql), "UPDATE `Events` SET `Notes` = '%s' WHERE `Id` = %" PRIu64, escapedNotes, id);
-    db_mutex.lock();
-    if ( mysql_query(&dbconn, sql) ) {
-      Error("Can't insert event: %s", mysql_error(&dbconn));
-    }
-    db_mutex.unlock();
+    dbQueue.push(std::move(sql));
 #endif
   }  // end if update
 }  // void Event::updateNotes(const StringSetMap &newNoteSetMap)
 
-void Event::AddFrames(int n_frames, Image **images, struct timeval **timestamps) {
-  for (int i = 0; i < n_frames; i += ZM_SQL_BATCH_SIZE) {
-    AddFramesInternal(n_frames, i, images, timestamps);
+void Event::AddPacket(ZMPacket *packet) {
+
+  have_video_keyframe = have_video_keyframe || 
+    ( ( packet->codec_type == AVMEDIA_TYPE_VIDEO ) && 
+      ( packet->keyframe || monitor->GetOptVideoWriter() == Monitor::ENCODE) );
+  Debug(2, "have_video_keyframe %d codec_type %d == video? %d packet keyframe %d",
+      have_video_keyframe, packet->codec_type, (packet->codec_type == AVMEDIA_TYPE_VIDEO), packet->keyframe);
+  ZM_DUMP_PACKET(packet->packet, "Adding to event");
+  if (videoStore) {
+    if (have_video_keyframe) {
+      videoStore->writePacket(packet);
+    } else {
+      Debug(2, "No video keyframe yet, not writing");
+    }
+    //FIXME if it fails, we should write a jpeg
   }
+  if ((packet->codec_type == AVMEDIA_TYPE_VIDEO) or packet->image)
+    AddFrame(packet->image, *(packet->timestamp), packet->zone_stats, packet->score, packet->analysis_image);
+  end_time = *packet->timestamp;
+  return;
 }
 
-void Event::AddFramesInternal(int n_frames, int start_frame, Image **images, struct timeval **timestamps) {
-  static char sql[ZM_SQL_LGE_BUFSIZ];
-  strncpy(sql, "INSERT INTO `Frames` (`EventId`, `FrameId`, `TimeStamp`, `Delta`) VALUES ", sizeof(sql));
-  int frameCount = 0;
-  for ( int i = start_frame; i < n_frames && i - start_frame < ZM_SQL_BATCH_SIZE; i++ ) {
-    if ( timestamps[i]->tv_sec <= 0 ) {
-      Debug(1, "Not adding pre-capture frame %d, zero or less than 0 timestamp", i);
-      continue;
-    }
-
-    frames++;
-
-    if ( monitor->GetOptSaveJPEGs() & 1 ) {
-			std::string event_file = stringtf(staticConfig.capture_file_format, path.c_str(), frames);
-      Debug(1, "Writing pre-capture frame %d", frames);
-      WriteFrameImage(images[i], *(timestamps[i]), event_file.c_str());
-    }
-    //If this is the first frame, we should add a thumbnail to the event directory
-    // ICON: We are working through the pre-event frames so this snapshot won't 
-    // neccessarily be of the motion.  But some events are less than 10 frames, 
-    // so I am changing this to 1, but we should overwrite it later with a better snapshot.
-    if ( frames == 1 ) {
-      WriteFrameImage(images[i], *(timestamps[i]), snapshot_file.c_str());
-    }
-
-    if ( videowriter != nullptr ) {
-      WriteFrameVideo(images[i], *(timestamps[i]), videowriter);
-    }
-
-    struct DeltaTimeval delta_time;
-    DELTA_TIMEVAL(delta_time, *(timestamps[i]), start_time, DT_PREC_2);
-    // Delta is Decimal(8,2) so 6 integer digits and 2 decimal digits
-    if ( delta_time.sec > 999999 ) {
-      Warning("Invalid delta_time from_unixtime(%ld), %s%ld.%02ld", 
-           timestamps[i]->tv_sec,
-           (delta_time.positive?"":"-"),
-           delta_time.sec,
-           delta_time.fsec);
-        delta_time.sec = 0;
-    }
-
-    int sql_len = strlen(sql);
-    snprintf(sql+sql_len, sizeof(sql)-sql_len, "( %" PRIu64 ", %d, from_unixtime(%ld), %s%ld.%02ld ), ",
-        id, frames, timestamps[i]->tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec);
-
-    frameCount++;
-  } // end foreach frame
-
-  if ( frameCount ) {
-    Debug(1, "Adding %d/%d frames to DB", frameCount, n_frames);
-    *(sql+strlen(sql)-2) = '\0';
-    db_mutex.lock();
-    if ( mysql_query(&dbconn, sql) ) {
-      Error("Can't insert frames: %s, sql was (%s)", mysql_error(&dbconn), sql);
-    }
-    db_mutex.unlock();
-    last_db_frame = frames;
-  } else {
-    Debug(1, "No valid pre-capture frames to add");
-  }
-}  // void Event::AddFramesInternal(int n_frames, int start_frame, Image **images, struct timeval **timestamps)
-
 void Event::WriteDbFrames() {
-  static char sql[ZM_SQL_LGE_BUFSIZ];
-  char * sql_ptr = (char *)&sql;
-  sql_ptr += snprintf(sql, sizeof(sql),
-      "INSERT INTO Frames ( EventId, FrameId, Type, TimeStamp, Delta, Score ) VALUES "
-      );
-  while ( frame_data.size() ) {
+  std::string frame_insert_sql = "INSERT INTO `Frames` (`EventId`, `FrameId`, `Type`, `TimeStamp`, `Delta`, `Score`) VALUES ";
+  std::string stats_insert_sql = "INSERT INTO `Stats` (`EventId`, `FrameId`, `MonitorId`, `ZoneId`, "
+                                              "`PixelDiff`, `AlarmPixels`, `FilterPixels`, `BlobPixels`,"
+                                              "`Blobs`,`MinBlobSize`, `MaxBlobSize`, "
+                                              "`MinX`, `MinY`, `MaxX`, `MaxY`,`Score`) VALUES ";
+
+  Debug(1, "Inserting %zu frames", frame_data.size());
+  while (frame_data.size()) {
     Frame *frame = frame_data.front();
     frame_data.pop();
-    sql_ptr += snprintf(sql_ptr, sizeof(sql)-(sql_ptr-(char *)&sql), "( %" PRIu64 ", %d, '%s', from_unixtime( %ld ), %s%ld.%02ld, %d ), ",
-        id, frame->frame_id, frame_type_names[frame->type],
+    frame_insert_sql += stringtf("\n( %" PRIu64 ", %d, '%s', from_unixtime( %ld ), %s%ld.%02ld, %d ),",
+        id, frame->frame_id,
+        frame_type_names[frame->type],
         frame->timestamp.tv_sec,
-        frame->delta.positive?"":"-",
+        frame->delta.positive ? "" : "-",
         frame->delta.sec,
         frame->delta.fsec,
         frame->score);
+    if (config.record_event_stats and frame->zone_stats.size()) {
+      for (ZoneStats &stats : frame->zone_stats) {
+        stats_insert_sql += stringtf("\n(%" PRIu64 ",%d,%u,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%u),",
+            id, frame->frame_id,
+            monitor->Id(),
+            stats.zone_id_,
+            stats.pixel_diff_,
+            stats.alarm_pixels_,
+            stats.alarm_filter_pixels_,
+            stats.alarm_blob_pixels_,
+            stats.alarm_blobs_,
+            stats.min_blob_size_,
+            stats.max_blob_size_,
+            stats.alarm_box_.LoX(),
+            stats.alarm_box_.LoY(),
+            stats.alarm_box_.HiX(),
+            stats.alarm_box_.HiY(),
+            stats.score_);
+      }  // end foreach zone stats
+    }  // end if recording stats
     delete frame;
+  }  // end while frames
+  // The -1 is for the extra , added for values above
+  frame_insert_sql.erase(frame_insert_sql.size()-1);
+  //zmDbDo(frame_insert_sql.c_str());
+  dbQueue.push(std::move(frame_insert_sql));
+  if (stats_insert_sql.size() > 208) {
+    // The -1 is for the extra , added for values above
+    stats_insert_sql.erase(stats_insert_sql.size()-1);
+    //zmDbDo(stats_insert_sql);
+    dbQueue.push(std::move(stats_insert_sql));
   }
-  *(sql_ptr-2) = '\0';
-  db_mutex.lock();
-  if ( mysql_query(&dbconn, sql) ) {
-    db_mutex.unlock();
-    Error("Can't insert frames: %s, sql was %s", mysql_error(&dbconn), sql);
-    return;
-  }
-  db_mutex.unlock();
 } // end void Event::WriteDbFrames()
 
-// Subtract an offset time from frames deltas to match with video start time
-void Event::UpdateFramesDelta(double offset) {
-  char sql[ZM_SQL_MED_BUFSIZ];
-
-  if ( offset == 0.0 ) return;
-  // the table is set to auto update timestamp so we force it to keep current value
-  snprintf(sql, sizeof(sql),
-    "UPDATE Frames SET timestamp = timestamp, Delta = Delta - (%.4f) WHERE EventId = %" PRIu64,
-    offset, id);
-
-  db_mutex.lock();
-  if ( mysql_query(&dbconn, sql) ) {
-    db_mutex.unlock();
-    Error("Can't update frames: %s, sql was %s", mysql_error(&dbconn), sql);
-    return;
-  }
-  db_mutex.unlock();
-  Info("Updating frames delta by %0.2f sec to match video file", offset);
-}
-
-void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *alarm_image) {
-  if ( !timestamp.tv_sec ) {
-    Debug(1, "Not adding new frame, zero timestamp");
+void Event::AddFrame(
+    Image *image,
+    struct timeval timestamp,
+    const std::vector<ZoneStats> &zone_stats,
+    int score,
+    Image *alarm_image) {
+  if (!timestamp.tv_sec) {
+    Warning("Not adding new frame, zero timestamp");
     return;
   }
 
   frames++;
+  Monitor::State monitor_state = monitor->GetState();
+
   bool write_to_db = false;
-  FrameType frame_type = score>0?ALARM:(score<0?BULK:NORMAL);
-  // < 0 means no motion detection is being done.
-  if ( score < 0 )
-    score = 0;
+  FrameType frame_type = ( ( score > 0 ) ? ALARM : (
+      (
+       ( monitor_state == Monitor::TAPE )
+       and
+       ( config.bulk_frame_interval > 1 )
+       and
+       ( ! (frames % config.bulk_frame_interval) )
+      ) ? BULK : NORMAL 
+      ) );
+  Debug(1, "Have frame type %s from score(%d) state %d frames %d bulk frame interval %d and mod%d", 
+      frame_type_names[frame_type], score, monitor->GetState(), frames, config.bulk_frame_interval, (frames % config.bulk_frame_interval));
 
-  if ( monitor->GetOptSaveJPEGs() & 1 ) {
-    std::string event_file = stringtf(staticConfig.capture_file_format, path.c_str(), frames);
-    Debug(1, "Writing capture frame %d to %s", frames, event_file.c_str());
-    if ( !WriteFrameImage(image, timestamp, event_file.c_str()) ) {
-      Error("Failed to write frame image");
+  if (score < 0) score = 0;
+  tot_score += score;
+
+  if (image) {
+    if (save_jpegs & 1) {
+      std::string event_file = stringtf(staticConfig.capture_file_format, path.c_str(), frames);
+      Debug(1, "Writing capture frame %d to %s", frames, event_file.c_str());
+      if (!WriteFrameImage(image, timestamp, event_file.c_str())) {
+        Error("Failed to write frame image");
+      }
+    }  // end if save_jpegs
+
+    // If this is the first frame, we should add a thumbnail to the event directory
+    if ((frames == 1) || (score > (int)max_score)) {
+      write_to_db = true; // web ui might show this as thumbnail, so db needs to know about it.
+      WriteFrameImage(image, timestamp, snapshot_file.c_str());
     }
-  }
 
-  // If this is the first frame, we should add a thumbnail to the event directory
-  if ( (frames == 1) || (score > (int)max_score) ) {
-    write_to_db = true; // web ui might show this as thumbnail, so db needs to know about it.
-    WriteFrameImage(image, timestamp, snapshot_file.c_str());
-  }
+    // We are writing an Alarm frame
+    if (frame_type == ALARM) {
+      // The first frame with a score will be the frame that alarmed the event
+      if (!alarm_frame_written) {
+        write_to_db = true; // OD processing will need it, so the db needs to know about it
+        alarm_frame_written = true;
+        WriteFrameImage(image, timestamp, alarm_file.c_str());
+      }
 
-  // We are writing an Alarm frame
-  if ( frame_type == ALARM ) {
-    // The first frame with a score will be the frame that alarmed the event
-    if ( !alarm_frame_written ) {
-      write_to_db = true; // OD processing will need it, so the db needs to know about it
-      alarm_frame_written = true;
-      WriteFrameImage(image, timestamp, alarm_file.c_str());
-    }
-    alarm_frames++;
-
-    tot_score += score;
-    if ( score > (int)max_score )
-      max_score = score;
-
-    if ( alarm_image ) {
-      if ( monitor->GetOptSaveJPEGs() & 2 ) {
+      if (alarm_image and (save_jpegs & 2)) {
         std::string event_file = stringtf(staticConfig.analyse_file_format, path.c_str(), frames);
         Debug(1, "Writing analysis frame %d", frames);
-        if ( ! WriteFrameImage(alarm_image, timestamp, event_file.c_str(), true) ) {
+        if (!WriteFrameImage(alarm_image, timestamp, event_file.c_str(), true)) {
           Error("Failed to write analysis frame image");
         }
       }
-    }
-  } // end if frame_type == ALARM
+    }  // end if is an alarm frame
+  } else {
+    Debug(1, "No image");
+  }  // end if has image
 
-  if ( videowriter != nullptr ) {
-    WriteFrameVideo(image, timestamp, videowriter);
-  }
+  if (frame_type == ALARM) alarm_frames++;
 
-  struct DeltaTimeval delta_time;
-  DELTA_TIMEVAL(delta_time, timestamp, start_time, DT_PREC_2);
+  bool db_frame = ( frame_type == BULK )
+    or ( frame_type == ALARM )
+    or ( frames == 1 )
+    or ( score > (int)max_score )
+    or ( monitor_state == Monitor::ALERT )
+    or ( monitor_state == Monitor::ALARM )
+    or ( monitor_state == Monitor::PREALARM );
 
-  bool db_frame = ( frame_type != BULK ) || (frames==1) || ((frames%config.bulk_frame_interval)==0) ;
-  if ( db_frame ) {
-    static char sql[ZM_SQL_MED_BUFSIZ];
+  if (db_frame) {
+
+    struct DeltaTimeval delta_time;
+    DELTA_TIMEVAL(delta_time, timestamp, start_time, DT_PREC_2);
+    Debug(1, "Frame delta is %" PRIi64 ".%" PRIi64 " - %" PRIi64 ".%" PRIi64 " = %lu.%lu, score %u zone_stats.size %zu",
+          static_cast<int64>(start_time.tv_sec), static_cast<int64>(start_time.tv_usec),
+          static_cast<int64>(timestamp.tv_sec), static_cast<int64>(timestamp.tv_usec),
+          delta_time.sec, delta_time.fsec,
+          score,
+          zone_stats.size());
 
     // The idea is to write out 1/sec
-    frame_data.push(new Frame(id, frames, frame_type, timestamp, delta_time, score));
-    if ( write_to_db || ( monitor->get_fps() && (frame_data.size() > monitor->get_fps())) ) {
-      Debug(1, "Adding %d frames to DB because write_to_db:%d or frames > analysis fps %f",
-					frame_data.size(), write_to_db, monitor->get_fps());
+    frame_data.push(new Frame(id, frames, frame_type, timestamp, delta_time, score, zone_stats));
+    double fps = monitor->get_capture_fps();
+		if ( write_to_db
+				or
+				( frame_data.size() >= MAX_DB_FRAMES )
+				or
+				( frame_type == BULK )
+				or
+				( fps and (frame_data.size() > fps) )
+			 ) {
+          Debug(1, "Adding %zu frames to DB because write_to_db:%d or frames > analysis fps %f or BULK(%d)",
+                frame_data.size(), write_to_db, fps, (frame_type == BULK));
       WriteDbFrames();
       last_db_frame = frames;
-      Debug(1, "Adding %d frames to DB, done", frame_data.size());
-    }
 
-    // We are writing a Bulk frame
-    if ( frame_type == BULK ) {
+      char sql[ZM_SQL_MED_BUFSIZ];
       snprintf(sql, sizeof(sql), 
           "UPDATE Events SET Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %" PRIu64, 
           ( delta_time.positive?"":"-" ),
@@ -680,16 +610,89 @@ void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *a
           max_score,
           id
           );
-      db_mutex.lock();
-      while ( mysql_query(&dbconn, sql) && !zm_terminate ) {
-        Error("Can't update event: %s", mysql_error(&dbconn));
-        db_mutex.unlock();
-        sleep(1);
-        db_mutex.lock();
-      }
-      db_mutex.unlock();
+      dbQueue.push(std::move(sql));
+		} else {
+          Debug(1, "Not Adding %zu frames to DB because write_to_db:%d or frames > analysis fps %f or BULK",
+                frame_data.size(), write_to_db, fps);
     } // end if frame_type == BULK
   } // end if db_frame
 
+  if (score > (int)max_score)
+    max_score = score;
   end_time = timestamp;
 }  // end void Event::AddFrame(Image *image, struct timeval timestamp, int score, Image *alarm_image)
+
+bool Event::SetPath(Storage *storage) {
+  scheme = storage->Scheme();
+
+  path = stringtf("%s/%d", storage->Path(), monitor->Id());
+  // Try to make the Monitor Dir.  Normally this would exist, but in odd cases might not.
+  if (mkdir(path.c_str(), 0755) and (errno != EEXIST)) {
+    Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
+    return false;
+  }
+
+  tm stime = {};
+  localtime_r(&start_time.tv_sec, &stime);
+  if (scheme == Storage::DEEP) {
+
+    int dt_parts[6];
+    dt_parts[0] = stime.tm_year-100;
+    dt_parts[1] = stime.tm_mon+1;
+    dt_parts[2] = stime.tm_mday;
+    dt_parts[3] = stime.tm_hour;
+    dt_parts[4] = stime.tm_min;
+    dt_parts[5] = stime.tm_sec;
+
+    std::string date_path;
+    std::string time_path;
+
+    for (unsigned int i = 0; i < sizeof(dt_parts)/sizeof(*dt_parts); i++) {
+      path += stringtf("/%02d", dt_parts[i]);
+
+      if (mkdir(path.c_str(), 0755) and (errno != EEXIST)) {
+        Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
+        return false;
+      }
+      if (i == 2)
+				date_path = path;
+    }
+		time_path = stringtf("%02d/%02d/%02d", stime.tm_hour, stime.tm_min, stime.tm_sec);
+
+    // Create event id symlink
+    std::string id_file = stringtf("%s/.%" PRIu64, date_path.c_str(), id);
+    if (symlink(time_path.c_str(), id_file.c_str()) < 0) {
+      Error("Can't symlink %s -> %s: %s", id_file.c_str(), time_path.c_str(), strerror(errno));
+      return false;
+    }
+  } else if (scheme == Storage::MEDIUM) {
+    path += stringtf("/%04d-%02d-%02d",
+        stime.tm_year+1900, stime.tm_mon+1, stime.tm_mday
+        );
+    if (mkdir(path.c_str(), 0755) and (errno != EEXIST)) {
+      Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
+      return false;
+    }
+    path += stringtf("/%" PRIu64, id);
+    if (mkdir(path.c_str(), 0755) and (errno != EEXIST)) {
+      Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
+      return false;
+    }
+  } else {
+    path += stringtf("/%" PRIu64, id);
+    if (mkdir(path.c_str(), 0755) and (errno != EEXIST)) {
+      Error("Can't mkdir %s: %s", path.c_str(), strerror(errno));
+      return false;
+    }
+
+    // Create empty id tag file
+    std::string id_file = stringtf("%s/.%" PRIu64, path.c_str(), id);
+    if ( FILE *id_fp = fopen(id_file.c_str(), "w") ) {
+      fclose(id_fp);
+    } else {
+      Error("Can't fopen %s: %s", id_file.c_str(), strerror(errno));
+      return false;
+		}
+  }  // deep storage or not
+  return true;
+}  // end bool Event::SetPath
diff --git a/src/zm_event.h b/src/zm_event.h
index 8c44af1f2..7d0a334c5 100644
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -1,69 +1,58 @@
 //
 // ZoneMinder Core Interfaces, $Date$, $Revision$
 // Copyright (C) 2001-2008 Philip Coombes
-// 
+//
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
+//
 
 #ifndef ZM_EVENT_H
 #define ZM_EVENT_H
 
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <limits.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <mysql/mysql.h>
+#include "zm_config.h"
+#include "zm_define.h"
+#include "zm_storage.h"
+#include "zm_zone.h"
 
-#include <set>
 #include <map>
 #include <queue>
+#include <set>
 
-#include "zm.h"
-#include "zm_image.h"
-#include "zm_stream.h"
-#include "zm_video.h"
-#include "zm_storage.h"
-
-class Zone;
-class Monitor;
 class EventStream;
+class Frame;
+class Image;
+class Monitor;
+class VideoStore;
+class ZMPacket;
+class Zone;
+
+// Maximum number of prealarm frames that can be stored
+#define MAX_PRE_ALARM_FRAMES  16
 
-#define MAX_PRE_ALARM_FRAMES  16 // Maximum number of prealarm frames that can be stored
 typedef uint64_t event_id_t;
-    typedef enum { NORMAL=0, BULK, ALARM } FrameType;
 
-#include "zm_frame.h"
 //
 // Class describing events, i.e. captured periods of activity.
 //
 class Event {
   friend class EventStream;
 
-  protected:
-    static int    sd;
-
-  public:
+ public:
     typedef std::set<std::string> StringSet;
     typedef std::map<std::string,StringSet> StringSetMap;
 
-  protected:
+ protected:
     static const char * frame_type_names[3];
 
     struct PreAlarmData {
@@ -83,78 +72,92 @@ class Event {
     struct timeval  end_time;
     std::string     cause;
     StringSetMap    noteSetMap;
-    bool            videoEvent;
     int        frames;
     int        alarm_frames;
     bool alarm_frame_written;
     unsigned int  tot_score;
     unsigned int  max_score;
-		std::string path;
+    std::string path;
     std::string snapshot_file;
     std::string alarm_file;
+    VideoStore *videoStore;
 
-    VideoWriter* videowriter;
-    FILE* timecodes_fd;
     std::string video_name;
     std::string video_file;
-
-    std::string timecodes_name;
-    std::string timecodes_file;
     int        last_db_frame;
+    bool have_video_keyframe; // a flag to tell us if we have had a video keyframe when writing an mp4.  The first frame SHOULD be a video keyframe.
     Storage::Schemes  scheme;
+    int save_jpegs;
 
-    void createNotes( std::string &notes );
+    void createNotes(std::string &notes);
 
-  public:
-    static bool OpenFrameSocket( int );
-    static bool ValidateFrameSocket( int );
+ public:
+    static bool OpenFrameSocket(int);
+    static bool ValidateFrameSocket(int);
 
-    Event( Monitor *p_monitor, struct timeval p_start_time, const std::string &p_cause, const StringSetMap &p_noteSetMap, bool p_videoEvent=false );
+    Event(
+        Monitor *p_monitor,
+        struct timeval p_start_time,
+        const std::string &p_cause,
+        const StringSetMap &p_noteSetMap
+        );
     ~Event();
 
     uint64_t Id() const { return id; }
-    const std::string &Cause() { return cause; }
+    const std::string &Cause() const { return cause; }
     int Frames() const { return frames; }
     int AlarmFrames() const { return alarm_frames; }
 
     const struct timeval &StartTime() const { return start_time; }
     const struct timeval &EndTime() const { return end_time; }
-    struct timeval &StartTime() { return start_time; }
-    struct timeval &EndTime() { return end_time; }
 
-    bool SendFrameImage( const Image *image, bool alarm_frame=false );
-    bool WriteFrameImage( Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame=false );
-    bool WriteFrameVideo( const Image *image, const struct timeval timestamp, VideoWriter* videow );
+    void AddPacket(ZMPacket *p);
+    bool WritePacket(ZMPacket &p);
+    bool SendFrameImage(const Image *image, bool alarm_frame=false);
+    bool WriteFrameImage(
+        Image *image,
+        struct timeval timestamp,
+        const char *event_file,
+        bool alarm_frame=false
+       ) const;
 
-    void updateNotes( const StringSetMap &stringSetMap );
+    void updateNotes(const StringSetMap &stringSetMap);
 
-    void AddFrames( int n_frames, Image **images, struct timeval **timestamps );
-    void AddFrame( Image *image, struct timeval timestamp, int score=0, Image *alarm_frame=nullptr );
+    void AddFrame(
+        Image *image,
+        struct timeval timestamp,
+        const std::vector<ZoneStats> &stats,
+        int score=0,
+        Image *alarm_image=nullptr
+        );
 
-  private:
-    void AddFramesInternal( int n_frames, int start_frame, Image **images, struct timeval **timestamps );
+ private:
     void WriteDbFrames();
-    void UpdateFramesDelta(double offset);
+    bool SetPath(Storage *storage);
 
-  public:
-    static const char *getSubPath( struct tm *time ) {
+ public:
+    static const char *getSubPath(tm time) {
       static char subpath[PATH_MAX] = "";
-      snprintf(subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec);
+      snprintf(subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d",
+          time.tm_year-100, time.tm_mon+1, time.tm_mday,
+          time.tm_hour, time.tm_min, time.tm_sec);
       return subpath;
     }
-    static const char *getSubPath( time_t *time ) {
-      return Event::getSubPath( localtime( time ) );
+    static const char *getSubPath(time_t *time) {
+      tm time_tm = {};
+      localtime_r(time, &time_tm);
+      return Event::getSubPath(time_tm);
     }
 
-    const char* getEventFile(void) {
+    const char* getEventFile() const {
       return video_file.c_str();
     }
 
-  public:
     static int PreAlarmCount() {
       return pre_alarm_count;
     }
     static void EmptyPreAlarmFrames() {
+#if 0
       while ( pre_alarm_count > 0 ) {
 				int i = pre_alarm_count - 1;
 				delete pre_alarm_data[i].image;
@@ -165,18 +168,27 @@ class Event {
 				}
 				pre_alarm_count--;
 			}
+#endif
       pre_alarm_count = 0;
     }
-    static void AddPreAlarmFrame(Image *image, struct timeval timestamp, int score=0, Image *alarm_frame=nullptr) {
+    static void AddPreAlarmFrame(
+        Image *image,
+        struct timeval timestamp,
+        int score=0,
+        Image *alarm_frame=nullptr
+        ) {
+#if 0
       pre_alarm_data[pre_alarm_count].image = new Image(*image);
       pre_alarm_data[pre_alarm_count].timestamp = timestamp;
       pre_alarm_data[pre_alarm_count].score = score;
       if ( alarm_frame ) {
         pre_alarm_data[pre_alarm_count].alarm_frame = new Image(*alarm_frame);
       }
+#endif
       pre_alarm_count++;
     }
     void SavePreAlarmFrames() {
+#if 0
       for ( int i = 0; i < pre_alarm_count; i++ ) {
         AddFrame(
 						pre_alarm_data[i].image,
@@ -184,6 +196,7 @@ class Event {
 						pre_alarm_data[i].score,
 						pre_alarm_data[i].alarm_frame);
 			}
+#endif
       EmptyPreAlarmFrames();
     }
 };
diff --git a/src/zm_eventstream.cpp b/src/zm_eventstream.cpp
index b9abf5e76..7a35f6892 100644
--- a/src/zm_eventstream.cpp
+++ b/src/zm_eventstream.cpp
@@ -1,5 +1,5 @@
 //
-// ZoneMinder Event Class Implementation, $Date$, $Revision$
+// ZoneMinder Event Stream Class Implementation
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -16,48 +16,39 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
-
-#include <fcntl.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <sys/un.h>
-#include <sys/uio.h>
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <getopt.h>
-#include <arpa/inet.h>
-#include <glob.h>
-#include <cinttypes>
-
-#include "zm.h"
-#include "zm_db.h"
-#include "zm_time.h"
-#include "zm_mpeg.h"
-#include "zm_signal.h"
-#include "zm_event.h"
+//
 #include "zm_eventstream.h"
-#include "zm_storage.h"
-#include "zm_monitor.h"
 
+#include "zm_db.h"
+#include "zm_image.h"
+#include "zm_logger.h"
 #include "zm_sendfile.h"
+#include "zm_signal.h"
+#include "zm_storage.h"
+#include <arpa/inet.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
+
+const std::string EventStream::StreamMode_Strings[4] = {
+  "None",
+  "Single",
+  "All",
+  "Gapless"
+};
 
 bool EventStream::loadInitialEventData(int monitor_id, time_t event_time) {
-  static char sql[ZM_SQL_SML_BUFSIZ];
+  std::string sql = stringtf("SELECT `Id` FROM `Events` WHERE "
+                             "`MonitorId` = %d AND unix_timestamp(`EndDateTime`) > %ld "
+                             "ORDER BY `Id` ASC LIMIT 1", monitor_id, event_time);
 
-  snprintf(sql, sizeof(sql), "SELECT `Id` FROM `Events` WHERE "
-      "`MonitorId` = %d AND unix_timestamp(`EndTime`) > %ld "
-      "ORDER BY `Id` ASC LIMIT 1", monitor_id, event_time);
+  MYSQL_RES *result = zmDbFetch(sql.c_str());
+  if (!result)
+    exit(-1);
 
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't run query: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
-  }
-
-  MYSQL_RES *result = mysql_store_result(&dbconn);
-  if ( !result ) {
-    Error("Can't use query result: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
-  }
   MYSQL_ROW dbrow = mysql_fetch_row(result);
 
   if ( mysql_errno(&dbconn) ) {
@@ -80,25 +71,28 @@ bool EventStream::loadInitialEventData(int monitor_id, time_t event_time) {
         //Info( "eft %d > et %d", event_data->frames[i].timestamp, event_time );
         if ( event_data->frames[i].timestamp >= event_time ) {
           curr_frame_id = i+1;
-          Debug(3, "Set curr_stream_time:%.2f, curr_frame_id:%d", curr_stream_time, curr_frame_id);
+          Debug(3, "Set curr_stream_time:%.2f, curr_frame_id:%ld", curr_stream_time, curr_frame_id);
           break;
         }
       } // end foreach frame
       Debug(3, "Skipping %ld frames", event_data->frame_count);
     } else {
-      Warning("Requested an event time less than the start of the event. event_time %.2f < start_time %.2f",
-          event_time, event_data->start_time);
+      Warning("Requested an event time less than the start of the event. event_time %" PRIi64 " < start_time %" PRIi64,
+          static_cast<int64>(event_time), static_cast<int64>(event_data->start_time));
     }
   } // end if have a start time
   return true;
 } // bool EventStream::loadInitialEventData( int monitor_id, time_t event_time )
 
-bool EventStream::loadInitialEventData(uint64_t init_event_id, unsigned int init_frame_id) {
+bool EventStream::loadInitialEventData(
+    uint64_t init_event_id,
+    unsigned int init_frame_id
+    ) {
   loadEventData(init_event_id);
 
   if ( init_frame_id ) {
     if ( init_frame_id >= event_data->frame_count ) {
-      Error("Invalid frame id specified. %d > %d", init_frame_id, event_data->frame_count);
+      Error("Invalid frame id specified. %d > %lu", init_frame_id, event_data->frame_count);
       curr_stream_time = event_data->start_time;
       curr_frame_id = 1;
     } else {
@@ -113,26 +107,19 @@ bool EventStream::loadInitialEventData(uint64_t init_event_id, unsigned int init
 }
 
 bool EventStream::loadEventData(uint64_t event_id) {
-  static char sql[ZM_SQL_MED_BUFSIZ];
-
-  snprintf(sql, sizeof(sql),
-      "SELECT `MonitorId`, `StorageId`, `Frames`, unix_timestamp( `StartTime` ) AS StartTimestamp, "
-      "(SELECT max(`Delta`)-min(`Delta`) FROM `Frames` WHERE `EventId`=`Events`.`Id`) AS Duration, "
+  std::string sql = stringtf(
+      "SELECT `MonitorId`, `StorageId`, `Frames`, unix_timestamp( `StartDateTime` ) AS StartTimestamp, "
+      "unix_timestamp( `EndDateTime` ) AS EndTimestamp, "
+      "(SELECT max(`Delta`)-min(`Delta`) FROM `Frames` WHERE `EventId`=`Events`.`Id`) AS FramesDuration, "
       "`DefaultVideo`, `Scheme`, `SaveJPEGs`, `Orientation`+0 FROM `Events` WHERE `Id` = %" PRIu64, event_id);
 
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't run query: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
-  }
-
-  MYSQL_RES *result = mysql_store_result(&dbconn);
-  if ( !result ) {
-    Error("Can't use query result: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
+  MYSQL_RES *result = zmDbFetch(sql.c_str());
+  if (!result) {
+    exit(-1);
   }
 
   if ( !mysql_num_rows(result) ) {
-    Fatal("Unable to load event %d, not found in DB", event_id);
+    Fatal("Unable to load event %" PRIu64 ", not found in DB", event_id);
   }
 
   MYSQL_ROW dbrow = mysql_fetch_row(result);
@@ -150,9 +137,11 @@ bool EventStream::loadEventData(uint64_t event_id) {
   event_data->storage_id = dbrow[1] ? atoi(dbrow[1]) : 0;
   event_data->frame_count = dbrow[2] == nullptr ? 0 : atoi(dbrow[2]);
   event_data->start_time = atoi(dbrow[3]);
-  event_data->duration = dbrow[4] ? atof(dbrow[4]) : 0.0;
-  strncpy(event_data->video_file, dbrow[5], sizeof(event_data->video_file)-1);
-  std::string scheme_str = std::string(dbrow[6]);
+  event_data->end_time = dbrow[4] ? atoi(dbrow[4]) : 0;
+  event_data->duration = event_data->end_time - event_data->start_time;
+  event_data->frames_duration = dbrow[5] ? atof(dbrow[5]) : 0.0;
+  strncpy(event_data->video_file, dbrow[6], sizeof(event_data->video_file)-1);
+  std::string scheme_str = std::string(dbrow[7]);
   if ( scheme_str == "Deep" ) {
     event_data->scheme = Storage::DEEP;
   } else if ( scheme_str == "Medium" ) {
@@ -160,14 +149,13 @@ bool EventStream::loadEventData(uint64_t event_id) {
   } else {
     event_data->scheme = Storage::SHALLOW;
   }
-  event_data->SaveJPEGs = dbrow[7] == nullptr ? 0 : atoi(dbrow[7]);
-  event_data->Orientation = (Monitor::Orientation)(dbrow[8] == nullptr ? 0 : atoi(dbrow[8]));
+  event_data->SaveJPEGs = dbrow[8] == nullptr ? 0 : atoi(dbrow[8]);
+  event_data->Orientation = (Monitor::Orientation)(dbrow[9] == nullptr ? 0 : atoi(dbrow[9]));
   mysql_free_result(result);
 
   if ( !monitor ) {
     monitor = Monitor::Load(event_data->monitor_id, false, Monitor::QUERY);
   } else if ( monitor->Id() != event_data->monitor_id ) {
-    delete monitor;
     monitor = Monitor::Load(event_data->monitor_id, false, Monitor::QUERY);
   }
   if ( !monitor ) {
@@ -183,60 +171,55 @@ bool EventStream::loadEventData(uint64_t event_id) {
   const char *storage_path = storage->Path();
 
   if ( event_data->scheme == Storage::DEEP ) {
-    struct tm *event_time = localtime(&event_data->start_time);
+    tm event_time = {};
+    localtime_r(&event_data->start_time, &event_time);
 
     if ( storage_path[0] == '/' )
       snprintf(event_data->path, sizeof(event_data->path),
-          "%s/%d/%02d/%02d/%02d/%02d/%02d/%02d",
+          "%s/%u/%02d/%02d/%02d/%02d/%02d/%02d",
           storage_path, event_data->monitor_id,
-          event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday,
-          event_time->tm_hour, event_time->tm_min, event_time->tm_sec);
+          event_time.tm_year-100, event_time.tm_mon+1, event_time.tm_mday,
+          event_time.tm_hour, event_time.tm_min, event_time.tm_sec);
     else
       snprintf(event_data->path, sizeof(event_data->path),
-          "%s/%s/%d/%02d/%02d/%02d/%02d/%02d/%02d",
+          "%s/%s/%u/%02d/%02d/%02d/%02d/%02d/%02d",
           staticConfig.PATH_WEB.c_str(), storage_path, event_data->monitor_id,
-          event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday,
-          event_time->tm_hour, event_time->tm_min, event_time->tm_sec);
+          event_time.tm_year-100, event_time.tm_mon+1, event_time.tm_mday,
+          event_time.tm_hour, event_time.tm_min, event_time.tm_sec);
   } else if ( event_data->scheme == Storage::MEDIUM ) {
-    struct tm *event_time = localtime(&event_data->start_time);
+    tm event_time = {};
+    localtime_r(&event_data->start_time, &event_time);
     if ( storage_path[0] == '/' )
       snprintf(event_data->path, sizeof(event_data->path),
-          "%s/%d/%04d-%02d-%02d/%" PRIu64,
+          "%s/%u/%04d-%02d-%02d/%" PRIu64,
           storage_path, event_data->monitor_id,
-          event_time->tm_year+1900, event_time->tm_mon+1, event_time->tm_mday,
+          event_time.tm_year+1900, event_time.tm_mon+1, event_time.tm_mday,
           event_data->event_id);
     else
       snprintf(event_data->path, sizeof(event_data->path),
-          "%s/%s/%d/%04d-%02d-%02d/%" PRIu64,
+          "%s/%s/%u/%04d-%02d-%02d/%" PRIu64,
           staticConfig.PATH_WEB.c_str(), storage_path, event_data->monitor_id,
-          event_time->tm_year+1900, event_time->tm_mon+1, event_time->tm_mday, 
+          event_time.tm_year+1900, event_time.tm_mon+1, event_time.tm_mday,
           event_data->event_id);
 
   } else {
     if ( storage_path[0] == '/' )
-      snprintf(event_data->path, sizeof(event_data->path), "%s/%d/%" PRIu64,
+      snprintf(event_data->path, sizeof(event_data->path), "%s/%u/%" PRIu64,
           storage_path, event_data->monitor_id, event_data->event_id);
     else
-      snprintf(event_data->path, sizeof(event_data->path), "%s/%s/%d/%" PRIu64, 
+      snprintf(event_data->path, sizeof(event_data->path), "%s/%s/%u/%" PRIu64,
           staticConfig.PATH_WEB.c_str(), storage_path, event_data->monitor_id,
           event_data->event_id);
   }
 
-  updateFrameRate((double)event_data->frame_count/event_data->duration);
-  Debug(3, "fps set by frame_count(%d)/duration(%f)",
-      event_data->frame_count, event_data->duration);
+  updateFrameRate((event_data->frame_count and event_data->duration) ? (double)event_data->frame_count/event_data->duration : 1);
 
-  snprintf(sql, sizeof(sql), "SELECT `FrameId`, unix_timestamp(`TimeStamp`), `Delta` "
-      "FROM `Frames` WHERE `EventId` = %" PRIu64 " ORDER BY `FrameId` ASC", event_id);
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't run query: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
-  }
+  sql = stringtf("SELECT `FrameId`, unix_timestamp(`TimeStamp`), `Delta` "
+                 "FROM `Frames` WHERE `EventId` = %" PRIu64 " ORDER BY `FrameId` ASC", event_id);
 
-  result = mysql_store_result(&dbconn);
-  if ( !result ) {
-    Error("Can't use query result: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
+  result = zmDbFetch(sql.c_str());
+  if (!result) {
+    exit(-1);
   }
 
   event_data->n_frames = mysql_num_rows(result);
@@ -284,11 +267,13 @@ bool EventStream::loadEventData(uint64_t event_id) {
         event_data->frames[id-1].in_db
         );
   }
+  // Incomplete events might not have any frame data
+  event_data->last_frame_id = last_id;
+
   if ( mysql_errno(&dbconn) ) {
     Error("Can't fetch row: %s", mysql_error(&dbconn));
     exit(mysql_errno(&dbconn));
   }
-
   mysql_free_result(result);
 
   if ( event_data->video_file[0] || (monitor->GetOptVideoWriter() > 0) ) {
@@ -296,9 +281,10 @@ bool EventStream::loadEventData(uint64_t event_id) {
       snprintf(event_data->video_file, sizeof(event_data->video_file), "%" PRIu64 "-%s", event_data->event_id, "video.mp4");
     }
     std::string filepath = std::string(event_data->path) + "/" + std::string(event_data->video_file);
-    //char filepath[PATH_MAX];
-    //snprintf(filepath, sizeof(filepath), "%s/%s", event_data->path, event_data->video_file);
     Debug(1, "Loading video file from %s", filepath.c_str());
+    if ( ffmpeg_input )
+      delete ffmpeg_input;
+
     ffmpeg_input = new FFmpeg_Input();
     if ( 0 > ffmpeg_input->Open(filepath.c_str()) ) {
       Warning("Unable to open ffmpeg_input %s", filepath.c_str());
@@ -307,14 +293,15 @@ bool EventStream::loadEventData(uint64_t event_id) {
     }
   }
 
+  // Not sure about this
   if ( forceEventChange || mode == MODE_ALL_GAPLESS ) {
     if ( replay_rate > 0 )
       curr_stream_time = event_data->frames[0].timestamp;
     else
-      curr_stream_time = event_data->frames[event_data->frame_count-1].timestamp;
+      curr_stream_time = event_data->frames[event_data->last_frame_id-1].timestamp;
   }
-  Debug(2, "Event:%" PRIu64 ", Frames:%ld, Duration: %.2f",
-      event_data->event_id, event_data->frame_count, event_data->duration);
+  Debug(2, "Event:%" PRIu64 ", Frames:%ld, Last Frame ID(%ld, Duration: %.2f Frames Duration: %.2f",
+      event_data->event_id, event_data->frame_count, event_data->last_frame_id, event_data->duration, event_data->frames_duration);
 
   return true;
 } // bool EventStream::loadEventData( int event_id )
@@ -341,14 +328,16 @@ void EventStream::processCommand(const CmdMsg *msg) {
         if (
             (mode == MODE_SINGLE || mode == MODE_NONE)
             &&
-            ((unsigned int)curr_frame_id == event_data->frame_count)
+            ((unsigned int)curr_frame_id == event_data->last_frame_id)
             ) {
           Debug(1, "Was in single or no replay mode, and at last frame, so jumping to 1st frame");
           curr_frame_id = 1;
         } else {
-          Debug(1, "mode is %s, current frame is %d, frame count is %d",
-              (mode == MODE_SINGLE ? "single" : "not single"),
-              curr_frame_id, event_data->frame_count );
+          Debug(1, "mode is %s, current frame is %ld, frame count is %ld, last frame id is %ld",
+                StreamMode_Strings[(int) mode].c_str(),
+                curr_frame_id,
+                event_data->frame_count,
+                event_data->last_frame_id);
         }
 
         replay_rate = ZM_RATE_BASE;
@@ -359,6 +348,13 @@ void EventStream::processCommand(const CmdMsg *msg) {
           paused = false;
         }
         replay_rate = ntohs(((unsigned char)msg->msg_data[2]<<8)|(unsigned char)msg->msg_data[1])-32768;
+        if ( replay_rate > 50 * ZM_RATE_BASE ) {
+          Warning("requested replay rate (%d) is too high. We only support up to 50x", replay_rate);
+          replay_rate = 50 * ZM_RATE_BASE;
+        } else if ( replay_rate < -50*ZM_RATE_BASE ) {
+          Warning("requested replay rate (%d) is too low. We only support up to -50x", replay_rate);
+          replay_rate = -50 * ZM_RATE_BASE;
+        }
         break;
     case CMD_STOP :
         Debug(1, "Got STOP command");
@@ -394,9 +390,9 @@ void EventStream::processCommand(const CmdMsg *msg) {
         paused = true;
         replay_rate = ZM_RATE_BASE;
         step = 1;
-        if ( (unsigned int)curr_frame_id < event_data->frame_count )
+        if ( (unsigned int)curr_frame_id < event_data->last_frame_id )
           curr_frame_id += 1;
-        Debug(1, "Got SLOWFWD command new frame id %d", curr_frame_id);
+        Debug(1, "Got SLOWFWD command new frame id %ld", curr_frame_id);
         break;
     case CMD_SLOWREV :
         paused = true;
@@ -404,13 +400,16 @@ void EventStream::processCommand(const CmdMsg *msg) {
         step = -1;
         curr_frame_id -= 1;
         if ( curr_frame_id < 1 ) curr_frame_id = 1;
-        Debug(1, "Got SLOWREV command new frame id %d", curr_frame_id);
+        Debug(1, "Got SLOWREV command new frame id %ld", curr_frame_id);
         break;
     case CMD_FASTREV :
         Debug(1, "Got FAST REV command");
         paused = false;
         // Set play rate
         switch ( replay_rate ) {
+          case -1 * ZM_RATE_BASE :
+            replay_rate = -2 * ZM_RATE_BASE;
+            break;
           case -2 * ZM_RATE_BASE :
             replay_rate = -5 * ZM_RATE_BASE;
             break;
@@ -425,7 +424,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
             replay_rate = -50 * ZM_RATE_BASE;
             break;
           default :
-            replay_rate = -2 * ZM_RATE_BASE;
+            replay_rate = -1 * ZM_RATE_BASE;
             break;
         }
         break;
@@ -489,14 +488,14 @@ void EventStream::processCommand(const CmdMsg *msg) {
         if ( replay_rate >= 0 )
           curr_frame_id = 0;
         else
-          curr_frame_id = event_data->frame_count+1;
+          curr_frame_id = event_data->last_frame_id+1;
         paused = false;
         forceEventChange = true;
         break;
     case CMD_NEXT :
         Debug(1, "Got NEXT command");
         if ( replay_rate >= 0 )
-          curr_frame_id = event_data->frame_count+1;
+          curr_frame_id = event_data->last_frame_id+1;
         else
           curr_frame_id = 0;
         paused = false;
@@ -505,9 +504,33 @@ void EventStream::processCommand(const CmdMsg *msg) {
     case CMD_SEEK :
       {
         // offset is in seconds
-        int offset = ((unsigned char)msg->msg_data[1]<<24)|((unsigned char)msg->msg_data[2]<<16)|((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
-        curr_frame_id = (int)(event_data->frame_count*offset/event_data->duration);
-        Debug(1, "Got SEEK command, to %d (new cfid: %d)", offset, curr_frame_id);
+
+        int int_part = ((unsigned char)msg->msg_data[1]<<24)|((unsigned char)msg->msg_data[2]<<16)|((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
+       int dec_part =  ((unsigned char)msg->msg_data[5]<<24)|((unsigned char)msg->msg_data[6]<<16)|((unsigned char)msg->msg_data[7]<<8)|(unsigned char)msg->msg_data[8];
+
+       double offset = (double)int_part + (double)(dec_part / (double)1000000);
+        if ( offset < 0.0 ) {
+          Warning("Invalid offset, not seeking");
+          break;
+        }
+        // This should get us close, but not all frames will have the same duration
+        curr_frame_id = (int)(event_data->frame_count*offset/event_data->duration)+1;
+        if ( event_data->frames[curr_frame_id-1].offset > offset ) {
+          while ( (curr_frame_id --) && ( event_data->frames[curr_frame_id-1].offset > offset ) ) {
+          }
+        } else if ( event_data->frames[curr_frame_id-1].offset < offset ) {
+          while ( (curr_frame_id ++) && ( event_data->frames[curr_frame_id-1].offset > offset ) ) {
+          }
+        }
+        if ( curr_frame_id < 1 ) {
+          curr_frame_id = 1;
+        } else if ( (unsigned long)curr_frame_id > event_data->last_frame_id ) {
+          curr_frame_id = event_data->last_frame_id;
+        }
+
+        curr_stream_time = event_data->frames[curr_frame_id-1].timestamp;
+        Debug(1, "Got SEEK command, to %f (new current frame id: %ld offset %f)",
+            offset, curr_frame_id, event_data->frames[curr_frame_id-1].offset);
         send_frame = true;
         break;
       }
@@ -524,19 +547,22 @@ void EventStream::processCommand(const CmdMsg *msg) {
 
   struct {
     uint64_t event_id;
-    int progress;
+    double duration;
+    double progress;
     int rate;
     int zoom;
     bool paused;
   } status_data;
 
   status_data.event_id = event_data->event_id;
-  status_data.progress = (int)event_data->frames[curr_frame_id-1].offset;
+  status_data.duration = event_data->duration;
+  status_data.progress = event_data->frames[curr_frame_id-1].offset;
   status_data.rate = replay_rate;
   status_data.zoom = zoom;
   status_data.paused = paused;
-  Debug(2, "Event:%" PRIu64 ", Paused:%d, progress:%d Rate:%d, Zoom:%d",
+  Debug(2, "Event:%" PRIu64 ", Duration %f, Paused:%d, progress:%f Rate:%d, Zoom:%d",
     status_data.event_id,
+    status_data.duration,
     status_data.paused,
     status_data.progress,
     status_data.rate,
@@ -546,7 +572,7 @@ void EventStream::processCommand(const CmdMsg *msg) {
   DataMsg status_msg;
   status_msg.msg_type = MSG_DATA_EVENT;
   memcpy(&status_msg.msg_data, &status_data, sizeof(status_data));
-  Debug(1, "Size of msg %d", sizeof(status_data));
+  Debug(1, "Size of msg %zu", sizeof(status_data));
   if ( sendto(sd, &status_msg, sizeof(status_msg), MSG_DONTWAIT, (sockaddr *)&rem_addr, sizeof(rem_addr)) < 0 ) {
     //if ( errno != EAGAIN )
     {
@@ -558,38 +584,45 @@ void EventStream::processCommand(const CmdMsg *msg) {
   if ( (MsgCommand)msg->msg_data[0] == CMD_QUIT )
     exit(0);
 
-  updateFrameRate((double)event_data->frame_count/event_data->duration);
+  updateFrameRate((event_data->frame_count and event_data->duration) ? (double)event_data->frame_count/event_data->duration : 1);
 }  // void EventStream::processCommand(const CmdMsg *msg)
 
 bool EventStream::checkEventLoaded() {
-  static char sql[ZM_SQL_SML_BUFSIZ];
+  std::string sql;
 
   if ( curr_frame_id <= 0 ) {
-    snprintf(sql, sizeof(sql),
+    sql = stringtf(
         "SELECT `Id` FROM `Events` WHERE `MonitorId` = %d AND `Id` < %" PRIu64 " ORDER BY `Id` DESC LIMIT 1",
         event_data->monitor_id, event_data->event_id);
-  } else if ( (unsigned int)curr_frame_id > event_data->frame_count ) {
-    snprintf(sql, sizeof(sql),
+  } else if ( (unsigned int)curr_frame_id > event_data->last_frame_id ) {
+    if ( !event_data->end_time ) {
+      // We are viewing an in-process event, so just reload it.
+      loadEventData(event_data->event_id);
+      if ( (unsigned int)curr_frame_id > event_data->last_frame_id )
+        curr_frame_id = event_data->last_frame_id;
+      return false;
+    }
+    sql = stringtf(
         "SELECT `Id` FROM `Events` WHERE `MonitorId` = %d AND `Id` > %" PRIu64 " ORDER BY `Id` ASC LIMIT 1",
         event_data->monitor_id, event_data->event_id);
   } else {
     // No event change required
-    Debug(3, "No event change required, as curr frame %d <=> event frames %d",
+    Debug(3, "No event change required, as curr frame %ld <=> event frames %lu",
         curr_frame_id, event_data->frame_count);
     return false;
   }
 
   // Event change required.
   if ( forceEventChange || ( (mode != MODE_SINGLE) && (mode != MODE_NONE) ) ) {
-    if ( mysql_query(&dbconn, sql) ) {
-      Error("Can't run query: %s", mysql_error(&dbconn));
-      exit(mysql_errno(&dbconn));
+    Debug(1, "Checking for next event %s", sql.c_str());
+
+    MYSQL_RES *result = zmDbFetch(sql.c_str());
+    if (!result) {
+      exit(-1);
     }
 
-    MYSQL_RES *result = mysql_store_result(&dbconn);
-    if ( !result ) {
-      Error("Can't use query result: %s", mysql_error(&dbconn));
-      exit(mysql_errno(&dbconn));
+    if ( mysql_num_rows(result) != 1 ) {
+      Debug(1, "No rows returned for %s", sql.c_str());
     }
     MYSQL_ROW dbrow = mysql_fetch_row(result);
 
@@ -605,13 +638,13 @@ bool EventStream::checkEventLoaded() {
       loadEventData(event_id);
 
       if ( replay_rate < 0 )  // rewind
-        curr_frame_id = event_data->frame_count;
+        curr_frame_id = event_data->last_frame_id;
       else
         curr_frame_id = 1;
-      Debug(2, "New frame id = %d", curr_frame_id);
+      Debug(2, "New frame id = %ld", curr_frame_id);
       return true;
     } else {
-      Debug(2, "No next event loaded using %s. Pausing", sql);
+      Debug(2, "No next event loaded using %s. Pausing", sql.c_str());
       if ( curr_frame_id <= 0 )
         curr_frame_id = 1;
       else
@@ -622,11 +655,11 @@ bool EventStream::checkEventLoaded() {
     mysql_free_result(result);
     forceEventChange = false;
   } else {
-    Debug(2, "Pausing because mode is %d", mode);
+    Debug(2, "Pausing because mode is %s", StreamMode_Strings[mode].c_str());
     if ( curr_frame_id <= 0 )
       curr_frame_id = 1;
     else
-      curr_frame_id = event_data->frame_count;
+      curr_frame_id = event_data->last_frame_id;
     paused = true;
   }
   return false;
@@ -636,13 +669,13 @@ Image * EventStream::getImage( ) {
   static char filepath[PATH_MAX];
 
   snprintf(filepath, sizeof(filepath), staticConfig.capture_file_format, event_data->path, curr_frame_id);
-  Debug(2, "EventStream::getImage path(%s) from %s frame(%d) ", filepath, event_data->path, curr_frame_id);
+  Debug(2, "EventStream::getImage path(%s) from %s frame(%ld) ", filepath, event_data->path, curr_frame_id);
   Image *image = new Image(filepath);
   return image;
 }
 
 bool EventStream::sendFrame(int delta_us) {
-  Debug(2, "Sending frame %d", curr_frame_id);
+  Debug(2, "Sending frame %ld", curr_frame_id);
 
   static char filepath[PATH_MAX];
   static struct stat filestat;
@@ -683,9 +716,6 @@ bool EventStream::sendFrame(int delta_us) {
 #endif // HAVE_LIBAVCODEC
   {
 
-    static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
-    int img_buffer_size = 0;
-    uint8_t *img_buffer = temp_img_buffer;
 
     bool send_raw = (type == STREAM_JPEG) && ((scale>=ZM_SCALE_BASE)&&(zoom==ZM_SCALE_BASE)) && filepath[0];
 
@@ -718,7 +748,7 @@ bool EventStream::sendFrame(int delta_us) {
         // when stored as an mp4, we just have the rotation as a flag in the headers
         // so we need to rotate it before outputting
         if (
-            (monitor->GetOptVideoWriter() == Monitor::H264PASSTHROUGH)
+            (monitor->GetOptVideoWriter() == Monitor::PASSTHROUGH)
             and
             (event_data->Orientation != Monitor::ROTATE_0)
             ) {
@@ -746,8 +776,11 @@ bool EventStream::sendFrame(int delta_us) {
         Error("Unable to get a frame");
         return false;
       }
-      
+
       Image *send_image = prepareImage(image);
+      static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
+      int img_buffer_size = 0;
+      uint8_t *img_buffer = temp_img_buffer;
 
       switch ( type ) {
         case STREAM_JPEG :
@@ -776,7 +809,7 @@ bool EventStream::sendFrame(int delta_us) {
 
   }  // end if stream MPEG or other
 
-  fputs("\r\n\r\n", stdout);
+  fputs("\r\n", stdout);
   fflush(stdout);
   last_frame_sent = TV_2_FLOAT(now);
   return true;
@@ -785,7 +818,7 @@ bool EventStream::sendFrame(int delta_us) {
 void EventStream::runStream() {
   openComms();
 
-  checkInitialised();
+  //checkInitialised();
 
   if ( type == STREAM_JPEG )
     fputs("Content-Type: multipart/x-mixed-replace;boundary=" BOUNDARY "\r\n\r\n", stdout);
@@ -795,13 +828,11 @@ void EventStream::runStream() {
     exit(0);
   }
 
-  Debug(3, "frame rate is: (%f)", (double)event_data->frame_count/event_data->duration);
-  updateFrameRate((double)event_data->frame_count/event_data->duration);
+  updateFrameRate((event_data->frame_count and event_data->duration) ? (double)event_data->frame_count/event_data->duration : 1);
   gettimeofday(&start, nullptr);
   uint64_t start_usec = start.tv_sec * 1000000 + start.tv_usec;
   uint64_t last_frame_offset = 0;
 
-  bool in_event = true;
   double time_to_event = 0;
 
   while ( !zm_terminate ) {
@@ -828,11 +859,11 @@ void EventStream::runStream() {
 
     if ( !paused ) {
       // Figure out if we should send this frame
-      Debug(3, "not paused at cur_frame_id (%d-1) mod frame_mod(%d)", curr_frame_id, frame_mod);
+      Debug(3, "not paused at cur_frame_id (%ld-1) mod frame_mod(%d)", curr_frame_id, frame_mod);
       // If we are streaming and this frame is due to be sent
       // frame mod defaults to 1 and if we are going faster than max_fps will get multiplied by 2
       // so if it is 2, then we send every other frame, if is it 4 then every fourth frame, etc.
- 
+
       if ( (frame_mod == 1) || (((curr_frame_id-1)%frame_mod) == 0) ) {
         send_frame = true;
       }
@@ -843,8 +874,8 @@ void EventStream::runStream() {
       send_frame = true;
     } else if ( !send_frame ) {
       // We are paused, not stepping and doing nothing, meaning that comms didn't set send_frame to true
-      double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent;
-      if ( actual_delta_time > MAX_STREAM_DELAY ) {
+      double time_since_last_send = TV_2_FLOAT(now) - last_frame_sent;
+      if ( time_since_last_send > MAX_STREAM_DELAY ) {
         // Send keepalive
         Debug(2, "Sending keepalive frame");
         send_frame = true;
@@ -852,21 +883,19 @@ void EventStream::runStream() {
     }  // end if streaming stepping or doing nothing
 
     // time_to_event > 0 means that we are not in the event
-    if ( time_to_event > 0 ) {
-      double actual_delta_time = TV_2_FLOAT(now) - last_frame_sent;
-      Debug(1, "Actual delta time = %f = %f - %f", actual_delta_time, TV_2_FLOAT(now), last_frame_sent);
-      // > 1 second
-      if ( actual_delta_time > 1 ) {
-        Debug(1, "Sending time to next event frame");
+    if ( ( time_to_event > 0 ) and ( mode == MODE_ALL ) ) {
+      double time_since_last_send = TV_2_FLOAT(now) - last_frame_sent;
+      Debug(1, "Time since last send = %f = %f - %f", time_since_last_send, TV_2_FLOAT(now), last_frame_sent);
+      if ( time_since_last_send > 1 /* second */ ) {
         static char frame_text[64];
-        snprintf(frame_text, sizeof(frame_text), "Time to next event = %d seconds", (int)time_to_event);
+
+        snprintf(frame_text, sizeof(frame_text), "Time to %s event = %d seconds",
+            (replay_rate > 0 ? "next" : "previous" ), (int)time_to_event);
         if ( !sendTextFrame(frame_text) )
           zm_terminate = true;
-      } else {
-        Debug(1, "Not Sending time to next event frame because actual delta time is %f", actual_delta_time);
+        send_frame = false; // In case keepalive was set
       }
-      //else
-      //{
+
       // FIXME ICON But we are not paused.  We are somehow still in the event?
       double sleep_time = (replay_rate>0?1:-1) * ((1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000));
       //double sleep_time = (replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000);
@@ -903,7 +932,7 @@ void EventStream::runStream() {
       delta_us = (unsigned int)((delta_us * base_fps)/effective_fps);
       Debug(3, "delta %u = base_fps(%f)/effective fps(%f)", delta_us, base_fps, effective_fps);
       // but must not exceed maxfps
-      delta_us = max(delta_us, 1000000/maxfps);
+      delta_us = std::max(delta_us, int(1000000/maxfps));
       Debug(3, "delta %u = base_fps(%f)/effective fps(%f) from 30fps", delta_us, base_fps, effective_fps);
 
       // +/- 1? What if we are skipping frames?
@@ -916,7 +945,7 @@ void EventStream::runStream() {
       if ( (mode == MODE_SINGLE) && (
             (curr_frame_id < 1 )
             ||
-            ((unsigned int)curr_frame_id >= event_data->frame_count) 
+            ((unsigned int)curr_frame_id >= event_data->frame_count)
             )
          ) {
         Debug(2, "Have mode==MODE_SINGLE and at end of event, looping back to start");
@@ -938,8 +967,8 @@ void EventStream::runStream() {
         // We assume that we are going forward and the next frame is in the future.
         delta_us = frame_data->offset * 1000000 - (now_usec-start_usec);
        // - (now_usec - start_usec);
-        Debug(2, "New delta_us now %" PRIu64 " - start %" PRIu64 " = %d offset %" PRId64 " - elapsed = %dusec",
-            now_usec, start_usec, now_usec-start_usec, frame_data->offset * 1000000, delta_us);
+        Debug(2, "New delta_us now %" PRIu64 " - start %" PRIu64 " = %" PRIu64 " offset %f - elapsed = %dusec",
+              now_usec, start_usec, static_cast<uint64>(now_usec - start_usec), frame_data->offset * 1000000, delta_us);
       } else {
         Debug(2, "No last frame_offset, no sleep");
         delta_us = 0;
@@ -960,10 +989,10 @@ void EventStream::runStream() {
       delta_us = ((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*(replay_rate?abs(replay_rate*2):2)));
 
       Debug(2, "Sleeping %d because 1000000 * ZM_RATE_BASE(%d) / ( base_fps (%f), replay_rate(%d)",
-          (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))),
+          delta_us,
           ZM_RATE_BASE,
-          (base_fps?base_fps:1),
-          (replay_rate?abs(replay_rate*2):0)
+          (base_fps ? base_fps : 1),
+          (replay_rate ? abs(replay_rate*2) : 0)
           );
       if ( delta_us > 0 ) {
         if ( delta_us > MAX_SLEEP_USEC ) {
@@ -976,29 +1005,28 @@ void EventStream::runStream() {
       //if ( step != 0 )// Adding 0 is cheaper than an if 0
       // curr_frame_id starts at 1 though, so we might skip the first frame?
       curr_frame_id += step;
-
-      // Detects when we hit end of event and will load the next event or previous event
-      if ( checkEventLoaded() ) {
-        // Have change of event
-
-        // This next bit is to determine if we are in the current event time wise
-        // and whether to show an image saying how long until the next event.
-        if ( replay_rate > 0 ) {
-          // This doesn't make sense unless we have hit the end of the event.
-          time_to_event = event_data->frames[0].timestamp - curr_stream_time;
-          Debug(1, "replay rate(%d) time_to_event(%f)=frame timestamp:%f - curr_stream_time(%f)",
-              replay_rate, time_to_event,
-              event_data->frames[0].timestamp,
-              curr_stream_time);
-
-        } else if ( replay_rate < 0 ) {
-          time_to_event = curr_stream_time - event_data->frames[event_data->frame_count-1].timestamp;
-          Debug(1, "replay rate(%d) time_to_event(%f)=curr_stream_time(%f)-frame timestamp:%f",
-              replay_rate, time_to_event, curr_stream_time, event_data->frames[event_data->frame_count-1].timestamp);
-        }  // end if forward or reverse
-
-      }  // end if checkEventLoaded
     }  // end if !paused
+
+    // Detects when we hit end of event and will load the next event or previous event
+    if ( checkEventLoaded() ) {
+      // Have change of event
+
+      // This next bit is to determine if we are in the current event time wise
+      // and whether to show an image saying how long until the next event.
+      if ( replay_rate > 0 ) {
+        // This doesn't make sense unless we have hit the end of the event.
+        time_to_event = event_data->frames[0].timestamp - curr_stream_time;
+        Debug(1, "replay rate(%d) time_to_event(%f)=frame timestamp:%f - curr_stream_time(%f)",
+            replay_rate, time_to_event,
+            event_data->frames[0].timestamp,
+            curr_stream_time);
+
+      } else if ( replay_rate < 0 ) {
+        time_to_event = curr_stream_time - event_data->frames[event_data->frame_count-1].timestamp;
+        Debug(1, "replay rate(%d) time_to_event(%f)=curr_stream_time(%f)-frame timestamp:%f",
+            replay_rate, time_to_event, curr_stream_time, event_data->frames[event_data->frame_count-1].timestamp);
+      }  // end if forward or reverse
+    }  // end if checkEventLoaded
   }  // end while ! zm_terminate
 #if HAVE_LIBAVCODEC
   if ( type == STREAM_MPEG )
@@ -1008,7 +1036,7 @@ void EventStream::runStream() {
   closeComms();
 } // end void EventStream::runStream()
 
-bool EventStream::send_file(const char * filepath) {
+bool EventStream::send_file(const char *filepath) {
   static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
 
   int img_buffer_size = 0;
@@ -1020,47 +1048,50 @@ bool EventStream::send_file(const char * filepath) {
     Error("Can't open %s: %s", filepath, strerror(errno));
     return false;
   }
-  bool size_sent = false;
-
 #if HAVE_SENDFILE
   static struct stat filestat;
   if ( fstat(fileno(fdj), &filestat) < 0 ) {
+    fclose(fdj); /* Close the file handle */
     Error("Failed getting information about file %s: %s", filepath, strerror(errno));
     return false;
   }
+  if ( !filestat.st_size ) {
+    fclose(fdj); /* Close the file handle */
+    Info("File size is zero. Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
+    return false;
+  }
   if ( 0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size) ) {
     fclose(fdj); /* Close the file handle */
-    Info("Unable to send raw frame %u: %s", curr_frame_id, strerror(errno));
+    Info("Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
     return false;
   }
-  size_sent = true;
-
-  if ( zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size) != (int)filestat.st_size ) {
+  int rc = zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size);
+  if ( rc == (int)filestat.st_size ) {
+    // Success
     fclose(fdj); /* Close the file handle */
     return true;
   }
+  Warning("Unable to send raw frame %ld: %s rc %d", curr_frame_id, strerror(errno), rc);
 #endif
   img_buffer_size = fread(img_buffer, 1, sizeof(temp_img_buffer), fdj);
-  if ( !size_sent ) {
-    if ( 0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", img_buffer_size) ) {
-      fclose(fdj); /* Close the file handle */
-      Info("Unable to send raw frame %u: %s", curr_frame_id, strerror(errno));
-      return false;
-    }
-  }
-  if ( fwrite(img_buffer, img_buffer_size, 1, stdout) != 1 ) {
-    Error("Unable to send raw frame %u: %s", curr_frame_id, strerror(errno));
+  fclose(fdj); /* Close the file handle */
+  if ( !img_buffer_size ) {
+    Info("Unable to read raw frame %ld: %s", curr_frame_id, strerror(errno));
     return false;
   }
 
-  fclose(fdj); /* Close the file handle */
-  return true;
+  return send_buffer(img_buffer, img_buffer_size);
 }  // end bool EventStream::send_file(const char * filepath)
 
 bool EventStream::send_buffer(uint8_t* buffer, int size) {
-  fprintf(stdout, "Content-Length: %d\r\n\r\n", size);
-  if ( fwrite(buffer, size, 1, stdout) != 1 ) {
-    Error("Unable to send raw frame %u: %s", curr_frame_id, strerror(errno));
+  if ( 0 > fprintf(stdout, "Content-Length: %d\r\n\r\n", size) ) {
+    Info("Unable to send raw frame %ld: %s", curr_frame_id, strerror(errno));
+    return false;
+  }
+  int rc = fwrite(buffer, size, 1, stdout);
+
+  if ( 1 != rc ) {
+    Error("Unable to send raw frame %ld: %s %d", curr_frame_id, strerror(errno), rc);
     return false;
   }
   return true;
diff --git a/src/zm_eventstream.h b/src/zm_eventstream.h
index 023dd7a99..54b7687ab 100644
--- a/src/zm_eventstream.h
+++ b/src/zm_eventstream.h
@@ -20,12 +20,11 @@
 #ifndef ZM_EVENTSTREAM_H
 #define ZM_EVENTSTREAM_H
 
-#include "zm_image.h"
-#include "zm_stream.h"
-#include "zm_video.h"
+#include "zm_define.h"
 #include "zm_ffmpeg_input.h"
 #include "zm_monitor.h"
 #include "zm_storage.h"
+#include "zm_stream.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,6 +39,7 @@ extern "C" {
 class EventStream : public StreamBase {
   public:
     typedef enum { MODE_NONE, MODE_SINGLE, MODE_ALL, MODE_ALL_GAPLESS } StreamMode;
+    static const std::string StreamMode_Strings[4];
 
   protected:
     struct FrameData {
@@ -54,11 +54,14 @@ class EventStream : public StreamBase {
       uint64_t  event_id;
       unsigned int    monitor_id;
       unsigned long   storage_id;
-      unsigned long   frame_count;
+      unsigned long   frame_count;    // Value of Frames column in Event
+      unsigned long   last_frame_id;  // Highest frame id known about. Can be < frame_count in incomplete events
       time_t          start_time;
+      time_t          end_time;
       double          duration;
+      double          frames_duration;
       char            path[PATH_MAX];
-      int             n_frames;
+      int             n_frames;       // # of frame rows returned from database
       FrameData       *frames;
       char            video_file[PATH_MAX];
       Storage::Schemes  scheme;
@@ -74,7 +77,7 @@ class EventStream : public StreamBase {
     StreamMode mode;
     bool forceEventChange;
 
-    int curr_frame_id;
+    long curr_frame_id;
     double curr_stream_time;
     bool  send_frame;
     struct timeval start;     // clock time when started the event
@@ -82,13 +85,13 @@ class EventStream : public StreamBase {
     EventData *event_data;
 
   protected:
-    bool loadEventData( uint64_t event_id );
-    bool loadInitialEventData( uint64_t init_event_id, unsigned int init_frame_id );
-    bool loadInitialEventData( int monitor_id, time_t event_time );
+    bool loadEventData(uint64_t event_id);
+    bool loadInitialEventData(uint64_t init_event_id, unsigned int init_frame_id);
+    bool loadInitialEventData(int monitor_id, time_t event_time);
 
     bool checkEventLoaded();
-    void processCommand( const CmdMsg *msg );
-    bool sendFrame( int delta_us );
+    void processCommand(const CmdMsg *msg) override;
+    bool sendFrame(int delta_us);
 
   public:
     EventStream() :
@@ -99,10 +102,7 @@ class EventStream : public StreamBase {
       send_frame(false),
       event_data(nullptr),
       storage(nullptr),
-      ffmpeg_input(nullptr),
-      // Used when loading frames from an mp4
-      input_codec_context(nullptr),
-      input_codec(nullptr)
+      ffmpeg_input(nullptr)
     {}
     ~EventStream() {
         if ( event_data ) {
@@ -113,10 +113,6 @@ class EventStream : public StreamBase {
           delete event_data;
           event_data = nullptr;
         }
-        if ( monitor ) {
-          delete monitor;
-          monitor = nullptr;
-        }
         if ( storage ) {
           delete storage;
           storage = nullptr;
@@ -126,20 +122,16 @@ class EventStream : public StreamBase {
           ffmpeg_input = nullptr;
         }
     }
-    void setStreamStart( uint64_t init_event_id, unsigned int init_frame_id );
-    void setStreamStart( int monitor_id, time_t event_time );
-    void setStreamMode( StreamMode p_mode ) {
-      mode = p_mode;
-    }
-    void runStream();
+    void setStreamStart(uint64_t init_event_id, unsigned int init_frame_id);
+    void setStreamStart(int monitor_id, time_t event_time);
+    void setStreamMode(StreamMode p_mode) { mode = p_mode; }
+    void runStream() override;
     Image *getImage();
   private:
-    bool send_file( const char *file_path );
-    bool send_buffer( uint8_t * buffer, int size );
+    bool send_file(const char *filepath);
+    bool send_buffer(uint8_t * buffer, int size);
     Storage *storage;
     FFmpeg_Input  *ffmpeg_input;
-    AVCodecContext *input_codec_context;
-    AVCodec *input_codec;
 };
 
 #endif // ZM_EVENTSTREAM_H
diff --git a/src/zm_exception.h b/src/zm_exception.h
index a02653b88..1bceeed8a 100644
--- a/src/zm_exception.h
+++ b/src/zm_exception.h
@@ -22,8 +22,7 @@
 
 #include <string>
 
-class Exception
-{
+class Exception {
 protected:
   typedef enum { INFO, WARNING, ERROR, FATAL } Severity;
 
@@ -32,33 +31,28 @@ protected:
   Severity mSeverity;
 
 public:
-  Exception( const std::string &message, Severity severity=ERROR ) : mMessage( message ), mSeverity( severity )
+  explicit Exception(const std::string &message, const Severity severity=ERROR) :
+    mMessage(message),
+    mSeverity(severity)
   {
   }
 
-public:
-  const std::string &getMessage() const
-  {
-    return( mMessage );
+  const std::string &getMessage() const {
+    return mMessage;
   }
-  Severity getSeverity() const
-  {
-    return( mSeverity );
+  Severity getSeverity() const {
+    return mSeverity;
   }
-  bool isInfo() const
-  {
-    return( mSeverity == INFO );
+  bool isInfo() const {
+    return mSeverity == INFO;
   }
-  bool isWarning() const
-  {
+  bool isWarning() const {
     return( mSeverity == WARNING );
   }
-  bool isError() const
-  {
+  bool isError() const {
     return( mSeverity == ERROR );
   }
-  bool isFatal() const
-  {
+  bool isFatal() const {
     return( mSeverity == FATAL );
   }
 };
diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 864b9e0a7..dcb22ed82 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -16,11 +16,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */ 
-#include <cinttypes>
 
 #include "zm_ffmpeg.h"
-#include "zm_image.h"
+
+#include "zm_logger.h"
 #include "zm_rgb.h"
+
 extern "C" {
 #include "libavutil/pixdesc.h"
 }
@@ -30,44 +31,45 @@ extern "C" {
 void log_libav_callback(void *ptr, int level, const char *fmt, va_list vargs) {
   Logger *log = Logger::fetch();
   int log_level = 0;
-  if ( level == AV_LOG_QUIET ) { // -8
+  if (level == AV_LOG_QUIET) { // -8
     log_level = Logger::NOLOG;
-  } else if ( level == AV_LOG_PANIC ) { //0
+  } else if (level == AV_LOG_PANIC) { //0
     log_level = Logger::PANIC;
-  } else if ( level == AV_LOG_FATAL ) { // 8
+  } else if (level == AV_LOG_FATAL) { // 8
     log_level = Logger::FATAL;
-  } else if ( level == AV_LOG_ERROR ) { // 16
+  } else if (level == AV_LOG_ERROR) { // 16
     log_level = Logger::WARNING; // ffmpeg outputs a lot of errors that don't really affect anything.
-    //log_level = Logger::ERROR;
-  } else if ( level == AV_LOG_WARNING ) { //24
+  } else if (level == AV_LOG_WARNING) { //24
     log_level = Logger::INFO;
-    //log_level = Logger::WARNING;
-  } else if ( level == AV_LOG_INFO ) { //32
+  } else if (level == AV_LOG_INFO) { //32
     log_level = Logger::DEBUG1;
-    //log_level = Logger::INFO;
-  } else if ( level == AV_LOG_VERBOSE ) { //40
+  } else if (level == AV_LOG_VERBOSE) { //40
     log_level = Logger::DEBUG2;
-  } else if ( level == AV_LOG_DEBUG ) { //48
+  } else if (level == AV_LOG_DEBUG) { //48
     log_level = Logger::DEBUG3;
 #ifdef AV_LOG_TRACE
-  } else if ( level == AV_LOG_TRACE ) {
+  } else if (level == AV_LOG_TRACE) {
     log_level = Logger::DEBUG8;
 #endif
 #ifdef AV_LOG_MAX_OFFSET
-  } else if ( level == AV_LOG_MAX_OFFSET ) {
+  } else if (level == AV_LOG_MAX_OFFSET) {
     log_level = Logger::DEBUG9;
 #endif
   } else {
     Error("Unknown log level %d", level);
   }
 
-  if ( log ) {
+  if (log) {
     char logString[8192];
-    vsnprintf(logString, sizeof(logString)-1, fmt, vargs);
-    int length = strlen(logString);
-    // ffmpeg logs have a carriage return, so replace it with terminator
-    logString[length-1] = 0;
-    log->logPrint(false, __FILE__, __LINE__, log_level, logString);
+    int length = vsnprintf(logString, sizeof(logString)-1, fmt, vargs);
+    if (length > 0) {
+      if (static_cast<size_t>(length) > sizeof(logString)-1) length = sizeof(logString)-1;
+      // ffmpeg logs have a carriage return, so replace it with terminator
+      logString[length-1] = 0;
+      log->logPrint(false, __FILE__, __LINE__, log_level, "%s", logString);
+    } else {
+      log->logPrint(false, __FILE__, __LINE__, AV_LOG_ERROR, "Can't encode log from av. fmt was %s", fmt);
+    }
   }
 }
 
@@ -75,8 +77,8 @@ static bool bInit = false;
 
 void FFMPEGInit() {
 
-  if ( !bInit ) {
-    if ( logDebugging()  && config.log_ffmpeg ) {
+  if (!bInit) {
+    if (logDebugging() && config.log_ffmpeg) {
       av_log_set_level(AV_LOG_DEBUG);
       av_log_set_callback(log_libav_callback); 
       Info("Enabling ffmpeg logs, as LOG_DEBUG+LOG_FFMPEG are enabled in options");
@@ -84,7 +86,7 @@ void FFMPEGInit() {
       Debug(1,"Not enabling ffmpeg logs, as LOG_FFMPEG and/or LOG_DEBUG is disabled in options, or this monitor is not part of your debug targets");
       av_log_set_level(AV_LOG_QUIET);
     }
-#if !LIBAVFORMAT_VERSION_CHECK(58, 9, 0, 64, 0)
+#if !LIBAVFORMAT_VERSION_CHECK(58, 9, 58, 9, 0)
     av_register_all();
 #endif
     avformat_network_init();
@@ -103,9 +105,8 @@ enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subp
 
   Debug(8,"Colours: %d SubpixelOrder: %d",p_colours,p_subpixelorder);
 
-  switch(p_colours) {
+  switch (p_colours) {
     case ZM_COLOUR_RGB24:
-      {
         if(p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
           /* BGR subpixel order */
           pf = AV_PIX_FMT_BGR24;
@@ -114,16 +115,14 @@ enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subp
           pf = AV_PIX_FMT_RGB24;
         }
         break;
-      }
     case ZM_COLOUR_RGB32:
-      {
-        if(p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+        if (p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
           /* ARGB subpixel order */
           pf = AV_PIX_FMT_ARGB;
-        } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+        } else if (p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
           /* ABGR subpixel order */
           pf = AV_PIX_FMT_ABGR;
-        } else if(p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+        } else if (p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
           /* BGRA subpixel order */
           pf = AV_PIX_FMT_BGRA;
         } else {
@@ -131,12 +130,11 @@ enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subp
           pf = AV_PIX_FMT_RGBA;
         }
         break;
-      }
     case ZM_COLOUR_GRAY8:
       pf = AV_PIX_FMT_GRAY8;
       break;
     default:
-      Panic("Unexpected colours: %d",p_colours);
+      Panic("Unexpected colours: %d", p_colours);
       pf = AV_PIX_FMT_GRAY8; /* Just to shush gcc variable may be unused warning */
       break;
   }
@@ -155,20 +153,21 @@ static int parse_key_value_pair(AVDictionary **pm, const char **buf,
     int ret;
 
     if (key && *key && strspn(*buf, key_val_sep)) {
-        (*buf)++;
-        val = av_get_token(buf, pairs_sep);
+      (*buf)++;
+      val = av_get_token(buf, pairs_sep);
     }
 
     if (key && *key && val && *val)
-        ret = av_dict_set(pm, key, val, flags);
+      ret = av_dict_set(pm, key, val, flags);
     else
-        ret = AVERROR(EINVAL);
+      ret = AVERROR(EINVAL);
 
     av_freep(&key);
     av_freep(&val);
 
     return ret;
 }
+
 int av_dict_parse_string(AVDictionary **pm, const char *str,
     const char *key_val_sep, const char *pairs_sep,
     int flags) {
@@ -221,61 +220,6 @@ simple_round:
 #endif
 #endif
 
-int hacked_up_context2_for_older_ffmpeg(AVFormatContext **avctx, AVOutputFormat *oformat, const char *format, const char *filename) {
-  AVFormatContext *s = avformat_alloc_context();
-  int ret = 0;
-
-  *avctx = nullptr;
-  if (!s) {
-    av_log(s, AV_LOG_ERROR, "Out of memory\n");
-    ret = AVERROR(ENOMEM);
-    return ret;
-  }
-
-  if (!oformat) {
-    if (format) {
-      oformat = av_guess_format(format, nullptr, nullptr);
-      if (!oformat) {
-        av_log(s, AV_LOG_ERROR, "Requested output format '%s' is not a suitable output format\n", format);
-        ret = AVERROR(EINVAL);
-      }
-    } else {
-      oformat = av_guess_format(nullptr, filename, nullptr);
-      if (!oformat) {
-        ret = AVERROR(EINVAL);
-        av_log(s, AV_LOG_ERROR, "Unable to find a suitable output format for '%s'\n", filename);
-      }
-    }
-  }
-
-  if (ret) {
-    avformat_free_context(s);
-    return ret;
-  }
-
-  s->oformat = oformat;
-#if 0
-  if (s->oformat->priv_data_size > 0) {
-      if (s->oformat->priv_class) {
-        // This looks wrong, we just allocated priv_data and now we are losing the pointer to it.FIXME
-        *(const AVClass**)s->priv_data = s->oformat->priv_class;
-        av_opt_set_defaults(s->priv_data);
-      } else {
-    s->priv_data = av_mallocz(s->oformat->priv_data_size);
-    if ( ! s->priv_data) {
-      av_log(s, AV_LOG_ERROR, "Out of memory\n");
-      ret = AVERROR(ENOMEM);
-      return ret;
-    }
-    s->priv_data = nullptr;
-  }
-#endif
-
-  if (filename) strncpy(s->filename, filename, sizeof(s->filename)-1);
-  *avctx = s;
-  return 0;
-}
-
 static void zm_log_fps(double d, const char *postfix) {
   uint64_t v = lrintf(d * 100);
   if (!v) {
@@ -290,7 +234,7 @@ static void zm_log_fps(double d, const char *postfix) {
 }
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-void zm_dump_codecpar ( const AVCodecParameters *par ) {
+void zm_dump_codecpar(const AVCodecParameters *par) {
   Debug(1, "Dumping codecpar codec_type(%d %s) codec_id(%d %s) codec_tag(%" PRIu32 ") width(%d) height(%d) bit_rate(%" PRIu64 ") format(%d %s)",
       par->codec_type,
       av_get_media_type_string(par->codec_type),
@@ -307,9 +251,10 @@ void zm_dump_codecpar ( const AVCodecParameters *par ) {
 #endif
 
 void zm_dump_codec(const AVCodecContext *codec) {
-  Debug(1, "Dumping codec_context codec_type(%d) codec_id(%d %s) width(%d) height(%d)  timebase(%d/%d) format(%s) "
+  Debug(1, "Dumping codec_context codec_type(%d %s) codec_id(%d %s) width(%d) height(%d)  timebase(%d/%d) format(%s) "
       "gop_size %d max_b_frames %d me_cmp %d me_range %d qmin %d qmax %d",
     codec->codec_type,
+    av_get_media_type_string(codec->codec_type),
     codec->codec_id,
     avcodec_get_name(codec->codec_id),
     codec->width,
@@ -332,7 +277,7 @@ void zm_dump_codec(const AVCodecContext *codec) {
 
 /* "user interface" functions */
 void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output) {
-  Debug(1, "Dumping stream index i(%d) index(%d)", i, index );
+  Debug(1, "Dumping stream index i(%d) index(%d)", i, index);
   int flags = (is_output ? ic->oformat->flags : ic->iformat->flags);
   AVStream *st = ic->streams[i];
   AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", nullptr, 0);
@@ -356,14 +301,17 @@ void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
       );
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  Debug(1, "codec: %s", avcodec_get_name(st->codecpar->codec_id));
+  Debug(1, "codec: %s %s",
+      avcodec_get_name(st->codecpar->codec_id),
+      av_get_media_type_string(st->codecpar->codec_type)
+      );
 #else
   char buf[256];
   avcodec_string(buf, sizeof(buf), st->codec, is_output);
   Debug(1, "codec: %s", buf);
 #endif
 
-  if ( st->sample_aspect_ratio.num && // default
+  if (st->sample_aspect_ratio.num && // default
       av_cmp_q(st->sample_aspect_ratio, codec->sample_aspect_ratio)
       ) {
     AVRational display_aspect_ratio;
@@ -377,7 +325,7 @@ void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
         display_aspect_ratio.num, display_aspect_ratio.den);
   }
 
-  if ( codec->codec_type == AVMEDIA_TYPE_VIDEO ) {
+  if (codec->codec_type == AVMEDIA_TYPE_VIDEO) {
     int fps = st->avg_frame_rate.den && st->avg_frame_rate.num;
     int tbn = st->time_base.den && st->time_base.num;
 
@@ -385,6 +333,9 @@ void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output)
       zm_log_fps(av_q2d(st->avg_frame_rate), "fps");
     if (tbn)
       zm_log_fps(1 / av_q2d(st->time_base), "stream tb numerator");
+  } else if (codec->codec_type == AVMEDIA_TYPE_AUDIO) {
+    Debug(1, "profile %d channels %d sample_rate %d",
+        codec->profile, codec->channels, codec->sample_rate);
   }
 
   if (st->disposition & AV_DISPOSITION_DEFAULT)
@@ -425,9 +376,26 @@ int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt) {
   return 0;
 }
 
+enum AVPixelFormat fix_deprecated_pix_fmt(enum AVPixelFormat fmt) {
+  // Fix deprecated formats
+  switch ( fmt ) {
+    case AV_PIX_FMT_YUVJ422P  :
+      return AV_PIX_FMT_YUV422P;
+    case AV_PIX_FMT_YUVJ444P   :
+      return AV_PIX_FMT_YUV444P;
+    case AV_PIX_FMT_YUVJ440P :
+      return AV_PIX_FMT_YUV440P;
+    case AV_PIX_FMT_NONE :
+    case AV_PIX_FMT_YUVJ420P :
+      return AV_PIX_FMT_YUV420P;
+    default:
+      return fmt;
+  }
+}
+
 #if LIBAVCODEC_VERSION_CHECK(56, 8, 0, 60, 100)
 #else
-unsigned int zm_av_packet_ref( AVPacket *dst, AVPacket *src ) {
+unsigned int zm_av_packet_ref(AVPacket *dst, AVPacket *src) {
   av_new_packet(dst,src->size);
   memcpy(dst->data, src->data, src->size);
   dst->flags = src->flags;
@@ -470,74 +438,73 @@ void av_packet_rescale_ts(
 
 bool is_video_stream(const AVStream * stream) {
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-      if ( stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO ) {
+  if (stream->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)
   #else
   #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-      if ( stream->codec->codec_type == AVMEDIA_TYPE_VIDEO ) {
+  if (stream->codec->codec_type == AVMEDIA_TYPE_VIDEO)
   #else
-      if ( stream->codec->codec_type == CODEC_TYPE_VIDEO ) {
+  if (stream->codec->codec_type == CODEC_TYPE_VIDEO)
   #endif
   #endif
+      {
     return true;
   }
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-      Debug(2, "Not a video type %d != %d", stream->codecpar->codec_type, AVMEDIA_TYPE_VIDEO);
+  Debug(2, "Not a video type %d != %d", stream->codecpar->codec_type, AVMEDIA_TYPE_VIDEO);
   #endif
 
   return false;
 }
 
-bool is_video_context(const AVCodecContext *codec_context ) {
+bool is_video_context(const AVCodecContext *codec_context) {
   return
   #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-      ( codec_context->codec_type == AVMEDIA_TYPE_VIDEO );
+      (codec_context->codec_type == AVMEDIA_TYPE_VIDEO);
   #else
-      ( codec_context->codec_type == CODEC_TYPE_VIDEO );
+      (codec_context->codec_type == CODEC_TYPE_VIDEO);
   #endif
 }
 
-bool is_audio_stream(const AVStream * stream ) {
+bool is_audio_stream(const AVStream * stream) {
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-      if ( stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO ) {
+  if (stream->codecpar->codec_type == AVMEDIA_TYPE_AUDIO)
   #else
   #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-      if ( stream->codec->codec_type == AVMEDIA_TYPE_AUDIO ) {
+  if (stream->codec->codec_type == AVMEDIA_TYPE_AUDIO)
   #else
-      if ( stream->codec->codec_type == CODEC_TYPE_AUDIO ) {
+  if (stream->codec->codec_type == CODEC_TYPE_AUDIO)
   #endif
   #endif
+      {
     return true;
   }
   return false;
 }
 
-bool is_audio_context(const AVCodecContext *codec_context ) {
+bool is_audio_context(const AVCodecContext *codec_context) {
   return
   #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-      ( codec_context->codec_type == AVMEDIA_TYPE_AUDIO );
+      (codec_context->codec_type == AVMEDIA_TYPE_AUDIO);
   #else
-      ( codec_context->codec_type == CODEC_TYPE_AUDIO );
+      (codec_context->codec_type == CODEC_TYPE_AUDIO);
   #endif
 }
 
 int zm_receive_packet(AVCodecContext *context, AVPacket &packet) {
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
   int ret = avcodec_receive_packet(context, &packet);
-  if ( ret < 0 ) {
-    if ( AVERROR_EOF != ret ) {
-      Error("Error encoding (%d) (%s)", ret,
-          av_err2str(ret));
-    }
-    return 0;
+  if ((ret < 0) and (AVERROR_EOF != ret)) {
+    Error("Error encoding (%d) (%s)", ret, av_err2str(ret));
   }
-  return 1;
+  return ret; // 1 or 0
 #else
   int got_packet = 0;
   int ret = avcodec_encode_audio2(context, &packet, nullptr, &got_packet);
-  if ( ret < 0 ) {
+  if (ret < 0) {
     Error("Error encoding (%d) (%s)", ret, av_err2str(ret));
+    return ret;
   }
-  return got_packet;
+  return got_packet; // 1
 #endif
 }  // end int zm_receive_packet(AVCodecContext *context, AVPacket &packet)
 
@@ -547,14 +514,14 @@ int zm_send_packet_receive_frame(
     AVPacket &packet) {
   int ret;
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  if ( (ret = avcodec_send_packet(context, &packet)) < 0 ) {
+  if ((ret = avcodec_send_packet(context, &packet)) < 0) {
     Error("Unable to send packet %s, continuing",
        av_make_error_string(ret).c_str());
     return ret;
   }
 
-  if ( (ret = avcodec_receive_frame(context, frame)) < 0 ) {
-    if ( AVERROR(EAGAIN) == ret ) {
+  if ((ret = avcodec_receive_frame(context, frame)) < 0) {
+    if (AVERROR(EAGAIN) == ret) {
       // The codec may need more samples than it has, perfectly valid
       Debug(2, "Codec not ready to give us a frame");
     } else {
@@ -567,38 +534,39 @@ int zm_send_packet_receive_frame(
   return packet.size;
 # else
   int frameComplete = 0;
-  while ( !frameComplete ) {
-    if ( is_video_context(context) ) {
-      ret = zm_avcodec_decode_video(context, frame, &frameComplete, &packet);
-    } else {
-      ret = avcodec_decode_audio4(context, frame, &frameComplete, &packet);
-    }
-    if ( ret < 0 ) {
-      Error("Unable to decode frame: %s", av_make_error_string(ret).c_str());
-      return ret;
-    }
-  } // end while !frameComplete
-  return ret;
+  if (is_video_context(context)) {
+    ret = zm_avcodec_decode_video(context, frame, &frameComplete, &packet);
+    Debug(2, "ret from decode_video %d, framecomplete %d", ret, frameComplete);
+  } else {
+    ret = avcodec_decode_audio4(context, frame, &frameComplete, &packet);
+    Debug(2, "ret from decode_audio %d, framecomplete %d", ret, frameComplete);
+  }
+  if (ret < 0) {
+    Error("Unable to decode frame: %s", av_make_error_string(ret).c_str());
+    return ret;
+  }
+  return frameComplete ? ret : 0;
 #endif
-} // end int zm_send_packet_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet)
+}  // end int zm_send_packet_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet)
 
 /* Returns < 0 on error, 0 if codec not ready, 1 on success
  */
 int zm_send_frame_receive_packet(AVCodecContext *ctx, AVFrame *frame, AVPacket &packet) {
   int ret;
   #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    if ( (ret = avcodec_send_frame(ctx, frame)) < 0 ) {
+    if (( (ret = avcodec_send_frame(ctx, frame)) < 0 ) and frame) {
       Error("Could not send frame (error '%s')",
             av_make_error_string(ret).c_str());
       return ret;
     }
 
-    if ( (ret = avcodec_receive_packet(ctx, &packet)) < 0 ) {
-      if ( AVERROR(EAGAIN) == ret ) {
+    if ((ret = avcodec_receive_packet(ctx, &packet)) < 0) {
+      if (AVERROR(EAGAIN) == ret) {
         // The codec may need more samples than it has, perfectly valid
         Debug(2, "Codec not ready to give us a packet");
         return 0;
-      } else {
+      } else if (frame) {
+        // May get EOF if frame is NULL because it signals flushing
         Error("Could not recieve packet (error %d = '%s')", ret,
               av_make_error_string(ret).c_str());
       }
@@ -607,14 +575,14 @@ int zm_send_frame_receive_packet(AVCodecContext *ctx, AVFrame *frame, AVPacket &
     }
   #else
     int data_present;
-    if ( (ret = avcodec_encode_audio2(
-            ctx, &packet, frame, &data_present)) < 0 ) {
+    if ((ret = avcodec_encode_audio2(
+            ctx, &packet, frame, &data_present)) < 0) {
       Error("Could not encode frame (error '%s')",
             av_make_error_string(ret).c_str());
       zm_av_packet_unref(&packet);
       return ret;
     }
-    if ( !data_present ) {
+    if (!data_present) {
       Debug(2, "Not ready to out a frame yet.");
       zm_av_packet_unref(&packet);
       return 0;
@@ -623,58 +591,15 @@ int zm_send_frame_receive_packet(AVCodecContext *ctx, AVFrame *frame, AVPacket &
   return 1;
 }  // end int zm_send_frame_receive_packet
 
-void dumpPacket(AVStream *stream, AVPacket *pkt, const char *text) {
-  char b[10240];
-
-  double pts_time = (double)av_rescale_q(pkt->pts,
-      stream->time_base,
-      AV_TIME_BASE_Q
-      ) / AV_TIME_BASE;
-
-  snprintf(b, sizeof(b),
-           " pts: %" PRId64 "=%f, dts: %" PRId64
-           ", size: %d, stream_index: %d, flags: %04x, keyframe(%d) pos: %" PRId64
-           ", duration: %" 
+void zm_free_codec(AVCodecContext **ctx) {
+  if (*ctx) {
+    avcodec_close(*ctx);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-           PRId64
-#else
-           "d"
+    // We allocate and copy in newer ffmpeg, so need to free it
+    avcodec_free_context(ctx);
 #endif
-           "\n",
-           pkt->pts, 
-           pts_time,
-           pkt->dts,
-           pkt->size,
-           pkt->stream_index,
-           pkt->flags,
-           pkt->flags & AV_PKT_FLAG_KEY,
-           pkt->pos,
-           pkt->duration);
-  Debug(2, "%s:%d:%s: %s", __FILE__, __LINE__, text, b);
-}
-
-void dumpPacket(AVPacket *pkt, const char *text) {
-  char b[10240];
-
-  snprintf(b, sizeof(b),
-           " pts: %" PRId64 ", dts: %" PRId64
-           ", size: %d, stream_index: %d, flags: %04x, keyframe(%d) pos: %" PRId64
-           ", duration: %"
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-           PRId64
-#else
-           "d"
-#endif
-           "\n",
-           pkt->pts,
-           pkt->dts,
-           pkt->size,
-           pkt->stream_index,
-           pkt->flags,
-           pkt->flags & AV_PKT_FLAG_KEY,
-           pkt->pos,
-           pkt->duration);
-  Debug(2, "%s:%d:%s: %s", __FILE__, __LINE__, text, b);
+    *ctx = NULL;
+  } // end if 
 }
 
 void zm_packet_copy_rescale_ts(const AVPacket *ipkt, AVPacket *opkt, const AVRational src_tb, const AVRational dst_tb) {
@@ -697,7 +622,7 @@ int zm_resample_audio(
     AVFrame *out_frame
     ) {
 #if defined(HAVE_LIBSWRESAMPLE)
-  if ( in_frame ) {
+  if (in_frame) {
     // Resample the in_frame into the audioSampleBuffer until we process the whole
     // decoded data. Note: pts does not survive resampling or converting
     Debug(2, "Converting %d to %d samples using swresample",
@@ -706,34 +631,33 @@ int zm_resample_audio(
     Debug(2, "Sending NULL frame to flush resampler");
   }
   int ret = swr_convert_frame(resample_ctx, out_frame, in_frame);
-  if ( ret < 0 ) {
+  if (ret < 0) {
     Error("Could not resample frame (error '%s')",
         av_make_error_string(ret).c_str());
     return 0;
   }
-  Debug(3,"swr_get_delay %d",
-      swr_get_delay(resample_ctx, out_frame->sample_rate));
+  Debug(3, "swr_get_delay %" PRIi64, swr_get_delay(resample_ctx, out_frame->sample_rate));
 #else
 #if defined(HAVE_LIBAVRESAMPLE)
-  if ( ! in_frame ) {
+  if (!in_frame) {
     Error("Flushing resampler not supported by AVRESAMPLE");
     return 0;
   }
   int ret = avresample_convert(resample_ctx, nullptr, 0, 0, in_frame->data,
                             0, in_frame->nb_samples);
-  if ( ret < 0 ) {
+  if (ret < 0) {
     Error("Could not resample frame (error '%s')",
         av_make_error_string(ret).c_str());
     return 0;
   }
   int samples_available = avresample_available(resample_ctx);
-  if ( samples_available < out_frame->nb_samples ) {
+  if (samples_available < out_frame->nb_samples) {
     Debug(1, "Not enough samples yet (%d)", samples_available);
     return 0;
   }
 
   // Read a frame audio data from the resample fifo
-  if ( avresample_read(resample_ctx, out_frame->data, out_frame->nb_samples) !=
+  if (avresample_read(resample_ctx, out_frame->data, out_frame->nb_samples) !=
       out_frame->nb_samples) {
     Warning("Error reading resampled audio.");
     return 0;
@@ -766,14 +690,14 @@ int zm_resample_get_delay(
 
 int zm_add_samples_to_fifo(AVAudioFifo *fifo, AVFrame *frame) {
   int ret = av_audio_fifo_realloc(fifo, av_audio_fifo_size(fifo) + frame->nb_samples);
-  if ( ret < 0 ) {
+  if (ret < 0) {
     Error("Could not reallocate FIFO to %d samples",
         av_audio_fifo_size(fifo) + frame->nb_samples);
     return 0;
   }
   /** Store the new samples in the FIFO buffer. */
   ret = av_audio_fifo_write(fifo, (void **)frame->data, frame->nb_samples);
-  if ( ret < frame->nb_samples ) {
+  if (ret < frame->nb_samples) {
     Error("Could not write data to FIFO. %d written, expecting %d. Reason %s",
         ret, frame->nb_samples, av_make_error_string(ret).c_str());
     return 0;
@@ -783,13 +707,13 @@ int zm_add_samples_to_fifo(AVAudioFifo *fifo, AVFrame *frame) {
 
 int zm_get_samples_from_fifo(AVAudioFifo *fifo, AVFrame *frame) {
   // AAC requires 1024 samples per encode.  Our input tends to be something else, so need to buffer them.
-  if ( frame->nb_samples > av_audio_fifo_size(fifo) ) {
+  if (frame->nb_samples > av_audio_fifo_size(fifo)) {
     Debug(1, "Not enough samples in fifo for AAC codec frame_size %d > fifo size %d",
          frame->nb_samples, av_audio_fifo_size(fifo));
     return 0;
   }
 
-  if ( av_audio_fifo_read(fifo, (void **)frame->data, frame->nb_samples) < frame->nb_samples ) {
+  if (av_audio_fifo_read(fifo, (void **)frame->data, frame->nb_samples) < frame->nb_samples) {
     Error("Could not read data from FIFO");
     return 0;
   }
@@ -797,4 +721,3 @@ int zm_get_samples_from_fifo(AVAudioFifo *fifo, AVFrame *frame) {
   zm_dump_frame(frame, "Out frame after fifo read");
   return 1;
 }
-
diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h
index d09fee8b1..7431641c6 100644
--- a/src/zm_ffmpeg.h
+++ b/src/zm_ffmpeg.h
@@ -15,12 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/  
+*/
 
 #ifndef ZM_FFMPEG_H
 #define ZM_FFMPEG_H
-#include <stdint.h>
-#include "zm.h"
+
+#include "zm_config.h"
+#include "zm_define.h"
 
 extern "C" {
 
@@ -41,6 +42,9 @@ extern "C" {
 #include <libavutil/avstring.h>
 #include "libavutil/audio_fifo.h"
 #include "libavutil/imgutils.h"
+#if HAVE_LIBAVUTIL_HWCONTEXT_H
+  #include "libavutil/hwcontext.h"
+#endif
 
 /* LIBAVUTIL_VERSION_CHECK checks for the right version of libav and FFmpeg
  * The original source is vlc (in modules/codec/avcodec/avcommon_compat.h)
@@ -56,7 +60,7 @@ extern "C" {
 #else
 #include <libavcodec/opt.h>
 #endif
-    
+
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
 #include <libavutil/imgutils.h>
 #endif
@@ -66,8 +70,8 @@ extern "C" {
 #include <ffmpeg/mathematics.h>
 #include <ffmpeg/opt.h>
 #endif /* HAVE_LIBAVUTIL_AVUTIL_H */
-    
-#if defined(HAVE_LIBAVUTIL_AVUTIL_H) 
+
+#if defined(HAVE_LIBAVUTIL_AVUTIL_H)
 #if LIBAVUTIL_VERSION_CHECK(51, 42, 0, 74, 100)
     #define _AVPIXELFORMAT AVPixelFormat
 #else
@@ -207,7 +211,7 @@ extern "C" {
  #endif
 #endif
 
-/* A single function to initialize ffmpeg, to avoid multiple initializations */		
+/* A single function to initialize ffmpeg, to avoid multiple initializations */
 void FFMPEGInit();
 void FFMPEGDeInit();
 
@@ -274,11 +278,6 @@ enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subp
 
 #endif // ( HAVE_LIBAVUTIL_AVUTIL_H || HAVE_LIBAVCODEC_AVCODEC_H || HAVE_LIBAVFORMAT_AVFORMAT_H || HAVE_LIBAVDEVICE_AVDEVICE_H )
 
-#ifndef avformat_alloc_output_context2
-int hacked_up_context2_for_older_ffmpeg(AVFormatContext **avctx, AVOutputFormat *oformat, const char *format, const char *filename);
-#define avformat_alloc_output_context2(x,y,z,a) hacked_up_context2_for_older_ffmpeg(x,y,z,a)
-#endif
-
 #ifndef av_rescale_delta
 /**
  * Rescale a timestamp while preserving known durations.
@@ -309,28 +308,27 @@ void zm_dump_codec(const AVCodecContext *codec);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
 void zm_dump_codecpar(const AVCodecParameters *par);
 #endif
-#define zm_dump_frame(frame, text) Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d channels %d" \
-      " duration %" PRId64 \
-      " layout %d pts %" PRId64, \
+#define zm_dump_frame(frame, text) Debug(1, "%s: format %d %s sample_rate %" PRIu32 " nb_samples %d" \
+      " layout %" PRIu64 " pts %" PRId64, \
       text, \
       frame->format, \
       av_get_sample_fmt_name((AVSampleFormat)frame->format), \
       frame->sample_rate, \
       frame->nb_samples, \
-      0, 0, \
       frame->channel_layout, \
       frame->pts \
       );
 
 #if LIBAVUTIL_VERSION_CHECK(54, 4, 0, 74, 100)
-#define zm_dump_video_frame(frame,text) Debug(1, "%s: format %d %s %dx%d linesize:%dx%d pts: %" PRId64, \
+#define zm_dump_video_frame(frame, text) Debug(1, "%s: format %d %s %dx%d linesize:%dx%d pts: %" PRId64 " keyframe: %d", \
       text, \
       frame->format, \
       av_get_pix_fmt_name((AVPixelFormat)frame->format), \
       frame->width, \
       frame->height, \
       frame->linesize[0], frame->linesize[1], \
-      frame->pts \
+      frame->pts, \
+      frame->key_frame \
       );
 
 #else
@@ -345,9 +343,67 @@ void zm_dump_codecpar(const AVCodecParameters *par);
       );
 #endif
 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+# define AV_PACKET_DURATION_FMT PRId64
+#else
+# define AV_PACKET_DURATION_FMT "d"
+#endif
+
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+#define CODEC_TYPE(stream) stream->codecpar->codec_type
+#else
+#define CODEC_TYPE(stream) stream->codec->codec_type
+#endif
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+#define CODEC(stream) stream->codecpar
+#else
+#define CODEC(stream) stream->codec
+#endif
+
+
+#ifndef DBG_OFF
+# define ZM_DUMP_PACKET(pkt, text) \
+  Debug(2, "%s: pts: %" PRId64 ", dts: %" PRId64 \
+    ", size: %d, stream_index: %d, flags: %04x, keyframe(%d) pos: %" PRId64 ", duration: %" AV_PACKET_DURATION_FMT, \
+    text,\
+    pkt.pts,\
+    pkt.dts,\
+    pkt.size,\
+    pkt.stream_index,\
+    pkt.flags,\
+    pkt.flags & AV_PKT_FLAG_KEY,\
+    pkt.pos,\
+    pkt.duration)
+
+# define ZM_DUMP_STREAM_PACKET(stream, pkt, text) \
+  if (logDebugging()) { \
+    double pts_time = static_cast<double>(av_rescale_q(pkt.pts, stream->time_base, AV_TIME_BASE_Q)) / AV_TIME_BASE; \
+    \
+    Debug(2, "%s: pts: %" PRId64 " * %u/%u=%f, dts: %" PRId64 \
+      ", size: %d, stream_index: %d, %s flags: %04x, keyframe(%d) pos: %" PRId64", duration: %" AV_PACKET_DURATION_FMT, \
+      text, \
+      pkt.pts, \
+      stream->time_base.num, \
+      stream->time_base.den, \
+      pts_time, \
+      pkt.dts, \
+      pkt.size, \
+      pkt.stream_index, \
+      av_get_media_type_string(CODEC_TYPE(stream)), \
+      pkt.flags, \
+      pkt.flags & AV_PKT_FLAG_KEY, \
+      pkt.pos, \
+    pkt.duration); \
+  }
+
+#else
+# define ZM_DUMP_PACKET(pkt, text)
+# define ZM_DUMP_STREAM_PACKET(stream, pkt, text)
+#endif
+
 #if LIBAVCODEC_VERSION_CHECK(56, 8, 0, 60, 100)
-    #define zm_av_packet_unref( packet ) av_packet_unref( packet )
-    #define zm_av_packet_ref( dst, src ) av_packet_ref( dst, src )
+    #define zm_av_packet_unref(packet) av_packet_unref(packet)
+    #define zm_av_packet_ref(dst, src) av_packet_ref(dst, src)
 #else
     unsigned int zm_av_packet_ref( AVPacket *dst, AVPacket *src );
     #define zm_av_packet_unref( packet ) av_free_packet( packet )
@@ -355,12 +411,20 @@ void zm_dump_codecpar(const AVCodecParameters *par);
 
     void av_packet_rescale_ts(AVPacket *pkt, AVRational src_tb, AVRational dst_tb);
 #endif
-#if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
-      #define zm_avcodec_decode_video( context, rawFrame, frameComplete, packet ) avcodec_decode_video2( context, rawFrame, frameComplete, packet )
+#if LIBAVCODEC_VERSION_CHECK(57, 24, 1, 45, 101)
+#define zm_avcodec_decode_video(context, rawFrame, frameComplete, packet) \
+ avcodec_send_packet(context, packet); \
+ avcodec_receive_frame(context, rawFrame);
 #else
-      #define zm_avcodec_decode_video(context, rawFrame, frameComplete, packet ) avcodec_decode_video( context, rawFrame, frameComplete, packet->data, packet->size)
+#if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
+  #define zm_avcodec_decode_video(context, rawFrame, frameComplete, packet) \
+      avcodec_decode_video2(context, rawFrame, frameComplete, packet)
+#else
+   #define zm_avcodec_decode_video(context, rawFrame, frameComplete, packet) \
+      avcodec_decode_video(context, rawFrame, frameComplete, packet->data, packet->size)
 #endif
-    
+#endif
+
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
   #define zm_av_frame_alloc() av_frame_alloc()
 #else
@@ -369,9 +433,10 @@ void zm_dump_codecpar(const AVCodecParameters *par);
 
 #if ! LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
   #define av_frame_free( input_avframe ) av_freep( input_avframe )
-#endif   
+#endif
 
 int check_sample_fmt(AVCodec *codec, enum AVSampleFormat sample_fmt);
+enum AVPixelFormat fix_deprecated_pix_fmt(enum AVPixelFormat );
 
 bool is_video_stream(const AVStream *);
 bool is_audio_stream(const AVStream *);
@@ -383,8 +448,6 @@ int zm_receive_packet(AVCodecContext *context, AVPacket &packet);
 int zm_send_packet_receive_frame(AVCodecContext *context, AVFrame *frame, AVPacket &packet);
 int zm_send_frame_receive_packet(AVCodecContext *context, AVFrame *frame, AVPacket &packet);
 
-void dumpPacket(AVStream *, AVPacket *,const char *text="");
-void dumpPacket(AVPacket *,const char *text="");
 void zm_packet_copy_rescale_ts(const AVPacket *ipkt, AVPacket *opkt, const AVRational src_tb, const AVRational dst_tb);
 
 #if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
@@ -415,5 +478,4 @@ int zm_resample_get_delay(
 int zm_add_samples_to_fifo(AVAudioFifo *fifo, AVFrame *frame);
 int zm_get_samples_from_fifo(AVAudioFifo *fifo, AVFrame *frame);
 
-
 #endif // ZM_FFMPEG_H
diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
index 6224c1f4f..b0c1401e7 100644
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -17,28 +17,28 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-#include "zm.h"
+#include "zm_ffmpeg_camera.h"
+
+#include "zm_ffmpeg_input.h"
+#include "zm_monitor.h"
+#include "zm_packet.h"
 #include "zm_signal.h"
 #include "zm_utils.h"
 
 #if HAVE_LIBAVFORMAT
 
-#include "zm_ffmpeg_camera.h"
-
 extern "C" {
 #include "libavutil/time.h"
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
   #include "libavutil/hwcontext.h"
 #endif
+
 #include "libavutil/pixdesc.h"
 }
-#ifndef AV_ERROR_MAX_STRING_SIZE
-#define AV_ERROR_MAX_STRING_SIZE 64
-#endif
 
 #include <string>
 
-
+time_t              start_read_time;
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
 #if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
 static enum AVPixelFormat hw_pix_fmt;
@@ -94,8 +94,9 @@ static enum AVPixelFormat find_fmt_by_hw_type(const enum AVHWDeviceType type) {
 #endif
 
 FfmpegCamera::FfmpegCamera(
-    int p_id,
+    const Monitor *monitor,
     const std::string &p_path,
+    const std::string &p_second_path,
     const std::string &p_method,
     const std::string &p_options,
     int p_width,
@@ -110,7 +111,7 @@ FfmpegCamera::FfmpegCamera(
     const std::string &p_hwaccel_name,
     const std::string &p_hwaccel_device) :
   Camera(
-      p_id,
+      monitor,
       FFMPEG_SRC,
       p_width,
       p_height,
@@ -124,33 +125,21 @@ FfmpegCamera::FfmpegCamera(
       p_record_audio
       ),
   mPath(p_path),
+  mSecondPath(p_second_path),
   mMethod(p_method),
   mOptions(p_options),
   hwaccel_name(p_hwaccel_name),
   hwaccel_device(p_hwaccel_device)
 {
   if ( capture ) {
-    Initialise();
+    FFMPEGInit();
   }
 
-  mFormatContext = nullptr;
-  mVideoStreamId = -1;
-  mAudioStreamId = -1;
-  mVideoCodecContext = nullptr;
-  mAudioCodecContext = nullptr;
-  mVideoCodec = nullptr;
-  mAudioCodec = nullptr;
-  mRawFrame = nullptr;
-  mFrame = nullptr;
   frameCount = 0;
   mCanCapture = false;
-  videoStore = nullptr;
-  have_video_keyframe = false;
-  packetqueue = nullptr;
   error_count = 0;
   use_hwaccel = true;
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
-  hwFrame = nullptr;
   hw_device_ctx = nullptr;
 #if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
   hw_pix_fmt = AV_PIX_FMT_NONE;
@@ -175,44 +164,16 @@ FfmpegCamera::FfmpegCamera(
     Panic("Unexpected colours: %d", colours);
   }
 
-  frame_buffer = nullptr;
-  // sws_scale needs 32bit aligned width and an extra 16 bytes padding, so recalculate imagesize, which was width*height*bytes_per_pixel
-#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-  alignment = 32;
-  imagesize = av_image_get_buffer_size(imagePixFormat, width, height, alignment);
-  // av_image_get_linesize isn't aligned, so we have to do that.
-  linesize = FFALIGN(av_image_get_linesize(imagePixFormat, width, 0), alignment);
-#else
-  alignment = 1;
-  linesize = FFALIGN(av_image_get_linesize(imagePixFormat, width, 0), alignment);
-  imagesize = avpicture_get_size(imagePixFormat, width, height);
-#endif
-  if ( linesize != width * colours ) {
-    Debug(1, "linesize %d != width %d * colours %d = %d, allocating frame_buffer", linesize, width, colours, width*colours);
-    frame_buffer = (uint8_t *)av_malloc(imagesize);
-  }
-
-  Debug(1, "ffmpegcamera: width %d height %d linesize %d colours %d image linesize %d imagesize %d",
-      width, height, linesize, colours, width*colours, imagesize);
 }  // FfmpegCamera::FfmpegCamera
 
 FfmpegCamera::~FfmpegCamera() {
   Close();
 
-  if ( capture ) {
-    Terminate();
-  }
   FFMPEGDeInit();
 }
 
-void FfmpegCamera::Initialise() {
-  FFMPEGInit();
-}
-
-void FfmpegCamera::Terminate() {
-}
-
 int FfmpegCamera::PrimeCapture() {
+  start_read_time = time(nullptr);
   if ( mCanCapture ) {
     Debug(1, "Priming capture from %s, Closing", mPath.c_str());
     Close();
@@ -225,118 +186,81 @@ int FfmpegCamera::PrimeCapture() {
 }
 
 int FfmpegCamera::PreCapture() {
-  // If Reopen was called, then ffmpeg is closed and we need to reopen it.
-  if ( !mCanCapture )
-    return OpenFfmpeg();
-  // Nothing to do here
   return 0;
 }
 
-int FfmpegCamera::Capture(Image &image) {
-  if ( !mCanCapture ) {
+int FfmpegCamera::Capture(ZMPacket &zm_packet) {
+  if (!mCanCapture) return -1;
+
+  start_read_time = time(nullptr);
+  int ret;
+  AVFormatContext *formatContextPtr;
+
+  if ( mSecondFormatContext and
+      (
+        av_rescale_q(mLastAudioPTS, mAudioStream->time_base, AV_TIME_BASE_Q)
+        <
+        av_rescale_q(mLastVideoPTS, mVideoStream->time_base, AV_TIME_BASE_Q)
+      ) ) {
+    // if audio stream is behind video stream, then read from audio, otherwise video
+    formatContextPtr = mSecondFormatContext;
+    Debug(4, "Using audio input because audio PTS %" PRId64 " < video PTS %" PRId64,
+        av_rescale_q(mLastAudioPTS, mAudioStream->time_base, AV_TIME_BASE_Q),
+        av_rescale_q(mLastVideoPTS, mVideoStream->time_base, AV_TIME_BASE_Q)
+        );
+  } else {
+    formatContextPtr = mFormatContext;
+    Debug(4, "Using video input because %" PRId64 " >= %" PRId64,
+        (mAudioStream?av_rescale_q(mLastAudioPTS, mAudioStream->time_base, AV_TIME_BASE_Q):0),
+        av_rescale_q(mLastVideoPTS, mVideoStream->time_base, AV_TIME_BASE_Q)
+        );
+  }
+
+  if ((ret = av_read_frame(formatContextPtr, &packet)) < 0) {
+    if (
+        // Check if EOF.
+        (ret == AVERROR_EOF || (formatContextPtr->pb && formatContextPtr->pb->eof_reached)) ||
+        // Check for Connection failure.
+        (ret == -110)
+       ) {
+      Info("Unable to read packet from stream %d: error %d \"%s\".",
+          packet.stream_index, ret, av_make_error_string(ret).c_str());
+    } else {
+      Error("Unable to read packet from stream %d: error %d \"%s\".",
+          packet.stream_index, ret, av_make_error_string(ret).c_str());
+    }
     return -1;
   }
 
-  int ret;
-  // If the reopen thread has a value, but mCanCapture != 0, then we have just
-  // reopened the connection to the device, and we can clean up the thread.
+  AVStream *stream = formatContextPtr->streams[packet.stream_index];
+  ZM_DUMP_STREAM_PACKET(stream, packet, "ffmpeg_camera in");
 
-  int frameComplete = false;
-  while ( !frameComplete && !zm_terminate ) {
-    ret = av_read_frame(mFormatContext, &packet);
-    if ( ret < 0 ) {
-      if (
-          // Check if EOF.
-          (
-           ret == AVERROR_EOF
-           ||
-           (mFormatContext->pb && mFormatContext->pb->eof_reached)
-          ) ||
-          // Check for Connection failure.
-          (ret == -110)
-         ) {
-        Info("Unable to read packet from stream %d: error %d \"%s\".",
-            packet.stream_index, ret, av_make_error_string(ret).c_str());
-      } else {
-        Error("Unable to read packet from stream %d: error %d \"%s\".",
-            packet.stream_index, ret, av_make_error_string(ret).c_str());
-      }
-      return -1;
-    }
-    bytes += packet.size;
-
-    int keyframe = packet.flags & AV_PKT_FLAG_KEY;
-    if ( keyframe )
-      have_video_keyframe = true;
-
-    Debug(5, "Got packet from stream %d dts (%d) pts(%d)",
-        packet.stream_index, packet.pts, packet.dts);
-    // What about audio stream? Maybe someday we could do sound detection...
-    if (
-        (packet.stream_index == mVideoStreamId)
-        &&
-        (keyframe || have_video_keyframe)
-        ) {
-      ret = zm_send_packet_receive_frame(mVideoCodecContext, mRawFrame, packet);
-      if ( ret < 0 ) {
-        if ( AVERROR(EAGAIN) != ret ) {
-          Warning("Unable to receive frame %d: code %d %s. error count is %d",
-              frameCount, ret, av_make_error_string(ret).c_str(), error_count);
-          error_count += 1;
-          if ( error_count > 100 ) {
-            Error("Error count over 100, going to close and re-open stream");
-            return -1;
-          }
-        }
-        zm_av_packet_unref(&packet);
-        continue;
-      }
-
-      frameComplete = 1;
-      zm_dump_video_frame(mRawFrame, "raw frame from decoder");
-
-#if HAVE_LIBAVUTIL_HWCONTEXT_H
-#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
-      if (
-          (hw_pix_fmt != AV_PIX_FMT_NONE)
-          &&
-          (mRawFrame->format == hw_pix_fmt)
-         ) {
-        /* retrieve data from GPU to CPU */
-        ret = av_hwframe_transfer_data(hwFrame, mRawFrame, 0);
-        if ( ret < 0 ) {
-          Error("Unable to transfer frame at frame %d: %s, continuing",
-              frameCount, av_make_error_string(ret).c_str());
-          zm_av_packet_unref(&packet);
-          continue;
-        }
-        zm_dump_video_frame(hwFrame, "After hwtransfer");
-
-        hwFrame->pts = mRawFrame->pts;
-        input_frame = hwFrame;
-      } else {
-#endif
-#endif
-        input_frame = mRawFrame;
-#if HAVE_LIBAVUTIL_HWCONTEXT_H
-#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
-      }
-#endif
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  zm_packet.codec_type = stream->codecpar->codec_type;
+#else
+  zm_packet.codec_type = stream->codec->codec_type;
 #endif
+  bytes += packet.size;
+  zm_packet.set_packet(&packet);
+  zm_packet.stream = stream;
+  zm_packet.pts = av_rescale_q(packet.pts, stream->time_base, AV_TIME_BASE_Q);
+  if ( packet.pts != AV_NOPTS_VALUE ) {
+    if ( stream == mVideoStream ) {
+      if (mFirstVideoPTS == AV_NOPTS_VALUE)
+        mFirstVideoPTS = packet.pts;
 
-      if ( transfer_to_image(image, mFrame, input_frame) < 0 ) {
-        zm_av_packet_unref(&packet);
-        return -1;
-      }
-
-      frameCount++;
+      mLastVideoPTS = packet.pts - mFirstVideoPTS;
     } else {
-      Debug(4, "Different stream_index %d", packet.stream_index);
-    }  // end if packet.stream_index == mVideoStreamId
-    zm_av_packet_unref(&packet);
-  }  // end while ! frameComplete
-  return frameComplete ? 1 : 0;
-}  // FfmpegCamera::Capture
+      if (mFirstAudioPTS == AV_NOPTS_VALUE)
+        mFirstAudioPTS = packet.pts;
+
+      mLastAudioPTS = packet.pts - mFirstAudioPTS;
+    }
+  }
+  zm_av_packet_unref(&packet);
+
+  return 1;
+} // FfmpegCamera::Capture
 
 int FfmpegCamera::PostCapture() {
   // Nothing to do here
@@ -346,12 +270,11 @@ int FfmpegCamera::PostCapture() {
 int FfmpegCamera::OpenFfmpeg() {
   int ret;
 
-  have_video_keyframe = false;
   error_count = 0;
 
   // Open the input, not necessarily a file
 #if !LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 4, 0)
-  if ( av_open_input_file(&mFormatContext, mPath.c_str(), nullptr, 0, nullptr) != 0 )
+  if (av_open_input_file(&mFormatContext, mPath.c_str(), nullptr, 0, nullptr) != 0)
 #else
   // Handle options
   AVDictionary *opts = nullptr;
@@ -362,7 +285,7 @@ int FfmpegCamera::OpenFfmpeg() {
 
   // Set transport method as specified by method field, rtpUni is default
   std::string protocol = mPath.substr(0, 4);
-  string_toupper(protocol);
+  StringToUpper(protocol);
   if ( protocol == "RTSP" ) {
     const std::string method = Method();
     if ( method == "rtpMulti" ) {
@@ -380,7 +303,6 @@ int FfmpegCamera::OpenFfmpeg() {
       Warning("Could not set rtsp_transport method '%s'", method.c_str());
     }
   }  // end if RTSP
-  // #av_dict_set(&opts, "timeout", "10000000", 0); // in microseconds.
 
   Debug(1, "Calling avformat_open_input for %s", mPath.c_str());
 
@@ -416,6 +338,7 @@ int FfmpegCamera::OpenFfmpeg() {
   }
   av_dict_free(&opts);
 
+  Debug(1, "Finding stream info");
 #if !LIBAVFORMAT_VERSION_CHECK(53, 6, 0, 6, 0)
   ret = av_find_stream_info(mFormatContext);
 #else
@@ -436,6 +359,7 @@ int FfmpegCamera::OpenFfmpeg() {
     if ( is_video_stream(stream) ) {
       if ( mVideoStreamId == -1 ) {
         mVideoStreamId = i;
+        mVideoStream = mFormatContext->streams[i];
         // if we break, then we won't find the audio stream
         continue;
       } else {
@@ -444,11 +368,13 @@ int FfmpegCamera::OpenFfmpeg() {
     } else if ( is_audio_stream(stream) ) {
       if ( mAudioStreamId == -1 ) {
         mAudioStreamId = i;
+        mAudioStream = mFormatContext->streams[i];
       } else {
         Debug(2, "Have another audio stream.");
       }
     }
   }  // end foreach stream
+
   if ( mVideoStreamId == -1 ) {
     Error("Unable to locate video stream in %s", mPath.c_str());
     return -1;
@@ -456,24 +382,15 @@ int FfmpegCamera::OpenFfmpeg() {
 
   Debug(3, "Found video stream at index %d, audio stream at index %d",
       mVideoStreamId, mAudioStreamId);
-  packetqueue = new zm_packetqueue(
-      (mVideoStreamId > mAudioStreamId) ? mVideoStreamId : mAudioStreamId);
 
+  AVCodec *mVideoCodec = nullptr;
+  if ( mVideoStream->
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  // mVideoCodecContext = avcodec_alloc_context3(NULL);
-  // avcodec_parameters_to_context(mVideoCodecContext,
-  // mFormatContext->streams[mVideoStreamId]->codecpar);
-  // this isn't copied.
-  // mVideoCodecContext->time_base =
-  // mFormatContext->streams[mVideoStreamId]->codec->time_base;
+      codecpar
 #else
+      codec
 #endif
-  mVideoCodecContext = mFormatContext->streams[mVideoStreamId]->codec;
-#ifdef CODEC_FLAG2_FAST
-  mVideoCodecContext->flags2 |= CODEC_FLAG2_FAST | CODEC_FLAG_LOW_DELAY;
-#endif
-
-  if ( mVideoCodecContext->codec_id == AV_CODEC_ID_H264 ) {
+      ->codec_id == AV_CODEC_ID_H264 ) {
     if ( (mVideoCodec = avcodec_find_decoder_by_name("h264_mmal")) == nullptr ) {
       Debug(1, "Failed to find decoder (h264_mmal)");
     } else {
@@ -482,7 +399,13 @@ int FfmpegCamera::OpenFfmpeg() {
   }
 
   if ( !mVideoCodec ) {
-    mVideoCodec = avcodec_find_decoder(mVideoCodecContext->codec_id);
+    mVideoCodec = avcodec_find_decoder(mVideoStream->
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+        codecpar
+#else
+        codec
+#endif
+        ->codec_id);
     if ( !mVideoCodec ) {
       // Try and get the codec from the codec context
       Error("Can't find codec for video stream from %s", mPath.c_str());
@@ -490,13 +413,24 @@ int FfmpegCamera::OpenFfmpeg() {
     }
   }
 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  mVideoCodecContext = avcodec_alloc_context3(mVideoCodec);
+  avcodec_parameters_to_context(mVideoCodecContext,
+      mFormatContext->streams[mVideoStreamId]->codecpar);
+#else
+  mVideoCodecContext = mFormatContext->streams[mVideoStreamId]->codec;
+#endif
+#ifdef CODEC_FLAG2_FAST
+  mVideoCodecContext->flags2 |= CODEC_FLAG2_FAST | CODEC_FLAG_LOW_DELAY;
+#endif
+
   zm_dump_stream_format(mFormatContext, mVideoStreamId, 0, 0);
 
   if ( use_hwaccel && (hwaccel_name != "") ) {
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
     // 3.2 doesn't seem to have all the bits in place, so let's require 3.3 and up
-#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
-// Print out available types
+  #if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
+    // Print out available types
     enum AVHWDeviceType type = AV_HWDEVICE_TYPE_NONE;
     while ( (type = av_hwdevice_iterate_types(type)) != AV_HWDEVICE_TYPE_NONE )
       Debug(1, "%s", av_hwdevice_get_type_name(type));
@@ -509,22 +443,24 @@ int FfmpegCamera::OpenFfmpeg() {
       Debug(1, "Found hwdevice %s", av_hwdevice_get_type_name(type));
     }
 
-#if LIBAVUTIL_VERSION_CHECK(56, 22, 0, 14, 0)
+    #if LIBAVUTIL_VERSION_CHECK(56, 22, 0, 14, 0)
     // Get hw_pix_fmt
     for ( int i = 0;; i++ ) {
       const AVCodecHWConfig *config = avcodec_get_hw_config(mVideoCodec, i);
       if ( !config ) {
-        Debug(1, "Decoder %s does not support device type %s.",
-            mVideoCodec->name, av_hwdevice_get_type_name(type));
+        Debug(1, "Decoder %s does not support config %d.",
+            mVideoCodec->name, i);
         break;
       }
       if ( (config->methods & AV_CODEC_HW_CONFIG_METHOD_HW_DEVICE_CTX)
           && (config->device_type == type)
           ) {
         hw_pix_fmt = config->pix_fmt;
-        break;
+        Debug(1, "Decoder %s does support our type %s.",
+            mVideoCodec->name, av_hwdevice_get_type_name(type));
+        //break;
       } else {
-        Debug(1, "decoder %s hwConfig doesn't match our type: %s != %s, pix_fmt %s.",
+        Debug(1, "Decoder %s hwConfig doesn't match our type: %s != %s, pix_fmt %s.",
             mVideoCodec->name,
             av_hwdevice_get_type_name(type),
             av_hwdevice_get_type_name(config->device_type),
@@ -532,36 +468,41 @@ int FfmpegCamera::OpenFfmpeg() {
             );
       }
     }  // end foreach hwconfig
-#else
+    #else
     hw_pix_fmt = find_fmt_by_hw_type(type);
-#endif
+    #endif
     if ( hw_pix_fmt != AV_PIX_FMT_NONE ) {
       Debug(1, "Selected hw_pix_fmt %d %s",
           hw_pix_fmt, av_get_pix_fmt_name(hw_pix_fmt));
 
+       mVideoCodecContext->hwaccel_flags |= AV_HWACCEL_FLAG_IGNORE_LEVEL;
+        //if (!lavc_param->check_hw_profile)
+       mVideoCodecContext->hwaccel_flags |= AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH;
+
       ret = av_hwdevice_ctx_create(&hw_device_ctx, type,
-          (hwaccel_device != "" ? hwaccel_device.c_str(): nullptr), nullptr, 0);
+          (hwaccel_device != "" ? hwaccel_device.c_str() : nullptr), nullptr, 0);
+      if ( ret < 0 and hwaccel_device != "" ) {
+        ret = av_hwdevice_ctx_create(&hw_device_ctx, type, nullptr, nullptr, 0);
+      }
       if ( ret < 0 ) {
-        Error("Failed to create hwaccel device. %s",av_make_error_string(ret).c_str());
+        Error("Failed to create hwaccel device. %s", av_make_error_string(ret).c_str());
         hw_pix_fmt = AV_PIX_FMT_NONE;
       } else {
         Debug(1, "Created hwdevice for %s", hwaccel_device.c_str());
         mVideoCodecContext->get_format = get_hw_format;
         mVideoCodecContext->hw_device_ctx = av_buffer_ref(hw_device_ctx);
-        hwFrame = zm_av_frame_alloc();
       }
     } else {
       Debug(1, "Failed to find suitable hw_pix_fmt.");
     }
-#else
+  #else
     Debug(1, "AVCodec not new enough for hwaccel");
-#endif
+  #endif
 #else
     Warning("HWAccel support not compiled in.");
 #endif
   }  // end if hwaccel_name
 
-  // Open the codec
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
   ret = avcodec_open(mVideoCodecContext, mVideoCodec);
 #else
@@ -578,14 +519,25 @@ int FfmpegCamera::OpenFfmpeg() {
   }
   zm_dump_codec(mVideoCodecContext);
 
-  Debug(1, hwFrame ? "HWACCEL in use" : "HWACCEL not in use");
+  if (mAudioStreamId == -1 and !monitor->GetSecondPath().empty()) {
+    Debug(1, "Trying secondary stream at %s", monitor->GetSecondPath().c_str());
+    FFmpeg_Input *second_input = new FFmpeg_Input();
+    if (second_input->Open(monitor->GetSecondPath().c_str()) > 0) {
+      mSecondFormatContext = second_input->get_format_context();
+      mAudioStreamId = second_input->get_audio_stream_id();
+      mAudioStream = second_input->get_audio_stream();
+    } else {
+      Warning("Failed to open secondary input");
+    }
+  }  // end if have audio stream
 
   if ( mAudioStreamId >= 0 ) {
+    AVCodec *mAudioCodec = nullptr;
     if ( (mAudioCodec = avcodec_find_decoder(
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-            mFormatContext->streams[mAudioStreamId]->codecpar->codec_id
+            mAudioStream->codecpar->codec_id
 #else
-            mFormatContext->streams[mAudioStreamId]->codec->codec_id
+            mAudioStream->codec->codec_id
 #endif
             )) == nullptr ) {
       Debug(1, "Can't find codec for audio stream from %s", mPath.c_str());
@@ -594,60 +546,25 @@ int FfmpegCamera::OpenFfmpeg() {
       mAudioCodecContext = avcodec_alloc_context3(mAudioCodec);
       avcodec_parameters_to_context(
           mAudioCodecContext,
-          mFormatContext->streams[mAudioStreamId]->codecpar
+          mAudioStream->codecpar
           );
 #else
-      mAudioCodecContext = mFormatContext->streams[mAudioStreamId]->codec;
-     // = avcodec_alloc_context3(mAudioCodec);
+      mAudioCodecContext = mAudioStream->codec;
 #endif
 
-      zm_dump_stream_format(mFormatContext, mAudioStreamId, 0, 0);
+      zm_dump_stream_format((mSecondFormatContext?mSecondFormatContext:mFormatContext), mAudioStreamId, 0, 0);
       // Open the codec
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
-      if ( avcodec_open(mAudioCodecContext, mAudioCodec) < 0 ) {
+      if ( avcodec_open(mAudioCodecContext, mAudioCodec) < 0 )
 #else
-      if ( avcodec_open2(mAudioCodecContext, mAudioCodec, nullptr) < 0 ) {
+      if ( avcodec_open2(mAudioCodecContext, mAudioCodec, nullptr) < 0 )
 #endif
+      {
         Error("Unable to open codec for audio stream from %s", mPath.c_str());
         return -1;
-      }
-      zm_dump_codec(mAudioCodecContext);
-    }  // end if find decoder
-  }  // end if have audio_context
-
-  // Allocate space for the native video frame
-  mRawFrame = zm_av_frame_alloc();
-
-  // Allocate space for the converted video frame
-  mFrame = zm_av_frame_alloc();
-
-  if ( mRawFrame == nullptr || mFrame == nullptr ) {
-    Error("Unable to allocate frame for %s", mPath.c_str());
-    return -1;
-  }
-  mFrame->width = width;
-  mFrame->height = height;
-
-
-#if HAVE_LIBSWSCALE
-  if ( !sws_isSupportedInput(mVideoCodecContext->pix_fmt) ) {
-    Error("swscale does not support the codec format for input: %s",
-        av_get_pix_fmt_name(mVideoCodecContext->pix_fmt)
-        );
-    return -1;
-  }
-
-  if ( !sws_isSupportedOutput(imagePixFormat) ) {
-    Error("swscale does not support the target format: %s",
-        av_get_pix_fmt_name(imagePixFormat)
-        );
-    return -1;
-  }
-
-#else  // HAVE_LIBSWSCALE
-  Fatal("You must compile ffmpeg with the --enable-swscale "
-      "option to use ffmpeg cameras");
-#endif  // HAVE_LIBSWSCALE
+      }  // end if opened
+    }  // end if found decoder
+  }  // end if mAudioStreamId
 
   if (
       ((unsigned int)mVideoCodecContext->width != width)
@@ -660,45 +577,16 @@ int FfmpegCamera::OpenFfmpeg() {
 
   mCanCapture = true;
 
-  return 0;
-}  // int FfmpegCamera::OpenFfmpeg()
+  return 1;
+} // int FfmpegCamera::OpenFfmpeg()
 
 int FfmpegCamera::Close() {
-  Debug(2, "CloseFfmpeg called.");
-
   mCanCapture = false;
 
-  if ( mFrame ) {
-    av_frame_free(&mFrame);
-    mFrame = nullptr;
-  }
-  if ( mRawFrame ) {
-    av_frame_free(&mRawFrame);
-    mRawFrame = nullptr;
-  }
-#if HAVE_LIBAVUTIL_HWCONTEXT_H
-  if ( hwFrame ) {
-    av_frame_free(&hwFrame);
-    hwFrame = nullptr;
-  }
-#endif
-
-#if HAVE_LIBSWSCALE
-  if ( mConvertContext ) {
-    sws_freeContext(mConvertContext);
-    mConvertContext = nullptr;
-  }
-#endif
-
-  if ( videoStore ) {
-    delete videoStore;
-    videoStore = nullptr;
-  }
-
   if ( mVideoCodecContext ) {
     avcodec_close(mVideoCodecContext);
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    // avcodec_free_context(&mVideoCodecContext);
+    avcodec_free_context(&mVideoCodecContext);
 #endif
     mVideoCodecContext = nullptr;  // Freed by av_close_input_file
   }
@@ -725,480 +613,22 @@ int FfmpegCamera::Close() {
     mFormatContext = nullptr;
   }
 
-  if ( packetqueue ) {
-    delete packetqueue;
-    packetqueue = nullptr;
-  }
-
   return 0;
 }  // end FfmpegCamera::Close
 
-// Function to handle capture and store
-int FfmpegCamera::CaptureAndRecord(
-    Image &image,
-    timeval recording,
-    char* event_file
-    ) {
-  if ( !mCanCapture ) {
-    return -1;
+int FfmpegCamera::FfmpegInterruptCallback(void *ctx) {
+  if (zm_terminate) {
+    Debug(1, "Received terminate in cb");
+    return zm_terminate;
   }
-  int ret;
-
-  struct timeval video_buffer_duration = monitor->GetVideoBufferDuration();
-
-  int frameComplete = false;
-  while ( !frameComplete ) {
-    av_init_packet(&packet);
-
-    ret = av_read_frame(mFormatContext, &packet);
-    if ( ret < 0 ) {
-      if (
-          // Check if EOF.
-          (
-           (ret == AVERROR_EOF) ||
-           (mFormatContext->pb && mFormatContext->pb->eof_reached)
-           ) ||
-          // Check for Connection failure.
-          (ret == -110)
-         ) {
-        Info("Unable to read packet from stream %d: error %d \"%s\".",
-            packet.stream_index, ret, av_make_error_string(ret).c_str());
-      } else {
-        Error("Unable to read packet from stream %d: error %d \"%s\".",
-            packet.stream_index, ret, av_make_error_string(ret).c_str());
-      }
-      return -1;
-    }
-
-    if ( (packet.pts != AV_NOPTS_VALUE) && (packet.pts < -100000) ) {
-      // Ignore packets that have crazy negative pts.
-      // They aren't supposed to happen.
-      Warning("Ignore packet because pts %" PRId64 " is massively negative."
-         " Error count is %d", packet.pts, error_count);
-      dumpPacket(
-          mFormatContext->streams[packet.stream_index],
-          &packet,
-          "Ignored packet");
-      if ( error_count > 100 ) {
-        Error("Bad packet count over 100, going to close and re-open stream");
-        return -1;
-      }
-      error_count += 1;
-      continue;
-    }
-    // If we get a good frame, decrease the error count.. We could zero it...
-    if ( error_count > 0 ) error_count -= 1;
-
-    int keyframe = packet.flags & AV_PKT_FLAG_KEY;
-    bytes += packet.size;
-    dumpPacket(
-        mFormatContext->streams[packet.stream_index],
-        &packet,
-        "Captured Packet");
-    if ( packet.dts == AV_NOPTS_VALUE ) {
-      packet.dts = packet.pts;
-    }
-
-    // Video recording
-    if ( recording.tv_sec ) {
-      uint32_t last_event_id = monitor->GetLastEventId();
-      uint32_t video_writer_event_id = monitor->GetVideoWriterEventId();
-
-      if ( last_event_id != video_writer_event_id ) {
-        Debug(2, "Have change of event.  last_event(%d), our current (%d)",
-            last_event_id, video_writer_event_id);
-
-        if ( videoStore ) {
-          Info("Re-starting video storage module");
-
-          // I don't know if this is important or not... but I figure we might
-          // as well write this last packet out to the store before closing it.
-          // Also don't know how much it matters for audio.
-          if ( packet.stream_index == mVideoStreamId ) {
-            // Write the packet to our video store
-            int ret = videoStore->writeVideoFramePacket(&packet);
-            if ( ret < 0 ) {  // Less than zero and we skipped a frame
-              Warning("Error writing last packet to videostore.");
-            }
-          }  // end if video
-
-          delete videoStore;
-          videoStore = nullptr;
-          have_video_keyframe = false;
-
-          monitor->SetVideoWriterEventId(0);
-        }  // end if videoStore
-      }  // end if end of recording
-
-      if ( last_event_id && !videoStore ) {
-        // Instantiate the video storage module
-
-        packetqueue->dumpQueue();
-        if ( record_audio ) {
-          if ( mAudioStreamId == -1 ) {
-            Debug(3, "Record Audio on but no audio stream found");
-            videoStore = new VideoStore((const char *) event_file, "mp4",
-                mFormatContext->streams[mVideoStreamId],
-                nullptr,
-                this->getMonitor());
-
-          } else {
-            Debug(3, "Video module initiated with audio stream");
-            videoStore = new VideoStore((const char *) event_file, "mp4",
-                mFormatContext->streams[mVideoStreamId],
-                mFormatContext->streams[mAudioStreamId],
-                this->getMonitor());
-          }
-        } else {
-          if ( mAudioStreamId >= 0 ) {
-            Debug(3, "Record_audio is false so exclude audio stream");
-          }
-          videoStore = new VideoStore((const char *) event_file, "mp4",
-              mFormatContext->streams[mVideoStreamId],
-              nullptr,
-              this->getMonitor());
-        }  // end if record_audio
-
-        if ( !videoStore->open() ) {
-          delete videoStore;
-          videoStore = nullptr;
-
-        } else {
-          monitor->SetVideoWriterEventId(last_event_id);
-
-          // Need to write out all the frames from the last keyframe?
-          // No... need to write out all frames from when the event began.
-          // Due to PreEventFrames, this could be more than
-          // since the last keyframe.
-          unsigned int packet_count = 0;
-          ZMPacket *queued_packet;
-          struct timeval video_offset = {0};
-
-          // Clear all packets that predate the moment when the recording began
-          packetqueue->clear_unwanted_packets(
-              &recording, 0, mVideoStreamId);
-
-          while ( (queued_packet = packetqueue->popPacket()) ) {
-            AVPacket *avp = queued_packet->av_packet();
-
-            // compute time offset between event start and first frame in video
-            if (packet_count == 0){
-                monitor->SetVideoWriterStartTime(queued_packet->timestamp);
-                timersub(&queued_packet->timestamp, &recording, &video_offset);
-                Info("Event video offset is %.3f sec (<0 means video starts early)",
-                     video_offset.tv_sec + video_offset.tv_usec*1e-6);
-            }
-
-            packet_count += 1;
-            // Write the packet to our video store
-            Debug(2, "Writing queued packet stream: %d  KEY %d, remaining (%d)",
-                avp->stream_index,
-                avp->flags & AV_PKT_FLAG_KEY,
-                packetqueue->size());
-            if ( avp->stream_index == mVideoStreamId ) {
-              ret = videoStore->writeVideoFramePacket(avp);
-              have_video_keyframe = true;
-            } else if ( avp->stream_index == mAudioStreamId ) {
-              ret = videoStore->writeAudioFramePacket(avp);
-            } else {
-              Warning("Unknown stream id in queued packet (%d)",
-                  avp->stream_index);
-              ret = -1;
-            }
-            if ( ret < 0 ) {
-              // Less than zero and we skipped a frame
-            }
-            delete queued_packet;
-          }  // end while packets in the packetqueue
-          Debug(2, "Wrote %d queued packets", packet_count);
-        }
-      }  // end if ! was recording
-
-    } else {
-      // Not recording
-
-      if ( videoStore ) {
-        Debug(1, "Deleting videoStore instance");
-        delete videoStore;
-        videoStore = nullptr;
-        have_video_keyframe = false;
-        monitor->SetVideoWriterEventId(0);
-      }
-    }  // end if recording or not
-
-    // Buffer video packets, since we are not recording.
-    // All audio packets are keyframes, so only if it's a video keyframe
-    if ( packet.stream_index == mVideoStreamId ) {
-      if ( keyframe ) {
-        Debug(3, "Clearing queue");
-        if (video_buffer_duration.tv_sec > 0 || video_buffer_duration.tv_usec > 0) {
-            packetqueue->clearQueue(&video_buffer_duration, mVideoStreamId);
-        }
-        else {
-            packetqueue->clearQueue(monitor->GetPreEventCount(), mVideoStreamId);
-        }
-
-        if (
-            packetqueue->packet_count(mVideoStreamId)
-            >=
-            monitor->GetImageBufferCount()
-            ) {
-          Warning(
-              "ImageBufferCount %d is too small. "
-              "Needs to be at least %d. "
-              "Either increase it or decrease time between keyframes",
-              monitor->GetImageBufferCount(),
-              packetqueue->packet_count(mVideoStreamId)+1);
-        }
-
-        packetqueue->queuePacket(&packet);
-      } else if ( packetqueue->size() ) {
-        // it's a keyframe or we already have something in the queue
-        packetqueue->queuePacket(&packet);
-      }
-    } else if ( packet.stream_index == mAudioStreamId ) {
-      // Ensure that the queue always begins with a video keyframe
-      if ( record_audio && packetqueue->size() ) {
-        packetqueue->queuePacket(&packet);
-      }
-    }  // end if packet type
-
-    if ( packet.stream_index == mVideoStreamId ) {
-      if ( (have_video_keyframe || keyframe) && videoStore ) {
-        int ret = videoStore->writeVideoFramePacket(&packet);
-        if ( ret < 0 ) {
-          // Less than zero and we skipped a frame
-          Error("Unable to write video packet code: %d, framecount %d: %s",
-              ret, frameCount, av_make_error_string(ret).c_str());
-        } else {
-          have_video_keyframe = true;
-        }
-      }  // end if keyframe or have_video_keyframe
-
-      ret = zm_send_packet_receive_frame(mVideoCodecContext, mRawFrame, packet);
-      if ( ret < 0 ) {
-        if ( AVERROR(EAGAIN) != ret ) {
-          Warning("Unable to receive frame %d: code %d %s. error count is %d",
-              frameCount, ret, av_make_error_string(ret).c_str(), error_count);
-          error_count += 1;
-          if ( error_count > 100 ) {
-            Error("Error count over 100, going to close and re-open stream");
-            return -1;
-          }
-#if HAVE_LIBAVUTIL_HWCONTEXT_H
-#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
-          if ( (ret == AVERROR_INVALIDDATA ) && (hw_pix_fmt != AV_PIX_FMT_NONE) ) {
-            use_hwaccel = false;
-            return -1;
-          }
-#endif
-#endif
-        }
-        zm_av_packet_unref(&packet);
-        continue;
-      }
-      if ( error_count > 0 ) error_count--;
-      zm_dump_video_frame(mRawFrame, "raw frame from decoder");
-#if HAVE_LIBAVUTIL_HWCONTEXT_H
-#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
-      if (
-          (hw_pix_fmt != AV_PIX_FMT_NONE)
-          &&
-          (mRawFrame->format == hw_pix_fmt)
-          ) {
-        /* retrieve data from GPU to CPU */
-        ret = av_hwframe_transfer_data(hwFrame, mRawFrame, 0);
-        if ( ret < 0 ) {
-          Error("Unable to transfer frame at frame %d: %s, continuing",
-              frameCount, av_make_error_string(ret).c_str());
-          zm_av_packet_unref(&packet);
-          continue;
-        }
-        zm_dump_video_frame(hwFrame, "After hwtransfer");
-
-        hwFrame->pts = mRawFrame->pts;
-        input_frame = hwFrame;
-      } else {
-#endif
-#endif
-        input_frame = mRawFrame;
-#if HAVE_LIBAVUTIL_HWCONTEXT_H
-#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
-      }
-#endif
-#endif
-      if ( transfer_to_image(image, mFrame, input_frame) < 0 ) {
-        Error("Failed to transfer from frame to image");
-        zm_av_packet_unref(&packet);
-        return -1;
-      }
-
-      frameComplete = 1;
-      frameCount++;
-    } else if ( packet.stream_index == mAudioStreamId ) {
-      // FIXME best way to copy all other streams
-      frameComplete = 1;
-      if ( videoStore ) {
-        if ( record_audio ) {
-          if ( have_video_keyframe ) {
-            // Write the packet to our video store
-            // FIXME no relevance of last key frame
-            int ret = videoStore->writeAudioFramePacket(&packet);
-            if ( ret < 0 ) {
-              // Less than zero and we skipped a frame
-              Warning("Failure to write audio packet.");
-              zm_av_packet_unref(&packet);
-              return 0;
-            }
-          } else {
-            Debug(3, "Not recording audio because no video keyframe");
-          }
-        } else {
-          Debug(4, "Not doing recording of audio packet");
-        }
-      } else {
-        Debug(4, "Have audio packet, but not recording atm");
-      }
-      zm_av_packet_unref(&packet);
-      return 0;
-    } else {
-#if LIBAVUTIL_VERSION_CHECK(56, 23, 0, 23, 0)
-      Debug(3, "Some other stream index %d, %s",
-          packet.stream_index,
-          av_get_media_type_string(
-            mFormatContext->streams[packet.stream_index]->codecpar->codec_type)
-          );
-#else
-      Debug(3, "Some other stream index %d", packet.stream_index);
-#endif
-    }  // end if is video or audio or something else
-
-    // the packet contents are ref counted... when queuing, we allocate another
-    // packet and reference it with that one, so we should always need to unref
-    // here, which should not affect the queued version.
-    zm_av_packet_unref(&packet);
-  }  // end while ! frameComplete
-  return frameCount;
-}  // end FfmpegCamera::CaptureAndRecord
-
-int FfmpegCamera::transfer_to_image(
-    Image &image,
-    AVFrame *output_frame,
-    AVFrame *input_frame
-    ) {
-  uint8_t* image_buffer;  // pointer to buffer in image
-  uint8_t* buffer;        // pointer to either image_buffer or frame_buffer
-
-  /* Request a writeable buffer of the target image */
-  image_buffer = image.WriteBuffer(width, height, colours, subpixelorder);
-  if ( image_buffer == nullptr ) {
-    Error("Failed requesting writeable buffer for the captured image.");
-    return -1;
-  }
-  // if image_buffer was allocated then use it.
-  buffer = frame_buffer ? frame_buffer : image_buffer;
-
-#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-  // From what I've read, we should align the linesizes to 32bit so that ffmpeg can use SIMD instructions too.
-  int size = av_image_fill_arrays(
-      output_frame->data, output_frame->linesize,
-      buffer, imagePixFormat, width, height,
-      alignment
-      );
-  if ( size < 0 ) {
-    Error("Problem setting up data pointers into image %s",
-        av_make_error_string(size).c_str());
-  } else {
-    Debug(4, "av_image_fill_array %dx%d alignment: %d = %d, buffer size is %d",
-        width, height, alignment, size, image.Size());
-  }
-  Debug(1, "ffmpegcamera: width %d height %d linesize %d colours %d imagesize %d", width, height, linesize, colours, imagesize);
-  if ( linesize != (unsigned int)output_frame->linesize[0] ) {
-    Error("Bad linesize expected %d got %d", linesize, output_frame->linesize[0]);
-  }
-#else
-  avpicture_fill((AVPicture *)output_frame, buffer,
-      imagePixFormat, width, height);
-#endif
-
-#if HAVE_LIBSWSCALE
-  if ( !mConvertContext ) {
-    mConvertContext = sws_getContext(
-        input_frame->width,
-        input_frame->height,
-        (AVPixelFormat)input_frame->format,
-        width, height,
-        imagePixFormat, SWS_BICUBIC, nullptr,
-        nullptr, nullptr);
-    if ( mConvertContext == nullptr ) {
-      Error("Unable to create conversion context for %s from %s to %s",
-          mPath.c_str(),
-          av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
-          av_get_pix_fmt_name(imagePixFormat)
-          );
-      return -1;
-    }
-    Debug(1, "Setup conversion context for %dx%d %s to %dx%d %s",
-          input_frame->width, input_frame->height,
-          av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
-          width, height,
-          av_get_pix_fmt_name(imagePixFormat)
-        );
-  }
-
-  int ret =
-      sws_scale(
-        mConvertContext, input_frame->data, input_frame->linesize,
-        0, mVideoCodecContext->height,
-        output_frame->data, output_frame->linesize);
-  if ( ret < 0 ) {
-    Error("Unable to convert format %u %s linesize %d,%d height %d to format %u %s linesize %d,%d at frame %d codec %u %s lines %d: code: %d",
-        input_frame->format, av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
-        input_frame->linesize[0], input_frame->linesize[1], mVideoCodecContext->height,
-        imagePixFormat,
-        av_get_pix_fmt_name(imagePixFormat),
-        output_frame->linesize[0], output_frame->linesize[1],
-        frameCount,
-        mVideoCodecContext->pix_fmt, av_get_pix_fmt_name(mVideoCodecContext->pix_fmt),
-        mVideoCodecContext->height,
-        ret
-        );
-    return -1;
-  }
-  Debug(4, "Able to convert format %u %s linesize %d,%d height %d to format %u %s linesize %d,%d at frame %d codec %u %s %dx%d ",
-      input_frame->format, av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
-      input_frame->linesize[0], input_frame->linesize[1], mVideoCodecContext->height,
-      imagePixFormat,
-      av_get_pix_fmt_name(imagePixFormat),
-      output_frame->linesize[0], output_frame->linesize[1],
-      frameCount,
-      mVideoCodecContext->pix_fmt, av_get_pix_fmt_name(mVideoCodecContext->pix_fmt),
-      output_frame->width,
-      output_frame->height
-      );
-#else  // HAVE_LIBSWSCALE
-  Fatal("You must compile ffmpeg with the --enable-swscale "
-      "option to use ffmpeg cameras");
-#endif  // HAVE_LIBSWSCALE
-  if ( buffer != image_buffer ) {
-    Debug(1, "Copying image-buffer to buffer");
-    // Have to copy contents of image_buffer to directbuffer.
-    // Since linesize isn't the same have to copy line by line
-    uint8_t *image_buffer_ptr = image_buffer;
-    int row_size = output_frame->width * colours;
-    for ( int i = 0; i < output_frame->height; i++ ) {
-      memcpy(image_buffer_ptr, buffer, row_size);
-      image_buffer_ptr += row_size;
-      buffer += output_frame->linesize[0];
-    }
+  time_t now = time(nullptr);
+  if (now - start_read_time > 10) {
+    Debug(1, "timeout in ffmpeg camera now %" PRIi64 " - %" PRIi64 " > 10",
+          static_cast<int64>(now),
+          static_cast<int64>(start_read_time));
+    return 1;
   }
   return 0;
-}  // end int FfmpegCamera::transfer_to_image
-
-int FfmpegCamera::FfmpegInterruptCallback(void *ctx) {
-  // FfmpegCamera* camera = reinterpret_cast<FfmpegCamera*>(ctx);
-  // Debug(4, "FfmpegInterruptCallback");
-  return zm_terminate;
 }
 
 #endif  // HAVE_LIBAVFORMAT
diff --git a/src/zm_ffmpeg_camera.h b/src/zm_ffmpeg_camera.h
index da815ab86..e6f55b634 100644
--- a/src/zm_ffmpeg_camera.h
+++ b/src/zm_ffmpeg_camera.h
@@ -22,11 +22,6 @@
 
 #include "zm_camera.h"
 
-#include "zm_buffer.h"
-#include "zm_ffmpeg.h"
-#include "zm_videostore.h"
-#include "zm_packetqueue.h"
-
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
 typedef struct DecodeContext {
       AVBufferRef *hw_device_ref;
@@ -39,29 +34,18 @@ typedef struct DecodeContext {
 class FfmpegCamera : public Camera {
   protected:
     std::string         mPath;
+    std::string         mSecondPath;
     std::string         mMethod;
     std::string         mOptions;
+
+    std::string         encoder_options;
     std::string         hwaccel_name;
     std::string         hwaccel_device;
 
     int frameCount;    
-  
-    int alignment;      /* ffmpeg wants line sizes to be 32bit aligned.  Especially 4.3+ */
 
-#if HAVE_LIBAVFORMAT
-    AVFormatContext     *mFormatContext;
-    int                 mVideoStreamId;
-    int                 mAudioStreamId;
-    AVCodecContext      *mVideoCodecContext;
-    AVCodecContext      *mAudioCodecContext;
-    AVCodec             *mVideoCodec;
-    AVCodec             *mAudioCodec;
-    AVFrame             *mRawFrame; 
-    AVFrame             *mFrame;
     _AVPIXELFORMAT      imagePixFormat;
-    AVFrame             *input_frame;         // Use to point to mRawFrame or hwFrame;
 
-    AVFrame             *hwFrame; // Will also be used to indicate if hwaccel is in use
     bool                use_hwaccel; //will default to on if hwaccel specified, will get turned off if there is a failure
 #if HAVE_LIBAVUTIL_HWCONTEXT_H
     AVBufferRef *hw_device_ctx = nullptr;
@@ -73,25 +57,20 @@ class FfmpegCamera : public Camera {
     AVPacket packet;       
 
     int OpenFfmpeg();
-    int Close();
+    int Close() override;
     bool mCanCapture;
-#endif // HAVE_LIBAVFORMAT
-
-    VideoStore          *videoStore;
-    zm_packetqueue      *packetqueue;
-    bool                have_video_keyframe;
 
 #if HAVE_LIBSWSCALE
     struct SwsContext   *mConvertContext;
 #endif
-    uint8_t *frame_buffer;
 
     int                 error_count;
 
   public:
     FfmpegCamera(
-        int p_id,
+        const Monitor *monitor,
         const std::string &path,
+        const std::string &second_path,
         const std::string &p_method,
         const std::string &p_options,
         int p_width,
@@ -112,16 +91,11 @@ class FfmpegCamera : public Camera {
     const std::string &Options() const { return mOptions; } 
     const std::string &Method() const { return mMethod; }
 
-    void Initialise();
-    void Terminate();
-
-    int PrimeCapture();
-    int PreCapture();
-    int Capture( Image &image );
-    int CaptureAndRecord( Image &image, timeval recording, char* event_directory );
-    int PostCapture();
+    int PrimeCapture() override;
+    int PreCapture() override;
+    int Capture(ZMPacket &p) override;
+    int PostCapture() override;
   private:
     static int FfmpegInterruptCallback(void*ctx);
-    int transfer_to_image(Image &i, AVFrame *output_frame, AVFrame *input_frame);
 };
 #endif // ZM_FFMPEG_CAMERA_H
diff --git a/src/zm_ffmpeg_input.cpp b/src/zm_ffmpeg_input.cpp
index 0ae6e634b..7b78cc598 100644
--- a/src/zm_ffmpeg_input.cpp
+++ b/src/zm_ffmpeg_input.cpp
@@ -1,7 +1,7 @@
-
 #include "zm_ffmpeg_input.h"
-#include "zm_logger.h"
+
 #include "zm_ffmpeg.h"
+#include "zm_logger.h"
 
 FFmpeg_Input::FFmpeg_Input() {
   input_format_context = nullptr;
@@ -14,28 +14,34 @@ FFmpeg_Input::FFmpeg_Input() {
 }
 
 FFmpeg_Input::~FFmpeg_Input() {
-  if ( streams ) {
-    for ( unsigned int i = 0; i < input_format_context->nb_streams; i += 1 ) {
-      avcodec_close(streams[i].context);
-      streams[i].context = nullptr;
-    }
-    delete[] streams;
-    streams = nullptr;
+  if ( input_format_context ) {
+    Close();
   }
   if ( frame ) {
     av_frame_free(&frame);
     frame = nullptr;
   }
-  if ( input_format_context ) {
-#if !LIBAVFORMAT_VERSION_CHECK(53, 17, 0, 25, 0)
-    av_close_input_file(input_format_context);
-#else
-    avformat_close_input(&input_format_context);
-#endif
-    input_format_context = nullptr;
-  }
 }  // end ~FFmpeg_Input()
 
+/* Takes streams provided from elsewhere.  They might not come from the same source
+ * but we will treat them as if they are.  */
+int FFmpeg_Input::Open(
+    const AVStream * video_in_stream,
+    const AVCodecContext * video_in_ctx,
+    const AVStream * audio_in_stream,
+    const AVCodecContext * audio_in_ctx
+    ) {
+  video_stream_id = video_in_stream->index;
+  int max_stream_index = video_in_stream->index;
+
+  if ( audio_in_stream ) {
+    max_stream_index = video_in_stream->index > audio_in_stream->index ? video_in_stream->index : audio_in_stream->index;
+    audio_stream_id = audio_in_stream->index;
+  }
+  streams = new stream[max_stream_index+1];
+  return 1;
+}
+
 int FFmpeg_Input::Open(const char *filepath) {
 
   int error;
@@ -43,8 +49,8 @@ int FFmpeg_Input::Open(const char *filepath) {
   /** Open the input file to read from it. */
   error = avformat_open_input(&input_format_context, filepath, nullptr, nullptr);
   if ( error < 0 ) {
-    Error("Could not open input file '%s' (error '%s')\n",
-        filepath, av_make_error_string(error).c_str() );
+    Error("Could not open input file '%s' (error '%s')",
+        filepath, av_make_error_string(error).c_str());
     input_format_context = nullptr;
     return error;
   }
@@ -112,13 +118,37 @@ int FFmpeg_Input::Open(const char *filepath) {
   } // end foreach stream
 
   if ( video_stream_id == -1 )
-    Error("Unable to locate video stream in %s", filepath);
+    Debug(1, "Unable to locate video stream in %s", filepath);
   if ( audio_stream_id == -1 )
     Debug(3, "Unable to locate audio stream in %s", filepath);
 
-  return 0;
+  return 1;
 } // end int FFmpeg_Input::Open( const char * filepath )
 
+int FFmpeg_Input::Close( ) {
+  if ( streams ) {
+    for ( unsigned int i = 0; i < input_format_context->nb_streams; i += 1 ) {
+      avcodec_close(streams[i].context);
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      avcodec_free_context(&streams[i].context);
+      streams[i].context = nullptr;
+#endif
+    }
+    delete[] streams;
+    streams = nullptr;
+  }
+
+  if ( input_format_context ) {
+#if !LIBAVFORMAT_VERSION_CHECK(53, 17, 0, 25, 0)
+    av_close_input_file(input_format_context);
+#else
+    avformat_close_input(&input_format_context);
+#endif
+    input_format_context = nullptr;
+  }
+  return 1;
+} // end int FFmpeg_Input::Close()
+
 AVFrame *FFmpeg_Input::get_frame(int stream_id) {
   int frameComplete = false;
   AVPacket packet;
@@ -140,42 +170,43 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id) {
           packet.stream_index, ret, av_make_error_string(ret).c_str());
       return nullptr;
     }
-    dumpPacket(input_format_context->streams[packet.stream_index], &packet, "Received packet");
+    ZM_DUMP_STREAM_PACKET(input_format_context->streams[packet.stream_index], packet, "Received packet");
 
-    if ( (stream_id < 0) || (packet.stream_index == stream_id) ) {
-      Debug(3, "Packet is for our stream (%d)", packet.stream_index);
+    if ( (stream_id >= 0) && (packet.stream_index != stream_id) ) {
+      Debug(1,"Packet is not for our stream (%d)", packet.stream_index );
+      continue;
+    }
 
-      AVCodecContext *context = streams[packet.stream_index].context;
+    AVCodecContext *context = streams[packet.stream_index].context;
 
-      if ( frame ) {
-        av_frame_free(&frame);
-        frame = zm_av_frame_alloc();
+    if ( frame ) {
+      av_frame_free(&frame);
+      frame = zm_av_frame_alloc();
+    } else {
+      frame = zm_av_frame_alloc();
+    }
+    ret = zm_send_packet_receive_frame(context, frame, packet);
+    if ( ret < 0 ) {
+      Error("Unable to decode frame at frame %d: %d %s, continuing",
+          streams[packet.stream_index].frame_count, ret, av_make_error_string(ret).c_str());
+      zm_av_packet_unref(&packet);
+      av_frame_free(&frame);
+      continue;
+    } else {
+      if ( is_video_stream(input_format_context->streams[packet.stream_index]) ) {
+        zm_dump_video_frame(frame, "resulting video frame");
       } else {
-        frame = zm_av_frame_alloc();
-      }
-      ret = zm_send_packet_receive_frame(context, frame, packet);
-      if ( ret < 0 ) {
-        Error("Unable to decode frame at frame %d: %d %s, continuing",
-            streams[packet.stream_index].frame_count, ret, av_make_error_string(ret).c_str());
-        zm_av_packet_unref(&packet);
-        av_frame_free(&frame);
-        continue;
-			} else {
-        if ( is_video_stream(input_format_context->streams[packet.stream_index]) ) {
-          zm_dump_video_frame(frame, "resulting video frame");
-        } else {
-          zm_dump_frame(frame, "resulting frame");
-        }
+        zm_dump_frame(frame, "resulting frame");
       }
+    }
 
-      frameComplete = 1;
-    } // end if it's the right stream
+    frameComplete = 1;
 
     zm_av_packet_unref(&packet);
 
-  } // end while ! frameComplete
+  } // end while !frameComplete
   return frame;
-} //  end AVFrame *FFmpeg_Input::get_frame
+}  // end AVFrame *FFmpeg_Input::get_frame
 
 AVFrame *FFmpeg_Input::get_frame(int stream_id, double at) {
   Debug(1, "Getting frame from stream %d at %f", stream_id, at);
@@ -187,47 +218,58 @@ AVFrame *FFmpeg_Input::get_frame(int stream_id, double at) {
 
   int ret;
 
-  if ( !frame ) {
+  if (!frame) {
     // Don't have a frame yet, so get a keyframe before the timestamp
     ret = av_seek_frame(input_format_context, stream_id, seek_target, AVSEEK_FLAG_FRAME);
-    if ( ret < 0 ) {
+    if (ret < 0) {
       Error("Unable to seek in stream");
       return nullptr;
     }
     // Have to grab a frame to update our current frame to know where we are
     get_frame(stream_id);
-  }  // end if ! frame
 
-	if ( !frame ) {
-		Warning("Unable to get frame.");
-		return nullptr;
-	}
+    if (!frame) {
+      Warning("Unable to get frame.");
+      return nullptr;
+    }
+  }  // end if ! frame
 
   if ( 
 			(last_seek_request >= 0)
 			&&
-			(last_seek_request > seek_target ) 
+			(last_seek_request > seek_target) 
 			&&
 			(frame->pts > seek_target)
 		 ) {
     zm_dump_frame(frame, "frame->pts > seek_target, seek backwards");
   // our frame must be beyond our seek target. so go backwards to before it
-    if ( ( ret = av_seek_frame(input_format_context, stream_id, seek_target, 
+    if (( ret = av_seek_frame(input_format_context, stream_id, seek_target, 
             AVSEEK_FLAG_BACKWARD | AVSEEK_FLAG_FRAME
-            ) < 0 ) ) {
-      Error("Unable to seek in stream");
+            ) ) < 0) {
+      Error("Unable to seek in stream %d", ret);
       return nullptr;
     }
     // Have to grab a frame to update our current frame to know where we are
     get_frame(stream_id);
-    zm_dump_frame(frame, "frame->pts > seek_target, got");
+    if ( is_video_stream(input_format_context->streams[stream_id]) ) {
+      zm_dump_video_frame(frame, "frame->pts > seek_target, got");
+    } else {
+      zm_dump_frame(frame, "frame->pts > seek_target, got");
+    }
+  } else if ( last_seek_request == seek_target ) {
+    // paused case, sending keepalives
+    return frame;
   } // end if frame->pts > seek_target
 
 	last_seek_request = seek_target;
 
   // Seeking seems to typically seek to a keyframe, so then we have to decode until we get the frame we want.
   if ( frame->pts <= seek_target ) {
-    zm_dump_frame(frame, "pts <= seek_target");
+    if ( is_video_stream(input_format_context->streams[stream_id]) ) {
+      zm_dump_video_frame(frame, "pts <= seek_target");
+    } else {
+      zm_dump_frame(frame, "pts <= seek_target");
+    }
     while ( frame && (frame->pts < seek_target) ) {
       if ( !get_frame(stream_id) ) {
         Warning("Got no frame. returning nothing");
diff --git a/src/zm_ffmpeg_input.h b/src/zm_ffmpeg_input.h
index 900f14d4a..5ca5f07dc 100644
--- a/src/zm_ffmpeg_input.h
+++ b/src/zm_ffmpeg_input.h
@@ -1,6 +1,8 @@
 #ifndef ZM_FFMPEG_INPUT_H
 #define ZM_FFMPEG_INPUT_H
 
+#include "zm_define.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -19,16 +21,28 @@ class FFmpeg_Input {
     FFmpeg_Input();
     ~FFmpeg_Input();
 
-    int Open( const char *filename );
+    int Open(const char *filename );
+    int Open(
+        const AVStream *,
+        const AVCodecContext *,
+        const AVStream *,
+        const AVCodecContext *);
     int Close();
-    AVFrame *get_frame( int stream_id=-1 );
-    AVFrame *get_frame( int stream_id, double at );
-    int get_video_stream_id() {
+    AVFrame *get_frame(int stream_id=-1);
+    AVFrame *get_frame(int stream_id, double at);
+    int get_video_stream_id() const {
       return video_stream_id;
     }
-    int get_audio_stream_id() {
+    int get_audio_stream_id() const {
       return audio_stream_id;
     }
+    AVStream *get_video_stream() {
+      return ( video_stream_id >= 0 ) ? input_format_context->streams[video_stream_id] : nullptr;
+    }
+    AVStream *get_audio_stream() {
+      return ( audio_stream_id >= 0 ) ? input_format_context->streams[audio_stream_id] : nullptr;
+    }
+    AVFormatContext *get_format_context() { return input_format_context; };
 
   private:
     typedef struct {
diff --git a/src/zm_ffmpeg_output.cpp b/src/zm_ffmpeg_output.cpp
new file mode 100644
index 000000000..b031399b9
--- /dev/null
+++ b/src/zm_ffmpeg_output.cpp
@@ -0,0 +1,179 @@
+
+#include "zm_ffmpeg_input.h"
+#include "zm_logger.h"
+#include "zm_ffmpeg.h"
+
+FFmpeg_Output::FFmpeg_Output() {
+  input_format_context = NULL;
+  video_stream_id = -1;
+  audio_stream_id = -1;
+
+  FFMPEGInit();
+}
+FFmpeg_Output::~FFmpeg_Output() {
+}
+
+int FFmpeg_Output::Open( const char *filepath ) {
+
+  int error;
+
+  /** Open the input file to read from it. */
+  if ( (error = avformat_open_input( &input_format_context, filepath, NULL, NULL)) < 0 ) {
+
+    Error("Could not open input file '%s' (error '%s')\n",
+        filepath, av_make_error_string(error).c_str() );
+    input_format_context = NULL;
+    return error;
+  } 
+
+  /** Get information on the input file (number of streams etc.). */
+  if ( (error = avformat_find_stream_info(input_format_context, NULL)) < 0 ) {
+    Error( "Could not open find stream info (error '%s')\n",
+        av_make_error_string(error).c_str() );
+    avformat_close_input(&input_format_context);
+    return error;
+  }
+
+  for ( unsigned int i = 0; i < input_format_context->nb_streams; i += 1 ) {
+    if ( is_video_stream( input_format_context->streams[i] ) ) {
+      zm_dump_stream_format(input_format_context, i, 0, 0);
+      if ( video_stream_id == -1 ) {
+        video_stream_id = i;
+        // if we break, then we won't find the audio stream
+      } else {
+        Warning( "Have another video stream." );
+      }
+    } else if ( is_audio_stream( input_format_context->streams[i] ) ) {
+      if ( audio_stream_id == -1 ) {
+        audio_stream_id = i;
+      } else {
+        Warning( "Have another audio stream." );
+      }
+    }
+
+    streams[i].frame_count = 0;
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+    streams[i].context = avcodec_alloc_context3( NULL );
+    avcodec_parameters_to_context( streams[i].context, input_format_context->streams[i]->codecpar );
+#else
+    streams[i].context = input_format_context->streams[i]->codec;
+#endif
+
+    if ( !(streams[i].codec = avcodec_find_decoder(streams[i].context->codec_id)) ) {
+      Error( "Could not find input codec\n");
+      avformat_close_input(&input_format_context);
+      return AVERROR_EXIT;
+    } else {
+      Debug(1, "Using codec (%s) for stream %d", streams[i].codec->name, i );
+    }
+
+    if ((error = avcodec_open2( streams[i].context, streams[i].codec, NULL)) < 0) {
+      Error( "Could not open input codec (error '%s')\n",
+          av_make_error_string(error).c_str() );
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      avcodec_free_context( &streams[i].context );
+#endif
+      avformat_close_input(&input_format_context);
+      return error;
+    }
+  } // end foreach stream
+
+  if ( video_stream_id == -1 )
+    Error( "Unable to locate video stream in %s", filepath );
+  if ( audio_stream_id == -1 )
+    Debug( 3, "Unable to locate audio stream in %s", filepath );
+
+  return 0;
+} // end int FFmpeg_Output::Open( const char * filepath )
+
+AVFrame *FFmpeg_Output::get_frame( int stream_id ) {
+  Debug(1, "Getting frame from stream %d", stream_id );
+
+  int frameComplete = false;
+  AVPacket packet;
+  av_init_packet( &packet );
+  AVFrame *frame = zm_av_frame_alloc();
+  char errbuf[AV_ERROR_MAX_STRING_SIZE];
+
+  while ( !frameComplete ) {
+    int ret = av_read_frame( input_format_context, &packet );
+    if ( ret < 0 ) {
+      av_strerror(ret, errbuf, AV_ERROR_MAX_STRING_SIZE);
+      if (
+          // Check if EOF.
+          (ret == AVERROR_EOF || (input_format_context->pb && input_format_context->pb->eof_reached)) ||
+          // Check for Connection failure.
+          (ret == -110)
+         ) {
+        Info( "av_read_frame returned %s.", errbuf );
+        return NULL;
+      }
+      Error( "Unable to read packet from stream %d: error %d \"%s\".", packet.stream_index, ret, errbuf );
+      return NULL;
+    }
+
+    if ( (stream_id < 0 ) || ( packet.stream_index == stream_id ) ) {
+      Debug(1,"Packet is for our stream (%d)", packet.stream_index );
+
+      AVCodecContext *context = streams[packet.stream_index].context;
+
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+    ret = avcodec_send_packet( context, &packet );
+    if ( ret < 0 ) {
+      av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE );
+      Error( "Unable to send packet at frame %d: %s, continuing", streams[packet.stream_index].frame_count, errbuf );
+      zm_av_packet_unref( &packet );
+      continue;
+    } else {
+      Debug(1, "Success getting a packet");
+    }
+
+#if HAVE_AVUTIL_HWCONTEXT_H
+    if ( hwaccel ) {
+      ret = avcodec_receive_frame( context, hwFrame );
+      if ( ret < 0 ) {
+        av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE );
+        Error( "Unable to receive frame %d: %s, continuing", streams[packet.stream_index].frame_count, errbuf );
+        zm_av_packet_unref( &packet );
+        continue;
+      }
+      ret = av_hwframe_transfer_data(frame, hwFrame, 0);
+      if (ret < 0) {
+        av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE );
+        Error( "Unable to transfer frame at frame %d: %s, continuing", streams[packet.stream_index].frame_count, errbuf );
+        zm_av_packet_unref( &packet );
+        continue;
+      }
+    } else {
+#endif
+      Debug(1,"Getting a frame?");
+      ret = avcodec_receive_frame( context, frame );
+      if ( ret < 0 ) {
+        av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE );
+        Error( "Unable to send packet at frame %d: %s, continuing", streams[packet.stream_index].frame_count, errbuf );
+        zm_av_packet_unref( &packet );
+        continue;
+      }
+
+#if HAVE_AVUTIL_HWCONTEXT_H
+    }
+#endif
+
+    frameComplete = 1;
+# else
+    ret = zm_avcodec_decode_video( streams[packet.stream_index].context, frame, &frameComplete, &packet );
+    if ( ret < 0 ) {
+      av_strerror( ret, errbuf, AV_ERROR_MAX_STRING_SIZE );
+      Error( "Unable to decode frame at frame %d: %s, continuing", streams[packet.stream_index].frame_count, errbuf );
+      zm_av_packet_unref( &packet );
+      continue;
+    }
+#endif
+  } // end if it's the right stream
+
+      zm_av_packet_unref( &packet );
+
+  } // end while ! frameComplete
+  return frame;
+
+} //  end AVFrame *FFmpeg_Output::get_frame
diff --git a/src/zm_ffmpeg_output.h b/src/zm_ffmpeg_output.h
new file mode 100644
index 000000000..76afad0d7
--- /dev/null
+++ b/src/zm_ffmpeg_output.h
@@ -0,0 +1,46 @@
+#ifndef ZM_FFMPEG_INPUT_H
+#define ZM_FFMPEG_INPUT_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "libavformat/avformat.h"
+#include "libavformat/avio.h"
+#include "libavcodec/avcodec.h"
+
+#ifdef __cplusplus
+}
+#endif
+
+class FFmpeg_Output {
+
+  public:
+    FFmpeg_Output();
+    ~FFmpeg_Output();
+
+    int Open( const char *filename );
+    int Close();
+    AVFrame *put_frame( int stream_id=-1 );
+    AVFrame *put_packet( int stream_id=-1 );
+    int get_video_stream_id() {
+      return video_stream_id;
+    }
+    int get_audio_stream_id() {
+      return audio_stream_id;
+    }
+
+  private:
+    typedef struct {
+        AVCodecContext *context;
+        AVCodec *codec;
+        int frame_count;
+    } stream;
+
+    stream streams[2];
+    int video_stream_id;
+    int audio_stream_id;
+    AVFormatContext *input_format_context;
+};
+
+#endif
diff --git a/src/zm_fifo.cpp b/src/zm_fifo.cpp
index 53025f597..731909166 100644
--- a/src/zm_fifo.cpp
+++ b/src/zm_fifo.cpp
@@ -17,117 +17,19 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
+#include "zm_fifo.h"
+
+#include "zm_monitor.h"
+#include "zm_signal.h"
 #include <fcntl.h>
 #include <sys/file.h>
-#include <stdio.h>
-#include <stdarg.h>
-#include <signal.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
-#include "zm.h"
-#include "zm_time.h"
-#include "zm_signal.h"
-#include "zm_monitor.h"
-#include "zm_fifo.h"
 #define RAW_BUFFER 512
-static bool zm_fifodbg_inited = false;
-FILE *zm_fifodbg_log_fd = nullptr;
-char zm_fifodbg_log[PATH_MAX] = "";
+#define PIPE_SIZE 1024*1024
 
-static bool zmFifoDbgOpen() {
-  if ( zm_fifodbg_log_fd )
-    fclose(zm_fifodbg_log_fd);
-  zm_fifodbg_log_fd = nullptr;
-  signal(SIGPIPE, SIG_IGN);
-  FifoStream::fifo_create_if_missing(zm_fifodbg_log);
-  int fd = open(zm_fifodbg_log, O_WRONLY|O_NONBLOCK|O_TRUNC);
-  if ( fd < 0 )
-    return false;
-  int res = flock(fd, LOCK_EX | LOCK_NB);
-  if ( res < 0 ) {
-    close(fd);
-    return false;
-  }
-  zm_fifodbg_log_fd = fdopen(fd, "wb");
-  if ( zm_fifodbg_log_fd == nullptr ) {
-    close(fd);
-    return false;
-  }
-  return true;
-}
-
-int zmFifoDbgInit(Monitor *monitor) {
-  zm_fifodbg_inited = true;
-  snprintf(zm_fifodbg_log, sizeof(zm_fifodbg_log), "%s/%d/dbgpipe.log",
-      monitor->getStorage()->Path(), monitor->Id());
-  zmFifoDbgOpen();
-  return 1;
-}
-
-void zmFifoDbgOutput(
-    int hex,
-    const char * const file,
-    const int line,
-    const int level,
-    const char *fstring,
-    ...
-    ) {
-  char dbg_string[8192];
-  int str_size = sizeof(dbg_string);
-
-  va_list arg_ptr;
-  if ( (!zm_fifodbg_inited) || ( !zm_fifodbg_log_fd && !zmFifoDbgOpen() ) )
-    return;
-
-  char *dbg_ptr = dbg_string;
-  va_start(arg_ptr, fstring);
-  if ( hex ) {
-    unsigned char *data = va_arg(arg_ptr, unsigned char *);
-    int len = va_arg(arg_ptr, int);
-    dbg_ptr += snprintf(dbg_ptr, str_size-(dbg_ptr-dbg_string), "%d:", len);
-    for ( int i = 0; i < len; i++ ) {
-      dbg_ptr += snprintf(dbg_ptr, str_size-(dbg_ptr-dbg_string), " %02x", data[i]);
-    }
-  } else {
-    dbg_ptr += vsnprintf(dbg_ptr, str_size-(dbg_ptr-dbg_string), fstring, arg_ptr);
-  }
-  va_end(arg_ptr);
-  strncpy(dbg_ptr++, "\n", 2);
-  int res = fwrite(dbg_string, dbg_ptr-dbg_string, 1, zm_fifodbg_log_fd);
-  if ( res != 1 ) {
-    fclose(zm_fifodbg_log_fd);
-    zm_fifodbg_log_fd = nullptr;
-  } else {
-    fflush(zm_fifodbg_log_fd);
-  }
-}
-
-bool FifoStream::sendRAWFrames() {
-  static unsigned char buffer[RAW_BUFFER];
-  int fd = open(stream_path, O_RDONLY);
-  if ( fd < 0 ) {
-    Error("Can't open %s: %s", stream_path, strerror(errno));
-    return false;
-  }
-  while ( (bytes_read = read(fd, buffer, RAW_BUFFER)) ) {
-    if ( bytes_read == 0 )
-      continue;
-    if ( bytes_read < 0 ) {
-      Error("Problem during reading: %s", strerror(errno));
-      close(fd);
-      return false;
-    }
-    if ( fwrite(buffer, bytes_read, 1, stdout) != 1 ) {
-      Error("Problem during writing: %s", strerror(errno));
-      close(fd);
-      return false;
-    }
-    fflush(stdout);
-  }
-  close(fd);
-  return true;
-}
-
-void FifoStream::file_create_if_missing(
+void Fifo::file_create_if_missing(
     const char * path,
     bool is_fifo,
     bool delete_fake_fifo
@@ -140,124 +42,147 @@ void FifoStream::file_create_if_missing(
     unlink(path);
   }
   int fd;
-  if ( !is_fifo ) {
+  if (!is_fifo) {
     Debug(5, "Creating non fifo file as requested: %s", path);
-    fd = open(path, O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR);
-    close(fd);
+    fd = ::open(path, O_CREAT|O_WRONLY, S_IRUSR|S_IWUSR);
+    ::close(fd);
     return;
   }
   Debug(5, "Making fifo file of: %s", path);
   mkfifo(path, S_IRUSR|S_IWUSR);
 }
 
-void FifoStream::fifo_create_if_missing(
+void Fifo::fifo_create_if_missing(
     const char * path,
     bool delete_fake_fifo
     ) {
   file_create_if_missing(path, true, delete_fake_fifo);
 }
 
-bool FifoStream::sendMJEGFrames() {
-  static unsigned char buffer[ZM_MAX_IMAGE_SIZE];
-  int fd = open(stream_path, O_RDONLY);
-  if ( fd < 0 ) {
-    Error("Can't open %s: %s", stream_path, strerror(errno));
-    return false;
-  }
-  total_read = 0;
-  while (
-      (bytes_read = read(fd, buffer+total_read, ZM_MAX_IMAGE_SIZE-total_read))
-      ) {
-    if ( bytes_read < 0 ) {
-      Error("Problem during reading: %s", strerror(errno));
-      close(fd);
+Fifo::~Fifo() {
+  close();
+}
+bool Fifo::open() {
+  fifo_create_if_missing(path.c_str());
+  if (!on_blocking_abort) {
+    if ( (outfile = fopen(path.c_str(), "wb")) == nullptr ) {
+      Error("Can't open %s for writing: %s", path.c_str(), strerror(errno));
+      return false;
+    }
+  } else {
+    raw_fd = ::open(path.c_str(), O_WRONLY|O_NONBLOCK|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+    if (raw_fd < 0)
+      return false;
+    outfile = fdopen(raw_fd, "wb");
+    if (outfile == nullptr) {
+      ::close(raw_fd);
+      raw_fd = -1;
       return false;
     }
-    total_read += bytes_read;
   }
-  close(fd);
-
-  if ( (total_read == 0) || (frame_count%frame_mod != 0) )
-    return true;
-
-  if ( fprintf(stdout,
-        "--ZoneMinderFrame\r\n"
-      "Content-Type: image/jpeg\r\n"
-      "Content-Length: %d\r\n\r\n",
-      total_read) < 0 ) {
-    Error("Problem during writing: %s", strerror(errno));
-    return false;
+#ifdef __linux__
+  int ret = fcntl(raw_fd, F_SETPIPE_SZ, PIPE_SIZE);
+  if (ret < 0) {
+    Error("set pipe size failed.");
   }
-
-  if ( fwrite(buffer, total_read, 1, stdout) != 1 ) {
-    Error("Problem during reading: %s", strerror(errno));
-    return false;
+  long pipe_size = (long)fcntl(raw_fd, F_GETPIPE_SZ);
+  if (pipe_size == -1) {
+    Error("get pipe size failed.");
   }
-  fprintf(stdout, "\r\n\r\n");
-  fflush(stdout);
-  last_frame_sent = TV_2_FLOAT(now);
-  frame_count++;
+  Debug(1, "default pipe size: %ld\n", pipe_size);
+#endif
   return true;
 }
 
-void FifoStream::setStreamStart(const char * path) {
-  stream_path = strdup(path);
+bool Fifo::close() {
+  if (outfile) {
+    fclose(outfile);
+  }
+
+  return true;
 }
 
-void FifoStream::setStreamStart(int monitor_id, const char * format) {
-  char diag_path[PATH_MAX];
-  const char * filename;
-  Monitor * monitor = Monitor::Load(monitor_id, false, Monitor::QUERY);
+bool Fifo::writePacket(const ZMPacket &packet) {
+  if (!(outfile or open())) return false;
 
-  if ( !strcmp(format, "reference") ) {
-    stream_type = MJPEG;
-    filename = "diagpipe-r.jpg";
-  } else if ( !strcmp(format, "delta") ) {
-    filename = "diagpipe-d.jpg";
-    stream_type = MJPEG;
-  } else {
-    stream_type = RAW;
-    filename = "dbgpipe.log";
-  }
-
-  snprintf(diag_path, sizeof(diag_path), "%s/%d/%s",
-      monitor->getStorage()->Path(), monitor->Id(), filename);
-  setStreamStart(diag_path);
-}
-
-void FifoStream::runStream() {
-  if ( stream_type == MJPEG ) {
-    fprintf(stdout, "Content-Type: multipart/x-mixed-replace;boundary=ZoneMinderFrame\r\n\r\n");
-  } else {
-    fprintf(stdout, "Content-Type: text/html\r\n\r\n");
-  }
-
-  char lock_file[PATH_MAX];
-  snprintf(lock_file, sizeof(lock_file), "%s.rlock", stream_path);
-  file_create_if_missing(lock_file, false);
-
-  int fd_lock = open(lock_file, O_RDONLY);
-  if ( fd_lock < 0 ) {
-    Error("Can't open %s: %s", lock_file, strerror(errno));
-    return;
-  }
-  int res = flock(fd_lock, LOCK_EX | LOCK_NB);
-  if ( res < 0 ) {
-    Error("Flocking problem on %s: - %s", lock_file, strerror(errno));
-    close(fd_lock);
-    return;
-  }
-
-  while ( !zm_terminate ) {
-    gettimeofday(&now, nullptr);
-    checkCommandQueue();
-    if ( stream_type == MJPEG ) {
-      if ( !sendMJEGFrames() )
-        zm_terminate = true;
+  Debug(2, "Writing header ZM %u %" PRId64,  packet.packet.size, packet.pts);
+  // Going to write a brief header
+  if (fprintf(outfile, "ZM %u %" PRId64 "\n", packet.packet.size, packet.pts) < 0) {
+    if (errno != EAGAIN) {
+      Error("Problem during writing: %s", strerror(errno));
     } else {
-      if ( !sendRAWFrames() )
-        zm_terminate = true;
+      Debug(1, "Problem during writing: %s", strerror(errno));
     }
+    return false;
   }
-  close(fd_lock);
+
+  if (fwrite(packet.packet.data, packet.packet.size, 1, outfile) != 1) {
+    Debug(1, "Unable to write to '%s': %s", path.c_str(), strerror(errno));
+    return false;
+  }
+  return true;
+}
+
+bool Fifo::writePacket(std::string filename, const ZMPacket &packet) {
+  FILE *outfile = nullptr;
+
+  int raw_fd = ::open(filename.c_str(), O_WRONLY|O_NONBLOCK|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+  if (raw_fd < 0)
+    return false;
+  outfile = fdopen(raw_fd, "wb");
+  if (outfile == nullptr) {
+    ::close(raw_fd);
+    return false;
+  }
+
+  Debug(4, "Writing packet of size %d pts %" PRId64, packet.packet.size, packet.pts);
+  if (fwrite(packet.packet.data, packet.packet.size, 1, outfile) != 1) {
+    Debug(1, "Unable to write to '%s': %s", filename.c_str(), strerror(errno));
+    fclose(outfile);
+    return false;
+  }
+
+  fclose(outfile);
+  return true;
+}
+
+bool Fifo::write(uint8_t *data, size_t bytes, int64_t pts) {
+  if (!(outfile or open())) return false;
+  // Going to write a brief header
+  Debug(1, "Writing header ZM %lu %" PRId64,  bytes, pts);
+  if ( fprintf(outfile, "ZM %lu %" PRId64 "\n", bytes, pts) < 0 ) {
+    if (errno != EAGAIN) {
+      Error("Problem during writing: %s", strerror(errno));
+    } else {
+      Debug(1, "Problem during writing: %s", strerror(errno));
+    }
+    return false;
+  }
+  if (fwrite(data, bytes, 1, outfile) != 1) {
+    Debug(1, "Unable to write to '%s': %s", path.c_str(), strerror(errno));
+    return false;
+  }
+  return true;
+}
+
+bool Fifo::write(std::string filename, uint8_t *data, size_t bytes) {
+  FILE *outfile = nullptr;
+
+  int raw_fd = ::open(filename.c_str(), O_WRONLY|O_NONBLOCK|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+  if (raw_fd < 0)
+    return false;
+  outfile = fdopen(raw_fd, "wb");
+  if (outfile == nullptr) {
+    ::close(raw_fd);
+    return false;
+  }
+
+  if (fwrite(data, bytes, 1, outfile) != 1) {
+    Debug(1, "Unable to write to '%s': %s", filename.c_str(), strerror(errno));
+    fclose(outfile);
+    return false;
+  }
+
+  fclose(outfile);
+  return true;
 }
diff --git a/src/zm_fifo.h b/src/zm_fifo.h
index 065fd569c..bd7f23490 100644
--- a/src/zm_fifo.h
+++ b/src/zm_fifo.h
@@ -1,5 +1,5 @@
 //
-// ZoneMinder Fifo Debug
+// ZoneMinder Fifo
 // Copyright (C) 2019 ZoneMinder LLC
 //
 // This program is free software; you can redistribute it and/or
@@ -19,68 +19,51 @@
 #ifndef ZM_FIFO_H
 #define ZM_FIFO_H
 
-#if 0
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <errno.h>
-#include <limits.h>
-#include <time.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-
-#include "zm.h"
-#include "zm_image.h"
-#endif
-#include "zm_monitor.h"
 #include "zm_stream.h"
+#include "zm_packet.h"
 
-#define zmFifoDbgPrintf(level, params...) {\
-  zmFifoDbgOutput(0, __FILE__, __LINE__, level, ##params);\
-  }
+class Monitor;
 
-#ifndef ZM_DBG_OFF
-#define FifoDebug(level, params...) zmFifoDbgPrintf(level, ##params)
-#else
-#define FifoDebug(level, params...)
-#endif
-void zmFifoDbgOutput(
-    int hex,
-    const char * const file,
-    const int line,
-    const int level,
-    const char *fstring,
-    ...) __attribute__((format(printf, 5, 6)));
-int zmFifoDbgInit(Monitor * monitor);
-
-class FifoStream : public StreamBase {
+class Fifo {
  private:
-    char * stream_path;
-    int fd;
-    int total_read;
-    int bytes_read;
-    unsigned int frame_count;
-    static void file_create_if_missing(
-        const char * path,
-        bool is_fifo,
-        bool delete_fake_fifo = true
-        );
-
- protected:
-    typedef enum { MJPEG, RAW } StreamType;
-    StreamType  stream_type;
-    bool sendMJEGFrames();
-    bool sendRAWFrames();
-    void processCommand(const CmdMsg *msg) {}
+   std::string path;
+   bool on_blocking_abort;
+   FILE *outfile;
+   int raw_fd;
 
  public:
-    FifoStream() {}
+   static void file_create_if_missing(
+       const char * path,
+       bool is_fifo,
+       bool delete_fake_fifo = true
+       );
+
+    Fifo() :
+      on_blocking_abort(true),
+      outfile(nullptr),
+      raw_fd(-1)
+    {}
+    Fifo(const char *p_path, bool p_on_blocking_abort) :
+      path(p_path),
+      on_blocking_abort(p_on_blocking_abort),
+      outfile(nullptr),
+      raw_fd(-1)
+    {}
+    ~Fifo();
+
     static void fifo_create_if_missing(
         const char * path,
         bool delete_fake_fifo = true);
-    void setStreamStart(const char * path);
-    void setStreamStart(int monitor_id, const char * format);
-    void runStream();
+
+
+
+    static bool writePacket(std::string filename, const ZMPacket &packet);
+    static bool write(std::string filename, uint8_t *data, size_t size);
+
+    bool open();
+    bool close();
+
+    bool writePacket(const ZMPacket &packet);
+    bool write(uint8_t *data, size_t size, int64_t pts);
 };
 #endif  // ZM_FIFO_H
diff --git a/src/zm_fifo_debug.cpp b/src/zm_fifo_debug.cpp
new file mode 100644
index 000000000..bb82f5ec8
--- /dev/null
+++ b/src/zm_fifo_debug.cpp
@@ -0,0 +1,99 @@
+//
+// ZoneMinder Fifo Debug
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+#include "zm_fifo_debug.h"
+#include "zm_fifo.h"
+#include "zm_monitor.h"
+#include "zm_signal.h"
+#include <fcntl.h>
+#include <sys/file.h>
+#include <unistd.h>
+
+#define RAW_BUFFER 512
+static bool zm_fifodbg_inited = false;
+FILE *zm_fifodbg_log_fd = nullptr;
+char zm_fifodbg_log[PATH_MAX] = "";
+
+static bool zmFifoDbgOpen() {
+  if ( zm_fifodbg_log_fd )
+    fclose(zm_fifodbg_log_fd);
+  zm_fifodbg_log_fd = nullptr;
+  signal(SIGPIPE, SIG_IGN);
+  Fifo::fifo_create_if_missing(zm_fifodbg_log);
+  int fd = open(zm_fifodbg_log, O_WRONLY|O_NONBLOCK|O_TRUNC);
+  if ( fd < 0 )
+    return false;
+  int res = flock(fd, LOCK_EX | LOCK_NB);
+  if ( res < 0 ) {
+    close(fd);
+    return false;
+  }
+  zm_fifodbg_log_fd = fdopen(fd, "wb");
+  if ( zm_fifodbg_log_fd == nullptr ) {
+    close(fd);
+    return false;
+  }
+  return true;
+}
+
+int zmFifoDbgInit(Monitor *monitor) {
+  zm_fifodbg_inited = true;
+  snprintf(zm_fifodbg_log, sizeof(zm_fifodbg_log), "%s/dbgpipe-%u.log",
+      staticConfig.PATH_SOCKS.c_str(), monitor->Id());
+  zmFifoDbgOpen();
+  return 1;
+}
+
+void zmFifoDbgOutput(
+    int hex,
+    const char * const file,
+    const int line,
+    const int level,
+    const char *fstring,
+    ...
+    ) {
+  char dbg_string[8192];
+  int str_size = sizeof(dbg_string);
+
+  va_list arg_ptr;
+  if ( (!zm_fifodbg_inited) || ( !zm_fifodbg_log_fd && !zmFifoDbgOpen() ) )
+    return;
+
+  char *dbg_ptr = dbg_string;
+  va_start(arg_ptr, fstring);
+  if ( hex ) {
+    unsigned char *data = va_arg(arg_ptr, unsigned char *);
+    int len = va_arg(arg_ptr, int);
+    dbg_ptr += snprintf(dbg_ptr, str_size-(dbg_ptr-dbg_string), "%d:", len);
+    for ( int i = 0; i < len; i++ ) {
+      dbg_ptr += snprintf(dbg_ptr, str_size-(dbg_ptr-dbg_string), " %02x", data[i]);
+    }
+  } else {
+    dbg_ptr += vsnprintf(dbg_ptr, str_size-(dbg_ptr-dbg_string), fstring, arg_ptr);
+  }
+  va_end(arg_ptr);
+  strncpy(dbg_ptr++, "\n", 2);
+  int res = fwrite(dbg_string, dbg_ptr-dbg_string, 1, zm_fifodbg_log_fd);
+  if ( res != 1 ) {
+    fclose(zm_fifodbg_log_fd);
+    zm_fifodbg_log_fd = nullptr;
+  } else {
+    fflush(zm_fifodbg_log_fd);
+  }
+}
diff --git a/src/zm_fifo_debug.h b/src/zm_fifo_debug.h
new file mode 100644
index 000000000..08f4c4fb5
--- /dev/null
+++ b/src/zm_fifo_debug.h
@@ -0,0 +1,42 @@
+//
+// ZoneMinder Fifo Debug
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+#ifndef ZM_FIFO_DEBUG_H
+#define ZM_FIFO_DEBUG_H
+
+class Monitor;
+
+#define zmFifoDbgPrintf(level, params...) {\
+  zmFifoDbgOutput(0, __FILE__, __LINE__, level, ##params);\
+  }
+
+#ifndef ZM_DBG_OFF
+#define FifoDebug(level, params...) zmFifoDbgPrintf(level, ##params)
+#else
+#define FifoDebug(level, params...)
+#endif
+void zmFifoDbgOutput(
+    int hex,
+    const char * const file,
+    const int line,
+    const int level,
+    const char *fstring,
+    ...) __attribute__((format(printf, 5, 6)));
+int zmFifoDbgInit(Monitor * monitor);
+
+#endif  // ZM_FIFO_DEBUG_H
diff --git a/src/zm_fifo_stream.cpp b/src/zm_fifo_stream.cpp
new file mode 100644
index 000000000..3035ad6d0
--- /dev/null
+++ b/src/zm_fifo_stream.cpp
@@ -0,0 +1,170 @@
+//
+// ZoneMinder Fifo Debug
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+#include "zm_fifo_stream.h"
+#include "zm_fifo.h"
+#include "zm_monitor.h"
+#include "zm_signal.h"
+#include <fcntl.h>
+#include <sys/file.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#define RAW_BUFFER 512
+bool FifoStream::sendRAWFrames() {
+  static unsigned char buffer[RAW_BUFFER];
+  int fd = open(stream_path, O_RDONLY);
+  if ( fd < 0 ) {
+    Error("Can't open %s: %s", stream_path, strerror(errno));
+    return false;
+  }
+  while ( (bytes_read = read(fd, buffer, RAW_BUFFER)) ) {
+    if ( bytes_read == 0 )
+      continue;
+    if ( bytes_read < 0 ) {
+      Error("Problem during reading: %s", strerror(errno));
+      close(fd);
+      return false;
+    }
+    if ( fwrite(buffer, bytes_read, 1, stdout) != 1 ) {
+      if ( !zm_terminate ) 
+        Error("Problem during writing: %s", strerror(errno));
+      close(fd);
+      return false;
+    }
+    fflush(stdout);
+  }
+  close(fd);
+  return true;
+}
+
+bool FifoStream::sendMJEGFrames() {
+  static unsigned char buffer[ZM_MAX_IMAGE_SIZE];
+  int fd = open(stream_path, O_RDONLY);
+  if ( fd < 0 ) {
+    Error("Can't open %s: %s", stream_path, strerror(errno));
+    return false;
+  }
+  total_read = 0;
+  while (
+      (bytes_read = read(fd, buffer+total_read, ZM_MAX_IMAGE_SIZE-total_read))
+      ) {
+    if ( bytes_read < 0 ) {
+      Error("Problem during reading: %s", strerror(errno));
+      close(fd);
+      return false;
+    }
+    total_read += bytes_read;
+  }
+  close(fd);
+
+  if ( (total_read == 0) || (frame_count%frame_mod != 0) )
+    return true;
+
+  if ( fprintf(stdout,
+        "--" BOUNDARY "\r\n"
+      "Content-Type: image/jpeg\r\n"
+      "Content-Length: %d\r\n\r\n",
+      total_read) < 0 ) {
+    Error("Problem during writing: %s", strerror(errno));
+    return false;
+  }
+
+  if ( fwrite(buffer, total_read, 1, stdout) != 1 ) {
+    Error("Problem during reading: %s", strerror(errno));
+    return false;
+  }
+  fprintf(stdout, "\r\n\r\n");
+  fflush(stdout);
+  last_frame_sent = TV_2_FLOAT(now);
+  frame_count++;
+  return true;
+}
+
+void FifoStream::setStreamStart(const char * path) {
+  stream_path = strdup(path);
+}
+
+void FifoStream::setStreamStart(int monitor_id, const char * format) {
+  char diag_path[PATH_MAX];
+  std::shared_ptr<Monitor> monitor = Monitor::Load(monitor_id, false, Monitor::QUERY);
+
+  if ( !strcmp(format, "reference") ) {
+    snprintf(diag_path, sizeof(diag_path), "%s/diagpipe-r-%u.jpg",
+        staticConfig.PATH_SOCKS.c_str(), monitor->Id());
+    stream_type = MJPEG;
+  } else if ( !strcmp(format, "delta") ) {
+    snprintf(diag_path, sizeof(diag_path), "%s/diagpipe-d-%u.jpg",
+        staticConfig.PATH_SOCKS.c_str(), monitor->Id());
+    stream_type = MJPEG;
+  } else {
+    if ( strcmp(format, "raw") ) {
+      Warning("Unknown or unspecified format.  Defaulting to raw");
+    }
+    snprintf(diag_path, sizeof(diag_path), "%s/dbgpipe-%u.log",
+        staticConfig.PATH_SOCKS.c_str(), monitor->Id());
+    stream_type = RAW;
+  }
+
+  setStreamStart(diag_path);
+}
+
+void FifoStream::runStream() {
+  if ( stream_type == MJPEG ) {
+    fprintf(stdout, "Content-Type: multipart/x-mixed-replace;boundary=" BOUNDARY "\r\n\r\n");
+  } else {
+    fprintf(stdout, "Content-Type: text/html\r\n\r\n");
+  }
+
+  /* only 1 person can read from a fifo at a time, so use a lock */
+  char lock_file[PATH_MAX];
+  snprintf(lock_file, sizeof(lock_file), "%s.rlock", stream_path);
+  Fifo::file_create_if_missing(lock_file, false);
+  Debug(1, "Locking %s", lock_file);
+
+  int fd_lock = open(lock_file, O_RDONLY);
+  if ( fd_lock < 0 ) {
+    Error("Can't open %s: %s", lock_file, strerror(errno));
+    return;
+  }
+  int res = flock(fd_lock, LOCK_EX | LOCK_NB);
+  while ( (res < 0 and errno == EAGAIN) and (! zm_terminate) ) {
+    Warning("Flocking problem on %s: - %s", lock_file, strerror(errno));
+    sleep(1);
+    res = flock(fd_lock, LOCK_EX | LOCK_NB);
+  }
+  if ( res < 0 ) {
+    Error("Flocking problem on %d != %d %s: - %s", EAGAIN, res, lock_file, strerror(errno));
+    close(fd_lock);
+    return;
+  }
+
+  while ( !zm_terminate ) {
+    gettimeofday(&now, nullptr);
+    checkCommandQueue();
+    if ( stream_type == MJPEG ) {
+      if ( !sendMJEGFrames() )
+        zm_terminate = true;
+    } else {
+      if ( !sendRAWFrames() )
+        zm_terminate = true;
+    }
+  }
+  close(fd_lock);
+}
diff --git a/src/zm_fifo_stream.h b/src/zm_fifo_stream.h
new file mode 100644
index 000000000..446108d2c
--- /dev/null
+++ b/src/zm_fifo_stream.h
@@ -0,0 +1,57 @@
+//
+// ZoneMinder Fifo Stream
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+#ifndef ZM_FIFO_STREAM_H
+#define ZM_FIFO_STREAM_H
+
+#include "zm_stream.h"
+
+class Monitor;
+
+class FifoStream : public StreamBase {
+ private:
+    char * stream_path;
+    int total_read;
+    int bytes_read;
+    unsigned int frame_count;
+    static void file_create_if_missing(
+        const char * path,
+        bool is_fifo,
+        bool delete_fake_fifo = true
+        );
+
+ protected:
+    typedef enum { UNKNOWN, MJPEG, RAW } StreamType;
+    StreamType  stream_type;
+    bool sendMJEGFrames();
+    bool sendRAWFrames();
+    void processCommand(const CmdMsg *msg) override {}
+
+ public:
+    FifoStream() : 
+      stream_path(nullptr),
+      total_read(0),
+      bytes_read(0),
+      frame_count(0),
+      stream_type(UNKNOWN)
+    {}
+    void setStreamStart(const char * path);
+    void setStreamStart(int monitor_id, const char * format);
+    void runStream() override;
+};
+#endif  // ZM_FIFO_STREAM_H
diff --git a/src/zm_file_camera.cpp b/src/zm_file_camera.cpp
index d94fce209..af494ce38 100644
--- a/src/zm_file_camera.cpp
+++ b/src/zm_file_camera.cpp
@@ -17,21 +17,14 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/stat.h>
-
-#include "zm.h"
 #include "zm_file_camera.h"
 
+#include "zm_packet.h"
+#include <sys/stat.h>
+#include <unistd.h>
+
 FileCamera::FileCamera(
-    int p_id,
+    const Monitor *monitor,
     const char *p_path,
     int p_width,
     int p_height,
@@ -43,7 +36,7 @@ FileCamera::FileCamera(
     bool p_capture,
     bool p_record_audio)
   : Camera(
-      p_id,
+      monitor,
       FILE_SRC,
       p_width,
       p_height,
@@ -94,8 +87,8 @@ int FileCamera::PreCapture() {
   return 0;
 }
 
-int FileCamera::Capture(Image &image) {
-  return image.ReadJpeg(path, colours, subpixelorder)?1:-1;
+int FileCamera::Capture( ZMPacket &zm_packet ) {
+  return zm_packet.image->ReadJpeg(path, colours, subpixelorder) ? 1 : -1;
 }
 
 int FileCamera::PostCapture() {
diff --git a/src/zm_file_camera.h b/src/zm_file_camera.h
index 84201b872..11a5cfe3f 100644
--- a/src/zm_file_camera.h
+++ b/src/zm_file_camera.h
@@ -21,11 +21,6 @@
 #define ZM_FILE_CAMERA_H
 
 #include "zm_camera.h"
-#include "zm_buffer.h"
-#include "zm_regexp.h"
-#include "zm_packetqueue.h"
-
-#include <sys/param.h>
 
 //
 // Class representing 'file' cameras, i.e. those which are
@@ -36,18 +31,29 @@ protected:
   char path[PATH_MAX];
 
 public:
-  FileCamera( int p_id, const char *p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  FileCamera(
+      const Monitor *monitor,
+      const char *p_path,
+      int p_width,
+      int p_height,
+      int p_colours,
+      int p_brightness,
+      int p_contrast,
+      int p_hue,
+      int p_colour,
+      bool p_capture,
+      bool p_record_audio
+      );
   ~FileCamera();
 
-  const char *Path() const { return( path ); }
+  const char *Path() const { return path; }
 
   void Initialise();
   void Terminate();
-  int PreCapture();
-  int Capture( Image &image );
-  int PostCapture();
-  int CaptureAndRecord( Image &image, timeval recording, char* event_directory ) {return(0);};
-int Close() { return 0; };
+  int PreCapture() override;
+  int Capture(ZMPacket &p) override;
+  int PostCapture() override;
+  int Close() override { return 0; };
 };
 
 #endif // ZM_FILE_CAMERA_H
diff --git a/src/zm_font.cpp b/src/zm_font.cpp
new file mode 100644
index 000000000..7ecaaa6b1
--- /dev/null
+++ b/src/zm_font.cpp
@@ -0,0 +1,122 @@
+/*
+ * This file is part of the ZoneMinder Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "zm_font.h"
+
+#include <cstring>
+#include <fstream>
+
+constexpr uint8 kRequiredZmFntVersion = 1;
+
+constexpr uint8 FontVariant::kMaxNumCodePoints;
+constexpr uint8 FontVariant::kMaxCharHeight;
+constexpr uint8 FontVariant::kMaxCharWidth;
+
+FontVariant::FontVariant() : char_height_(0), char_width_(0), char_padding_(0), codepoint_count_(0) {}
+
+FontVariant::FontVariant(uint16 char_height, uint16 char_width, uint8 char_padding, std::vector<uint64> bitmap)
+    : char_height_(char_height), char_width_(char_width), char_padding_(char_padding), bitmap_(std::move(bitmap)) {
+  if (char_height_ > kMaxCharHeight) {
+    throw std::invalid_argument("char_height > kMaxCharHeight");
+  }
+
+  if (char_width_ > kMaxCharWidth) {
+    throw std::invalid_argument("char_width > kMaxCharWidth");
+  }
+
+  if (bitmap_.size() % char_height_ != 0) {
+    throw std::invalid_argument("bitmap has wrong length");
+  }
+
+  codepoint_count_ = bitmap_.size() / char_height;
+}
+
+nonstd::span<const uint64> FontVariant::GetCodepoint(uint8 idx) const {
+  static constexpr std::array<uint64, kMaxCharHeight> empty_bitmap = {};
+
+  if (idx >= GetCodepointsCount()) {
+    return {empty_bitmap.begin(), GetCharHeight()};
+  }
+
+  return {bitmap_.begin() + (idx * GetCharHeight()), GetCharHeight()};
+}
+
+std::ifstream &operator>>(std::ifstream &stream, FontBitmapHeader &bm_header) {
+  stream.read(reinterpret_cast<char *>(&bm_header), sizeof(bm_header));
+
+  return stream;
+}
+
+std::ifstream &operator>>(std::ifstream &stream, FontFileHeader &header) {
+  stream.read(header.magic, sizeof(header.magic));
+  stream.read(reinterpret_cast<char *>(&header.version), sizeof(header.version));
+  stream.seekg(sizeof(header.pad), std::ifstream::cur);
+
+  for (FontBitmapHeader &bm_header : header.bitmap_header)
+    stream >> bm_header;
+
+  return stream;
+}
+
+FontLoadError ZmFont::LoadFontFile(const std::string &loc) {
+  std::ifstream font_file(loc, std::ifstream::binary);
+  font_file.exceptions(std::ifstream::badbit);
+
+  if (!font_file.is_open()) {
+    return FontLoadError::kFileNotFound;
+  }
+
+  FontFileHeader file_header = {};
+  font_file >> file_header;
+
+  if (font_file.fail()) {
+    return FontLoadError::kInvalidFile;
+  }
+
+  if (memcmp(file_header.magic, "ZMFNT", 5) != 0 || file_header.version != kRequiredZmFntVersion) {
+    return FontLoadError::kInvalidFile;
+  }
+
+  for (int i = 0; i < kNumFontSizes; i++) {
+    FontBitmapHeader bitmap_header = file_header.bitmap_header[i];
+
+    if (bitmap_header.char_width > FontVariant::kMaxCharWidth
+        || bitmap_header.char_height > FontVariant::kMaxCharHeight
+        || bitmap_header.number_of_code_points > FontVariant::kMaxNumCodePoints) {
+      return FontLoadError::kInvalidFile;
+    }
+
+    std::vector<uint64> bitmap;
+    bitmap.resize(bitmap_header.number_of_code_points * bitmap_header.char_height);
+
+    std::size_t bitmap_bytes = bitmap.size() * sizeof(uint64);
+    font_file.read(reinterpret_cast<char *>(bitmap.data()), static_cast<std::streamsize>(bitmap_bytes));
+
+    variants_[i] =
+        {bitmap_header.char_height, bitmap_header.char_width, bitmap_header.char_padding, std::move(bitmap)};
+  }
+
+  if (font_file.fail()) {
+    return FontLoadError::kInvalidFile;
+  }
+
+  return FontLoadError::kOk;
+}
+
+const FontVariant &ZmFont::GetFontVariant(uint8 idx) const {
+  return variants_.at(idx);
+}
diff --git a/src/zm_font.h b/src/zm_font.h
index cdad72dc4..b606108b2 100644
--- a/src/zm_font.h
+++ b/src/zm_font.h
@@ -1,3337 +1,93 @@
-/**********************************************/
-/*                      */
-/*     Font file generated by rthelen     */
-/*                      */
-/**********************************************/
-
-static unsigned char fontdata[] = {
-
-  /* 0 0x00 '^A' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 1 0x01 '^B' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 2 0x02 '^C' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 3 0x03 '^D' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 4 0x04 '^E' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 5 0x05 '^F' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 6 0x06 '^G' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 7 0x07 '^H' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 8 0x08 '^I' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 9 0x09 '^J' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 10 0x0a '^K' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 11 0x0b '^L' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 12 0x0c '^M' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 13 0x0d '^N' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 14 0x0e '^O' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 15 0x0f '^P' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 16 0x10 '^Q' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 17 0x11 '^R' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x28, /* 00 0 000 */
-  0x54, /* 0 0 0 00 */
-  0x38, /* 00   000 */
-  0x54, /* 0 0 0 00 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 18 0x12 '^S' */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x50, /* 0 0 0000 */
-  0x50, /* 0 0 0000 */
-  0x20, /* 00 00000 */
-  0x20, /* 00 00000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 19 0x13 '^T' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x7c, /* 0   00 */
-  0x38, /* 00   000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 20 0x14 '^U' */
-  0x18, /* 000  000 */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x7c, /* 0   00 */
-  0x78, /* 0  000 */
-  0x78, /* 0  000 */
-  0x7c, /* 0   00 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 21 0x15 '^V' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 22 0x16 '^W' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 23 0x17 '^X' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 24 0x18 '^Y' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 25 0x19 '^Z' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 26 0x1a '^[' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 27 0x1b '^\' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 28 0x1c '^]' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 29 0x1d '^^' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 30 0x1e '^_' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 31 0x1f '^`' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 32 0x20 ' ' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 33 0x21 '!' */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 34 0x22 '"' */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 35 0x23 '#' */
-  0x00, /* 00000000 */
-  0x28, /* 00 0 000 */
-  0x7c, /* 0   00 */
-  0x28, /* 00 0 000 */
-  0x7c, /* 0   00 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 36 0x24 '$' */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x54, /* 0 0 0 00 */
-  0x50, /* 0 0 0000 */
-  0x38, /* 00   000 */
-  0x14, /* 000 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x38, /* 00   000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 37 0x25 '%' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x54, /* 0 0 0 00 */
-  0x58, /* 0 0  000 */
-  0x28, /* 00 0 000 */
-  0x34, /* 00  0 00 */
-  0x54, /* 0 0 0 00 */
-  0x48, /* 0 00 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 38 0x26 '&' */
-  0x00, /* 00000000 */
-  0x30, /* 00  0000 */
-  0x48, /* 0 00 000 */
-  0x50, /* 0 0 0000 */
-  0x20, /* 00 00000 */
-  0x54, /* 0 0 0 00 */
-  0x48, /* 0 00 000 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 39 0x27 ''' */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 40 0x28 '(' */
-  0x04, /* 00000 00 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x04, /* 00000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 41 0x29 ')' */
-  0x20, /* 00 00000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 42 0x2a '*' */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x54, /* 0 0 0 00 */
-  0x38, /* 00   000 */
-  0x54, /* 0 0 0 00 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 43 0x2b '+' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x7c, /* 0   00 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 44 0x2c ',' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x30, /* 00  0000 */
-  0x30, /* 00  0000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x00, /* 00000000 */
-
-  /* 45 0x2d '-' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 46 0x2e '.' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x18, /* 000  000 */
-  0x18, /* 000  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 47 0x2f '/' */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x20, /* 00 00000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x00, /* 00000000 */
-
-  /* 48 0x30 '0' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x54, /* 0 0 0 00 */
-  0x64, /* 0  00 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 49 0x31 '1' */
-  0x00, /* 00000000 */
-  0x08, /* 0000 000 */
-  0x18, /* 000  000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x1c, /* 000   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 50 0x32 '2' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x04, /* 00000 00 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 51 0x33 '3' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x04, /* 00000 00 */
-  0x18, /* 000  000 */
-  0x04, /* 00000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 52 0x34 '4' */
-  0x00, /* 00000000 */
-  0x08, /* 0000 000 */
-  0x18, /* 000  000 */
-  0x28, /* 00 0 000 */
-  0x48, /* 0 00 000 */
-  0x7c, /* 0   00 */
-  0x08, /* 0000 000 */
-  0x1c, /* 000   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 53 0x35 '5' */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x40, /* 0 000000 */
-  0x78, /* 0  000 */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 54 0x36 '6' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x40, /* 0 000000 */
-  0x78, /* 0  000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 55 0x37 '7' */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 56 0x38 '8' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 57 0x39 '9' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x3c, /* 00  00 */
-  0x04, /* 00000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 58 0x3a ':' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x18, /* 000  000 */
-  0x18, /* 000  000 */
-  0x00, /* 00000000 */
-  0x18, /* 000  000 */
-  0x18, /* 000  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 59 0x3b ';' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x30, /* 00  0000 */
-  0x30, /* 00  0000 */
-  0x00, /* 00000000 */
-  0x30, /* 00  0000 */
-  0x30, /* 00  0000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x00, /* 00000000 */
-
-  /* 60 0x3c '<' */
-  0x00, /* 00000000 */
-  0x04, /* 00000 00 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x04, /* 00000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 61 0x3d '=' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 62 0x3e '>' */
-  0x00, /* 00000000 */
-  0x20, /* 00 00000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x04, /* 00000 00 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 63 0x3f '?' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x04, /* 00000 00 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 64 0x40 '@' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x74, /* 0   0 00 */
-  0x54, /* 0 0 0 00 */
-  0x78, /* 0  000 */
-  0x40, /* 0 000000 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 65 0x41 'A' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 66 0x42 'B' */
-  0x00, /* 00000000 */
-  0x78, /* 0  000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x78, /* 0  000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x78, /* 0  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 67 0x43 'C' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 68 0x44 'D' */
-  0x00, /* 00000000 */
-  0x78, /* 0  000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x78, /* 0  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 69 0x45 'E' */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x78, /* 0  000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 70 0x46 'F' */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x78, /* 0  000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 71 0x47 'G' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x40, /* 0 000000 */
-  0x4c, /* 0 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 72 0x48 'H' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 73 0x49 'I' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 74 0x4a 'J' */
-  0x00, /* 00000000 */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 75 0x4b 'K' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x48, /* 0 00 000 */
-  0x50, /* 0 0 0000 */
-  0x60, /* 0  00000 */
-  0x50, /* 0 0 0000 */
-  0x48, /* 0 00 000 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 76 0x4c 'L' */
-  0x00, /* 00000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 77 0x4d 'M' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x6c, /* 0  0  00 */
-  0x54, /* 0 0 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 78 0x4e 'N' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x64, /* 0  00 00 */
-  0x54, /* 0 0 0 00 */
-  0x4c, /* 0 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 79 0x4f 'O' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 80 0x50 'P' */
-  0x00, /* 00000000 */
-  0x78, /* 0  000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x78, /* 0  000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 81 0x51 'Q' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x54, /* 0 0 0 00 */
-  0x38, /* 00   000 */
-  0x04, /* 00000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 82 0x52 'R' */
-  0x00, /* 00000000 */
-  0x78, /* 0  000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x78, /* 0  000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 83 0x53 'S' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x40, /* 0 000000 */
-  0x38, /* 00   000 */
-  0x04, /* 00000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 84 0x54 'T' */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 85 0x55 'U' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 86 0x56 'V' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x28, /* 00 0 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 87 0x57 'W' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x54, /* 0 0 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x6c, /* 0  0  00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 88 0x58 'X' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x28, /* 00 0 000 */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 89 0x59 'Y' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x28, /* 00 0 000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 90 0x5a 'Z' */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x04, /* 00000 00 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x40, /* 0 000000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 91 0x5b '[' */
-  0x0c, /* 0000  00 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x0c, /* 0000  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 92 0x5c '\' */
-  0x20, /* 00 00000 */
-  0x20, /* 00 00000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x02, /* 000000 0 */
-  0x02, /* 000000 0 */
-  0x00, /* 00000000 */
-
-  /* 93 0x5d ']' */
-  0x30, /* 00  0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x30, /* 00  0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 94 0x5e '^' */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 95 0x5f '_' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x7e, /* 0    0 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 96 0x60 '`' */
-  0x20, /* 00 00000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 97 0x61 'a' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 98 0x62 'b' */
-  0x00, /* 00000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x78, /* 0  000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x78, /* 0  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 99 0x63 'c' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x40, /* 0 000000 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 100 0x64 'd' */
-  0x00, /* 00000000 */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x3c, /* 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 101 0x65 'e' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x40, /* 0 000000 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 102 0x66 'f' */
-  0x00, /* 00000000 */
-  0x0c, /* 0000  00 */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 103 0x67 'g' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x3c, /* 00  00 */
-  0x04, /* 00000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-
-  /* 104 0x68 'h' */
-  0x00, /* 00000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x78, /* 0  000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 105 0x69 'i' */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x30, /* 00  0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 106 0x6a 'j' */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x30, /* 00  0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x60, /* 0  00000 */
-  0x00, /* 00000000 */
-
-  /* 107 0x6b 'k' */
-  0x00, /* 00000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x48, /* 0 00 000 */
-  0x50, /* 0 0 0000 */
-  0x70, /* 0   0000 */
-  0x48, /* 0 00 000 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 108 0x6c 'l' */
-  0x00, /* 00000000 */
-  0x30, /* 00  0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 109 0x6d 'm' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x78, /* 0  000 */
-  0x54, /* 0 0 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 110 0x6e 'n' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x58, /* 0 0  000 */
-  0x64, /* 0  00 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 111 0x6f 'o' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 112 0x70 'p' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x78, /* 0  000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x78, /* 0  000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x00, /* 00000000 */
-
-  /* 113 0x71 'q' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x3c, /* 00  00 */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x00, /* 00000000 */
-
-  /* 114 0x72 'r' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x58, /* 0 0  000 */
-  0x64, /* 0  00 00 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 115 0x73 's' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x40, /* 0 000000 */
-  0x38, /* 00   000 */
-  0x04, /* 00000 00 */
-  0x78, /* 0  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 116 0x74 't' */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x0c, /* 0000  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 117 0x75 'u' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 118 0x76 'v' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x28, /* 00 0 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 119 0x77 'w' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x54, /* 0 0 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 120 0x78 'x' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x28, /* 00 0 000 */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 121 0x79 'y' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x3c, /* 00  00 */
-  0x04, /* 00000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-
-  /* 122 0x7a 'z' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 123 0x7b '{' */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x04, /* 00000 00 */
-  0x00, /* 00000000 */
-
-  /* 124 0x7c '|' */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 125 0x7d '}' */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x00, /* 00000000 */
-
-  /* 126 0x7e '~' */
-  0x00, /* 00000000 */
-  0x34, /* 00  0 00 */
-  0x58, /* 0 0  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 127 0x7f '^?' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 128 0x80 '\200' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 129 0x81 '\201' */
-  0x28, /* 00 0 000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 130 0x82 '\202' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 131 0x83 '\203' */
-  0x10, /* 000 0000 */
-  0x7c, /* 0   00 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x78, /* 0  000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 132 0x84 '\204' */
-  0x58, /* 0 0  000 */
-  0x44, /* 0 000 00 */
-  0x64, /* 0  00 00 */
-  0x54, /* 0 0 0 00 */
-  0x4c, /* 0 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 133 0x85 '\205' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 134 0x86 '\206' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 135 0x87 '\207' */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 136 0x88 '\210' */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 137 0x89 '\211' */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 138 0x8a '\212' */
-  0x00, /* 00000000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 139 0x8b '\213' */
-  0x34, /* 00  0 00 */
-  0x58, /* 0 0  000 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 140 0x8c '\214' */
-  0x18, /* 000  000 */
-  0x24, /* 00 00 00 */
-  0x18, /* 000  000 */
-  0x3c, /* 00  00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 141 0x8d '\215' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x3c, /* 00  00 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x00, /* 00000000 */
-
-  /* 142 0x8e '\216' */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x40, /* 0 000000 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 143 0x8f '\217' */
-  0x20, /* 00 00000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x40, /* 0 000000 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 144 0x90 '\220' */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x40, /* 0 000000 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 145 0x91 '\221' */
-  0x00, /* 00000000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x40, /* 0 000000 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 146 0x92 '\222' */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 147 0x93 '\223' */
-  0x20, /* 00 00000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 148 0x94 '\224' */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 149 0x95 '\225' */
-  0x00, /* 00000000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 150 0x96 '\226' */
-  0x34, /* 00  0 00 */
-  0x58, /* 0 0  000 */
-  0x00, /* 00000000 */
-  0x58, /* 0 0  000 */
-  0x64, /* 0  00 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 151 0x97 '\227' */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 152 0x98 '\230' */
-  0x20, /* 00 00000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 153 0x99 '\231' */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 154 0x9a '\232' */
-  0x00, /* 00000000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 155 0x9b '\233' */
-  0x34, /* 00  0 00 */
-  0x58, /* 0 0  000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 156 0x9c '\234' */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 157 0x9d '\235' */
-  0x20, /* 00 00000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 158 0x9e '\236' */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 159 0x9f '\237' */
-  0x00, /* 00000000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x34, /* 00  0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 160 0xa0 '\240' */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 161 0xa1 '\241' */
-  0x18, /* 000  000 */
-  0x24, /* 00 00 00 */
-  0x24, /* 00 00 00 */
-  0x18, /* 000  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 162 0xa2 '\242' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x54, /* 0 0 0 00 */
-  0x50, /* 0 0 0000 */
-  0x54, /* 0 0 0 00 */
-  0x38, /* 00   000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 163 0xa3 '\243' */
-  0x30, /* 00  0000 */
-  0x48, /* 0 00 000 */
-  0x40, /* 0 000000 */
-  0x70, /* 0   0000 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x44, /* 0 000 00 */
-  0x78, /* 0  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 164 0xa4 '\244' */
-  0x44, /* 0 000 00 */
-  0x24, /* 00 00 00 */
-  0x50, /* 0 0 0000 */
-  0x48, /* 0 00 000 */
-  0x24, /* 00 00 00 */
-  0x14, /* 000 0 00 */
-  0x48, /* 0 00 000 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 165 0xa5 '\245' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x7c, /* 0   00 */
-  0x7c, /* 0   00 */
-  0x7c, /* 0   00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 166 0xa6 '\246' */
-  0x3c, /* 00  00 */
-  0x54, /* 0 0 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x54, /* 0 0 0 00 */
-  0x3c, /* 00  00 */
-  0x14, /* 000 0 00 */
-  0x14, /* 000 0 00 */
-  0x14, /* 000 0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 167 0xa7 '\247' */
-  0x18, /* 000  000 */
-  0x24, /* 00 00 00 */
-  0x44, /* 0 000 00 */
-  0x48, /* 0 00 000 */
-  0x48, /* 0 00 000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x58, /* 0 0  000 */
-  0x40, /* 0 000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 168 0xa8 '\250' */
-  0x00, /* 00000000 */
-  0x70, /* 0   0000 */
-  0x08, /* 0000 000 */
-  0x64, /* 0  00 00 */
-  0x54, /* 0 0 0 00 */
-  0x64, /* 0  00 00 */
-  0x58, /* 0 0  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 169 0xa9 '\251' */
-  0x00, /* 00000000 */
-  0x70, /* 0   0000 */
-  0x08, /* 0000 000 */
-  0x34, /* 00  0 00 */
-  0x44, /* 0 000 00 */
-  0x34, /* 00  0 00 */
-  0x08, /* 0000 000 */
-  0x70, /* 0   0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 170 0xaa '\252' */
-  0x00, /* 00000000 */
-  0x7a, /* 0  0 0 */
-  0x2e, /* 00 0   0 */
-  0x2e, /* 00 0   0 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 171 0xab '\253' */
-  0x00, /* 00000000 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 172 0xac '\254' */
-  0x00, /* 00000000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 173 0xad '\255' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x08, /* 0000 000 */
-  0x7c, /* 0   00 */
-  0x10, /* 000 0000 */
-  0x7c, /* 0   00 */
-  0x20, /* 00 00000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 174 0xae '\256' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x50, /* 0 0 0000 */
-  0x50, /* 0 0 0000 */
-  0x78, /* 0  000 */
-  0x50, /* 0 0 0000 */
-  0x50, /* 0 0 0000 */
-  0x5c, /* 0 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 175 0xaf '\257' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x4c, /* 0 00  00 */
-  0x54, /* 0 0 0 00 */
-  0x64, /* 0  00 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 176 0xb0 '\260' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x6c, /* 0  0  00 */
-  0x54, /* 0 0 0 00 */
-  0x6c, /* 0  0  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 177 0xb1 '\261' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x7c, /* 0   00 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 178 0xb2 '\262' */
-  0x00, /* 00000000 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 179 0xb3 '\263' */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x04, /* 00000 00 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x1c, /* 000   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 180 0xb4 '\264' */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x28, /* 00 0 000 */
-  0x7c, /* 0   00 */
-  0x10, /* 000 0000 */
-  0x7c, /* 0   00 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 181 0xb5 '\265' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x48, /* 0 00 000 */
-  0x48, /* 0 00 000 */
-  0x48, /* 0 00 000 */
-  0x48, /* 0 00 000 */
-  0x74, /* 0   0 00 */
-  0x40, /* 0 000000 */
-  0x40, /* 0 000000 */
-  0x00, /* 00000000 */
-
-  /* 182 0xb6 '\266' */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x0c, /* 0000  00 */
-  0x14, /* 000 0 00 */
-  0x24, /* 00 00 00 */
-  0x24, /* 00 00 00 */
-  0x18, /* 000  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 183 0xb7 '\267' */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x24, /* 00 00 00 */
-  0x10, /* 000 0000 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x24, /* 00 00 00 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 184 0xb8 '\270' */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 185 0xb9 '\271' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 186 0xba '\272' */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x60, /* 0  00000 */
-  0x00, /* 00000000 */
-
-  /* 187 0xbb '\273' */
-  0x00, /* 00000000 */
-  0x1c, /* 000   00 */
-  0x24, /* 00 00 00 */
-  0x24, /* 00 00 00 */
-  0x1c, /* 000   00 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 188 0xbc '\274' */
-  0x00, /* 00000000 */
-  0x18, /* 000  000 */
-  0x24, /* 00 00 00 */
-  0x24, /* 00 00 00 */
-  0x18, /* 000  000 */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 189 0xbd '\275' */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x28, /* 00 0 000 */
-  0x6c, /* 0  0  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 190 0xbe '\276' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x54, /* 0 0 0 00 */
-  0x5c, /* 0 0   00 */
-  0x50, /* 0 0 0000 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 191 0xbf '\277' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x4c, /* 0 00  00 */
-  0x54, /* 0 0 0 00 */
-  0x64, /* 0  00 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 192 0xc0 '\300' */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x20, /* 00 00000 */
-  0x40, /* 0 000000 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 193 0xc1 '\301' */
-  0x00, /* 00000000 */
-  0x08, /* 0000 000 */
-  0x00, /* 00000000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x08, /* 0000 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 194 0xc2 '\302' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x04, /* 00000 00 */
-  0x04, /* 00000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 195 0xc3 '\303' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x0c, /* 0000  00 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x50, /* 0 0 0000 */
-  0x20, /* 00 00000 */
-  0x20, /* 00 00000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 196 0xc4 '\304' */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x60, /* 0  00000 */
-  0x00, /* 00000000 */
-
-  /* 197 0xc5 '\305' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x04, /* 00000 00 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x40, /* 0 000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 198 0xc6 '\306' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 199 0xc7 '\307' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x24, /* 00 00 00 */
-  0x48, /* 0 00 000 */
-  0x48, /* 0 00 000 */
-  0x24, /* 00 00 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 200 0xc8 '\310' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x48, /* 0 00 000 */
-  0x24, /* 00 00 00 */
-  0x24, /* 00 00 00 */
-  0x48, /* 0 00 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 201 0xc9 '\311' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x54, /* 0 0 0 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 202 0xca '\312' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 203 0xcb '\313' */
-  0x10, /* 000 0000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 204 0xcc '\314' */
-  0x58, /* 0 0  000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x7c, /* 0   00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 205 0xcd '\315' */
-  0x58, /* 0 0  000 */
-  0x38, /* 00   000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 206 0xce '\316' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x50, /* 0 0 0000 */
-  0x50, /* 0 0 0000 */
-  0x58, /* 0 0  000 */
-  0x50, /* 0 0 0000 */
-  0x50, /* 0 0 0000 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 207 0xcf '\317' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x28, /* 00 0 000 */
-  0x54, /* 0 0 0 00 */
-  0x5c, /* 0 0   00 */
-  0x50, /* 0 0 0000 */
-  0x2c, /* 00 0  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 208 0xd0 '\320' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 209 0xd1 '\321' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x7e, /* 0    0 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 210 0xd2 '\322' */
-  0x00, /* 00000000 */
-  0x14, /* 000 0 00 */
-  0x28, /* 00 0 000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 211 0xd3 '\323' */
-  0x00, /* 00000000 */
-  0x14, /* 000 0 00 */
-  0x14, /* 000 0 00 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 212 0xd4 '\324' */
-  0x00, /* 00000000 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x18, /* 000  000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 213 0xd5 '\325' */
-  0x00, /* 00000000 */
-  0x18, /* 000  000 */
-  0x08, /* 0000 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 214 0xd6 '\326' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x7c, /* 0   00 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 215 0xd7 '\327' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x10, /* 000 0000 */
-  0x28, /* 00 0 000 */
-  0x44, /* 0 000 00 */
-  0x28, /* 00 0 000 */
-  0x10, /* 000 0000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 216 0xd8 '\330' */
-  0x00, /* 00000000 */
-  0x28, /* 00 0 000 */
-  0x00, /* 00000000 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x44, /* 0 000 00 */
-  0x3c, /* 00  00 */
-  0x04, /* 00000 00 */
-  0x38, /* 00   000 */
-  0x00, /* 00000000 */
-
-  /* 217 0xd9 '\331' */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x7e, /* 0    0 */
-  0x00, /* 00000000 */
-  0x7e, /* 0    0 */
-  0x00, /* 00000000 */
-  0x7e, /* 0    0 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 218 0xda '\332' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 219 0xdb '\333' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 220 0xdc '\334' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 221 0xdd '\335' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 222 0xde '\336' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 223 0xdf '\337' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 224 0xe0 '\340' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 225 0xe1 '\341' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 226 0xe2 '\342' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 227 0xe3 '\343' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 228 0xe4 '\344' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 229 0xe5 '\345' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 230 0xe6 '\346' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 231 0xe7 '\347' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 232 0xe8 '\350' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 233 0xe9 '\351' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 234 0xea '\352' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 235 0xeb '\353' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 236 0xec '\354' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 237 0xed '\355' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 238 0xee '\356' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 239 0xef '\357' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 240 0xf0 '\360' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 241 0xf1 '\361' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 242 0xf2 '\362' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 243 0xf3 '\363' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 244 0xf4 '\364' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 245 0xf5 '\365' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 246 0xf6 '\366' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 247 0xf7 '\367' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 248 0xf8 '\370' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 249 0xf9 '\371' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 250 0xfa '\372' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 251 0xfb '\373' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 252 0xfc '\374' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 253 0xfd '\375' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 254 0xfe '\376' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
-  /* 255 0xff '\377' */
-  0x00, /* 00000000 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x3c, /* 00  00 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-  0x00, /* 00000000 */
-
+/*
+ * This file is part of the ZoneMinder Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef ZM_FONT_H
+#define ZM_FONT_H
+
+#include "zm_define.h"
+#include <array>
+#include <cassert>
+#include "span.hpp"
+#include <string>
+#include <vector>
+
+constexpr uint8 kNumFontSizes = 4;
+
+enum class FontLoadError {
+  kOk,
+  kFileNotFound,
+  kInvalidFile
 };
+
+#pragma pack(push, 1)
+struct FontBitmapHeader {
+  uint16 char_height; // height of every character
+  uint16 char_width; // width of every character
+  uint32 number_of_code_points; // number of codepoints; max. 255 for now
+  uint32 idx; // offset in data where data for the bitmap starts; not used
+  uint8 char_padding; // padding around characters
+  uint8 pad[3]; // struct padding
+};
+#pragma pack(pop)
+
+#pragma pack(push, 1)
+struct FontFileHeader {
+  char magic[6]; // "ZMFNT\0"
+  uint8 version;
+  uint8 pad;
+  std::array<FontBitmapHeader, kNumFontSizes> bitmap_header;
+};
+#pragma pack(pop)
+
+class FontVariant {
+ public:
+  static constexpr uint8 kMaxNumCodePoints = 255;
+  // height cannot be greater than 200 (arbitrary number; shouldn't need more than this)
+  static constexpr uint8 kMaxCharHeight = 200;
+  // character width can't be greater than 64 as a row is represented as an uint64
+  static constexpr uint8 kMaxCharWidth = 64;
+
+  FontVariant();
+  FontVariant(uint16 char_height, uint16 char_width, uint8 char_padding, std::vector<uint64> bitmap);
+
+  uint16 GetCharHeight() const { return char_height_; }
+  uint16 GetCharWidth() const { return char_width_; }
+  uint8 GetCharPadding() const { return char_padding_; }
+  uint8 GetCodepointsCount() const { return codepoint_count_; }
+
+  // Returns the bitmap of the codepoint `idx`. If `idx` is greater than `GetCodepointsCount`
+  // a all-zero bitmap with `GetCharHeight` elements is returned.
+  nonstd::span<const uint64> GetCodepoint(uint8 idx) const;
+
+ private:
+  uint16 char_height_;
+  uint16 char_width_;
+  uint8 char_padding_;
+  uint8 codepoint_count_;
+  std::vector<uint64> bitmap_;
+};
+
+class ZmFont {
+ public:
+  FontLoadError LoadFontFile(const std::string &loc);
+  const FontVariant &GetFontVariant(uint8 idx) const;
+
+ private:
+  std::array<FontVariant, kNumFontSizes> variants_;
+};
+
+#endif
diff --git a/src/zm_frame.cpp b/src/zm_frame.cpp
index bf47bdbf5..f6c0e296d 100644
--- a/src/zm_frame.cpp
+++ b/src/zm_frame.cpp
@@ -1,18 +1,16 @@
 #include "zm_frame.h"
 
-Frame::Frame(
-    event_id_t p_event_id,
-    int p_frame_id,
-    FrameType p_type,
-    struct timeval p_timestamp,
-    struct DeltaTimeval p_delta,
-    int p_score
-    ) : 
-      event_id(p_event_id),
+Frame::Frame(event_id_t p_event_id,
+             int p_frame_id,
+             FrameType p_type,
+             struct timeval p_timestamp,
+             struct DeltaTimeval &p_delta,
+             int p_score,
+             std::vector<ZoneStats> p_stats)
+    : event_id(p_event_id),
       frame_id(p_frame_id),
       type(p_type),
       timestamp(p_timestamp),
       delta(p_delta),
-      score(p_score)
-{
-}
+      score(p_score),
+      zone_stats(std::move(p_stats)) {}
diff --git a/src/zm_frame.h b/src/zm_frame.h
index 84190e779..8f5a7e9cc 100644
--- a/src/zm_frame.h
+++ b/src/zm_frame.h
@@ -20,35 +20,40 @@
 #ifndef ZM_FRAME_H
 #define ZM_FRAME_H
 
-#include <sys/time.h>
-#include <sys/types.h>
-class Frame;
-
 #include "zm_event.h"
 #include "zm_time.h"
+#include "zm_zone.h"
+
+#include <sys/time.h>
+#include <vector>
+
+enum FrameType {
+  NORMAL = 0,
+  BULK,
+  ALARM
+};
 
 //
 // This describes a frame record
 //
 class Frame {
+ public:
+  Frame(event_id_t p_event_id,
+        int p_frame_id,
+        FrameType p_type,
+        struct timeval p_timestamp,
+        struct DeltaTimeval &p_delta,
+        int p_score,
+        std::vector<ZoneStats> p_stats
+  );
 
-public:
-  Frame(
-     event_id_t           p_event_id,
-     int                  p_frame_id,
-     FrameType            p_type,
-     struct timeval       p_timestamp,
-     struct DeltaTimeval  p_delta,
-     int                  p_score
-     );
-
-  event_id_t     event_id;
-  int            frame_id;
-  FrameType      type;
+  event_id_t event_id;
+  int frame_id;
+  FrameType type;
   struct timeval timestamp;
-  struct DeltaTimeval  delta;
+  struct DeltaTimeval delta;
   int score;
-
+  std::vector<ZoneStats> zone_stats;
 };
 
 #endif // ZM_FRAME_H
diff --git a/src/zm_group.cpp b/src/zm_group.cpp
index 070d3b571..b2fc43e5f 100644
--- a/src/zm_group.cpp
+++ b/src/zm_group.cpp
@@ -15,15 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/ 
-
-#include "zm.h"
-#include "zm_db.h"
+*/
 
 #include "zm_group.h"
 
-#include <string.h>
-#include <stdlib.h>
+#include "zm_logger.h"
+#include <cstring>
 
 Group::Group() {
 	Warning("Instantiating default Group Object. Should not happen.");
@@ -33,7 +30,7 @@ Group::Group() {
 }
 
 // The order of columns is: Id, ParentId, Name
-Group::Group(MYSQL_ROW &dbrow) {
+Group::Group(const MYSQL_ROW &dbrow) {
 	unsigned int index = 0;
 	id = atoi(dbrow[index++]);
 	parent_id = dbrow[index] ? atoi(dbrow[index]): 0; index++;
@@ -46,11 +43,11 @@ Group::Group(unsigned int p_id) {
 
 	if ( p_id ) {
 		char sql[ZM_SQL_SML_BUFSIZ];
-		snprintf(sql, sizeof(sql), "SELECT `Id`, `ParentId`, `Name` FROM `Group` WHERE `Id`=%d", p_id);
-		Debug(2,"Loading Group for %d using %s", p_id, sql);
+		snprintf(sql, sizeof(sql), "SELECT `Id`, `ParentId`, `Name` FROM `Group` WHERE `Id`=%u", p_id);
+		Debug(2,"Loading Group for %u using %s", p_id, sql);
 		zmDbRow dbrow;
 		if ( !dbrow.fetch(sql) ) {
-			Error("Unable to load group for id %d: %s", p_id, mysql_error(&dbconn));
+			Error("Unable to load group for id %u: %s", p_id, mysql_error(&dbconn));
 		} else {
 			unsigned int index = 0;
 			id = atoi(dbrow[index++]);
diff --git a/src/zm_group.h b/src/zm_group.h
index 6adb8cd93..f3ce1f3cf 100644
--- a/src/zm_group.h
+++ b/src/zm_group.h
@@ -17,11 +17,11 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */  
 
-#include "zm_db.h"
-
 #ifndef ZM_GROUP_H
 #define ZM_GROUP_H
 
+#include "zm_db.h"
+
 class Group {
 
 protected:
@@ -31,7 +31,7 @@ protected:
 
 public:
 	Group();
-	explicit Group( MYSQL_ROW &dbrow );
+	explicit Group(const MYSQL_ROW &dbrow );
 	explicit Group( unsigned int p_id );
 	~Group();
 
diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index 0a4cca08f..909b4db15 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -16,17 +16,16 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
-#include "zm.h"
-#include "zm_font.h"
-#include "zm_bigfont.h"
-#include "zm_image.h"
-#include "zm_utils.h"
-#include "zm_rgb.h"
-#include "zm_ffmpeg.h"
 
+#include "zm_image.h"
+
+#include "zm_font.h"
+#include "zm_poly.h"
+#include "zm_utils.h"
+#include <algorithm>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <errno.h>
+#include <unistd.h>
 
 static unsigned char y_table_global[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 15, 16, 17, 18, 19, 20, 22, 23, 24, 25, 26, 27, 29, 30, 31, 32, 33, 34, 36, 37, 38, 39, 40, 41, 43, 44, 45, 46, 47, 48, 50, 51, 52, 53, 54, 55, 57, 58, 59, 60, 61, 62, 64, 65, 66, 67, 68, 69, 71, 72, 73, 74, 75, 76, 78, 79, 80, 81, 82, 83, 85, 86, 87, 88, 89, 90, 91, 93, 94, 95, 96, 97, 98, 100, 101, 102, 103, 104, 105, 107, 108, 109, 110, 111, 112, 114, 115, 116, 117, 118, 119, 121, 122, 123, 124, 125, 126, 128, 129, 130, 131, 132, 133, 135, 136, 137, 138, 139, 140, 142, 143, 144, 145, 146, 147, 149, 150, 151, 152, 153, 154, 156, 157, 158, 159, 160, 161, 163, 164, 165, 166, 167, 168, 170, 171, 172, 173, 174, 175, 176, 178, 179, 180, 181, 182, 183, 185, 186, 187, 188, 189, 190, 192, 193, 194, 195, 196, 197, 199, 200, 201, 202, 203, 204, 206, 207, 208, 209, 210, 211, 213, 214, 215, 216, 217, 218, 220, 221, 222, 223, 224, 225, 227, 228, 229, 230, 231, 232, 234, 235, 236, 237, 238, 239, 241, 242, 243, 244, 245, 246, 248, 249, 250, 251, 252, 253, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255, 255};
 
@@ -78,6 +77,9 @@ static deinterlace_4field_fptr_t fptr_deinterlace_4field_gray8;
 /* Pointer to image buffer memory copy function */
 imgbufcpy_fptr_t fptr_imgbufcpy;
 
+/* Font */
+static ZmFont font;
+
 void Image::update_function_pointers() {
   /* Because many loops are unrolled and work on 16 colours/time or 4 pixels/time, we have to meet requirements */
   if ( pixels % 16 || pixels % 12 ) {
@@ -104,21 +106,30 @@ void Image::update_function_pointers() {
 }
 
 // This constructor is not used anywhere
-Image::Image() {
+Image::Image() :
+    delta8_rgb(&std_delta8_rgb),
+    delta8_bgr(&std_delta8_bgr),
+    delta8_rgba(&std_delta8_rgba),
+    delta8_bgra(&std_delta8_bgra),
+    delta8_argb(&std_delta8_argb),
+    delta8_abgr(&std_delta8_abgr),
+    delta8_gray8(&std_delta8_gray8),
+    blend(&std_blend)
+{
   if ( !initialised )
     Initialise();
   width = 0;
   linesize = 0;
   height = 0;
+  padding = 0;
   pixels = 0;
   colours = 0;
   subpixelorder = 0;
   size = 0;
   allocation = 0;
   buffer = 0;
-  buffertype = 0;
+  buffertype = ZM_BUFTYPE_DONTFREE;
   holdbuffer = 0;
-  text[0] = '\0';
   blend = fptr_blend;
 }
 
@@ -128,54 +139,62 @@ Image::Image(const char *filename) {
   width = 0;
   linesize = 0;
   height = 0;
+  padding = 0;
   pixels = 0;
   colours = 0;
   subpixelorder = 0;
   size = 0;
   allocation = 0;
   buffer = 0;
-  buffertype = 0;
+  buffertype = ZM_BUFTYPE_DONTFREE;
   holdbuffer = 0;
   ReadJpeg(filename, ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB);
-  text[0] = '\0';
   update_function_pointers();
 }
 
-Image::Image(int p_width, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer, unsigned int p_padding) {
-  if ( !initialised )
+Image::Image(int p_width, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer, unsigned int p_padding) :
+  width(p_width),
+  height(p_height),
+  colours(p_colours),
+  padding(p_padding),
+  subpixelorder(p_subpixelorder),
+  buffer(p_buffer) {
+
+  if (!initialised)
     Initialise();
-  width = p_width;
-  height = p_height;
-  pixels = width*height;
-  colours = p_colours;
+  pixels = width * height;
   linesize = p_width * p_colours;
-  padding = p_padding;
-  subpixelorder = p_subpixelorder;
-  size = linesize*height + padding;
+  size = linesize * height + padding;
   buffer = nullptr;
   holdbuffer = 0;
-  if ( p_buffer ) {
+  if (p_buffer) {
     allocation = size;
     buffertype = ZM_BUFTYPE_DONTFREE;
     buffer = p_buffer;
   } else {
     AllocImgBuffer(size);
   }
-  text[0] = '\0';
+  if (!subpixelorder and colours>1) {
+    // Default to RGBA when no subpixelorder is specified.
+    subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+  }
+  imagePixFormat = AVPixFormat();
 
   update_function_pointers();
 }
 
-Image::Image(int p_width, int p_linesize, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer, unsigned int p_padding) {
+Image::Image(int p_width, int p_linesize, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer, unsigned int p_padding) :
+  width(p_width),
+  linesize(p_linesize),
+  height(p_height),
+  colours(p_colours),
+  padding(p_padding),
+  subpixelorder(p_subpixelorder),
+  buffer(p_buffer)
+{
   if ( !initialised )
     Initialise();
-  width = p_width;
-  linesize = p_linesize;
-  height = p_height;
   pixels = width*height;
-  colours = p_colours;
-  padding = p_padding;
-  subpixelorder = p_subpixelorder;
   size = linesize*height + padding;
   buffer = nullptr;
   holdbuffer = 0;
@@ -186,69 +205,131 @@ Image::Image(int p_width, int p_linesize, int p_height, int p_colours, int p_sub
   } else {
     AllocImgBuffer(size);
   }
-  text[0] = '\0';
+  if (!subpixelorder and colours>1) {
+    // Default to RGBA when no subpixelorder is specified.
+    subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+  }
+  imagePixFormat = AVPixFormat();
 
   update_function_pointers();
 }
 
 Image::Image(const AVFrame *frame) {
-  AVFrame *dest_frame = zm_av_frame_alloc();
-  text[0] = '\0';
-
   width = frame->width;
   height = frame->height;
   pixels = width*height;
+
+  zm_dump_video_frame(frame, "Image.Assign(frame)");
+  // FIXME
   colours = ZM_COLOUR_RGB32;
   subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+  imagePixFormat = AV_PIX_FMT_RGBA;
+    //(AVPixelFormat)frame->format;
 
-  #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
+#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
   size = av_image_get_buffer_size(AV_PIX_FMT_RGBA, width, height, 32);
   // av_image_get_linesize isn't aligned, so we have to do that.
   linesize = FFALIGN(av_image_get_linesize(AV_PIX_FMT_RGBA, width, 0), 32);
 #else
   linesize = FFALIGN(av_image_get_linesize(AV_PIX_FMT_RGBA, width, 0), 1);
-  size = avpicture_get_size(AV_PIX_FMT_RGBA, width, height);
+  size = avpicture_get_size(AV_PIX_FMT_RGB0, width, height);
 #endif
+  padding = 0;
 
   buffer = nullptr;
   holdbuffer = 0;
   AllocImgBuffer(size);
+  this->Assign(frame);
+}
 
+static void dont_free(void *opaque, uint8_t *data) {
+}
+
+int Image::PopulateFrame(AVFrame *frame) {
+  Debug(1, "PopulateFrame: width %d height %d linesize %d colours %d imagesize %d %s",
+      width, height, linesize, colours, size,
+      av_get_pix_fmt_name(imagePixFormat)
+      );
+  AVBufferRef *ref = av_buffer_create(buffer, size, 
+      dont_free, /* Free callback */
+      nullptr, /* opaque */
+      0 /* flags */
+      );
+  if (!ref) {
+    Warning("Failed to create av_buffer");
+  }
+  frame->buf[0] = ref;
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-  av_image_fill_arrays(dest_frame->data, dest_frame->linesize,
-      buffer, AV_PIX_FMT_RGBA, width, height, 32);
+  // From what I've read, we should align the linesizes to 32bit so that ffmpeg can use SIMD instructions too.
+  int size = av_image_fill_arrays(
+      frame->data, frame->linesize,
+      buffer, imagePixFormat, width, height,
+      32 //alignment
+      );
+  if ( size < 0 ) {
+    Error("Problem setting up data pointers into image %s",
+        av_make_error_string(size).c_str());
+    return size;
+  }
 #else
-  avpicture_fill( (AVPicture *)dest_frame, buffer,
-      AV_PIX_FMT_RGBA, width, height);
+  avpicture_fill((AVPicture *)frame, buffer,
+      imagePixFormat, width, height);
 #endif
+  frame->width = width;
+  frame->height = height;
+  frame->format = imagePixFormat;
+  Debug(1, "PopulateFrame: width %d height %d linesize %d colours %d imagesize %d", width, height, linesize, colours, size);
+  zm_dump_video_frame(frame, "Image.Populate(frame)");
+  return 1;
+}  // int Image::PopulateFrame(AVFrame *frame)
 
-#if HAVE_LIBSWSCALE
+bool Image::Assign(const AVFrame *frame) {
+  /* Assume the dimensions etc are correct. FIXME */
+
+  // Desired format
+  AVPixelFormat format = (AVPixelFormat)AVPixFormat();
+  AVFrame *dest_frame = zm_av_frame_alloc();
   sws_convert_context = sws_getCachedContext(
       sws_convert_context,
-      width,
-      height,
-      (AVPixelFormat)frame->format,
-      width, height,
-      AV_PIX_FMT_RGBA, SWS_BICUBIC, nullptr,
-      nullptr, nullptr);
-  if ( sws_convert_context == nullptr )
-    Fatal("Unable to create conversion context");
-
-  if ( sws_scale(sws_convert_context, frame->data, frame->linesize, 0, frame->height,
-        dest_frame->data, dest_frame->linesize) < 0 )
-    Fatal("Unable to convert raw format %u to target format %u", frame->format, AV_PIX_FMT_RGBA);
-#else // HAVE_LIBSWSCALE
-  Fatal("You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras");
-#endif // HAVE_LIBSWSCALE
+      frame->width, frame->height, (AVPixelFormat)frame->format,
+      width, height, format,
+      SWS_BICUBIC,
+      //SWS_POINT | SWS_BITEXACT,
+      nullptr, nullptr, nullptr);
+  if (sws_convert_context == nullptr) {
+    Error("Unable to create conversion context");
+    return false;
+  }
+  bool result = Assign(frame, sws_convert_context, dest_frame);
   av_frame_free(&dest_frame);
   update_function_pointers();
-}  // end Image::Image(const AVFrame *frame)
+  return result;
+}  // end Image::Assign(const AVFrame *frame)
+
+bool Image::Assign(const AVFrame *frame, SwsContext *convert_context, AVFrame *temp_frame) {
+  PopulateFrame(temp_frame);
+  zm_dump_video_frame(frame, "source frame before convert");
+  temp_frame->pts = frame->pts;
+  AVPixelFormat format = (AVPixelFormat)AVPixFormat();
+
+  if (sws_scale(convert_context,
+        frame->data, frame->linesize, 0, frame->height,
+        temp_frame->data, temp_frame->linesize) < 0) {
+    Error("Unable to convert raw format %u %ux%u to target format %u %ux%u",
+        frame->format, frame->width, frame->height,
+        format, width, height);
+    return false;
+  }
+  zm_dump_video_frame(temp_frame, "dest frame after convert");
+  return true;
+}  // end Image::Assign(const AVFrame *frame, SwsContext *convert_context, AVFrame *temp_frame)
 
 Image::Image(const Image &p_image) {
   if ( !initialised )
     Initialise();
   width = p_image.width;
   linesize = p_image.linesize;
+  padding = 0;
   height = p_image.height;
   pixels = p_image.pixels;
   colours = p_image.colours;
@@ -258,7 +339,8 @@ Image::Image(const Image &p_image) {
   holdbuffer = 0;
   AllocImgBuffer(size);
   (*fptr_imgbufcpy)(buffer, p_image.buffer, size);
-  strncpy(text, p_image.text, sizeof(text));
+  annotation_ = p_image.annotation_;
+  imagePixFormat = p_image.imagePixFormat;
   update_function_pointers();
 }
 
@@ -268,27 +350,32 @@ Image::~Image() {
 
 /* Should be called as part of program shutdown to free everything */
 void Image::Deinitialise() {
-  if ( !initialised ) return;
+  if (!initialised) return;
   initialised = false;
-  if ( readjpg_dcinfo ) {
+  if (readjpg_dcinfo) {
     jpeg_destroy_decompress(readjpg_dcinfo);
     delete readjpg_dcinfo;
     readjpg_dcinfo = nullptr;
   }
-  if ( decodejpg_dcinfo ) {
+  if (decodejpg_dcinfo) {
     jpeg_destroy_decompress(decodejpg_dcinfo);
     delete decodejpg_dcinfo;
     decodejpg_dcinfo = nullptr;
   }
-  for ( unsigned int quality=0; quality <= 100; quality += 1 ) {
-    if ( writejpg_ccinfo[quality] ) {
+  for (unsigned int quality=0; quality <= 100; quality += 1) {
+    if (writejpg_ccinfo[quality]) {
       jpeg_destroy_compress(writejpg_ccinfo[quality]);
       delete writejpg_ccinfo[quality];
       writejpg_ccinfo[quality] = nullptr;
     }
+    if (encodejpg_ccinfo[quality]) {
+      jpeg_destroy_compress(encodejpg_ccinfo[quality]);
+      delete encodejpg_ccinfo[quality];
+      encodejpg_ccinfo[quality] = nullptr;
+    }
   } // end foreach quality
 
-  if ( sws_convert_context ) {
+  if (sws_convert_context) {
     sws_freeContext(sws_convert_context);
     sws_convert_context = nullptr;
   }
@@ -485,6 +572,12 @@ void Image::Initialise() {
   g_u_table = g_u_table_global;
   b_u_table = b_u_table_global;
 
+  FontLoadError res = font.LoadFontFile(config.font_file_location);
+  if ( res == FontLoadError::kFileNotFound ) {
+    Panic("Invalid font location: %s", config.font_file_location);
+  } else if ( res == FontLoadError::kInvalidFile ) {
+    Panic("Invalid font file."); 
+  }
   initialised = true;
 }
 
@@ -563,11 +656,11 @@ void Image::AssignDirect(
   }
 
   if ( p_colours != ZM_COLOUR_GRAY8 && p_colours != ZM_COLOUR_RGB24 && p_colours != ZM_COLOUR_RGB32 ) {
-    Error("Attempt to directly assign buffer with unexpected colours per pixel: %d",p_colours);
+    Error("Attempt to directly assign buffer with unexpected colours per pixel: %d", p_colours);
     return;
   }
 
-  unsigned int new_buffer_size = ((p_width*p_height)*p_colours);
+  size_t new_buffer_size = p_width * p_height * p_colours;
 
   if ( buffer_size < new_buffer_size ) {
     Error("Attempt to directly assign buffer from an undersized buffer of size: %zu, needed %dx%d*%d colours = %zu",
@@ -580,38 +673,28 @@ void Image::AssignDirect(
       Error("Held buffer is undersized for assigned buffer");
       return;
     } else {
-      width = p_width;
-      height = p_height;
-      colours = p_colours;
-      linesize = width * colours;
-      subpixelorder = p_subpixelorder;
-      pixels = height*width;
-      size = new_buffer_size; // was pixels*colours, but we already calculated it above as new_buffer_size
-
       /* Copy into the held buffer */
       if ( new_buffer != buffer ) {
         (*fptr_imgbufcpy)(buffer, new_buffer, size);
       }
-
       /* Free the new buffer */
       DumpBuffer(new_buffer, p_buffertype);
     }
   } else {
     /* Free an existing buffer if any */
     DumpImgBuffer();
-
-    width = p_width;
-    height = p_height;
-    colours = p_colours;
-    linesize = width*colours;
-    subpixelorder = p_subpixelorder;
-    pixels = height*width;
-    size = new_buffer_size; // was pixels*colours, but we already calculated it above as new_buffer_size
-
     allocation = buffer_size;
     buffertype = p_buffertype;
     buffer = new_buffer;
   }
+
+  width = p_width;
+  height = p_height;
+  colours = p_colours;
+  linesize = width * colours;
+  subpixelorder = p_subpixelorder;
+  pixels = width * height;
+  size = new_buffer_size;
 }  // end void Image::AssignDirect
 
 void Image::Assign(
@@ -621,13 +704,13 @@ void Image::Assign(
     const unsigned int p_subpixelorder,
     const uint8_t* new_buffer,
     const size_t buffer_size) {
-  unsigned int new_size = (p_width * p_height) * p_colours;
 
   if ( new_buffer == nullptr ) {
     Error("Attempt to assign buffer from a NULL pointer");
     return;
   }
 
+  unsigned int new_size = p_width * p_height * p_colours;
   if ( buffer_size < new_size ) {
     Error("Attempt to assign buffer from an undersized buffer of size: %zu", buffer_size);
     return;
@@ -651,7 +734,7 @@ void Image::Assign(
         return;
       }
     } else {
-      if ( new_size > allocation || !buffer ) {
+      if ( (new_size > allocation) || !buffer ) {
         DumpImgBuffer();
         AllocImgBuffer(new_size);
       }
@@ -667,6 +750,7 @@ void Image::Assign(
 
   if ( new_buffer != buffer )
     (*fptr_imgbufcpy)(buffer, new_buffer, size);
+  update_function_pointers();
 }
 
 void Image::Assign(const Image &image) {
@@ -689,7 +773,6 @@ void Image::Assign(const Image &image) {
   if ( !buffer
       || image.width != width || image.height != height
       || image.colours != colours || image.subpixelorder != subpixelorder
-      || image.linesize != linesize
       ) {
 
     if ( holdbuffer && buffer ) {
@@ -698,7 +781,7 @@ void Image::Assign(const Image &image) {
         return;
       }
     } else {
-      if ( new_size > allocation || !buffer) {
+      if ( new_size > allocation || !buffer ) { 
         // DumpImgBuffer(); This is also done in AllocImgBuffer
         AllocImgBuffer(new_size);
       }
@@ -886,8 +969,8 @@ bool Image::ReadJpeg(const char *filename, unsigned int p_colours, unsigned int
 
   jpeg_read_header(cinfo, TRUE);
 
-  if ( cinfo->num_components != 1 && cinfo->num_components != 3 ) {
-    Error( "Unexpected colours when reading jpeg image: %d", colours );
+  if ( (cinfo->num_components != 1) && (cinfo->num_components != 3) ) {
+    Error("Unexpected colours when reading jpeg image: %d", colours);
     jpeg_abort_decompress(cinfo);
     fclose(infile);
     return false;
@@ -902,7 +985,7 @@ bool Image::ReadJpeg(const char *filename, unsigned int p_colours, unsigned int
   new_width = cinfo->image_width;
   new_height = cinfo->image_height;
 
-  if ( width != new_width || height != new_height ) {
+  if ( (width != new_width) || (height != new_height) ) {
     Debug(9, "Image dimensions differ. Old: %ux%u New: %ux%u", width, height, new_width, new_height);
   }
 
@@ -1012,8 +1095,7 @@ bool Image::WriteJpeg(const char *filename, int quality_override, struct timeval
 
   struct jpeg_compress_struct *cinfo = writejpg_ccinfo[quality];
   FILE *outfile = nullptr;
-  static int raw_fd = 0;
-  raw_fd = 0;
+  int raw_fd = 0;
 
   if ( !cinfo ) {
     cinfo = writejpg_ccinfo[quality] = new jpeg_compress_struct;
@@ -1106,7 +1188,7 @@ cinfo->out_color_space = JCS_EXT_RGB;
 #else
 cinfo->out_color_space = JCS_RGB;
 #endif
-           */
+*/
           cinfo->in_color_space = JCS_RGB;
         }
         break;
@@ -1117,8 +1199,8 @@ cinfo->out_color_space = JCS_RGB;
   cinfo->dct_method = JDCT_FASTEST;
 
   jpeg_start_compress(cinfo, TRUE);
-  if ( config.add_jpeg_comments && text[0] ) {
-    jpeg_write_marker(cinfo, JPEG_COM, (const JOCTET *)text, strlen(text));
+  if ( config.add_jpeg_comments && !annotation_.empty() ) {
+    jpeg_write_marker(cinfo, JPEG_COM, reinterpret_cast<const JOCTET *>(annotation_.c_str()), annotation_.size());
   }
   // If we have a non-zero time (meaning a parameter was passed in), then form a simple exif segment with that time as DateTimeOriginal and SubsecTimeOriginal
   // No timestamp just leave off the exif section.
@@ -1131,7 +1213,8 @@ cinfo->out_color_space = JCS_RGB;
 
     // This is a lot of stuff to allocate on the stack.  Recommend char *timebuf[64];
     char timebuf[64], msbuf[64];
-    strftime(timebuf, sizeof timebuf, "%Y:%m:%d %H:%M:%S", localtime(&(timestamp.tv_sec)));
+    tm timestamp_tm = {};
+    strftime(timebuf, sizeof timebuf, "%Y:%m:%d %H:%M:%S", localtime_r(&timestamp.tv_sec, &timestamp_tm));
     snprintf(msbuf, sizeof msbuf, "%06d",(int)(timestamp.tv_usec));  // we only use milliseconds because that's all defined in exif, but this is the whole microseconds because we have it
     unsigned char exiftimes[82] = {
       0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00,
@@ -1197,7 +1280,7 @@ bool Image::DecodeJpeg(
   new_width = cinfo->image_width;
   new_height = cinfo->image_height;
 
-  if ( width != new_width || height != new_height ) {
+  if ( (width != new_width) || (height != new_height) ) {
     Debug(9, "Image dimensions differ. Old: %ux%u New: %ux%u",
         width, height, new_width, new_height);
   }
@@ -1406,23 +1489,21 @@ bool Image::Crop( unsigned int lo_x, unsigned int lo_y, unsigned int hi_x, unsig
         lo_x, lo_y, hi_x, hi_y, width-1, height-1);
     return false;
   }
-
-  if ( new_width == width && new_height == height ) {
+  if ( (new_width == width) && (new_height == height) ) {
     return true;
   }
 
-  unsigned int new_size = new_width*new_height*colours;
+  unsigned int new_stride = new_width * colours;
+  unsigned int new_size = new_stride * new_height;
   uint8_t *new_buffer = AllocBuffer(new_size);
 
-  unsigned int new_stride = new_width * colours;
   for ( unsigned int y = lo_y, ny = 0; y <= hi_y; y++, ny++ ) {
-    unsigned char *pbuf = &buffer[((y*linesize)+lo_x)];
-    unsigned char *pnbuf = &new_buffer[(ny*new_width)*colours];
-    memcpy( pnbuf, pbuf, new_stride );
+    unsigned char *pbuf = &buffer[((y*linesize)+(lo_x*colours))];
+    unsigned char *pnbuf = &new_buffer[ny*new_stride];
+    memcpy(pnbuf, pbuf, new_stride);
   }
 
   AssignDirect(new_width, new_height, colours, subpixelorder, new_buffer, new_size, ZM_BUFTYPE_ZM);
-
   return true;
 }
 
@@ -1439,7 +1520,8 @@ void Image::Overlay( const Image &image ) {
   }
 
   if ( colours == image.colours && subpixelorder != image.subpixelorder ) {
-    Warning("Attempt to overlay images of same format but with different subpixel order.");
+    Warning("Attempt to overlay images of same format but with different subpixel order %d != %d.",
+        subpixelorder, image.subpixelorder);
   }
 
   /* Grayscale ontop of grayscale - complete */
@@ -1678,7 +1760,7 @@ void Image::Blend( const Image &image, int transparency ) {
 
 #ifdef ZM_IMAGE_PROFILING
   clock_gettime(CLOCK_THREAD_CPUTIME_ID,&end);
-  timespec_diff(&start,&end,&diff);
+  TimespecDiff(&start,&end,&diff);
 
   executetime = (1000000000ull * diff.tv_sec) + diff.tv_nsec;
   milpixels = (unsigned long)((long double)size)/((((long double)executetime)/1000));
@@ -1784,8 +1866,8 @@ Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb thres
   return result;
 }
 
-/* New function to allow buffer re-using instead of allocating memory for the delta image every time */
-void Image::Delta( const Image &image, Image* targetimage) const {
+/* New function to allow buffer re-using instead of allocationg memory for the delta image every time */
+void Image::Delta(const Image &image, Image* targetimage) const {
 #ifdef ZM_IMAGE_PROFILING
   struct timespec start,end,diff;
   unsigned long long executetime;
@@ -1842,7 +1924,7 @@ void Image::Delta( const Image &image, Image* targetimage) const {
 
 #ifdef ZM_IMAGE_PROFILING
   clock_gettime(CLOCK_THREAD_CPUTIME_ID,&end);
-  timespec_diff(&start,&end,&diff);
+  TimespecDiff(&start,&end,&diff);
 
   executetime = (1000000000ull * diff.tv_sec) + diff.tv_nsec;
   milpixels = (unsigned long)((long double)pixels)/((((long double)executetime)/1000));
@@ -1850,10 +1932,10 @@ void Image::Delta( const Image &image, Image* targetimage) const {
 #endif
 }
 
-const Coord Image::centreCoord( const char *text ) const {
+const Coord Image::centreCoord( const char *text, int size=1 ) const {
   int index = 0;
   int line_no = 0;
-  int text_len = strlen( text );
+  int text_len = strlen(text);
   int line_len = 0;
   int max_line_len = 0;
   const char *line = text;
@@ -1869,8 +1951,12 @@ const Coord Image::centreCoord( const char *text ) const {
     line = text+index;
     line_no++;
   }
-  int x = (width - (max_line_len * ZM_CHAR_WIDTH) ) / 2;
-  int y = (height - (line_no * LINE_HEIGHT) ) / 2;
+
+  FontVariant const &font_variant = font.GetFontVariant(size - 1);
+  uint16_t char_width = font_variant.GetCharWidth();
+  uint16_t char_height = font_variant.GetCharHeight();
+  int x = (width - (max_line_len * char_width )) / 2;
+  int y = (height - (line_no * char_height) ) / 2;
   return Coord(x, y);
 }
 
@@ -1916,179 +2002,135 @@ void Image::MaskPrivacy( const unsigned char *p_bitmask, const Rgb pixel_colour
 }
 
 /* RGB32 compatible: complete */
-void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int size, const Rgb fg_colour, const Rgb bg_colour )
-{
-  strncpy(text, p_text, sizeof(text)-1);
+/* Bitmap decoding trick has been adopted from here:
+https://lemire.me/blog/2018/02/21/iterating-over-set-bits-quickly/
+*/
+void Image::Annotate(
+    const std::string &text,
+    const Coord &coord,
+    const uint8 size,
+    const Rgb fg_colour,
+    const Rgb bg_colour) {
+  annotation_ = text;
 
-  unsigned int index = 0;
-  unsigned int line_no = 0;
-  unsigned int text_len = strlen(text);
-  unsigned int line_len = 0;
-  const char *line = text;
+  const Rgb fg_rgb_col = rgb_convert(fg_colour, subpixelorder);
+  const Rgb bg_rgb_col = rgb_convert(bg_colour, subpixelorder);
 
-  const uint8_t fg_r_col = RED_VAL_RGBA(fg_colour);
-  const uint8_t fg_g_col = GREEN_VAL_RGBA(fg_colour);
-  const uint8_t fg_b_col = BLUE_VAL_RGBA(fg_colour);
-  const uint8_t fg_bw_col = fg_colour & 0xff;
-  const Rgb fg_rgb_col = rgb_convert(fg_colour,subpixelorder);
-  const bool fg_trans = (fg_colour == RGB_TRANSPARENT);
+  FontVariant const &font_variant = font.GetFontVariant(size - 1);
+  const uint16 char_width = font_variant.GetCharWidth();
+  const uint16 char_height = font_variant.GetCharHeight();
 
-  const uint8_t bg_r_col = RED_VAL_RGBA(bg_colour);
-  const uint8_t bg_g_col = GREEN_VAL_RGBA(bg_colour);
-  const uint8_t bg_b_col = BLUE_VAL_RGBA(bg_colour);
-  const uint8_t bg_bw_col = bg_colour & 0xff;
-  const Rgb bg_rgb_col = rgb_convert(bg_colour,subpixelorder);
-  const bool bg_trans = (bg_colour == RGB_TRANSPARENT);
+  std::vector<std::string> lines = Split(annotation_, '\n');
+  std::size_t max_line_length = 0;
+  for (const std::string &s : lines) {
+    max_line_length = std::max(max_line_length, s.size());
+  }
 
-  int zm_text_bitmask = 0x80;
-  if ( size == 2 )
-    zm_text_bitmask = 0x8000;
+  uint32 x0_max = width - (max_line_length * char_width);
+  uint32 y0_max = height - (lines.size() * char_height);
 
-  while ( (index < text_len) && (line_len = strcspn(line, "\n")) ) {
+  // Calculate initial coordinates of annotation so that everything is displayed even if the
+  // user set coordinates would prevent that.
+  uint32 x0 = ZM::clamp(static_cast<uint32>(coord.X()), 0u, x0_max);
+  uint32 y0 = ZM::clamp(static_cast<uint32>(coord.Y()), 0u, y0_max);
 
-    unsigned int line_width = line_len * ZM_CHAR_WIDTH * size;
+  uint32 y = y0;
+  for (const std::string &line : lines) {
+    uint32 x = x0;
 
-    unsigned int lo_line_x = coord.X();
-    unsigned int lo_line_y = coord.Y() + (line_no * LINE_HEIGHT * size);
-
-    unsigned int min_line_x = 0;
-    unsigned int max_line_x = width - line_width;
-    unsigned  int min_line_y = 0;
-    unsigned int max_line_y = height - (LINE_HEIGHT * size);
-
-    if ( lo_line_x > max_line_x )
-      lo_line_x = max_line_x;
-    if ( lo_line_x < min_line_x )
-      lo_line_x = min_line_x;
-    if ( lo_line_y > max_line_y )
-      lo_line_y = max_line_y;
-    if ( lo_line_y < min_line_y )
-      lo_line_y = min_line_y;
-
-    unsigned int hi_line_x = lo_line_x + line_width;
-    unsigned int hi_line_y = lo_line_y + (LINE_HEIGHT * size);
-
-    // Clip anything that runs off the right of the screen
-    if ( hi_line_x > width )
-      hi_line_x = width;
-    if ( hi_line_y > height )
-      hi_line_y = height;
-
-    if ( colours == ZM_COLOUR_GRAY8 ) {
-      unsigned char *ptr = &buffer[(lo_line_y*width)+lo_line_x];
-      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (ZM_CHAR_HEIGHT * size); y++, r++, ptr += width ) {
-        unsigned char *temp_ptr = ptr;
-        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ ) {
-          int f;
-          if ( size == 2 ) {
-            if ( (line[c] * ZM_CHAR_HEIGHT * size) + r > sizeof(bigfontdata) ) {
-              Warning("Unsupported character %c in %s", line[c], line);
-              continue;
-            }
-            f = bigfontdata[(line[c] * ZM_CHAR_HEIGHT * size) + r];
-          } else {
-            if ( (line[c] * ZM_CHAR_HEIGHT) + r > sizeof(fontdata) ) {
-              Warning("Unsupported character %c in %s", line[c], line);
-              continue;
-            }
-            f = fontdata[(line[c] * ZM_CHAR_HEIGHT) + r];
+    if (colours == ZM_COLOUR_GRAY8) {
+      uint8 *ptr = &buffer[(y * width) + x0];
+      for (char c : line) {
+        for (uint64 cp_row : font_variant.GetCodepoint(c)) {
+          if (bg_colour != kRGBTransparent) {
+            std::fill(ptr, ptr + char_width, static_cast<uint8>(bg_colour & 0xff));
           }
-          for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ ) {
-            if ( f & (zm_text_bitmask >> i) ) {
-              if ( !fg_trans )
-                *temp_ptr = fg_bw_col;
-            } else if ( !bg_trans ) {
-              *temp_ptr = bg_bw_col;
-            }
+
+          while (cp_row != 0) {
+            uint32 column_idx = char_width - __builtin_ctzll(cp_row) + font_variant.GetCharPadding();
+            *(ptr + column_idx) = fg_colour & 0xff;
+            cp_row = cp_row & (cp_row - 1);
           }
+          ptr += width;
+        }
+        ptr -= (width * char_height);
+        ptr += char_width;
+        x += char_width;
+        if (x >= width) {
+          break;
         }
       }
-    } else if ( colours == ZM_COLOUR_RGB24 ) {
-      unsigned int wc = width * colours;
+    } else if (colours == ZM_COLOUR_RGB24) {
+      constexpr uint8 bytesPerPixel = 3;
+      uint8 *ptr = &buffer[((y * width) + x0) * bytesPerPixel];
 
-      unsigned char *ptr = &buffer[((lo_line_y*width)+lo_line_x)*colours];
-      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (ZM_CHAR_HEIGHT * size); y++, r++, ptr += wc ) {
-        unsigned char *temp_ptr = ptr;
-        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ ) {
-          int f;
-          if ( size == 2 ) {
-            if ( (line[c] * ZM_CHAR_HEIGHT * size) + r > sizeof(bigfontdata) ) {
-              Warning("Unsupported character %c in %s", line[c], line);
-              continue;
-            }
-            f = bigfontdata[(line[c] * ZM_CHAR_HEIGHT * size) + r];
-          } else {
-            if ( (line[c] * ZM_CHAR_HEIGHT) + r > sizeof(fontdata) ) {
-              Warning("Unsupported character %c in %s", line[c], line);
-              continue;
-            }
-            f = fontdata[(line[c] * ZM_CHAR_HEIGHT) + r];
-          }
-          for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr += colours ) {
-            if ( f & (zm_text_bitmask >> i) ) {
-              if ( !fg_trans ) {
-                RED_PTR_RGBA(temp_ptr) = fg_r_col;
-                GREEN_PTR_RGBA(temp_ptr) = fg_g_col;
-                BLUE_PTR_RGBA(temp_ptr) = fg_b_col;
-              }
-            } else if ( !bg_trans ) {
-              RED_PTR_RGBA(temp_ptr) = bg_r_col;
-              GREEN_PTR_RGBA(temp_ptr) = bg_g_col;
-              BLUE_PTR_RGBA(temp_ptr) = bg_b_col;
+      for (char c : line) {
+        for (uint64 cp_row : font_variant.GetCodepoint(c)) {
+          if (bg_colour != kRGBTransparent) {
+            for (uint16 i = 0; i < char_width; i++) {  // We need to set individual r,g,b components
+              uint8 *colour_ptr = ptr + (i * bytesPerPixel);
+              RED_PTR_RGBA(colour_ptr) = RED_VAL_RGBA(bg_colour);
+              GREEN_PTR_RGBA(colour_ptr) = GREEN_VAL_RGBA(bg_colour);
+              BLUE_PTR_RGBA(colour_ptr) = BLUE_VAL_RGBA(bg_colour);
             }
           }
+
+          while (cp_row != 0) {
+            uint32 column_idx = char_width - __builtin_ctzll(cp_row) + font_variant.GetCharPadding();
+            uint8 *colour_ptr = ptr + (column_idx * bytesPerPixel);
+            RED_PTR_RGBA(colour_ptr) = RED_VAL_RGBA(fg_colour);
+            GREEN_PTR_RGBA(colour_ptr) = GREEN_VAL_RGBA(fg_colour);
+            BLUE_PTR_RGBA(colour_ptr) = BLUE_VAL_RGBA(fg_colour);
+            cp_row = cp_row & (cp_row - 1);
+          }
+          ptr += width * bytesPerPixel;
+        }
+        ptr -= (width * char_height * bytesPerPixel);
+        ptr += char_width * bytesPerPixel;
+        x += char_width;
+        if (x >= width) {
+          break;
         }
       }
-    } else if ( colours == ZM_COLOUR_RGB32 ) {
-      unsigned int wc = width * colours;
+    } else if (colours == ZM_COLOUR_RGB32) {
+      constexpr uint8 bytesPerPixel = 4;
+      Rgb *ptr = reinterpret_cast<Rgb *>(&buffer[((y * width) + x0) * bytesPerPixel]);
 
-      uint8_t *ptr = &buffer[((lo_line_y*width)+lo_line_x)<<2];
-      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (ZM_CHAR_HEIGHT * size); y++, r++, ptr += wc ) {
-        Rgb* temp_ptr = (Rgb*)ptr;
-        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ ) {
-          int f;
-          if ( size == 2 ) {
-            if ( (line[c] * ZM_CHAR_HEIGHT * size) + r > sizeof(bigfontdata) ) {
-              Warning("Unsupported character %c in %s", line[c], line);
-              continue;
-            }
-            f = bigfontdata[(line[c] * ZM_CHAR_HEIGHT * size) + r];
-          } else {
-            if ( (line[c] * ZM_CHAR_HEIGHT) + r > sizeof(fontdata) ) {
-              Warning("Unsupported character %c in %s", line[c], line);
-              continue;
-            }
-            f = fontdata[(line[c] * ZM_CHAR_HEIGHT) + r];
+      for (char c : line) {
+        for (uint64 cp_row : font_variant.GetCodepoint(c)) {
+          if (bg_colour != kRGBTransparent) {
+            std::fill(ptr, ptr + char_width, bg_rgb_col);
           }
-          for ( unsigned int i = 0; i < (ZM_CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ ) {
-            if ( f & (zm_text_bitmask >> i) ) {
-              if ( !fg_trans ) {
-                *temp_ptr = fg_rgb_col;
-              }
-            } else if ( !bg_trans ) {
-              *temp_ptr = bg_rgb_col;
-            }
+
+          while (cp_row != 0) {
+            uint32 column_idx = char_width - __builtin_ctzll(cp_row) + font_variant.GetCharPadding();
+            *(ptr + column_idx) = fg_rgb_col;
+            cp_row = cp_row & (cp_row - 1);
           }
+          ptr += width;
+        }
+        ptr -= (width * char_height);
+        ptr += char_width;
+        x += char_width;
+        if (x >= width) {
+          break;
         }
       }
-
     } else {
       Error("Annotate called with unexpected colours: %d", colours);
       return;
     }
-
-    index += line_len;
-    while ( text[index] == '\n' ) {
-      index++;
+    y += char_height;
+    if (y >= height) {
+      break;
     }
-    line = text+index;
-    line_no++;
   }
 }
 
 void Image::Timestamp( const char *label, const time_t when, const Coord &coord, const int size ) {
   char time_text[64];
-  strftime(time_text, sizeof(time_text), "%y/%m/%d %H:%M:%S", localtime(&when));
+  tm when_tm = {};
+  strftime(time_text, sizeof(time_text), "%y/%m/%d %H:%M:%S", localtime_r(&when, &when_tm));
   if ( label ) {
     // Assume label is max 64, + ' - ' + 64 chars of time_text
     char text[132];
@@ -2449,7 +2491,7 @@ void Image::Fill(Rgb colour, int density, const Polygon &polygon) {
     global_edges[n_global_edges]._1_m = dx/dy;
     n_global_edges++;
   }
-  qsort( global_edges, n_global_edges, sizeof(*global_edges), Edge::CompareYX );
+  std::sort(global_edges, global_edges + n_global_edges, Edge::CompareYX);
 
 #ifndef ZM_DBG_OFF
   if ( logLevel() >= Logger::DEBUG9 ) {
@@ -2478,7 +2520,7 @@ void Image::Fill(Rgb colour, int density, const Polygon &polygon) {
         break;
       }
     }
-    qsort(active_edges, n_active_edges, sizeof(*active_edges), Edge::CompareX);
+    std::sort(active_edges, active_edges + n_active_edges, Edge::CompareX);
 #ifndef ZM_DBG_OFF
     if ( logLevel() >= Logger::DEBUG9 ) {
       for ( int i = 0; i < n_active_edges; i++ ) {
@@ -2763,11 +2805,11 @@ void Image::Scale(unsigned int factor) {
       h_count += factor;
       h_index = h_count/ZM_SCALE_BASE;
       for ( unsigned int f = last_h_index+1; f < h_index; f++ ) {
-        memcpy( pd, pd-nwc, nwc );
+        memcpy(pd, pd-nwc, nwc);
         pd += nwc;
       }
       last_h_index = h_index;
-    }
+    }  // end foreach line
     new_width = last_w_index;
     new_height = last_h_index;
   } else {
@@ -4680,8 +4722,8 @@ void ssse3_convert_yuyv_gray8(const uint8_t* col1, uint8_t* result, unsigned lon
 
 /* YUYV to RGB24 - relocated from zm_local_camera.cpp */
 __attribute__((noinline)) void zm_convert_yuyv_rgb(const uint8_t* col1, uint8_t* result, unsigned long count) {
-  unsigned int r,g,b;
-  unsigned int y1,y2,u,v;
+  int32 r,g,b;
+  int32 y1,y2,u,v;
   for(unsigned int i=0; i < count; i += 2, col1 += 4, result += 6) {
     y1 = col1[0];
     u = col1[1];
@@ -5230,3 +5272,5 @@ __attribute__((noinline)) void std_deinterlace_4field_abgr(uint8_t* col1, uint8_
     pncurrent += 4;
   }
 }
+
+
diff --git a/src/zm_image.h b/src/zm_image.h
index 8f86c3e30..671cc0487 100644
--- a/src/zm_image.h
+++ b/src/zm_image.h
@@ -20,26 +20,21 @@
 #ifndef ZM_IMAGE_H
 #define ZM_IMAGE_H
 
-#include "zm.h"
-extern "C" {
-#include "zm_jpeg.h"
-}
-#include "zm_rgb.h"
 #include "zm_coord.h"
-#include "zm_box.h"
-#include "zm_poly.h"
-#include "zm_mem_utils.h"
-#include "zm_utils.h"
-
-class Image;
 #include "zm_ffmpeg.h"
-
-#include <errno.h>
+#include "zm_jpeg.h"
+#include "zm_logger.h"
+#include "zm_mem_utils.h"
+#include "zm_rgb.h"
 
 #if HAVE_ZLIB_H
 #include <zlib.h>
 #endif // HAVE_ZLIB_H
 
+class Box;
+class Image;
+class Polygon;
+
 #define ZM_BUFTYPE_DONTFREE 0
 #define ZM_BUFTYPE_MALLOC 1 
 #define ZM_BUFTYPE_NEW 2
@@ -64,7 +59,7 @@ inline static uint8_t* AllocBuffer(size_t p_bufsize) {
 }
 
 inline static void DumpBuffer(uint8_t* buffer, int buffertype) {
-	if ( buffer && buffertype != ZM_BUFTYPE_DONTFREE ) {
+	if ( buffer && (buffertype != ZM_BUFTYPE_DONTFREE) ) {
     if ( buffertype == ZM_BUFTYPE_ZM ) {
       zm_freealigned(buffer);
     } else if ( buffertype == ZM_BUFTYPE_MALLOC ) {
@@ -99,196 +94,221 @@ class Image {
     blend_fptr_t blend;
 
     void update_function_pointers();
-protected:
 
-	struct Edge {
-		int min_y;
-		int max_y;
-		double min_x;
-		double _1_m;
+  protected:
+    struct Edge {
+      int min_y;
+      int max_y;
+      double min_x;
+      double _1_m;
 
-		static int CompareYX( const void *p1, const void *p2 ) {
-			const Edge *e1 = reinterpret_cast<const Edge *>(p1), *e2 = reinterpret_cast<const Edge *>(p2);
-			if ( e1->min_y == e2->min_y )
-				return( int(e1->min_x - e2->min_x) );
-			else
-				return( int(e1->min_y - e2->min_y) );
-		}
-		static int CompareX( const void *p1, const void *p2 ) {
-			const Edge *e1 = reinterpret_cast<const Edge *>(p1), *e2 = reinterpret_cast<const Edge *>(p2);
-			return( int(e1->min_x - e2->min_x) );
-		}
-	};
+      static bool CompareYX(const Edge &e1, const Edge &e2) {
+        if ( e1.min_y == e2.min_y )
+          return e1.min_x < e2.min_x;
+        return e1.min_y < e2.min_y;
+      }
+
+      static bool CompareX(const Edge &e1, const Edge &e2) {
+        return e1.min_x < e2.min_x;
+      }
+    };
 	
-	inline void DumpImgBuffer() {
-		DumpBuffer(buffer, buffertype);
-		buffer = nullptr;
-		allocation = 0;
-	}
-	
-	inline void AllocImgBuffer(size_t p_bufsize) {
-		if ( buffer ) 
-			DumpImgBuffer();
-		
-		buffer = AllocBuffer(p_bufsize);
-		buffertype = ZM_BUFTYPE_ZM;
-		allocation = p_bufsize;
-	}
 
-public:
-	enum { ZM_CHAR_HEIGHT=11, ZM_CHAR_WIDTH=6 };
-	enum { LINE_HEIGHT=ZM_CHAR_HEIGHT+0 };
+    inline void AllocImgBuffer(size_t p_bufsize) {
+      if ( buffer )
+        DumpImgBuffer();
 
-protected:
-	static bool initialised;
-	static unsigned char *abs_table;
-	static unsigned char *y_r_table;
-	static unsigned char *y_g_table;
-	static unsigned char *y_b_table;
-	static jpeg_compress_struct *writejpg_ccinfo[101];
-	static jpeg_compress_struct *encodejpg_ccinfo[101];
-	static jpeg_decompress_struct *readjpg_dcinfo;
-	static jpeg_decompress_struct *decodejpg_dcinfo;
-	static struct zm_error_mgr jpg_err;
+      buffer = AllocBuffer(p_bufsize);
+      buffertype = ZM_BUFTYPE_ZM;
+      allocation = p_bufsize;
+    }
 
-	unsigned int width;
-	unsigned int linesize;
-	unsigned int height;
-	unsigned int pixels;
-	unsigned int colours;
-  unsigned int padding;
-	unsigned int size;
-	unsigned int subpixelorder;
-	unsigned long allocation;
-	uint8_t *buffer;
-	int buffertype; /* 0=not ours, no need to call free(), 1=malloc() buffer, 2=new buffer */
-	int holdbuffer; /* Hold the buffer instead of replacing it with new one */
-	char text[1024];
+  public:
+    enum { ZM_CHAR_HEIGHT=11, ZM_CHAR_WIDTH=6 };
+    enum { LINE_HEIGHT=ZM_CHAR_HEIGHT+0 };
 
-public:
-	Image();
-	explicit Image(const char *filename);
-	Image(int p_width, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer=0, unsigned int padding=0);
-	Image(int p_width, int p_linesize, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer=0, unsigned int padding=0);
-	explicit Image( const Image &p_image );
-  explicit Image( const AVFrame *frame );
+  protected:
+    static bool initialised;
+    static unsigned char *abs_table;
+    static unsigned char *y_r_table;
+    static unsigned char *y_g_table;
+    static unsigned char *y_b_table;
+    static jpeg_compress_struct *writejpg_ccinfo[101];
+    static jpeg_compress_struct *encodejpg_ccinfo[101];
+    static jpeg_decompress_struct *readjpg_dcinfo;
+    static jpeg_decompress_struct *decodejpg_dcinfo;
+    static struct zm_error_mgr jpg_err;
 
-	~Image();
-	static void Initialise();
-	static void Deinitialise();
+    unsigned int width;
+    unsigned int linesize;
+    unsigned int height;
+    unsigned int pixels;
+    unsigned int colours;
+    unsigned int padding;
+    unsigned int size;
+    unsigned int subpixelorder;
+    unsigned long allocation;
+    _AVPIXELFORMAT      imagePixFormat;
+    uint8_t *buffer;
+    int buffertype; /* 0=not ours, no need to call free(), 1=malloc() buffer, 2=new buffer */
+    int holdbuffer; /* Hold the buffer instead of replacing it with new one */
+    std::string annotation_;
 
-	inline unsigned int Width() const { return width; }
-	inline unsigned int LineSize() const { return linesize; }
-	inline unsigned int Height() const { return height; }
-	inline unsigned int Pixels() const { return pixels; }
-	inline unsigned int Colours() const { return colours; }
-	inline unsigned int SubpixelOrder() const { return subpixelorder; }
-	inline unsigned int Size() const { return size; }
-	
-	/* Internal buffer should not be modified from functions outside of this class */
-	inline const uint8_t* Buffer() const { return buffer; }
-	inline const uint8_t* Buffer( unsigned int x, unsigned int y= 0 ) const { return &buffer[(y*linesize)+x]; }
-	/* Request writeable buffer */
-	uint8_t* WriteBuffer(const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder);
-	
-	inline int IsBufferHeld() const { return holdbuffer; }
-	inline void HoldBuffer(int tohold) { holdbuffer = tohold; }
-	
-	inline void Empty() {
-    if ( !holdbuffer )
-      DumpImgBuffer();
+  public:
+    Image();
+    explicit Image(const char *filename);
+    Image(int p_width, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer=0, unsigned int padding=0);
+    Image(int p_width, int p_linesize, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer=0, unsigned int padding=0);
+    explicit Image(const Image &p_image);
+    explicit Image(const AVFrame *frame);
 
-    width = linesize = height = colours = size = pixels = subpixelorder = 0;
-	}
-	
-	void Assign(
-      unsigned int p_width,
-      unsigned int p_height,
-      unsigned int p_colours,
-      unsigned int p_subpixelorder,
-      const uint8_t* new_buffer,
-      const size_t buffer_size);
-	void Assign(const Image &image);
-	void AssignDirect(
-      const unsigned int p_width,
-      const unsigned int p_height,
-      const unsigned int p_colours,
-      const unsigned int p_subpixelorder,
-      uint8_t *new_buffer,
-      const size_t buffer_size,
-      const int p_buffertype);
+    ~Image();
+    static void Initialise();
+    static void Deinitialise();
 
-	inline void CopyBuffer(const Image &image) {
-		Assign(image);
-	}
-	inline Image &operator=(const Image &image) {
-		Assign(image);
-		return *this;
-	}
-	inline Image &operator=(const unsigned char *new_buffer) {
-		(*fptr_imgbufcpy)(buffer, new_buffer, size);
-		return *this;
-	}
+    inline void DumpImgBuffer() {
+      DumpBuffer(buffer, buffertype);
+      buffertype = ZM_BUFTYPE_DONTFREE;
+      buffer = nullptr;
+      allocation = 0;
+    }
+    inline unsigned int Width() const { return width; }
+    inline unsigned int LineSize() const { return linesize; }
+    inline unsigned int Height() const { return height; }
+    inline unsigned int Pixels() const { return pixels; }
+    inline unsigned int Colours() const { return colours; }
+    inline unsigned int SubpixelOrder() const { return subpixelorder; }
+    inline unsigned int Size() const { return size; }
 
-	bool ReadRaw( const char *filename );
-	bool WriteRaw( const char *filename ) const;
+    inline AVPixelFormat AVPixFormat() {
+      if ( colours == ZM_COLOUR_RGB32 ) {
+        return AV_PIX_FMT_RGBA;
+      } else if ( colours == ZM_COLOUR_RGB24 ) {
+        if ( subpixelorder == ZM_SUBPIX_ORDER_BGR){
+          return AV_PIX_FMT_BGR24;
+        } else {
+          return AV_PIX_FMT_RGB24;
+        }
+      } else if ( colours == ZM_COLOUR_GRAY8 ) {
+        return AV_PIX_FMT_GRAY8;
+      } else {
+        Error("Unknown colours (%d)",colours);
+        return AV_PIX_FMT_RGBA;
+      }
+    }
 
-	bool ReadJpeg( const char *filename, unsigned int p_colours, unsigned int p_subpixelorder);
+    /* Internal buffer should not be modified from functions outside of this class */
+    inline const uint8_t* Buffer() const { return buffer; }
+    inline const uint8_t* Buffer(unsigned int x, unsigned int y=0) const { return &buffer[(y*linesize)+x]; }
+    /* Request writeable buffer */
+    uint8_t* WriteBuffer(const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder);
+    // Is only acceptable on a pre-allocated buffer
+    uint8_t* WriteBuffer() { return holdbuffer ? buffer : nullptr; };
 
-	bool WriteJpeg ( const char *filename) const;
-	bool WriteJpeg ( const char *filename, bool on_blocking_abort) const;	
-  bool WriteJpeg ( const char *filename, int quality_override ) const;
-  bool WriteJpeg ( const char *filename, struct timeval timestamp ) const;
-  bool WriteJpeg ( const char *filename, int quality_override, struct timeval timestamp ) const;
-  bool WriteJpeg ( const char *filename, int quality_override, struct timeval timestamp, bool on_blocking_abort ) const;
-  
+    inline int IsBufferHeld() const { return holdbuffer; }
+    inline void HoldBuffer(int tohold) { holdbuffer = tohold; }
 
-	bool DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int p_colours, unsigned int p_subpixelorder);
-	bool EncodeJpeg( JOCTET *outbuffer, int *outbuffer_size, int quality_override=0 ) const;
+    inline void Empty() {
+      if ( !holdbuffer )
+        DumpImgBuffer();
+
+      width = linesize = height = colours = size = pixels = subpixelorder = 0;
+    }
+
+    void Assign(
+        unsigned int p_width,
+        unsigned int p_height,
+        unsigned int p_colours,
+        unsigned int p_subpixelorder,
+        const uint8_t* new_buffer,
+        const size_t buffer_size);
+    void Assign(const Image &image);
+    bool Assign(const AVFrame *frame);
+    bool Assign(const AVFrame *frame, SwsContext *convert_context, AVFrame *temp_frame);
+    void AssignDirect(
+        const unsigned int p_width,
+        const unsigned int p_height,
+        const unsigned int p_colours,
+        const unsigned int p_subpixelorder,
+        uint8_t *new_buffer,
+        const size_t buffer_size,
+        const int p_buffertype);
+
+    int PopulateFrame(AVFrame *frame);
+
+    inline void CopyBuffer(const Image &image) {
+      Assign(image);
+    }
+    inline Image &operator=(const Image &image) {
+      Assign(image);
+      return *this;
+    }
+    inline Image &operator=(const unsigned char *new_buffer) {
+      (*fptr_imgbufcpy)(buffer, new_buffer, size);
+      return *this;
+    }
+
+    bool ReadRaw(const char *filename);
+    bool WriteRaw(const char *filename) const;
+
+    bool ReadJpeg(const char *filename, unsigned int p_colours, unsigned int p_subpixelorder);
+
+    bool WriteJpeg(const char *filename) const;
+    bool WriteJpeg(const char *filename, bool on_blocking_abort) const;
+    bool WriteJpeg(const char *filename, int quality_override) const;
+    bool WriteJpeg(const char *filename, struct timeval timestamp) const;
+    bool WriteJpeg(const char *filename, int quality_override, struct timeval timestamp) const;
+    bool WriteJpeg(const char *filename, int quality_override, struct timeval timestamp, bool on_blocking_abort) const;
+
+    bool DecodeJpeg(const JOCTET *inbuffer, int inbuffer_size, unsigned int p_colours, unsigned int p_subpixelorder);
+    bool EncodeJpeg(JOCTET *outbuffer, int *outbuffer_size, int quality_override=0) const;
 
 #if HAVE_ZLIB_H
-	bool Unzip( const Bytef *inbuffer, unsigned long inbuffer_size );
-	bool Zip( Bytef *outbuffer, unsigned long *outbuffer_size, int compression_level=Z_BEST_SPEED ) const;
+    bool Unzip(const Bytef *inbuffer, unsigned long inbuffer_size);
+    bool Zip(Bytef *outbuffer, unsigned long *outbuffer_size, int compression_level=Z_BEST_SPEED) const;
 #endif // HAVE_ZLIB_H
 
-	bool Crop( unsigned int lo_x, unsigned int lo_y, unsigned int hi_x, unsigned int hi_y );
-	bool Crop( const Box &limits );
+    bool Crop(unsigned int lo_x, unsigned int lo_y, unsigned int hi_x, unsigned int hi_y);
+    bool Crop(const Box &limits);
 
-	void Overlay( const Image &image );
-	void Overlay( const Image &image, unsigned int x, unsigned int y );
-	void Blend( const Image &image, int transparency=12 );
-	static Image *Merge( unsigned int n_images, Image *images[] );
-	static Image *Merge( unsigned int n_images, Image *images[], double weight );
-	static Image *Highlight( unsigned int n_images, Image *images[], const Rgb threshold=RGB_BLACK, const Rgb ref_colour=RGB_RED );
-	//Image *Delta( const Image &image ) const;
-	void Delta( const Image &image, Image* targetimage) const;
+    void Overlay(const Image &image);
+    void Overlay(const Image &image, unsigned int x, unsigned int y);
+    void Blend(const Image &image, int transparency=12);
+    static Image *Merge( unsigned int n_images, Image *images[] );
+    static Image *Merge( unsigned int n_images, Image *images[], double weight );
+    static Image *Highlight(unsigned int n_images, Image *images[], Rgb threshold = kRGBBlack, Rgb ref_colour = kRGBRed);
+    //Image *Delta( const Image &image ) const;
+    void Delta( const Image &image, Image* targetimage) const;
 
-	const Coord centreCoord( const char *text ) const;
-  void MaskPrivacy( const unsigned char *p_bitmask, const Rgb pixel_colour=0x00222222 );
-	void Annotate( const char *p_text, const Coord &coord, const unsigned int size=1, const Rgb fg_colour=RGB_WHITE, const Rgb bg_colour=RGB_BLACK );
-	Image *HighlightEdges( Rgb colour, unsigned int p_colours, unsigned int p_subpixelorder, const Box *limits=0 );
-	//Image *HighlightEdges( Rgb colour, const Polygon &polygon );
-	void Timestamp( const char *label, const time_t when, const Coord &coord, const int size );
-	void Colourise(const unsigned int p_reqcolours, const unsigned int p_reqsubpixelorder);
-	void DeColourise();
+    const Coord centreCoord(const char *text, const int size) const;
+    void MaskPrivacy( const unsigned char *p_bitmask, const Rgb pixel_colour=0x00222222 );
+    void Annotate(const std::string &text,
+                const Coord &coord,
+                uint8 size = 1,
+                Rgb fg_colour = kRGBWhite,
+                Rgb bg_colour = kRGBBlack);
+    Image *HighlightEdges( Rgb colour, unsigned int p_colours, unsigned int p_subpixelorder, const Box *limits=0 );
+    //Image *HighlightEdges( Rgb colour, const Polygon &polygon );
+    void Timestamp( const char *label, const time_t when, const Coord &coord, const int size );
+    void Colourise(const unsigned int p_reqcolours, const unsigned int p_reqsubpixelorder);
+    void DeColourise();
 
-	void Clear() { memset( buffer, 0, size ); }
-	void Fill( Rgb colour, const Box *limits=0 );
-	void Fill( Rgb colour, int density, const Box *limits=0 );
-	void Outline( Rgb colour, const Polygon &polygon );
-	void Fill( Rgb colour, const Polygon &polygon );
-	void Fill( Rgb colour, int density, const Polygon &polygon );
+    void Clear() { memset( buffer, 0, size ); }
+    void Fill( Rgb colour, const Box *limits=0 );
+    void Fill( Rgb colour, int density, const Box *limits=0 );
+    void Outline( Rgb colour, const Polygon &polygon );
+    void Fill( Rgb colour, const Polygon &polygon );
+    void Fill( Rgb colour, int density, const Polygon &polygon );
 
-	void Rotate( int angle );
-	void Flip( bool leftright );
-	void Scale( unsigned int factor );
+    void Rotate( int angle );
+    void Flip( bool leftright );
+    void Scale( unsigned int factor );
 
-	void Deinterlace_Discard();
-	void Deinterlace_Linear();
-	void Deinterlace_Blend();
-	void Deinterlace_Blend_CustomRatio(int divider);
-	void Deinterlace_4Field(const Image* next_image, unsigned int threshold);
-	
+    void Deinterlace_Discard();
+    void Deinterlace_Linear();
+    void Deinterlace_Blend();
+    void Deinterlace_Blend_CustomRatio(int divider);
+    void Deinterlace_4Field(const Image* next_image, unsigned int threshold);
 };
 
 #endif // ZM_IMAGE_H
diff --git a/src/zm_jpeg.cpp b/src/zm_jpeg.cpp
index 9865d4db4..c3fddec1f 100644
--- a/src/zm_jpeg.cpp
+++ b/src/zm_jpeg.cpp
@@ -18,76 +18,66 @@
 */ 
 
 #include "zm_jpeg.h"
+
 #include "zm_logger.h"
 
-#include <unistd.h>
-
 /* Overridden error handlers, mostly for decompression */
-extern "C"
-{
+extern "C" {
 
 #define MAX_JPEG_ERRS 25
 
 static int jpeg_err_count = 0;
 
-void zm_jpeg_error_silent( j_common_ptr cinfo ){
+void zm_jpeg_error_silent(j_common_ptr cinfo) {
   zm_error_ptr zmerr = (zm_error_ptr)cinfo->err;
-  longjmp( zmerr->setjmp_buffer, 1 );
-}
-void zm_jpeg_emit_silence( j_common_ptr cinfo, int msg_level ){
+  longjmp(zmerr->setjmp_buffer, 1);
 }
 
-void zm_jpeg_error_exit( j_common_ptr cinfo )
-{
+void zm_jpeg_emit_silence(j_common_ptr cinfo, int msg_level) {
+}
+
+void zm_jpeg_error_exit(j_common_ptr cinfo) {
   static char buffer[JMSG_LENGTH_MAX];
   zm_error_ptr zmerr = (zm_error_ptr)cinfo->err;
 
-  (zmerr->pub.format_message)( cinfo, buffer ); 
+  (zmerr->pub.format_message)(cinfo, buffer); 
 
-  Error( "%s", buffer );
-  if ( ++jpeg_err_count == MAX_JPEG_ERRS )
-  {
-    Fatal( "Maximum number (%d) of JPEG errors reached, exiting", jpeg_err_count );
+  Error("%s", buffer);
+  if ( ++jpeg_err_count == MAX_JPEG_ERRS ) {
+    Fatal("Maximum number (%d) of JPEG errors reached, exiting", jpeg_err_count);
   }
 
-  longjmp( zmerr->setjmp_buffer, 1 );
+  longjmp(zmerr->setjmp_buffer, 1);
 }
 
-void zm_jpeg_emit_message( j_common_ptr cinfo, int msg_level )
-{
+void zm_jpeg_emit_message(j_common_ptr cinfo, int msg_level) {
   static char buffer[JMSG_LENGTH_MAX];
   zm_error_ptr zmerr = (zm_error_ptr)cinfo->err;
 
-  if ( msg_level < 0 )
-  {
+  if ( msg_level < 0 ) {
     /* It's a warning message.  Since corrupt files may generate many warnings,
      * the policy implemented here is to show only the first warning,
      * unless trace_level >= 3.
      */
-    if ( zmerr->pub.num_warnings == 0 || zmerr->pub.trace_level >= 3 )
-    {
-      (zmerr->pub.format_message)( cinfo, buffer );
-      if (!strstr(buffer, "Corrupt JPEG data:")) 
-      Warning( "%s", buffer );
+    if ( zmerr->pub.num_warnings == 0 || zmerr->pub.trace_level >= 3 ) {
+      (zmerr->pub.format_message)(cinfo, buffer);
+      if ( !strstr(buffer, "Corrupt JPEG data:") ) 
+        Warning("%s", buffer);
     }
     /* Always count warnings in num_warnings. */
     zmerr->pub.num_warnings++;
-  }
-  else
-  {
+  } else {
     /* It's a trace message.  Show it if trace_level >= msg_level. */
-    if ( zmerr->pub.trace_level >= msg_level )
-    {
-      (zmerr->pub.format_message)( cinfo, buffer ); 
-      Debug( msg_level, "%s", buffer );
+    if ( zmerr->pub.trace_level >= msg_level ) {
+      (zmerr->pub.format_message)(cinfo, buffer); 
+      Debug(msg_level, "%s", buffer);
     }
   }
 }
 
 /* Expanded data destination object for memory */
 
-typedef struct
-{
+typedef struct {
   struct jpeg_destination_mgr pub; /* public fields */
 
   JOCTET *outbuffer;    /* target buffer */
@@ -104,8 +94,7 @@ typedef mem_destination_mgr * mem_dest_ptr;
  * before any data is actually written.
  */
 
-static void init_destination (j_compress_ptr cinfo)
-{
+static void init_destination (j_compress_ptr cinfo) {
   mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
 
   /* Allocate the output buffer --- it will be released when done with image */
@@ -117,7 +106,6 @@ static void init_destination (j_compress_ptr cinfo)
   *(dest->outbuffer_size) = 0;
 }
 
-
 /*
  * Empty the output buffer --- called whenever buffer fills up.
  *
@@ -141,17 +129,16 @@ static void init_destination (j_compress_ptr cinfo)
  * write it out when emptying the buffer externally.
  */
 
-static boolean empty_output_buffer (j_compress_ptr cinfo)
-{
+static boolean empty_output_buffer(j_compress_ptr cinfo) {
   mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
 
-  memcpy( dest->outbuffer+*(dest->outbuffer_size), dest->buffer, OUTPUT_BUF_SIZE );
+  memcpy(dest->outbuffer+*(dest->outbuffer_size), dest->buffer, OUTPUT_BUF_SIZE);
   *(dest->outbuffer_size) += OUTPUT_BUF_SIZE;
 
   dest->pub.next_output_byte = dest->buffer;
   dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
 
-  return( TRUE );
+  return TRUE;
 }
 
 /*
@@ -163,14 +150,12 @@ static boolean empty_output_buffer (j_compress_ptr cinfo)
  * for error exit.
  */
 
-static void term_destination (j_compress_ptr cinfo)
-{
+static void term_destination(j_compress_ptr cinfo) {
   mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
   size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
 
-  if ( datacount > 0 )
-  {
-    memcpy( dest->outbuffer+*(dest->outbuffer_size), dest->buffer, datacount );
+  if ( datacount > 0 ) {
+    memcpy(dest->outbuffer+*(dest->outbuffer_size), dest->buffer, datacount);
     *(dest->outbuffer_size) += datacount;
   }
 }
@@ -182,8 +167,7 @@ static void term_destination (j_compress_ptr cinfo)
  * for closing it after finishing compression.
  */
 
-void zm_jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
-{
+void zm_jpeg_mem_dest(j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size) {
   mem_dest_ptr dest;
 
   /* The destination object is made permanent so that multiple JPEG images
@@ -192,10 +176,10 @@ void zm_jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_s
    * manager serially with the same JPEG object, because their private object
    * sizes may be different.  Caveat programmer.
    */
-  if ( cinfo->dest == nullptr )
-  {
+  if ( cinfo->dest == nullptr ) {
     /* first time for this JPEG object? */
-    cinfo->dest = (struct jpeg_destination_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(mem_destination_mgr));
+    cinfo->dest = (struct jpeg_destination_mgr *)(*cinfo->mem->alloc_small)
+      ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(mem_destination_mgr));
   }
 
   dest = (mem_dest_ptr) cinfo->dest;
@@ -208,8 +192,7 @@ void zm_jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_s
 
 /* Expanded data source object for memory input */
 
-typedef struct
-{
+typedef struct {
   struct jpeg_source_mgr pub;  /* public fields */
 
   JOCTET * inbuffer;    /* source stream */
@@ -229,8 +212,7 @@ typedef mem_source_mgr * mem_src_ptr;
  * before any data is actually read.
  */
 
-static void init_source (j_decompress_ptr cinfo)
-{
+static void init_source (j_decompress_ptr cinfo) {
   mem_src_ptr src = (mem_src_ptr) cinfo->src;
 
   /* We reset the empty-input-file flag for each image,
@@ -275,12 +257,11 @@ static void init_source (j_decompress_ptr cinfo)
  * the front of the buffer rather than discarding it.
  */
 
-static boolean fill_input_buffer (j_decompress_ptr cinfo)
-{
+static boolean fill_input_buffer (j_decompress_ptr cinfo) {
   mem_src_ptr src = (mem_src_ptr) cinfo->src;
   size_t nbytes;
 
-  memcpy( src->buffer, src->inbuffer, (size_t) src->inbuffer_size );
+  memcpy(src->buffer, src->inbuffer, (size_t) src->inbuffer_size);
   nbytes = src->inbuffer_size;
 
   if ( nbytes == 0 ) {
@@ -297,10 +278,9 @@ static boolean fill_input_buffer (j_decompress_ptr cinfo)
   src->pub.bytes_in_buffer = nbytes;
   src->start_of_data = FALSE;
 
-  return( TRUE );
+  return TRUE;
 }
 
-
 /*
  * Skip data --- used to skip over a potentially large amount of
  * uninteresting data (such as an APPn marker).
@@ -313,18 +293,15 @@ static boolean fill_input_buffer (j_decompress_ptr cinfo)
  * buffer is the application writer's problem.
  */
 
-static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
-{
+static void skip_input_data(j_decompress_ptr cinfo, long num_bytes) {
   mem_src_ptr src = (mem_src_ptr) cinfo->src;
 
   /* Just a dumb implementation for now.  Could use fseek() except
    * it doesn't work on pipes.  Not clear that being smart is worth
    * any trouble anyway --- large skips are infrequent.
    */
-  if ( num_bytes > 0 )
-  {
-    while ( num_bytes > (long) src->pub.bytes_in_buffer )
-    {
+  if ( num_bytes > 0 ) {
+    while ( num_bytes > (long) src->pub.bytes_in_buffer ) {
       num_bytes -= (long) src->pub.bytes_in_buffer;
       (void) fill_input_buffer(cinfo);
       /* note we assume that fill_input_buffer will never return FALSE,
@@ -336,7 +313,6 @@ static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
   }
 }
 
-
 /*
  * Terminate source --- called by jpeg_finish_decompress
  * after all data has been read.  Often a no-op.
@@ -346,20 +322,17 @@ static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
  * for error exit.
  */
 
-static void term_source (j_decompress_ptr cinfo)
-{
+static void term_source(j_decompress_ptr cinfo) {
   /* no work necessary here */
 }
 
-
 /*
  * Prepare for input from a memory stream.
  * The caller must have already opened the stream, and is responsible
  * for closing it after finishing decompression.
  */
 
-void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
-{
+void zm_jpeg_mem_src(j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size) {
   mem_src_ptr src;
 
   /* The source object and input buffer are made permanent so that a series
@@ -369,19 +342,15 @@ void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuff
    * This makes it unsafe to use this manager and a different source
    * manager serially with the same JPEG object.  Caveat programmer.
    */
-  if ( cinfo->src == nullptr )
-  {
+  if ( cinfo->src == nullptr ) {
       /* first time for this JPEG object? */
     cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(mem_source_mgr));
     src = (mem_src_ptr) cinfo->src;
     src->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, inbuffer_size * SIZEOF(JOCTET));
     src->inbuffer_size_hwm = inbuffer_size;
-  }
-  else
-  {
+  } else {
     src = (mem_src_ptr) cinfo->src;
-    if ( src->inbuffer_size_hwm < inbuffer_size )
-    {
+    if ( src->inbuffer_size_hwm < inbuffer_size ) {
       src->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, inbuffer_size * SIZEOF(JOCTET));
       src->inbuffer_size_hwm = inbuffer_size;
     }
@@ -399,7 +368,7 @@ void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuff
   src->pub.next_input_byte = nullptr; /* until buffer loaded */
 }
 
-void zm_use_std_huff_tables( j_decompress_ptr cinfo ) {
+void zm_use_std_huff_tables(j_decompress_ptr cinfo) {
   /* JPEG standard Huffman tables (cf. JPEG standard section K.3) */
   /* IMPORTANT: these are only valid for 8-bit data precision! */
   static const JHUFF_TBL dclumin = {
@@ -467,7 +436,6 @@ void zm_use_std_huff_tables( j_decompress_ptr cinfo ) {
   cinfo->dc_huff_tbl_ptrs[1] = (JHUFF_TBL*)&dcchrome;
   cinfo->ac_huff_tbl_ptrs[0] = (JHUFF_TBL*)&aclumin;
   cinfo->ac_huff_tbl_ptrs[1] = (JHUFF_TBL*)&acchrome;
-  
 }
 
 }
diff --git a/src/zm_jpeg.h b/src/zm_jpeg.h
index f0b4a355c..acf47f809 100644
--- a/src/zm_jpeg.h
+++ b/src/zm_jpeg.h
@@ -15,13 +15,12 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/  
-
-#include <setjmp.h>
+*/
 
+#include "jerror.h"
 #include "jinclude.h"
 #include "jpeglib.h"
-#include "jerror.h"
+#include <csetjmp>
 
 // Stop complaints about deuplicate definitions
 #undef HAVE_STDLIB_H
diff --git a/src/zm_libvlc_camera.cpp b/src/zm_libvlc_camera.cpp
index 2ac76d198..59cdc4ccf 100644
--- a/src/zm_libvlc_camera.cpp
+++ b/src/zm_libvlc_camera.cpp
@@ -15,13 +15,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/  
+*/
 
-#include <dlfcn.h>
-#include "zm.h"
-#include "zm_signal.h"
 #include "zm_libvlc_camera.h"
 
+#include "zm_packet.h"
+#include "zm_signal.h"
+#include "zm_utils.h"
+#include <dlfcn.h>
+
 #if HAVE_LIBVLC
 static void *libvlc_lib = nullptr;
 static void (*libvlc_media_player_release_f)(libvlc_media_player_t* ) = nullptr;
@@ -92,12 +94,16 @@ void LibvlcUnlockBuffer(void* opaque, void* picture, void *const *planes) {
   // Return frames slightly faster than 1fps (if time() supports greater than one second resolution)
   if ( newFrame || difftime(now, data->prevTime) >= 0.8 ) {
     data->prevTime = now;
-    data->newImage.updateValueSignal(true);
+    {
+      std::lock_guard<std::mutex> lck(data->newImageMutex);
+      data->newImage = true;
+    }
+    data->newImageCv.notify_all();
   }
 }
 
 LibvlcCamera::LibvlcCamera(
-    int p_id,
+    const Monitor *monitor,
     const std::string &p_path,
     const std::string &p_method,
     const std::string &p_options,
@@ -112,7 +118,7 @@ LibvlcCamera::LibvlcCamera(
     bool p_record_audio
     ) :
   Camera(
-      p_id,
+      monitor,
       LIBVLC_SRC,
       p_width,
       p_height,
@@ -163,6 +169,9 @@ LibvlcCamera::~LibvlcCamera() {
   if ( capture ) {
     Terminate();
   }
+
+  mLibvlcData.newImageCv.notify_all(); // to unblock on termination (zm_terminate)
+
   if ( mLibvlcMediaPlayer != nullptr ) {
     (*libvlc_media_player_release_f)(mLibvlcMediaPlayer);
     mLibvlcMediaPlayer = nullptr;
@@ -175,6 +184,10 @@ LibvlcCamera::~LibvlcCamera() {
     (*libvlc_release_f)(mLibvlcInstance);
     mLibvlcInstance = nullptr;
   }
+  if (libvlc_lib) {
+    dlclose(libvlc_lib);
+    libvlc_lib = nullptr;
+  }
   if ( mOptArgV != nullptr ) {
     delete[] mOptArgV;
   }
@@ -200,7 +213,7 @@ void LibvlcCamera::Terminate() {
 int LibvlcCamera::PrimeCapture() {
   Debug(1, "Priming capture from %s, libvlc version %s", mPath.c_str(), (*libvlc_get_version_f)());
 
-  StringVector opVect = split(Options(), ",");
+  StringVector opVect = Split(Options(), ",");
 
   // Set transport method as specified by method field, rtpUni is default
   if ( Method() == "rtpMulti" )
@@ -214,11 +227,11 @@ int LibvlcCamera::PrimeCapture() {
 
   if ( opVect.size() > 0 ) {
     mOptArgV = new char*[opVect.size()];
-    Debug(2, "Number of Options: %d",opVect.size());
+    Debug(2, "Number of Options: %zu", opVect.size());
     for (size_t i=0; i< opVect.size(); i++) {
-      opVect[i] = trimSpaces(opVect[i]);
+      opVect[i] = TrimSpaces(opVect[i]);
       mOptArgV[i] = (char *)opVect[i].c_str();
-      Debug(2, "set option %d to '%s'", i,  opVect[i].c_str());
+      Debug(2, "set option %zu to '%s'", i, opVect[i].c_str());
     }
   }
 
@@ -249,8 +262,8 @@ int LibvlcCamera::PrimeCapture() {
   // Libvlc wants 32 byte alignment for images (should in theory do this for all image lines)
   mLibvlcData.buffer = (uint8_t*)zm_mallocaligned(64, mLibvlcData.bufferSize);
   mLibvlcData.prevBuffer = (uint8_t*)zm_mallocaligned(64, mLibvlcData.bufferSize);
-  
-  mLibvlcData.newImage.setValueImmediate(false);
+
+  mLibvlcData.newImage = false;
 
   (*libvlc_media_player_play_f)(mLibvlcMediaPlayer);
 
@@ -263,27 +276,26 @@ int LibvlcCamera::PreCapture() {
 }
 
 // Should not return -1 as cancels capture. Always wait for image if available.
-int LibvlcCamera::Capture(Image &image) {   
-
+int LibvlcCamera::Capture( ZMPacket &zm_packet ) {   
   // newImage is a mutex/condition based flag to tell us when there is an image available
-  while( !mLibvlcData.newImage.getValueImmediate() ) {
-    if (zm_terminate)
-      return 0;
-    mLibvlcData.newImage.getUpdatedValue(1);
+  {
+    std::unique_lock<std::mutex> lck(mLibvlcData.newImageMutex);
+    mLibvlcData.newImageCv.wait(lck, [&]{ return mLibvlcData.newImage || zm_terminate; });
+    mLibvlcData.newImage = false;
   }
 
+  if (zm_terminate)
+    return 0;
+
   mLibvlcData.mutex.lock();
-  image.Assign(width, height, colours, subpixelorder, mLibvlcData.buffer, width * height * mBpp);
-  mLibvlcData.newImage.setValueImmediate(false);
+  zm_packet.image->Assign(width, height, colours, subpixelorder, mLibvlcData.buffer, width * height * mBpp);
+  zm_packet.packet.stream_index = mVideoStreamId;
+  zm_packet.stream = mVideoStream;
   mLibvlcData.mutex.unlock();
 
   return 1;
 }
 
-int LibvlcCamera::CaptureAndRecord(Image &image, timeval recording, char* event_directory) {
-  return 0;
-}
-
 int LibvlcCamera::PostCapture() {
   return 0;
 }
@@ -307,9 +319,9 @@ void LibvlcCamera::log_callback(void *ptr, int level, const libvlc_log_t *ctx, c
   }
 
   if ( log ) {
-    char            logString[8192];
-    vsnprintf(logString, sizeof(logString)-1, fmt, vargs);
-    log->logPrint(false, __FILE__, __LINE__, log_level, logString);
+    char logString[8192];
+    vsnprintf(logString, sizeof(logString) - 1, fmt, vargs);
+    log->logPrint(false, __FILE__, __LINE__, log_level, "%s", logString);
   }
 }
 #endif // HAVE_LIBVLC
diff --git a/src/zm_libvlc_camera.h b/src/zm_libvlc_camera.h
index 038d30f05..7d9be27c1 100644
--- a/src/zm_libvlc_camera.h
+++ b/src/zm_libvlc_camera.h
@@ -20,9 +20,9 @@
 #ifndef ZM_LIBVLC_CAMERA_H
 #define ZM_LIBVLC_CAMERA_H
 
-#include "zm_buffer.h"
 #include "zm_camera.h"
-#include "zm_thread.h"
+#include <condition_variable>
+#include <mutex>
 
 #if HAVE_LIBVLC
 
@@ -31,14 +31,16 @@
 #endif
 
 // Used by libvlc callbacks
-struct LibvlcPrivateData
-{
+struct LibvlcPrivateData {
   uint8_t* buffer;
   uint8_t* prevBuffer;
   time_t prevTime;
   uint32_t bufferSize;
-  Mutex mutex;
-  ThreadData<bool> newImage;
+  std::mutex mutex;
+
+  bool newImage;
+  std::mutex newImageMutex;
+  std::condition_variable newImageCv;
 };
 
 class LibvlcCamera : public Camera {
@@ -58,7 +60,7 @@ protected:
   libvlc_media_player_t *mLibvlcMediaPlayer;
 
 public:
-  LibvlcCamera( int p_id, const std::string &path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  LibvlcCamera( const Monitor *monitor, const std::string &path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
   ~LibvlcCamera();
 
   const std::string &Path() const { return mPath; }
@@ -68,12 +70,11 @@ public:
   void Initialise();
   void Terminate();
 
-  int PrimeCapture();
-  int PreCapture();
-  int Capture( Image &image );
-  int CaptureAndRecord( Image &image, timeval recording, char* event_directory );
-  int PostCapture();
-  int Close() { return 0; };
+  int PrimeCapture() override;
+  int PreCapture() override;
+  int Capture(ZMPacket &p) override;
+  int PostCapture() override;
+  int Close() override { return 0; };
 };
 
 #endif // HAVE_LIBVLC
diff --git a/src/zm_libvnc_camera.cpp b/src/zm_libvnc_camera.cpp
index 315cc19dd..faa594a7e 100644
--- a/src/zm_libvnc_camera.cpp
+++ b/src/zm_libvnc_camera.cpp
@@ -1,8 +1,7 @@
-#include <dlfcn.h>
-#include "zm.h"
-#include "zm_signal.h"
 #include "zm_libvnc_camera.h"
-#include "zm_swscale.h"
+
+#include "zm_packet.h"
+#include <dlfcn.h>
 
 #if HAVE_LIBVNC
 
@@ -19,11 +18,11 @@ static int (*WaitForMessage_f)(rfbClient*, unsigned int) = nullptr;
 static rfbBool (*HandleRFBServerMessage_f)(rfbClient*) = nullptr;
 
 void bind_libvnc_symbols() {
-  if ( libvnc_lib != nullptr ) // Safe-check
+  if (libvnc_lib != nullptr) // Safe-check
     return;
   
   libvnc_lib = dlopen("libvncclient.so", RTLD_LAZY | RTLD_GLOBAL);
-  if ( !libvnc_lib ) {
+  if (!libvnc_lib) {
     Error("Error loading libvncclient: %s", dlerror());
     return;
   }
@@ -37,29 +36,50 @@ void bind_libvnc_symbols() {
   *(void**) (&HandleRFBServerMessage_f) = dlsym(libvnc_lib, "HandleRFBServerMessage");
 }
 
-static void GotFrameBufferUpdateCallback(rfbClient *rfb, int x, int y, int w, int h){
+static void GotFrameBufferUpdateCallback(rfbClient *rfb, int x, int y, int w, int h) {
   VncPrivateData *data = (VncPrivateData *)(*rfbClientGetClientData_f)(rfb, &TAG_0);
   data->buffer = rfb->frameBuffer;
+  Debug(1, "GotFrameBufferUpdateallback x:%d y:%d w%d h:%d width: %d, height: %d, buffer %p",
+      x,y,w,h, rfb->width, rfb->height, rfb->frameBuffer);
 }
 
-static char* GetPasswordCallback(rfbClient* cl){
+static char* GetPasswordCallback(rfbClient* cl) {
+  Debug(1, "Getcredentials: %s", static_cast<char *>((*rfbClientGetClientData_f)(cl, &TAG_1)));
   return strdup((const char *)(*rfbClientGetClientData_f)(cl, &TAG_1));
 }
 
 static rfbCredential* GetCredentialsCallback(rfbClient* cl, int credentialType){
-  rfbCredential *c = (rfbCredential *)malloc(sizeof(rfbCredential));
-  if ( credentialType != rfbCredentialTypeUser ) {
-    free(c);
+  if (credentialType != rfbCredentialTypeUser) {
+		Debug(1, "credentialType != rfbCredentialTypeUser");
     return nullptr;
   }
+  rfbCredential *c = (rfbCredential *)malloc(sizeof(rfbCredential));
 
+  Debug(1, "Getcredentials: %s:%s",
+        static_cast<char *>((*rfbClientGetClientData_f)(cl, &TAG_1)),
+        static_cast<char *>((*rfbClientGetClientData_f)(cl, &TAG_2)));
   c->userCredential.password = strdup((const char *)(*rfbClientGetClientData_f)(cl, &TAG_1));
   c->userCredential.username = strdup((const char *)(*rfbClientGetClientData_f)(cl, &TAG_2));
   return c;
 }
 
+static rfbBool resize(rfbClient* client) {
+  if (client->frameBuffer) {
+    Debug(1, "Freeing old frame buffer");
+    av_free(client->frameBuffer);
+  }
+
+  int bufferSize = 4*client->width*client->height;
+  // libVNC doesn't do alignment or padding in each line
+  //SWScale::GetBufferSize(AV_PIX_FMT_RGBA, client->width, client->height);
+  client->frameBuffer = (uint8_t *)av_malloc(bufferSize);
+    Debug(1, "Allocing new frame buffer %dx%d = %d", client->width, client->height, bufferSize);
+
+  return TRUE;
+}
+
 VncCamera::VncCamera(
-    unsigned int p_monitor_id,
+    const Monitor *monitor,
     const std::string &host,
     const std::string &port,
     const std::string &user,
@@ -74,7 +94,7 @@ VncCamera::VncCamera(
     bool p_capture,
     bool p_record_audio ) :
     Camera(
-      p_monitor_id,
+      monitor,
       VNC_SRC,
       p_width,
       p_height,
@@ -87,111 +107,152 @@ VncCamera::VncCamera(
       p_capture,
       p_record_audio
     ),
+    mRfb(nullptr),
+    mVncData({}),
   mHost(host),
   mPort(port),
   mUser(user),
   mPass(pass)
 {
-  Debug(2, "Host:%s Port: %s User: %s Pass:%s", mHost.c_str(), mPort.c_str(), mUser.c_str(), mPass.c_str());
-  
-  if ( colours == ZM_COLOUR_RGB32 ) {
+  if (colours == ZM_COLOUR_RGB32) {
     subpixelorder = ZM_SUBPIX_ORDER_RGBA;
     mImgPixFmt = AV_PIX_FMT_RGBA;
-    mBpp = 4;
-  } else if ( colours == ZM_COLOUR_RGB24 ) {
+  } else if (colours == ZM_COLOUR_RGB24) {
     subpixelorder = ZM_SUBPIX_ORDER_RGB;
     mImgPixFmt = AV_PIX_FMT_RGB24;
-    mBpp = 3;
-  } else if ( colours == ZM_COLOUR_GRAY8 ) {
+  } else if (colours == ZM_COLOUR_GRAY8) {
     subpixelorder = ZM_SUBPIX_ORDER_NONE;
     mImgPixFmt = AV_PIX_FMT_GRAY8;
-    mBpp = 1;
   } else {
     Panic("Unexpected colours: %d", colours);
   }
 
-  if ( capture )
-    Initialise();
+  if (capture) {
+    Debug(3, "Initializing Client");
+    bind_libvnc_symbols();
+    scale.init();
+  }
 }
 
-
 VncCamera::~VncCamera() {
-  if ( capture )
-    Terminate();
-}
-
-void VncCamera::Initialise() {
-  Debug(2, "Initializing Client");
-  bind_libvnc_symbols();
-  mRfb = (*rfbGetClient_f)(8, 3, 4);
-  
-  (*rfbClientSetClientData_f)(mRfb, &TAG_0, &mVncData);
-  (*rfbClientSetClientData_f)(mRfb, &TAG_1, (void *)mPass.c_str());
-  (*rfbClientSetClientData_f)(mRfb, &TAG_2, (void *)mUser.c_str());
-
-  mRfb->GotFrameBufferUpdate = GotFrameBufferUpdateCallback;
-  mRfb->GetPassword = GetPasswordCallback;
-  mRfb->GetCredential = GetCredentialsCallback;
-
-  mRfb->programName = "Zoneminder VNC Monitor";
-  mRfb->serverHost = strdup(mHost.c_str());
-  mRfb->serverPort = atoi(mPort.c_str());
-  scale.init();
-}
-
-void VncCamera::Terminate() {
-  if ( mRfb->frameBuffer )
-    free(mRfb->frameBuffer);
-  (*rfbClientCleanup_f)(mRfb);
-  return;
+  if (capture and mRfb) {
+    if (mRfb->frameBuffer)
+      free(mRfb->frameBuffer);
+    (*rfbClientCleanup_f)(mRfb);
+  }
+  if (libvnc_lib) {
+    dlclose(libvnc_lib);
+    libvnc_lib = nullptr;
+  }
 }
 
 int VncCamera::PrimeCapture() {
+  if (libvnc_lib == nullptr) {
+    Error("No libvnc shared lib bound.");
+    return -1;
+  }
   Debug(1, "Priming capture from %s", mHost.c_str());
-  if ( ! (*rfbInitClient_f)(mRfb, 0, nullptr) ) {
+
+  if (!mRfb) {
+    mVncData.buffer = nullptr;
+    mVncData.width = 0;
+    mVncData.height = 0;
+
+    // TODO, support 8bit or 24bit
+    mRfb = (*rfbGetClient_f)(8 /* bits per sample */, 3 /* samples per pixel */, 4 /* bytes Per Pixel */);
+    mRfb->MallocFrameBuffer = resize;
+
+    (*rfbClientSetClientData_f)(mRfb, &TAG_0, &mVncData);
+    (*rfbClientSetClientData_f)(mRfb, &TAG_1, (void *)mPass.c_str());
+    (*rfbClientSetClientData_f)(mRfb, &TAG_2, (void *)mUser.c_str());
+
+    mRfb->GotFrameBufferUpdate = GotFrameBufferUpdateCallback;
+    mRfb->GetPassword = GetPasswordCallback;
+    mRfb->GetCredential = GetCredentialsCallback;
+
+    mRfb->programName = "Zoneminder VNC Monitor";
+    if (mRfb->serverHost) free(mRfb->serverHost);
+    mRfb->serverHost = strdup(mHost.c_str());
+    mRfb->serverPort = atoi(mPort.c_str());
+		if (!mRfb->serverPort) {
+			Debug(1, "Defaulting to port 5900");
+			mRfb->serverPort = 5900;
+		}
+
+	} else {
+		Debug(1, "mRfb already exists?");
+  }
+  if (!(*rfbInitClient_f)(mRfb, 0, nullptr)) {
+    /* IF rfbInitClient fails, it calls rdbClientCleanup which will free mRfb */
+    mRfb = nullptr;
     return -1; 
   }
-  return 0;
+  if (((unsigned int)mRfb->width != width) or ((unsigned int)mRfb->height != height)) {
+    Warning("Specified dimensions do not match screen size monitor: (%dx%d) != vnc: (%dx%d)",
+        width, height, mRfb->width, mRfb->height);
+  }
+  getVideoStream();
+
+  return 1;
 }
 
 int VncCamera::PreCapture() {
-  Debug(2, "PreCapture");
   int rc = (*WaitForMessage_f)(mRfb, 500);
-  if ( rc < 0 ) {
+  if (rc < 0) {
     return -1;
-  } else if ( !rc ) {
+  } else if (!rc) {
     return rc;
   }
   rfbBool res = (*HandleRFBServerMessage_f)(mRfb);
+  Debug(3, "PreCapture rc from HandleMessage %d", res == TRUE ? 1 : -1);
   return res == TRUE ? 1 : -1;
 }
 
-int VncCamera::Capture(Image &image) {
-  Debug(2, "Capturing");
-  uint8_t *directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
-  scale.Convert(
-      mVncData.buffer,
-      mRfb->si.framebufferHeight * mRfb->si.framebufferWidth * 4,
+int VncCamera::Capture(ZMPacket &zm_packet) {
+  if (!mVncData.buffer) {
+    Debug(1, "No buffer");
+    return 0;
+  }
+  if (!zm_packet.image) {
+    Debug(1, "Allocating image %dx%d %dcolours = %d", width, height, colours, colours*pixels);
+    zm_packet.image = new Image(width, height, colours, subpixelorder);
+  }
+  zm_packet.keyframe = 1;
+  zm_packet.codec_type = AVMEDIA_TYPE_VIDEO;
+  zm_packet.packet.stream_index = mVideoStreamId;
+  zm_packet.stream = mVideoStream;
+
+  uint8_t *directbuffer = zm_packet.image->WriteBuffer(width, height, colours, subpixelorder);
+  Debug(1, "scale src %p, %d, dest %p %d %d %dx%d %dx%d", mVncData.buffer,
+      mRfb->si.framebufferWidth * mRfb->si.framebufferHeight * 4,
       directbuffer,
-      width * height * mBpp,
+      width * height * colours,
+      mImgPixFmt,
+      mRfb->si.framebufferWidth,
+      mRfb->si.framebufferHeight,
+      width,
+      height);
+
+  int rc = scale.Convert(
+      mVncData.buffer,
+      mRfb->si.framebufferWidth * mRfb->si.framebufferHeight * 4,
+      //SWScale::GetBufferSize(AV_PIX_FMT_RGBA, mRfb->si.framebufferWidth, mRfb->si.framebufferHeight),
+      directbuffer,
+      width * height * colours,
       AV_PIX_FMT_RGBA,
       mImgPixFmt,
       mRfb->si.framebufferWidth,
       mRfb->si.framebufferHeight,
       width,
       height);
-  return 1;
+  return rc == 0 ? 1 : rc;
 }
 
 int VncCamera::PostCapture() {
-  return 0;
-}
-
-int VncCamera::CaptureAndRecord(Image &image, timeval recording, char* event_directory) {
-  return 0;
+  return 1;
 }
 
 int VncCamera::Close() {
-  return 0;
+  return 1;
 }
 #endif
diff --git a/src/zm_libvnc_camera.h b/src/zm_libvnc_camera.h
index 250cfaa2e..caa1bb1da 100644
--- a/src/zm_libvnc_camera.h
+++ b/src/zm_libvnc_camera.h
@@ -2,16 +2,21 @@
 #ifndef ZN_LIBVNC_CAMERA_H
 #define ZN_LIBVNC_CAMERA_H
 
-#include "zm_buffer.h"
 #include "zm_camera.h"
-#include "zm_thread.h"
 #include "zm_swscale.h"
 
 #if HAVE_LIBVNC
 #include <rfb/rfbclient.h>
+
+// Older versions of libvncserver defined a max macro in rfb/rfbproto.h
+// Undef it here so it doesn't collide with std::max
+// TODO: Remove this once xenial support is dropped
+#ifdef max
+#undef max
+#endif
+
 // Used by vnc callbacks
-struct VncPrivateData
-{
+struct VncPrivateData {
   uint8_t *buffer;
   uint8_t width; 
   uint8_t height;
@@ -21,7 +26,6 @@ class VncCamera : public Camera {
 protected:
   rfbClient *mRfb;
   VncPrivateData mVncData;
-  int mBpp;
   SWScale scale;
   AVPixelFormat mImgPixFmt;
   std::string mHost;
@@ -30,7 +34,7 @@ protected:
   std::string mPass;
 public:
   VncCamera(
-      unsigned int p_monitor_id,
+      const Monitor *monitor,
       const std::string &host,
       const std::string &port,
       const std::string &user,
@@ -43,19 +47,15 @@ public:
       int p_hue,
       int p_colour,
       bool p_capture,
-      bool p_record_audio );
+      bool p_record_audio);
     
   ~VncCamera();
 
-  void Initialise();
-  void Terminate();
-  
-  int PreCapture();
-  int PrimeCapture();
-  int Capture( Image &image );
-  int PostCapture();
-  int CaptureAndRecord( Image &image, timeval recording, char* event_directory );
-  int Close();
+  int PreCapture() override;
+  int PrimeCapture() override;
+  int Capture(ZMPacket &packet) override;
+  int PostCapture() override;
+  int Close() override;
 };
 
 #endif // HAVE_LIBVNC
diff --git a/src/zm_local_camera.cpp b/src/zm_local_camera.cpp
index 38c7dae0e..7e97ecd08 100644
--- a/src/zm_local_camera.cpp
+++ b/src/zm_local_camera.cpp
@@ -17,20 +17,15 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-#include "zm.h"
-
-#if ZM_HAS_V4L
-
 #include "zm_local_camera.h"
 
-#include <sys/types.h>
-#include <sys/stat.h>
+#include "zm_packet.h"
+#include "zm_utils.h"
 #include <fcntl.h>
-#include <unistd.h>
 #include <sys/mman.h>
-#include <errno.h>
-#include <stdlib.h>
-#include <limits.h>
+#include <sys/stat.h>
+
+#if ZM_HAS_V4L
 
 /* Workaround for GNU/kFreeBSD and FreeBSD */
 #if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
@@ -40,6 +35,7 @@
 #endif
 
 static unsigned int BigEndian;
+static bool primed;
 
 static int vidioctl(int fd, int request, void *arg) {
   int result = -1;
@@ -148,6 +144,7 @@ static _AVPIXELFORMAT getFfPixFormatFromV4lPalette(int v4l_version, int palette)
         {
           Fatal("Can't find swscale format for palette %d", palette);
           break;
+#if 0
           // These are all spare and may match some of the above
           pixFormat = AV_PIX_FMT_YUVJ420P;
           pixFormat = AV_PIX_FMT_YUVJ422P;
@@ -173,6 +170,7 @@ static _AVPIXELFORMAT getFfPixFormatFromV4lPalette(int v4l_version, int palette)
           //pixFormat = AV_PIX_FMT_VDPAU_H264;
           //pixFormat = AV_PIX_FMT_VDPAU_MPEG1;
           //pixFormat = AV_PIX_FMT_VDPAU_MPEG2;
+#endif
         }
     } // end switch palette
   } // end if v4l2
@@ -215,6 +213,7 @@ static _AVPIXELFORMAT getFfPixFormatFromV4lPalette(int v4l_version, int palette)
         {
           Fatal("Can't find swscale format for palette %d", palette);
           break;
+#if 0
           // These are all spare and may match some of the above
           pixFormat = AV_PIX_FMT_YUVJ420P;
           pixFormat = AV_PIX_FMT_YUVJ422P;
@@ -241,6 +240,7 @@ static _AVPIXELFORMAT getFfPixFormatFromV4lPalette(int v4l_version, int palette)
           //pixFormat = AV_PIX_FMT_VDPAU_H264;
           //pixFormat = AV_PIX_FMT_VDPAU_MPEG1;
           //pixFormat = AV_PIX_FMT_VDPAU_MPEG2;
+#endif
         }
     } // end switch palette
   } // end if v4l1
@@ -285,7 +285,6 @@ static const uint32_t prefered_gray8_formats[] = {
 };
 #endif
 
-
 int LocalCamera::camera_count = 0;
 int LocalCamera::channel_count = 0;
 int LocalCamera::channels[VIDEO_MAX_FRAME];
@@ -308,7 +307,7 @@ AVFrame **LocalCamera::capturePictures = nullptr;
 LocalCamera *LocalCamera::last_camera = nullptr;
 
 LocalCamera::LocalCamera(
-  int p_id,
+  const Monitor *monitor,
   const std::string &p_device,
   int p_channel,
   int p_standard,
@@ -324,15 +323,15 @@ LocalCamera::LocalCamera(
   int p_hue,
   int p_colour,
   bool p_capture,
-	bool p_record_audio,
+  bool p_record_audio,
   unsigned int p_extras) :
-    Camera( p_id, LOCAL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
-  device( p_device ),
-  channel( p_channel ),
-  standard( p_standard ),
-  palette( p_palette ),
-  channel_index( 0 ),
-  extras ( p_extras )
+    Camera(monitor, LOCAL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio),
+  device(p_device),
+  channel(p_channel),
+  standard(p_standard),
+  palette(p_palette),
+  channel_index(0),
+  extras(p_extras)
 {
   // If we are the first, or only, input on this device then
   // do the initial opening etc
@@ -343,10 +342,10 @@ LocalCamera::LocalCamera(
 
   if ( capture ) {
     if ( device_prime ) {
-      Debug( 2, "V4L support enabled, using V4L%d api", v4l_version );
+      Debug(2, "V4L support enabled, using V4L%d api", v4l_version);
     }
 
-    if ( !last_camera || channel != last_camera->channel ) {
+    if ( (!last_camera) || (channel != last_camera->channel) ) {
       // We are the first, or only, input that uses this channel
       channel_prime = true;
       channel_index = channel_count++;
@@ -362,10 +361,10 @@ LocalCamera::LocalCamera(
   uint32_t checkval = 0xAABBCCDD;
   if ( *(unsigned char*)&checkval == 0xDD ) {
     BigEndian = 0;
-    Debug(2,"little-endian processor detected");
+    Debug(2, "little-endian processor detected");
   } else if ( *(unsigned char*)&checkval == 0xAA ) {
     BigEndian = 1;
-    Debug(2,"Big-endian processor detected");
+    Debug(2, "Big-endian processor detected");
   } else {
     Error("Unable to detect the processor's endianness. Assuming little-endian.");
     BigEndian = 0;
@@ -388,19 +387,19 @@ LocalCamera::LocalCamera(
   }
 #endif
 
-  if ( capture ) {
-    if ( last_camera ) {
-      if ( (p_method == "v4l2" && v4l_version != 2) || (p_method == "v4l1" && v4l_version != 1) ) 
-        Fatal( "Different Video For Linux version used for monitors sharing same device" );
+  if (capture) {
+    if (last_camera) {
+      if ((p_method == "v4l2" && v4l_version != 2) || (p_method == "v4l1" && v4l_version != 1)) 
+        Fatal("Different Video For Linux version used for monitors sharing same device");
 
-      if ( standard != last_camera->standard )
-        Warning( "Different video standards defined for monitors sharing same device, results may be unpredictable or completely wrong" );
+      if (standard != last_camera->standard)
+        Warning("Different video standards defined for monitors sharing same device, results may be unpredictable or completely wrong");
 
-      if ( palette != last_camera->palette )
-        Warning( "Different video palettes defined for monitors sharing same device, results may be unpredictable or completely wrong" );
+      if (palette != last_camera->palette)
+        Warning("Different video palettes defined for monitors sharing same device, results may be unpredictable or completely wrong");
 
-      if ( width != last_camera->width || height != last_camera->height )
-        Warning( "Different capture sizes defined for monitors sharing same device, results may be unpredictable or completely wrong" );
+      if (width != last_camera->width or height != last_camera->height)
+        Warning("Different capture sizes defined for monitors sharing same device, results may be unpredictable or completely wrong");
     }
 
 #if HAVE_LIBSWSCALE
@@ -428,10 +427,6 @@ LocalCamera::LocalCamera(
       /* RGB24 palette and 24bit target colourspace */
     } else if ( palette == V4L2_PIX_FMT_RGB24 && colours == ZM_COLOUR_RGB24 ) {
       conversion_type = 0;
-      subpixelorder = ZM_SUBPIX_ORDER_RGB;
-
-      /* BGR24 palette and 24bit target colourspace */
-    } else if ( palette == V4L2_PIX_FMT_BGR24 && colours == ZM_COLOUR_RGB24 ) {
       conversion_type = 0;
       subpixelorder = ZM_SUBPIX_ORDER_BGR;
 
@@ -452,7 +447,7 @@ LocalCamera::LocalCamera(
 #if HAVE_LIBSWSCALE
       /* Try using swscale for the conversion */
       conversion_type = 1; 
-      Debug(2,"Using swscale for image conversion");
+      Debug(2, "Using swscale for image conversion");
       if ( colours == ZM_COLOUR_RGB32 ) {
         subpixelorder = ZM_SUBPIX_ORDER_RGBA;
         imagePixFormat = AV_PIX_FMT_RGBA;
@@ -595,15 +590,15 @@ LocalCamera::LocalCamera(
           conversion_type = 2; /* Try ZM format conversions */
         }
       }
-#else
-      /* Don't have swscale, see what we can do */
-      conversion_type = 2;
-#endif
+
       /* Our YUYV->Grayscale conversion is a lot faster than swscale's */
       if ( colours == ZM_COLOUR_GRAY8 && (palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422) ) {
         conversion_type = 2;
       }
-
+#else
+      /* Don't have swscale, see what we can do */
+      conversion_type = 2;
+#endif
       if ( conversion_type == 2 ) {
         Debug(2,"Using ZM for image conversion");
         if ( palette == VIDEO_PALETTE_RGB32 && colours == ZM_COLOUR_GRAY8 ) {
@@ -645,17 +640,17 @@ LocalCamera::LocalCamera(
         } else {
           Fatal("Unable to find a suitable format conversion for the selected palette and target colorspace.");
         }
-      }
+      } // end if conversion_type == 2
     }
   }
 #endif // ZM_HAS_V4L1    
 
   last_camera = this;
-  Debug(3,"Selected subpixelorder: %u",subpixelorder);
+  Debug(3, "Selected subpixelorder: %u", subpixelorder);
 
 #if HAVE_LIBSWSCALE
   /* Initialize swscale stuff */
-  if ( capture && conversion_type == 1 ) {
+  if ( capture and (conversion_type == 1) ) {
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
     tmpPicture = av_frame_alloc();
 #else
@@ -670,10 +665,13 @@ LocalCamera::LocalCamera(
     unsigned int pSize = avpicture_get_size(imagePixFormat, width, height);
 #endif
     if ( pSize != imagesize ) {
-      Fatal("Image size mismatch. Required: %d Available: %u", pSize, imagesize);
+      Fatal("Image size mismatch. Required: %d Available: %llu", pSize, imagesize);
     }
 
-    imgConversionContext = sws_getContext(width, height, capturePixFormat, width, height, imagePixFormat, SWS_BICUBIC, nullptr, nullptr, nullptr);
+    imgConversionContext = sws_getContext(
+        width, height, capturePixFormat,
+        width, height, imagePixFormat, SWS_BICUBIC,
+        nullptr, nullptr, nullptr);
 
     if ( !imgConversionContext ) {
       Fatal("Unable to initialise image scaling context");
@@ -681,8 +679,10 @@ LocalCamera::LocalCamera(
   } else {
     tmpPicture = nullptr;
     imgConversionContext = nullptr;
-  }
+  } // end if capture and conversion_tye == swscale
 #endif
+  if ( capture and device_prime )
+    Initialise();
 } // end LocalCamera::LocalCamera
 
 LocalCamera::~LocalCamera() {
@@ -691,23 +691,17 @@ LocalCamera::~LocalCamera() {
 
 #if HAVE_LIBSWSCALE
   /* Clean up swscale stuff */
-  if ( capture && conversion_type == 1 ) {
+  if ( capture && (conversion_type == 1) ) {
     sws_freeContext(imgConversionContext);
     imgConversionContext = nullptr;
 
     av_frame_free(&tmpPicture);
   }
 #endif
-}
+    
+} // end LocalCamera::~LocalCamera
 
 void LocalCamera::Initialise() {
-#if HAVE_LIBSWSCALE
-  if ( logDebugging() )
-    av_log_set_level(AV_LOG_DEBUG);
-  else
-    av_log_set_level(AV_LOG_QUIET);
-#endif // HAVE_LIBSWSCALE
-
   Debug(3, "Opening video device %s", device.c_str());
   //if ( (vid_fd = open( device.c_str(), O_RDWR|O_NONBLOCK, 0 )) < 0 )
   if ( (vid_fd = open(device.c_str(), O_RDWR, 0)) < 0 )
@@ -781,7 +775,7 @@ void LocalCamera::Initialise() {
       }
     } else {        
       if ( vidioctl(vid_fd, VIDIOC_S_FMT, &v4l2_data.fmt) < 0 ) {
-        Fatal("Failed to set video format: %s", strerror(errno));
+        Error("Failed to set video format: %s", strerror(errno));
       }
     }
 
@@ -807,6 +801,13 @@ void LocalCamera::Initialise() {
         , v4l2_data.fmt.fmt.pix.priv
         );
 
+    if ( v4l2_data.fmt.fmt.pix.width != width ) {
+      Warning("Failed to set requested width");
+    }
+    if ( v4l2_data.fmt.fmt.pix.height != height ) {
+      Warning("Failed to set requested height");
+    }
+
     /* Buggy driver paranoia. */
     unsigned int min;
     min = v4l2_data.fmt.fmt.pix.width * 2;
@@ -840,8 +841,8 @@ void LocalCamera::Initialise() {
           if ( vidioctl(vid_fd, VIDIOC_G_JPEGCOMP, &jpeg_comp) < 0 ) {
             Debug(3,"Failed to get updated JPEG compression options: %s", strerror(errno));
           } else {
-            Debug(4, "JPEG quality: %d",jpeg_comp.quality);
-            Debug(4, "JPEG markers: %#x",jpeg_comp.jpeg_markers);
+            Debug(4, "JPEG quality: %d, markers: %#x",
+                jpeg_comp.quality, jpeg_comp.jpeg_markers);
           }
         }
       }
@@ -924,7 +925,8 @@ void LocalCamera::Initialise() {
 #else
       avpicture_fill(
           (AVPicture *)capturePictures[i],
-          (uint8_t*)v4l2_data.buffers[i].start, capturePixFormat,
+          (uint8_t*)v4l2_data.buffers[i].start,
+          capturePixFormat,
           v4l2_data.fmt.fmt.pix.width,
           v4l2_data.fmt.fmt.pix.height
           );
@@ -949,12 +951,12 @@ void LocalCamera::Initialise() {
     }
 
     if ( (input.std != V4L2_STD_UNKNOWN) && ((input.std & standard) == V4L2_STD_UNKNOWN) ) {
-      Fatal("Device does not support video standard %d", standard);
+      Error("Device does not support video standard %d", standard);
     }
 
     stdId = standard;
-    if ( (input.std != V4L2_STD_UNKNOWN) && (vidioctl(vid_fd, VIDIOC_S_STD, &stdId) < 0) )   {
-      Fatal("Failed to set video standard %d: %d %s", standard, errno, strerror(errno));
+    if ((vidioctl(vid_fd, VIDIOC_S_STD, &stdId) < 0)) {
+      Error("Failed to set video standard %d: %d %s", standard, errno, strerror(errno));
     }
 
     Contrast(contrast);
@@ -1172,11 +1174,12 @@ void LocalCamera::Terminate() {
       Error("Failed to munmap buffers: %s", strerror(errno));
 
     delete[] v4l1_data.buffers;
-  }
+  } // end if using v4l1
 #endif // ZM_HAS_V4L1
 
   close(vid_fd);
-} // end Terminate
+  primed = false;
+} // end LocalCamera::Terminate
 
 uint32_t LocalCamera::AutoSelectFormat(int p_colours) {
   /* Automatic format selection */
@@ -1268,13 +1271,16 @@ uint32_t LocalCamera::AutoSelectFormat(int p_colours) {
 
 #endif /* ZM_HAS_V4L2 */
   return selected_palette;
-}
-
+} //uint32_t LocalCamera::AutoSelectFormat(int p_colours)
 
 #define capString(test,prefix,yesString,noString,capability) \
   (test) ? (prefix yesString " " capability "\n") : (prefix noString " " capability "\n")
 
-bool LocalCamera::GetCurrentSettings(const char *device, char *output, int version, bool verbose) {
+bool LocalCamera::GetCurrentSettings(
+    const char *device,
+    char *output,
+    int version,
+    bool verbose) {
   output[0] = 0;
   char *output_ptr = output;
 
@@ -1412,20 +1418,20 @@ bool LocalCamera::GetCurrentSettings(const char *device, char *output, int versi
         if ( verbose )
           output_ptr += sprintf(
               output_ptr,
-              "  %s (0x%02hhx%02hhx%02hhx%02hhx)\n",
+              "  %s (0x%02x%02x%02x%02x)\n",
               format.description,
-              (format.pixelformat>>24)&0xff,
-              (format.pixelformat>>16)&0xff,
-              (format.pixelformat>>8)&0xff,
-              format.pixelformat&0xff);
+              (format.pixelformat >> 24) & 0xff,
+              (format.pixelformat >> 16) & 0xff,
+              (format.pixelformat >> 8) & 0xff,
+              format.pixelformat & 0xff);
         else
           output_ptr += sprintf(
               output_ptr,
-              "0x%02hhx%02hhx%02hhx%02hhx/",
-              (format.pixelformat>>24)&0xff,
-              (format.pixelformat>>16)&0xff,
-              (format.pixelformat>>8)&0xff,
-              (format.pixelformat)&0xff);
+              "0x%02x%02x%02x%02x/",
+              (format.pixelformat >> 24) & 0xff,
+              (format.pixelformat >> 16) & 0xff,
+              (format.pixelformat >> 8) & 0xff,
+              format.pixelformat & 0xff);
       } while ( formatIndex++ >= 0 );
 
       if ( !verbose )
@@ -1766,7 +1772,7 @@ bool LocalCamera::GetCurrentSettings(const char *device, char *output, int versi
   return true;
 }
 
-int LocalCamera::Brightness( int p_brightness ) {
+int LocalCamera::Brightness(int p_brightness) {
 #if ZM_HAS_V4L2
   if ( v4l_version == 2 ) {
     struct v4l2_control vid_control;
@@ -1820,7 +1826,7 @@ int LocalCamera::Brightness( int p_brightness ) {
   return -1;
 }
 
-int LocalCamera::Hue( int p_hue ) {
+int LocalCamera::Hue(int p_hue) {
 #if ZM_HAS_V4L2
   if ( v4l_version == 2 ) {
     struct v4l2_control vid_control;
@@ -1830,9 +1836,9 @@ int LocalCamera::Hue( int p_hue ) {
 
     if ( vidioctl(vid_fd, VIDIOC_G_CTRL, &vid_control) < 0 ) {
       if ( errno != EINVAL )
-        Error("Unable to query hue: %s", strerror(errno))
+        Error("Unable to query hue: %s", strerror(errno));
       else
-        Warning("Hue control is not supported")
+        Warning("Hue control is not supported");
     } else if ( p_hue >= 0 ) {
       vid_control.value = p_hue;
 
@@ -1973,23 +1979,30 @@ int LocalCamera::Contrast( int p_contrast ) {
 }
 
 int LocalCamera::PrimeCapture() {
-  Initialise();
+  getVideoStream();
+  if ( !device_prime )
+    return 1;
 
   Debug(2, "Priming capture");
 #if ZM_HAS_V4L2
   if ( v4l_version == 2 ) {
-    Debug(3, "Queueing buffers");
+    Debug(3, "Queueing (%d) buffers", v4l2_data.reqbufs.count);
     for ( unsigned int frame = 0; frame < v4l2_data.reqbufs.count; frame++ ) {
       struct v4l2_buffer vid_buf;
 
       memset(&vid_buf, 0, sizeof(vid_buf));
+      if ( v4l2_data.fmt.type != V4L2_BUF_TYPE_VIDEO_CAPTURE ) {
+        Warning("Unknown type: (%d)", v4l2_data.fmt.type);
+      }
 
       vid_buf.type = v4l2_data.fmt.type;
       vid_buf.memory = v4l2_data.reqbufs.memory;
       vid_buf.index = frame;
 
-      if ( vidioctl(vid_fd, VIDIOC_QBUF, &vid_buf) < 0 )
-        Fatal("Failed to queue buffer %d: %s", frame, strerror(errno));
+      if (vidioctl(vid_fd, VIDIOC_QBUF, &vid_buf) < 0) {
+        Error("Failed to queue buffer %d: %s", frame, strerror(errno));
+        return 0;
+      }
     }
     v4l2_data.bufptr = nullptr;
 
@@ -1997,9 +2010,11 @@ int LocalCamera::PrimeCapture() {
     //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
     //enum v4l2_buf_type type = v4l2_data.fmt.type;
     enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
-    if ( vidioctl(vid_fd, VIDIOC_STREAMON, &type) < 0 )
-      Fatal("Failed to start capture stream: %s", strerror(errno));
-  }
+    if (vidioctl(vid_fd, VIDIOC_STREAMON, &type) < 0) {
+      Error("Failed to start capture stream: %s", strerror(errno));
+      return -1;
+    }
+  }  // end if v4l_version == 2
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
   if ( v4l_version == 1 ) {
@@ -2013,16 +2028,16 @@ int LocalCamera::PrimeCapture() {
   }
 #endif // ZM_HAS_V4L1
 
-  return 0;
+  return 1;
 } // end LocalCamera::PrimeCapture
 
 int LocalCamera::PreCapture() {
   //Debug(5, "Pre-capturing");
-  return 0;
+  return 1;
 }
 
-int LocalCamera::Capture(Image &image) {
-  Debug(3, "Capturing");
+int LocalCamera::Capture(ZMPacket &zm_packet) {
+  // We assume that the avpacket is allocated, and just needs to be filled
   static uint8_t* buffer = nullptr;
   int buffer_bytesused = 0;
   int capture_frame = -1;
@@ -2044,7 +2059,6 @@ int LocalCamera::Capture(Image &image) {
       memset(&vid_buf, 0, sizeof(vid_buf));
 
       vid_buf.type = v4l2_data.fmt.type;
-      //vid_buf.memory = V4L2_MEMORY_MMAP;
       vid_buf.memory = v4l2_data.reqbufs.memory;
 
       Debug(3, "Capturing %d frames", captures_per_frame);
@@ -2057,6 +2071,7 @@ int LocalCamera::Capture(Image &image) {
           }
           return -1;
         }
+        Debug(5, "Captured a frame");
 
         v4l2_data.bufptr = &vid_buf;
         capture_frame = v4l2_data.bufptr->index;
@@ -2076,11 +2091,17 @@ int LocalCamera::Capture(Image &image) {
       buffer_bytesused = v4l2_data.bufptr->bytesused;
       bytes += buffer_bytesused;
 
-      if ( (v4l2_data.fmt.fmt.pix.width * v4l2_data.fmt.fmt.pix.height) !=  (width * height) ) {
-        Fatal("Captured image dimensions differ: V4L2: %dx%d monitor: %dx%d",
-            v4l2_data.fmt.fmt.pix.width,v4l2_data.fmt.fmt.pix.height,width,height);
+      if ( (v4l2_data.fmt.fmt.pix.width * v4l2_data.fmt.fmt.pix.height) > (width * height) ) {
+        Fatal("Captured image dimensions larger than image buffer: V4L2: %dx%d monitor: %dx%d",
+            v4l2_data.fmt.fmt.pix.width, v4l2_data.fmt.fmt.pix.height, width, height);
+      } else if ( (v4l2_data.fmt.fmt.pix.width * v4l2_data.fmt.fmt.pix.height) != (width * height) ) {
+        Error("Captured image dimensions differ: V4L2: %dx%d monitor: %dx%d",
+            v4l2_data.fmt.fmt.pix.width, v4l2_data.fmt.fmt.pix.height, width, height);
       }
     } // end if v4l2
+#if ZM_HAS_V4L1
+    else 
+#endif // ZM_HAS_V4L1
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
     if ( v4l_version == 1 ) {
@@ -2108,64 +2129,6 @@ int LocalCamera::Capture(Image &image) {
       buffer = v4l1_data.bufptr+v4l1_data.frames.offsets[capture_frame];
     }
 #endif // ZM_HAS_V4L1
-  } /* prime capture */    
-
-  if ( conversion_type != 0 ) {
-
-    Debug(3, "Performing format conversion");
-
-    /* Request a writeable buffer of the target image */
-    uint8_t* directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
-    if ( directbuffer == nullptr ) {
-      Error("Failed requesting writeable buffer for the captured image.");
-      return -1;
-    }
-#if HAVE_LIBSWSCALE
-    if ( conversion_type == 1 ) {
-
-      Debug(9, "Calling sws_scale to perform the conversion");
-      /* Use swscale to convert the image directly into the shared memory */
-#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-      av_image_fill_arrays(tmpPicture->data,
-          tmpPicture->linesize, directbuffer,
-          imagePixFormat, width, height, 1);
-#else
-      avpicture_fill( (AVPicture *)tmpPicture, directbuffer,
-          imagePixFormat, width, height );
-#endif
-      sws_scale( imgConversionContext,
-          capturePictures[capture_frame]->data,
-          capturePictures[capture_frame]->linesize,
-          0,
-          height,
-          tmpPicture->data,
-          tmpPicture->linesize );
-    }
-#endif  
-    if ( conversion_type == 2 ) {
-      Debug(9, "Calling the conversion function");
-      /* Call the image conversion function and convert directly into the shared memory */
-      (*conversion_fptr)(buffer, directbuffer, pixels);
-    } else if ( conversion_type == 3 ) {
-      Debug(9, "Decoding the JPEG image");
-      /* JPEG decoding */
-      image.DecodeJpeg(buffer, buffer_bytesused, colours, subpixelorder);
-    }
-
-  } else {
-    Debug(3, "No format conversion performed. Assigning the image");
-
-    /* No conversion was performed, the image is in the V4L buffers and needs to be copied into the shared memory */
-    image.Assign( width, height, colours, subpixelorder, buffer, imagesize);
-  }
-
-  return 1;
-} // end int LocalCamera::Capture()
-
-int LocalCamera::PostCapture() {
-  Debug(4, "Post-capturing");
-  // Requeue the buffer unless we need to switch or are a duplicate camera on a channel
-  if ( channel_count > 1 || channel_prime ) {
 #if ZM_HAS_V4L2
     if ( v4l_version == 2 ) {
       if ( channel_count > 1 ) {
@@ -2177,9 +2140,8 @@ int LocalCamera::PostCapture() {
         }
 
         v4l2_std_id stdId = standards[next_channel];
-        if ( vidioctl( vid_fd, VIDIOC_S_STD, &stdId ) < 0 ) {
+        if ( vidioctl(vid_fd, VIDIOC_S_STD, &stdId) < 0 ) {
           Error("Failed to set video format %d: %s", standards[next_channel], strerror(errno));
-          return -1;
         }
       }
       if ( v4l2_data.bufptr ) {
@@ -2189,9 +2151,12 @@ int LocalCamera::PostCapture() {
           return -1;
         }
       } else {
-        Error("Unable to requeue buffer due to not v4l2_data")
+        Error("Unable to requeue buffer due to not v4l2_data");
       }
     }
+#if ZM_HAS_V4L1
+    else
+#endif // ZM_HAS_V4L1
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
     if ( v4l_version == 1 ) {
@@ -2223,8 +2188,72 @@ int LocalCamera::PostCapture() {
       v4l1_data.active_frame = (v4l1_data.active_frame+1)%v4l1_data.frames.frames;
     }
 #endif // ZM_HAS_V4L1
-  }
-  return 0;
-}
 
+  } /* prime capture */    
+
+  if (!zm_packet.image) {
+    Debug(4, "Allocating image");
+    zm_packet.image = new Image(width, height, colours, subpixelorder);
+  }
+
+  if ( conversion_type != 0 ) {
+    Debug(3, "Performing format conversion %d", conversion_type);
+
+    /* Request a writeable buffer of the target image */
+    uint8_t *directbuffer = zm_packet.image->WriteBuffer(width, height, colours, subpixelorder);
+    if ( directbuffer == nullptr ) {
+      Error("Failed requesting writeable buffer for the captured image.");
+      return -1;
+    }
+#if HAVE_LIBSWSCALE
+    if ( conversion_type == 1 ) {
+      Debug(9, "Calling sws_scale to perform the conversion");
+      /* Use swscale to convert the image directly into the shared memory */
+#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
+      av_image_fill_arrays(tmpPicture->data,
+          tmpPicture->linesize, directbuffer,
+          imagePixFormat, width, height, 1);
+#else
+      avpicture_fill( (AVPicture *)tmpPicture, directbuffer,
+          imagePixFormat, width, height );
+#endif
+      sws_scale(
+          imgConversionContext,
+          capturePictures[capture_frame]->data,
+          capturePictures[capture_frame]->linesize,
+          0,
+          height,
+          tmpPicture->data,
+          tmpPicture->linesize
+          );
+    } else
+#endif  
+    if ( conversion_type == 2 ) {
+      Debug(9, "Calling the conversion function");
+      /* Call the image conversion function and convert directly into the shared memory */
+      (*conversion_fptr)(buffer, directbuffer, pixels);
+    } else if ( conversion_type == 3 ) {
+      // Need to store the jpeg data too
+      Debug(9, "Decoding the JPEG image");
+      /* JPEG decoding */
+      zm_packet.image->DecodeJpeg(buffer, buffer_bytesused, colours, subpixelorder);
+    }
+
+  } else {
+    Debug(3, "No format conversion performed. Assigning the image");
+
+    /* No conversion was performed, the image is in the V4L buffers and needs to be copied into the shared memory */
+    zm_packet.image->Assign(width, height, colours, subpixelorder, buffer, imagesize);
+  } // end if doing conversion or not
+
+  zm_packet.packet.stream_index = mVideoStreamId;
+  zm_packet.stream = mVideoStream;
+  zm_packet.codec_type = AVMEDIA_TYPE_VIDEO;
+  zm_packet.keyframe = 1;
+  return 1;
+} // end int LocalCamera::Capture()
+
+int LocalCamera::PostCapture() {
+  return 1;
+}
 #endif // ZM_HAS_V4L
diff --git a/src/zm_local_camera.h b/src/zm_local_camera.h
index d06631c23..6d3ff2672 100644
--- a/src/zm_local_camera.h
+++ b/src/zm_local_camera.h
@@ -20,10 +20,7 @@
 #ifndef ZM_LOCAL_CAMERA_H
 #define ZM_LOCAL_CAMERA_H
 
-#include "zm.h"
 #include "zm_camera.h"
-#include "zm_image.h"
-#include "zm_packetqueue.h"
 
 #if ZM_HAS_V4L
 
@@ -42,25 +39,20 @@
 #define VIDEO_MAX_FRAME               32
 #endif
 
-#include "zm_ffmpeg.h"
-
 //
 // Class representing 'local' cameras, i.e. those which are
 // directly connect to the host machine and which are accessed
 // via a video interface.
 //
-class LocalCamera : public Camera
-{
+class LocalCamera : public Camera {
 protected:
 #if ZM_HAS_V4L2
-    struct V4L2MappedBuffer
-    {
+    struct V4L2MappedBuffer {
         void    *start;
         size_t  length;
     };
 
-    struct V4L2Data
-    {
+    struct V4L2Data {
         v4l2_cropcap        cropcap;
         v4l2_crop           crop;
         v4l2_format         fmt;
@@ -71,8 +63,7 @@ protected:
 #endif // ZM_HAS_V4L2
 
 #if ZM_HAS_V4L1
-    struct V4L1Data
-    {
+    struct V4L1Data {
         int active_frame;
         video_mbuf frames;
         video_mmap *buffers;
@@ -123,7 +114,7 @@ protected:
 
 public:
   LocalCamera(
-    int p_id,
+    const Monitor *monitor,
     const std::string &device,
     int p_channel,
     int p_format,
@@ -146,26 +137,25 @@ public:
   void Initialise();
   void Terminate();
 
-  const std::string &Device() const { return( device ); }
+  const std::string &Device() const { return device; }
 
-  int Channel() const { return( channel ); }
-  int Standard() const { return( standard ); }
-  int Palette() const { return( palette ); }
-  int Extras() const { return( extras ); }
+  int Channel() const { return channel; }
+  int Standard() const { return standard; }
+  int Palette() const { return palette; }
+  int Extras() const { return extras; }
 
-  int Brightness( int p_brightness=-1 );
-  int Hue( int p_hue=-1 );
-  int Colour( int p_colour=-1 );
-  int Contrast( int p_contrast=-1 );
+  int Brightness( int p_brightness=-1 ) override;
+  int Hue( int p_hue=-1 ) override;
+  int Colour( int p_colour=-1 ) override;
+  int Contrast( int p_contrast=-1 ) override;
 
-  int PrimeCapture();
-  int PreCapture();
-  int Capture( Image &image );
-  int PostCapture();
-  int CaptureAndRecord( Image &image, timeval recording, char* event_directory ) {return(0);};
-  int Close() { return 0; };
+  int PrimeCapture() override;
+  int PreCapture() override;
+  int Capture(ZMPacket &p) override;
+  int PostCapture() override;
+  int Close() override { return 0; };
 
-  static bool GetCurrentSettings( const char *device, char *output, int version, bool verbose );
+  static bool GetCurrentSettings(const char *device, char *output, int version, bool verbose);
 };
 
 #endif // ZM_HAS_V4L
diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index 29361b5a9..dd03ec9f2 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -19,23 +19,21 @@
 
 #include "zm_logger.h"
 
-#include "zm_config.h"
-#include "zm_utils.h"
 #include "zm_db.h"
-
-#include <unistd.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/time.h>
-#include <syslog.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <errno.h>
+#include "zm_utils.h"
 #include <libgen.h>
+#include <syslog.h>
+#include <sys/time.h>
+#include <unistd.h>
+
 #ifdef __FreeBSD__
 #include <sys/thr.h>
 #endif
+#include <cerrno>
+#include <csignal>
+#include <cstdarg>
+#include <cstring>
+
 
 bool Logger::smInitialised = false;
 Logger *Logger::smInstance = nullptr;
@@ -43,18 +41,6 @@ Logger *Logger::smInstance = nullptr;
 Logger::StringMap Logger::smCodes;
 Logger::IntMap Logger::smSyslogPriorities;
 
-#if 0
-static void subtractTime( struct timeval * const tp1, struct timeval * const tp2 ) {
-  tp1->tv_sec -= tp2->tv_sec;
-  if ( tp1->tv_usec <= tp2->tv_usec ) {
-    tp1->tv_sec--;
-    tp1->tv_usec = 1000000 - (tp2->tv_usec - tp1->tv_usec);
-  } else {
-    tp1->tv_usec = tp1->tv_usec - tp2->tv_usec;
-  }
-}
-#endif
-
 void Logger::usrHandler(int sig) {
   Logger *logger = fetch();
   if ( sig == SIGUSR1 )
@@ -73,16 +59,15 @@ Logger::Logger() :
   mEffectiveLevel(NOLOG),
   mDbConnected(false),
   mLogPath(staticConfig.PATH_LOGS.c_str()),
-  //mLogFile( mLogPath+"/"+mId+".log" ),
+  //  mLogFile( mLogPath+"/"+mId+".log" ),
   mLogFileFP(nullptr),
   mHasTerminal(false),
   mFlush(false) {
-
-  if ( smInstance ) {
+  if (smInstance) {
     Panic("Attempt to create second instance of Logger class");
   }
 
-  if ( !smInitialised ) {
+  if (!smInitialised) {
     smCodes[INFO] = "INF";
     smCodes[WARNING] = "WAR";
     smCodes[ERROR] = "ERR";
@@ -97,16 +82,16 @@ Logger::Logger() :
     smSyslogPriorities[PANIC] = LOG_ERR;
 
     char code[4] = "";
-    for ( int i = DEBUG1; i <= DEBUG9; i++ ) {
+    for (int i = DEBUG1; i <= DEBUG9; i++) {
       snprintf(code, sizeof(code), "DB%d", i);
       smCodes[i] = code;
       smSyslogPriorities[i] = LOG_DEBUG;
     }
 
     smInitialised = true;
-  }
+  }  // end if ! smInitialised
 
-  if ( fileno(stderr) && isatty(fileno(stderr)) ) {
+  if (fileno(stderr) && isatty(fileno(stderr))) {
     mHasTerminal = true;
     mTerminalLevel = WARNING;
   }
@@ -117,14 +102,6 @@ Logger::~Logger() {
   smCodes.clear();
   smSyslogPriorities.clear();
   smInitialised = false;
-#if 0
-  for ( StringMap::iterator itr = smCodes.begin(); itr != smCodes.end(); itr ++ ) {
-      smCodes.erase( itr );
-  }
-  for ( IntMap::iterator itr = smSyslogPriorities.begin(); itr != smSyslogPriorities.end(); itr ++ ) {
-      smSyslogPriorities.erase(itr);
-  }
-#endif
 }
 
 void Logger::initialise(const std::string &id, const Options &options) {
@@ -149,24 +126,24 @@ void Logger::initialise(const std::string &id, const Options &options) {
 
   Level tempLevel = INFO;
   Level tempTerminalLevel = mTerminalLevel;
-  Level tempDatabaseLevel = mDatabaseLevel;
-  Level tempFileLevel = mFileLevel;
-  Level tempSyslogLevel = mSyslogLevel;
 
   if ( options.mTerminalLevel != NOOPT )
     tempTerminalLevel = options.mTerminalLevel;
 
-  // DEBUG1 == 1.  So >= DEBUG1, we set to DEBUG9?! Why?
+  // DEBUG1 == 1.  So >= DEBUG1, we set to DEBUG9?! Why? icon: because log_level_database only goes up to debug.
+  Level tempDatabaseLevel;
   if ( options.mDatabaseLevel != NOOPT )
     tempDatabaseLevel = options.mDatabaseLevel;
   else
     tempDatabaseLevel = config.log_level_database >= DEBUG1 ? DEBUG9 : config.log_level_database;
 
+  Level tempFileLevel;
   if ( options.mFileLevel != NOOPT )
     tempFileLevel = options.mFileLevel;
   else
     tempFileLevel = config.log_level_file >= DEBUG1 ? DEBUG9 : config.log_level_file;
 
+  Level tempSyslogLevel;
   if ( options.mSyslogLevel != NOOPT )
     tempSyslogLevel = options.mSyslogLevel;
   else
@@ -189,7 +166,7 @@ void Logger::initialise(const std::string &id, const Options &options) {
     tempSyslogLevel = atoi(envPtr);
 
   if ( config.log_debug ) {
-    StringVector targets = split(config.log_debug_target, "|");
+    StringVector targets = Split(config.log_debug_target, "|");
     for ( unsigned int i = 0; i < targets.size(); i++ ) {
       const std::string &target = targets[i];
       if ( target == mId || target == "_"+mId || target == "_"+mIdRoot || target == "" ) {
@@ -201,7 +178,7 @@ void Logger::initialise(const std::string &id, const Options &options) {
           }
         }
       }
-    } // end foreach target
+    }  // end foreach target
   } else {
     // if we don't have debug turned on, then the max effective log level is INFO
     if ( tempSyslogLevel > INFO ) tempSyslogLevel = INFO;
@@ -209,7 +186,7 @@ void Logger::initialise(const std::string &id, const Options &options) {
     if ( tempTerminalLevel > INFO ) tempTerminalLevel = INFO;
     if ( tempDatabaseLevel > INFO ) tempDatabaseLevel = INFO;
     if ( tempLevel > INFO ) tempLevel = INFO;
-  } // end if config.log_debug
+  }  // end if config.log_debug
 
   logFile(tempLogFile);
 
@@ -283,9 +260,7 @@ std::string Logger::strEnv(const std::string &name, const std::string &defaultVa
 }
 
 char *Logger::getTargettedEnv(const std::string &name) {
-  std::string envName;
-
-  envName = name+"_"+mId;
+  std::string envName = name+"_"+mId;
   char *envPtr = getenv(envName.c_str());
   if ( !envPtr && mId != mIdRoot ) {
     envName = name+"_"+mIdRoot;
@@ -322,9 +297,7 @@ const std::string &Logger::id(const std::string &id) {
 
 Logger::Level Logger::level(Logger::Level level) {
   if ( level > NOOPT ) {
-    level = limit(level);
-    if ( mLevel != level )
-      mLevel = level;
+    mLevel = limit(level);
 
     mEffectiveLevel = NOLOG;
     if ( mTerminalLevel > mEffectiveLevel )
@@ -349,35 +322,33 @@ Logger::Level Logger::terminalLevel(Logger::Level terminalLevel) {
   if ( terminalLevel > NOOPT ) {
     if ( !mHasTerminal )
       terminalLevel = NOLOG;
-    terminalLevel = limit(terminalLevel);
-    if ( mTerminalLevel != terminalLevel )
-      mTerminalLevel = terminalLevel;
+    mTerminalLevel = limit(terminalLevel);
   }
   return mTerminalLevel;
 }
 
 Logger::Level Logger::databaseLevel(Logger::Level databaseLevel) {
-  if ( databaseLevel > NOOPT ) {
+  if (databaseLevel > NOOPT) {
     databaseLevel = limit(databaseLevel);
-    if ( mDatabaseLevel != databaseLevel ) {
-      if ( (databaseLevel > NOLOG) && (mDatabaseLevel <= NOLOG) ) { // <= NOLOG would be NOOPT
-        if ( !zmDbConnect() ) {
+    if (mDatabaseLevel != databaseLevel) {
+      if ((databaseLevel > NOLOG) && (mDatabaseLevel <= NOLOG)) { // <= NOLOG would be NOOPT
+        if (!zmDbConnected) {
           databaseLevel = NOLOG;
         }
-      }  // end if ( databaseLevel > NOLOG && mDatabaseLevel <= NOLOG )
+      }
       mDatabaseLevel = databaseLevel;
-    }  // end if ( mDatabaseLevel != databaseLevel )
-  }  // end if ( databaseLevel > NOOPT )
+    }
+  }
 
   return mDatabaseLevel;
 }
 
 Logger::Level Logger::fileLevel(Logger::Level fileLevel) {
-  if ( fileLevel > NOOPT ) {
+  if (fileLevel > NOOPT) {
     fileLevel = limit(fileLevel);
     // Always close, because we may have changed file names
-    if ( mFileLevel > NOLOG )
-	    closeFile();
+    if (mFileLevel > NOLOG)
+      closeFile();
     mFileLevel = fileLevel;
     // Don't try to open it here because it will create the log file even if we never write to it.
   }
@@ -385,13 +356,13 @@ Logger::Level Logger::fileLevel(Logger::Level fileLevel) {
 }
 
 Logger::Level Logger::syslogLevel(Logger::Level syslogLevel) {
-  if ( syslogLevel > NOOPT ) {
+  if (syslogLevel > NOOPT) {
     syslogLevel = limit(syslogLevel);
-    if ( mSyslogLevel != syslogLevel ) {
-      if ( mSyslogLevel > NOLOG )
+    if (mSyslogLevel != syslogLevel) {
+      if (mSyslogLevel > NOLOG)
         closeSyslog();
       mSyslogLevel = syslogLevel;
-      if ( mSyslogLevel > NOLOG )
+      if (mSyslogLevel > NOLOG)
         openSyslog();
     }
   }
@@ -401,31 +372,31 @@ Logger::Level Logger::syslogLevel(Logger::Level syslogLevel) {
 void Logger::logFile(const std::string &logFile) {
   bool addLogPid = false;
   std::string tempLogFile = logFile;
-  if ( tempLogFile[tempLogFile.length()-1] == '+' ) {
+  if (tempLogFile[tempLogFile.length()-1] == '+') {
     tempLogFile.resize(tempLogFile.length()-1);
     addLogPid = true;
   }
-  if ( addLogPid )
+  if (addLogPid)
     mLogFile = stringtf("%s.%05d", tempLogFile.c_str(), getpid());
   else
     mLogFile = tempLogFile;
 }
 
 void Logger::openFile() {
-  if ( mLogFile.size() ) {
-   if ( (mLogFileFP = fopen(mLogFile.c_str(), "a")) == nullptr ) {
-    mFileLevel = NOLOG;
-    Error("fopen() for %s, error = %s", mLogFile.c_str(), strerror(errno));
-   }
+  if (mLogFile.size()) {
+    if ( (mLogFileFP = fopen(mLogFile.c_str(), "a")) == nullptr ) {
+      mFileLevel = NOLOG;
+      Error("fopen() for %s, error = %s", mLogFile.c_str(), strerror(errno));
+    }
   } else {
     puts("Called Logger::openFile() without a filename");
   }
 }
 
 void Logger::closeFile() {
-  if ( mLogFileFP ) {
+  if (mLogFileFP) {
     fflush(mLogFileFP);
-    if ( fclose(mLogFileFP) < 0 ) {
+    if (fclose(mLogFileFP) < 0) {
       mLogFileFP = nullptr;
       Error("fclose(), error = %s", strerror(errno));
     }
@@ -434,7 +405,6 @@ void Logger::closeFile() {
 }
 
 void Logger::closeDatabase() {
-
 }
 
 void Logger::openSyslog() {
@@ -445,25 +415,22 @@ void Logger::closeSyslog() {
   (void) closelog();
 }
 
-void Logger::logPrint(bool hex, const char * const filepath, const int line, const int level, const char *fstring, ...) {
-  
-  if ( level > mEffectiveLevel ) {
-    return;
-  }
+void Logger::logPrint(bool hex, const char *filepath, int line, int level, const char *fstring, ...) {
+  if (level > mEffectiveLevel) return;
+  if (level < PANIC || level > DEBUG9)
+    Panic("Invalid logger level %d", level);
     
   log_mutex.lock();
+  // Can we save some cycles by having these as members and not allocate them on the fly? I think so.
   char            timeString[64];
-  char            logString[8192];
+  char            logString[4096]; // SQL TEXT can hold 64k so we could go up to 32k here but why?
   va_list         argPtr;
   struct timeval  timeVal;
 
-  char *filecopy = strdup(filepath);
-  const char * const file = basename(filecopy);
+  const char *base = strrchr(filepath, '/');
+  const char *file = base ? base+1 : filepath;
   const char *classString = smCodes[level].c_str();
 
-  if ( level < PANIC || level > DEBUG9 )
-    Panic("Invalid logger level %d", level);
-
   gettimeofday(&timeVal, nullptr);
 
 #if 0
@@ -476,7 +443,8 @@ void Logger::logPrint(bool hex, const char * const filepath, const int line, con
   } else {
 #endif
     char *timePtr = timeString;
-    timePtr += strftime(timePtr, sizeof(timeString), "%x %H:%M:%S", localtime(&timeVal.tv_sec));
+    tm now_tm = {};
+    timePtr += strftime(timePtr, sizeof(timeString), "%x %H:%M:%S", localtime_r(&timeVal.tv_sec, &now_tm));
     snprintf(timePtr, sizeof(timeString)-(timePtr-timeString), ".%06ld", timeVal.tv_usec);
 #if 0
   }
@@ -492,12 +460,12 @@ void Logger::logPrint(bool hex, const char * const filepath, const int line, con
 #else
   #ifdef HAVE_SYSCALL
     #ifdef __FreeBSD_kernel__
-    if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
+    if ((syscall(SYS_thr_self, &tid)) < 0)  // Thread/Process id
 
     # else
       // SOLARIS doesn't have SYS_gettid; don't assume
       #ifdef SYS_gettid
-    if ( (tid = syscall(SYS_gettid)) < 0 ) // Thread/Process id
+    if ((tid = syscall(SYS_gettid)) < 0)  // Thread/Process id
       #endif // SYS_gettid
     #endif
   #endif // HAVE_SYSCALL
@@ -529,80 +497,70 @@ void Logger::logPrint(bool hex, const char * const filepath, const int line, con
   }
   va_end(argPtr);
   char *syslogEnd = logPtr;
+
+  if ( static_cast<size_t>(logPtr - logString) >= sizeof(logString) ) {
+    // vsnprintf won't exceed the the buffer, but it might hit the end.
+    logPtr = logString + sizeof(logString)-3;
+  }
   strncpy(logPtr, "]\n", sizeof(logString)-(logPtr-logString));
 
-  if ( level <= mTerminalLevel ) {
+  if (level <= mTerminalLevel) {
     puts(logString);
     fflush(stdout);
   }
-  if ( level <= mFileLevel ) {
-    if ( !mLogFileFP ) {
-      log_mutex.unlock();
+
+  if (level <= mFileLevel) {
+    if (!mLogFileFP) {
+      // FIXME unlocking here is a problem. Another thread could sneak in.
+      // We are using a recursive mutex so unlocking shouldn't be neccessary
+      //log_mutex.unlock();
+      // We do this here so that we only create the file if we ever write to it.
       openFile();
-      log_mutex.lock();
+      //log_mutex.lock();
     }
-    if ( mLogFileFP ) {
+    if (mLogFileFP) {
       fputs(logString, mLogFileFP);
-      if ( mFlush )
-        fflush(mLogFileFP);
-    } else {
-      puts("Logging to file, but failed to open it\n");
+      if (mFlush) fflush(mLogFileFP);
+    } else if (mTerminalLevel != NOLOG) {
+      puts("Logging to file but failed to open it\n");
     }
-#if 0
-  } else {
-    printf("Not writing to log file because level %d %s <= mFileLevel %d %s\nstring: %s\n",
-        level, smCodes[level].c_str(), mFileLevel, smCodes[mFileLevel].c_str(), logString);
-#endif
-  }
-  *syslogEnd = '\0';
-  if ( level <= mDatabaseLevel ) {
-    char sql[ZM_SQL_MED_BUFSIZ];
-    char escapedString[(strlen(syslogStart)*2)+1];
+  }  // end if level <= mFileLevel
 
-    if ( !db_mutex.trylock() ) {
-      mysql_real_escape_string(&dbconn, escapedString, syslogStart, strlen(syslogStart));
+  if (level <= mDatabaseLevel) {
+    if (zmDbConnected) {
+      int syslogSize = syslogEnd-syslogStart;
+      char escapedString[(syslogSize*2)+1];
+      mysql_real_escape_string(&dbconn, escapedString, syslogStart, syslogSize);
 
-      snprintf(sql, sizeof(sql),
+      std::string sql_string = stringtf(
           "INSERT INTO `Logs` "
           "( `TimeKey`, `Component`, `ServerId`, `Pid`, `Level`, `Code`, `Message`, `File`, `Line` )"
-         " VALUES "
-         "( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
-         timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line
-         );
-      if ( mysql_query(&dbconn, sql) ) {
-        Level tempDatabaseLevel = mDatabaseLevel;
-        databaseLevel(NOLOG);
-        Error("Can't insert log entry: sql(%s) error(%s)", sql, mysql_error(&dbconn));
-        databaseLevel(tempDatabaseLevel);
-      }
-      db_mutex.unlock();
+          " VALUES "
+          "( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )",
+          timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line
+          );
+      dbQueue.push(std::move(sql_string));
     } else {
-      Level tempDatabaseLevel = mDatabaseLevel;
-      databaseLevel(NOLOG);
-      Error("Can't insert log entry: sql(%s) error(db is locked)", logString);
-      databaseLevel(tempDatabaseLevel);
+      puts("Db is closed");
     }
-  }
-  if ( level <= mSyslogLevel ) {
-    int priority = smSyslogPriorities[level];
-    //priority |= LOG_DAEMON;
-    syslog(priority, "%s [%s] [%s]", classString, mId.c_str(), syslogStart);
+  }  // end if level <= mDatabaseLevel
+
+  if (level <= mSyslogLevel) {
+    *syslogEnd = '\0';
+    syslog(smSyslogPriorities[level], "%s [%s] [%s]", classString, mId.c_str(), syslogStart);
   }
 
-  free(filecopy);
-  if ( level <= FATAL ) {
-    log_mutex.unlock();
+  log_mutex.unlock();
+  if (level <= FATAL) {
     logTerm();
     zmDbClose();
-    if ( level <= PANIC )
-      abort();
+    if (level <= PANIC) abort();
     exit(-1);
   }
-  log_mutex.unlock();
 }  // end logPrint
 
 void logInit(const char *name, const Logger::Options &options) {
-  if ( Logger::smInstance ) {
+  if (Logger::smInstance) {
     delete Logger::smInstance;
     Logger::smInstance = nullptr;
   }
@@ -612,7 +570,7 @@ void logInit(const char *name, const Logger::Options &options) {
 }
 
 void logTerm() {
-  if ( Logger::smInstance ) {
+  if (Logger::smInstance) {
     delete Logger::smInstance;
     Logger::smInstance = nullptr;
   }
diff --git a/src/zm_logger.h b/src/zm_logger.h
index 82144a1c9..d5a01be39 100644
--- a/src/zm_logger.h
+++ b/src/zm_logger.h
@@ -20,17 +20,16 @@
 #ifndef ZM_LOGGER_H
 #define ZM_LOGGER_H
 
+#include "zm_db.h"
 #include "zm_config.h"
-#include <stdint.h>
-#include <unistd.h>
-#include <string>
+#include "zm_define.h"
 #include <map>
+#include <mutex>
+#include <string>
+
 #ifdef HAVE_SYS_SYSCALL_H
 #include <sys/syscall.h>
 #endif // HAVE_SYS_SYSCALL_H
-#include <mysql/mysql.h>
-
-#include "zm_thread.h"
 
 class Logger {
 public:
@@ -90,7 +89,7 @@ private:
   static bool smInitialised;
   static Logger *smInstance;
 
-  RecursiveMutex log_mutex;
+  std::recursive_mutex log_mutex;
 
   static StringMap smCodes;
   static IntMap smSyslogPriorities;
@@ -121,7 +120,7 @@ private:
   Logger();
   ~Logger();
 
-  int limit(int level) {
+  int limit(const int level) const {
     if ( level > DEBUG9 )
       return DEBUG9;
     if ( level < NOLOG )
@@ -154,18 +153,12 @@ public:
   void terminate();
 
   const std::string &id(const std::string &id);
-  const std::string &id() const {
-    return mId;
-  }
+  const std::string &id() const { return mId; }
 
-  Level level() const {
-    return mLevel;
-  }
+  Level level() const { return mLevel; }
   Level level(Level=NOOPT);
 
-  bool debugOn() {
-    return mEffectiveLevel >= DEBUG1;
-  }
+  bool debugOn() const { return mEffectiveLevel >= DEBUG1; }
 
   Level terminalLevel(Level=NOOPT);
   Level databaseLevel(Level=NOOPT);
@@ -180,8 +173,13 @@ private:
   void closeSyslog();
   void closeDatabase();
 
-public:
-  void logPrint(bool hex, const char * const filepath, const int line, const int level, const char *fstring, ...);
+ public:
+  void logPrint(bool hex,
+                const char *filepath,
+                int line,
+                int level,
+                const char *fstring,
+                ...) __attribute__((format(printf, 6, 7)));
 };
 
 void logInit(const char *name, const Logger::Options &options=Logger::Options());
@@ -196,15 +194,19 @@ inline Logger::Level logDebugging() {
   return Logger::fetch()->debugOn();
 }
 
-#define logPrintf(logLevel,params...)  {\
-    if ( logLevel <= Logger::fetch()->level() )\
-      Logger::fetch()->logPrint( false, __FILE__, __LINE__, logLevel, ##params );\
-  }
+#define logPrintf(logLevel, params...)                                          \
+  do {                                                                          \
+    if (logLevel <= Logger::fetch()->level()) {                                 \
+      Logger::fetch()->logPrint(false, __FILE__, __LINE__, logLevel, ##params); \
+    }                                                                           \
+  } while (0)
 
-#define logHexdump(logLevel,data,len)  {\
-    if ( logLevel <= Logger::fetch()->level() )\
-      Logger::fetch()->logPrint( true, __FILE__, __LINE__, logLevel, "%p (%d)", data, len );\
-  }
+#define logHexdump(logLevel, data, len)                                                    \
+  do {                                                                                     \
+    if (logLevel <= Logger::fetch()->level()) {                                            \
+      Logger::fetch()->logPrint(true, __FILE__, __LINE__, logLevel, "%p (%d)", data, len); \
+    }                                                                                      \
+  } while (0)
 
 /* Debug compiled out */
 #ifndef DBG_OFF
diff --git a/src/zm_mem_utils.h b/src/zm_mem_utils.h
index 6ef1bdac5..72fb2b9aa 100644
--- a/src/zm_mem_utils.h
+++ b/src/zm_mem_utils.h
@@ -20,13 +20,12 @@
 #ifndef ZM_MEM_UTILS_H
 #define ZM_MEM_UTILS_H
 
-#include <stdlib.h>
-#include "zm.h"
+#include <cstdlib>
 
 inline void* zm_mallocaligned(unsigned int reqalignment, size_t reqsize) {
   uint8_t* retptr;
 #if HAVE_POSIX_MEMALIGN
-  if ( posix_memalign((void**)&retptr,reqalignment,reqsize) != 0 )
+  if ( posix_memalign((void**)&retptr, reqalignment, reqsize) != 0 )
     return nullptr;
   
   return retptr;
@@ -39,7 +38,7 @@ inline void* zm_mallocaligned(unsigned int reqalignment, size_t reqsize) {
   
   alloc = retptr + sizeof(void*);
   
-  if(((long)alloc % reqalignment) != 0)
+  if ( ((long)alloc % reqalignment) != 0 )
     alloc = alloc + (reqalignment - ((long)alloc % reqalignment));
   
   /* Store a pointer before to the start of the block, just before returned aligned memory */
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
index de245f854..9c58a8ffb 100644
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -17,44 +17,48 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <arpa/inet.h>
-#include <glob.h>
-#include <cinttypes>
-
-#include "zm.h"
-#include "zm_db.h"
-#include "zm_time.h"
-#include "zm_mpeg.h"
-#include "zm_signal.h"
 #include "zm_monitor.h"
-#include "zm_video.h"
+
+#include "zm_group.h"
 #include "zm_eventstream.h"
-#if ZM_HAS_V4L
-#include "zm_local_camera.h"
-#endif // ZM_HAS_V4L
+#include "zm_fifo.h"
+#include "zm_file_camera.h"
 #include "zm_remote_camera.h"
 #include "zm_remote_camera_http.h"
 #include "zm_remote_camera_nvsocket.h"
+#include "zm_signal.h"
+#include "zm_time.h"
+#include "zm_utils.h"
+#include "zm_zone.h"
+
+#if ZM_HAS_V4L
+#include "zm_local_camera.h"
+#endif // ZM_HAS_V4L
+
 #if HAVE_LIBAVFORMAT
 #include "zm_remote_camera_rtsp.h"
 #endif // HAVE_LIBAVFORMAT
-#include "zm_file_camera.h"
+
 #if HAVE_LIBAVFORMAT
 #include "zm_ffmpeg_camera.h"
 #endif // HAVE_LIBAVFORMAT
-#include "zm_fifo.h"
+
 #if HAVE_LIBVLC
 #include "zm_libvlc_camera.h"
 #endif // HAVE_LIBVLC
+
 #if HAVE_LIBCURL
 #include "zm_curl_camera.h"
 #endif // HAVE_LIBCURL
+
 #if HAVE_LIBVNC
 #include "zm_libvnc_camera.h"
 #endif // HAVE_LIBVNC
 
+#include <algorithm>
+#include <sys/types.h>
+#include <sys/stat.h>
+
 #if ZM_MEM_MAPPED
 #include <sys/mman.h>
 #include <fcntl.h>
@@ -71,19 +75,21 @@
 // This is the official SQL (and ordering of the fields) to load a Monitor.
 // It will be used whereever a Monitor dbrow is needed. WHERE conditions can be appended
 std::string load_monitor_sql =
-"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `LinkedMonitors`, "
-"`AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`,"
+"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `DecodingEnabled`, "
+"`LinkedMonitors`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`,"
 "`Device`, `Channel`, `Format`, `V4LMultiBuffer`, `V4LCapturesPerFrame`, " // V4L Settings
-"`Protocol`, `Method`, `Options`, `User`, `Pass`, `Host`, `Port`, `Path`, `Width`, `Height`, `Colours`, `Palette`, `Orientation`+0, `Deinterlacing`, "
+"`Protocol`, `Method`, `Options`, `User`, `Pass`, `Host`, `Port`, `Path`, `SecondPath`, `Width`, `Height`, `Colours`, `Palette`, `Orientation`+0, `Deinterlacing`, "
 "`DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, "
 "`SaveJPEGs`, `VideoWriter`, `EncoderParameters`, "
-//" OutputCodec, Encoder, OutputContainer, "
+"`OutputCodec`, `Encoder`, `OutputContainer`, "
 "`RecordAudio`, "
 "`Brightness`, `Contrast`, `Hue`, `Colour`, "
 "`EventPrefix`, `LabelFormat`, `LabelX`, `LabelY`, `LabelSize`,"
-"`ImageBufferCount`, `WarmupCount`, `PreEventCount`, `PostEventCount`, `StreamReplayBuffer`, `AlarmFrameCount`, "
+"`ImageBufferCount`, `MaxImageBufferCount`, `WarmupCount`, `PreEventCount`, `PostEventCount`, `StreamReplayBuffer`, `AlarmFrameCount`, "
 "`SectionLength`, `MinSectionLength`, `FrameSkip`, `MotionFrameSkip`, "
-"`FPSReportInterval`, `RefBlendPerc`, `AlarmRefBlendPerc`, `TrackMotion`, `Exif`, `SignalCheckPoints`, `SignalCheckColour` FROM `Monitors`";
+"`FPSReportInterval`, `RefBlendPerc`, `AlarmRefBlendPerc`, `TrackMotion`, `Exif`,"
+"`RTSPServer`, `RTSPStreamName`,"
+"`SignalCheckPoints`, `SignalCheckColour`, `Importance`-2 FROM `Monitors`";
 
 std::string CameraType_Strings[] = {
   "Local",
@@ -91,20 +97,22 @@ std::string CameraType_Strings[] = {
   "File",
   "Ffmpeg",
   "LibVLC",
+  "NVSOCKET",
   "CURL",
   "VNC",
 };
 
+std::string State_Strings[] = {
+  "IDLE",
+  "PREALARM",
+  "ALARM",
+  "ALERT",
+  "TAPE"
+};
 
-std::vector<std::string> split(const std::string &s, char delim) {
-  std::vector<std::string> elems;
-  std::stringstream ss(s);
-  std::string item;
-  while(std::getline(ss, item, delim)) {
-    elems.push_back(trimSpaces(item));
-  }
-  return elems;
-}
+std::string TriggerState_Strings[] = {
+  "Cancel", "On", "Off"
+};
 
 Monitor::MonitorLink::MonitorLink(unsigned int p_id, const char *p_name) :
   id(p_id),
@@ -116,14 +124,14 @@ Monitor::MonitorLink::MonitorLink(unsigned int p_id, const char *p_name) :
 
 #if ZM_MEM_MAPPED
   map_fd = -1;
-  snprintf(mem_file, sizeof(mem_file), "%s/zm.mmap.%d", staticConfig.PATH_MAP.c_str(), id);
+  snprintf(mem_file, sizeof(mem_file), "%s/zm.mmap.%u", staticConfig.PATH_MAP.c_str(), id);
 #else // ZM_MEM_MAPPED
   shm_id = 0;
 #endif // ZM_MEM_MAPPED
   mem_size = 0;
   mem_ptr = nullptr;
 
-  last_event = 0;
+  last_event_id = 0;
   last_state = IDLE;
 
   last_connect_time = 0;
@@ -140,7 +148,7 @@ bool Monitor::MonitorLink::connect() {
 
     mem_size = sizeof(SharedData) + sizeof(TriggerData);
 
-    Debug(1, "link.mem.size=%d", mem_size);
+    Debug(1, "link.mem.size=%jd", mem_size);
 #if ZM_MEM_MAPPED
     map_fd = open(mem_file, O_RDWR, (mode_t)0600);
     if ( map_fd < 0 ) {
@@ -167,26 +175,26 @@ bool Monitor::MonitorLink::connect() {
       disconnect();
       return false;
     } else if ( map_stat.st_size < mem_size ) {
-      Error("Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size);
+      Error("Got unexpected memory map file size %ld, expected %jd", map_stat.st_size, mem_size);
       disconnect();
       return false;
     }
 
     mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0);
     if ( mem_ptr == MAP_FAILED ) {
-      Error("Can't map file %s (%d bytes) to memory: %s", mem_file, mem_size, strerror(errno));
+      Error("Can't map file %s (%jd bytes) to memory: %s", mem_file, mem_size, strerror(errno));
       disconnect();
       return false;
     }
 #else // ZM_MEM_MAPPED
-    shm_id = shmget( (config.shm_key&0xffff0000)|id, mem_size, 0700 );
+    shm_id = shmget((config.shm_key&0xffff0000)|id, mem_size, 0700);
     if ( shm_id < 0 ) {
-      Debug(3, "Can't shmget link memory: %s", strerror(errno );
+      Debug(3, "Can't shmget link memory: %s", strerror(errno));
       connected = false;
       return false;
     }
     mem_ptr = (unsigned char *)shmat(shm_id, 0, 0);
-    if ( mem_ptr < (void *)0 ) {
+    if ((int)mem_ptr == -1) {
       Debug(3, "Can't shmat link memory: %s", strerror(errno));
       connected = false;
       return false;
@@ -203,13 +211,13 @@ bool Monitor::MonitorLink::connect() {
     }
 
     last_state = shared_data->state;
-    last_event = shared_data->last_event;
+    last_event_id = shared_data->last_event_id;
     connected = true;
 
     return true;
   }
   return false;
-}
+} // end bool Monitor::MonitorLink::connect()
 
 bool Monitor::MonitorLink::disconnect() {
   if ( connected ) {
@@ -233,190 +241,180 @@ bool Monitor::MonitorLink::disconnect() {
 
     shm_id = 0;
 
-    if ( shm_data.shm_nattch <= 1 ) {
-      if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 ) {
-        Debug( 3, "Can't shmctl: %s", strerror(errno) );
-        return( false );
+    if (shm_data.shm_nattch <= 1) {
+      if (shmctl(shm_id, IPC_RMID, 0) < 0) {
+        Debug(3, "Can't shmctl: %s", strerror(errno));
+        return false;
       }
     }
 
-    if ( shmdt( mem_ptr ) < 0 ) {
-      Debug( 3, "Can't shmdt: %s", strerror(errno) );
-      return( false );
+    if (shmdt(mem_ptr) < 0) {
+      Debug(3, "Can't shmdt: %s", strerror(errno));
+      return false;
     }
 
 #endif // ZM_MEM_MAPPED
     mem_size = 0;
     mem_ptr = nullptr;
   }
-  return( true );
+  return true;
 }
 
 bool Monitor::MonitorLink::isAlarmed() {
-  if ( !connected ) {
-    return( false );
+  if (!connected) {
+    return false;
   }
   return( shared_data->state == ALARM );
 }
 
 bool Monitor::MonitorLink::inAlarm() {
-  if ( !connected ) {
-    return( false );
+  if (!connected) {
+    return false;
   }
   return( shared_data->state == ALARM || shared_data->state == ALERT );
 }
 
 bool Monitor::MonitorLink::hasAlarmed() {
-  if ( shared_data->state == ALARM ) {
+  if (shared_data->state == ALARM) {
     return true;
-  } else if ( shared_data->last_event != last_event ) {
-    last_event = shared_data->last_event;
   }
+  last_event_id = shared_data->last_event_id;
   return false;
 }
 
-Monitor::Monitor(
-  unsigned int p_id,
-  const char *p_name,
-  const unsigned int p_server_id,
-  const unsigned int p_storage_id,
-  int p_function,
-  bool p_enabled,
-  const char *p_linked_monitors,
-  Camera *p_camera,
-  int p_orientation,
-  unsigned int p_deinterlacing,
-  const std::string &p_decoder_hwaccel_name,
-  const std::string &p_decoder_hwaccel_device,
-  int p_savejpegs,
-  VideoWriter p_videowriter,
-  std::string p_encoderparams,
-  bool p_record_audio,
-  const char *p_event_prefix,
-  const char *p_label_format,
-  const Coord &p_label_coord,
-  int p_label_size,
-  int p_image_buffer_count,
-  int p_warmup_count,
-  int p_pre_event_count,
-  int p_post_event_count,
-  int p_stream_replay_buffer,
-  int p_alarm_frame_count,
-  int p_section_length,
-  int p_min_section_length,
-  int p_frame_skip,
-  int p_motion_frame_skip,
-  double p_capture_max_fps,
-  double p_analysis_fps,
-  unsigned int p_analysis_update_delay,
-  int p_capture_delay,
-  int p_alarm_capture_delay,
-  int p_fps_report_interval,
-  int p_ref_blend_perc,
-  int p_alarm_ref_blend_perc,
-  bool p_track_motion,
-  int p_signal_check_points,
-  Rgb p_signal_check_colour,
-  bool p_embed_exif,
-  Purpose p_purpose,
-  int p_n_zones,
-  Zone *p_zones[]
-) : id( p_id ),
-  server_id( p_server_id ),
-  storage_id( p_storage_id ),
-  function( (Function)p_function ),
-  enabled( p_enabled ),
-    width( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Height():p_camera->Width() ),
-    height( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Width():p_camera->Height() ),
-  orientation( (Orientation)p_orientation ),
-  deinterlacing( p_deinterlacing ),
-  decoder_hwaccel_name(p_decoder_hwaccel_name),
-  decoder_hwaccel_device(p_decoder_hwaccel_device),
-  savejpegs( p_savejpegs ),
-  videowriter( p_videowriter ),
-  encoderparams( p_encoderparams ),
-  record_audio( p_record_audio ),
-  label_coord( p_label_coord ),
-  label_size( p_label_size ),
-  image_buffer_count( p_image_buffer_count ),
-  warmup_count( p_warmup_count ),
-  pre_event_count( p_pre_event_count ),
-  post_event_count( p_post_event_count ),
-  video_buffer_duration({0}),
-  stream_replay_buffer( p_stream_replay_buffer ),
-  section_length( p_section_length ),
-  min_section_length( p_min_section_length ),
-  frame_skip( p_frame_skip ),
-  motion_frame_skip( p_motion_frame_skip ),
-  capture_max_fps( p_capture_max_fps ),
-  analysis_fps( p_analysis_fps ),
-  analysis_update_delay( p_analysis_update_delay ),
-  capture_delay( p_capture_delay ),
-  alarm_capture_delay( p_alarm_capture_delay ),
-  alarm_frame_count( p_alarm_frame_count ),
-  fps_report_interval( p_fps_report_interval ),
-  ref_blend_perc( p_ref_blend_perc ),
-  alarm_ref_blend_perc( p_alarm_ref_blend_perc ),
-  track_motion( p_track_motion ),
-  signal_check_points(p_signal_check_points),
-  signal_check_colour( p_signal_check_colour ),
-  embed_exif( p_embed_exif ),
-  delta_image( width, height, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_NONE ),
-  ref_image( width, height, p_camera->Colours(), p_camera->SubpixelOrder() ),
-  purpose( p_purpose ),
+Monitor::Monitor() 
+ : id(0),
+  name(""),
+  server_id(0),
+  storage_id(0),
+  type(LOCAL),
+  function(NONE),
+  enabled(0),
+  decoding_enabled(0),
+  //protocol
+  //method
+  //options
+  //host
+  //port
+  //user
+  //pass
+  //path
+  //device 
+  palette(0),
+  channel(0),
+  format(0),
+
+  width(0),
+  height(0),
+  //v4l_multi_buffer
+  //v4l_captures_per_frame
+  orientation(ROTATE_0),
+  deinterlacing(0),
+  deinterlacing_value(0),
+  decoder_hwaccel_name(""),
+  decoder_hwaccel_device(""),
+  videoRecording(0),
+  rtsp_describe(0),
+
+  savejpegs(0),
+  colours(0),
+  videowriter(DISABLED),
+  encoderparams(""),
+  output_codec(0),
+  encoder(""),
+  output_container(""),
+  imagePixFormat(AV_PIX_FMT_NONE),
+  record_audio(0),
+//event_prefix
+//label_format
+  label_coord(Coord(0,0)),
+  label_size(0),
+  image_buffer_count(0),
+  max_image_buffer_count(0),
+  warmup_count(0),
+  pre_event_count(0),
+  post_event_count(0),
+  stream_replay_buffer(0),
+  section_length(0),
+  min_section_length(0),
+  adaptive_skip(false),
+  frame_skip(0),
+  motion_frame_skip(0),
+  analysis_fps_limit(0),
+  analysis_update_delay(0),
+  capture_delay(0),
+  alarm_capture_delay(0),
+  alarm_frame_count(0),
+  alert_to_alarm_frame_count(0),
+  fps_report_interval(0),
+  ref_blend_perc(0),
+  alarm_ref_blend_perc(0),
+  track_motion(0),
+  signal_check_points(0),
+  signal_check_colour(0),
+  embed_exif(0),
+  rtsp_server(0),
+  rtsp_streamname(""),
+  importance(0),
+  capture_max_fps(0),
+  purpose(QUERY),
+  last_camera_bytes(0),
+  event_count(0),
+  image_count(0),
+  last_capture_image_count(0),
+  analysis_image_count(0),
+  motion_frame_count(0),
+  last_motion_frame_count(0),
+  ready_count(0),
+  first_alarm_count(0),
+  last_alarm_count(0),
+  last_signal(false),
+  last_section_mod(0),
+  buffer_count(0),
+  state(IDLE),
+  start_time(0),
+  last_fps_time(0),
+  last_analysis_fps_time(0),
+  auto_resume_time(0),
   last_motion_score(0),
-  camera( p_camera ),
-  n_zones( p_n_zones ),
-  zones( p_zones ),
-  timestamps( nullptr ),
-  images( nullptr ),
-  privacy_bitmask( nullptr ),
-  event_delete_thread(nullptr)
+  event_close_mode(CLOSE_IDLE),
+#if ZM_MEM_MAPPED
+  map_fd(-1),
+  mem_file(""),
+#else // ZM_MEM_MAPPED
+  shm_id(-1),
+#endif // ZM_MEM_MAPPED
+  mem_size(0),
+  mem_ptr(nullptr),
+  shared_data(nullptr),
+  trigger_data(nullptr),
+  video_store_data(nullptr),
+  shared_timestamps(nullptr),
+  shared_images(nullptr),
+  video_stream_id(-1),
+  audio_stream_id(-1),
+  video_fifo(nullptr),
+  audio_fifo(nullptr),
+  camera(nullptr),
+  event(nullptr),
+  storage(nullptr),
+  videoStore(nullptr),
+  analysis_it(nullptr),
+  analysis_thread(nullptr),
+  decoder_it(nullptr),
+  decoder(nullptr),
+  dest_frame(nullptr),
+  convert_context(nullptr),
+  //zones(nullptr),
+  privacy_bitmask(nullptr),
+  n_linked_monitors(0),
+  linked_monitors(nullptr),
+  red_val(0),
+  green_val(0),
+  blue_val(0),
+  grayscale_val(0),
+  colour_val(0)
 {
-  if (analysis_fps > 0.0) {
-      uint64_t usec = round(1000000*pre_event_count/analysis_fps);
-      video_buffer_duration.tv_sec = usec/1000000;
-      video_buffer_duration.tv_usec = usec % 1000000;
-  }
-
-  strncpy(name, p_name, sizeof(name)-1);
-
-  strncpy(event_prefix, p_event_prefix, sizeof(event_prefix)-1);
-  strncpy(label_format, p_label_format, sizeof(label_format)-1);
-  Debug(1, "encoder params %s", encoderparams.c_str());
-
-  // Change \n to actual line feeds
-  char *token_ptr = label_format;
-  const char *token_string = "\n";
-  while ( ( token_ptr = strstr(token_ptr, token_string) ) ) {
-    if ( *(token_ptr+1) ) {
-      *token_ptr = '\n';
-      token_ptr++;
-      strcpy(token_ptr, token_ptr+1);
-    } else {
-      *token_ptr = '\0';
-      break;
-    }
-  }
-
-  /* Parse encoder parameters */
-  ParseEncoderParameters(encoderparams.c_str(), &encoderparamsvec);
-
-  fps = 0.0;
-  last_camera_bytes = 0;
-  event_count = 0;
-  image_count = 0;
-  ready_count = warmup_count;
-  first_alarm_count = 0;
-  last_alarm_count = 0;
-  state = IDLE;
-
-  if ( alarm_frame_count < 1 )
-    alarm_frame_count = 1;
-  else if ( alarm_frame_count > MAX_PRE_ALARM_FRAMES )
-    alarm_frame_count = MAX_PRE_ALARM_FRAMES;
-
-  auto_resume_time = 0;
 
   if ( strcmp(config.event_close_mode, "time") == 0 )
     event_close_mode = CLOSE_TIME;
@@ -425,48 +423,599 @@ Monitor::Monitor(
   else
     event_close_mode = CLOSE_IDLE;
 
-  Debug(1, "monitor purpose=%d", purpose);
+  event = 0;
+  last_section_mod = 0;
+
+  adaptive_skip = true;
+
+  videoStore = nullptr;
+}  // Monitor::Monitor
+
+/*
+  std::string load_monitor_sql =
+ "SELECT Id, Name, ServerId, StorageId, Type, Function+0, Enabled, DecodingEnabled, LinkedMonitors, "
+ "AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS,"
+ "Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings
+ "Protocol, Method, Options, User, Pass, Host, Port, Path, SecondPath, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, "
+ "SaveJPEGs, VideoWriter, EncoderParameters,
+ "OutputCodec, Encoder, OutputContainer, RecordAudio, "
+ "Brightness, Contrast, Hue, Colour, "
+ "EventPrefix, LabelFormat, LabelX, LabelY, LabelSize,"
+ "ImageBufferCount, `MaxImageBufferCount`, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, "
+ "SectionLength, MinSectionLength, FrameSkip, MotionFrameSkip, "
+ "FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif,"
+ "`RTSPServer`,`RTSPStreamName`,
+ "SignalCheckPoints, SignalCheckColour, Importance-2 FROM Monitors";
+*/
+
+void Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY) {
+  purpose = p;
+  int col = 0;
+
+  id = atoi(dbrow[col]); col++;
+  name = dbrow[col]; col++;
+  server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
+
+  storage_id = atoi(dbrow[col]); col++;
+  if (storage) delete storage;
+  storage = new Storage(storage_id);
+
+  if ( ! strcmp(dbrow[col], "Local") ) {
+    type = LOCAL;
+  } else if ( ! strcmp(dbrow[col], "Ffmpeg") ) {
+    type = FFMPEG;
+  } else if ( ! strcmp(dbrow[col], "Remote") ) {
+    type = REMOTE;
+  } else if ( ! strcmp(dbrow[col], "File") ) {
+    type = FILE;
+  } else if ( ! strcmp(dbrow[col], "NVSocket") ) {
+    type = NVSOCKET;
+  } else if ( ! strcmp(dbrow[col], "Libvlc") ) {
+    type = LIBVLC;
+  } else if ( ! strcmp(dbrow[col], "cURL") ) {
+    type = CURL;
+  } else if ( ! strcmp(dbrow[col], "VNC") ) {
+    type = VNC;
+  } else {
+    Fatal("Bogus monitor type '%s' for monitor %d", dbrow[col], id);
+  }
+  Debug(1, "Have camera type %s", CameraType_Strings[type].c_str());
+  col++;
+  function = (Function)atoi(dbrow[col]); col++;
+  enabled = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
+  decoding_enabled = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
+
+  ReloadLinkedMonitors(dbrow[col]); col++;
+
+  /* "AnalysisFPSLimit, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS," */
+  analysis_fps_limit = dbrow[col] ? strtod(dbrow[col], nullptr) : 0.0; col++;
+  analysis_update_delay = strtoul(dbrow[col++], nullptr, 0);
+  capture_delay = (dbrow[col] && atof(dbrow[col])>0.0)?int(DT_PREC_6/atof(dbrow[col])):0; col++;
+  alarm_capture_delay = (dbrow[col] && atof(dbrow[col])>0.0)?int(DT_PREC_6/atof(dbrow[col])):0; col++;
+
+  /* "Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, " // V4L Settings */
+  device = dbrow[col] ? dbrow[col] : ""; col++;
+  channel = atoi(dbrow[col]); col++;
+  format = atoi(dbrow[col]); col++;
+  v4l_multi_buffer = config.v4l_multi_buffer;
+  if ( dbrow[col] ) {
+    if (*dbrow[col] == '0' ) {
+      v4l_multi_buffer = false;
+    } else if ( *dbrow[col] == '1' ) {
+      v4l_multi_buffer = true;
+    }
+  }
+  col++;
+
+  v4l_captures_per_frame = 0;
+  if ( dbrow[col] ) {
+    v4l_captures_per_frame = atoi(dbrow[col]);
+  } else {
+    v4l_captures_per_frame = config.captures_per_frame;
+  }
+  col++;
+
+  /* "Protocol, Method, Options, User, Pass, Host, Port, Path, SecondPath, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, " */
+  protocol = dbrow[col] ? dbrow[col] : ""; col++;
+  method = dbrow[col] ? dbrow[col] : ""; col++;
+  options = dbrow[col] ? dbrow[col] : ""; col++;
+  user = dbrow[col] ? dbrow[col] : ""; col++;
+  pass = dbrow[col] ? dbrow[col] : ""; col++;
+  host = dbrow[col] ? dbrow[col] : ""; col++;
+  port = dbrow[col] ? dbrow[col] : ""; col++;
+  path = dbrow[col] ? dbrow[col] : ""; col++;
+  second_path = dbrow[col] ? dbrow[col] : ""; col++;
+  camera_width = atoi(dbrow[col]); col++;
+  camera_height = atoi(dbrow[col]); col++;
+  colours = atoi(dbrow[col]); col++;
+  palette = atoi(dbrow[col]); col++;
+  orientation = (Orientation)atoi(dbrow[col]); col++;
+  width = (orientation==ROTATE_90||orientation==ROTATE_270) ? camera_height : camera_width;
+  height = (orientation==ROTATE_90||orientation==ROTATE_270) ? camera_width : camera_height;
+  deinterlacing = atoi(dbrow[col]); col++;
+  deinterlacing_value = deinterlacing & 0xff;
+
+/*"`DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, " */
+  decoder_hwaccel_name = dbrow[col] ? dbrow[col] : ""; col++;
+  decoder_hwaccel_device = dbrow[col] ? dbrow[col] : ""; col++;
+  rtsp_describe = (dbrow[col] && *dbrow[col] != '0'); col++;
+
+
+/* "`SaveJPEGs`, `VideoWriter`, `EncoderParameters`, " */
+  savejpegs = atoi(dbrow[col]); col++;
+  videowriter = (VideoWriter)atoi(dbrow[col]); col++;
+  encoderparams = dbrow[col] ? dbrow[col] : ""; col++;
+
+/*"`OutputCodec`, `Encoder`, `OutputContainer`, " */
+  output_codec = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
+  encoder = dbrow[col] ? dbrow[col] : ""; col++;
+  output_container = dbrow[col] ? dbrow[col] : ""; col++;
+  record_audio = (*dbrow[col] != '0'); col++;
+
+ /* "Brightness, Contrast, Hue, Colour, " */
+  brightness = atoi(dbrow[col]); col++;
+  contrast = atoi(dbrow[col]); col++;
+  hue = atoi(dbrow[col]); col++;
+  colour = atoi(dbrow[col]); col++;
+
+  /* "EventPrefix, LabelFormat, LabelX, LabelY, LabelSize," */
+  event_prefix = dbrow[col] ? dbrow[col] : ""; col++;
+  label_format = dbrow[col] ? ReplaceAll(dbrow[col], "\\n", "\n") : ""; col++;
+  label_coord = Coord(atoi(dbrow[col]), atoi(dbrow[col+1])); col += 2;
+  label_size = atoi(dbrow[col]); col++;
+
+  /* "ImageBufferCount, `MaxImageBufferCount`, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, " */
+  image_buffer_count = atoi(dbrow[col]); col++;
+  max_image_buffer_count = atoi(dbrow[col]); col++;
+  warmup_count = atoi(dbrow[col]); col++;
+  pre_event_count = atoi(dbrow[col]); col++;
+  packetqueue.setPreEventVideoPackets(pre_event_count);
+  packetqueue.setMaxVideoPackets(max_image_buffer_count);
+  packetqueue.setKeepKeyframes(videowriter == PASSTHROUGH);
+  post_event_count = atoi(dbrow[col]); col++;
+  stream_replay_buffer = atoi(dbrow[col]); col++;
+  alarm_frame_count = atoi(dbrow[col]); col++;
+  if (alarm_frame_count < 1) alarm_frame_count = 1;
+  else if (alarm_frame_count > MAX_PRE_ALARM_FRAMES) alarm_frame_count = MAX_PRE_ALARM_FRAMES;
+
+ /* "SectionLength, MinSectionLength, FrameSkip, MotionFrameSkip, " */
+  section_length = atoi(dbrow[col]); col++;
+  min_section_length = atoi(dbrow[col]); col++;
+  frame_skip = atoi(dbrow[col]); col++;
+  motion_frame_skip = atoi(dbrow[col]); col++;
+
+ /* "FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif," */
+  fps_report_interval = atoi(dbrow[col]); col++;
+  ref_blend_perc = atoi(dbrow[col]); col++;
+  alarm_ref_blend_perc = atoi(dbrow[col]); col++;
+  track_motion = atoi(dbrow[col]); col++;
+  embed_exif = (*dbrow[col] != '0'); col++;
+
+ /* "`RTSPServer`,`RTSPStreamName`, */
+  rtsp_server = (*dbrow[col] != '0'); col++;
+  rtsp_streamname = dbrow[col]; col++;
+
+ /*"SignalCheckPoints, SignalCheckColour, Importance-2 FROM Monitors"; */
+  signal_check_points = atoi(dbrow[col]); col++;
+  signal_check_colour = strtol(dbrow[col][0] == '#' ? dbrow[col]+1 : dbrow[col], 0, 16); col++;
+
+  colour_val = rgb_convert(signal_check_colour, ZM_SUBPIX_ORDER_BGR); /* HTML colour code is actually BGR in memory, we want RGB */
+  colour_val = rgb_convert(colour_val, palette);
+  red_val = RED_VAL_BGRA(signal_check_colour);
+  green_val = GREEN_VAL_BGRA(signal_check_colour);
+  blue_val = BLUE_VAL_BGRA(signal_check_colour);
+  grayscale_val = signal_check_colour & 0xff; /* Clear all bytes but lowest byte */
+
+  importance = dbrow[col] ? atoi(dbrow[col]) : 0;// col++;
+
+  // How many frames we need to have before we start analysing
+  ready_count = std::max(warmup_count, pre_event_count);
+
+  last_alarm_count = 0;
+  state = IDLE;
+  last_signal = true;   // Defaulting to having signal so that we don't get a signal change on the first frame.
+                        // Instead initial failure to capture will cause a loss of signal change which I think makes more sense.
+  uint64_t image_size = width * height * colours;
+
+  if ( strcmp(config.event_close_mode, "time") == 0 )
+    event_close_mode = CLOSE_TIME;
+  else if ( strcmp(config.event_close_mode, "alarm") == 0 )
+    event_close_mode = CLOSE_ALARM;
+  else
+    event_close_mode = CLOSE_IDLE;
 
   mem_size = sizeof(SharedData)
        + sizeof(TriggerData)
        + sizeof(VideoStoreData) //Information to pass back to the capture process
-       + (image_buffer_count*sizeof(struct timeval))
-       + (image_buffer_count*camera->ImageSize())
+       + (image_buffer_count * sizeof(struct timeval))
+       + (image_buffer_count * image_size)
        + 64; /* Padding used to permit aligning the images buffer to 64 byte boundary */
 
-  Debug(1, "mem.size(%d) SharedData=%d TriggerData=%d VideoStoreData=%d timestamps=%d images=%dx%d = %" PRId64 " total=%" PRId64,
-      sizeof(mem_size),
-      sizeof(SharedData), sizeof(TriggerData), sizeof(VideoStoreData),
-      (image_buffer_count*sizeof(struct timeval)),
-      image_buffer_count, camera->ImageSize(), (image_buffer_count*camera->ImageSize()),
-     mem_size);
-  mem_ptr = nullptr;
+  Debug(1,
+        "mem.size(%zu) SharedData=%zu TriggerData=%zu VideoStoreData=%zu timestamps=%zu images=%dx%" PRIi64 " = %" PRId64 " total=%jd",
+        sizeof(mem_size),
+        sizeof(SharedData),
+        sizeof(TriggerData),
+        sizeof(VideoStoreData),
+        (image_buffer_count * sizeof(struct timeval)),
+        image_buffer_count,
+        image_size,
+        (image_buffer_count * image_size),
+        mem_size);
 
-  storage = new Storage(storage_id);
-  Debug(1, "Storage path: %s", storage->Path());
   // Should maybe store this for later use
-  char monitor_dir[PATH_MAX];
-  snprintf(monitor_dir, sizeof(monitor_dir), "%s/%d", storage->Path(), id);
+  std::string monitor_dir = stringtf("%s/%u", storage->Path(), id);
 
-  if ( purpose == CAPTURE ) {
-    if ( mkdir(monitor_dir, 0755) && ( errno != EEXIST ) ) {
-      Error("Can't mkdir %s: %s", monitor_dir, strerror(errno));
+  if ( purpose != QUERY ) {
+    LoadCamera();
+    ReloadZones();
+
+    if ( mkdir(monitor_dir.c_str(), 0755) && ( errno != EEXIST ) ) {
+      Error("Can't mkdir %s: %s", monitor_dir.c_str(), strerror(errno));
     }
 
-    if ( !this->connect() ) {
-      Error("unable to connect, but doing capture");
-      exit(-1);
-    }
+    // Do this here to save a few cycles with all the comparisons
+    decoding_enabled = !(
+        ( function == RECORD or function == NODECT )
+        and
+        ( savejpegs == 0 )
+        and
+        ( videowriter == PASSTHROUGH )
+        and
+        !decoding_enabled
+        );
+    Debug(1, "Decoding enabled: %d", decoding_enabled);
 
+    if ( config.record_diag_images ) {
+      if ( config.record_diag_images_fifo ) {
+        diag_path_ref = stringtf("%s/diagpipe-r-%d.jpg", staticConfig.PATH_SOCKS.c_str(), id);
+        diag_path_delta = stringtf("%s/diagpipe-d-%d.jpg", staticConfig.PATH_SOCKS.c_str(), id);
+        Fifo::fifo_create_if_missing(diag_path_ref.c_str());
+        Fifo::fifo_create_if_missing(diag_path_delta.c_str());
+      } else {
+        diag_path_ref = stringtf("%s/%d/diag-r.jpg", storage->Path(), id);
+        diag_path_delta = stringtf("%s/%d/diag-d.jpg", storage->Path(), id);
+      }
+    }
+  }  // end if purpose
+
+  Debug(1, "Loaded monitor %d(%s), %zu zones", id, name.c_str(), zones.size());
+} // Monitor::Load(MYSQL_ROW dbrow, bool load_zones=true, Purpose p = QUERY)
+
+void Monitor::LoadCamera() {
+  if (camera)
+    return;
+
+  switch (type) {
+    case LOCAL: {
+#if ZM_HAS_V4L
+      int extras = (deinterlacing >> 24) & 0xff;
+
+      camera = ZM::make_unique<LocalCamera>(this,
+                                            device,
+                                            channel,
+                                            format,
+                                            v4l_multi_buffer,
+                                            v4l_captures_per_frame,
+                                            method,
+                                            camera_width,
+                                            camera_height,
+                                            colours,
+                                            palette,
+                                            brightness,
+                                            contrast,
+                                            hue,
+                                            colour,
+                                            purpose == CAPTURE,
+                                            record_audio,
+                                            extras
+      );
+#else
+      Fatal("Not compiled with local v4l camera support");
+#endif
+      break;
+    }
+    case REMOTE: {
+      if (protocol == "http") {
+        camera = ZM::make_unique<RemoteCameraHttp>(this,
+                                                   method,
+                                                   host,
+                                                   port,
+                                                   path,
+                                                   camera_width,
+                                                   camera_height,
+                                                   colours,
+                                                   brightness,
+                                                   contrast,
+                                                   hue,
+                                                   colour,
+                                                   purpose == CAPTURE,
+                                                   record_audio
+        );
+      }
+#if HAVE_LIBAVFORMAT
+      else if (protocol == "rtsp") {
+        camera = ZM::make_unique<RemoteCameraRtsp>(this,
+                                                   method,
+                                                   host, // Host
+                                                   port, // Port
+                                                   path, // Path
+                                                   camera_width,
+                                                   camera_height,
+                                                   rtsp_describe,
+                                                   colours,
+                                                   brightness,
+                                                   contrast,
+                                                   hue,
+                                                   colour,
+                                                   purpose == CAPTURE,
+                                                   record_audio
+        );
+      }
+#endif // HAVE_LIBAVFORMAT
+      else {
+        Error("Unexpected remote camera protocol '%s'", protocol.c_str());
+      }
+      break;
+    }
+    case FILE: {
+      camera = ZM::make_unique<FileCamera>(this,
+                                           path.c_str(),
+                                           camera_width,
+                                           camera_height,
+                                           colours,
+                                           brightness,
+                                           contrast,
+                                           hue,
+                                           colour,
+                                           purpose == CAPTURE,
+                                           record_audio
+      );
+      break;
+    }
+#if HAVE_LIBAVFORMAT
+    case FFMPEG: {
+      camera = ZM::make_unique<FfmpegCamera>(this,
+                                             path,
+                                             second_path,
+                                             method,
+                                             options,
+                                             camera_width,
+                                             camera_height,
+                                             colours,
+                                             brightness,
+                                             contrast,
+                                             hue,
+                                             colour,
+                                             purpose == CAPTURE,
+                                             record_audio,
+                                             decoder_hwaccel_name,
+                                             decoder_hwaccel_device
+      );
+      break;
+    }
+#endif // HAVE_LIBAVFORMAT
+    case NVSOCKET: {
+      camera = ZM::make_unique<RemoteCameraNVSocket>(this,
+                                                     host.c_str(),
+                                                     port.c_str(),
+                                                     path.c_str(),
+                                                     camera_width,
+                                                     camera_height,
+                                                     colours,
+                                                     brightness,
+                                                     contrast,
+                                                     hue,
+                                                     colour,
+                                                     purpose == CAPTURE,
+                                                     record_audio
+      );
+      break;
+    }
+    case LIBVLC: {
+#if HAVE_LIBVLC
+      camera = ZM::make_unique<LibvlcCamera>(this,
+                                             path.c_str(),
+                                             method,
+                                             options,
+                                             camera_width,
+                                             camera_height,
+                                             colours,
+                                             brightness,
+                                             contrast,
+                                             hue,
+                                             colour,
+                                             purpose == CAPTURE,
+                                             record_audio
+      );
+#else // HAVE_LIBVLC
+      Error("You must have vlc libraries installed to use vlc cameras for monitor %d", id);
+#endif // HAVE_LIBVLC
+      break;
+    }
+    case CURL: {
+#if HAVE_LIBCURL
+      camera = ZM::make_unique<cURLCamera>(this,
+                                           path.c_str(),
+                                           user.c_str(),
+                                           pass.c_str(),
+                                           camera_width,
+                                           camera_height,
+                                           colours,
+                                           brightness,
+                                           contrast,
+                                           hue,
+                                           colour,
+                                           purpose == CAPTURE,
+                                           record_audio
+      );
+#else // HAVE_LIBCURL
+      Error("You must have libcurl installed to use ffmpeg cameras for monitor %d", id);
+#endif // HAVE_LIBCURL
+      break;
+    }
+    case VNC: {
+#if HAVE_LIBVNC
+      camera = ZM::make_unique<VncCamera>(this,
+                                          host.c_str(),
+                                          port.c_str(),
+                                          user.c_str(),
+                                          pass.c_str(),
+                                          width,
+                                          height,
+                                          colours,
+                                          brightness,
+                                          contrast,
+                                          hue,
+                                          colour,
+                                          purpose == CAPTURE,
+                                          record_audio
+      );
+#else // HAVE_LIBVNC
+      Fatal("You must have libvnc installed to use VNC cameras for monitor id %d", id);
+#endif // HAVE_LIBVNC
+      break;
+    }
+    default: {
+      Fatal("Tried to load unsupported camera type %d for monitor %u", int(type), id);
+      break;
+    }
+  }
+}
+
+std::shared_ptr<Monitor> Monitor::Load(unsigned int p_id, bool load_zones, Purpose purpose) {
+  std::string sql = load_monitor_sql + stringtf(" WHERE Id=%d", p_id);
+
+  zmDbRow dbrow;
+  if ( !dbrow.fetch(sql.c_str()) ) {
+    Error("Can't use query result: %s", mysql_error(&dbconn));
+    return nullptr;
+  }
+
+  std::shared_ptr<Monitor> monitor = std::make_shared<Monitor>();
+  monitor->Load(dbrow.mysql_row(), load_zones, purpose);
+
+  return monitor;
+}
+
+bool Monitor::connect() {
+
+  if (mem_ptr != nullptr) {
+    Warning("Already connected. Please call disconnect first.");
+  }
+  Debug(3, "Connecting to monitor.  Purpose is %d", purpose);
+#if ZM_MEM_MAPPED
+  snprintf(mem_file, sizeof(mem_file), "%s/zm.mmap.%u", staticConfig.PATH_MAP.c_str(), id);
+  if (purpose != CAPTURE) {
+    map_fd = open(mem_file, O_RDWR);
+  } else {
+    map_fd = open(mem_file, O_RDWR|O_CREAT, (mode_t)0660);
+  }
+
+  if (map_fd < 0) {
+    Error("Can't open memory map file %s: %s", mem_file, strerror(errno));
+    return false;
+  } else {
+    Debug(3, "Success opening mmap file at (%s)", mem_file);
+  }
+
+  struct stat map_stat;
+  if (fstat(map_fd, &map_stat) < 0) {
+    Error("Can't stat memory map file %s: %s, is the zmc process for this monitor running?", mem_file, strerror(errno));
+    close(map_fd);
+    map_fd = -1;
+    return false;
+  }
+
+  if (map_stat.st_size != mem_size) {
+    if (purpose == CAPTURE) {
+      // Allocate the size
+      if (ftruncate(map_fd, mem_size) < 0) {
+        Error("Can't extend memory map file %s to %jd bytes: %s", mem_file, mem_size, strerror(errno));
+        close(map_fd);
+        map_fd = -1;
+        return false;
+      }
+    } else if (map_stat.st_size == 0) {
+      Error("Got empty memory map file size %ld, is the zmc process for this monitor running?", map_stat.st_size);
+      close(map_fd);
+      map_fd = -1;
+      return false;
+    } else {
+      Error("Got unexpected memory map file size %ld, expected %jd", map_stat.st_size, mem_size);
+      close(map_fd);
+      map_fd = -1;
+      return false;
+    }
+  }  // end if map_stat.st_size != mem_size
+
+  Debug(3, "MMap file size is %ld", map_stat.st_size);
+#ifdef MAP_LOCKED
+  mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0);
+  if (mem_ptr == MAP_FAILED) {
+    if (errno == EAGAIN) {
+      Debug(1, "Unable to map file %s (%jd bytes) to locked memory, trying unlocked", mem_file, mem_size);
+#endif
+      mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0);
+      Debug(1, "Mapped file %s (%jd bytes) to unlocked memory", mem_file, mem_size);
+#ifdef MAP_LOCKED
+    } else {
+      Error("Unable to map file %s (%jd bytes) to locked memory (%s)", mem_file, mem_size, strerror(errno));
+    }
+  }
+#endif
+  if ((mem_ptr == MAP_FAILED) or (mem_ptr == nullptr)) {
+    Error("Can't map file %s (%jd bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno);
+    close(map_fd);
+    map_fd = -1;
+    mem_ptr = nullptr;
+    return false;
+  }
+#else // ZM_MEM_MAPPED
+  shm_id = shmget((config.shm_key&0xffff0000)|id, mem_size, IPC_CREAT|0700);
+  if (shm_id < 0) {
+    Fatal("Can't shmget, probably not enough shared memory space free: %s", strerror(errno));
+  }
+  mem_ptr = (unsigned char *)shmat(shm_id, 0, 0);
+  if ((int)mem_ptr == -1) {
+    Fatal("Can't shmat: %s", strerror(errno));
+  }
+#endif // ZM_MEM_MAPPED
+
+  shared_data = (SharedData *)mem_ptr;
+  trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
+  video_store_data = (VideoStoreData *)((char *)trigger_data + sizeof(TriggerData));
+  shared_timestamps = (struct timeval *)((char *)video_store_data + sizeof(VideoStoreData));
+  shared_images = (unsigned char *)((char *)shared_timestamps + (image_buffer_count*sizeof(struct timeval)));
+
+  if (((unsigned long)shared_images % 64) != 0) {
+    /* Align images buffer to nearest 64 byte boundary */
+    Debug(3, "Aligning shared memory images to the next 64 byte boundary");
+    shared_images = (uint8_t*)((unsigned long)shared_images + (64 - ((unsigned long)shared_images % 64)));
+  }
+  if (!camera) LoadCamera();
+
+  Debug(3, "Allocating %d image buffers", image_buffer_count);
+  image_buffer = new ZMPacket[image_buffer_count];
+  for (int32_t i = 0; i < image_buffer_count; i++) {
+    image_buffer[i].image_index = i;
+    image_buffer[i].timestamp = &(shared_timestamps[i]);
+    image_buffer[i].image = new Image(width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]));
+    image_buffer[i].image->HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
+  }
+
+  if (purpose == CAPTURE) {
     memset(mem_ptr, 0, mem_size);
     shared_data->size = sizeof(SharedData);
     shared_data->active = enabled;
     shared_data->signal = false;
+    shared_data->capture_fps = 0.0;
+    shared_data->analysis_fps = 0.0;
     shared_data->state = IDLE;
     shared_data->last_write_index = image_buffer_count;
     shared_data->last_read_index = image_buffer_count;
     shared_data->last_write_time = 0;
-    shared_data->last_event = 0;
+    shared_data->last_event_id = 0;
     shared_data->action = (Action)0;
     shared_data->brightness = -1;
     shared_data->hue = -1;
@@ -477,343 +1026,159 @@ Monitor::Monitor(
     shared_data->format = camera->SubpixelOrder();
     shared_data->imagesize = camera->ImageSize();
     shared_data->alarm_cause[0] = 0;
+    shared_data->video_fifo_path[0] = 0;
+    shared_data->audio_fifo_path[0] = 0;
+    shared_data->last_frame_score = 0;
+    shared_data->audio_frequency = -1;
+    shared_data->audio_channels = -1;
     trigger_data->size = sizeof(TriggerData);
-    trigger_data->trigger_state = TRIGGER_CANCEL;
+    trigger_data->trigger_state = TriggerState::TRIGGER_CANCEL;
     trigger_data->trigger_score = 0;
     trigger_data->trigger_cause[0] = 0;
     trigger_data->trigger_text[0] = 0;
     trigger_data->trigger_showtext[0] = 0;
-    shared_data->valid = true;
-    video_store_data->recording = (struct timeval){0};
+    video_store_data->recording = {};
+    // Uh, why nothing?  Why not nullptr?
     snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "nothing");
     video_store_data->size = sizeof(VideoStoreData);
-    //video_store_data->frameNumber = 0;
-  } else if ( purpose == ANALYSIS ) {
-    if ( ! (this->connect() && mem_ptr && shared_data->valid) ) {
-      Error("Shared data not initialised by capture daemon for monitor %s", name);
-      exit(-1);
-    }
-    shared_data->state = IDLE;
-    shared_data->last_read_time = 0;
-    shared_data->alarm_x = -1;
-    shared_data->alarm_y = -1;
+    shared_data->valid = true;
+  } else if ( !shared_data->valid ) {
+    Error("Shared data not initialised by capture daemon for monitor %s", name.c_str());
+    return false;
   }
 
-  start_time = last_fps_time = time( 0 );
+  // We set these here because otherwise the first fps calc is meaningless
+  struct timeval now;
+  gettimeofday(&now, nullptr);
+  double now_double = (double)now.tv_sec + (0.000001f * now.tv_usec);
+  last_fps_time = now_double;
+  last_analysis_fps_time = now_double;
 
-  event = 0;
+  Debug(3, "Success connecting");
+  return true;
+} // Monitor::connect
 
-  Debug(1, "Monitor %s has function %d,\n"
-      "label format = '%s', label X = %d, label Y = %d, label size = %d,\n"
-      "image buffer count = %d, warmup count = %d, pre-event count = %d, post-event count = %d, alarm frame count = %d,\n"
-      "fps report interval = %d, ref blend percentage = %d, alarm ref blend percentage = %d, track motion = %d",
-      name, function,
-      label_format, label_coord.X(), label_coord.Y(), label_size,
-      image_buffer_count, warmup_count, pre_event_count, post_event_count, alarm_frame_count,
-      fps_report_interval, ref_blend_perc, alarm_ref_blend_perc, track_motion );
+bool Monitor::disconnect() {
+  if (mem_ptr == nullptr) {
+    Debug(1, "Already disconnected");
+    return true;
+  }
 
-  //Set video recording flag for event start constructor and easy reference in code
-  videoRecording = ((GetOptVideoWriter() == H264PASSTHROUGH) && camera->SupportsNativeVideo());
-
-  n_linked_monitors = 0;
-  linked_monitors = nullptr;
-
-  if ( purpose == ANALYSIS ) {
-    while(
-        ( shared_data->last_write_index == (unsigned int)image_buffer_count )
-         &&
-        ( shared_data->last_write_time == 0 )
-        &&
-        ( !zm_terminate )
-        ) {
-      Debug(1, "Waiting for capture daemon last_write_index(%d), last_write_time(%d)",
-          shared_data->last_write_index, shared_data->last_write_time );
-      sleep(1);
-    }
-
-    ref_image.Assign(width, height, camera->Colours(), camera->SubpixelOrder(),
-        image_buffer[shared_data->last_write_index].image->Buffer(), camera->ImageSize());
-    adaptive_skip = true;
-
-    ReloadLinkedMonitors(p_linked_monitors);
-
-    if ( config.record_diag_images ) {
-      diag_path_r = stringtf(config.record_diag_images_fifo ? "%s/%d/diagpipe-r.jpg" : "%s/%d/diag-r.jpg", storage->Path(), id);
-      diag_path_d = stringtf(config.record_diag_images_fifo ? "%s/%d/diagpipe-d.jpg" : "%s/%d/diag-d.jpg", storage->Path(), id);
-      if ( config.record_diag_images_fifo ) {
-        FifoStream::fifo_create_if_missing(diag_path_r.c_str());
-        FifoStream::fifo_create_if_missing(diag_path_d.c_str());
-      }
-    }
-  }  // end if purpose == ANALYSIS
-}  // Monitor::Monitor
-
-bool Monitor::connect() {
-  Debug(3, "Connecting to monitor.  Purpose is %d", purpose );
 #if ZM_MEM_MAPPED
-  snprintf(mem_file, sizeof(mem_file), "%s/zm.mmap.%d", staticConfig.PATH_MAP.c_str(), id);
-  map_fd = open(mem_file, O_RDWR|O_CREAT, (mode_t)0600);
-  if ( map_fd < 0 ) {
-    Error("Can't open memory map file %s, probably not enough space free: %s", mem_file, strerror(errno));
-    return false;
-  } else {
-    Debug(3, "Success opening mmap file at (%s)", mem_file);
-  }
+  msync(mem_ptr, mem_size, MS_ASYNC);
+  munmap(mem_ptr, mem_size);
+  if (map_fd >= 0) close(map_fd);
 
-  struct stat map_stat;
-  if ( fstat(map_fd, &map_stat) < 0 ) {
-    Error("Can't stat memory map file %s: %s, is the zmc process for this monitor running?", mem_file, strerror(errno));
-    close(map_fd);
-    return false;
-  }
+  map_fd = -1;
+  mem_ptr = nullptr;
+  shared_data = nullptr;
 
-  if ( map_stat.st_size != mem_size ) {
-    if ( purpose == CAPTURE ) {
-      // Allocate the size
-      if ( ftruncate(map_fd, mem_size) < 0 ) {
-        Fatal("Can't extend memory map file %s to %d bytes: %s", mem_file, mem_size, strerror(errno));
-      }
-    } else if ( map_stat.st_size == 0 ) {
-      Error("Got empty memory map file size %ld, is the zmc process for this monitor running?", map_stat.st_size, mem_size);
-      close(map_fd);
-      map_fd = -1;
-      return false;
-    } else {
-      Error("Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size);
-      close(map_fd);
-      map_fd = -1;
-      return false;
-    }
-  }
-
-  Debug(3, "MMap file size is %ld", map_stat.st_size);
-#ifdef MAP_LOCKED
-  mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0);
-  if ( mem_ptr == MAP_FAILED ) {
-    if ( errno == EAGAIN ) {
-      Debug(1, "Unable to map file %s (%d bytes) to locked memory, trying unlocked", mem_file, mem_size);
-#endif
-      mem_ptr = (unsigned char *)mmap(nullptr, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0);
-      Debug(1, "Mapped file %s (%d bytes) to unlocked memory", mem_file, mem_size);
-#ifdef MAP_LOCKED
-    } else {
-      Error("Unable to map file %s (%d bytes) to locked memory (%s)", mem_file, mem_size, strerror(errno));
-    }
-  }
-#endif
-  if ( mem_ptr == MAP_FAILED )
-    Fatal("Can't map file %s (%d bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno);
-  if ( mem_ptr == nullptr ) {
-    Error("mmap gave a NULL address:");
-  } else {
-    Debug(3, "mmapped to %p", mem_ptr);
+  if (purpose == CAPTURE and (unlink(mem_file) < 0) ) {
+    Warning("Can't unlink '%s': %s", mem_file, strerror(errno));
   }
 #else // ZM_MEM_MAPPED
-  shm_id = shmget((config.shm_key&0xffff0000)|id, mem_size, IPC_CREAT|0700);
-  if ( shm_id < 0 ) {
-    Fatal("Can't shmget, probably not enough shared memory space free: %s", strerror(errno));
+  struct shmid_ds shm_data;
+  if (shmctl(shm_id, IPC_STAT, &shm_data) < 0) {
+    Debug(3, "Can't shmctl: %s", strerror(errno));
+    return false;
   }
-  mem_ptr = (unsigned char *)shmat(shm_id, 0, 0);
-  if ( mem_ptr < (void *)0 ) {
-    Fatal("Can't shmat: %s", strerror(errno));
+
+  shm_id = 0;
+
+  if ((shm_data.shm_nattch <= 1) and (shmctl(shm_id, IPC_RMID, 0) < 0)) {
+    Debug(3, "Can't shmctl: %s", strerror(errno));
+    return false;
+  }
+
+  if (shmdt(mem_ptr) < 0) {
+    Debug(3, "Can't shmdt: %s", strerror(errno));
+    return false;
   }
 #endif // ZM_MEM_MAPPED
-  shared_data = (SharedData *)mem_ptr;
-  trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
-  video_store_data = (VideoStoreData *)((char *)trigger_data + sizeof(TriggerData));
-  struct timeval *shared_timestamps = (struct timeval *)((char *)video_store_data + sizeof(VideoStoreData));
-  unsigned char *shared_images = (unsigned char *)((char *)shared_timestamps + (image_buffer_count*sizeof(struct timeval)));
 
-  if ( ((unsigned long)shared_images % 64) != 0 ) {
-    /* Align images buffer to nearest 64 byte boundary */
-    Debug(3,"Aligning shared memory images to the next 64 byte boundary");
-    shared_images = (uint8_t*)((unsigned long)shared_images + (64 - ((unsigned long)shared_images % 64)));
+  if (image_buffer) {
+    for ( int32_t i = 0; i < image_buffer_count; i++ ) {
+      // We delete the image because it is an object pointing to space that won't be free'd.
+      delete image_buffer[i].image;
+      image_buffer[i].image = nullptr;
+      // We don't delete the timestamp because it is just a pointer to shared mem.
+      image_buffer[i].timestamp = nullptr;
+    }
+    delete[] image_buffer;
+    image_buffer = nullptr;
   }
-  Debug(3, "Allocating %d image buffers", image_buffer_count);
-  image_buffer = new Snapshot[image_buffer_count];
-  for ( int i = 0; i < image_buffer_count; i++ ) {
-    image_buffer[i].timestamp = &(shared_timestamps[i]);
-    image_buffer[i].image = new Image(width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]));
-    image_buffer[i].image->HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
-  }
-  if ( (deinterlacing & 0xff) == 4 ) {
-    /* Four field motion adaptive deinterlacing in use */
-    /* Allocate a buffer for the next image */
-    next_buffer.image = new Image(width, height, camera->Colours(), camera->SubpixelOrder());
-    next_buffer.timestamp = new struct timeval;
-  }
-  if ( purpose == ANALYSIS ) {
-		if ( analysis_fps ) {
-			// Size of pre event buffer must be greater than pre_event_count
-			// if alarm_frame_count > 1, because in this case the buffer contains
-			// alarmed images that must be discarded when event is created
-			pre_event_buffer_count = pre_event_count + alarm_frame_count - 1;
-			pre_event_buffer = new Snapshot[pre_event_buffer_count];
-			for ( int i = 0; i < pre_event_buffer_count; i++ ) {
-				pre_event_buffer[i].timestamp = new struct timeval;
-				*pre_event_buffer[i].timestamp = {0,0};
-				pre_event_buffer[i].image = new Image( width, height, camera->Colours(), camera->SubpixelOrder());
-			}
-		} // end if max_analysis_fps
 
-    timestamps = new struct timeval *[pre_event_count];
-    images = new Image *[pre_event_count];
-    last_signal = shared_data->signal;
-  } // end if purpose == ANALYSIS
-Debug(3, "Success connecting");
   return true;
-} // end Monitor::connect
+}  // end bool Monitor::disconnect()
 
 Monitor::~Monitor() {
-  if ( n_linked_monitors ) {
-    for( int i = 0; i < n_linked_monitors; i++ ) {
+  Close();
+
+  if (mem_ptr != nullptr) {
+    if (purpose != QUERY) {
+      shared_data->state = state = IDLE;
+      shared_data->last_read_index = image_buffer_count;
+      shared_data->last_read_time = 0;
+      shared_data->valid = false;
+      memset(mem_ptr, 0, mem_size);
+    }  // end if purpose != query
+    disconnect();
+  }  // end if mem_ptr
+
+  // Will be free by packetqueue destructor
+  analysis_it = nullptr;
+  decoder_it = nullptr;
+
+  delete storage;
+  if (n_linked_monitors) {
+    for ( int i=0; i < n_linked_monitors; i++ ) {
       delete linked_monitors[i];
     }
     delete[] linked_monitors;
     linked_monitors = nullptr;
   }
-  if ( timestamps ) {
-    delete[] timestamps;
-    timestamps = nullptr;
+
+  if (video_fifo) delete video_fifo;
+  if (audio_fifo) delete audio_fifo;
+  if (dest_frame) av_frame_free(&dest_frame);
+  if (convert_context) {
+    sws_freeContext(convert_context);
+    convert_context = nullptr;
   }
-  if ( images ) {
-    delete[] images;
-    images = nullptr;
-  }
-  if ( privacy_bitmask ) {
-    delete[] privacy_bitmask;
-    privacy_bitmask = nullptr;
-  }
-  if ( mem_ptr ) {
-    if ( event ) {
-      Info( "%s: image_count:%d - Closing event %" PRIu64 ", shutting down", name, image_count, event->Id() );
-      closeEvent();
+}  // end Monitor::~Monitor()
 
-      // closeEvent may start another thread to close the event, so wait for it to finish
-      if ( event_delete_thread ) {
-        event_delete_thread->join();
-        delete event_delete_thread;
-        event_delete_thread = nullptr;
-      }
-    }
-
-    if ( (deinterlacing & 0xff) == 4) {
-      delete next_buffer.image;
-      delete next_buffer.timestamp;
-    }
-    for ( int i = 0; i < image_buffer_count; i++ ) {
-      delete image_buffer[i].image;
-    }
-    delete[] image_buffer;
-  } // end if mem_ptr
-
-  for ( int i = 0; i < n_zones; i++ ) {
-    delete zones[i];
-  }
-  delete[] zones;
-
-  delete camera;
-  delete storage;
-
-  if ( mem_ptr ) {
-    if ( purpose == ANALYSIS ) {
-      shared_data->state = state = IDLE;
-      shared_data->last_read_index = image_buffer_count;
-      shared_data->last_read_time = 0;
-
-      if ( analysis_fps ) {
-        for ( int i = 0; i < pre_event_buffer_count; i++ ) {
-          delete pre_event_buffer[i].image;
-          delete pre_event_buffer[i].timestamp;
-        }
-        delete[] pre_event_buffer;
-      }
-			if ( Event::PreAlarmCount() )
-				Event::EmptyPreAlarmFrames();
-    } else if ( purpose == CAPTURE ) {
-      shared_data->valid = false;
-      memset(mem_ptr, 0, mem_size);
-    }
-
-#if ZM_MEM_MAPPED
-    if ( msync(mem_ptr, mem_size, MS_SYNC) < 0 )
-      Error("Can't msync: %s", strerror(errno));
-    if ( munmap(mem_ptr, mem_size) < 0 )
-      Fatal("Can't munmap: %s", strerror(errno));
-    close( map_fd );
-
-    if ( purpose == CAPTURE ) {
-      // How about we store this in the object on instantiation so that we don't have to do this again.
-      char mmap_path[PATH_MAX] = "";
-      snprintf(mmap_path, sizeof(mmap_path), "%s/zm.mmap.%d", staticConfig.PATH_MAP.c_str(), id);
-
-      if ( unlink(mmap_path) < 0 ) {
-        Warning("Can't unlink '%s': %s", mmap_path, strerror(errno));
-      }
-    }
-#else // ZM_MEM_MAPPED
-    struct shmid_ds shm_data;
-    if ( shmctl(shm_id, IPC_STAT, &shm_data) < 0 ) {
-      Fatal("Can't shmctl: %s", strerror(errno));
-    }
-    if ( shm_data.shm_nattch <= 1 ) {
-      if ( shmctl(shm_id, IPC_RMID, 0) < 0 ) {
-        Fatal("Can't shmctl: %s", strerror(errno));
-      }
-    }
-#endif // ZM_MEM_MAPPED
-  } // end if mem_ptr
-}
-
-void Monitor::AddZones( int p_n_zones, Zone *p_zones[] ) {
-  for ( int i = 0; i < n_zones; i++ )
-    delete zones[i];
-  delete[] zones;
-  n_zones = p_n_zones;
-  zones = p_zones;
-}
-
-void Monitor::AddPrivacyBitmask( Zone *p_zones[] ) {
-  if ( privacy_bitmask ) {
+void Monitor::AddPrivacyBitmask() {
+  if (privacy_bitmask) {
     delete[] privacy_bitmask;
     privacy_bitmask = nullptr;
   }
   Image *privacy_image = nullptr;
 
-  for ( int i = 0; i < n_zones; i++ ) {
-    if ( p_zones[i]->IsPrivacy() ) {
-      if ( !privacy_image ) {
-        privacy_image = new Image( width, height, 1, ZM_SUBPIX_ORDER_NONE);
+  for (const Zone &zone : zones) {
+  //for (int i=0; i < zones.size(); i++) {
+    if (zone.IsPrivacy()) {
+      if (!privacy_image) {
+        privacy_image = new Image(width, height, 1, ZM_SUBPIX_ORDER_NONE);
         privacy_image->Clear();
       }
-      privacy_image->Fill( 0xff, p_zones[i]->GetPolygon() );
-      privacy_image->Outline( 0xff, p_zones[i]->GetPolygon() );
+      privacy_image->Fill(0xff, zone.GetPolygon());
+      privacy_image->Outline(0xff, zone.GetPolygon());
     }
   } // end foreach zone
-  if ( privacy_image )
+  if (privacy_image)
     privacy_bitmask = privacy_image->Buffer();
 }
 
-Monitor::State Monitor::GetState() const {
-  return (State)shared_data->state;
-}
-
-int Monitor::GetImage( int index, int scale ) {
+int Monitor::GetImage(int32_t index, int scale) {
   if ( index < 0 || index > image_buffer_count ) {
     index = shared_data->last_write_index;
   }
-
   if ( index != image_buffer_count ) {
     Image *image;
     // If we are going to be modifying the snapshot before writing, then we need to copy it
     if ( ( scale != ZM_SCALE_BASE ) || ( !config.timestamp_on_capture ) ) {
-      Snapshot *snap = &image_buffer[index];
-      Image *snap_image = snap->image;
-
-      alarm_image.Assign(*snap_image);
-
-
-      //write_image.Assign( *snap_image );
+      ZMPacket *snap = &image_buffer[index];
+      alarm_image.Assign(*snap->image);
 
       if ( scale != ZM_SCALE_BASE ) {
         alarm_image.Scale(scale);
@@ -828,7 +1193,7 @@ int Monitor::GetImage( int index, int scale ) {
     }
 
     static char filename[PATH_MAX];
-    snprintf(filename, sizeof(filename), "Monitor%d.jpg", id);
+    snprintf(filename, sizeof(filename), "Monitor%u.jpg", id);
     image->WriteJpeg(filename);
   } else {
     Error("Unable to generate image, no images in buffer");
@@ -836,74 +1201,72 @@ int Monitor::GetImage( int index, int scale ) {
   return 0;
 }
 
-struct timeval Monitor::GetTimestamp( int index ) const {
-  if ( index < 0 || index > image_buffer_count ) {
+ZMPacket *Monitor::getSnapshot(int index) const {
+
+  if ( (index < 0) || (index > image_buffer_count) ) {
     index = shared_data->last_write_index;
   }
+  return &image_buffer[index];
 
-  if ( index != image_buffer_count ) {
-    Snapshot *snap = &image_buffer[index];
+  return nullptr;
+}
 
-    return *(snap->timestamp);
-  } else {
-    static struct timeval null_tv = { 0, 0 };
+struct timeval Monitor::GetTimestamp(int index) const {
+  ZMPacket *packet = getSnapshot(index);
+  if ( packet ) 
+    return *packet->timestamp;
 
-    return null_tv;
-  }
+  static struct timeval null_tv = { 0, 0 };
+  return null_tv;
 }
 
 unsigned int Monitor::GetLastReadIndex() const {
-  return( shared_data->last_read_index!=(unsigned int)image_buffer_count?shared_data->last_read_index:-1 );
+  return ( shared_data->last_read_index != image_buffer_count ? shared_data->last_read_index : -1 );
 }
 
 unsigned int Monitor::GetLastWriteIndex() const {
-  return( shared_data->last_write_index!=(unsigned int)image_buffer_count?shared_data->last_write_index:-1 );
+  return ( shared_data->last_write_index != image_buffer_count ? shared_data->last_write_index : -1 );
 }
 
 uint64_t Monitor::GetLastEventId() const {
-#if 0
-  Debug(2, "mem_ptr(%x), State(%d) last_read_index(%d) last_read_time(%d) last_event(%" PRIu64 ")",
-      mem_ptr,
-      shared_data->state,
-      shared_data->last_read_index,
-      shared_data->last_read_time,
-      shared_data->last_event
-      );
-#endif
-  return shared_data->last_event;
+  return shared_data->last_event_id;
 }
 
 // This function is crap.
 double Monitor::GetFPS() const {
+  return get_capture_fps();
   // last_write_index is the last capture index.  It starts as == image_buffer_count so that the first asignment % image_buffer_count = 0;
-  int index1 = shared_data->last_write_index;
-  if ( index1 == image_buffer_count ) {
+  int32_t index1 = shared_data->last_write_index;
+  if ( index1 >= image_buffer_count ) {
     // last_write_index only has this value on startup before capturing anything.
     return 0.0;
   }
-  Snapshot *snap1 = &image_buffer[index1];
-  if ( !snap1->timestamp || !snap1->timestamp->tv_sec ) {
+  Debug(2, "index1(%d)", index1);
+  ZMPacket *snap1 = &image_buffer[index1];
+  if ( !snap1->timestamp->tv_sec ) {
     // This should be impossible
     Warning("Impossible situation.  No timestamp on captured image index was %d, image-buffer_count was (%d)", index1, image_buffer_count);
     return 0.0;
   }
   struct timeval time1 = *snap1->timestamp;
 
-  int image_count = image_buffer_count;
-  int index2 = (index1+1)%image_buffer_count;
-  Snapshot *snap2 = &image_buffer[index2];
+  int32_t fps_image_count = image_buffer_count;
+
+  int32_t index2 = (index1+1)%image_buffer_count;
+  Debug(2, "index2(%d)", index2);
+  ZMPacket *snap2 = &image_buffer[index2];
   // the timestamp pointers are initialized on connection, so that's redundant
   // tv_sec is probably only zero during the first loop of capturing, so this basically just counts the unused images.
   // The problem is that there is no locking, and we set the timestamp before we set last_write_index,
   // so there is a small window where the next image can have a timestamp in the future
-  while ( !snap2->timestamp || !snap2->timestamp->tv_sec || tvDiffSec(*snap2->timestamp, *snap1->timestamp) < 0 ) {
+  while ( !snap2->timestamp->tv_sec || tvDiffSec(*snap2->timestamp, *snap1->timestamp) < 0 ) {
     if ( index1 == index2 ) {
       // All images are uncaptured
       return 0.0;
     }
     index2 = (index2+1)%image_buffer_count;
-    snap2 = &image_buffer[index2];
-    image_count--;
+    snap2 = &image_buffer[ index2 ];
+    fps_image_count--;
   }
   struct timeval time2 = *snap2->timestamp;
 
@@ -913,7 +1276,7 @@ double Monitor::GetFPS() const {
         time_diff, index2, time2.tv_sec, time2.tv_usec, index1, time1.tv_sec, time1.tv_usec, image_buffer_count);
     return 0.0;
   }
-  double curr_fps = image_count/time_diff;
+  double curr_fps = fps_image_count/time_diff;
 
   if ( curr_fps < 0.0 ) {
     Error("Negative FPS %f, time_diff = %lf (%d:%ld.%ld - %d:%ld.%ld), ibc: %d",
@@ -926,21 +1289,27 @@ double Monitor::GetFPS() const {
   return curr_fps;
 }
 
+/* I think this returns the # of micro seconds that we should sleep in order to maintain the desired analysis rate */
 useconds_t Monitor::GetAnalysisRate() {
-  double capturing_fps = GetFPS();
-  if ( !analysis_fps ) {
+  double capture_fps = get_capture_fps();
+  if ( !analysis_fps_limit ) {
     return 0;
-  } else if ( analysis_fps > capturing_fps ) {
-    Warning("Analysis fps (%.2f) is greater than capturing fps (%.2f)", analysis_fps, capturing_fps);
+  } else if ( analysis_fps_limit > capture_fps ) {
+    if ( last_fps_time != last_analysis_fps_time ) {
+      // At startup they are equal, should never be equal again
+      Warning("Analysis fps (%.2f) is greater than capturing fps (%.2f)", analysis_fps_limit, capture_fps);
+    }
     return 0;
-  } else {
-    return ( ( 1000000 / analysis_fps ) - ( 1000000 / capturing_fps ) );
+  } else if ( capture_fps ) {
+    return( ( 1000000 / analysis_fps_limit ) - ( 1000000 / capture_fps ) );
   }
+  return 0;
 }
 
 void Monitor::UpdateAdaptiveSkip() {
   if ( config.opt_adaptive_skip ) {
-    double capturing_fps = GetFPS();
+    double capturing_fps = get_capture_fps();
+    double analysis_fps = get_analysis_fps();
     if ( adaptive_skip && analysis_fps && ( analysis_fps < capturing_fps ) ) {
       Info("Analysis fps (%.2f) is lower than capturing fps (%.2f), disabling adaptive skip feature", analysis_fps, capturing_fps);
       adaptive_skip = false;
@@ -954,18 +1323,18 @@ void Monitor::UpdateAdaptiveSkip() {
 }
 
 void Monitor::ForceAlarmOn( int force_score, const char *force_cause, const char *force_text ) {
-  trigger_data->trigger_state = TRIGGER_ON;
+  trigger_data->trigger_state = TriggerState::TRIGGER_ON;
   trigger_data->trigger_score = force_score;
   strncpy(trigger_data->trigger_cause, force_cause, sizeof(trigger_data->trigger_cause)-1);
   strncpy(trigger_data->trigger_text, force_text, sizeof(trigger_data->trigger_text)-1);
 }
 
 void Monitor::ForceAlarmOff() {
-  trigger_data->trigger_state = TRIGGER_OFF;
+  trigger_data->trigger_state = TriggerState::TRIGGER_OFF;
 }
 
 void Monitor::CancelForced() {
-  trigger_data->trigger_state = TRIGGER_CANCEL;
+  trigger_data->trigger_state = TriggerState::TRIGGER_CANCEL;
 }
 
 void Monitor::actionReload() {
@@ -975,25 +1344,17 @@ void Monitor::actionReload() {
 void Monitor::actionEnable() {
   shared_data->action |= RELOAD;
 
-  db_mutex.lock();
-  static char sql[ZM_SQL_SML_BUFSIZ];
-  snprintf(sql, sizeof(sql), "UPDATE `Monitors` SET `Enabled` = 1 WHERE `Id` = %d", id);
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't run query: %s", mysql_error(&dbconn));
-  }
-  db_mutex.unlock();
+  char sql[ZM_SQL_SML_BUFSIZ];
+  snprintf(sql, sizeof(sql), "UPDATE `Monitors` SET `Enabled` = 1 WHERE `Id` = %u", id);
+  zmDbDo(sql);
 }
 
 void Monitor::actionDisable() {
   shared_data->action |= RELOAD;
 
-  static char sql[ZM_SQL_SML_BUFSIZ];
-  snprintf(sql, sizeof(sql), "UPDATE `Monitors` SET `Enabled` = 0 WHERE `Id` = %d", id);
-  db_mutex.lock();
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't run query: %s", mysql_error(&dbconn));
-  }
-  db_mutex.unlock();
+  char sql[ZM_SQL_SML_BUFSIZ];
+  snprintf(sql, sizeof(sql), "UPDATE `Monitors` SET `Enabled` = 0 WHERE `Id` = %u", id);
+  zmDbDo(sql);
 }
 
 void Monitor::actionSuspend() {
@@ -1143,7 +1504,7 @@ void Monitor::DumpZoneImage(const char *zone_string) {
   if ( ( (!staticConfig.SERVER_ID) || ( staticConfig.SERVER_ID == server_id ) ) && mem_ptr ) {
     Debug(3, "Trying to load from local zmc");
     int index = shared_data->last_write_index;
-    Snapshot *snap = &image_buffer[index];
+    ZMPacket *snap = getSnapshot(index);
     zone_image = new Image(*snap->image);
   } else {
     Debug(3, "Trying to load from event");
@@ -1169,28 +1530,28 @@ void Monitor::DumpZoneImage(const char *zone_string) {
     zone_image->Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB);
   }
 
-  for ( int i = 0; i < n_zones; i++ ) {
-    if ( exclude_id && (!extra_colour || extra_zone.getNumCoords()) && zones[i]->Id() == exclude_id )
+  for (const Zone &zone : zones) {
+    if ( exclude_id && (!extra_colour || extra_zone.getNumCoords()) && zone.Id() == exclude_id )
       continue;
 
     Rgb colour;
-    if ( exclude_id && !extra_zone.getNumCoords() && zones[i]->Id() == exclude_id ) {
+    if ( exclude_id && !extra_zone.getNumCoords() && zone.Id() == exclude_id ) {
       colour = extra_colour;
     } else {
-      if ( zones[i]->IsActive() ) {
-        colour = RGB_RED;
-      } else if ( zones[i]->IsInclusive() ) {
-        colour = RGB_ORANGE;
-      } else if ( zones[i]->IsExclusive() ) {
-        colour = RGB_PURPLE;
-      } else if ( zones[i]->IsPreclusive() ) {
-        colour = RGB_BLUE;
+      if ( zone.IsActive() ) {
+        colour = kRGBRed;
+      } else if ( zone.IsInclusive() ) {
+        colour = kRGBOrange;
+      } else if ( zone.IsExclusive() ) {
+        colour = kRGBPurple;
+      } else if ( zone.IsPreclusive() ) {
+        colour = kRGBBlue;
       } else {
-        colour = RGB_WHITE;
+        colour = kRGBWhite;
       }
     }
-    zone_image->Fill(colour, 2, zones[i]->GetPolygon());
-    zone_image->Outline(colour, zones[i]->GetPolygon());
+    zone_image->Fill(colour, 2, zone.GetPolygon());
+    zone_image->Outline(colour, zone.GetPolygon());
   }
 
   if ( extra_zone.getNumCoords() ) {
@@ -1199,7 +1560,7 @@ void Monitor::DumpZoneImage(const char *zone_string) {
   }
 
   static char filename[PATH_MAX];
-  snprintf(filename, sizeof(filename), "Zones%d.jpg", id);
+  snprintf(filename, sizeof(filename), "Zones%u.jpg", id);
   zone_image->WriteJpeg(filename);
   delete zone_image;
 } // end void Monitor::DumpZoneImage(const char *zone_string)
@@ -1208,149 +1569,69 @@ void Monitor::DumpImage(Image *dump_image) const {
   if ( image_count && !(image_count%10) ) {
     static char filename[PATH_MAX];
     static char new_filename[PATH_MAX];
-    snprintf(filename, sizeof(filename), "Monitor%d.jpg", id);
-    snprintf(new_filename, sizeof(new_filename), "Monitor%d-new.jpg", id);
+    snprintf(filename, sizeof(filename), "Monitor%u.jpg", id);
+    snprintf(new_filename, sizeof(new_filename), "Monitor%u-new.jpg", id);
     if ( dump_image->WriteJpeg(new_filename) )
       rename(new_filename, filename);
   }
 } // end void Monitor::DumpImage(Image *dump_image)
 
 bool Monitor::CheckSignal(const Image *image) {
-  static bool static_undef = true;
-  /* RGB24 colors */
-  static uint8_t red_val;
-  static uint8_t green_val;
-  static uint8_t blue_val;
-  static uint8_t grayscale_val; /* 8bit grayscale color */
-  static Rgb colour_val; /* RGB32 color */
-  static int usedsubpixorder;
+  if (signal_check_points <= 0)
+    return true;
 
-  if ( signal_check_points > 0 ) {
-    if ( static_undef ) {
-      static_undef = false;
-      usedsubpixorder = camera->SubpixelOrder();
-      colour_val = rgb_convert(signal_check_colour, ZM_SUBPIX_ORDER_BGR); /* HTML colour code is actually BGR in memory, we want RGB */
-      colour_val = rgb_convert(colour_val, usedsubpixorder);
-      red_val = RED_VAL_BGRA(signal_check_colour);
-      green_val = GREEN_VAL_BGRA(signal_check_colour);
-      blue_val = BLUE_VAL_BGRA(signal_check_colour);
-      grayscale_val = signal_check_colour & 0xff; /* Clear all bytes but lowest byte */
+  const uint8_t *buffer = image->Buffer();
+  int pixels = image->Pixels();
+  int width = image->Width();
+  int colours = image->Colours();
+
+  int index = 0;
+  for ( int i = 0; i < signal_check_points; i++ ) {
+    while ( true ) {
+      // Why the casting to long long? also note that on a 64bit cpu, long long is 128bits
+      index = (int)(((long long)rand()*(long long)(pixels-1))/RAND_MAX);
+      if ( !config.timestamp_on_capture || !label_format[0] )
+        break;
+      // Avoid sampling the rows with timestamp in
+      if ( index < (label_coord.Y()*width) || index >= (label_coord.Y()+Image::LINE_HEIGHT)*width )
+        break;
     }
 
-    const uint8_t *buffer = image->Buffer();
-    int pixels = image->Pixels();
-    int width = image->Width();
-    int colours = image->Colours();
+    if ( colours == ZM_COLOUR_GRAY8 ) {
+      if ( *(buffer+index) != grayscale_val )
+        return true;
 
-    int index = 0;
-    for ( int i = 0; i < signal_check_points; i++ ) {
-      while( true ) {
-        // Why the casting to long long? also note that on a 64bit cpu, long long is 128bits
-        index = (int)(((long long)rand()*(long long)(pixels-1))/RAND_MAX);
-        if ( !config.timestamp_on_capture || !label_format[0] )
-          break;
-        // Avoid sampling the rows with timestamp in
-        if ( index < (label_coord.Y()*width) || index >= (label_coord.Y()+Image::LINE_HEIGHT)*width )
-          break;
-      }
+    } else if ( colours == ZM_COLOUR_RGB24 ) {
+      const uint8_t *ptr = buffer+(index*colours);
 
-      if ( colours == ZM_COLOUR_GRAY8 ) {
-        if ( *(buffer+index) != grayscale_val )
+      if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR ) {
+        if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
+          return true;
+      } else {
+        /* Assume RGB */
+        if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
           return true;
-
-      } else if ( colours == ZM_COLOUR_RGB24 ) {
-        const uint8_t *ptr = buffer+(index*colours);
-
-        if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR ) {
-          if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
-            return true;
-        } else {
-          /* Assume RGB */
-          if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
-            return true;
-        }
-
-      } else if ( colours == ZM_COLOUR_RGB32 ) {
-        if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR ) {
-          if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
-            return true;
-        } else {
-          /* Assume RGBA or BGRA */
-          if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
-            return true;
-        }
       }
-    } // end for < signal_check_points
-    Debug(1, "SignalCheck: %d points, colour_val(%d)", signal_check_points, colour_val);
-    return false;
-  } // end if signal_check_points
-  return true;
+
+    } else if ( colours == ZM_COLOUR_RGB32 ) {
+      if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR ) {
+        if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
+          return true;
+      } else {
+        /* Assume RGBA or BGRA */
+        if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
+          return true;
+      }
+    }
+  } // end for < signal_check_points
+  Debug(1, "SignalCheck: %d points, colour_val(%d)", signal_check_points, colour_val);
+  return false;
 } // end bool Monitor::CheckSignal(const Image *image)
 
-bool Monitor::Analyse() {
-  if ( shared_data->last_read_index == shared_data->last_write_index ) {
-    // I wonder how often this happens. Maybe if this happens we should sleep or something?
-    return false;
-  }
-
+void Monitor::CheckAction() {
   struct timeval now;
   gettimeofday(&now, nullptr);
 
-  if ( image_count && fps_report_interval && !(image_count%fps_report_interval) ) {
-    if ( now.tv_sec != last_fps_time ) {
-      double new_fps = double(fps_report_interval)/(now.tv_sec - last_fps_time);
-      Info("%s: %d - Analysing at %.2f fps", name, image_count, new_fps);
-      if ( fps != new_fps ) {
-        fps = new_fps;
-        db_mutex.lock();
-        static char sql[ZM_SQL_SML_BUFSIZ];
-        snprintf(sql, sizeof(sql), "INSERT INTO Monitor_Status (MonitorId,AnalysisFPS) VALUES (%d, %.2lf) ON DUPLICATE KEY UPDATE AnalysisFPS = %.2lf", id, fps, fps);
-        if ( mysql_query(&dbconn, sql) ) {
-          Error("Can't run query: %s", mysql_error(&dbconn));
-        }
-        db_mutex.unlock();
-      } // end if fps != new_fps
-
-      last_fps_time = now.tv_sec;
-    }
-  }
-
-  int index;
-  if ( adaptive_skip ) {
-    // I think the idea behind adaptive skip is if we are falling behind, then skip a bunch, but not all
-    int read_margin = shared_data->last_read_index - shared_data->last_write_index;
-    if ( read_margin < 0 ) read_margin += image_buffer_count;
-
-    int step = 1;
-    // Isn't read_margin always > 0 here?
-    if ( read_margin > 0 ) {
-      // TODO explain this so... 90% of image buffer / 50% of read margin?
-      step = (9*image_buffer_count)/(5*read_margin);
-    }
-
-    int pending_frames = shared_data->last_write_index - shared_data->last_read_index;
-    if ( pending_frames < 0 ) pending_frames += image_buffer_count;
-
-    Debug(4,
-        "ReadIndex:%d, WriteIndex: %d, PendingFrames = %d, ReadMargin = %d, Step = %d",
-        shared_data->last_read_index, shared_data->last_write_index, pending_frames, read_margin, step
-        );
-    if ( step <= pending_frames ) {
-      index = (shared_data->last_read_index+step)%image_buffer_count;
-    } else {
-      if ( pending_frames ) {
-        Warning("Approaching buffer overrun, consider slowing capture, simplifying analysis or increasing ring buffer size");
-      }
-      index = shared_data->last_write_index%image_buffer_count;
-    }
-  } else {
-    index = shared_data->last_write_index%image_buffer_count;
-  }
-
-  Snapshot *snap = &image_buffer[index];
-  struct timeval *timestamp = snap->timestamp;
-  Image *snap_image = snap->image;
-
   if ( shared_data->action ) {
     // Can there be more than 1 bit set in the action?  Shouldn't these be elseifs?
     if ( shared_data->action & RELOAD ) {
@@ -1370,13 +1651,11 @@ bool Monitor::Analyse() {
         auto_resume_time = now.tv_sec + config.max_suspend_time;
       }
       shared_data->action &= ~SUSPEND;
-    }
-    if ( shared_data->action & RESUME ) {
+    } else if ( shared_data->action & RESUME ) {
       if ( Enabled() && !Active() ) {
         Info("Received resume indication at count %d", image_count);
         shared_data->active = true;
-        ref_image = *snap_image;
-        ready_count = image_count+(warmup_count/2);
+        ref_image.DumpImgBuffer(); // Will get re-assigned by analysis thread
         shared_data->alarm_x = shared_data->alarm_y = -1;
       }
       shared_data->action &= ~RESUME;
@@ -1386,511 +1665,696 @@ bool Monitor::Analyse() {
   if ( auto_resume_time && (now.tv_sec >= auto_resume_time) ) {
     Info("Auto resuming at count %d", image_count);
     shared_data->active = true;
-    ref_image = *snap_image;
-    ready_count = image_count+(warmup_count/2);
+    ref_image.DumpImgBuffer(); // Will get re-assigned by analysis thread
     auto_resume_time = 0;
   }
+}
 
-  if ( Enabled() ) {
-    bool signal = shared_data->signal;
-    bool signal_change = (signal != last_signal);
+void Monitor::UpdateCaptureFPS() {
+  if ( fps_report_interval and 
+      ( 
+       !(image_count%fps_report_interval)
+      or 
+     ( (image_count < fps_report_interval) and !(image_count%10) )
+     )
+     ) {
+    struct timeval now;
+    gettimeofday(&now, nullptr);
+    double now_double = (double)now.tv_sec + (0.000001f * now.tv_usec);
+    double elapsed = now_double - last_fps_time;
 
-    Debug(3, "Motion detection is enabled signal(%d) signal_change(%d)", signal, signal_change);
+    // If we are too fast, we get div by zero. This seems to happen in the case of audio packets.
+    // Also only do the update at most 1/sec
+    if ( elapsed > 1.0 ) {
+      // # of images per interval / the amount of time it took
+      double new_capture_fps = double((image_count - last_capture_image_count)/elapsed);
+      unsigned int new_camera_bytes = camera->Bytes();
+      unsigned int new_capture_bandwidth = (new_camera_bytes-last_camera_bytes)/elapsed;
+      last_camera_bytes = new_camera_bytes;
 
-    if ( trigger_data->trigger_state != TRIGGER_OFF ) {
-      unsigned int score = 0;
-      if ( Ready() ) {
-        std::string cause;
-        Event::StringSetMap noteSetMap;
+      Debug(4, "%s: %d - last %d = %d now:%lf, last %lf, elapsed %lf = %lffps", "Capturing", image_count,
+          last_capture_image_count, image_count - last_capture_image_count,
+          now_double, last_analysis_fps_time,
+          elapsed, new_capture_fps
+          );
+      Info("%s: %d - Capturing at %.2lf fps, capturing bandwidth %ubytes/sec",
+          name.c_str(), image_count, new_capture_fps, new_capture_bandwidth);
+      shared_data->capture_fps = new_capture_fps;
+      last_fps_time = now_double;
+      last_capture_image_count = image_count;
 
-        if ( trigger_data->trigger_state == TRIGGER_ON ) {
-          score += trigger_data->trigger_score;
-          Debug(1, "Triggered on score += %d => %d", trigger_data->trigger_score, score);
-          if ( !event ) {
-            cause += trigger_data->trigger_cause;
-          }
-          Event::StringSet noteSet;
-          noteSet.insert(trigger_data->trigger_text);
-          noteSetMap[trigger_data->trigger_cause] = noteSet;
+      std::string sql = stringtf(
+          "UPDATE LOW_PRIORITY Monitor_Status SET CaptureFPS = %.2lf, CaptureBandwidth=%u WHERE MonitorId=%u",
+          new_capture_fps, new_capture_bandwidth, id);
+      dbQueue.push(std::move(sql));
+    } // now != last_fps_time
+  } // end if report fps
+}  // void Monitor::UpdateCaptureFPS()
+
+void Monitor::UpdateAnalysisFPS() {
+  Debug(1, "analysis_image_count(%d) motion_count(%d) fps_report_interval(%d) mod%d",
+      analysis_image_count, motion_frame_count, fps_report_interval, 
+      ((analysis_image_count && fps_report_interval) ? !(analysis_image_count%fps_report_interval) : -1 ) );
+
+  if ( 
+      ( analysis_image_count and fps_report_interval and !(analysis_image_count%fps_report_interval) )
+      or 
+      // In startup do faster updates
+      ( (analysis_image_count < fps_report_interval) and !(analysis_image_count%10) )
+     ) {
+    //if ( analysis_image_count && fps_report_interval && !(analysis_image_count%fps_report_interval) ) {
+    struct timeval now;
+    gettimeofday(&now, nullptr);
+    double now_double = (double)now.tv_sec + (0.000001f * now.tv_usec);
+    double elapsed = now_double - last_analysis_fps_time;
+    Debug(4, "%s: %d - now:%" PRIi64 ".%" PRIi64 " = %lf, last %lf, diff %lf",
+          name.c_str(),
+          analysis_image_count,
+          static_cast<int64>(now.tv_sec),
+          static_cast<int64>(now.tv_usec),
+          now_double,
+          last_analysis_fps_time,
+          elapsed);
+
+    if ( elapsed > 1.0 ) {
+      double new_analysis_fps = double(motion_frame_count - last_motion_frame_count) / elapsed;
+      Info("%s: %d - Analysing at %.2lf fps from %d - %d=%d / %lf - %lf = %lf",
+          name.c_str(), analysis_image_count, new_analysis_fps,
+          motion_frame_count, last_motion_frame_count, (motion_frame_count - last_motion_frame_count),
+          now_double, last_analysis_fps_time, elapsed);
+
+      if ( new_analysis_fps != shared_data->analysis_fps ) {
+        shared_data->analysis_fps = new_analysis_fps;
+
+      std::string sql = stringtf(
+          "UPDATE LOW_PRIORITY Monitor_Status SET AnalysisFPS = %.2lf WHERE MonitorId=%u",
+             new_analysis_fps, id);
+        dbQueue.push(std::move(sql));
+        last_analysis_fps_time = now_double;
+        last_motion_frame_count = motion_frame_count;
+      } else {
+        Debug(4, "No change in fps");
+      } // end if change in fps
+    } // end if at least 1 second has passed since last update
+
+  } // end if time to do an update
+} // end void Monitor::UpdateAnalysisFPS
+
+// Would be nice if this JUST did analysis
+// This idea is that we should be analysing as close to the capture frame as possible.
+// This function should process as much as possible before returning
+//
+// If there is an event, the we should do our best to empty the queue.
+// If there isn't then we keep pre-event + alarm frames. = pre_event_count
+bool Monitor::Analyse() {
+  // if have event, send frames until we find a video packet, at which point do analysis. Adaptive skip should only affect which frames we do analysis on.
+
+  // get_analysis_packet will lock the packet and may wait if analysis_it is at the end
+  ZMLockedPacket *packet_lock = packetqueue.get_packet(analysis_it);
+  if (!packet_lock) return false;
+  ZMPacket *snap = packet_lock->packet_;
+
+  // Is it possible for snap->score to be ! -1 ? Not if everything is working correctly
+  if (snap->score != -1) {
+    delete packet_lock;
+    packetqueue.increment_it(analysis_it);
+    Error("skipping because score was %d", snap->score);
+    return false;
+  }
+
+  packetqueue_iterator snap_it = *analysis_it;
+  packetqueue.increment_it(analysis_it);
+
+  // signal is set by capture
+  bool signal = shared_data->signal;
+  bool signal_change = (signal != last_signal);
+
+  Debug(3, "Motion detection is enabled signal(%d) signal_change(%d) trigger state(%s) image index %d",
+      signal, signal_change, TriggerState_Strings[trigger_data->trigger_state].c_str(), snap->image_index);
+
+  // Need to guard around event creation/deletion from Reload()
+  std::lock_guard<std::mutex> lck(event_mutex);
+  Debug(3, "Have event lock");
+
+  // if we have been told to be OFF, then we are off and don't do any processing.
+  if (trigger_data->trigger_state != TriggerState::TRIGGER_OFF) {
+    Debug(4, "Trigger not OFF state is (%d)", int(trigger_data->trigger_state));
+    int score = 0;
+    // Ready means that we have captured the warmup # of frames
+    if (!Ready()) {
+      Debug(3, "Not ready?");
+      delete packet_lock;
+      return false;
+    }
+
+    std::string cause;
+    Event::StringSetMap noteSetMap;
+
+    // Specifically told to be on.  Setting the score here will trigger the alarm.
+    if (trigger_data->trigger_state == TriggerState::TRIGGER_ON) {
+      score += trigger_data->trigger_score;
+      Debug(1, "Triggered on score += %d => %d", trigger_data->trigger_score, score);
+      if (!event) {
+        cause += trigger_data->trigger_cause;
+      }
+      Event::StringSet noteSet;
+      noteSet.insert(trigger_data->trigger_text);
+      noteSetMap[trigger_data->trigger_cause] = noteSet;
+    } // end if trigger_on
+
+    // FIXME this snap might not be the one that caused the signal change.  Need to store that in the packet.
+    if (signal_change) {
+      Debug(2, "Signal change, new signal is %d", signal);
+      const char *signalText = "Unknown";
+      if (!signal) {
+        signalText = "Lost";
+        if (event) {
+          Info("%s: %03d - Closing event %" PRIu64 ", signal loss", name.c_str(), analysis_image_count, event->Id());
+          closeEvent();
+          last_section_mod = 0;
         }
+      } else {
+        signalText = "Reacquired";
+        score += 100;
+      }
+      if (!event) {
+        if (cause.length()) cause += ", ";
+        cause += SIGNAL_CAUSE;
+      }
+      Event::StringSet noteSet;
+      noteSet.insert(signalText);
+      noteSetMap[SIGNAL_CAUSE] = noteSet;
+      shared_data->state = state = IDLE;
+      shared_data->active = signal;
+      if ((function == MODECT or function == MOCORD) and snap->image)
+        ref_image.Assign(*(snap->image));
+    }// else 
 
-        if ( signal_change ) {
-          const char *signalText;
-          if ( !signal ) {
-            signalText = "Lost";
-          } else {
-            signalText = "Reacquired";
-            score += 100;
-          }
-          Warning("%s: %s", SIGNAL_CAUSE, signalText);
-          if ( event && !signal ) {
-            Info("%s: %03d - Closing event %" PRIu64 ", signal loss", name, image_count, event->Id());
-            closeEvent();
-          }
-          if ( !event ) {
-            if ( cause.length() )
-              cause += ", ";
-            cause += SIGNAL_CAUSE;
-          }
+    if (signal) {
+      if (snap->codec_type == AVMEDIA_TYPE_VIDEO) {
+        // Check to see if linked monitors are triggering.
+        if (n_linked_monitors > 0) {
+          Debug(1, "Checking linked monitors");
+          // FIXME improve logic here
+          bool first_link = true;
           Event::StringSet noteSet;
-          noteSet.insert(signalText);
-          noteSetMap[SIGNAL_CAUSE] = noteSet;
-          shared_data->state = state = IDLE;
-          shared_data->active = signal;
-          ref_image = *snap_image;
-
-        } else if ( signal ) {
-          if ( Active() && (function == MODECT || function == MOCORD) ) {
-            // All is good, so add motion detection score.
-            Event::StringSet zoneSet;
-            if ( (!motion_frame_skip) || !(image_count % (motion_frame_skip+1)) ) {
-              // Get new score.
-              int new_motion_score = DetectMotion(*snap_image, zoneSet);
-
-              Debug(3,
-                  "After motion detection, last_motion_score(%d), new motion score(%d)",
-                  last_motion_score, new_motion_score
-                  );
-              last_motion_score = new_motion_score;
-            }
-            if ( last_motion_score ) {
-              score += last_motion_score;
-              if ( !event ) {
-                if ( cause.length() )
-                  cause += ", ";
-                cause += MOTION_CAUSE;
-              }
-              noteSetMap[MOTION_CAUSE] = zoneSet;
-            } // end if motion_score
-            //shared_data->active = signal; // unneccessary active gets set on signal change
-          } // end if active and doing motion detection
-
-          // Check to see if linked monitors are triggering.
-          if ( n_linked_monitors > 0 ) {
-            // FIXME improve logic here
-            bool first_link = true;
-            Event::StringSet noteSet;
-            for ( int i = 0; i < n_linked_monitors; i++ ) {
-              // TODO: Shouldn't we try to connect?
-              if ( linked_monitors[i]->isConnected() ) {
-                if ( linked_monitors[i]->hasAlarmed() ) {
-                  if ( !event ) {
-                    if ( first_link ) {
-                      if ( cause.length() )
-                        cause += ", ";
-                      cause += LINKED_CAUSE;
-                      first_link = false;
-                    }
+          for ( int i = 0; i < n_linked_monitors; i++ ) {
+            // TODO: Shouldn't we try to connect?
+            if ( linked_monitors[i]->isConnected() ) {
+              Debug(1, "Linked monitor %d %s is connected",
+                  linked_monitors[i]->Id(), linked_monitors[i]->Name());
+              if ( linked_monitors[i]->hasAlarmed() ) {
+                Debug(1, "Linked monitor %d %s is alarmed",
+                    linked_monitors[i]->Id(), linked_monitors[i]->Name());
+                if ( !event ) {
+                  if ( first_link ) {
+                    if ( cause.length() )
+                      cause += ", ";
+                    cause += LINKED_CAUSE;
+                    first_link = false;
                   }
-                  noteSet.insert(linked_monitors[i]->Name());
-                  score += 50;
                 }
+                noteSet.insert(linked_monitors[i]->Name());
+                score += linked_monitors[i]->lastFrameScore(); // 50;
               } else {
-                Debug(1, "Linked monitor %d %d is not connected. Connecting.", i, linked_monitors[i]->Id());
-                linked_monitors[i]->connect();
+                Debug(1, "Linked monitor %d %s is not alarmed",
+                    linked_monitors[i]->Id(), linked_monitors[i]->Name());
               }
-            } // end foreach linked_monit
-            if ( noteSet.size() > 0 )
-              noteSetMap[LINKED_CAUSE] = noteSet;
-          } // end if linked_monitors 
+            } else {
+              Debug(1, "Linked monitor %d %d is not connected. Connecting.", i, linked_monitors[i]->Id());
+              linked_monitors[i]->connect();
+            }
+          } // end foreach linked_monitor
+          if ( noteSet.size() > 0 )
+            noteSetMap[LINKED_CAUSE] = noteSet;
+        } // end if linked_monitors
 
-          //TODO: What happens is the event closes and sets recording to false then recording to true again so quickly that our capture daemon never picks it up. Maybe need a refresh flag?
-          if ( function == RECORD || function == MOCORD ) {
-            if ( event ) {
-              Debug(3, "Have signal and recording with open event at (%d.%d)", timestamp->tv_sec, timestamp->tv_usec);
+        struct timeval *timestamp = snap->timestamp;
 
-              if ( section_length
-                  && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
-                  && ( (function == MOCORD && (event_close_mode != CLOSE_TIME)) || ! ( timestamp->tv_sec % section_length ) ) 
-                 ) {
-                Info("%s: %03d - Closing event %" PRIu64 ", section end forced %d - %d = %d >= %d",
-                    name, image_count, event->Id(),
-                    timestamp->tv_sec, video_store_data->recording.tv_sec,
-                    timestamp->tv_sec - video_store_data->recording.tv_sec,
-                    section_length
-                    );
-                closeEvent();
-              } // end if section_length
-            } // end if event
+        /* try to stay behind the decoder. */
+        if (decoding_enabled) {
+          while (!snap->image and !snap->decoded and !zm_terminate and !analysis_thread->Stopped()) {
+            // Need to wait for the decoder thread.
+            Debug(1, "Waiting for decode");
+            packet_lock->wait();
+            if (!snap->image and snap->decoded) {
+              Debug(1, "No image but was decoded, giving up");
+              delete packet_lock;
+              return false;
+            }
+          }  // end while ! decoded
+          if (zm_terminate) {
+            delete packet_lock;
+            return false;
+          }
+        }  // end if decoding enabled
 
-            if ( !event ) {
-              // Create event
-              event = new Event(this, *timestamp, "Continuous", noteSetMap, videoRecording);
-              shared_data->last_event = event->Id();
-              //set up video store data
-              snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
-              video_store_data->recording = event->StartTime();
+        if (Active() and (function == MODECT or function == MOCORD)) {
+          Debug(3, "signal and active and modect");
+          Event::StringSet zoneSet;
 
-              Info("%s: %03d - Opening new event %" PRIu64 ", section start", name, image_count, event->Id());
+          int motion_score = last_motion_score;
 
-              /* To prevent cancelling out an existing alert\prealarm\alarm state */
-              if ( state == IDLE ) {
-                shared_data->state = state = TAPE;
+          if (analysis_fps_limit) {
+            double capture_fps = get_capture_fps();
+            motion_frame_skip = capture_fps / analysis_fps_limit;
+            Debug(1, "Recalculating motion_frame_skip (%d) = capture_fps(%f) / analysis_fps(%f)",
+                motion_frame_skip, capture_fps, analysis_fps_limit);
+          }
+
+          if (!(analysis_image_count % (motion_frame_skip+1))) {
+
+            if (snap->image) {
+              // decoder may not have been able to provide an image
+              if (!ref_image.Buffer()) {
+                Debug(1, "Assigning instead of Dectecting");
+                ref_image.Assign(*(snap->image));
+              } else {
+                Debug(1, "Detecting motion on image %d, image %p", snap->image_index, snap->image);
+                // Get new score.
+                motion_score = DetectMotion(*(snap->image), zoneSet);
+
+                snap->zone_stats.reserve(zones.size());
+                for (const Zone &zone : zones) {
+                  const ZoneStats &stats = zone.GetStats();
+                  stats.DumpToLog("After detect motion");
+                  snap->zone_stats.push_back(stats);
+                }
+
+                Debug(3, "After motion detection, score:%d last_motion_score(%d), new motion score(%d)",
+                    score, last_motion_score, motion_score);
+                motion_frame_count += 1;
+                // Why are we updating the last_motion_score too?
+                last_motion_score = motion_score;
               }
-            } // end if ! event
-          } // end if function == RECORD || function == MOCORD)
-        } // end if !signal_change && signal
+            } else {
+              Debug(1, "no image so skipping motion detection");
+            }  // end if has image
+          } else {
+            Debug(1, "Skipped motion detection last motion score was %d", motion_score);
+          }
+          if (motion_score) {
+            score += motion_score;
+            if (cause.length()) cause += ", ";
+            cause += MOTION_CAUSE;
+            noteSetMap[MOTION_CAUSE] = zoneSet;
+          } // end if motion_score
+        } else {
+          Debug(1, "Not Active(%d) enabled %d active %d doing motion detection: %d",
+              Active(), enabled, shared_data->active,
+              (function == MODECT or function == MOCORD)
+              );
+        } // end if active and doing motion detection
 
-        if ( score ) {
-          if ( (state == IDLE) || (state == TAPE) || (state == PREALARM) ) {
+        if (function == RECORD or function == MOCORD) {
+          // If doing record, check to see if we need to close the event or not.
+          if (event) {
+            Debug(2, "Have event %" PRIu64 " in mocord", event->Id());
+
+            if (section_length && 
+                ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
+                && ( 
+                  ( (function == MOCORD) && (event_close_mode != CLOSE_TIME) )
+                  ||
+                  ( (function == RECORD) && (event_close_mode == CLOSE_TIME) )  
+                  || ! ( timestamp->tv_sec % section_length )
+                )
+               ) {
+              Info("%s: %03d - Closing event %" PRIu64 ", section end forced %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %d",
+                   name.c_str(),
+                   image_count,
+                   event->Id(),
+                   static_cast<int64>(timestamp->tv_sec),
+                   static_cast<int64>(video_store_data->recording.tv_sec),
+                   static_cast<int64>(timestamp->tv_sec - video_store_data->recording.tv_sec),
+                   section_length);
+              closeEvent();
+            }  // end if section_length
+          }  // end if event
+
+          if (!event) {
+            Debug(2, "Creating continuous event");
+            if (!snap->keyframe and (videowriter == PASSTHROUGH)) {
+              // Must start on a keyframe so rewind. Only for passthrough though I guess.
+              // FIXME this iterator is not protected from invalidation
+              packetqueue_iterator *start_it = packetqueue.get_event_start_packet_it(
+                  snap_it, 0 /* pre_event_count */
+                  );
+
+              // This gets a lock on the starting packet
+
+              ZMLockedPacket *starting_packet_lock = nullptr;
+              ZMPacket *starting_packet = nullptr;
+              if ( *start_it != snap_it ) {
+                starting_packet_lock = packetqueue.get_packet(start_it);
+                if (!starting_packet_lock) return false;
+                starting_packet = starting_packet_lock->packet_;
+              } else {
+                starting_packet = snap;
+              }
+
+              event = new Event(this, *(starting_packet->timestamp), "Continuous", noteSetMap);
+              // Write out starting packets, do not modify packetqueue it will garbage collect itself
+              while ( starting_packet and ((*start_it) != snap_it) ) {
+                event->AddPacket(starting_packet);
+                // Have added the packet, don't want to unlock it until we have locked the next
+
+                packetqueue.increment_it(start_it);
+                if ( (*start_it) == snap_it ) {
+                  if (starting_packet_lock) delete starting_packet_lock;
+                  break;
+                }
+                ZMLockedPacket *lp = packetqueue.get_packet(start_it);
+                delete starting_packet_lock;
+                if (!lp) return false;
+                starting_packet_lock = lp;
+                starting_packet = lp->packet_;
+              }
+              packetqueue.free_it(start_it);
+              delete start_it;
+              start_it = nullptr;
+            } else {
+              // Create event from current snap
+              event = new Event(this, *timestamp, "Continuous", noteSetMap);
+            }
+            shared_data->last_event_id = event->Id();
+
+            // lets construct alarm cause. It will contain cause + names of zones alarmed
+            std::string alarm_cause;
+            for (const Zone &zone : zones) {
+              if (zone.Alarmed()) {
+                if (!alarm_cause.empty()) alarm_cause += ",";
+                alarm_cause += std::string(zone.Label());
+              }
+            }
+            alarm_cause = cause+" Continuous "+alarm_cause;
+            strncpy(shared_data->alarm_cause, alarm_cause.c_str(), sizeof(shared_data->alarm_cause)-1);
+            video_store_data->recording = event->StartTime();
+            Info("%s: %03d - Opened new event %" PRIu64 ", section start",
+                name.c_str(), analysis_image_count, event->Id());
+            /* To prevent cancelling out an existing alert\prealarm\alarm state */
+            if (state == IDLE) {
+              shared_data->state = state = TAPE;
+            }
+          } // end if ! event
+        } // end if RECORDING
+
+        if (score) {
+
+          if ((state == IDLE) || (state == TAPE) || (state == PREALARM)) {
             // If we should end then previous continuous event and start a new non-continuous event
-            if ( event && event->Frames()
+            if (event && event->Frames()
                 && (!event->AlarmFrames())
                 && (event_close_mode == CLOSE_ALARM)
                 && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= min_section_length )
-								&& ( (!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1) )
+                && ( (!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1) )
                ) {
               Info("%s: %03d - Closing event %" PRIu64 ", continuous end, alarm begins",
-                  name, image_count, event->Id());
+                  name.c_str(), image_count, event->Id());
               closeEvent();
-            } else if ( event ) {
-							// This is so if we need more than 1 alarm frame before going into alarm, so it is basically if we have enough alarm frames
-							Debug(3, "pre-alarm-count in event %d, event frames %d, alarm frames %d event length %d >=? %d min",
-									Event::PreAlarmCount(), event->Frames(), event->AlarmFrames(), 
-									( timestamp->tv_sec - video_store_data->recording.tv_sec ), min_section_length
-									);
-						}
-
-						if ( (!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1) ) {
-							// lets construct alarm cause. It will contain cause + names of zones alarmed
-							std::string alarm_cause = "";
-							for ( int i=0; i < n_zones; i++ ) {
-								if ( zones[i]->Alarmed() ) {
-                  alarm_cause = alarm_cause + "," + std::string(zones[i]->Label());
+            } else if (event) {
+              // This is so if we need more than 1 alarm frame before going into alarm, so it is basically if we have enough alarm frames
+              Debug(3,
+                    "pre_alarm_count in event %d, event frames %d, alarm frames %d event length %" PRIi64 " >=? %d min",
+                    Event::PreAlarmCount(),
+                    event->Frames(),
+                    event->AlarmFrames(),
+                    static_cast<int64>(timestamp->tv_sec - video_store_data->recording.tv_sec),
+                    min_section_length);
+            }
+            if ((!pre_event_count) || (Event::PreAlarmCount() >= alarm_frame_count-1)) {
+              // lets construct alarm cause. It will contain cause + names of zones alarmed
+              std::string alarm_cause = "";
+              for (const Zone &zone : zones) {
+                if (zone.Alarmed()) {
+                  alarm_cause = alarm_cause + "," + std::string(zone.Label());
                 }
               }
-              if ( !alarm_cause.empty() ) alarm_cause[0] = ' ';
+              if (!alarm_cause.empty()) alarm_cause[0] = ' ';
               alarm_cause = cause + alarm_cause;
               strncpy(shared_data->alarm_cause, alarm_cause.c_str(), sizeof(shared_data->alarm_cause)-1);
               Info("%s: %03d - Gone into alarm state PreAlarmCount: %u > AlarmFrameCount:%u Cause:%s",
-                  name, image_count, Event::PreAlarmCount(), alarm_frame_count, shared_data->alarm_cause);
+                  name.c_str(), image_count, Event::PreAlarmCount(), alarm_frame_count, shared_data->alarm_cause);
 
-              if ( !event ) {
-                int pre_index;
-                int pre_event_images = pre_event_count;
-
-                if ( analysis_fps && pre_event_count ) {
-                  // If analysis fps is set,
-                  // compute the index for pre event images in the dedicated buffer
-                  pre_index = pre_event_buffer_count ? image_count % pre_event_buffer_count : 0;
-                  Debug(3, "pre-index %d = image_count(%d) %% pre_event_buffer_count(%d)",
-                     pre_index, image_count, pre_event_buffer_count); 
-
-                  // Seek forward the next filled slot in to the buffer (oldest data)
-                  // from the current position
-                  while ( pre_event_images && !pre_event_buffer[pre_index].timestamp->tv_sec ) {
-                    pre_index = (pre_index + 1)%pre_event_buffer_count;
-                    // Slot is empty, removing image from counter
-                    pre_event_images--;
-                  }
-                  Debug(3, "pre-index %d, pre-event_images %d",
-                     pre_index, pre_event_images); 
-
-                  event = new Event(this, *(pre_event_buffer[pre_index].timestamp), cause, noteSetMap);
+              if (!event) {
+                packetqueue_iterator *start_it = packetqueue.get_event_start_packet_it(
+                    snap_it,
+                    (pre_event_count > alarm_frame_count ? pre_event_count : alarm_frame_count)
+                    );
+                ZMLockedPacket *starting_packet_lock = nullptr;
+                ZMPacket *starting_packet = nullptr;
+                if (*start_it != snap_it) {
+                  starting_packet_lock = packetqueue.get_packet(start_it);
+                  if (!starting_packet_lock) return false;
+                  starting_packet = starting_packet_lock->packet_;
                 } else {
-                  // If analysis fps is not set (analysis performed at capturing framerate),
-                  // compute the index for pre event images in the capturing buffer
-                  if ( alarm_frame_count > 1 )
-                    pre_index = ((index + image_buffer_count) - ((alarm_frame_count - 1) + pre_event_count))%image_buffer_count;
-                  else
-                    pre_index = ((index + image_buffer_count) - pre_event_count)%image_buffer_count;
+                  starting_packet = snap;
+                }
 
-                  Debug(3, "Resulting pre_index(%d) from index(%d) + image_buffer_count(%d) - pre_event_count(%d)",
-                      pre_index, index, image_buffer_count, pre_event_count);
-
-                  // Seek forward the next filled slot in to the buffer (oldest data)
-                  // from the current position
-                  while ( pre_event_images && !image_buffer[pre_index].timestamp->tv_sec ) {
-                    pre_index = (pre_index + 1)%image_buffer_count;
-                    // Slot is empty, removing image from counter
-                    pre_event_images--;
-                  }
-
-                  event = new Event(this, *(image_buffer[pre_index].timestamp), cause, noteSetMap);
-                } // end if analysis_fps && pre_event_count
-
-                shared_data->last_event = event->Id();
-                //set up video store data
+                event = new Event(this, *(starting_packet->timestamp), cause, noteSetMap);
+                shared_data->last_event_id = event->Id();
                 snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
                 video_store_data->recording = event->StartTime();
+                shared_data->state = state = ALARM;
 
-                Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name, image_count, event->Id());
+                // Write out starting packets, do not modify packetqueue it will garbage collect itself
+                while (*start_it != snap_it) {
+                  event->AddPacket(starting_packet);
 
-                if ( pre_event_images ) {
-                  if ( analysis_fps ) {
-                    for ( int i = 0; i < pre_event_images; i++ ) {
-                      timestamps[i] = pre_event_buffer[pre_index].timestamp;
-                      images[i] = pre_event_buffer[pre_index].image;
-                      pre_index = (pre_index + 1)%pre_event_buffer_count;
-                    }
-                  } else {
-                    for ( int i = 0; i < pre_event_images; i++ ) {
-                      timestamps[i] = image_buffer[pre_index].timestamp;
-                      images[i] = image_buffer[pre_index].image;
-                      pre_index = (pre_index + 1)%image_buffer_count;
-                    }
+                  packetqueue.increment_it(start_it);
+                  if ( (*start_it) == snap_it ) {
+                    if (starting_packet_lock) delete starting_packet_lock;
+                    break;
                   }
-                  event->AddFrames(pre_event_images, images, timestamps);
-                }  // end if pre_event_images
-
-                if ( ( alarm_frame_count > 1 ) && Event::PreAlarmCount() ) {
-                  Debug(1, "alarm frame count so SavePreAlarmFrames");
-                  event->SavePreAlarmFrames();
+                  ZMLockedPacket *lp = packetqueue.get_packet(start_it);
+                  delete starting_packet_lock;
+                  if (!lp) {
+                    // Shutting down event will be closed by ~Monitor()
+                    // Perhaps we shouldn't do this.
+                    return false;
+                  }
+                  starting_packet_lock = lp;
+                  starting_packet = lp->packet_;
                 }
-              } // end if event
-              shared_data->state = state = ALARM;
-            } else if ( state != PREALARM ) {
-              Info("%s: %03d - Gone into prealarm state", name, image_count);
+                packetqueue.free_it(start_it);
+                delete start_it;
+                start_it = nullptr;
+
+                Info("%s: %03d - Opening new event %" PRIu64 ", alarm start", name.c_str(), analysis_image_count, event->Id());
+              } else {
+                shared_data->state = state = ALARM;
+              }  // end if no event, so start it
+              if ( alarm_frame_count ) {
+                Debug(1, "alarm frame count so SavePreAlarmFrames");
+                event->SavePreAlarmFrames();
+              }
+            } else if (state != PREALARM) {
+              Info("%s: %03d - Gone into prealarm state", name.c_str(), analysis_image_count);
               shared_data->state = state = PREALARM;
             }
-          } else if ( state == ALERT ) {
-            Info("%s: %03d - Gone back into alarm state", name, image_count);
+          } else if (state == ALERT) {
+            alert_to_alarm_frame_count--;
+            Info("%s: %03d - Alarmed frame while in alert state. Consecutive alarmed frames left to return to alarm state: %03d",
+                name.c_str(), analysis_image_count, alert_to_alarm_frame_count);
+            if (alert_to_alarm_frame_count == 0) {
+              Info("%s: %03d - Gone back into alarm state", name.c_str(), analysis_image_count);
+              shared_data->state = state = ALARM;
+            }
+          } else if (state == TAPE) {
+            // Already recording, but IDLE so switch to ALARM
             shared_data->state = state = ALARM;
+            Debug(1, "Was in TAPE, going into ALARM");
+          } else {
+            Debug(1, "Staying in %s", State_Strings[state].c_str());
+
           }
-          last_alarm_count = image_count;
-        } else { // not score
-          if ( state == ALARM ) {
-            Info("%s: %03d - Gone into alert state", name, image_count);
+          if (state == ALARM) {
+            last_alarm_count = analysis_image_count; 
+          } // This is needed so post_event_count counts after last alarmed frames while in ALARM not single alarmed frames while ALERT
+        } else { // no score?
+          alert_to_alarm_frame_count = alarm_frame_count; // load same value configured for alarm_frame_count 
+          if (state == ALARM) {
+            Info("%s: %03d - Gone into alert state", name.c_str(), analysis_image_count);
             shared_data->state = state = ALERT;
-          } else if ( state == ALERT ) {
+          } else if (state == ALERT) {
             if ( 
-                ( image_count-last_alarm_count > post_event_count )
-                && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= min_section_length )
-                ) {
+                ( analysis_image_count-last_alarm_count > post_event_count ) 
+                &&
+                ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= min_section_length )
+               ) {
               Info("%s: %03d - Left alarm state (%" PRIu64 ") - %d(%d) images",
-                  name, image_count, event->Id(), event->Frames(), event->AlarmFrames());
+                  name.c_str(), analysis_image_count, event->Id(), event->Frames(), event->AlarmFrames());
               //if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() == SIGNAL_CAUSE )
-              if ( ( function != MOCORD && function != RECORD ) || event_close_mode == CLOSE_ALARM ) {
+              if ( (function != RECORD && function != MOCORD ) || event_close_mode == CLOSE_ALARM ) {
                 shared_data->state = state = IDLE;
                 Info("%s: %03d - Closing event %" PRIu64 ", alarm end%s",
-                    name, image_count, event->Id(), (function==MOCORD)?", section truncated":"");
+                    name.c_str(), analysis_image_count, event->Id(), (function==MOCORD)?", section truncated":"" );
                 closeEvent();
               } else {
                 shared_data->state = state = TAPE;
               }
             }
-          } // end if ALARM or ALERT
-
-          if ( state == PREALARM ) {
-            if ( function != MOCORD ) {
-              shared_data->state = state = IDLE;
-            } else {
-              shared_data->state = state = TAPE;
-            }
-						// Not in PREALARM state anymore, can clear PreAlarmCount
-						if ( Event::PreAlarmCount() )
-							Event::EmptyPreAlarmFrames();
-					}
-				} // end if score or not
-
-        if ( state != IDLE ) {
-          if ( state == PREALARM || state == ALARM ) {
-            if ( savejpegs > 1 ) {
-              bool got_anal_image = false;
-              alarm_image.Assign(*snap_image);
-              for ( int i = 0; i < n_zones; i++ ) {
-                if ( zones[i]->Alarmed() ) {
-                  if ( zones[i]->AlarmImage() ) {
-                    alarm_image.Overlay(*(zones[i]->AlarmImage()));
-                    got_anal_image = true;
-                  }
-                  if ( config.record_event_stats && (state == ALARM) )
-                    zones[i]->RecordStats(event);
-                } // end if zone is alarmed
-              } // end foreach zone
-
-              if ( state == PREALARM ) {
-                Event::AddPreAlarmFrame(snap_image, *timestamp, score, (got_anal_image?&alarm_image:nullptr));
-              } else {
-								event->AddFrame(snap_image, *timestamp, score, (got_anal_image?&alarm_image:nullptr));
-							}
-            } else {
-              // Not doing alarm frame storage
-              if ( state == PREALARM ) {
-                Event::AddPreAlarmFrame(snap_image, *timestamp, score);
-              } else {
-                event->AddFrame(snap_image, *timestamp, score);
-                if ( config.record_event_stats ) {
-                  for ( int i = 0; i < n_zones; i++ ) {
-                    if ( zones[i]->Alarmed() )
-                      zones[i]->RecordStats(event);
-                  }
-                } // end if  config.record_event_stats
-              }
-            } // end if savejpegs > 1 
-
-            if ( event ) {
-              if ( noteSetMap.size() > 0 )
-                event->updateNotes(noteSetMap);
-
-              if ( section_length
-                  && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
-                  && ! (image_count % fps_report_interval)
-                 ) {
-                Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %d - %d = %d >= %d",
-                    name, image_count, event->Id(),
-                    timestamp->tv_sec, video_store_data->recording.tv_sec,
-                    timestamp->tv_sec - video_store_data->recording.tv_sec,
-                    section_length
-                    );
-                closeEvent();
-                event = new Event(this, *timestamp, cause, noteSetMap);
-                shared_data->last_event = event->Id();
-                //set up video store data
-                snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
-                video_store_data->recording = event->StartTime();
-              }
-            } // end if event
-
-          } else if ( state == ALERT ) {
-            event->AddFrame(snap_image, *timestamp);
-            if ( noteSetMap.size() > 0 )
-              event->updateNotes(noteSetMap);
-          } else if ( state == TAPE ) {
-            //Video Storage: activate only for supported cameras. Event::AddFrame knows whether or not we are recording video and saves frames accordingly
-            //if((GetOptVideoWriter() == 2) && camera->SupportsNativeVideo()) {
-              // I don't think this is required, and causes problems, as the event file hasn't been setup yet.
-              //Warning("In state TAPE,
-              //video_store_data->recording = event->StartTime();
-            //}
-            if ( (!frame_skip) || !(image_count%(frame_skip+1)) ) {
-              if ( config.bulk_frame_interval > 1 ) {
-                event->AddFrame(snap_image, *timestamp, (event->Frames()<pre_event_count?0:-1));
-              } else {
-                event->AddFrame(snap_image, *timestamp);
-              }
-            }
+          } else if (state == PREALARM) {
+            // Back to IDLE
+            shared_data->state = state = ((function != MOCORD) ? IDLE : TAPE);
+          } else {
+            Debug(1,
+                  "State %s because image_count(%d)-last_alarm_count(%d) > post_event_count(%d) and timestamp.tv_sec(%" PRIi64 ") - recording.tv_src(%" PRIi64 ") >= min_section_length(%d)",
+                  State_Strings[state].c_str(),
+                  analysis_image_count,
+                  last_alarm_count,
+                  post_event_count,
+                  static_cast<int64>(timestamp->tv_sec),
+                  static_cast<int64>(video_store_data->recording.tv_sec),
+                  min_section_length);
           }
-        } // end if ! IDLE
-      }
-    } else {
-      if ( event ) {
-        Info("%s: %03d - Closing event %" PRIu64 ", trigger off", name, image_count, event->Id());
-        closeEvent();
-      }
-      shared_data->state = state = IDLE;
-      trigger_data->trigger_state = TRIGGER_CANCEL;
-    } // end if ( trigger_data->trigger_state != TRIGGER_OFF )
+          if (Event::PreAlarmCount())
+            Event::EmptyPreAlarmFrames();
+        } // end if score or not
 
-    if ( (!signal_change && signal) && (function == MODECT || function == MOCORD) ) {
-      if ( state == ALARM ) {
-         ref_image.Blend( *snap_image, alarm_ref_blend_perc );
-      } else {
-         ref_image.Blend( *snap_image, ref_blend_perc );
-      }
+        snap->score = score;
+
+        if (state == PREALARM) {
+          // Generate analysis images if necessary
+          if ((savejpegs > 1) and snap->image) {
+            for (const Zone &zone : zones) {
+              if (zone.Alarmed()) {
+                if (zone.AlarmImage()) {
+                  if (!snap->analysis_image)
+                    snap->analysis_image = new Image(*(snap->image));
+                  snap->analysis_image->Overlay(*(zone.AlarmImage()));
+                }
+              } // end if zone is alarmed
+            } // end foreach zone
+          } // end if savejpegs
+
+          // incremement pre alarm image count
+          //have_pre_alarmed_frames ++;
+          Event::AddPreAlarmFrame(snap->image, *timestamp, score, nullptr);
+        } else if (state == ALARM) {
+          for (const Zone &zone : zones) {
+            if (zone.Alarmed()) {
+              if (zone.AlarmImage() and (savejpegs > 1) and snap->image) {
+                if (!snap->analysis_image)
+                  snap->analysis_image = new Image(*(snap->image));
+                snap->analysis_image->Overlay(*(zone.AlarmImage()));
+              }
+            } // end if zone is alarmed
+          } // end foreach zone
+          if (event) {
+            if (noteSetMap.size() > 0)
+              event->updateNotes(noteSetMap);
+            if ( section_length
+                && ( ( timestamp->tv_sec - video_store_data->recording.tv_sec ) >= section_length )
+               ) {
+              Warning("%s: %03d - event %" PRIu64 ", has exceeded desired section length. %" PRIi64 " - %" PRIi64 " = %" PRIi64 " >= %d",
+                      name.c_str(), analysis_image_count, event->Id(),
+                      static_cast<int64>(timestamp->tv_sec), static_cast<int64>(video_store_data->recording.tv_sec),
+                      static_cast<int64>(timestamp->tv_sec - video_store_data->recording.tv_sec),
+                      section_length);
+              closeEvent();
+              event = new Event(this, *timestamp, cause, noteSetMap);
+              shared_data->last_event_id = event->Id();
+              //set up video store data
+              snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
+              video_store_data->recording = event->StartTime();
+            }
+          } else {
+            Error("ALARM but no event");
+          }
+        } else if ( state == ALERT ) {
+          // Alert means this frame has no motion, but we were alarmed and are still recording.
+          if ( noteSetMap.size() > 0 )
+            event->updateNotes(noteSetMap);
+        } else if ( state == TAPE ) {
+          // bulk frame code moved to event.
+        } // end if state machine
+
+        if ( (function == MODECT or function == MOCORD) and snap->image ) {
+          if (!ref_image.Buffer()) {
+            Debug(1, "Assigning");
+            ref_image.Assign(*(snap->image));
+          } else {
+            Debug(1, "Blending");
+            ref_image.Blend(*(snap->image), ( state==ALARM ? alarm_ref_blend_perc : ref_blend_perc ));
+            Debug(1, "Done Blending");
+          }
+        }
+        last_signal = signal;
+      } // end if videostream
+    } // end if signal
+    shared_data->last_frame_score = score;
+  } else {
+    Debug(3, "trigger == off");
+    if ( event ) {
+      Info("%s: %03d - Closing event %" PRIu64 ", trigger off", name.c_str(), analysis_image_count, event->Id());
+      closeEvent();
     }
-    last_signal = signal;
-  } // end if Enabled()
+    shared_data->state = state = IDLE;
+  } // end if ( trigger_data->trigger_state != TRIGGER_OFF )
 
-  shared_data->last_read_index = index % image_buffer_count;
-  //shared_data->last_read_time = image_buffer[index].timestamp->tv_sec;
-  shared_data->last_read_time = now.tv_sec;
+  if (event) event->AddPacket(snap);
 
-  if ( analysis_fps && pre_event_buffer_count ) {
-    // If analysis fps is set, add analysed image to dedicated pre event buffer
-    int pre_index = image_count%pre_event_buffer_count;
-    pre_event_buffer[pre_index].image->Assign(*snap->image);
-    memcpy(pre_event_buffer[pre_index].timestamp, snap->timestamp, sizeof(struct timeval));
+  // In the case where people have pre-alarm frames, the web ui will generate the frame images
+  // from the mp4. So no one will notice anyways.
+  if (snap->image and (videowriter == PASSTHROUGH) and !savejpegs) {
+    Debug(1, "Deleting image data for %d", snap->image_index);
+    // Don't need raw images anymore
+    delete snap->image;
+    snap->image = nullptr;
   }
 
-  image_count++;
+  packetqueue.unlock(packet_lock);
+
+  if ( snap->image_index > 0 ) {
+    // Only do these if it's a video packet.
+    shared_data->last_read_index = snap->image_index;
+    analysis_image_count++;
+    if ( function == MODECT or function == MOCORD )
+      UpdateAnalysisFPS();
+  }
+  shared_data->last_read_time = time(nullptr);
+  packetqueue.clearPackets(snap);
 
   return true;
-} // end Monitor::Analyze
+} // end Monitor::Analyse
 
 void Monitor::Reload() {
-  Debug(1, "Reloading monitor %s", name);
+  Debug(1, "Reloading monitor %s", name.c_str());
 
-  if ( event ) {
-    Info("%s: %03d - Closing event %" PRIu64 ", reloading", name, image_count, event->Id());
+  // Access to the event needs to be protected.  Either thread could call Reload.  Either thread could close the event. 
+  // Need a mutex on it I guess.  FIXME
+  // Need to guard around event creation/deletion This will prevent event creation until new settings are loaded
+  std::lock_guard<std::mutex> lck(event_mutex);
+  if (event) {
+    Info("%s: %03d - Closing event %" PRIu64 ", reloading", name.c_str(), image_count, event->Id());
     closeEvent();
   }
 
-  static char sql[ZM_SQL_MED_BUFSIZ];
-  // This seems to have fallen out of date.
-  snprintf(sql, sizeof(sql), 
-      "SELECT `Function`+0, `Enabled`, `LinkedMonitors`, `EventPrefix`, `LabelFormat`, "
-      "`LabelX`, `LabelY`, `LabelSize`, `WarmupCount`, `PreEventCount`, `PostEventCount`, "
-      "`AlarmFrameCount`, `SectionLength`, `MinSectionLength`, `FrameSkip`, "
-      "`MotionFrameSkip`, `AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`, "
-      "`FPSReportInterval`, `RefBlendPerc`, `AlarmRefBlendPerc`, `TrackMotion`, "
-      "`SignalCheckPoints`, `SignalCheckColour` FROM `Monitors` WHERE `Id` = '%d'", id);
-
-  zmDbRow *row = zmDbFetchOne(sql);
-  if ( !row ) {
+  std::string sql = load_monitor_sql + stringtf(" WHERE Id=%d", id);
+  zmDbRow *row = zmDbFetchOne(sql.c_str());
+  if (!row) {
     Error("Can't run query: %s", mysql_error(&dbconn));
-  } else if ( MYSQL_ROW dbrow = row->mysql_row() ) {
-    int index = 0;
-    function = (Function)atoi(dbrow[index++]);
-    enabled = atoi(dbrow[index++]);
-    const char *p_linked_monitors = dbrow[index++];
+  } else if (MYSQL_ROW dbrow = row->mysql_row()) {
+    Load(dbrow, true /*load zones */, purpose);
 
-    if ( dbrow[index] ) {
-      strncpy(event_prefix, dbrow[index++], sizeof(event_prefix)-1);
-    } else {
-      event_prefix[0] = 0;
-      index++;
-    }
-    if ( dbrow[index] ) {
-      strncpy(label_format, dbrow[index++], sizeof(label_format)-1);
-    } else {
-      label_format[0] = 0;
-      index++;
-    }
-
-    label_coord = Coord( atoi(dbrow[index]), atoi(dbrow[index+1]) ); index += 2;
-    label_size = atoi(dbrow[index++]);
-    warmup_count = atoi(dbrow[index++]);
-    pre_event_count = atoi(dbrow[index++]);
-    post_event_count = atoi(dbrow[index++]);
-    alarm_frame_count = atoi(dbrow[index++]);
-    section_length = atoi(dbrow[index++]);
-    min_section_length = atoi(dbrow[index++]);
-    frame_skip = atoi(dbrow[index++]);
-    motion_frame_skip = atoi(dbrow[index++]);
-    analysis_fps = dbrow[index] ? strtod(dbrow[index], nullptr) : 0; index++;
-    analysis_update_delay = strtoul(dbrow[index++], nullptr, 0);
-
-    capture_max_fps = dbrow[index] ? atof(dbrow[index]) : 0.0; index++;
-    capture_delay = ( capture_max_fps > 0.0 ) ? int(DT_PREC_3/capture_max_fps) : 0;
-
-    alarm_capture_delay = (dbrow[index]&&atof(dbrow[index])>0.0)?int(DT_PREC_3/atof(dbrow[index])):0; index++;
-    fps_report_interval = atoi(dbrow[index++]);
-    ref_blend_perc = atoi(dbrow[index++]);
-    alarm_ref_blend_perc = atoi(dbrow[index++]);
-    track_motion = atoi(dbrow[index++]);
-
-    signal_check_points = dbrow[index]?atoi(dbrow[index]):0; index++;
-    signal_check_colour = strtol(dbrow[index][0]=='#'?dbrow[index]+1:dbrow[index], 0, 16); index++;
-
-    shared_data->state = state = IDLE;
-    shared_data->alarm_x = shared_data->alarm_y = -1;
-    if ( enabled )
-      shared_data->active = true;
-    ready_count = image_count+warmup_count;
-
-    ReloadLinkedMonitors(p_linked_monitors);
     delete row;
-  } // end if row
+  }  // end if row
 
-  ReloadZones();
 }  // end void Monitor::Reload()
 
 void Monitor::ReloadZones() {
-  Debug(1, "Reloading zones for monitor %s", name);
-  for ( int i = 0; i < n_zones; i++ ) {
-    delete zones[i];
-  }
-  delete[] zones;
-  zones = nullptr;
-  n_zones = Zone::Load(this, zones);
+  Debug(3, "Reloading zones for monitor %s have %zu", name.c_str(), zones.size());
+  zones = Zone::Load(this);
+  Debug(1, "Reloading zones for monitor %s have %zu", name.c_str(), zones.size());
+  this->AddPrivacyBitmask();
   //DumpZoneImage();
 } // end void Monitor::ReloadZones()
 
 void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors) {
-  Debug(1, "Reloading linked monitors for monitor %s, '%s'", name, p_linked_monitors);
+  Debug(1, "Reloading linked monitors for monitor %s, '%s'", name.c_str(), p_linked_monitors);
   if ( n_linked_monitors ) {
-    for ( int i = 0; i < n_linked_monitors; i++ ) {
+    for ( int i=0; i < n_linked_monitors; i++ ) {
       delete linked_monitors[i];
     }
     delete[] linked_monitors;
@@ -1902,6 +2366,7 @@ void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors) {
     int n_link_ids = 0;
     unsigned int link_ids[256];
 
+    // This nasty code picks out strings of digits from p_linked_monitors and tries to load them. 
     char link_id_str[8];
     char *dest_ptr = link_id_str;
     const char *src_ptr = p_linked_monitors;
@@ -1945,639 +2410,205 @@ void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors) {
       for ( int i = 0; i < n_link_ids; i++ ) {
         Debug(1, "Checking linked monitor %d", link_ids[i]);
 
-        db_mutex.lock();
-        static char sql[ZM_SQL_SML_BUFSIZ];
-        snprintf(sql, sizeof(sql),
+        std::string sql = stringtf(
             "SELECT `Id`, `Name` FROM `Monitors`"
             "  WHERE `Id` = %d"
             "   AND `Function` != 'None'"
             "   AND `Function` != 'Monitor'"
             "   AND `Enabled`=1",
-            link_ids[i] );
-        if ( mysql_query(&dbconn, sql) ) {
-					db_mutex.unlock();
-          Error("Can't run query: %s", mysql_error(&dbconn));
+            link_ids[i]);
+
+        MYSQL_RES *result = zmDbFetch(sql.c_str());
+        if (!result) {
           continue;
         }
 
-        MYSQL_RES *result = mysql_store_result(&dbconn);
-        if ( !result ) {
-					db_mutex.unlock();
-          Error("Can't use query result: %s", mysql_error(&dbconn));
-          continue;
-        }
-        db_mutex.unlock();
         int n_monitors = mysql_num_rows(result);
         if ( n_monitors == 1 ) {
           MYSQL_ROW dbrow = mysql_fetch_row(result);
-          Debug(1, "Linking to monitor %d", link_ids[i]);
+          Debug(1, "Linking to monitor %d %s", atoi(dbrow[0]), dbrow[1]);
           linked_monitors[count++] = new MonitorLink(link_ids[i], dbrow[1]);
         } else {
           Warning("Can't link to monitor %d, invalid id, function or not enabled", link_ids[i]);
         }
         mysql_free_result(result);
-      } // end foreach link_id
+      }  // end foreach link_id
       n_linked_monitors = count;
-    } // end if has link_ids
-  } // end if p_linked_monitors
-} // end void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors)
-
-int Monitor::LoadMonitors(std::string sql, Monitor **&monitors, Purpose purpose) {
+    }  // end if has link_ids
+  }  // end if p_linked_monitors
+}  // end void Monitor::ReloadLinkedMonitors(const char *p_linked_monitors)
 
+std::vector<std::shared_ptr<Monitor>> Monitor::LoadMonitors(std::string &where, Purpose purpose) {
+  std::string sql = load_monitor_sql + " WHERE " + where;
   Debug(1, "Loading Monitors with %s", sql.c_str());
 
   MYSQL_RES *result = zmDbFetch(sql.c_str());
-  if ( !result ) {
+  if (!result) {
     Error("Can't load local monitors: %s", mysql_error(&dbconn));
-    return 0;
+    return {};
   }
   int n_monitors = mysql_num_rows(result);
   Debug(1, "Got %d monitors", n_monitors);
-  delete[] monitors;
-  monitors = new Monitor *[n_monitors];
-  for ( int i=0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
-    monitors[i] = Monitor::Load(dbrow, 1, purpose);
+
+  std::vector<std::shared_ptr<Monitor>> monitors;
+  monitors.reserve(n_monitors);
+
+  for (int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++) {
+    monitors.emplace_back(std::make_shared<Monitor>());
+    monitors.back()->Load(dbrow, true, purpose);
   }
-  if ( mysql_errno(&dbconn) ) {
+
+  if (mysql_errno(&dbconn)) {
     Error("Can't fetch row: %s", mysql_error(&dbconn));
-    return 0;
+    mysql_free_result(result);
+    return {};
   }
   mysql_free_result(result);
 
-  return n_monitors;
-} // end int Monitor::LoadMonitors(std::string sql, Monitor **&monitors, Purpose purpose)
+  return monitors;
+}
 
 #if ZM_HAS_V4L
-int Monitor::LoadLocalMonitors(const char *device, Monitor **&monitors, Purpose purpose) {
+std::vector<std::shared_ptr<Monitor>> Monitor::LoadLocalMonitors
+(const char *device, Purpose purpose) {
 
-  std::string sql = load_monitor_sql + " WHERE `Function` != 'None' AND `Type` = 'Local'";
+  std::string where = "`Function` != 'None' AND `Type` = 'Local'";
 
   if ( device[0] )
-    sql += " AND `Device`='" + std::string(device) + "'";
-  if ( staticConfig.SERVER_ID )
-    sql += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
-  return LoadMonitors(sql, monitors, purpose);
-} // end int Monitor::LoadLocalMonitors(const char *device, Monitor **&monitors, Purpose purpose)
+    where += " AND `Device`='" + std::string(device) + "'";
+  if (staticConfig.SERVER_ID)
+    where += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
+  return LoadMonitors(where, purpose);
+}
 #endif // ZM_HAS_V4L
 
-int Monitor::LoadRemoteMonitors(const char *protocol, const char *host, const char *port, const char *path, Monitor **&monitors, Purpose purpose) {
-  std::string sql = load_monitor_sql + " WHERE `Function` != 'None' AND `Type` = 'Remote'";
-  if ( staticConfig.SERVER_ID )
-    sql += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
+std::vector<std::shared_ptr<Monitor>> Monitor::LoadRemoteMonitors
+(const char *protocol, const char *host, const char *port, const char *path, Purpose purpose) {
+  std::string where = "`Function` != 'None' AND `Type` = 'Remote'";
+  if (staticConfig.SERVER_ID)
+    where += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
+  if (protocol)
+    where += stringtf(" AND `Protocol` = '%s' AND `Host` = '%s' AND `Port` = '%s' AND `Path` = '%s'", protocol, host, port, path);
+  return LoadMonitors(where, purpose);
+}
 
-  if ( protocol )
-    sql += stringtf(" AND `Protocol` = '%s' AND `Host` = '%s' AND `Port` = '%s' AND `Path` = '%s'", protocol, host, port, path);
-  return LoadMonitors(sql, monitors, purpose);
-} // end int Monitor::LoadRemoteMonitors
-
-int Monitor::LoadFileMonitors(const char *file, Monitor **&monitors, Purpose purpose) {
-  std::string sql = load_monitor_sql + " WHERE `Function` != 'None' AND `Type` = 'File'";
-  if ( file[0] )
-    sql += " AND `Path`='" + std::string(file) + "'";
-  if ( staticConfig.SERVER_ID ) {
-    sql += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
-  }
-  return LoadMonitors(sql, monitors, purpose);
-} // end int Monitor::LoadFileMonitors
+std::vector<std::shared_ptr<Monitor>> Monitor::LoadFileMonitors(const char *file, Purpose purpose) {
+  std::string where = "`Function` != 'None' AND `Type` = 'File'";
+  if (file[0])
+    where += " AND `Path`='" + std::string(file) + "'";
+  if (staticConfig.SERVER_ID)
+    where += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
+  return LoadMonitors(where, purpose);
+}
 
 #if HAVE_LIBAVFORMAT
-int Monitor::LoadFfmpegMonitors(const char *file, Monitor **&monitors, Purpose purpose) {
-  std::string sql = load_monitor_sql + " WHERE `Function` != 'None' AND `Type` = 'Ffmpeg'";
-  if ( file[0] )
-    sql += " AND `Path` = '" + std::string(file) + "'";
-
-  if ( staticConfig.SERVER_ID ) {
-    sql += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
-  }
-  return LoadMonitors(sql, monitors, purpose);
-} // end int Monitor::LoadFfmpegMonitors
+std::vector<std::shared_ptr<Monitor>> Monitor::LoadFfmpegMonitors(const char *file, Purpose purpose) {
+  std::string where = "`Function` != 'None' AND `Type` = 'Ffmpeg'";
+  if (file[0])
+    where += " AND `Path` = '" + std::string(file) + "'";
+  if (staticConfig.SERVER_ID)
+    where += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
+  return LoadMonitors(where, purpose);
+}
 #endif // HAVE_LIBAVFORMAT
 
-/* For reference
-std::string load_monitor_sql =
-"SELECT `Id`, `Name`, `ServerId`, `StorageId`, `Type`, `Function`+0, `Enabled`, `LinkedMonitors`, "
-"`AnalysisFPSLimit`, `AnalysisUpdateDelay`, `MaxFPS`, `AlarmMaxFPS`,"
-"`Device`, `Channel`, `Format`, `V4LMultiBuffer`, `V4LCapturesPerFrame`, " // V4L Settings
-"`Protocol`, `Method`, `Options`, `User`, `Pass`, `Host`, `Port`, `Path`, `Width`, `Height`, `Colours`, `Palette`, `Orientation`+0, `Deinterlacing`, "
-"`DecoderHWAccelName`, `DecoderHWAccelDevice`, `RTSPDescribe`, "
-"`SaveJPEGs`, `VideoWriter`, `EncoderParameters`, "
-//" OutputCodec, Encoder, OutputContainer, "
-"`RecordAudio`, "
-"`Brightness`, `Contrast`, `Hue`, `Colour`, "
-"`EventPrefix`, `LabelFormat`, `LabelX`, `LabelY`, `LabelSize`,"
-"`ImageBufferCount`, `WarmupCount`, `PreEventCount`, `PostEventCount`, `StreamReplayBuffer`, `AlarmFrameCount`, "
-"`SectionLength`, `MinSectionLength`, `FrameSkip`, `MotionFrameSkip`, "
-"`FPSReportInterval`, `RefBlendPerc`, `AlarmRefBlendPerc`, `TrackMotion`, `Exif`, `SignalCheckPoints`, `SignalCheckColour` FROM `Monitors`";
-*/
-
-Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose) {
-  int col = 0;
-
-  int id = atoi(dbrow[col]); col++;
-  const char *name = dbrow[col]; col++;
-  int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
-  int storage_id = atoi(dbrow[col]); col++;
-  std::string type = dbrow[col] ? dbrow[col] : ""; col++;
-  Function function = (Function)atoi(dbrow[col]); col++;
-  int enabled = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
-  const char *linked_monitors = dbrow[col];col++;
-
-  double analysis_fps = dbrow[col] ? strtod(dbrow[col], nullptr) : 0; col++;
-  unsigned int analysis_update_delay = strtoul(dbrow[col++], nullptr, 0);
-
-  double capture_max_fps = dbrow[col] ? atof(dbrow[col]) : 0.0; col++;
-  double capture_delay = ( capture_max_fps > 0.0 ) ? int(DT_PREC_3/capture_max_fps) : 0;
-  unsigned int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-
-  const char *device = dbrow[col]; col++;
-  int channel = atoi(dbrow[col]); col++;
-  int format = atoi(dbrow[col]); col++;
-  bool v4l_multi_buffer = config.v4l_multi_buffer;
-  if ( dbrow[col] ) {
-    if (*dbrow[col] == '0' ) {
-      v4l_multi_buffer = false;
-    } else if ( *dbrow[col] == '1' ) {
-      v4l_multi_buffer = true;
-    }
-  }
-  col++;
-
-  int v4l_captures_per_frame = 0;
-  if ( dbrow[col] ) {
-    v4l_captures_per_frame = atoi(dbrow[col]);
-  } else {
-    v4l_captures_per_frame = config.captures_per_frame;
-  }
-  Debug(1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame);
-  col++;
-
-  std::string protocol = dbrow[col] ? dbrow[col] : ""; col++;
-  std::string method = dbrow[col] ? dbrow[col] : ""; col++;
-  std::string options = dbrow[col] ? dbrow[col] : ""; col++;
-  std::string user = dbrow[col] ? dbrow[col] : ""; col++;
-  std::string pass = dbrow[col] ? dbrow[col] : ""; col++;
-  std::string host = dbrow[col] ? dbrow[col] : ""; col++;
-  std::string port = dbrow[col] ? dbrow[col] : ""; col++;
-  std::string path = dbrow[col] ? dbrow[col] : ""; col++;
-  int width = atoi(dbrow[col]); col++;
-  int height = atoi(dbrow[col]); col++;
-  int colours = atoi(dbrow[col]); col++;
-  int palette = atoi(dbrow[col]); col++;
-  Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
-  int deinterlacing = atoi(dbrow[col]); col++;
-  std::string decoder_hwaccel_name = dbrow[col] ? dbrow[col] : ""; col++;
-  std::string decoder_hwaccel_device = dbrow[col] ? dbrow[col] : ""; col++;
-
-  bool rtsp_describe = (dbrow[col] && *dbrow[col] != '0'); col++;
-
-  int savejpegs = atoi(dbrow[col]); col++;
-  VideoWriter videowriter = (VideoWriter)atoi(dbrow[col]); col++;
-  const char *encoderparams = dbrow[col] ? dbrow[col] : ""; col++;
-  bool record_audio = (*dbrow[col] != '0'); col++;
-
-  int brightness = atoi(dbrow[col]); col++;
-  int contrast = atoi(dbrow[col]); col++;
-  int hue = atoi(dbrow[col]); col++;
-  int colour = atoi(dbrow[col]); col++;
-
-  const char *event_prefix = dbrow[col]; col ++;
-  const char *label_format = dbrow[col] ? dbrow[col] : ""; col ++;
-  Coord label_coord = Coord( atoi(dbrow[col]), atoi(dbrow[col+1]) ); col += 2;
-  int label_size = atoi(dbrow[col]); col++;
-
-  int image_buffer_count = atoi(dbrow[col]); col++;
-  int warmup_count = atoi(dbrow[col]); col++;
-  int pre_event_count = atoi(dbrow[col]); col++;
-  int post_event_count = atoi(dbrow[col]); col++;
-  int stream_replay_buffer = atoi(dbrow[col]); col++;
-  int alarm_frame_count = atoi(dbrow[col]); col++;
-  int section_length = atoi(dbrow[col]); col++;
-  int min_section_length = atoi(dbrow[col]); col++;
-  int frame_skip = atoi(dbrow[col]); col++;
-  int motion_frame_skip = atoi(dbrow[col]); col++;
-  int fps_report_interval = atoi(dbrow[col]); col++;
-  int ref_blend_perc = atoi(dbrow[col]); col++;
-  int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
-  int track_motion = atoi(dbrow[col]); col++;
-  bool embed_exif = (*dbrow[col] != '0'); col++;
-  int signal_check_points = dbrow[col] ? atoi(dbrow[col]) : 0;col++;
-  int signal_check_color = strtol(dbrow[col][0] == '#' ? dbrow[col]+1 : dbrow[col], nullptr, 16); col++;
-
-  Camera *camera = nullptr;
-  if ( type == "Local" ) {
-
-#if ZM_HAS_V4L
-    int extras = (deinterlacing>>24)&0xff;
-
-    camera = new LocalCamera(
-        id,
-        device,
-        channel,
-        format,
-        v4l_multi_buffer,
-        v4l_captures_per_frame,
-        method,
-        width,
-        height,
-        colours,
-        palette,
-        brightness,
-        contrast,
-        hue,
-        colour,
-        purpose==CAPTURE,
-        record_audio,
-        extras
-        );
-#else
-    Fatal("ZoneMinder not built with Local Camera support");
-#endif
-  } else if ( type == "Remote" ) {
-    if ( protocol == "http" ) {
-      camera = new RemoteCameraHttp(
-        id,
-        method,
-        host,
-        port,
-        path,
-        width,
-        height,
-        colours,
-        brightness,
-        contrast,
-        hue,
-        colour,
-        purpose==CAPTURE,
-        record_audio
-      );
-    }
-#if HAVE_LIBAVFORMAT
-    else if ( protocol == "rtsp" ) {
-      camera = new RemoteCameraRtsp(
-        id,
-        method,
-        host, // Host
-        port, // Port
-        path, // Path
-        width,
-        height,
-        rtsp_describe,
-        colours,
-        brightness,
-        contrast,
-        hue,
-        colour,
-        purpose==CAPTURE,
-        record_audio
-      );
-    }
-#endif // HAVE_LIBAVFORMAT
-    else {
-      Fatal("Unexpected remote camera protocol '%s'", protocol.c_str());
-    }
-  } else if ( type == "File" ) {
-    camera = new FileCamera(
-      id,
-      path.c_str(),
-      width,
-      height,
-      colours,
-      brightness,
-      contrast,
-      hue,
-      colour,
-      purpose==CAPTURE,
-      record_audio
-    );
-  } else if ( type == "Ffmpeg" ) {
-#if HAVE_LIBAVFORMAT
-    camera = new FfmpegCamera(
-      id,
-      path,
-      method,
-      options,
-      width,
-      height,
-      colours,
-      brightness,
-      contrast,
-      hue,
-      colour,
-      purpose==CAPTURE,
-      record_audio,
-      decoder_hwaccel_name,
-      decoder_hwaccel_device
-      );
-#endif // HAVE_LIBAVFORMAT
-  } else if ( type == "NVSocket" ) {
-      camera = new RemoteCameraNVSocket(
-        id,
-        host.c_str(),
-        port.c_str(),
-        path.c_str(),
-        width,
-        height,
-        colours,
-        brightness,
-        contrast,
-        hue,
-        colour,
-        purpose==CAPTURE,
-        record_audio
-      );
-  } else if ( type == "Libvlc" ) {
-#if HAVE_LIBVLC
-    camera = new LibvlcCamera(
-      id,
-      path.c_str(),
-      method,
-      options,
-      width,
-      height,
-      colours,
-      brightness,
-      contrast,
-      hue,
-      colour,
-      purpose==CAPTURE,
-      record_audio
-    );
-#else // HAVE_LIBVLC
-    Fatal("You must have vlc libraries installed to use vlc cameras for monitor %d", id);
-#endif // HAVE_LIBVLC
-  } else if ( type == "cURL" ) {
-#if HAVE_LIBCURL
-    camera = new cURLCamera(
-      id,
-      path.c_str(),
-      user.c_str(),
-      pass.c_str(),
-      width,
-      height,
-      colours,
-      brightness,
-      contrast,
-      hue,
-      colour,
-      purpose==CAPTURE,
-      record_audio
-    );
-#else // HAVE_LIBCURL
-    Fatal("You must have libcurl installed to use ffmpeg cameras for monitor %d", id);
-#endif // HAVE_LIBCURL
-  } else if ( type == "VNC" ) {
-#if HAVE_LIBVNC
-    camera = new VncCamera(
-      id,
-      host.c_str(),
-      port.c_str(),
-      user.c_str(),
-      pass.c_str(),
-      width,
-      height,
-      colours,
-      brightness, 
-      contrast,
-      hue,
-      colour,
-      purpose==CAPTURE,
-      record_audio
-    );
-#else // HAVE_LIBVNC
-    Fatal("You must have libvnc installed to use VNC cameras for monitor id %d", id);
-#endif // HAVE_LIBVNC
-  } else {
-    Fatal("Bogus monitor type '%s' for monitor %d", type.c_str(), id);
-  } // end if type
-
-  Monitor *monitor = new Monitor(
-      id,
-      name,
-      server_id,
-      storage_id,
-      (int)function,
-      enabled,
-      linked_monitors,
-      camera,
-      orientation,
-      deinterlacing,
-      decoder_hwaccel_name,
-      decoder_hwaccel_device,
-      savejpegs,
-      videowriter,
-      encoderparams,
-      record_audio,
-      event_prefix,
-      label_format,
-      label_coord,
-      label_size,
-      image_buffer_count,
-      warmup_count,
-      pre_event_count,
-      post_event_count,
-      stream_replay_buffer,
-      alarm_frame_count,
-      section_length,
-      min_section_length,
-      frame_skip,
-      motion_frame_skip,
-      capture_max_fps,
-      analysis_fps,
-      analysis_update_delay,
-      capture_delay,
-      alarm_capture_delay,
-      fps_report_interval,
-      ref_blend_perc,
-      alarm_ref_blend_perc,
-      track_motion,
-      signal_check_points,
-      signal_check_color,
-      embed_exif,
-      purpose,
-      0,
-      0
-        );
-  camera->setMonitor(monitor);
-  Zone **zones = 0;
-  int n_zones = Zone::Load(monitor, zones);
-  monitor->AddZones(n_zones, zones);
-  monitor->AddPrivacyBitmask(zones);
-  Debug(1, "Loaded monitor %d(%s), %d zones", id, name, n_zones);
-  return monitor;
-} // end Monitor *Monitor::Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose)
-
-Monitor *Monitor::Load(unsigned int p_id, bool load_zones, Purpose purpose) {
-  std::string sql = load_monitor_sql + stringtf(" WHERE `Id`=%d", p_id);
-
-  zmDbRow dbrow;
-  if ( ! dbrow.fetch(sql.c_str()) ) {
-    Error("Can't use query result: %s", mysql_error(&dbconn));
-    return nullptr;
-  }
-  Monitor *monitor = Monitor::Load(dbrow.mysql_row(), load_zones, purpose);
-
-  return monitor;
-} // end Monitor *Monitor::Load(unsigned int p_id, bool load_zones, Purpose purpose)
-
 /* Returns 0 on success, even if no new images are available (transient error)
  * Returns -1 on failure.
  */
 int Monitor::Capture() {
-  static int FirstCapture = 1; // Used in de-interlacing to indicate whether this is the even or odd image
-  int captureResult;
+  unsigned int index = image_count % image_buffer_count;
 
-  unsigned int index = image_count%image_buffer_count;
-  Image* capture_image = image_buffer[index].image;
+  ZMPacket *packet = new ZMPacket();
+  packet->timestamp = new struct timeval;
+  packet->image_index = image_count;
+  gettimeofday(packet->timestamp, nullptr);
+  shared_data->zmc_heartbeat_time = packet->timestamp->tv_sec;
 
-  unsigned int deinterlacing_value = deinterlacing & 0xff;
+  int captureResult = camera->Capture(*packet);
+  Debug(4, "Back from capture result=%d image count %d", captureResult, image_count);
 
-  if ( deinterlacing_value == 4 ) {
-    if ( FirstCapture != 1 ) {
-      /* Copy the next image into the shared memory */
-      capture_image->CopyBuffer(*(next_buffer.image));
-    }
-
-    /* Capture a new next image */
-
-    //Check if FFMPEG camera
-    // Icon: I don't think we can support de-interlacing on ffmpeg input.... most of the time it will be h264 or mpeg4
-    if ( ( videowriter == H264PASSTHROUGH ) && camera->SupportsNativeVideo() ) {
-      captureResult = camera->CaptureAndRecord(*(next_buffer.image),
-          video_store_data->recording,
-          video_store_data->event_file );
-    } else {
-      captureResult = camera->Capture(*(next_buffer.image));
-    }
-
-    if ( FirstCapture ) {
-      FirstCapture = 0;
-      return 0;
-    }
-
-  } else {
-    //Check if FFMPEG camera
-    if ( (videowriter == H264PASSTHROUGH) && camera->SupportsNativeVideo() ) {
-      //Warning("ZMC: Recording: %d", video_store_data->recording);
-      // Should return -1 on error, like loss of signal.  Should return 0 if ok but no video frame. > 0 for received a frame.
-      captureResult = camera->CaptureAndRecord(
-          *capture_image,
-          video_store_data->recording,
-          video_store_data->event_file
-          );
-    } else {
-      /* Capture directly into image buffer, avoiding the need to memcpy() */
-      captureResult = camera->Capture(*capture_image);
-    }
-  } // end if deinterlacing or not
-
-  if ( captureResult < 0 ) {
-    Info("Return from Capture (%d), signal loss", captureResult);
-    // Tell zma to end the event. zma will reset TRIGGER
-    trigger_data->trigger_state = TRIGGER_OFF;
-    // Unable to capture image for temporary reason
+  if (captureResult < 0) {
+    Debug(2, "failed capture");
+    // Unable to capture image
     // Fake a signal loss image
+    // Not sure what to do here.  We will close monitor and kill analysis_thread but what about rtsp server?
     Rgb signalcolor;
-    signalcolor = rgb_convert(signal_check_colour, ZM_SUBPIX_ORDER_BGR); /* HTML colour code is actually BGR in memory, we want RGB */
+    /* HTML colour code is actually BGR in memory, we want RGB */
+    signalcolor = rgb_convert(signal_check_colour, ZM_SUBPIX_ORDER_BGR);
+    Image *capture_image = new Image(width, height, camera->Colours(), camera->SubpixelOrder());
     capture_image->Fill(signalcolor);
-  } else if ( captureResult > 0 ) {
-    Debug(4, "Return from Capture (%d)", captureResult);
-
-    /* Deinterlacing */
-    if ( deinterlacing_value == 1 ) {
-      capture_image->Deinterlace_Discard();
-    } else if ( deinterlacing_value == 2 ) {
-      capture_image->Deinterlace_Linear();
-    } else if ( deinterlacing_value == 3 ) {
-      capture_image->Deinterlace_Blend();
-    } else if ( deinterlacing_value == 4 ) {
-      capture_image->Deinterlace_4Field(next_buffer.image, (deinterlacing>>8)&0xff);
-    } else if ( deinterlacing_value == 5 ) {
-      capture_image->Deinterlace_Blend_CustomRatio((deinterlacing>>8)&0xff);
-    }
-
-    if ( orientation != ROTATE_0 ) {
-      switch ( orientation ) {
-        case ROTATE_0 :
-          // No action required
-          break;
-        case ROTATE_90 :
-        case ROTATE_180 :
-        case ROTATE_270 :
-          capture_image->Rotate((orientation-1)*90);
-          break;
-        case FLIP_HORI :
-        case FLIP_VERT :
-          capture_image->Flip(orientation==FLIP_HORI);
-          break;
-      }
-    } // end if have rotation
-
-    if ( capture_image->Size() > camera->ImageSize() ) {
-      Error("Captured image %d does not match expected size %d check width, height and colour depth",
-          capture_image->Size(), camera->ImageSize() );
-      return -1;
-    }
-
-    if ( (index == shared_data->last_read_index) && (function > MONITOR) ) {
-      Warning("Buffer overrun at index %d, image %d, slow down capture, speed up analysis or increase ring buffer size",
-          index, image_count );
-      time_t now = time(nullptr);
-      double approxFps = double(image_buffer_count)/double(now-image_buffer[index].timestamp->tv_sec);
-      time_t last_read_delta = now - shared_data->last_read_time;
-      if ( last_read_delta > (image_buffer_count/approxFps) ) {
-        Warning("Last image read from shared memory %ld seconds ago, zma may have gone away", last_read_delta);
-        shared_data->last_read_index = image_buffer_count;
-      }
-    } // end if overrun
-
-    if ( privacy_bitmask )
-      capture_image->MaskPrivacy(privacy_bitmask);
-
-    // Might be able to remove this call, when we start passing around ZMPackets, which will already have a timestamp
-    gettimeofday(image_buffer[index].timestamp, nullptr);
-    if ( config.timestamp_on_capture ) {
-      TimestampImage(capture_image, image_buffer[index].timestamp);
-    }
-    // Maybe we don't need to do this on all camera types
-    shared_data->signal = signal_check_points ? CheckSignal(capture_image) : true;
+    shared_data->signal = false;
     shared_data->last_write_index = index;
     shared_data->last_write_time = image_buffer[index].timestamp->tv_sec;
+    image_buffer[index].image->Assign(*capture_image);
+    *(image_buffer[index].timestamp) = *(packet->timestamp);
+    delete capture_image;
+    image_count++;
+    delete packet;
+    // What about timestamping it?
+    // Don't want to do analysis on it, but we won't due to signal
+    return -1;
+  } else if ( captureResult > 0 ) {
+    shared_data->signal = true;   // Assume if getting packets that we are getting something useful. CheckSignalPoints can correct this later.
+    // If we captured, let's assume signal, Decode will detect further
+    if (!decoding_enabled) {
+      shared_data->last_write_index = index;
+      shared_data->last_write_time = packet->timestamp->tv_sec;
+    }
+    Debug(2, "Have packet stream_index:%d ?= videostream_id: %d q.vpktcount %d event? %d image_count %d",
+        packet->packet.stream_index, video_stream_id, packetqueue.packet_count(video_stream_id), ( event ? 1 : 0 ), image_count );
+
+    if (packet->codec_type == AVMEDIA_TYPE_VIDEO) {
+      packet->packet.stream_index = video_stream_id; // Convert to packetQueue's index
+      if (video_fifo) {
+        if ( packet->keyframe ) {
+          // avcodec strips out important nals that describe the stream and
+          // stick them in extradata. Need to send them along with keyframes
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+          AVStream *stream = camera->getVideoStream();
+          video_fifo->write(
+              static_cast<unsigned char *>(stream->codecpar->extradata),
+              stream->codecpar->extradata_size,
+              packet->pts);
+#endif
+        }
+        video_fifo->writePacket(*packet);
+      }
+    } else if (packet->codec_type == AVMEDIA_TYPE_AUDIO) {
+      if (audio_fifo)
+        audio_fifo->writePacket(*packet);
+
+      // Only queue if we have some video packets in there. Should push this logic into packetqueue
+      if (record_audio and (packetqueue.packet_count(video_stream_id) or event)) {
+        packet->image_index=-1;
+        Debug(2, "Queueing audio packet");
+        packet->packet.stream_index = audio_stream_id; // Convert to packetQueue's index
+        packetqueue.queuePacket(packet);
+      } else {
+        Debug(4, "Not Queueing audio packet");
+        delete packet;
+      }
+      // Don't update last_write_index because that is used for live streaming
+      //shared_data->last_write_time = image_buffer[index].timestamp->tv_sec;
+      return 1;
+    } else {
+      Debug(1, "Unknown codec type %d", packet->codec_type);
+      delete packet;
+      return 1;
+    } // end if audio
 
     image_count++;
 
-    if ( image_count && fps_report_interval && ( (!(image_count%fps_report_interval)) || image_count < 5 ) ) {
-      time_t now = image_buffer[index].timestamp->tv_sec;
-      // If we are too fast, we get div by zero. This seems to happen in the case of audio packets.
-      if ( now != last_fps_time ) {
-        // # of images per interval / the amount of time it took
-        double new_fps = double(image_count%fps_report_interval?image_count:fps_report_interval)/(now-last_fps_time);
-        unsigned int new_camera_bytes = camera->Bytes();
-        unsigned int new_capture_bandwidth = (new_camera_bytes - last_camera_bytes)/(now-last_fps_time);
-        last_camera_bytes = new_camera_bytes;
-        //Info( "%d -> %d -> %d", fps_report_interval, now, last_fps_time );
-        //Info( "%d -> %d -> %lf -> %lf", now-last_fps_time, fps_report_interval/(now-last_fps_time), double(fps_report_interval)/(now-last_fps_time), fps );
-        Info("%s: images:%d - Capturing at %.2lf fps, capturing bandwidth %ubytes/sec",
-            name, image_count, new_fps, new_capture_bandwidth);
-        last_fps_time = now;
-        fps = new_fps;
-        db_mutex.lock();
-        static char sql[ZM_SQL_SML_BUFSIZ];
-        // The reason we update the Status as well is because if mysql restarts, the Monitor_Status table is lost,
-        // and nothing else will update the status until zmc restarts. Since we are successfully capturing we can
-        // assume that we are connected
-        snprintf(sql, sizeof(sql),
-            "INSERT INTO Monitor_Status (MonitorId,CaptureFPS,CaptureBandwidth,Status) "
-           "VALUES (%d, %.2lf, %u, 'Connected') ON DUPLICATE KEY UPDATE "
-           "CaptureFPS = %.2lf, CaptureBandwidth=%u, Status='Connected'",
-            id, fps, new_capture_bandwidth, fps, new_capture_bandwidth);
-        if ( mysql_query(&dbconn, sql) ) {
-          Error("Can't run query: %s", mysql_error(&dbconn));
-        }
-        db_mutex.unlock();
-        Debug(4,sql);
-      } // end if time has changed since last update
-    } // end if it might be time to report the fps
-  } // end if captureResult
+    // Will only be queued if there are iterators allocated in the queue.
+    if ( !packetqueue.queuePacket(packet) ) {
+      delete packet;
+    }
+    UpdateCaptureFPS();
+  } else { // result == 0
+    // Question is, do we update last_write_index etc?
+    delete packet;
+    return 0;
+  } // end if result
 
   // Icon: I'm not sure these should be here. They have nothing to do with capturing
   if ( shared_data->action & GET_SETTINGS ) {
@@ -2595,7 +2626,144 @@ int Monitor::Capture() {
     shared_data->action &= ~SET_SETTINGS;
   }
   return captureResult;
-} // end int Monitor::Capture
+} // end Monitor::Capture
+
+bool Monitor::Decode() {
+  ZMLockedPacket *packet_lock = packetqueue.get_packet(decoder_it);
+  if (!packet_lock) return false;
+  ZMPacket *packet = packet_lock->packet_;
+  packetqueue.increment_it(decoder_it);
+  if (packet->codec_type != AVMEDIA_TYPE_VIDEO) {
+    Debug(4, "Not video");
+    packetqueue.unlock(packet_lock);
+    return true; // Don't need decode
+  }
+
+  if ((!packet->image) and packet->packet.size and !packet->in_frame) {
+    // Allocate the image first so that it can be used by hwaccel
+    // We don't actually care about camera colours, pixel order etc.  We care about the desired settings
+    //
+    //capture_image = packet->image = new Image(width, height, camera->Colours(), camera->SubpixelOrder());
+    int ret = packet->decode(camera->getVideoCodecContext());
+    if (ret > 0) {
+      if (packet->in_frame and !packet->image) {
+        packet->image = new Image(camera_width, camera_height, camera->Colours(), camera->SubpixelOrder());
+        AVFrame *input_frame = packet->in_frame;
+        if (!dest_frame) dest_frame = zm_av_frame_alloc();
+
+        if (!convert_context) {
+          AVPixelFormat imagePixFormat = (AVPixelFormat)(packet->image->AVPixFormat());
+
+          convert_context = sws_getContext(
+              input_frame->width,
+              input_frame->height,
+              (AVPixelFormat)input_frame->format,
+              camera_width, camera_height,
+              imagePixFormat, SWS_BICUBIC,
+              nullptr, nullptr, nullptr);
+          if (convert_context == nullptr) {
+            Error("Unable to create conversion context from %s to %s",
+                av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
+                av_get_pix_fmt_name(imagePixFormat)
+                );
+            delete packet->image;
+            packet->image = nullptr;
+          } else {
+            Debug(1, "Setup conversion context for %dx%d %s to %dx%d %s",
+                input_frame->width, input_frame->height,
+                av_get_pix_fmt_name((AVPixelFormat)input_frame->format),
+                camera_width, camera_height,
+                av_get_pix_fmt_name(imagePixFormat)
+                );
+          }
+        }
+        if (convert_context) {
+          if (!packet->image->Assign(packet->in_frame, convert_context, dest_frame)) {
+            delete packet->image;
+            packet->image = nullptr;
+          }
+        }  // end if have convert_context
+      }  // end if need transfer to image
+    } else {
+      Debug(1, "No packet.size(%d) or packet->in_frame(%p). Not decoding", packet->packet.size, packet->in_frame);
+    }
+  }  // end if need_decoding
+  Image* capture_image = nullptr;
+  unsigned int index = image_count % image_buffer_count;
+
+  if (packet->image) {
+    capture_image = packet->image;
+
+    /* Deinterlacing */
+    if (deinterlacing_value) {
+      Debug(1, "Doing deinterlacing");
+      if (deinterlacing_value == 1) {
+        capture_image->Deinterlace_Discard();
+      } else if (deinterlacing_value == 2) {
+        capture_image->Deinterlace_Linear();
+      } else if (deinterlacing_value == 3) {
+        capture_image->Deinterlace_Blend();
+      } else if (deinterlacing_value == 4) {
+        ZMLockedPacket *deinterlace_packet_lock = nullptr;
+        while (!zm_terminate) {
+          ZMLockedPacket *second_packet_lock = packetqueue.get_packet(decoder_it);
+          if (!second_packet_lock) {
+            packetqueue.unlock(packet_lock);
+            return false;
+          }
+          if (second_packet_lock->packet_->codec_type == packet->codec_type) {
+            deinterlace_packet_lock = second_packet_lock;
+            break;
+          }
+          packetqueue.unlock(second_packet_lock);
+          packetqueue.increment_it(decoder_it);
+        }
+        if (zm_terminate) return false;
+        capture_image->Deinterlace_4Field(deinterlace_packet_lock->packet_->image, (deinterlacing>>8)&0xff);
+        packetqueue.unlock(deinterlace_packet_lock);
+      } else if (deinterlacing_value == 5) {
+        capture_image->Deinterlace_Blend_CustomRatio((deinterlacing>>8)&0xff);
+      }
+    }
+
+    if ( orientation != ROTATE_0 ) {
+      Debug(2, "Doing rotation");
+      switch ( orientation ) {
+        case ROTATE_0 :
+          // No action required
+          break;
+        case ROTATE_90 :
+        case ROTATE_180 :
+        case ROTATE_270 : 
+          capture_image->Rotate((orientation-1)*90);
+          break;
+        case FLIP_HORI :
+        case FLIP_VERT :
+          capture_image->Flip(orientation==FLIP_HORI);
+          break;
+      }
+    } // end if have rotation
+
+    if (privacy_bitmask) {
+      Debug(3, "Applying privacy");
+      capture_image->MaskPrivacy(privacy_bitmask);
+    }
+
+    if (config.timestamp_on_capture) {
+      Debug(3, "Timestampprivacy");
+      TimestampImage(packet->image, packet->timestamp);
+    }
+
+    image_buffer[index].image->Assign(*(packet->image));
+    *(image_buffer[index].timestamp) = *(packet->timestamp);
+  }  // end if have image
+  packet->decoded = true;
+  shared_data->signal = ( capture_image and signal_check_points ) ? CheckSignal(capture_image) : true;
+  shared_data->last_write_index = index;
+  shared_data->last_write_time = packet->timestamp->tv_sec;
+  packetqueue.unlock(packet_lock);
+  return true;
+}  // end bool Monitor::Decode()
 
 void Monitor::TimestampImage(Image *ts_image, const struct timeval *ts_time) const {
   if ( !label_format[0] )
@@ -2603,8 +2771,8 @@ void Monitor::TimestampImage(Image *ts_image, const struct timeval *ts_time) con
 
   // Expand the strftime macros first
   char label_time_text[256];
-  strftime(label_time_text, sizeof(label_time_text), label_format, localtime(&ts_time->tv_sec));
-
+  tm ts_tm = {};
+  strftime(label_time_text, sizeof(label_time_text), label_format.c_str(), localtime_r(&ts_time->tv_sec, &ts_tm));
   char label_text[1024];
   const char *s_ptr = label_time_text;
   char *d_ptr = label_text;
@@ -2613,7 +2781,7 @@ void Monitor::TimestampImage(Image *ts_image, const struct timeval *ts_time) con
       bool found_macro = false;
       switch ( *(s_ptr+1) ) {
         case 'N' :
-          d_ptr += snprintf(d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", name);
+          d_ptr += snprintf(d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", name.c_str());
           found_macro = true;
           break;
         case 'Q' :
@@ -2633,219 +2801,208 @@ void Monitor::TimestampImage(Image *ts_image, const struct timeval *ts_time) con
     *d_ptr++ = *s_ptr++;
   } // end while
   *d_ptr = '\0';
-  ts_image->Annotate( label_text, label_coord, label_size );
+  Debug(2, "annotating %s", label_text);
+  ts_image->Annotate(label_text, label_coord, label_size);
+  Debug(2, "done annotating %s", label_text);
 } // end void Monitor::TimestampImage
 
-bool Monitor::closeEvent() {
-  if ( !event )
-    return false;
+void Monitor::closeEvent() {
+  if (!event) return;
 
-  if ( function == RECORD || function == MOCORD ) {
-    //FIXME Is this neccessary? ENdTime should be set in the destructor
-    gettimeofday(&(event->EndTime()), nullptr);
+  if ( close_event_thread.joinable() ) {
+    Debug(1, "close event thread is joinable");
+    close_event_thread.join();
+  } else {
+    Debug(1, "close event thread is not joinable");
   }
-  if ( event_delete_thread ) {
-    event_delete_thread->join();
-    delete event_delete_thread;
-    event_delete_thread = nullptr;
-  }
-#if 0
-  event_delete_thread = new std::thread([](Event *event) {
-      Event * e = event;
-      event = nullptr;
-      delete e;
-      e = nullptr;
-      }, event);
-#else
-  delete event;
+  Debug(1, "Starting thread to close event");
+  close_event_thread = std::thread([](Event *e){ delete e; }, event);
+  Debug(1, "Nulling event");
   event = nullptr;
-#endif
-  video_store_data->recording = (struct timeval){0};
-  return true;
+  if (shared_data) video_store_data->recording = {};
 } // end bool Monitor::closeEvent()
 
 unsigned int Monitor::DetectMotion(const Image &comp_image, Event::StringSet &zoneSet) {
   bool alarm = false;
   unsigned int score = 0;
 
-  if ( n_zones <= 0 ) return alarm;
+  if (zones.empty()) {
+    Warning("No zones to check!");
+    return alarm;
+  }
 
   ref_image.Delta(comp_image, &delta_image);
 
-  if ( config.record_diag_images ) {
-    ref_image.WriteJpeg(diag_path_r.c_str(), config.record_diag_images_fifo);
-    delta_image.WriteJpeg(diag_path_d.c_str(), config.record_diag_images_fifo);
+  if (config.record_diag_images) {
+    ref_image.WriteJpeg(diag_path_ref.c_str(), config.record_diag_images_fifo);
+    delta_image.WriteJpeg(diag_path_delta.c_str(), config.record_diag_images_fifo);
   }
 
   // Blank out all exclusion zones
-  for ( int n_zone = 0; n_zone < n_zones; n_zone++ ) {
-    Zone *zone = zones[n_zone];
+  for (Zone &zone : zones) {
     // need previous alarmed state for preclusive zone, so don't clear just yet
-    if ( !zone->IsPreclusive() )
-      zone->ClearAlarm();
-    if ( !zone->IsInactive() ) {
+    if (!zone.IsPreclusive())
+      zone.ClearAlarm();
+    if (!zone.IsInactive())
       continue;
-    }
-    Debug(3, "Blanking inactive zone %s", zone->Label());
-    delta_image.Fill(RGB_BLACK, zone->GetPolygon());
+    Debug(3, "Blanking inactive zone %s", zone.Label());
+    delta_image.Fill(kRGBBlack, zone.GetPolygon());
   } // end foreach zone
 
   // Check preclusive zones first
-  for ( int n_zone = 0; n_zone < n_zones; n_zone++ ) {
-    Zone *zone = zones[n_zone];
-    if ( !zone->IsPreclusive() ) {
+  for (Zone &zone : zones) {
+    if (!zone.IsPreclusive())
       continue;
-    }
-    int old_zone_score = zone->Score();
-    bool old_zone_alarmed = zone->Alarmed();
+    int old_zone_score = zone.Score();
+    bool old_zone_alarmed = zone.Alarmed();
     Debug(3, "Checking preclusive zone %s - old score: %d, state: %s",
-        zone->Label(),old_zone_score, zone->Alarmed()?"alarmed":"quiet");
-    if ( zone->CheckAlarms(&delta_image) ) {
+        zone.Label(),old_zone_score, zone.Alarmed()?"alarmed":"quiet");
+    if (zone.CheckAlarms(&delta_image)) {
       alarm = true;
-      score += zone->Score();
-      zone->SetAlarm();
-      Debug(3, "Zone is alarmed, zone score = %d", zone->Score());
-      zoneSet.insert(zone->Label());
-      //zone->ResetStats();
+      score += zone.Score();
+      zone.SetAlarm();
+      Debug(3, "Zone is alarmed, zone score = %d", zone.Score());
+      zoneSet.insert(zone.Label());
     } else {
       // check if end of alarm
-      if ( old_zone_alarmed ) {
+      if (old_zone_alarmed) {
         Debug(3, "Preclusive Zone %s alarm Ends. Previous score: %d",
-            zone->Label(), old_zone_score);
-        if ( old_zone_score > 0 ) {
-          zone->SetExtendAlarmCount(zone->GetExtendAlarmFrames());
+            zone.Label(), old_zone_score);
+        if (old_zone_score > 0) {
+          zone.SetExtendAlarmCount(zone.GetExtendAlarmFrames());
         }
-        if ( zone->CheckExtendAlarmCount() ) {
+        if (zone.CheckExtendAlarmCount()) {
           alarm = true;
-          zone->SetAlarm();
+          zone.SetAlarm();
         } else {
-          zone->ClearAlarm();
+          zone.ClearAlarm();
         }
-      }
+      }  // end if zone WAS alarmed
     } // end if CheckAlarms
   } // end foreach zone
 
   Coord alarm_centre;
   int top_score = -1;
 
-  if ( alarm ) {
+  if (alarm) {
     alarm = false;
     score = 0;
   } else {
     // Find all alarm pixels in active zones
-    for ( int n_zone = 0; n_zone < n_zones; n_zone++ ) {
-      Zone *zone = zones[n_zone];
-      if ( !zone->IsActive() || zone->IsPreclusive()) {
+    for (Zone &zone : zones) {
+      if (!zone.IsActive() || zone.IsPreclusive()) {
         continue;
       }
-      Debug(3, "Checking active zone %s", zone->Label());
-      if ( zone->CheckAlarms(&delta_image) ) {
+      Debug(3, "Checking active zone %s", zone.Label());
+      if (zone.CheckAlarms(&delta_image)) {
         alarm = true;
-        score += zone->Score();
-        zone->SetAlarm();
-        Debug(3, "Zone is alarmed, zone score = %d", zone->Score());
-        zoneSet.insert(zone->Label());
-        if ( config.opt_control && track_motion ) {
-          if ( (int)zone->Score() > top_score ) {
-            top_score = zone->Score();
-            alarm_centre = zone->GetAlarmCentre();
+        score += zone.Score();
+        zone.SetAlarm();
+        Debug(3, "Zone is alarmed, zone score = %d", zone.Score());
+        zoneSet.insert(zone.Label());
+        if (config.opt_control && track_motion) {
+          if ((int)zone.Score() > top_score) {
+            top_score = zone.Score();
+            alarm_centre = zone.GetAlarmCentre();
           }
         }
       }
     } // end foreach zone
 
-    if ( alarm ) {
-      for ( int n_zone = 0; n_zone < n_zones; n_zone++ ) {
-        Zone *zone = zones[n_zone];
-        // Wasn't this zone already checked above?
-        if ( !zone->IsInclusive() ) {
+    if (alarm) {
+      for (Zone &zone : zones) {
+        if (!zone.IsInclusive()) {
           continue;
         }
-        Debug(3, "Checking inclusive zone %s", zone->Label());
-        if ( zone->CheckAlarms(&delta_image) ) {
-          alarm = true;
-          score += zone->Score();
-          zone->SetAlarm();
-          Debug(3, "Zone is alarmed, zone score = %d", zone->Score());
-          zoneSet.insert( zone->Label() );
-          if ( config.opt_control && track_motion ) {
-            if ( zone->Score() > (unsigned int)top_score ) {
-              top_score = zone->Score();
-              alarm_centre = zone->GetAlarmCentre();
+        Debug(3, "Checking inclusive zone %s", zone.Label());
+        if (zone.CheckAlarms(&delta_image)) {
+          score += zone.Score();
+          zone.SetAlarm();
+          Debug(3, "Zone is alarmed, zone score = %d", zone.Score());
+          zoneSet.insert(zone.Label());
+          if (config.opt_control && track_motion) {
+            if (zone.Score() > (unsigned int)top_score) {
+              top_score = zone.Score();
+              alarm_centre = zone.GetAlarmCentre();
             }
           }
         } // end if CheckAlarm
       } // end foreach zone
     } else {
       // Find all alarm pixels in exclusive zones
-      for ( int n_zone = 0; n_zone < n_zones; n_zone++ ) {
-        Zone *zone = zones[n_zone];
-        if ( !zone->IsExclusive() ) {
+      for (Zone &zone : zones) {
+        if (!zone.IsExclusive()) {
           continue;
         }
-        Debug(3, "Checking exclusive zone %s", zone->Label());
-        if ( zone->CheckAlarms(&delta_image) ) {
+        Debug(3, "Checking exclusive zone %s", zone.Label());
+        if (zone.CheckAlarms(&delta_image)) {
           alarm = true;
-          score += zone->Score();
-          zone->SetAlarm();
-          Debug(3, "Zone is alarmed, zone score = %d", zone->Score());
-          zoneSet.insert(zone->Label());
+          score += zone.Score();
+          zone.SetAlarm();
+          Debug(3, "Zone is alarmed, zone score = %d", zone.Score());
+          zoneSet.insert(zone.Label());
         }
       } // end foreach zone
     } // end if alarm or not
   } // end if alarm
 
-  if ( top_score > 0 ) {
+  if (top_score > 0) {
     shared_data->alarm_x = alarm_centre.X();
     shared_data->alarm_y = alarm_centre.Y();
 
     Info("Got alarm centre at %d,%d, at count %d",
-        shared_data->alarm_x, shared_data->alarm_y, image_count);
+        shared_data->alarm_x, shared_data->alarm_y, analysis_image_count);
   } else {
     shared_data->alarm_x = shared_data->alarm_y = -1;
   }
 
   // This is a small and innocent hack to prevent scores of 0 being returned in alarm state
   return score ? score : alarm;
-} // end MotionDetect
+} // end DetectMotion
 
+// TODO: Move the camera specific things to the camera classes and avoid these casts.
 bool Monitor::DumpSettings(char *output, bool verbose) {
   output[0] = 0;
 
-  sprintf( output+strlen(output), "Id : %d\n", id );
-  sprintf( output+strlen(output), "Name : %s\n", name );
+  sprintf( output+strlen(output), "Id : %u\n", id );
+  sprintf( output+strlen(output), "Name : %s\n", name.c_str() );
   sprintf( output+strlen(output), "Type : %s\n", camera->IsLocal()?"Local":(camera->IsRemote()?"Remote":"File") );
 #if ZM_HAS_V4L
   if ( camera->IsLocal() ) {
-    sprintf( output+strlen(output), "Device : %s\n", ((LocalCamera *)camera)->Device().c_str() );
-    sprintf( output+strlen(output), "Channel : %d\n", ((LocalCamera *)camera)->Channel() );
-    sprintf( output+strlen(output), "Standard : %d\n", ((LocalCamera *)camera)->Standard() );
+    LocalCamera* cam = static_cast<LocalCamera*>(camera.get());
+    sprintf( output+strlen(output), "Device : %s\n", cam->Device().c_str() );
+    sprintf( output+strlen(output), "Channel : %d\n", cam->Channel() );
+    sprintf( output+strlen(output), "Standard : %d\n", cam->Standard() );
   } else
 #endif // ZM_HAS_V4L
   if ( camera->IsRemote() ) {
-    sprintf( output+strlen(output), "Protocol : %s\n", ((RemoteCamera *)camera)->Protocol().c_str() );
-    sprintf( output+strlen(output), "Host : %s\n", ((RemoteCamera *)camera)->Host().c_str() );
-    sprintf( output+strlen(output), "Port : %s\n", ((RemoteCamera *)camera)->Port().c_str() );
-    sprintf( output+strlen(output), "Path : %s\n", ((RemoteCamera *)camera)->Path().c_str() );
+    RemoteCamera* cam = static_cast<RemoteCamera*>(camera.get());
+    sprintf( output+strlen(output), "Protocol : %s\n", cam->Protocol().c_str() );
+    sprintf( output+strlen(output), "Host : %s\n", cam->Host().c_str() );
+    sprintf( output+strlen(output), "Port : %s\n", cam->Port().c_str() );
+    sprintf( output+strlen(output), "Path : %s\n", cam->Path().c_str() );
   } else if ( camera->IsFile() ) {
-    sprintf( output+strlen(output), "Path : %s\n", ((FileCamera *)camera)->Path() );
+    FileCamera* cam = static_cast<FileCamera*>(camera.get());
+    sprintf( output+strlen(output), "Path : %s\n", cam->Path() );
   }
 #if HAVE_LIBAVFORMAT
   else if ( camera->IsFfmpeg() ) {
-    sprintf( output+strlen(output), "Path : %s\n", ((FfmpegCamera *)camera)->Path().c_str() );
+    FfmpegCamera* cam = static_cast<FfmpegCamera*>(camera.get());
+    sprintf( output+strlen(output), "Path : %s\n", cam->Path().c_str() );
   }
 #endif // HAVE_LIBAVFORMAT
-  sprintf( output+strlen(output), "Width : %d\n", camera->Width() );
-  sprintf( output+strlen(output), "Height : %d\n", camera->Height() );
+  sprintf( output+strlen(output), "Width : %u\n", camera->Width() );
+  sprintf( output+strlen(output), "Height : %u\n", camera->Height() );
 #if ZM_HAS_V4L
   if ( camera->IsLocal() ) {
-    sprintf( output+strlen(output), "Palette : %d\n", ((LocalCamera *)camera)->Palette() );
+    LocalCamera* cam = static_cast<LocalCamera*>(camera.get());
+    sprintf( output+strlen(output), "Palette : %d\n", cam->Palette() );
   }
 #endif // ZM_HAS_V4L
-  sprintf(output+strlen(output), "Colours : %d\n", camera->Colours() );
-  sprintf(output+strlen(output), "Subpixel Order : %d\n", camera->SubpixelOrder() );
-  sprintf(output+strlen(output), "Event Prefix : %s\n", event_prefix );
-  sprintf(output+strlen(output), "Label Format : %s\n", label_format );
+  sprintf(output+strlen(output), "Colours : %u\n", camera->Colours() );
+  sprintf(output+strlen(output), "Subpixel Order : %u\n", camera->SubpixelOrder() );
+  sprintf(output+strlen(output), "Event Prefix : %s\n", event_prefix.c_str() );
+  sprintf(output+strlen(output), "Label Format : %s\n", label_format.c_str() );
   sprintf(output+strlen(output), "Label Coord : %d,%d\n", label_coord.X(), label_coord.Y() );
   sprintf(output+strlen(output), "Label Size : %d\n", label_size );
   sprintf(output+strlen(output), "Image Buffer Count : %d\n", image_buffer_count );
@@ -2869,23 +3026,173 @@ bool Monitor::DumpSettings(char *output, bool verbose) {
     function==MOCORD?"Continuous Record with Motion Detection":(
     function==NODECT?"Externally Triggered only, no Motion Detection":"Unknown"
   ))))));
-  sprintf(output+strlen(output), "Zones : %d\n", n_zones );
-  for ( int i = 0; i < n_zones; i++ ) {
-    zones[i]->DumpSettings(output+strlen(output), verbose);
+  sprintf(output+strlen(output), "Zones : %lu\n", zones.size());
+  for (const Zone &zone : zones) {
+    zone.DumpSettings(output+strlen(output), verbose);
   }
+  sprintf(output+strlen(output), "Recording Enabled? %s\n", enabled ? "enabled" : "disabled");
+  sprintf(output+strlen(output), "Events Enabled (!TRIGGER_OFF)? %s\n", trigger_data->trigger_state == TRIGGER_OFF ? "disabled" : "enabled");
+  sprintf(output+strlen(output), "Motion Detection Enabled? %s\n", shared_data->active ? "enabled" : "disabled");
   return true;
 } // bool Monitor::DumpSettings(char *output, bool verbose)
 
-unsigned int Monitor::Colours() const { return camera->Colours(); }
-unsigned int Monitor::SubpixelOrder() const { return camera->SubpixelOrder(); }
-int Monitor::PrimeCapture() const { return camera->PrimeCapture(); }
+unsigned int Monitor::Colours() const { return camera ? camera->Colours() : colours; }
+unsigned int Monitor::SubpixelOrder() const { return camera ? camera->SubpixelOrder() : 0; }
+
+int Monitor::PrimeCapture() {
+  int ret = camera->PrimeCapture();
+  if (ret <= 0) return ret;
+
+  if ( -1 != camera->getVideoStreamId() ) {
+    video_stream_id = packetqueue.addStream();
+  }
+
+  if ( -1 != camera->getAudioStreamId() ) {
+    audio_stream_id = packetqueue.addStream();
+    packetqueue.addStream();
+    shared_data->audio_frequency = camera->getFrequency();
+    shared_data->audio_channels = camera->getChannels();
+  }
+
+  Debug(2, "Video stream id is %d, audio is %d, minimum_packets to keep in buffer %d",
+      video_stream_id, audio_stream_id, pre_event_count);
+
+  if (rtsp_server) {
+    if (video_stream_id >= 0) {
+      AVStream *videoStream = camera->getVideoStream();
+      snprintf(shared_data->video_fifo_path, sizeof(shared_data->video_fifo_path)-1, "%s/video_fifo_%u.%s",
+          staticConfig.PATH_SOCKS.c_str(),
+          id,
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+          avcodec_get_name(videoStream->codecpar->codec_id)
+#else
+          avcodec_get_name(videoStream->codec->codec_id)
+#endif
+          );
+      video_fifo = new Fifo(shared_data->video_fifo_path, true);
+    }
+    if (record_audio and (audio_stream_id >= 0)) {
+      AVStream *audioStream = camera->getAudioStream();
+      if (audioStream && CODEC(audioStream)) {
+      snprintf(shared_data->audio_fifo_path, sizeof(shared_data->audio_fifo_path)-1, "%s/audio_fifo_%u.%s",
+          staticConfig.PATH_SOCKS.c_str(), id,
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+          avcodec_get_name(audioStream->codecpar->codec_id)
+#else
+          avcodec_get_name(audioStream->codec->codec_id)
+#endif
+          );
+      audio_fifo = new Fifo(shared_data->audio_fifo_path, true);
+      } else {
+        Warning("No audioStream %p or codec?", audioStream);
+      }
+    }
+  }  // end if rtsp_server
+
+  if (decoding_enabled) {
+    if (!decoder_it) decoder_it = packetqueue.get_video_it(false);
+    if (!decoder) {
+      Debug(1, "Creating decoder thread");
+      decoder = ZM::make_unique<DecoderThread>(this);
+    } else {
+      Debug(1, "Restartg decoder thread");
+      decoder->Start();
+    }
+  }
+  Debug(1, "Done restarting decoder");
+  if (!analysis_it) {
+    Debug(1, "getting analysis_it");
+    analysis_it = packetqueue.get_video_it(false);
+  } else {
+    Debug(1, "haveing analysis_it");
+  }
+  if (!analysis_thread) {
+    Debug(1, "Starting an analysis thread for monitor (%d)", id);
+    analysis_thread = ZM::make_unique<AnalysisThread>(this);
+  } else {
+    Debug(1, "Restarting analysis thread for monitor (%d)", id);
+    analysis_thread->Start();
+  }
+  return ret;
+}  // end int Monitor::PrimeCapture()
+
 int Monitor::PreCapture() const { return camera->PreCapture(); }
-int Monitor::PostCapture() const { return camera->PostCapture() ; }
-int Monitor::Close() { return camera->Close(); };
+int Monitor::PostCapture() const { return camera->PostCapture(); }
+int Monitor::Close() {
+  if (close_event_thread.joinable()) {
+    close_event_thread.join();
+  }
+  // Because the stream indexes may change we have to clear out the packetqueue
+  if (decoder) {
+    decoder->Stop();
+  }
+  if (analysis_thread) {
+    analysis_thread->Stop();
+  }
+  packetqueue.clear();
+  if (audio_fifo) {
+    delete audio_fifo;
+    audio_fifo = nullptr;
+  }
+  if (video_fifo) {
+    delete video_fifo;
+    video_fifo = nullptr;
+  }
+
+  std::lock_guard<std::mutex> lck(event_mutex);
+  if (event) {
+    Info("%s: image_count:%d - Closing event %" PRIu64 ", shutting down", name.c_str(), image_count, event->Id());
+    closeEvent();
+  }
+  if (camera) camera->Close();
+  return 1;
+}
+
 Monitor::Orientation Monitor::getOrientation() const { return orientation; }
 
-Monitor::Snapshot *Monitor::getSnapshot() const {
-  return &image_buffer[ shared_data->last_write_index%image_buffer_count ];
+// Wait for camera to get an image, and then assign it as the base reference image.
+// So this should be done as the first task in the analysis thread startup.
+// This function is deprecated.
+void Monitor::get_ref_image() {
+  ZMLockedPacket *snap_lock = nullptr;
+
+  if ( !analysis_it ) 
+    analysis_it = packetqueue.get_video_it(true);
+
+  while ( 
+      (
+       !( snap_lock = packetqueue.get_packet(analysis_it))
+       or 
+       ( snap_lock->packet_->codec_type != AVMEDIA_TYPE_VIDEO )
+       or
+       ! snap_lock->packet_->image
+      )
+    and !zm_terminate) {
+
+    Debug(1, "Waiting for capture daemon lastwriteindex(%d) lastwritetime(%" PRIi64 ")",
+          shared_data->last_write_index, static_cast<int64>(shared_data->last_write_time));
+    if ( snap_lock and ! snap_lock->packet_->image ) {
+      delete snap_lock;
+      // can't analyse it anyways, incremement
+      packetqueue.increment_it(analysis_it);
+    }
+    //usleep(10000);
+  }
+  if ( zm_terminate )
+    return;
+
+  ZMPacket *snap = snap_lock->packet_;
+  Debug(1, "get_ref_image: packet.stream %d ?= video_stream %d, packet image id %d packet image %p",
+      snap->packet.stream_index, video_stream_id, snap->image_index, snap->image );
+  // Might not have been decoded yet FIXME
+  if ( snap->image ) {
+    ref_image.Assign(width, height, camera->Colours(),
+        camera->SubpixelOrder(), snap->image->Buffer(), camera->ImageSize());
+    Debug(2, "Have ref image about to unlock");
+  } else {
+    Debug(2, "Have no ref image about to unlock");
+  }
+  delete snap_lock;
 }
 
 std::vector<Group *> Monitor::Groups() {
@@ -2893,7 +3200,7 @@ std::vector<Group *> Monitor::Groups() {
   if ( !groups.size() ) {
     std::string sql = stringtf(
         "SELECT `Id`, `ParentId`, `Name` FROM `Groups` WHERE `Groups.Id` IN "
-        "(SELECT `GroupId` FROM `Groups_Monitors` WHERE `MonitorId`=%d)",id);
+        "(SELECT `GroupId` FROM `Groups_Monitors` WHERE `MonitorId`=%d)", id);
     MYSQL_RES *result = zmDbFetch(sql.c_str());
     if ( !result ) {
       Error("Can't load groups: %s", mysql_error(&dbconn));
@@ -2916,7 +3223,7 @@ StringVector Monitor::GroupNames() {
   StringVector groupnames;
   for ( Group * g: Groups() ) {
     groupnames.push_back(std::string(g->Name()));
-    Debug(1,"Groups: %s", g->Name());
+    Debug(1, "Groups: %s", g->Name());
   }
   return groupnames;
 } // end Monitor::GroupNames()
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index e020ba391..0efc8a130 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -1,45 +1,40 @@
 //
 // ZoneMinder Monitor Class Interfaces, $Date$, $Revision$
 // Copyright (C) 2001-2008 Philip Coombes
-// 
+//
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
+//
 
 #ifndef ZM_MONITOR_H
 #define ZM_MONITOR_H
 
-#include <vector>
-#include <sstream>
-#include <thread>
-
-#include "zm.h"
-#include "zm_coord.h"
-#include "zm_image.h"
-#include "zm_rgb.h"
-#include "zm_zone.h"
-#include "zm_event.h"
-class Monitor;
-#include "zm_group.h"
+#include "zm_define.h"
 #include "zm_camera.h"
-#include "zm_storage.h"
+#include "zm_analysis_thread.h"
+#include "zm_decoder_thread.h"
+#include "zm_event.h"
+#include "zm_fifo.h"
+#include "zm_image.h"
+#include "zm_packet.h"
+#include "zm_packetqueue.h"
 #include "zm_utils.h"
-
-#include "zm_image_analyser.h"
-
+#include <memory>
 #include <sys/time.h>
-#include <stdint.h>
+#include <vector>
+
+class Group;
 
 #define SIGNAL_CAUSE "Signal"
 #define MOTION_CAUSE "Motion"
@@ -75,10 +70,11 @@ public:
     FFMPEG,
     LIBVLC,
     CURL,
+    NVSOCKET,
     VNC,
   } CameraType;
 
-  typedef enum { 
+  typedef enum {
     ROTATE_0=1,
     ROTATE_90,
     ROTATE_180,
@@ -88,7 +84,23 @@ public:
   } Orientation;
 
   typedef enum {
-    UNKNOWN,
+    DEINTERLACE_DISABLED = 0x00000000, 
+    DEINTERLACE_FOUR_FIELD_SOFT = 0x00001E04,
+    DEINTERLACE_FOUR_FIELD_MEDIUM = 0x00001404,
+    DEINTERLACE_FOUR_FIELD_HARD = 0x00000A04,
+    DEINTERLACE_DISCARD = 0x00000001,
+    DEINTERLACE_LINEAR = 0x00000002,
+    DEINTERLACE_BLEND = 0x00000003,
+    DEINTERLACE_BLEND_25 = 0x00000205,
+    DEINTERLACE_V4L2_TOP = 0x02000000,
+    DEINTERLACE_V4L2_BOTTOM = 0x03000000,
+    DEINTERLACE_V4L2_ALTERNATE = 0x07000000,
+    DEINTERLACE_V4L2_PROGRESSIVE = 0x01000000,
+    DEINTERLACE_V4L2_INTERLACED = 0x04000000
+  } Deinterlace;
+
+  typedef enum {
+    UNKNOWN=-1,
     IDLE,
     PREALARM,
     ALARM,
@@ -98,8 +110,8 @@ public:
 
   typedef enum {
     DISABLED,
-    X264ENCODE,
-    H264PASSTHROUGH,
+    ENCODE,
+    PASSTHROUGH,
   } VideoWriter;
 
 protected:
@@ -109,13 +121,15 @@ protected:
 
   typedef enum { CLOSE_TIME, CLOSE_IDLE, CLOSE_ALARM } EventCloseMode;
 
-  /* sizeof(SharedData) expected to be 340 bytes on 32bit and 64bit */
+  /* sizeof(SharedData) expected to be 472 bytes on 32bit and 64bit */
   typedef struct {
     uint32_t size;              /* +0    */
-    uint32_t last_write_index;  /* +4    */ 
-    uint32_t last_read_index;   /* +8    */
+    int32_t last_write_index;  /* +4    */
+    int32_t last_read_index;   /* +8    */
     uint32_t state;             /* +12   */
-    uint64_t last_event;        /* +16   */
+    double      capture_fps;       // Current capturing fps
+    double      analysis_fps;      // Current analysis fps
+    uint64_t last_event_id;     /* +16   */
     uint32_t action;            /* +24   */
     int32_t brightness;         /* +28   */
     int32_t hue;                /* +32   */
@@ -128,45 +142,49 @@ protected:
     uint8_t signal;             /* +54   */
     uint8_t format;             /* +55   */
     uint32_t imagesize;         /* +56   */
-    uint32_t epadding1;         /* +60   */
+    uint32_t last_frame_score;  /* +60   */
+    uint32_t  audio_frequency;  /* +64   */
+    uint32_t  audio_channels;   /* +68   */
     /* 
      ** This keeps 32bit time_t and 64bit time_t identical and compatible as long as time is before 2038.
      ** Shared memory layout should be identical for both 32bit and 64bit and is multiples of 16.
      ** Because startup_time is 64bit it may be aligned to a 64bit boundary.  So it's offset SHOULD be a multiple 
      ** of 8. Add or delete epadding's to achieve this.
      */  
-    union {                     /* +64   */
+    union {                     /* +72   */
       time_t startup_time;			/* When the zmc process started.  zmwatch uses this to see how long the process has been running without getting any images */
       uint64_t extrapad1;
     };
-    union {                     /* +72   */
+    union {                     /* +80   */
       time_t zmc_heartbeat_time;			/* Constantly updated by zmc.  Used to determine if the process is alive or hung or dead */
       uint64_t extrapad2;
     };
-    union {                     /* +80   */
-      time_t zma_heartbeat_time;			/* Constantly updated by zma.  Used to determine if the process is alive or hung or dead */
-      uint64_t extrapad3;
-    };
     union {                     /* +88  */
       time_t last_write_time;
-      uint64_t extrapad4;
+      uint64_t extrapad3;
     };
     union {                     /* +96  */
       time_t last_read_time;
-      uint64_t extrapad5;
+      uint64_t extrapad4;
     };
     uint8_t control_state[256];  /* +104   */
 
     char alarm_cause[256];
-    
+    char video_fifo_path[64];
+    char audio_fifo_path[64];
+
   } SharedData;
 
-  typedef enum { TRIGGER_CANCEL, TRIGGER_ON, TRIGGER_OFF } TriggerState;
+  enum TriggerState : uint32 {
+    TRIGGER_CANCEL,
+    TRIGGER_ON,
+    TRIGGER_OFF
+  };
 
   /* sizeof(TriggerData) expected to be 560 on 32bit & and 64bit */
   typedef struct {
     uint32_t size;
-    uint32_t trigger_state;
+    TriggerState trigger_state;
     uint32_t trigger_score;
     uint32_t padding;
     char trigger_cause[32];
@@ -174,26 +192,15 @@ protected:
     char trigger_showtext[256];
   } TriggerData;
 
-  /* sizeof(Snapshot) expected to be 16 bytes on 32bit and 32 bytes on 64bit */
-  struct Snapshot {
-    struct timeval  *timestamp;
-    Image  *image;
-    void* padding;
-  };
-
   //TODO: Technically we can't exclude this struct when people don't have avformat as the Memory.pm module doesn't know about avformat
-#if 1
   //sizeOf(VideoStoreData) expected to be 4104 bytes on 32bit and 64bit
   typedef struct {
     uint32_t size;
     uint64_t current_event;
     char event_file[4096];
     timeval recording;      // used as both bool and a pointer to the timestamp when recording should begin
-    //uint32_t frameNumber;
   } VideoStoreData;
 
-#endif // HAVE_LIBAVFORMAT
-
   class MonitorLink {
   protected:
     unsigned int  id;
@@ -216,24 +223,20 @@ protected:
     volatile VideoStoreData *video_store_data;
 
     int        last_state;
-    uint64_t   last_event;
+    uint64_t   last_event_id;
 
     public:
       MonitorLink(unsigned int p_id, const char *p_name);
       ~MonitorLink();
 
-      inline unsigned int Id() const {
-        return id;
-      }
-      inline const char *Name() const {
-        return name;
-      }
+      inline unsigned int Id() const { return id; }
+      inline const char *Name() const { return name; }
 
-      inline bool isConnected() const {   
-        return connected && shared_data->valid;
-      }
-      inline time_t getLastConnectTime() const {
-        return last_connect_time;
+      inline bool isConnected() const { return connected && shared_data->valid; }
+      inline time_t getLastConnectTime() const { return last_connect_time; }
+
+      inline uint32_t lastFrameScore() {
+        return shared_data->last_frame_score;
       }
 
       bool connect();
@@ -247,87 +250,114 @@ protected:
   protected:
   // These are read from the DB and thereafter remain unchanged
   unsigned int    id;
-  char            name[64];
+  std::string     name;
   unsigned int    server_id;          // Id of the Server object
   unsigned int    storage_id;         // Id of the Storage Object, which currently will just provide a path, but in future may do more.
   CameraType      type;
   Function        function;           // What the monitor is doing
   bool            enabled;            // Whether the monitor is enabled or asleep
+  bool            decoding_enabled;   // Whether the monitor will decode h264/h265 packets
+
+  std::string protocol;
+  std::string method;
+  std::string options;
+  std::string host;
+  std::string port;
+  std::string user;
+  std::string pass;
+  std::string path;
+  std::string second_path;
+
+  std::string     device;
+  int             palette;
+  int             channel;
+  int             format;
+
+  unsigned int    camera_width;
+  unsigned int    camera_height;
   unsigned int    width;              // Normally the same as the camera, but not if partly rotated
   unsigned int    height;             // Normally the same as the camera, but not if partly rotated
   bool            v4l_multi_buffer;
   unsigned int    v4l_captures_per_frame;
   Orientation     orientation;        // Whether the image has to be rotated at all
   unsigned int    deinterlacing;
-  bool            videoRecording;
+  unsigned int    deinterlacing_value;
   std::string     decoder_hwaccel_name;
   std::string     decoder_hwaccel_device;
+  bool            videoRecording;
+  bool            rtsp_describe;
 
-  int savejpegs;
-  VideoWriter videowriter;
-  std::string encoderparams;
-  std::vector<EncoderParameter_t> encoderparamsvec;
-  bool          record_audio;      // Whether to store the audio that we receive
+  int             savejpegs;
+  int             colours;
+  VideoWriter     videowriter;
+  std::string     encoderparams;
+  int             output_codec;
+  std::string     encoder;
+  std::string     output_container;
+  _AVPIXELFORMAT  imagePixFormat;
+  bool            record_audio;      // Whether to store the audio that we receive
 
-  int           brightness;        // The statically saved brightness of the camera
-  int           contrast;        // The statically saved contrast of the camera
-  int           hue;          // The statically saved hue of the camera
-  int           colour;          // The statically saved colour of the camera
-  char          event_prefix[64];    // The prefix applied to event names as they are created
-  char          label_format[64];    // The format of the timestamp on the images
-  Coord         label_coord;      // The coordinates of the timestamp on the images
-  int           label_size;         // Size of the timestamp on the images
-  int           image_buffer_count;   // Size of circular image buffer, at least twice the size of the pre_event_count
-  int           pre_event_buffer_count;   // Size of dedicated circular pre event buffer used when analysis is not performed at capturing framerate,
-  // value is pre_event_count + alarm_frame_count - 1
-  int           warmup_count;      // How many images to process before looking for events
-  int           pre_event_count;    // How many images to hold and prepend to an alarm event
-  int           post_event_count;    // How many unalarmed images must occur before the alarm state is reset
-  struct timeval video_buffer_duration; // How long a video segment to keep in buffer (set only if analysis fps != 0 )
-  int           stream_replay_buffer;   // How many frames to store to support DVR functions, IGNORED from this object, passed directly into zms now
-  int           section_length;      // How long events should last in continuous modes
-  int           min_section_length;   // Minimum event length when using event_close_mode == ALARM
-  bool          adaptive_skip;        // Whether to use the newer adaptive algorithm for this monitor
-  int           frame_skip;        // How many frames to skip in continuous modes
-  int           motion_frame_skip;      // How many frames to skip in motion detection
-  double        capture_max_fps;       // Target Capture FPS
-  double        analysis_fps;  // Target framerate for video analysis
+
+  int        brightness;        // The statically saved brightness of the camera
+  int        contrast;        // The statically saved contrast of the camera
+  int        hue;          // The statically saved hue of the camera
+  int        colour;          // The statically saved colour of the camera
+
+  std::string     event_prefix;    // The prefix applied to event names as they are created
+  std::string     label_format;    // The format of the timestamp on the images
+  Coord      label_coord;      // The coordinates of the timestamp on the images
+  int        label_size;         // Size of the timestamp on the images
+  int32_t    image_buffer_count;        // Size of circular image buffer, kept in /dev/shm
+  int32_t    max_image_buffer_count;    // Max # of video packets to keep in packet queue
+  int        warmup_count;              // How many images to process before looking for events
+  int        pre_event_count;    // How many images to hold and prepend to an alarm event
+  int        post_event_count;    // How many unalarmed images must occur before the alarm state is reset
+  int        stream_replay_buffer;   // How many frames to store to support DVR functions, IGNORED from this object, passed directly into zms now
+  int        section_length;      // How long events should last in continuous modes
+  int        min_section_length;   // Minimum event length when using event_close_mode == ALARM
+  bool       adaptive_skip;        // Whether to use the newer adaptive algorithm for this monitor
+  int        frame_skip;        // How many frames to skip in continuous modes
+  int        motion_frame_skip;      // How many frames to skip in motion detection
+  double     analysis_fps_limit;     // Target framerate for video analysis
   unsigned int  analysis_update_delay;  //  How long we wait before updating analysis parameters
-  int           capture_delay;      // How long we wait between capture frames
-  int           alarm_capture_delay;  // How long we wait between capture frames when in alarm state
-  int           alarm_frame_count;    // How many alarm frames are required before an event is triggered
-  int           fps_report_interval;  // How many images should be captured/processed between reporting the current FPS
-  int           ref_blend_perc;      // Percentage of new image going into reference image.
-  int           alarm_ref_blend_perc;      // Percentage of new image going into reference image during alarm.
-  bool          track_motion;      // Whether this monitor tries to track detected motion 
-  int           signal_check_points;  // Number of points in the image to check for signal
-  Rgb           signal_check_colour;  // The colour that the camera will emit when no video signal detected
-  bool          embed_exif; // Whether to embed Exif data into each image frame or not
+  int        capture_delay;      // How long we wait between capture frames
+  int        alarm_capture_delay;  // How long we wait between capture frames when in alarm state
+  int        alarm_frame_count;    // How many alarm frames are required before an event is triggered
+  int        alert_to_alarm_frame_count;    // How many alarm frames (consecutive score frames) are required to return alarm from alert
+  // value for now is the same number configured in alarm_frame_count, maybe getting his own parameter some day
+  int        fps_report_interval;  // How many images should be captured/processed between reporting the current FPS
+  int        ref_blend_perc;      // Percentage of new image going into reference image.
+  int        alarm_ref_blend_perc;      // Percentage of new image going into reference image during alarm.
+  bool       track_motion;      // Whether this monitor tries to track detected motion 
+  int         signal_check_points;  // Number of points in the image to check for signal
+  Rgb         signal_check_colour;  // The colour that the camera will emit when no video signal detected
+  bool        embed_exif; // Whether to embed Exif data into each image frame or not
+  bool        rtsp_server; // Whether to include this monitor as an rtsp server stream
+  std::string rtsp_streamname;      // path in the rtsp url for this monitor
+  int         importance;           // Importance of this monitor, affects Connection logging errors.
 
-  bool last_signal;
-
-  double       fps;
-  unsigned int last_camera_bytes;
-  
-  Image        delta_image;
-  Image        ref_image;
-  Image        alarm_image;  // Used in creating analysis images, will be initialized in Analysis
-  Image        write_image;    // Used when creating snapshot images
-  std::string diag_path_r;
-  std::string diag_path_d;
+  int capture_max_fps;
 
   Purpose      purpose;        // What this monitor has been created to do
-  int          event_count;
-  int          image_count;
-  int          ready_count;
-  int          first_alarm_count;
-  int          last_alarm_count;
-  int          buffer_count;
-  int          prealarm_count;
-  State        state;
-  time_t       start_time;
-  time_t       last_fps_time;
-  time_t       auto_resume_time;
+  unsigned int  last_camera_bytes;
+
+  int        event_count;
+  int        image_count;
+  int         last_capture_image_count; // last value of image_count when calculating capture fps
+  int        analysis_image_count;    // How many frames have been processed by analysis thread.
+  int        motion_frame_count;      // How many frames have had motion detection performed on them.
+  int         last_motion_frame_count; // last value of motion_frame_count when calculating fps
+  int        ready_count;
+  int        first_alarm_count;
+  int        last_alarm_count;
+  bool       last_signal;
+  int        last_section_mod;
+  int        buffer_count;
+  State      state;
+  time_t      start_time;
+  double      last_fps_time;
+  double      last_analysis_fps_time;
+  time_t      auto_resume_time;
   unsigned int      last_motion_score;
 
   EventCloseMode  event_close_mode;
@@ -344,149 +374,165 @@ protected:
   TriggerData     *trigger_data;
   VideoStoreData  *video_store_data;
 
-  Snapshot    *image_buffer;
-  Snapshot    next_buffer; /* Used by four field deinterlacing */
-  Snapshot    *pre_event_buffer;
+  struct timeval *shared_timestamps;
+  unsigned char *shared_images;
+  ZMPacket *image_buffer;
+  ZMPacket    next_buffer; /* Used by four field deinterlacing */
 
-  Camera      *camera;
+  int video_stream_id; // will be filled in PrimeCapture
+  int audio_stream_id; // will be filled in PrimeCapture
+  Fifo *video_fifo;
+  Fifo *audio_fifo;
+
+  std::unique_ptr<Camera> camera;
   Event       *event;
+  std::mutex   event_mutex;
   Storage     *storage;
 
-  int      n_zones;
-  Zone      **zones;
+  VideoStore          *videoStore;
+  PacketQueue      packetqueue;
+  packetqueue_iterator  *analysis_it;
+  std::unique_ptr<AnalysisThread> analysis_thread;
+  packetqueue_iterator  *decoder_it;
+  std::unique_ptr<DecoderThread> decoder;
+  AVFrame *dest_frame;                    // Used by decoding thread doing colorspace conversions
+  SwsContext   *convert_context;
+  std::thread  close_event_thread;
 
-  struct timeval    **timestamps;
-  Image      **images;
+  std::vector<Zone> zones;
 
   const unsigned char  *privacy_bitmask;
-  std::thread   *event_delete_thread; // Used to close events, but continue processing.
 
   int      n_linked_monitors;
   MonitorLink    **linked_monitors;
 
   std::vector<Group *> groups;
 
+  Image        delta_image;
+  Image        ref_image;
+  Image        alarm_image;  // Used in creating analysis images, will be initialized in Analysis
+  Image        write_image;    // Used when creating snapshot images
+  std::string diag_path_ref;
+  std::string diag_path_delta;
+
+  // Used in check signal
+  uint8_t red_val;
+  uint8_t green_val;
+  uint8_t blue_val;
+  uint8_t grayscale_val; /* 8bit grayscale color */
+  Rgb colour_val; /* RGB32 color */
+  int usedsubpixorder;
+
 public:
+  explicit Monitor();
   explicit Monitor(unsigned int p_id);
 
-// OurCheckAlarms seems to be unused. Check it on zm_monitor.cpp for more info.
-//bool OurCheckAlarms( Zone *zone, const Image *pImage );
-  Monitor( 
-    unsigned int p_id,
-    const char *p_name,
-    unsigned int p_server_id,
-    unsigned int p_storage_id,
-    int p_function,
-    bool p_enabled,
-    const char *p_linked_monitors,
-    Camera *p_camera,
-    int p_orientation,
-    unsigned int p_deinterlacing,
-    const std::string &p_decoder_hwaccel_name,
-    const std::string &p_decoder_hwaccel_device,
-    int p_savejpegs,
-    VideoWriter p_videowriter,
-    std::string p_encoderparams,
-    bool  p_record_audio,
-    const char *p_event_prefix,
-    const char *p_label_format,
-    const Coord &p_label_coord,
-    int label_size,
-    int p_image_buffer_count,
-    int p_warmup_count,
-    int p_pre_event_count,
-    int p_post_event_count,
-    int p_stream_replay_buffer,
-    int p_alarm_frame_count,
-    int p_section_length,
-    int p_min_section_length,
-    int p_frame_skip,
-    int p_motion_frame_skip,
-    double p_capture_max_fps,
-    double p_analysis_fps,
-    unsigned int p_analysis_update_delay,
-    int p_capture_delay,
-    int p_alarm_capture_delay,
-    int p_fps_report_interval,
-    int p_ref_blend_perc,
-    int p_alarm_ref_blend_perc,
-    bool p_track_motion,
-    int p_signal_check_points,
-    Rgb p_signal_check_colour,
-    bool p_embed_exif,
-    Purpose p_purpose,
-    int p_n_zones=0,
-    Zone *p_zones[]=0
-  );
   ~Monitor();
 
-  void AddZones( int p_n_zones, Zone *p_zones[] );
-  void AddPrivacyBitmask( Zone *p_zones[] );
+  void AddPrivacyBitmask();
 
+  void LoadCamera();
   bool connect();
+  bool disconnect();
+  inline bool isConnected() const { return mem_ptr != nullptr; }
 
   inline int ShmValid() const {
-    return shared_data && shared_data->valid;
+    if ( shared_data && shared_data->valid ) {
+      timeval now = {};
+      gettimeofday(&now, nullptr);
+      Debug(3, "Shared data is valid, checking heartbeat %" PRIi64 " - %" PRIi64 " = %" PRIi64"  < %f",
+            static_cast<int64>(now.tv_sec),
+            static_cast<int64>(shared_data->zmc_heartbeat_time),
+            static_cast<int64>(now.tv_sec - shared_data->zmc_heartbeat_time),
+            config.watch_max_delay);
+
+      if ((now.tv_sec - shared_data->zmc_heartbeat_time) < config.watch_max_delay)
+        return true;
+    }
+    return false;
   }
 
-  inline unsigned int Id() const {
-    return id;
-  }
-  inline const char *Name() const {
-    return name;
-  }
+  inline unsigned int Id() const { return id; }
+  inline const char *Name() const { return name.c_str(); }
+  inline unsigned int ServerId() { return server_id; }
   inline Storage *getStorage() {
     if ( ! storage ) {
-      storage = new Storage( storage_id );
+      storage = new Storage(storage_id);
     }
     return storage;
   }
-  inline Function GetFunction() const {
-    return( function );
-  }
-  inline bool Enabled() {
+  inline CameraType GetType() const { return type; }
+  inline Function GetFunction() const { return function; }
+  inline PacketQueue * GetPacketQueue() { return &packetqueue; }
+  inline bool Enabled() const {
     if ( function <= MONITOR )
       return false;
     return enabled;
   }
-  inline const char *EventPrefix() const {
-    return event_prefix;
+  inline bool DecodingEnabled() const {
+    return decoding_enabled;
   }
-  inline bool Ready() {
-    if ( function <= MONITOR )
-      return false;
-    return( image_count > ready_count );
+  inline const char *EventPrefix() const { return event_prefix.c_str(); }
+  inline bool Ready() const {
+    if ( image_count >= ready_count ) {
+      return true;
+    }
+    Debug(2, "Not ready because image_count(%d) <= ready_count(%d)", image_count, ready_count);
+    return false;
   }
-  inline bool Active() {
+  inline bool Active() const {
     if ( function <= MONITOR )
       return false;
     return( enabled && shared_data->active );
   }
-  inline bool Exif() {
-    return embed_exif;
-  }
+  inline bool Exif() const { return embed_exif; }
+  inline bool RTSPServer() const { return rtsp_server; }
+  inline bool RecordAudio() { return record_audio; }
+
+  /*
+  inline Purpose Purpose() { return purpose };
+  inline Purpose Purpose( Purpose p ) { purpose = p; };
+  */
+
   Orientation getOrientation() const;
 
   unsigned int Width() const { return width; }
   unsigned int Height() const { return height; }
   unsigned int Colours() const;
   unsigned int SubpixelOrder() const;
-    
+
+  int GetAudioFrequency() const { return shared_data ? shared_data->audio_frequency : -1; }
+  int GetAudioChannels() const { return shared_data ? shared_data->audio_channels : -1; }
+
   int GetOptSaveJPEGs() const { return savejpegs; }
   VideoWriter GetOptVideoWriter() const { return videowriter; }
-  const std::vector<EncoderParameter_t>* GetOptEncoderParamsVec() const { return &encoderparamsvec; }
-  const std::string GetOptEncoderParams() const { return encoderparams; }
+  const std::string &GetEncoderOptions() const { return encoderparams; }
+  int OutputCodec() const { return output_codec; }
+  const std::string &Encoder() const { return encoder; }
+  const std::string &OutputContainer() const { return output_container; }
+
   uint64_t GetVideoWriterEventId() const { return video_store_data->current_event; }
-  void SetVideoWriterEventId( unsigned long long p_event_id ) { video_store_data->current_event = p_event_id; }
+  void SetVideoWriterEventId( uint64_t p_event_id ) { video_store_data->current_event = p_event_id; }
+
   struct timeval GetVideoWriterStartTime() const { return video_store_data->recording; }
-  void SetVideoWriterStartTime(struct timeval &t) { video_store_data->recording = t; }
+  void SetVideoWriterStartTime(const struct timeval &t) { video_store_data->recording = t; }
  
   unsigned int GetPreEventCount() const { return pre_event_count; };
-  struct timeval GetVideoBufferDuration() const { return video_buffer_duration; };
-  int GetImageBufferCount() const { return image_buffer_count; };
-  State GetState() const;
-  int GetImage( int index=-1, int scale=100 );
-  Snapshot *getSnapshot() const;
+  int32_t GetImageBufferCount() const { return image_buffer_count; };
+  State GetState() const { return (State)shared_data->state; }
+
+  AVStream *GetAudioStream() const { return camera ? camera->getAudioStream() : nullptr; };
+  AVCodecContext *GetAudioCodecContext() const { return camera ? camera->getAudioCodecContext() : nullptr; };
+  AVStream *GetVideoStream() const { return camera ? camera->getVideoStream() : nullptr; };
+  AVCodecContext *GetVideoCodecContext() const { return camera ? camera->getVideoCodecContext() : nullptr; };
+
+  const std::string GetSecondPath() const { return second_path; };
+  const std::string GetVideoFifoPath() const { return shared_data ? shared_data->video_fifo_path : ""; };
+  const std::string GetAudioFifoPath() const { return shared_data ? shared_data->audio_fifo_path : ""; };
+  const std::string GetRTSPStreamName() const { return rtsp_streamname; };
+
+  int GetImage(int32_t index=-1, int scale=100);
+  ZMPacket *getSnapshot( int index=-1 ) const;
   struct timeval GetTimestamp( int index=-1 ) const;
   void UpdateAdaptiveSkip();
   useconds_t GetAnalysisRate();
@@ -498,12 +544,18 @@ public:
   unsigned int GetLastWriteIndex() const;
   uint64_t GetLastEventId() const;
   double GetFPS() const;
+  void UpdateAnalysisFPS();
+  void UpdateCaptureFPS();
   void ForceAlarmOn( int force_score, const char *force_case, const char *force_text="" );
   void ForceAlarmOff();
   void CancelForced();
-  TriggerState GetTriggerState() const { return (TriggerState)(trigger_data?trigger_data->trigger_state:TRIGGER_CANCEL); }
+  TriggerState GetTriggerState() const { return trigger_data ? trigger_data->trigger_state : TRIGGER_CANCEL; }
 	inline time_t getStartupTime() const { return shared_data->startup_time; }
 	inline void setStartupTime( time_t p_time ) { shared_data->startup_time = p_time; }
+	inline void setHeartbeatTime( time_t p_time ) { shared_data->zmc_heartbeat_time = p_time; }
+  void get_ref_image();
+
+  int LabelSize() const { return label_size; }
 
   void actionReload();
   void actionEnable();
@@ -516,20 +568,23 @@ public:
   int actionColour( int p_colour=-1 );
   int actionContrast( int p_contrast=-1 );
 
-  int PrimeCapture() const;
+  int PrimeCapture();
   int PreCapture() const;
   int Capture();
   int PostCapture() const;
   int Close();
 
+  void CheckAction();
+
   unsigned int DetectMotion( const Image &comp_image, Event::StringSet &zoneSet );
    // DetectBlack seems to be unused. Check it on zm_monitor.cpp for more info.
    //unsigned int DetectBlack( const Image &comp_image, Event::StringSet &zoneSet );
   bool CheckSignal( const Image *image );
   bool Analyse();
+  bool Decode();
   void DumpImage( Image *dump_image ) const;
   void TimestampImage( Image *ts_image, const struct timeval *ts_time ) const;
-  bool closeEvent();
+  void closeEvent();
 
   void Reload();
   void ReloadZones();
@@ -540,17 +595,17 @@ public:
   std::vector<Group *>  Groups();
   StringVector GroupNames();
 
-  static int LoadMonitors(std::string sql, Monitor **&monitors, Purpose purpose);  // Returns # of Monitors loaded, 0 on failure.
+  static std::vector<std::shared_ptr<Monitor>> LoadMonitors(std::string &sql, Purpose purpose);  // Returns # of Monitors loaded, 0 on failure.
 #if ZM_HAS_V4L
-  static int LoadLocalMonitors(const char *device, Monitor **&monitors, Purpose purpose);
+  static std::vector<std::shared_ptr<Monitor>> LoadLocalMonitors(const char *device, Purpose purpose);
 #endif // ZM_HAS_V4L
-  static int LoadRemoteMonitors(const char *protocol, const char *host, const char*port, const char*path, Monitor **&monitors, Purpose purpose);
-  static int LoadFileMonitors(const char *file, Monitor **&monitors, Purpose purpose);
+  static std::vector<std::shared_ptr<Monitor>> LoadRemoteMonitors(const char *protocol, const char *host, const char*port, const char*path, Purpose purpose);
+  static std::vector<std::shared_ptr<Monitor>> LoadFileMonitors(const char *file, Purpose purpose);
 #if HAVE_LIBAVFORMAT
-  static int LoadFfmpegMonitors(const char *file, Monitor **&monitors, Purpose purpose);
+  static std::vector<std::shared_ptr<Monitor>> LoadFfmpegMonitors(const char *file, Purpose purpose);
 #endif // HAVE_LIBAVFORMAT
-  static Monitor *Load(unsigned int id, bool load_zones, Purpose purpose);
-  static Monitor *Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose);
+  static std::shared_ptr<Monitor> Load(unsigned int id, bool load_zones, Purpose purpose);
+  void Load(MYSQL_ROW dbrow, bool load_zones, Purpose purpose);
   //void writeStreamImage( Image *image, struct timeval *timestamp, int scale, int mag, int x, int y );
   //void StreamImages( int scale=100, int maxfps=10, time_t ttl=0, int msq_id=0 );
   //void StreamImagesRaw( int scale=100, int maxfps=10, time_t ttl=0 );
@@ -558,9 +613,13 @@ public:
 #if HAVE_LIBAVCODEC
   //void StreamMpeg( const char *format, int scale=100, int maxfps=10, int bitrate=100000 );
 #endif // HAVE_LIBAVCODEC
-  double get_fps( ) const {
-    return fps;
+  double get_capture_fps( ) const {
+    return shared_data ? shared_data->capture_fps : 0.0;
   }
+  double get_analysis_fps( ) const {
+    return shared_data ? shared_data->analysis_fps : 0.0;
+  }
+  int Importance() { return importance; }
 };
 
 #define MOD_ADD( var, delta, limit ) (((var)+(limit)+(delta))%(limit))
diff --git a/src/zm_monitorstream.cpp b/src/zm_monitorstream.cpp
index 71a7a66d2..63f85d71b 100644
--- a/src/zm_monitorstream.cpp
+++ b/src/zm_monitorstream.cpp
@@ -17,23 +17,25 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-#include "zm.h"
-#include "zm_db.h"
-#include "zm_time.h"
-#include "zm_mpeg.h"
-#include "zm_signal.h"
-#include "zm_monitor.h"
 #include "zm_monitorstream.h"
+
+#include "zm_monitor.h"
+#include "zm_signal.h"
+#include "zm_time.h"
 #include <arpa/inet.h>
 #include <glob.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
-const int MAX_SLEEP_USEC=1000000; // 1 sec
+#ifdef __FreeBSD__
+#include <netinet/in.h>
+#endif
 
 bool MonitorStream::checkSwapPath(const char *path, bool create_path) {
-
   struct stat stat_buf;
   if ( stat(path, &stat_buf) < 0 ) {
-    if ( create_path && errno == ENOENT ) {
+    if ( create_path and (errno == ENOENT) ) {
       Debug(3, "Swap path '%s' missing, creating", path);
       if ( mkdir(path, 0755) ) {
         Error("Can't mkdir %s: %s", path, strerror(errno));
@@ -73,7 +75,7 @@ bool MonitorStream::checkSwapPath(const char *path, bool create_path) {
     return false;
   }
   return true;
-} // end bool MonitorStream::checkSwapPath( const char *path, bool create_path )
+} // end bool MonitorStream::checkSwapPath(const char *path, bool create_path)
 
 void MonitorStream::processCommand(const CmdMsg *msg) {
   Debug(2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0]);
@@ -175,7 +177,7 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
     case CMD_ZOOMIN :
       x = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
       y = ((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
-      Debug( 1, "Got ZOOM IN command, to %d,%d", x, y );
+      Debug(1, "Got ZOOM IN command, to %d,%d", x, y);
       switch ( zoom ) {
         case 100:
           zoom = 150;
@@ -196,7 +198,7 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
       }
       break;
     case CMD_ZOOMOUT :
-      Debug( 1, "Got ZOOM OUT command" );
+      Debug(1, "Got ZOOM OUT command");
       switch ( zoom ) {
         case 500:
           zoom = 400;
@@ -240,6 +242,8 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
     int id;
     int state;
     double fps;
+    double capture_fps;
+    double analysis_fps;
     int buffer_level;
     int rate;
     double delay;
@@ -253,6 +257,8 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
   status_data.id = monitor->Id();
   if ( ! monitor->ShmValid() ) {
     status_data.fps = 0.0;
+    status_data.capture_fps = 0.0;
+    status_data.analysis_fps = 0.0;
     status_data.state = Monitor::UNKNOWN;
     //status_data.enabled = monitor->shared_data->active;
     status_data.enabled = false;
@@ -260,10 +266,12 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
     status_data.buffer_level = 0;
   } else {
     status_data.fps = monitor->GetFPS();
+    status_data.capture_fps = monitor->get_capture_fps();
+    status_data.analysis_fps = monitor->get_analysis_fps();
     status_data.state = monitor->shared_data->state;
     //status_data.enabled = monitor->shared_data->active;
-    status_data.enabled = monitor->trigger_data->trigger_state!=Monitor::TRIGGER_OFF;
-    status_data.forced = monitor->trigger_data->trigger_state==Monitor::TRIGGER_ON;
+    status_data.enabled = monitor->trigger_data->trigger_state != Monitor::TriggerState::TRIGGER_OFF;
+    status_data.forced = monitor->trigger_data->trigger_state == Monitor::TriggerState::TRIGGER_ON;
     if ( playback_buffer > 0 )
       status_data.buffer_level = (MOD_ADD( (temp_write_index-temp_read_index), 0, temp_image_buffer_count )*100)/temp_image_buffer_count;
     else
@@ -274,16 +282,19 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
   status_data.rate = replay_rate;
   status_data.delay = TV_2_FLOAT(now) - TV_2_FLOAT(last_frame_timestamp);
   status_data.zoom = zoom;
-  Debug(2, "Buffer Level:%d, Delayed:%d, Paused:%d, Rate:%d, delay:%.3f, Zoom:%d, Enabled:%d Forced:%d",
-    status_data.buffer_level,
-    status_data.delayed,
-    status_data.paused,
-    status_data.rate,
-    status_data.delay,
-    status_data.zoom,
-    status_data.enabled,
-    status_data.forced
-  );
+  Debug(2, "fps: %.2f capture_fps: %.2f analysis_fps: %.2f Buffer Level:%d, Delayed:%d, Paused:%d, Rate:%d, delay:%.3f, Zoom:%d, Enabled:%d Forced:%d",
+      status_data.fps,
+      status_data.capture_fps,
+      status_data.analysis_fps,
+      status_data.buffer_level,
+      status_data.delayed,
+      status_data.paused,
+      status_data.rate,
+      status_data.delay,
+      status_data.zoom,
+      status_data.enabled,
+      status_data.forced
+      );
 
   DataMsg status_msg;
   status_msg.msg_type = MSG_DATA_WATCH;
@@ -292,14 +303,14 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
   if ( (nbytes = sendto(sd, &status_msg, sizeof(status_msg), MSG_DONTWAIT, (sockaddr *)&rem_addr, sizeof(rem_addr))) < 0 ) {
     //if ( errno != EAGAIN )
     {
-      Error( "Can't sendto on sd %d: %s", sd, strerror(errno) );
+      Error("Can't sendto on sd %d: %s", sd, strerror(errno));
       //exit( -1 );
     }
   }
   Debug(2, "Number of bytes sent to (%s): (%d)", rem_addr.sun_path, nbytes);
 
   // quit after sending a status, if this was a quit request
-  if ( (MsgCommand)msg->msg_data[0]==CMD_QUIT ) {
+  if ( (MsgCommand)msg->msg_data[0] == CMD_QUIT ) {
     zm_terminate = true;
     Debug(2, "Quitting");
     return;
@@ -307,19 +318,20 @@ void MonitorStream::processCommand(const CmdMsg *msg) {
 
   //Debug(2,"Updating framerate");
   //updateFrameRate(monitor->GetFPS());
-} // end void MonitorStream::processCommand(const CmdMsg *msg)
+}  // end void MonitorStream::processCommand(const CmdMsg *msg)
 
 bool MonitorStream::sendFrame(const char *filepath, struct timeval *timestamp) {
   bool send_raw = ((scale>=ZM_SCALE_BASE)&&(zoom==ZM_SCALE_BASE));
 
-  if ( type != STREAM_JPEG )
-    send_raw = false;
-  if ( !config.timestamp_on_capture && timestamp )
+  if (
+      ( type != STREAM_JPEG )
+      ||
+      ( (!config.timestamp_on_capture) && timestamp )
+     )
     send_raw = false;
 
   if ( !send_raw ) {
     Image temp_image(filepath);
-
     return sendFrame(&temp_image, timestamp);
   } else {
     int img_buffer_size = 0;
@@ -453,33 +465,43 @@ bool MonitorStream::sendFrame(Image *image, struct timeval *timestamp) {
 } // end bool MonitorStream::sendFrame( Image *image, struct timeval *timestamp )
 
 void MonitorStream::runStream() {
-  if ( type == STREAM_SINGLE ) {
+  if (type == STREAM_SINGLE) {
     // Not yet migrated over to stream class
-    SingleImage(scale);
+    if (checkInitialised())
+      SingleImage(scale);
+    else
+      sendTextFrame("Unable to send image");
+
     return;
   }
 
   openComms();
 
-  if ( type == STREAM_JPEG )
+  if (type == STREAM_JPEG)
     fputs("Content-Type: multipart/x-mixed-replace; boundary=" BOUNDARY "\r\n\r\n", stdout);
 
-  if ( !checkInitialised() ) {
-    Error("Not initialized");
-    while ( !(loadMonitor(monitor_id) || zm_terminate) ) {
-      sendTextFrame("Not connected");
-      if ( connkey )
-        checkCommandQueue();
+  /* This is all about waiting and showing a useful message if the monitor isn't available */
+  while (!zm_terminate) {
+    if (connkey)
+      checkCommandQueue();
+
+    if (!checkInitialised()) {
+      if (!loadMonitor(monitor_id)) {
+        if (!sendTextFrame("Not connected")) return;
+      } else {
+        if (!sendTextFrame("Unable to stream")) return;
+      }
       sleep(1);
+    } else {
+      break;
     }
-    if ( zm_terminate )
-      return;
   }
+  if (zm_terminate) return;
 
   updateFrameRate(monitor->GetFPS());
 
   // point to end which is theoretically not a valid value because all indexes are % image_buffer_count
-  unsigned int last_read_index = monitor->image_buffer_count;
+  int32_t last_read_index = monitor->image_buffer_count;
 
   time_t stream_start_time;
   time(&stream_start_time);
@@ -503,7 +525,7 @@ void MonitorStream::runStream() {
     const int max_swap_len_suffix = 15;
 
     int swap_path_length = staticConfig.PATH_SWAP.length() + 1; // +1 for NULL terminator
-    int subfolder1_length = snprintf(nullptr, 0, "/zmswap-m%d", monitor->Id()) + 1;
+    int subfolder1_length = snprintf(nullptr, 0, "/zmswap-m%u", monitor->Id()) + 1;
     int subfolder2_length = snprintf(nullptr, 0, "/zmswap-q%06d", connkey) + 1;
     int total_swap_path_length = swap_path_length + subfolder1_length + subfolder2_length;
 
@@ -540,15 +562,7 @@ void MonitorStream::runStream() {
     Debug(2, "Not using playback_buffer");
   } // end if connkey  & playback_buffer
 
-  // if MaxFPS < 0 as in 1/60 = 0.017 then we won't get another frame for 60 sec.
-  double capture_fps = monitor->GetFPS();
-  double capture_max_fps = monitor->GetCaptureMaxFPS();
-  if ( capture_max_fps && ( capture_fps > capture_max_fps ) ) {
-    Debug(1, "Using %.3f for fps instead of current fps %.3f", capture_max_fps, capture_fps);
-    capture_fps = capture_max_fps;
-  }
-
-  while ( !zm_terminate ) {
+  while (!zm_terminate) {
     bool got_command = false;
     if ( feof(stdout) ) {
       Debug(2, "feof stdout");
@@ -556,7 +570,7 @@ void MonitorStream::runStream() {
     } else if ( ferror(stdout) ) {
       Debug(2, "ferror stdout");
       break;
-    } else if ( !monitor->ShmValid() ) {
+    } else if (!monitor->ShmValid()) {
       Debug(2, "monitor not valid.... maybe we should wait until it comes back.");
       break;
     }
@@ -679,34 +693,34 @@ void MonitorStream::runStream() {
 
     if ( last_read_index != monitor->shared_data->last_write_index ) {
       // have a new image to send
-      int index = monitor->shared_data->last_write_index % monitor->image_buffer_count;  // % shouldn't be neccessary
+      int index = monitor->shared_data->last_write_index % monitor->image_buffer_count; // % shouldn't be neccessary
       if ( (frame_mod == 1) || ((frame_count%frame_mod) == 0) ) {
         if ( !paused && !delayed ) {
           last_read_index = monitor->shared_data->last_write_index;
           Debug(2, "Sending frame index: %d: frame_mod: %d frame count: %d paused(%d) delayed(%d)",
               index, frame_mod, frame_count, paused, delayed);
           // Send the next frame
-          Monitor::Snapshot *snap = &monitor->image_buffer[index];
+          //
+          ZMPacket *snap = &monitor->image_buffer[index];
 
           if ( !sendFrame(snap->image, snap->timestamp) ) {
             Debug(2, "sendFrame failed, quiting.");
             zm_terminate = true;
+            break;
           }
+          // Perhaps we should use NOW instead. 
+          last_frame_timestamp = *(snap->timestamp);
+          //frame_sent = true;
+          //
           if ( frame_count == 0 ) {
             // Chrome will not display the first frame until it receives another.
             // Firefox is fine.  So just send the first frame twice.
             if ( !sendFrame(snap->image, snap->timestamp) ) {
               Debug(2, "sendFrame failed, quiting.");
               zm_terminate = true;
+              break;
             }
           }
-          // Perhaps we should use NOW instead.
-          memcpy(
-              &last_frame_timestamp,
-              snap->timestamp,
-              sizeof(last_frame_timestamp)
-              );
-          // frame_sent = true;
 
           temp_read_index = temp_write_index;
         } else {
@@ -733,14 +747,14 @@ void MonitorStream::runStream() {
               } else {
                 Debug(2, "Would have sent keepalive frame, but had no paused_image");
               }
-            } // end if actual_delta_time > 5
-          } // end if change in zoom
-        } // end if paused or not
-      } // end if should send frame
+            }  // end if actual_delta_time > 5
+          }  // end if change in zoom
+        }  // end if paused or not
+      }  // end if should send frame
 
       if ( buffered_playback && !paused ) {
         if ( monitor->shared_data->valid ) {
-          if ( monitor->image_buffer[index].timestamp->tv_sec ) {
+          if ( monitor->shared_timestamps[index].tv_sec ) {
             int temp_index = temp_write_index%temp_image_buffer_count;
             Debug(2, "Storing frame %d", temp_index);
             if ( !temp_image_buffer[temp_index].valid ) {
@@ -752,8 +766,11 @@ void MonitorStream::runStream() {
                   temp_index);
               temp_image_buffer[temp_index].valid = true;
             }
-            memcpy(&(temp_image_buffer[temp_index].timestamp), monitor->image_buffer[index].timestamp, sizeof(temp_image_buffer[0].timestamp));
-            monitor->image_buffer[index].image->WriteJpeg(temp_image_buffer[temp_index].file_name, config.jpeg_file_quality);
+            temp_image_buffer[temp_index].timestamp = monitor->shared_timestamps[index];
+            monitor->image_buffer[index].image->WriteJpeg(
+                temp_image_buffer[temp_index].file_name,
+                config.jpeg_file_quality
+                );
             temp_write_index = MOD_ADD(temp_write_index, 1, temp_image_buffer_count);
             if ( temp_write_index == temp_read_index ) {
               // Go back to live viewing
@@ -775,17 +792,20 @@ void MonitorStream::runStream() {
     } // end if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index )
 
     unsigned long sleep_time = (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2)));
-    if ( sleep_time > MAX_SLEEP_USEC ) {
+    if ( sleep_time > MonitorStream::MAX_SLEEP_USEC ) {
       // Shouldn't sleep for long because we need to check command queue, etc.
-      sleep_time = MAX_SLEEP_USEC;
-      Debug(3, "Sleeping for MAX_SLEEP_USEC %dus", sleep_time);
+      sleep_time = MonitorStream::MAX_SLEEP_USEC;
+      Debug(3, "Sleeping for MAX_SLEEP_USEC %luus", sleep_time);
     } else {
-      Debug(3, "Sleeping for %dus", sleep_time);
+      Debug(3, "Sleeping for %luus", sleep_time);
     }
     usleep(sleep_time);
     if ( ttl ) {
       if ( (now.tv_sec - stream_start_time) > ttl ) {
-        Debug(2, "now(%d) - start(%d) > ttl(%d) break", now.tv_sec, stream_start_time, ttl);
+        Debug(2, "now(%" PRIi64 ") - start(%" PRIi64 " ) > ttl(%" PRIi64 ") break",
+              static_cast<int64>(now.tv_sec),
+              static_cast<int64>(stream_start_time),
+              static_cast<int64>(ttl));
         break;
       }
     }
@@ -839,7 +859,13 @@ void MonitorStream::SingleImage(int scale) {
   int img_buffer_size = 0;
   static JOCTET img_buffer[ZM_MAX_IMAGE_SIZE];
   Image scaled_image;
-  Monitor::Snapshot *snap = monitor->getSnapshot();
+  while ((monitor->shared_data->last_write_index >= monitor->image_buffer_count) and !zm_terminate) {
+    Debug(1, "Waiting for capture to begin");
+    usleep(100000);
+  }
+  int index = monitor->shared_data->last_write_index % monitor->image_buffer_count;
+  Debug(1, "write index: %d %d", monitor->shared_data->last_write_index, index);
+  ZMPacket *snap = &(monitor->image_buffer[index]);
   Image *snap_image = snap->image;
 
   if ( scale != ZM_SCALE_BASE ) {
@@ -857,11 +883,11 @@ void MonitorStream::SingleImage(int scale) {
       "Content-Type: image/jpeg\r\n\r\n",
       img_buffer_size);
   fwrite(img_buffer, img_buffer_size, 1, stdout);
-}
+}  // end void MonitorStream::SingleImage(int scale)
 
 void MonitorStream::SingleImageRaw(int scale) {
   Image scaled_image;
-  Monitor::Snapshot *snap = monitor->getSnapshot();
+  ZMPacket *snap = monitor->getSnapshot();
   Image *snap_image = snap->image;
 
   if ( scale != ZM_SCALE_BASE ) {
@@ -874,11 +900,11 @@ void MonitorStream::SingleImageRaw(int scale) {
   }
 
   fprintf(stdout,
-      "Content-Length: %d\r\n"
+      "Content-Length: %u\r\n"
       "Content-Type: image/x-rgb\r\n\r\n",
       snap_image->Size());
   fwrite(snap_image->Buffer(), snap_image->Size(), 1, stdout);
-}
+}  // end void MonitorStream::SingleImageRaw(int scale)
 
 #ifdef HAVE_ZLIB_H
 void MonitorStream::SingleImageZip(int scale) {
@@ -886,7 +912,7 @@ void MonitorStream::SingleImageZip(int scale) {
   static Bytef img_buffer[ZM_MAX_IMAGE_SIZE];
   Image scaled_image;
 
-  Monitor::Snapshot *snap = monitor->getSnapshot();
+  ZMPacket *snap = monitor->getSnapshot();
   Image *snap_image = snap->image;
 
   if ( scale != ZM_SCALE_BASE ) {
@@ -900,9 +926,9 @@ void MonitorStream::SingleImageZip(int scale) {
   snap_image->Zip(img_buffer, &img_buffer_size);
 
   fprintf(stdout,
-      "Content-Length: %ld\r\n"
+      "Content-Length: %lu\r\n"
       "Content-Type: image/x-rgbz\r\n\r\n",
       img_buffer_size);
   fwrite(img_buffer, img_buffer_size, 1, stdout);
-}
+}  // end void MonitorStream::SingleImageZip(int scale)
 #endif // HAVE_ZLIB_H
diff --git a/src/zm_monitorstream.h b/src/zm_monitorstream.h
index 24655b636..0c1f92777 100644
--- a/src/zm_monitorstream.h
+++ b/src/zm_monitorstream.h
@@ -20,11 +20,8 @@
 #ifndef ZM_MONITORSTREAM_H
 #define ZM_MONITORSTREAM_H
 
-#include "zm.h"
-#include "zm_coord.h"
-#include "zm_image.h"
-#include "zm_utils.h"
-#include "zm_monitor.h"
+#include "zm_stream.h"
+#include <sys/time.h>
 
 class MonitorStream : public StreamBase {
   protected:
@@ -50,7 +47,7 @@ class MonitorStream : public StreamBase {
     bool checkSwapPath(const char *path, bool create_path);
     bool sendFrame(const char *filepath, struct timeval *timestamp);
     bool sendFrame(Image *image, struct timeval *timestamp);
-    void processCommand(const CmdMsg *msg);
+    void processCommand(const CmdMsg *msg) override;
     void SingleImage(int scale=100);
     void SingleImageRaw(int scale=100);
 #ifdef HAVE_ZLIB_H
@@ -59,8 +56,14 @@ class MonitorStream : public StreamBase {
 
   public:
     MonitorStream() : 
-      temp_image_buffer(nullptr), temp_image_buffer_count(0), temp_read_index(0), temp_write_index(0),
-      ttl(0), playback_buffer(0), delayed(false), frame_count(0) {
+      temp_image_buffer(nullptr),
+      temp_image_buffer_count(0),
+      temp_read_index(0),
+      temp_write_index(0),
+      ttl(0),
+      playback_buffer(0),
+      delayed(false),
+      frame_count(0) {
     }
     void setStreamBuffer(int p_playback_buffer) {
       playback_buffer = p_playback_buffer;
@@ -71,7 +74,7 @@ class MonitorStream : public StreamBase {
     bool setStreamStart(int monitor_id) {
       return loadMonitor(monitor_id);
     }
-    void runStream();
+    void runStream() override;
 };
 
 #endif // ZM_MONITORSTREAM_H
diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp
index 225cdaa5e..5ab1ad5dc 100644
--- a/src/zm_mpeg.cpp
+++ b/src/zm_mpeg.cpp
@@ -17,13 +17,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#include <stdlib.h>
-#include <string.h>
-
-#include "zm.h"
-#include "zm_rgb.h"
 #include "zm_mpeg.h"
 
+#include "zm_logger.h"
+#include "zm_rgb.h"
+#include <cstring>
+#include <unistd.h>
+
 #if HAVE_LIBAVCODEC
 extern "C" {
 #include <libavutil/mathematics.h>
@@ -101,7 +101,7 @@ void VideoStream::SetupFormat( ) {
 	ofc = s;
 #endif
 	if ( !ofc ) {
-		Fatal("avformat_alloc_..._context failed: %d", ofc);
+		Fatal("avformat_alloc_..._context failed");
 	}
 
 	of = ofc->oformat;
@@ -264,22 +264,21 @@ void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int hei
 void VideoStream::SetParameters( ) {
 }
 
-const char *VideoStream::MimeType( ) const {
+const char *VideoStream::MimeType() const {
 	for ( unsigned int i = 0; i < sizeof (mime_data) / sizeof (*mime_data); i++ ) {
-		if ( strcmp( format, mime_data[i].format ) == 0 ) {
-			Debug( 1, "MimeType is \"%s\"", mime_data[i].mime_type );
+		if ( strcmp(format, mime_data[i].format) == 0 ) {
+			Debug(1, "MimeType is \"%s\"", mime_data[i].mime_type);
 			return mime_data[i].mime_type;
 		}
 	}
 	const char *mime_type = of->mime_type;
 	if ( !mime_type ) {
-		std::string mime = "video/";
-		mime = mime.append( format );
-		mime_type = mime.c_str( );
-		Warning( "Unable to determine mime type for '%s' format, using '%s' as default", format, mime_type );
+		std::string mime = std::string("video/") + format;
+		mime_type = strdup(mime.c_str()); // mem leak
+		Warning( "Unable to determine mime type for '%s' format, using '%s' as default", format, mime_type);
 	}
 
-	Debug(1, "MimeType is \"%s\"", mime_type );
+	Debug(1, "MimeType is \"%s\"", mime_type);
 
 	return mime_type;
 }
diff --git a/src/zm_mpeg.h b/src/zm_mpeg.h
index 6e75f8743..4999f1328 100644
--- a/src/zm_mpeg.h
+++ b/src/zm_mpeg.h
@@ -21,6 +21,7 @@
 #define ZM_MPEG_H
 
 #include "zm_ffmpeg.h"
+#include <pthread.h>
 
 #if HAVE_LIBAVCODEC
 
diff --git a/src/zm_packet.cpp b/src/zm_packet.cpp
index 36407ba21..7aef2ddca 100644
--- a/src/zm_packet.cpp
+++ b/src/zm_packet.cpp
@@ -16,35 +16,266 @@
 //You should have received a copy of the GNU General Public License
 //along with ZoneMinder.  If not, see <http://www.gnu.org/licenses/>.
 
-
 #include "zm_packet.h"
-#include "zm_ffmpeg.h"
 
+#include "zm_ffmpeg.h"
+#include "zm_image.h"
+#include "zm_logger.h"
 #include <sys/time.h>
 
 using namespace std;
+AVPixelFormat target_format = AV_PIX_FMT_NONE;
 
-ZMPacket::ZMPacket( AVPacket *p ) {
-  frame = nullptr;
-  image = nullptr;
-  av_init_packet( &packet );
-  if ( zm_av_packet_ref( &packet, p ) < 0 ) {
-    Error("error refing packet");
-	}
-  gettimeofday( &timestamp, nullptr );
+ZMPacket::ZMPacket() :
+  keyframe(0),
+  stream(nullptr),
+  in_frame(nullptr),
+  out_frame(nullptr),
+  timestamp(nullptr),
+  buffer(nullptr),
+  image(nullptr),
+  analysis_image(nullptr),
+  score(-1),
+  codec_type(AVMEDIA_TYPE_UNKNOWN),
+  image_index(-1),
+  codec_imgsize(0),
+  pts(0),
+  decoded(0)
+{
+  av_init_packet(&packet);
+  packet.size = 0; // So we can detect whether it has been filled.
 }
 
-ZMPacket::ZMPacket( AVPacket *p, struct timeval *t ) {
-  frame = nullptr;
-  image = nullptr;
-  av_init_packet( &packet );
-  if ( zm_av_packet_ref( &packet, p ) < 0 ) {
+ZMPacket::ZMPacket(ZMPacket &p) :
+  keyframe(0),
+  stream(nullptr),
+  in_frame(nullptr),
+  out_frame(nullptr),
+  timestamp(nullptr),
+  buffer(nullptr),
+  image(nullptr),
+  analysis_image(nullptr),
+  score(-1),
+  codec_type(AVMEDIA_TYPE_UNKNOWN),
+  image_index(-1),
+  codec_imgsize(0),
+  pts(0),
+  decoded(0)
+{
+  av_init_packet(&packet);
+  packet.size = 0;
+  packet.data = nullptr;
+  if ( zm_av_packet_ref(&packet, &p.packet) < 0 ) {
     Error("error refing packet");
-	}
-  timestamp = *t;
+  }
+  timestamp = new struct timeval;
+  *timestamp = *p.timestamp;
 }
 
 ZMPacket::~ZMPacket() {
-  zm_av_packet_unref( &packet );
+  zm_av_packet_unref(&packet);
+  if ( in_frame ) av_frame_free(&in_frame);
+  if ( out_frame ) av_frame_free(&out_frame);
+  if ( buffer ) av_freep(&buffer);
+  if ( analysis_image ) delete analysis_image;
+  if ( image ) delete image;
+  if ( timestamp ) delete timestamp;
 }
 
+/* returns < 0 on error, 0 on not ready, int bytes consumed on success 
+ * This functions job is to populate in_frame with the image in an appropriate
+ * format. It MAY also populate image if able to.  In this case in_frame is populated
+ * by the image buffer.  
+ */
+int ZMPacket::decode(AVCodecContext *ctx) {
+  Debug(4, "about to decode video, image_index is (%d)", image_index);
+
+  if ( in_frame ) {
+    Error("Already have a frame?");
+  } else {
+    in_frame = zm_av_frame_alloc();
+  }
+
+  // packets are always stored in AV_TIME_BASE_Q so need to convert to codec time base
+  //av_packet_rescale_ts(&packet, AV_TIME_BASE_Q, ctx->time_base);
+
+  int ret = zm_send_packet_receive_frame(ctx, in_frame, packet);
+  if ( ret < 0 ) {
+    if ( AVERROR(EAGAIN) != ret ) {
+      Warning("Unable to receive frame : code %d %s.",
+          ret, av_make_error_string(ret).c_str());
+    }
+    av_frame_free(&in_frame);
+    return 0;
+  }
+  int bytes_consumed = ret;
+  if ( ret > 0 ) {
+    zm_dump_video_frame(in_frame, "got frame");
+
+#if HAVE_LIBAVUTIL_HWCONTEXT_H
+#if LIBAVCODEC_VERSION_CHECK(57, 89, 0, 89, 0)
+
+    if ( fix_deprecated_pix_fmt(ctx->sw_pix_fmt) != fix_deprecated_pix_fmt(static_cast<AVPixelFormat>(in_frame->format)) ) {
+      Debug(1, "Have different format ctx->pix_fmt %s ?= ctx->sw_pix_fmt %s in_frame->format %s.",
+          av_get_pix_fmt_name(ctx->pix_fmt),
+          av_get_pix_fmt_name(ctx->sw_pix_fmt),
+          av_get_pix_fmt_name(static_cast<AVPixelFormat>(in_frame->format))
+          );
+#if 0
+      if ( target_format == AV_PIX_FMT_NONE and ctx->hw_frames_ctx and (image->Colours() == 4) ) {
+        // Look for rgb0 in list of supported formats
+        enum AVPixelFormat *formats;
+        if ( 0 <= av_hwframe_transfer_get_formats(
+              ctx->hw_frames_ctx,
+              AV_HWFRAME_TRANSFER_DIRECTION_FROM,
+              &formats,
+              0
+              )	) {
+          for (int i = 0; formats[i] != AV_PIX_FMT_NONE; i++) {
+            Debug(1, "Available dest formats %d %s", 
+                formats[i],
+                av_get_pix_fmt_name(formats[i])
+                );
+            if ( formats[i] == AV_PIX_FMT_RGB0 ) {
+              target_format = formats[i];
+              break;
+            }  // endif RGB0
+          }  // end foreach support format
+          av_freep(&formats);
+        }  // endif success getting list of formats
+      }  // end if target_format not set
+#endif
+
+      AVFrame *new_frame = zm_av_frame_alloc();
+#if 0
+      if ( target_format == AV_PIX_FMT_RGB0 ) {
+        if ( image ) {
+          if ( 0 > image->PopulateFrame(new_frame) ) {
+            delete new_frame;
+            new_frame = zm_av_frame_alloc();
+            delete image;
+            image = nullptr;
+            new_frame->format = target_format;
+          }
+        }
+      }
+#endif
+      /* retrieve data from GPU to CPU */
+      zm_dump_video_frame(in_frame, "Before hwtransfer");
+      ret = av_hwframe_transfer_data(new_frame, in_frame, 0);
+      if ( ret < 0 ) {
+        Error("Unable to transfer frame: %s, continuing",
+            av_make_error_string(ret).c_str());
+        av_frame_free(&in_frame);
+        av_frame_free(&new_frame);
+        return 0;
+      }
+      ret = av_frame_copy_props(new_frame, in_frame);
+      if ( ret < 0 ) {
+        Error("Unable to copy props: %s, continuing",
+            av_make_error_string(ret).c_str());
+      }
+
+      zm_dump_video_frame(new_frame, "After hwtransfer");
+#if 0
+      if ( new_frame->format == AV_PIX_FMT_RGB0 ) {
+        new_frame->format = AV_PIX_FMT_RGBA;
+        zm_dump_video_frame(new_frame, "After hwtransfer setting to rgba");
+      }
+#endif
+      av_frame_free(&in_frame);
+      in_frame = new_frame;
+    } else
+#endif
+#endif
+      Debug(2, "Same pix format %s so not hwtransferring. sw_pix_fmt is %s",
+          av_get_pix_fmt_name(ctx->pix_fmt),
+          av_get_pix_fmt_name(ctx->sw_pix_fmt)
+          );
+#if 0
+    if ( image ) {
+      image->Assign(in_frame);
+    }
+#endif
+  } // end if if ( ret > 0 ) {
+  return bytes_consumed;
+} // end ZMPacket::decode
+
+Image *ZMPacket::get_image(Image *i) {
+  if ( !in_frame ) {
+    Error("Can't get image without frame.. maybe need to decode first");
+    return nullptr;
+  }
+  if ( !image ) {
+    if ( !i ) {
+      Error("Need a pre-allocated image buffer");
+      return nullptr;
+    } 
+    image = i;
+  }
+  image->Assign(in_frame);
+  return image;
+}
+
+Image *ZMPacket::set_image(Image *i) {
+  image = i;
+  return image;
+}
+
+AVPacket *ZMPacket::set_packet(AVPacket *p) {
+  if ( zm_av_packet_ref(&packet, p) < 0 ) {
+    Error("error refing packet");
+  }
+  //ZM_DUMP_PACKET(packet, "zmpacket:");
+  gettimeofday(timestamp, nullptr);
+  keyframe = p->flags & AV_PKT_FLAG_KEY;
+  return &packet;
+}
+
+AVFrame *ZMPacket::get_out_frame(int width, int height, AVPixelFormat format) {
+  if (!out_frame) {
+    out_frame = zm_av_frame_alloc();
+    if (!out_frame) {
+      Error("Unable to allocate a frame");
+      return nullptr;
+    }
+
+#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
+    
+    codec_imgsize = av_image_get_buffer_size(
+        format, width, height, 32);
+    Debug(1, "buffer size %u from %s %dx%d", codec_imgsize, av_get_pix_fmt_name(format), width, height);
+    buffer = (uint8_t *)av_malloc(codec_imgsize);
+    int ret;
+    if ((ret=av_image_fill_arrays(
+        out_frame->data,
+        out_frame->linesize,
+        buffer,
+        format,
+        width,
+        height,
+        32))<0) {
+      Error("Failed to fill_arrays %s", av_make_error_string(ret).c_str());
+      av_frame_free(&out_frame);
+      return nullptr;
+    }
+#else
+    codec_imgsize = avpicture_get_size(
+        format,
+        width,
+        >height);
+    buffer = (uint8_t *)av_malloc(codec_imgsize);
+    avpicture_fill(
+        (AVPicture *)out_frame,
+        buffer,
+        format,
+        width,
+        height
+        );
+#endif
+    out_frame->width = width;
+    out_frame->height = height;
+    out_frame->format = format;
+  }
+  return out_frame;
+} // end AVFrame *ZMPacket::get_out_frame( AVCodecContext *ctx );
diff --git a/src/zm_packet.h b/src/zm_packet.h
index bdb67cb57..a7deca325 100644
--- a/src/zm_packet.h
+++ b/src/zm_packet.h
@@ -20,6 +20,13 @@
 #ifndef ZM_PACKET_H
 #define ZM_PACKET_H
 
+#include "zm_logger.h"
+#include "zm_zone.h"
+
+#include <condition_variable>
+#include <mutex>
+#include <vector>
+
 extern "C" {
 #include <libavformat/avformat.h>
 }
@@ -27,20 +34,90 @@ extern "C" {
 #ifdef __FreeBSD__
 #include <sys/time.h>
 #endif // __FreeBSD__
-#include "zm_image.h"
+
+class Image;
 
 class ZMPacket {
   public:
   
-    AVPacket  packet;   // Input packet, undecoded
-    AVFrame   *frame;    // Input image, decoded
-    Image     *image;   // Our internal image oject representing this frame
-    struct timeval timestamp;
+    std::mutex  mutex_;
+    std::condition_variable condition_;
+
+    int keyframe;
+    AVStream  *stream;            // Input stream
+    AVPacket  packet;             // Input packet, undecoded
+    AVFrame   *in_frame;          // Input image, decoded Theoretically only filled if needed.
+    AVFrame   *out_frame;         // output image, Only filled if needed.
+    struct timeval *timestamp;
+    uint8_t   *buffer;            // buffer used in image
+    Image     *image;
+    Image     *analysis_image;
+    int       score;
+    AVMediaType codec_type;
+    int image_index;
+    int codec_imgsize;
+    int64_t   pts;                // pts in the packet can be in another time base. This MUST be in AV_TIME_BASE_Q
+    bool decoded;
+    std::vector<ZoneStats> zone_stats;
+
   public:
     AVPacket *av_packet() { return &packet; }
-    ZMPacket( AVPacket *packet, struct timeval *timestamp );
-    explicit ZMPacket( AVPacket *packet );
+    AVPacket *set_packet(AVPacket *p) ;
+    AVFrame *av_frame() { return out_frame; }
+    Image *get_image(Image *i=nullptr);
+    Image *set_image(Image *);
+
+    int is_keyframe() { return keyframe; };
+    int decode( AVCodecContext *ctx );
+    explicit ZMPacket(Image *image);
+    explicit ZMPacket(ZMPacket &packet);
+    ZMPacket();
     ~ZMPacket();
+
+    //AVFrame *get_out_frame(const AVCodecContext *ctx);
+    AVFrame *get_out_frame(int width, int height, AVPixelFormat format);
+    int get_codec_imgsize() { return codec_imgsize; };
+};
+
+class ZMLockedPacket {
+  public:
+    ZMPacket *packet_;
+    std::unique_lock<std::mutex> lck_;
+    bool locked;
+
+    explicit ZMLockedPacket(ZMPacket *p) :
+      packet_(p),
+      lck_(packet_->mutex_, std::defer_lock),
+      locked(false) {
+    }
+    ~ZMLockedPacket() {
+      if (locked) unlock();
+    }
+
+    void lock() {
+      Debug(4, "locking packet %d", packet_->image_index);
+      lck_.lock();
+      locked = true;
+      Debug(4, "packet %d locked", packet_->image_index);
+    };
+
+    bool trylock() {
+      Debug(4, "TryLocking packet %d", packet_->image_index);
+      locked = lck_.try_lock();
+      return locked;
+    };
+
+    void unlock() {
+      Debug(4, "packet %d unlocked", packet_->image_index);
+      locked = false;
+      lck_.unlock();
+      packet_->condition_.notify_all();
+    };
+
+    void wait() {
+      Debug(4, "packet %d waiting", packet_->image_index);
+      packet_->condition_.wait(lck_);
+    }
 };
 
 #endif /* ZM_PACKET_H */
diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index 7dbe31bd7..a1f149bb4 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -17,223 +17,482 @@
 //along with ZoneMinder.  If not, see <http://www.gnu.org/licenses/>.
 
 
+// PacketQueue must know about all iterators and manage them
+
 #include "zm_packetqueue.h"
+
 #include "zm_ffmpeg.h"
+#include "zm_packet.h"
+#include "zm_signal.h"
 #include <sys/time.h>
-#include "zm_time.h"
 
-zm_packetqueue::zm_packetqueue( int p_max_stream_id ) {
-  max_stream_id = p_max_stream_id;
+PacketQueue::PacketQueue():
+  video_stream_id(-1),
+  max_video_packet_count(-1),
+  pre_event_video_packet_count(-1),
+  max_stream_id(-1),
+  packet_counts(nullptr),
+  deleting(false),
+  keep_keyframes(false)
+{
+}
+
+/* Assumes queue is empty when adding streams
+ * Assumes first stream added will be the video stream
+ */
+int PacketQueue::addStream() {
+  deleting = false;
+  if (max_stream_id == -1) {
+    video_stream_id = 0;
+    max_stream_id = 0;
+  } else {
+    max_stream_id ++;
+  }
+
+  if (packet_counts) delete[] packet_counts;
   packet_counts = new int[max_stream_id+1];
-  for ( int i=0; i <= max_stream_id; ++i )
+  for (int i=0; i <= max_stream_id; ++i)
     packet_counts[i] = 0;
+  return max_stream_id;
 }
 
-zm_packetqueue::~zm_packetqueue() {
-  clearQueue();
-  delete[] packet_counts;
-  packet_counts = nullptr;
+PacketQueue::~PacketQueue() {
+  clear();
+  if (packet_counts) {
+    delete[] packet_counts;
+    packet_counts = nullptr;
+  }
+  while (!iterators.empty()) {
+    packetqueue_iterator *it = iterators.front();
+    iterators.pop_front();
+    delete it;
+  }
+  Debug(4, "Done in destructor");
 }
 
-bool zm_packetqueue::queuePacket(ZMPacket* zm_packet) {
+/* Enqueues the given packet.  Will maintain the it pointer and image packet counts.
+ * If we have reached our max image packet count, it will pop off as many packets as are needed.
+ * Thus it will ensure that the same packet never gets queued twice.
+ */
 
-  if (
-      ( zm_packet->packet.dts == AV_NOPTS_VALUE )
-      ||
-      ( packet_counts[zm_packet->packet.stream_index] <= 0 ) 
-    ) {
-    Debug(2,"Inserting packet with dts %" PRId64 " because queue %d is empty (queue size: %d) or invalid dts",
-        zm_packet->packet.dts, zm_packet->packet.stream_index, packet_counts[zm_packet->packet.stream_index]
+bool PacketQueue::queuePacket(ZMPacket* add_packet) {
+  Debug(4, "packetqueue queuepacket %p %d", add_packet, add_packet->image_index);
+  if (iterators.empty()) {
+    Debug(4, "No iterators so no one needs us to queue packets.");
+    return false;
+  }
+  if (!packet_counts[video_stream_id] and !add_packet->keyframe) {
+    Debug(4, "No video keyframe so no one needs us to queue packets.");
+    return false;
+  }
+  {
+    std::unique_lock<std::mutex> lck(mutex);
+
+    if (add_packet->packet.stream_index == video_stream_id) {
+      if ((max_video_packet_count > 0) and (packet_counts[video_stream_id] > max_video_packet_count)) {
+        Warning("You have set the max video packets in the queue to %u."
+            " The queue is full. Either Analysis is not keeping up or"
+            " your camera's keyframe interval is larger than this setting."
+            " We are dropping packets.", max_video_packet_count);
+        if (add_packet->keyframe) {
+          // Have a new keyframe, so delete everything
+          while ((*pktQueue.begin() != add_packet) and (packet_counts[video_stream_id] > max_video_packet_count)) {
+            ZMPacket *zm_packet = *pktQueue.begin();
+            ZMLockedPacket *lp = new ZMLockedPacket(zm_packet);
+            if (!lp->trylock()) {
+              Debug(1, "Found locked packet when trying to free up video packets. Can't continue");
+              delete lp;
+              break;
+            }
+            delete lp;
+
+            for (
+                std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
+                iterators_it != iterators.end();
+                ++iterators_it
+                ) {
+              packetqueue_iterator *iterator_it = *iterators_it;
+              // Have to check each iterator and make sure it doesn't point to the packet we are about to delete
+              if ( *(*iterator_it) == zm_packet ) {
+                Debug(1, "Bumping IT because it is at the front that we are deleting");
+                ++(*iterators_it);
+              }
+            }  // end foreach iterator
+
+            pktQueue.pop_front();
+            packet_counts[zm_packet->packet.stream_index] -= 1;
+            Debug(1,
+                  "Deleting a packet with stream index:%d image_index:%d with keyframe:%d, video frames in queue:%d max: %d, queuesize:%zu",
+                  zm_packet->packet.stream_index,
+                  zm_packet->image_index,
+                  zm_packet->keyframe,
+                  packet_counts[video_stream_id],
+                  max_video_packet_count,
+                  pktQueue.size());
+            delete zm_packet;
+          } // end while
+        }
+      }  // end if too many video packets
+      if ((max_video_packet_count > 0) and (packet_counts[video_stream_id] > max_video_packet_count)) {
+        Error("Unable to free up older packets.  Not queueing this video packet.");
+        return false;
+      }
+    }  // end if this packet is a video packet
+
+    pktQueue.push_back(add_packet);
+    packet_counts[add_packet->packet.stream_index] += 1;
+    Debug(2, "packet counts for %d is %d",
+        add_packet->packet.stream_index,
+        packet_counts[add_packet->packet.stream_index]);
+
+    for (
+        std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
+        iterators_it != iterators.end();
+        ++iterators_it
+        ) {
+      packetqueue_iterator *iterator_it = *iterators_it;
+      if (*iterator_it == pktQueue.end()) {
+        Debug(4, "pointing it %p to back", iterator_it);
+        --(*iterator_it);
+      } else {
+        Debug(4, "it %p not at end", iterator_it);
+      }
+    }  // end foreach iterator
+  }  // end lock scope
+  // We signal on every packet because someday we may analyze sound
+  Debug(4, "packetqueue queuepacket, unlocked signalling");
+  condition.notify_all();
+
+	return true;
+} // end bool PacketQueue::queuePacket(ZMPacket* zm_packet)
+
+void PacketQueue::clearPackets(ZMPacket *add_packet) {
+  // Only do queueCleaning if we are adding a video keyframe, so that we guarantee that there is one.
+  // No good.  Have to satisfy two conditions: 
+  // 1. packetqueue starts with a video keyframe
+  // 2. Have minimum # of video packets
+  // 3. No packets can be locked
+  // 4. No iterator can point to one of the packets
+  //
+  // So start at the beginning, counting video packets until the next keyframe.  
+  // Then if deleting those packets doesn't break 1 and 2, then go ahead and delete them.
+  if (keep_keyframes and ! (
+        add_packet->packet.stream_index == video_stream_id
+        and
+        add_packet->keyframe
+        and
+        (packet_counts[video_stream_id] > pre_event_video_packet_count)
+        and 
+        *(pktQueue.begin()) != add_packet
+        )
+     ) {
+    Debug(3, "stream index %d ?= video_stream_id %d, keyframe %d, keep_keyframes %d,  counts %d > pre_event_count %d at begin %d",
+        add_packet->packet.stream_index, video_stream_id, add_packet->keyframe, keep_keyframes, packet_counts[video_stream_id], pre_event_video_packet_count, 
+        ( *(pktQueue.begin()) != add_packet )
         );
-    // No dts value, can't so much with it
-    pktQueue.push_back(zm_packet);
-    packet_counts[zm_packet->packet.stream_index] += 1;
-    return true;
+    return;
   }
+  std::unique_lock<std::mutex> lck(mutex);
+  if (!pktQueue.size()) return;
 
-#if 0
-  std::list<ZMPacket *>::reverse_iterator it = pktQueue.rbegin();
+  // If analysis_it isn't at the end, we need to keep that many additional packets
+  int tail_count = 0;
+  if (pktQueue.back() != add_packet) {
+    packetqueue_iterator it = pktQueue.end();
+    --it;
+    while (*it != add_packet) {
+      if ((*it)->packet.stream_index == video_stream_id)
+        ++tail_count;
+      --it;
+    }
+  }
+  Debug(1, "Tail count is %d, queue size is %lu", tail_count, pktQueue.size());
 
-  // Scan through the queue looking for a packet for our stream with a dts <= ours.
-  while ( it != pktQueue.rend() ) {
-    AVPacket *av_packet = &((*it)->packet);
+  if (!keep_keyframes) {
+    // If not doing passthrough, we don't care about starting with a keyframe so logic is simpler
+    while ((*pktQueue.begin() != add_packet) and (packet_counts[video_stream_id] > pre_event_video_packet_count + tail_count)) {
+      ZMPacket *zm_packet = *pktQueue.begin();
+      ZMLockedPacket *lp = new ZMLockedPacket(zm_packet);
+      if (!lp->trylock()) break;
+      delete lp;
 
-    Debug(2, "Looking at packet with stream index (%d) with dts %" PRId64,
-        av_packet->stream_index, av_packet->dts);
-    if ( av_packet->stream_index == zm_packet->packet.stream_index ) {
-      if (
-          ( av_packet->dts != AV_NOPTS_VALUE )
-          &&
-          ( av_packet->dts <= zm_packet->packet.dts) 
-         ) {
-        Debug(2, "break packet with stream index (%d) with dts %" PRId64,
-            (*it)->packet.stream_index, (*it)->packet.dts);
+      if (is_there_an_iterator_pointing_to_packet(zm_packet)) {
+        Warning("Found iterator at beginning of queue. Some thread isn't keeping up");
         break;
       }
-    } else { // Not same stream, compare timestamps
-      if ( tvDiffUsec(((*it)->timestamp, zm_packet->timestamp) ) <= 0 ) {
-        Debug(2, "break packet with stream index (%d) with dts %" PRId64,
-            (*it)->packet.stream_index, (*it)->packet.dts);
+
+      pktQueue.pop_front();
+      packet_counts[zm_packet->packet.stream_index] -= 1;
+      Debug(1,
+            "Deleting a packet with stream index:%d image_index:%d with keyframe:%d, video frames in queue:%d max: %d, queuesize:%zu",
+            zm_packet->packet.stream_index,
+            zm_packet->image_index,
+            zm_packet->keyframe,
+            packet_counts[video_stream_id],
+            pre_event_video_packet_count,
+            pktQueue.size());
+      delete zm_packet;
+    } // end while
+    return;
+  }
+
+  packetqueue_iterator it = pktQueue.begin();
+  packetqueue_iterator next_front = pktQueue.begin();
+  int video_packets_to_delete = 0;    // This is a count of how many packets we will delete so we know when to stop looking
+
+  // First packet is special because we know it is a video keyframe and only need to check for lock
+  ZMPacket *zm_packet = *it;
+  Debug(1, "trying lock on first packet");
+  ZMLockedPacket *lp = new ZMLockedPacket(zm_packet);
+  if (lp->trylock()) {
+    Debug(1, "Have lock on first packet");
+    ++it;
+    delete lp;
+
+    if (it == pktQueue.end()) {
+      Debug(1, "Hit end already");
+      it = pktQueue.begin();
+    } else {
+    // Since we have many packets in the queue, we should NOT be pointing at end so don't need to test for that
+    while (*it != add_packet) {
+      zm_packet = *it;
+      lp = new ZMLockedPacket(zm_packet);
+      if (!lp->trylock()) {
+        delete lp;
         break;
       }
+      delete lp;
+
+      if (is_there_an_iterator_pointing_to_packet(zm_packet) and (pktQueue.begin() == next_front)) {
+        Warning("Found iterator at beginning of queue. Some thread isn't keeping up");
+        break;
+      }
+
+      if (zm_packet->packet.stream_index == video_stream_id) {
+        if (zm_packet->keyframe) {
+          Debug(3, "Have a video keyframe so setting next front to it");
+          next_front = it;
+        }
+        ++video_packets_to_delete;
+          Debug(4, "Counted %d video packets. Which would leave %d in packetqueue tail count is %d",
+              video_packets_to_delete, packet_counts[video_stream_id]-video_packets_to_delete, tail_count);
+        if (packet_counts[video_stream_id] - video_packets_to_delete <= pre_event_video_packet_count + tail_count) {
+          break;
+        }
+      }
+      it++;
+    } // end while
     }
-    it++;
-  } // end while not the end of the queue
+  }  // end if first packet not locked
+  Debug(1, "Resulting pointing at latest packet? %d, next front points to begin? %d",
+      ( *it == add_packet ),
+      ( next_front == pktQueue.begin() )
+      );
+  if ( next_front != pktQueue.begin() ) {
+    while ( pktQueue.begin() != next_front ) {
+      ZMPacket *zm_packet = *pktQueue.begin();
+      if ( !zm_packet ) {
+        Error("NULL zm_packet in queue");
+        continue;
+      }
 
-  if ( it != pktQueue.rend() ) {
-    Debug(2, "Found packet with stream index (%d) with dts %" PRId64 " <= %" PRId64,
-        (*it)->packet.stream_index, (*it)->packet.dts, zm_packet->packet.dts);
-    if ( it == pktQueue.rbegin() ) {
-       Debug(2,"Inserting packet with dts %" PRId64 " at end", zm_packet->packet.dts);
-      // No dts value, can't so much with it
-      pktQueue.push_back(zm_packet);
-      packet_counts[zm_packet->packet.stream_index] += 1;
-      return true;
+      Debug(1,
+            "Deleting a packet with stream index:%d image_index:%d with keyframe:%d, video frames in queue:%d max: %d, queuesize:%zu",
+            zm_packet->packet.stream_index,
+            zm_packet->image_index,
+            zm_packet->keyframe,
+            packet_counts[video_stream_id],
+            pre_event_video_packet_count,
+            pktQueue.size());
+      pktQueue.pop_front();
+      packet_counts[zm_packet->packet.stream_index] -= 1;
+      delete zm_packet;
     }
-    // Convert to a forward iterator so that we can insert at end
-    std::list<ZMPacket *>::iterator f_it = it.base();
+  }  // end if have at least max_video_packet_count video packets remaining
+  // We signal on every packet because someday we may analyze sound
 
-    Debug(2, "Insert packet before packet with stream index (%d) with dts %" PRId64 " for dts %" PRId64,
-        (*f_it)->packet.stream_index, (*f_it)->packet.dts, zm_packet->packet.dts);
+	return;
+} // end voidPacketQueue::clearPackets(ZMPacket* zm_packet)
 
-    pktQueue.insert(f_it, zm_packet);
-
-    packet_counts[zm_packet->packet.stream_index] += 1;
-    return true;
-  }
-  Debug(1,"Unable to insert packet for stream %d with dts %" PRId64 " into queue.",
-      zm_packet->packet.stream_index, zm_packet->packet.dts);
-#endif
-  pktQueue.push_back(zm_packet);
-  packet_counts[zm_packet->packet.stream_index] += 1;
-  return true;
-} // end bool zm_packetqueue::queuePacket(ZMPacket* zm_packet)
-
-bool zm_packetqueue::queuePacket(AVPacket* av_packet) {
-  ZMPacket *zm_packet = new ZMPacket(av_packet);
-  return queuePacket(zm_packet);
-}
-
-ZMPacket* zm_packetqueue::popPacket( ) {
+ZMLockedPacket* PacketQueue::popPacket( ) {
+  Debug(4, "pktQueue size %zu", pktQueue.size());
 	if ( pktQueue.empty() ) {
 		return nullptr;
 	}
+  Debug(4, "poPacket Mutex locking");
+  std::unique_lock<std::mutex> lck(mutex);
+
+	ZMPacket *zm_packet = pktQueue.front();
+  for (
+      std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
+      iterators_it != iterators.end();
+      ++iterators_it
+      ) {
+    packetqueue_iterator *iterator_it = *iterators_it;
+    // Have to check each iterator and make sure it doesn't point to the packet we are about to delete
+    if ( *(*iterator_it) == zm_packet ) {
+      Debug(4, "Bumping it because it is at the front that we are deleting");
+      ++(*iterators_it);
+    }
+  }  // end foreach iterator
+
+  ZMLockedPacket *lp = new ZMLockedPacket (zm_packet);
+  lp->lock();
 
-	ZMPacket *packet = pktQueue.front();
 	pktQueue.pop_front();
-  packet_counts[packet->packet.stream_index] -= 1;
+  packet_counts[zm_packet->packet.stream_index] -= 1;
 
-	return packet;
-}
+	return lp;
+}  // popPacket
 
-unsigned int zm_packetqueue::clearQueue(unsigned int frames_to_keep, int stream_id) {
-  
-  Debug(3, "Clearing all but %d frames, queue has %d", frames_to_keep, pktQueue.size());
-  frames_to_keep += 1;
+
+/* Keeps frames_to_keep frames of the provided stream, which theoretically is the video stream
+ * Basically it starts at the end, moving backwards until it finds the minimum video frame.
+ * Then it should probably move forward to find a keyframe.  The first video frame must always be a keyframe.
+ * So really frames_to_keep is a maximum which isn't so awesome.. maybe we should go back  farther to find the keyframe in which case
+ * frames_to_keep in a minimum
+ */
+
+unsigned int PacketQueue::clear(unsigned int frames_to_keep, int stream_id) {
+  Debug(3, "Clearing all but %d frames, queue has %zu", frames_to_keep, pktQueue.size());
 
 	if ( pktQueue.empty() ) {
-    Debug(3, "Queue is empty");
     return 0;
   }
 
-  std::list<ZMPacket *>::reverse_iterator it;
-  ZMPacket *packet = nullptr;
+  // If size is <= frames_to_keep since it could contain audio, we can't possibly do anything
+  if ( pktQueue.size() <= frames_to_keep ) {
+    return 0;
+  }
+  Debug(5, "Locking in clear");
+  std::unique_lock<std::mutex> lck(mutex);
 
-  for ( it = pktQueue.rbegin(); it != pktQueue.rend() && frames_to_keep; ++it ) {
-    ZMPacket *zm_packet = *it;
+  packetqueue_iterator it = pktQueue.end()--;  // point to last element instead of end
+  ZMPacket *zm_packet = nullptr;
+
+  while ( (it != pktQueue.begin()) and frames_to_keep ) {
+    zm_packet = *it;
     AVPacket *av_packet = &(zm_packet->packet);
        
-    Debug(4, "Looking at packet with stream index (%d) with keyframe (%d), frames_to_keep is (%d)",
-        av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), frames_to_keep );
+    Debug(3, "Looking at packet with stream index (%d) with keyframe(%d), Image_index(%d) frames_to_keep is (%d)",
+        av_packet->stream_index, zm_packet->keyframe, zm_packet->image_index, frames_to_keep );
     
     // Want frames_to_keep video keyframes.  Otherwise, we may not have enough
-    if ( ( av_packet->stream_index == stream_id) ) {
-      //&& ( av_packet->flags & AV_PKT_FLAG_KEY ) ) {
+    if ( av_packet->stream_index == stream_id ) {
       frames_to_keep --;
     }
+    it --;
   }
 
-  // Make sure we start on a keyframe
-  for ( ; it != pktQueue.rend(); ++it ) {
-    ZMPacket *zm_packet = *it;
-    AVPacket *av_packet = &(zm_packet->packet);
-       
-    Debug(5, "Looking for keyframe at packet with stream index (%d) with keyframe (%d), frames_to_keep is (%d)",
-        av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), frames_to_keep);
-    
-    // Want frames_to_keep video keyframes.  Otherwise, we may not have enough
-    if ( (av_packet->stream_index == stream_id) && (av_packet->flags & AV_PKT_FLAG_KEY) ) {
-      Debug(4, "Found keyframe at packet with stream index (%d) with keyframe (%d), frames_to_keep is (%d)",
-          av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), frames_to_keep);
-      break;
+  // Either at beginning or frames_to_keep == 0
+
+  if ( it == pktQueue.begin() ) {
+    if ( frames_to_keep ) {
+      Warning("Couldn't remove any packets, needed %d", frames_to_keep);
     }
+    mutex.unlock();
+    return 0;
   }
-  if ( frames_to_keep ) {
-    Debug(3, "Hit end of queue, still need (%d) video frames", frames_to_keep);
-  }
-  if ( it != pktQueue.rend() ) {
-    // We want to keep this packet, so advance to the next
-    ++it;
-  }
-  unsigned int delete_count = 0;
-  while ( it != pktQueue.rend() ) {
-    Debug(4, "Deleting a packet from the front, count is (%d)", delete_count);
 
-    packet = pktQueue.front();
-    pktQueue.pop_front();
-    packet_counts[packet->packet.stream_index] -= 1;
-    delete packet;
-
-    delete_count += 1;
-  }    
-  packet = nullptr; // tidy up for valgrind
-  Debug(3, "Deleted %d packets, %d remaining", delete_count, pktQueue.size());
-  return delete_count; 
-} // end unsigned int zm_packetqueue::clearQueue( unsigned int frames_to_keep, int stream_id )
-
-void zm_packetqueue::clearQueue() {
-  ZMPacket *packet = nullptr;
   int delete_count = 0;
-	while ( !pktQueue.empty() ) {
-    packet = pktQueue.front();
-    packet_counts[packet->packet.stream_index] -= 1;
+
+  // Else not at beginning, are pointing at packet before the last video packet
+  while ( pktQueue.begin() != it ) {
+    Debug(4, "Deleting a packet from the front, count is (%d), queue size is %zu",
+          delete_count, pktQueue.size());
+    zm_packet = pktQueue.front();
+    for (
+        std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
+        iterators_it != iterators.end();
+        ++iterators_it
+       ) {
+      packetqueue_iterator *iterator_it = *iterators_it;
+      // Have to check each iterator and make sure it doesn't point to the packet we are about to delete
+      if ( *(*iterator_it) == zm_packet ) {
+        Debug(4, "Bumping it because it is at the front that we are deleting");
+        ++(*iterators_it);
+      }
+    }  // end foreach iterator
+    packet_counts[zm_packet->packet.stream_index] --;
     pktQueue.pop_front();
-    delete packet;
+    //if ( zm_packet->image_index == -1 )
+      delete zm_packet;
+
     delete_count += 1;
-	}
-  Debug(3, "Deleted (%d) packets", delete_count );
+  } // while our iterator is not the first packet
+  Debug(3, "Deleted %d packets, %zu remaining", delete_count, pktQueue.size());
+  return delete_count; 
+} // end unsigned int PacketQueue::clear( unsigned int frames_to_keep, int stream_id )
+
+void PacketQueue::clear() {
+  deleting = true;
+  condition.notify_all();
+  Debug(1, "Clearing packetqueue");
+  std::unique_lock<std::mutex> lck(mutex);
+
+  while (!pktQueue.empty()) {
+    ZMPacket *packet = pktQueue.front();
+    // Someone might have this packet, but not for very long and since we have locked the queue they won't be able to get another one
+    ZMLockedPacket *lp = new ZMLockedPacket(packet);
+    lp->lock();
+    pktQueue.pop_front();
+    delete lp;
+    delete packet;
+  }
+
+  for (
+      std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
+      iterators_it != iterators.end();
+      ++iterators_it
+      ) {
+    packetqueue_iterator *iterator_it = *iterators_it;
+    *iterator_it = pktQueue.begin();
+  }  // end foreach iterator
+
+  if ( packet_counts ) delete[] packet_counts;
+  packet_counts = nullptr;
+  max_stream_id = -1;
+
+  condition.notify_all();
 }
 
 // clear queue keeping only specified duration of video -- return number of pkts removed
-unsigned int zm_packetqueue::clearQueue(struct timeval *duration, int streamId) {
+unsigned int PacketQueue::clear(struct timeval *duration, int streamId) {
 
-  if (pktQueue.empty()) {
+  if ( pktQueue.empty() ) {
     return 0;
   }
-  struct timeval keep_from;
-  std::list<ZMPacket *>::reverse_iterator it;
-  it = pktQueue.rbegin();
+  Debug(4, "Locking in clear");
+  std::unique_lock<std::mutex> lck(mutex);
 
-  timersub(&(*it)->timestamp, duration, &keep_from);
+  struct timeval keep_from;
+  std::list<ZMPacket *>::reverse_iterator it = pktQueue.rbegin();
+
+  struct timeval *t = (*it)->timestamp;
+  timersub(t, duration, &keep_from);
   ++it;
 
-  Debug(3, "Looking for frame before queue keep time with  stream id (%d), queue has %d packets",
+  Debug(3, "Looking for frame before queue keep time with stream id (%d), queue has %zu packets",
         streamId, pktQueue.size());
   for ( ; it != pktQueue.rend(); ++it) {
     ZMPacket *zm_packet = *it;
     AVPacket *av_packet = &(zm_packet->packet);
-    if (av_packet->stream_index == streamId
-        && timercmp( &zm_packet->timestamp, &keep_from, <= )) {
-        Debug(3, "Found frame before keep time with stream index %d at %d.%d",
-                 av_packet->stream_index,
-                 zm_packet->timestamp.tv_sec,
-                 zm_packet->timestamp.tv_usec);
+    if (
+        (av_packet->stream_index == streamId)
+        and
+        timercmp(zm_packet->timestamp, &keep_from, <=)
+        ) {
+      Debug(3, "Found frame before keep time with stream index %d at %" PRIi64 ".%" PRIi64,
+            av_packet->stream_index,
+            static_cast<int64>(zm_packet->timestamp->tv_sec),
+            static_cast<int64>(zm_packet->timestamp->tv_usec));
         break;
     }
   }
 
-  if (it == pktQueue.rend()) {
+  if ( it == pktQueue.rend() ) {
     Debug(1, "Didn't find a frame before queue preserve time. keeping all");
+    mutex.unlock();
     return 0;
   }
 
@@ -241,12 +500,15 @@ unsigned int zm_packetqueue::clearQueue(struct timeval *duration, int streamId)
   for ( ; it != pktQueue.rend(); ++it) {
     ZMPacket *zm_packet = *it;
     AVPacket *av_packet = &(zm_packet->packet);
-    if (av_packet->flags & AV_PKT_FLAG_KEY
-        && av_packet->stream_index == streamId) {
-      Debug(3, "Found keyframe before start with stream index %d at %d.%d",
-               av_packet->stream_index,
-               zm_packet->timestamp.tv_sec,
-               zm_packet->timestamp.tv_usec );
+    if (
+        (av_packet->flags & AV_PKT_FLAG_KEY)
+        and
+       (av_packet->stream_index == streamId)
+       ) {
+      Debug(3, "Found keyframe before start with stream index %d at %" PRIi64 ".%" PRIi64,
+            av_packet->stream_index,
+            static_cast<int64>(zm_packet->timestamp->tv_sec),
+            static_cast<int64>(zm_packet->timestamp->tv_usec));
       break;
     }
   }
@@ -257,142 +519,280 @@ unsigned int zm_packetqueue::clearQueue(struct timeval *duration, int streamId)
 
   unsigned int deleted_frames = 0;
   ZMPacket *zm_packet = nullptr;
-  while (distance(it, pktQueue.rend()) > 1) {
+  while ( distance(it, pktQueue.rend()) > 1 ) {
     zm_packet = pktQueue.front();
+    for (
+        std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
+        iterators_it != iterators.end();
+        ++iterators_it
+       ) {
+      packetqueue_iterator *iterator_it = *iterators_it;
+      // Have to check each iterator and make sure it doesn't point to the packet we are about to delete
+      if ( *(*iterator_it) == zm_packet ) {
+        Debug(4, "Bumping it because it is at the front that we are deleting");
+        ++(*iterators_it);
+      }
+    }  // end foreach iterator
     pktQueue.pop_front();
     packet_counts[zm_packet->packet.stream_index] -= 1;
     delete zm_packet;
     deleted_frames += 1;
   }
-  zm_packet = nullptr;
   Debug(3, "Deleted %d frames", deleted_frames);
-
   return deleted_frames;
 }
 
-unsigned int zm_packetqueue::size() {
+unsigned int PacketQueue::size() {
   return pktQueue.size();
 }
 
-int zm_packetqueue::packet_count( int stream_id ) {
+int PacketQueue::packet_count(int stream_id) {
+  if ( stream_id < 0 or stream_id > max_stream_id ) {
+    Error("Invalid stream_id %d max is %d", stream_id, max_stream_id);
+    return -1;
+  }
   return packet_counts[stream_id];
-} // end int zm_packetqueue::packet_count( int stream_id )
+}  // end int PacketQueue::packet_count(int stream_id)
 
-// Clear packets before the given timestamp.
-// Must also take into account pre_event_count frames
-void zm_packetqueue::clear_unwanted_packets(
-    timeval *recording_started,
-    int pre_event_count,
-    int mVideoStreamId) {
-  // Need to find the keyframe <= recording_started.  Can get rid of audio packets.
-	if ( pktQueue.empty() )
-		return;
 
-  // Step 1 - find frame <= recording_started.
-  // Step 2 - go back pre_event_count
-  // Step 3 - find a keyframe
-  // Step 4 - pop packets until we get to the packet in step 3
-  std::list<ZMPacket *>::reverse_iterator it;
+// Returns a packet. Packet will be locked
+ZMLockedPacket *PacketQueue::get_packet(packetqueue_iterator *it) {
+  if (deleting or zm_terminate)
+    return nullptr;
 
-  // Step 1 - find frame <= recording_started.
-  Debug(3, "Looking for frame before start (%d.%d) recording stream id (%d), queue has %d packets",
-      recording_started->tv_sec, recording_started->tv_usec, mVideoStreamId, pktQueue.size());
-  for ( it = pktQueue.rbegin(); it != pktQueue.rend(); ++ it ) {
-    ZMPacket *zm_packet = *it;
-    AVPacket *av_packet = &(zm_packet->packet);
-    if (
-        ( av_packet->stream_index == mVideoStreamId )
-        &&
-        timercmp( &(zm_packet->timestamp), recording_started, <= )
-       ) {
-    Debug(3, "Found frame before start with stream index %d at %d.%d",
-        av_packet->stream_index,
-        zm_packet->timestamp.tv_sec,
-        zm_packet->timestamp.tv_usec);
-      break;
+  Debug(4, "Locking in get_packet using it %p queue end? %d, packet %p",
+        std::addressof(*it), (*it == pktQueue.end()), *(*it));
+  std::unique_lock<std::mutex> lck(mutex);
+  Debug(4, "Have Lock in get_packet");
+
+  ZMLockedPacket *lp = nullptr;
+  while (!lp) {
+    while (*it == pktQueue.end()) {
+      if (deleting or zm_terminate) {
+        Debug(1, "terminated, leaving");
+        condition.notify_all();
+        return nullptr;
+      }
+      Debug(2, "waiting.  Queue size %zu it == end? %d", pktQueue.size(), (*it == pktQueue.end()));
+      condition.wait(lck);
     }
-    Debug(3, "Not Found frame before start with stream index %d at %d.%d",
-        av_packet->stream_index,
-        zm_packet->timestamp.tv_sec,
-        zm_packet->timestamp.tv_usec);
+    if (deleting or zm_terminate) {
+      Debug(1, "terminated, leaving");
+      condition.notify_all();
+      return nullptr;
+    }
+
+    ZMPacket *p = *(*it);
+    if (!p) {
+      Error("Null p?!");
+      return nullptr;
+    }
+    Debug(4, "get_packet using it %p locking index %d, packet %p",
+          std::addressof(*it), p->image_index, p);
+    // Packets are only deleted by packetqueue, so lock must be held.
+    // We shouldn't have to trylock. Someone else might hold the lock but not for long
+
+    lp = new ZMLockedPacket(p);
+    if (lp->trylock()) {
+      Debug(2, "Locked packet %d, unlocking packetqueue mutex", p->image_index);
+
+      return lp;
+    }
+    delete lp;
+    lp = nullptr;
+    Debug(2, "waiting.  Queue size %zu it == end? %d", pktQueue.size(), (*it == pktQueue.end()));
+    condition.wait(lck);
+  }  // end while !lp
+  return nullptr;
+}  // end ZMLockedPacket *PacketQueue::get_packet(it)
+
+void PacketQueue::unlock(ZMLockedPacket *lp) {
+  delete lp;
+  condition.notify_all();
+}
+
+bool PacketQueue::increment_it(packetqueue_iterator *it) {
+  Debug(2, "Incrementing %p, queue size %zu, end? %d", it, pktQueue.size(), ((*it) == pktQueue.end()));
+  if ((*it) == pktQueue.end() or deleting) {
+    return false;
+  }
+  std::unique_lock<std::mutex> lck(mutex);
+  ++(*it);
+  if (*it != pktQueue.end()) {
+    Debug(2, "Incrementing %p, %p still not at end, so returning true", it, std::addressof(*it));
+    return true;
+  }
+  Debug(2, "At end");
+  return false;
+}  // end bool PacketQueue::increment_it(packetqueue_iterator *it)
+
+// Increment it only considering packets for a given stream
+bool PacketQueue::increment_it(packetqueue_iterator *it, int stream_id) {
+  Debug(2, "Incrementing %p, queue size %zu, end? %d", it, pktQueue.size(), (*it == pktQueue.end()));
+  if ( *it == pktQueue.end() ) {
+    return false;
   }
 
-  if ( it == pktQueue.rend() ) {
-    Info("Didn't find a frame before event starttime. keeping all");
-    return;
-  }
+  std::unique_lock<std::mutex> lck(mutex);
+  do {
+    ++(*it);
+  } while ( (*it != pktQueue.end()) and ( (*(*it))->packet.stream_index != stream_id) );
 
-  Debug(1, "Seeking back %d frames", pre_event_count);
-  for ( ; pre_event_count && (it != pktQueue.rend()); ++ it ) {
-    ZMPacket *zm_packet = *it;
-    AVPacket *av_packet = &(zm_packet->packet);
-    if ( av_packet->stream_index == mVideoStreamId ) {
-      --pre_event_count;
+  if ( *it != pktQueue.end() ) {
+    Debug(2, "Incrementing %p, still not at end, so incrementing", it);
+    return true;
+  }
+  return false;
+}  // end bool PacketQueue::increment_it(packetqueue_iterator *it)
+
+packetqueue_iterator *PacketQueue::get_event_start_packet_it(
+    packetqueue_iterator snapshot_it,
+    unsigned int pre_event_count
+    ) {
+  std::unique_lock<std::mutex> lck(mutex);
+
+  packetqueue_iterator *it = new packetqueue_iterator;
+  iterators.push_back(it);
+
+  *it = snapshot_it;
+  ZMPacket *packet = *(*it);
+  ZM_DUMP_PACKET(packet->packet, "");
+  // Step one count back pre_event_count frames as the minimum
+  // Do not assume that snapshot_it is video
+  // snapshot it might already point to the beginning
+  if (pre_event_count) {
+    while ((*it) != pktQueue.begin()) {
+      packet = *(*it);
+      Debug(1, "Previous packet pre_event_count %d stream_index %d keyframe %d score %d",
+          pre_event_count, packet->packet.stream_index, packet->keyframe, packet->score);
+      ZM_DUMP_PACKET(packet->packet, "");
+      if (packet->packet.stream_index == video_stream_id) {
+        pre_event_count --;
+        if (!pre_event_count)
+          break;
+      }
+      (*it)--;
     }
   }
-
-  if ( it == pktQueue.rend() ) {
-    Debug(1, "ran out of pre_event frames before event starttime. keeping all");
-    return;
-  }
-
-  Debug(3, "Looking for keyframe");
-  for ( ; it != pktQueue.rend(); ++ it ) {
-    ZMPacket *zm_packet = *it;
-    AVPacket *av_packet = &(zm_packet->packet);
-    if ( 
-        ( av_packet->flags & AV_PKT_FLAG_KEY ) 
-        && 
-        ( av_packet->stream_index == mVideoStreamId )
-       ) {
-    Debug(3, "Found keyframe before start with stream index %d at %d.%d",
-        av_packet->stream_index,
-        zm_packet->timestamp.tv_sec,
-        zm_packet->timestamp.tv_usec );
-      break;
+  // it either points to beginning or we have seen pre_event_count video packets.
+  
+  packet = *(*it);
+  if (pre_event_count) {
+    if (packet->image_index < (int)pre_event_count) {
+      // probably just starting up
+      Debug(1, "Hit end of packetqueue before satisfying pre_event_count. Needed %d more video frames", pre_event_count);
+    } else {
+      Warning("Hit end of packetqueue before satisfying pre_event_count. Needed %d more video frames", pre_event_count);
     }
-  }
-  if ( it == pktQueue.rend() ) {
-    Debug(1, "Didn't find a keyframe before event starttime. keeping all" );
-    return;
+    ZM_DUMP_PACKET(packet->packet, "");
+    return it;
   }
 
-  ZMPacket *zm_packet = *it;
-  AVPacket *av_packet = &(zm_packet->packet);
-  Debug(3, "Found packet before start with stream index (%d) with keyframe (%d), distance(%d), size(%d)", 
-      av_packet->stream_index, 
-      ( av_packet->flags & AV_PKT_FLAG_KEY ), 
-      distance( it, pktQueue.rend() ),
-      pktQueue.size() );
-
-  unsigned int deleted_frames = 0;
-  ZMPacket *packet = nullptr;
-  while ( distance(it, pktQueue.rend()) > 1 ) {
-  //while ( pktQueue.rend() != it ) {
-    packet = pktQueue.front();
-    pktQueue.pop_front();
-    packet_counts[packet->packet.stream_index] -= 1;
-    delete packet;
-    deleted_frames += 1;
+  while ((*it) != pktQueue.begin()) {
+    packet = *(*it);
+    ZM_DUMP_PACKET(packet->packet, "No keyframe");
+    if ((packet->packet.stream_index == video_stream_id) and packet->keyframe)
+      return it; // Success
+    --(*it);
   }
-  packet = nullptr; // tidy up for valgrind
-
-  zm_packet = pktQueue.front();
-  av_packet = &(zm_packet->packet);
-  if ( ( ! ( av_packet->flags & AV_PKT_FLAG_KEY ) ) || ( av_packet->stream_index != mVideoStreamId ) ) {
-    Error( "Done looking for keyframe.  Deleted %d frames. Remaining frames in queue: %d stream of head packet is (%d), keyframe (%d), distance(%d), packets(%d)",
-        deleted_frames, pktQueue.size(), av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), distance( it, pktQueue.rend() ), pktQueue.size() );
-  } else {
-    Debug(1, "Done looking for keyframe.  Deleted %d frames. Remaining frames in queue: %d stream of head packet is (%d), keyframe (%d), distance(%d), packets(%d)",
-        deleted_frames, pktQueue.size(), av_packet->stream_index, ( av_packet->flags & AV_PKT_FLAG_KEY ), distance( it, pktQueue.rend() ), pktQueue.size() );
+  if (!(*(*it))->keyframe) {
+    Warning("Hit beginning of packetqueue and packet is not a keyframe. index is %d", packet->image_index);
   }
-} // end void zm_packetqueue::clear_unwanted_packets( timeval *recording_started, int mVideoStreamId )
+  return it;
+}  // end packetqueue_iterator *PacketQueue::get_event_start_packet_it
 
-void zm_packetqueue::dumpQueue() {
+void PacketQueue::dumpQueue() {
   std::list<ZMPacket *>::reverse_iterator it;
   for ( it = pktQueue.rbegin(); it != pktQueue.rend(); ++ it ) {
     ZMPacket *zm_packet = *it;
-    AVPacket *av_packet = &(zm_packet->packet);
-    dumpPacket(av_packet);
+    ZM_DUMP_PACKET(zm_packet->packet, "");
   }
 }
+
+/* Returns an iterator to the first video keyframe in the queue.
+ * nullptr if no keyframe video packet exists.
+ */
+packetqueue_iterator * PacketQueue::get_video_it(bool wait) {
+  packetqueue_iterator *it = new packetqueue_iterator;
+  iterators.push_back(it);
+
+  std::unique_lock<std::mutex> lck(mutex);
+  *it = pktQueue.begin();
+
+  if ( wait ) {
+    while ( ((! pktQueue.size()) or (*it == pktQueue.end())) and !zm_terminate and !deleting ) {
+      Debug(2, "waiting for packets in queue. Queue size %zu it == end? %d", pktQueue.size(), (*it == pktQueue.end()));
+      condition.wait(lck);
+      *it = pktQueue.begin();
+    }
+    if ( deleting or zm_terminate ) {
+      free_it(it);
+      delete it;
+      return nullptr;
+    }
+  }
+
+  while ( *it != pktQueue.end() ) {
+    ZMPacket *zm_packet = *(*it);
+    if (!zm_packet) {
+      Error("Null zmpacket in queue!?");
+      free_it(it);
+      return nullptr;
+    }
+    Debug(1, "Packet keyframe %d for stream %d, so returning the it to it",
+        zm_packet->keyframe, zm_packet->packet.stream_index);
+    if (zm_packet->keyframe and ( zm_packet->packet.stream_index == video_stream_id )) {
+      Debug(1, "Found a keyframe for stream %d, so returning the it to it", video_stream_id);
+      return it;
+    }
+    ++(*it);
+  }
+  Debug(1, "DIdn't Found a keyframe for stream %d, so returning the it to it", video_stream_id);
+  return it;
+}  // get video_it
+
+void PacketQueue::free_it(packetqueue_iterator *it) {
+  for (
+      std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
+      iterators_it != iterators.end();
+      ++iterators_it
+      ) {
+    if ( *iterators_it == it ) {
+      iterators.erase(iterators_it);
+      break;
+    }
+  }
+}
+
+bool PacketQueue::is_there_an_iterator_pointing_to_packet(ZMPacket *zm_packet) {
+  for (
+      std::list<packetqueue_iterator *>::iterator iterators_it = iterators.begin();
+      iterators_it != iterators.end();
+      ++iterators_it
+      ) {
+    packetqueue_iterator *iterator_it = *iterators_it;
+    if ( *iterator_it == pktQueue.end() ) {
+      continue;
+    }
+    Debug(4, "Checking iterator %p == packet ? %d", std::addressof(*iterator_it), ( *(*iterator_it) == zm_packet ));
+    // Have to check each iterator and make sure it doesn't point to the packet we are about to delete
+    if ( *(*iterator_it) == zm_packet ) {
+      return true;
+    }
+  }  // end foreach iterator
+  return false;
+}
+
+void PacketQueue::setMaxVideoPackets(int p) {
+  max_video_packet_count = p;
+  Debug(1, "Setting max_video_packet_count to %d", p);
+  if ( max_video_packet_count < 0 )
+    max_video_packet_count = 0 ;
+}
+void PacketQueue::setPreEventVideoPackets(int p) {
+  pre_event_video_packet_count = p;
+  Debug(1, "Setting pre_event_video_packet_count to %d", p);
+  if ( pre_event_video_packet_count < 1 )
+    pre_event_video_packet_count = 1;
+  // We can simplify a lot of logic in queuePacket if we can assume at least 1 packet in queue
+}
diff --git a/src/zm_packetqueue.h b/src/zm_packetqueue.h
index 31fe321cb..bc9932f24 100644
--- a/src/zm_packetqueue.h
+++ b/src/zm_packetqueue.h
@@ -16,41 +16,75 @@
 //You should have received a copy of the GNU General Public License
 //along with ZoneMinder.  If not, see <http://www.gnu.org/licenses/>.
 
-
 #ifndef ZM_PACKETQUEUE_H
 #define ZM_PACKETQUEUE_H
 
-//#include <boost/interprocess/managed_shared_memory.hpp>
-//#include <boost/interprocess/containers/map.hpp>
-//#include <boost/interprocess/allocators/allocator.hpp>
+#include <condition_variable>
 #include <list>
-#include "zm_packet.h"
+#include <mutex>
 
-extern "C" {
-#include <libavformat/avformat.h>
-}
-class zm_packetqueue {
-public:
-    zm_packetqueue(int max_stream_id);
-    virtual ~zm_packetqueue();
-    bool queuePacket(AVPacket* packet, struct timeval *timestamp);
-    bool queuePacket(ZMPacket* packet);
-    bool queuePacket(AVPacket* packet);
-    ZMPacket * popPacket();
-    bool popVideoPacket(ZMPacket* packet);
-    bool popAudioPacket(ZMPacket* packet);
-    unsigned int clearQueue(unsigned int video_frames_to_keep, int stream_id);
-    unsigned int clearQueue(struct timeval *duration, int streamid);
-    void clearQueue();
-    void dumpQueue();
-    unsigned int size();
-    void clear_unwanted_packets(timeval *recording, int pre_event_count, int mVideoStreamId);
-    int packet_count(int stream_id);
-private:
+class ZMPacket;
+class ZMLockedPacket;
+
+typedef std::list<ZMPacket *>::iterator packetqueue_iterator;
+
+class PacketQueue {
+  public: // For now just to ease development
     std::list<ZMPacket *>    pktQueue;
+    std::list<ZMPacket *>::iterator analysis_it;
+
+    int video_stream_id;
+    int max_video_packet_count; // allow a negative value to someday mean unlimited
+                                // This is now a hard limit on the # of video packets to keep in the queue so that we can limit ram
+    int pre_event_video_packet_count; // Was max_video_packet_count
     int max_stream_id;
     int *packet_counts;     /* packet count for each stream_id, to keep track of how many video vs audio packets are in the queue */
+    bool deleting;
+    bool keep_keyframes;
+    std::list<packetqueue_iterator *> iterators;
 
+    std::mutex mutex;
+    std::condition_variable condition;
+
+  public:
+    PacketQueue();
+    virtual ~PacketQueue();
+    std::list<ZMPacket *>::const_iterator end() const { return pktQueue.end(); }
+    std::list<ZMPacket *>::const_iterator begin() const { return pktQueue.begin(); }
+
+    int addStream();
+    void setMaxVideoPackets(int p);
+    void setPreEventVideoPackets(int p);
+    void setKeepKeyframes(bool k) { keep_keyframes = k; };
+
+    bool queuePacket(ZMPacket* packet);
+    ZMLockedPacket * popPacket();
+    bool popVideoPacket(ZMPacket* packet);
+    bool popAudioPacket(ZMPacket* packet);
+    unsigned int clear(unsigned int video_frames_to_keep, int stream_id);
+    unsigned int clear(struct timeval *duration, int streamid);
+    void clear();
+    void dumpQueue();
+    unsigned int size();
+    unsigned int get_packet_count(int stream_id) const { return packet_counts[stream_id]; };
+
+    void clear_unwanted_packets(timeval *recording, int pre_event_count, int mVideoStreamId);
+    void clearPackets(ZMPacket *);
+    int packet_count(int stream_id);
+
+    bool increment_it(packetqueue_iterator *it);
+    bool increment_it(packetqueue_iterator *it, int stream_id);
+    ZMLockedPacket *get_packet(packetqueue_iterator *);
+    packetqueue_iterator *get_video_it(bool wait);
+    packetqueue_iterator *get_stream_it(int stream_id);
+    void free_it(packetqueue_iterator *);
+
+    packetqueue_iterator *get_event_start_packet_it(
+        packetqueue_iterator snapshot_it,
+        unsigned int pre_event_count
+    );
+    bool is_there_an_iterator_pointing_to_packet(ZMPacket *zm_packet);
+    void unlock(ZMLockedPacket *lp);
 };
 
 #endif /* ZM_PACKETQUEUE_H */
diff --git a/src/zm_poly.cpp b/src/zm_poly.cpp
index 35319d6af..94f153b98 100644
--- a/src/zm_poly.cpp
+++ b/src/zm_poly.cpp
@@ -17,14 +17,9 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-#include "zm.h"
 #include "zm_poly.h"
 
-#ifndef SOLARIS
-#include <math.h>
-#else
 #include <cmath>
-#endif
 
 void Polygon::calcArea() {
   double float_area = 0.0L;
@@ -46,11 +41,10 @@ void Polygon::calcCentre() {
   }
   float_x /= (6*area);
   float_y /= (6*area);
-  //printf( "%.2f,%.2f\n", float_x, float_y );
   centre = Coord( (int)round(float_x), (int)round(float_y) );
 }
 
-Polygon::Polygon(int p_n_coords, const Coord *p_coords) : n_coords( p_n_coords ) {
+Polygon::Polygon(int p_n_coords, const Coord *p_coords) : n_coords(p_n_coords) {
   coords = new Coord[n_coords];
 
   int min_x = -1;
@@ -73,7 +67,7 @@ Polygon::Polygon(int p_n_coords, const Coord *p_coords) : n_coords( p_n_coords )
   calcCentre();
 }
 
-Polygon::Polygon( const Polygon &p_polygon ) :
+Polygon::Polygon(const Polygon &p_polygon) :
   n_coords(p_polygon.n_coords),
   extent(p_polygon.extent),
   area(p_polygon.area),
@@ -85,19 +79,20 @@ Polygon::Polygon( const Polygon &p_polygon ) :
   }
 }
 
-Polygon &Polygon::operator=( const Polygon &p_polygon ) {
-  if ( n_coords < p_polygon.n_coords ) {
-    delete[] coords;
-    coords = new Coord[p_polygon.n_coords];
-  }
+Polygon &Polygon::operator=(const Polygon &p_polygon) {
   n_coords = p_polygon.n_coords;
-  for ( int i = 0; i < n_coords; i++ ) {
-    coords[i] = p_polygon.coords[i];
+
+  Coord *new_coords = new Coord[n_coords];
+  for (int i = 0; i < n_coords; i++) {
+    new_coords[i] = p_polygon.coords[i];
   }
+  delete[] coords;
+  coords = new_coords;
+
   extent = p_polygon.extent;
   area = p_polygon.area;
   centre = p_polygon.centre;
-  return *this ;
+  return *this;
 }
 
 bool Polygon::isInside( const Coord &coord ) const {
diff --git a/src/zm_poly.h b/src/zm_poly.h
index 53eafcf84..21b7f14bb 100644
--- a/src/zm_poly.h
+++ b/src/zm_poly.h
@@ -20,11 +20,9 @@
 #ifndef ZM_POLY_H
 #define ZM_POLY_H
 
-#include "zm.h"
-#include "zm_coord.h"
 #include "zm_box.h"
 
-#include <math.h>
+class Coord;
 
 //
 // Class used for storing a box, which is defined as a region
@@ -74,8 +72,6 @@ protected:
   Box extent;
   int area;
   Coord centre;
-  Edge *edges;
-  Slice *slices;
 
 protected:
   void initialiseEdges();
@@ -83,7 +79,7 @@ protected:
   void calcCentre();
 
 public:
-  inline Polygon() : n_coords(0), coords(nullptr), area(0), edges(nullptr), slices(nullptr) {
+  inline Polygon() : n_coords(0), coords(nullptr), area(0) {
   }
   Polygon(int p_n_coords, const Coord *p_coords);
   Polygon(const Polygon &p_polygon);
@@ -100,9 +96,13 @@ public:
 
   inline const Box &Extent() const { return extent; }
   inline int LoX() const { return extent.LoX(); }
+  inline int LoX(int p_lo_x) { return extent.LoX(p_lo_x); }
   inline int HiX() const { return extent.HiX(); }
+  inline int HiX(int p_hi_x) { return extent.HiX(p_hi_x); }
   inline int LoY() const { return extent.LoY(); }
+  inline int LoY(int p_lo_y) { return extent.LoY(p_lo_y); }
   inline int HiY() const { return extent.HiY(); }
+  inline int HiY(int p_hi_y) { return extent.HiY(p_hi_y); }
   inline int Width() const { return extent.Width(); }
   inline int Height() const { return extent.Height(); }
 
diff --git a/src/zm_regexp.cpp b/src/zm_regexp.cpp
index fa3bc2de7..1541b31ef 100644
--- a/src/zm_regexp.cpp
+++ b/src/zm_regexp.cpp
@@ -15,13 +15,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/ 
+*/
 
-#include <string.h>
-
-#include "zm.h"
 #include "zm_regexp.h"
 
+#include "zm_logger.h"
+#include <cstring>
+
 #if HAVE_LIBPCRE
 
 RegExpr::RegExpr( const char *pattern, int flags, int p_max_matches ) : max_matches( p_max_matches ), match_buffers( nullptr ), match_lengths( nullptr ), match_valid( nullptr )
diff --git a/src/zm_regexp.h b/src/zm_regexp.h
index c859823d5..9c9ec5675 100644
--- a/src/zm_regexp.h
+++ b/src/zm_regexp.h
@@ -17,11 +17,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */  
 
-#include "zm.h"
-
 #ifndef ZM_REGEXP_H
 #define ZM_REGEXP_H
 
+#include "zm_config.h"
+
 #if HAVE_LIBPCRE
 
 #if HAVE_PCRE_H
@@ -51,7 +51,7 @@ protected:
   bool ok;
 
 public:
-  RegExpr( const char *pattern, int cflags=0, int p_max_matches=32 );
+  explicit RegExpr( const char *pattern, int cflags=0, int p_max_matches=32 );
   ~RegExpr();
   bool Ok() const { return( ok ); }
   int MatchCount() const { return( n_matches ); }
diff --git a/src/zm_remote_camera.cpp b/src/zm_remote_camera.cpp
index dce4daf5c..5e3dfefae 100644
--- a/src/zm_remote_camera.cpp
+++ b/src/zm_remote_camera.cpp
@@ -20,9 +20,12 @@
 #include "zm_remote_camera.h"
 
 #include "zm_utils.h"
+#include <arpa/inet.h>
+#include <netdb.h>
+#include <sys/socket.h>
 
 RemoteCamera::RemoteCamera(
-  unsigned int p_monitor_id,
+  const Monitor *monitor,
   const std::string &p_protocol,
   const std::string &p_host,
   const std::string &p_port,
@@ -37,7 +40,7 @@ RemoteCamera::RemoteCamera(
   bool p_capture,
   bool p_record_audio
  ) :
-    Camera( p_monitor_id, REMOTE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
+    Camera( monitor, REMOTE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
     protocol( p_protocol ),
     host( p_host ),
     port( p_port ),
@@ -80,7 +83,7 @@ void RemoteCamera::Initialise() {
   if ( authIndex != std::string::npos ) {
     auth = host.substr( 0, authIndex );
     host.erase( 0, authIndex+1 );
-    auth64 = base64Encode( auth );
+    auth64 = Base64Encode(auth);
 
     authIndex = auth.rfind( ':' );
     username = auth.substr(0,authIndex);
diff --git a/src/zm_remote_camera.h b/src/zm_remote_camera.h
index 63396df95..b4d9af3bc 100644
--- a/src/zm_remote_camera.h
+++ b/src/zm_remote_camera.h
@@ -22,12 +22,7 @@
 
 #include "zm_camera.h"
 #include "zm_rtsp_auth.h"
-
 #include <string>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <arpa/inet.h>
 
 #define SOCKET_BUF_SIZE 8192
 
@@ -57,7 +52,7 @@ protected:
 
 public:
   RemoteCamera(
-    unsigned int p_monitor_id,
+    const Monitor *monitor,
     const std::string &p_proto,
     const std::string &p_host,
     const std::string &p_port,
@@ -74,24 +69,23 @@ public:
   );
   virtual ~RemoteCamera();
 
-  const std::string &Protocol() const { return( protocol ); }
-  const std::string &Host() const { return( host ); }
-  const std::string &Port() const { return( port ); }
-  const std::string &Path() const { return( path ); }
-  const std::string &Auth() const { return( auth ); }
-  const std::string &Username() const { return( username ); }
-  const std::string &Password() const { return( password ); }
+  const std::string &Protocol() const { return protocol; }
+  const std::string &Host() const { return host; }
+  const std::string &Port() const { return port; }
+  const std::string &Path() const { return path; }
+  const std::string &Auth() const { return auth; }
+  const std::string &Username() const { return username; }
+  const std::string &Password() const { return password; }
 
   virtual void Initialise();
   virtual void Terminate() = 0;
   virtual int Connect() = 0;
   virtual int Disconnect() = 0;
-  virtual int PreCapture() { return 0; };
-  virtual int PrimeCapture() { return 0; };
-  virtual int Capture( Image &image ) = 0;
-  virtual int PostCapture() = 0;
-  virtual int CaptureAndRecord( Image &image, timeval recording, char* event_directory )=0;
-  int Read( int fd, char*buf, int size );
+  virtual int PreCapture() override { return 0; };
+  virtual int PrimeCapture() override { return 0; };
+  virtual int Capture(ZMPacket &p) override = 0;
+  virtual int PostCapture() override = 0;
+  int Read(int fd, char*buf, int size);
 };
 
 #endif // ZM_REMOTE_CAMERA_H
diff --git a/src/zm_remote_camera_http.cpp b/src/zm_remote_camera_http.cpp
index 50c19cc44..6eab03fb8 100644
--- a/src/zm_remote_camera_http.cpp
+++ b/src/zm_remote_camera_http.cpp
@@ -18,15 +18,16 @@
 // 
 
 #include "zm_remote_camera_http.h"
-#include "zm_rtsp_auth.h"
 
-#include "zm_mem_utils.h"
+#include "zm_monitor.h"
+#include "zm_packet.h"
 #include "zm_signal.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <errno.h>
+#include "zm_regexp.h"
+#include "zm_utils.h"
+#include <arpa/inet.h>
 #include <netdb.h>
+#include <sys/socket.h>
+#include <unistd.h>
 
 #ifdef SOLARIS
 #include <sys/filio.h> // FIONREAD and friends
@@ -44,7 +45,7 @@ static RegExpr *content_type_expr = nullptr;
 #endif
 
 RemoteCameraHttp::RemoteCameraHttp(
-  unsigned int p_monitor_id,
+  const Monitor *monitor,
   const std::string &p_method,
   const std::string &p_host,
   const std::string &p_port,
@@ -58,7 +59,7 @@ RemoteCameraHttp::RemoteCameraHttp(
   bool p_capture,
   bool p_record_audio ) :
   RemoteCamera(
-    p_monitor_id,
+    monitor,
     "http",
     p_host,
     p_port,
@@ -83,10 +84,11 @@ RemoteCameraHttp::RemoteCameraHttp(
   else if ( p_method == "regexp" ) {
     method = REGEXP;
   } else
-    Fatal( "Unrecognised method '%s' when creating HTTP camera %d", p_method.c_str(), monitor_id );
+    Fatal("Unrecognised method '%s' when creating HTTP camera %d", p_method.c_str(), monitor->Id());
   if ( capture ) {
     Initialise();
   }
+  mVideoStream = nullptr;
 }
 
 RemoteCameraHttp::~RemoteCameraHttp() {
@@ -103,7 +105,7 @@ void RemoteCameraHttp::Initialise() {
     request += stringtf( "User-Agent: %s/%s\r\n", config.http_ua, ZM_VERSION );
     request += stringtf( "Host: %s\r\n", host.c_str());
     if ( strcmp( config.http_version, "1.0" ) == 0 )
-      request += stringtf( "Connection: Keep-Alive\r\n" );
+      request += "Connection: Keep-Alive\r\n";
     if ( !auth.empty() )
       request += stringtf( "Authorization: Basic %s\r\n", auth64.c_str() );
     request += "\r\n";
@@ -157,7 +159,7 @@ int RemoteCameraHttp::Connect() {
       addr = (struct sockaddr_in *)p->ai_addr; 
       inet_ntop( AF_INET, &(addr->sin_addr), buf, INET6_ADDRSTRLEN );
 
-      Warning("Can't connect to remote camera mid: %d at %s: %s", monitor_id, buf, strerror(errno) );
+      Warning("Can't connect to remote camera mid: %d at %s: %s", monitor->Id(), buf, strerror(errno));
       continue;
     }
 
@@ -200,7 +202,7 @@ int RemoteCameraHttp::SendRequest() {
  * > 0 is the # of bytes read.
  */
 
-int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) {
+int RemoteCameraHttp::ReadData(Buffer &buffer, unsigned int bytes_expected) {
   fd_set rfds;
   FD_ZERO(&rfds);
   FD_SET(sd, &rfds);
@@ -208,44 +210,49 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) {
   struct timeval temp_timeout = timeout;
 
   int n_found = select(sd+1, &rfds, nullptr, nullptr, &temp_timeout);
-  if( n_found == 0 ) {
-    Debug( 1, "Select timed out timeout was %d secs %d usecs", temp_timeout.tv_sec, temp_timeout.tv_usec );
+  if (n_found == 0) {
+    Debug(1, "Select timed out timeout was %" PRIi64 " secs %" PRIi64" usecs",
+          static_cast<int64>(temp_timeout.tv_sec),
+          static_cast<int64>(temp_timeout.tv_usec));
     int error = 0;
-    socklen_t len = sizeof (error);
-    int retval = getsockopt (sd, SOL_SOCKET, SO_ERROR, &error, &len);
-    if(retval != 0 ) {
-      Debug( 1, "error getting socket error code %s", strerror(retval) );
+    socklen_t len = sizeof(error);
+    int retval = getsockopt(sd, SOL_SOCKET, SO_ERROR, &error, &len);
+    if (retval != 0) {
+      Debug(1, "error getting socket error code %s", strerror(retval));
     }
-    if (error != 0 ) {
+    if (error != 0) {
       return -1;
     }
     // Why are we disconnecting?  It's just a timeout, meaning that data wasn't available.
     //Disconnect();
     return 0;
-  } else if ( n_found < 0) {
+  } else if (n_found == EINTR) {
+    Error("Select interrupted");
+    return 0;
+  } else if (n_found < 0) {
     Error("Select error: %s", strerror(errno));
     return -1;
   }
 
   unsigned int total_bytes_to_read = 0;
 
-  if ( bytes_expected ) {
+  if (bytes_expected) {
     total_bytes_to_read = bytes_expected;
   } else {
-    if ( ioctl( sd, FIONREAD, &total_bytes_to_read ) < 0 ) {
-      Error( "Can't ioctl(): %s", strerror(errno) );
+    if (ioctl(sd, FIONREAD, &total_bytes_to_read) < 0) {
+      Error("Can't ioctl(): %s", strerror(errno) );
       return -1;
     }
 
-    if ( total_bytes_to_read == 0 ) {
-      if ( mode == SINGLE_IMAGE ) {
+    if (total_bytes_to_read == 0) {
+      if (mode == SINGLE_IMAGE) {
         int error = 0;
-        socklen_t len = sizeof (error);
-        int retval = getsockopt( sd, SOL_SOCKET, SO_ERROR, &error, &len );
-        if ( retval != 0 ) {
-          Debug( 1, "error getting socket error code %s", strerror(retval) );
+        socklen_t len = sizeof(error);
+        int retval = getsockopt(sd, SOL_SOCKET, SO_ERROR, &error, &len);
+        if (retval != 0) {
+          Debug(1, "error getting socket error code %s", strerror(retval));
         }
-        if ( error != 0 ) {
+        if (error != 0) {
           return -1;
         }
         // Case where we are grabbing a single jpg, but no content-length was given, so the expectation is that we read until close.
@@ -259,44 +266,44 @@ int RemoteCameraHttp::ReadData( Buffer &buffer, unsigned int bytes_expected ) {
     }
 
     // There can be lots of bytes available.  I've seen 4MB or more. This will vastly inflate our buffer size unnecessarily.
-    if ( total_bytes_to_read > ZM_NETWORK_BUFSIZ ) {
+    if (total_bytes_to_read > ZM_NETWORK_BUFSIZ) {
       total_bytes_to_read = ZM_NETWORK_BUFSIZ;
-      Debug(3, "Just getting 32K" );
+      Debug(4, "Just getting 32K");
     } else {
-      Debug(3, "Just getting %d", total_bytes_to_read );
+      Debug(4, "Just getting %d", total_bytes_to_read);
     }
   } // end if bytes_expected or not
-  Debug( 3, "Expecting %d bytes", total_bytes_to_read );
+  Debug(4, "Expecting %d bytes", total_bytes_to_read);
 
   int total_bytes_read = 0;
   do {
-    int bytes_read = buffer.read_into( sd, total_bytes_to_read );
-    if ( bytes_read < 0 ) {
-      Error( "Read error: %s", strerror(errno) );
-      return( -1 );
-    } else if ( bytes_read == 0 ) {
-      Debug( 2, "Socket closed" );
+    int bytes_read = buffer.read_into(sd, total_bytes_to_read);
+    if (bytes_read < 0) {
+      Error("Read error: %s", strerror(errno));
+      return -1;
+    } else if (bytes_read == 0) {
+      Debug(2, "Socket closed");
       //Disconnect(); // Disconnect is done outside of ReadData now.
-      return( -1 );
-    } else if ( (unsigned int)bytes_read < total_bytes_to_read ) {
-      Error( "Incomplete read, expected %d, got %d", total_bytes_to_read, bytes_read );
-      return( -1 );
+      return -1;
+    } else if ((unsigned int)bytes_read < total_bytes_to_read) {
+      Debug(1, "Incomplete read, expected %d, got %d", total_bytes_to_read, bytes_read);
+    } else {
+      Debug(3, "Read %d bytes", bytes_read);
     }
-    Debug( 3, "Read %d bytes", bytes_read );
     total_bytes_read += bytes_read;
     total_bytes_to_read -= bytes_read;
-  } while ( total_bytes_to_read );
+  } while (total_bytes_to_read);
 
-  Debug(4, buffer);
+  Debug(4, "buffer size: %d", static_cast<int>(buffer));
 
   return total_bytes_read;
-}
+}  // end readData
 
 int RemoteCameraHttp::GetData() {
 	time_t start_time = time(nullptr);
 	int buffer_len = 0;
-	while ( !( buffer_len = ReadData(buffer) ) ) {
-			if ( zm_terminate ||  ( start_time - time(nullptr) < ZM_WATCH_MAX_DELAY ))
+	while (!(buffer_len = ReadData(buffer))) {
+			if (zm_terminate or ( (time(nullptr) - start_time) > ZM_WATCH_MAX_DELAY ))
 				return -1;
 		Debug(4, "Timeout waiting for REGEXP HEADER");
 		usleep(100000);
@@ -305,7 +312,6 @@ int RemoteCameraHttp::GetData() {
 }
 
 int RemoteCameraHttp::GetResponse() {
-  int buffer_len;
 #if HAVE_LIBPCRE
   if ( method == REGEXP ) {
     const char *header = nullptr;
@@ -326,7 +332,7 @@ int RemoteCameraHttp::GetResponse() {
       switch( state ) {
         case HEADER :
           {
-						buffer_len = GetData();
+						int buffer_len = GetData();
             if ( buffer_len < 0 ) {
               Error("Unable to read header data");
               return -1;
@@ -337,8 +343,7 @@ int RemoteCameraHttp::GetResponse() {
               header_len = header_expr->MatchLength( 1 );
               Debug(4, "Captured header (%d bytes):\n'%s'", header_len, header);
 
-              if ( status_expr->Match( header, header_len ) < 4 )
-              {
+              if ( status_expr->Match( header, header_len ) < 4 ) {
                 Error( "Unable to extract HTTP status from header" );
                 return( -1 );
               }
@@ -361,7 +366,7 @@ int RemoteCameraHttp::GetResponse() {
                   request += stringtf( "User-Agent: %s/%s\r\n", config.http_ua, ZM_VERSION );
                   request += stringtf( "Host: %s\r\n", host.c_str());
                   if ( strcmp( config.http_version, "1.0" ) == 0 )
-                    request += stringtf( "Connection: Keep-Alive\r\n" );
+                    request += "Connection: Keep-Alive\r\n";
                   request += mAuthenticator->getAuthHeader( "GET", path.c_str() );
                   request += "\r\n";
 
@@ -375,451 +380,25 @@ int RemoteCameraHttp::GetResponse() {
               }
               Debug( 3, "Got status '%d' (%s), http version %s", status_code, status_mesg, http_version );
 
-              if ( connection_expr->Match( header, header_len ) == 2 )
-              {
+              if ( connection_expr->Match( header, header_len ) == 2 ) {
                 connection_type = connection_expr->MatchString( 1 );
                 Debug( 3, "Got connection '%s'", connection_type );
               }
 
-              if ( content_length_expr->Match( header, header_len ) == 2 )
-              {
+              if ( content_length_expr->Match( header, header_len ) == 2 ) {
                 content_length = atoi( content_length_expr->MatchString( 1 ) );
                 Debug( 3, "Got content length '%d'", content_length );
               }
 
-              if ( content_type_expr->Match( header, header_len ) >= 2 )
-              {
+              if ( content_type_expr->Match( header, header_len ) >= 2 ) {
                 content_type = content_type_expr->MatchString( 1 );
                 Debug( 3, "Got content type '%s'\n", content_type );
-                if ( content_type_expr->MatchCount() > 2 )
-                {
+                if ( content_type_expr->MatchCount() > 2 ) {
                   content_boundary = content_type_expr->MatchString( 2 );
                   Debug( 3, "Got content boundary '%s'", content_boundary );
                 }
               }
 
-              if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) )
-              {
-                // Single image
-                mode = SINGLE_IMAGE;
-                format = JPEG;
-                state = CONTENT;
-              }
-              else if ( !strcasecmp( content_type, "image/x-rgb" ) )
-              {
-                // Single image
-                mode = SINGLE_IMAGE;
-                format = X_RGB;
-                state = CONTENT;
-              }
-              else if ( !strcasecmp( content_type, "image/x-rgbz" ) )
-              {
-                // Single image
-                mode = SINGLE_IMAGE;
-                format = X_RGBZ;
-                state = CONTENT;
-              }
-              else if ( !strcasecmp( content_type, "multipart/x-mixed-replace" ) )
-              {
-                // Image stream, so start processing
-                if ( !content_boundary[0] )
-                {
-                  Error( "No content boundary found in header '%s'", header );
-                  return( -1 );
-                }
-                mode = MULTI_IMAGE;
-                state = SUBHEADER;
-              }
-              //else if ( !strcasecmp( content_type, "video/mpeg" ) || !strcasecmp( content_type, "video/mpg" ) )
-              //{
-              //// MPEG stream, coming soon!
-              //}
-              else
-              {
-                Error( "Unrecognised content type '%s'", content_type );
-                return( -1 );
-              }
-              buffer.consume( header_len );
-            }
-            else
-            {
-              Debug( 3, "Unable to extract header from stream, retrying" );
-              //return( -1 );
-            }
-            break;
-          }
-        case SUBHEADER :
-          {
-            static RegExpr *subheader_expr = nullptr;
-            static RegExpr *subcontent_length_expr = nullptr;
-            static RegExpr *subcontent_type_expr = nullptr;
-
-            if ( !subheader_expr )
-            {
-              char subheader_pattern[256] = "";
-              snprintf( subheader_pattern, sizeof(subheader_pattern), "^((?:\r?\n){0,2}?(?:--)?%s\r?\n.+?\r?\n\r?\n)", content_boundary );
-              subheader_expr = new RegExpr( subheader_pattern, PCRE_DOTALL );
-            }
-            if ( subheader_expr->Match( (char *)buffer, (int)buffer ) == 2 )
-            {
-              subheader = subheader_expr->MatchString( 1 );
-              subheader_len = subheader_expr->MatchLength( 1 );
-              Debug( 4, "Captured subheader (%d bytes):'%s'", subheader_len, subheader );
-
-              if ( !subcontent_length_expr )
-                subcontent_length_expr = new RegExpr( "Content-length: ?([0-9]+)\r?\n", PCRE_CASELESS );
-              if ( subcontent_length_expr->Match( subheader, subheader_len ) == 2 )
-              {
-                content_length = atoi( subcontent_length_expr->MatchString( 1 ) );
-                Debug( 3, "Got subcontent length '%d'", content_length );
-              }
-
-              if ( !subcontent_type_expr )
-                subcontent_type_expr = new RegExpr( "Content-type: ?(.+?)\r?\n", PCRE_CASELESS );
-              if ( subcontent_type_expr->Match( subheader, subheader_len ) == 2 )
-              {
-                content_type = subcontent_type_expr->MatchString( 1 );
-                Debug( 3, "Got subcontent type '%s'", content_type );
-              }
-
-              buffer.consume( subheader_len );
-              state = CONTENT;
-            }
-            else
-            {
-              Debug( 3, "Unable to extract subheader from stream, retrying" );
-							buffer_len = GetData();
-              if ( buffer_len < 0 ) {
-                Error( "Unable to extract subheader data" );
-                return( -1 );
-              }
-							bytes += buffer_len;
-            }
-            break;
-          }
-        case CONTENT :
-          {
-
-            // if content_type is something like image/jpeg;size=, this will strip the ;size=
-            char * semicolon = strchr( (char *)content_type, ';' );
-            if ( semicolon ) {
-              *semicolon = '\0';
-            }
-
-            if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) )
-            {
-              format = JPEG;
-            }
-            else if ( !strcasecmp( content_type, "image/x-rgb" ) )
-            {
-              format = X_RGB;
-            }
-            else if ( !strcasecmp( content_type, "image/x-rgbz" ) )
-            {
-              format = X_RGBZ;
-            }
-            else
-            {
-              Error( "Found unsupported content type '%s'", content_type );
-              return( -1 );
-            }
-
-            if ( content_length )
-            {
-              while ( ((long)buffer.size() < content_length ) && ! zm_terminate )
-              {
-                Debug(3, "Need more data buffer %d < content length %d", buffer.size(), content_length );
-								int bytes_read = GetData();
-
-                if ( bytes_read < 0 ) {
-                  Error( "Unable to read content" );
-                  return( -1 );
-                }
-								bytes += bytes_read;
-              }
-              Debug( 3, "Got end of image by length, content-length = %d", content_length );
-            }
-            else
-            {
-              while ( !content_length )
-              {
-								buffer_len = GetData();
-                if ( buffer_len < 0 ) {
-                  Error( "Unable to read content" );
-                  return( -1 );
-                }
-								bytes += buffer_len;
-                static RegExpr *content_expr = 0;
-                if ( mode == MULTI_IMAGE )
-                {
-                  if ( !content_expr )
-                  {
-                    char content_pattern[256] = "";
-                    snprintf( content_pattern, sizeof(content_pattern), "^(.+?)(?:\r?\n)*(?:--)?%s\r?\n", content_boundary );
-                    content_expr = new RegExpr( content_pattern, PCRE_DOTALL );
-                  }
-                  if ( content_expr->Match( buffer, buffer.size() ) == 2 )
-                  {
-                    content_length = content_expr->MatchLength( 1 );
-                    Debug( 3, "Got end of image by pattern, content-length = %d", content_length );
-                  }
-                }
-              }
-            }
-            if ( mode == SINGLE_IMAGE ) {
-              state = HEADER;
-              Disconnect();
-            } else {
-              state = SUBHEADER;
-            }
-            Debug( 3, "Returning %d (%d) bytes of captured content", content_length, buffer.size() );
-            return content_length;
-          }
-        case HEADERCONT :
-        case SUBHEADERCONT :
-          {
-            // Ignore
-            break;
-          }
-      }
-    }
-  } else
-#endif // HAVE_LIBPCRE
-  {
-    static const char *http_match = "HTTP/";
-    static const char *connection_match = "Connection:";
-    static const char *content_length_match = "Content-length:";
-    static const char *content_type_match = "Content-type:";
-    static const char *boundary_match = "boundary=";
-    static const char *authenticate_match = "WWW-Authenticate:";
-    static int http_match_len = 0;
-    static int connection_match_len = 0;
-    static int content_length_match_len = 0;
-    static int content_type_match_len = 0;
-    static int boundary_match_len = 0;
-    static int authenticate_match_len = 0;
-
-    if ( !http_match_len )
-      http_match_len = strlen( http_match );
-    if ( !connection_match_len )
-      connection_match_len = strlen( connection_match );
-    if ( !content_length_match_len )
-      content_length_match_len = strlen( content_length_match );
-    if ( !content_type_match_len )
-      content_type_match_len = strlen( content_type_match );
-    if ( !boundary_match_len )
-      boundary_match_len = strlen( boundary_match );
-    if ( !authenticate_match_len )
-      authenticate_match_len = strlen( authenticate_match );
-
-    static int n_headers;
-    //static char *headers[32];
-
-    static int n_subheaders;
-    //static char *subheaders[32];
-
-    static char *http_header;
-    static char *connection_header;
-    static char *content_length_header;
-    static char *content_type_header;
-    static char *boundary_header;
-    static char *authenticate_header;
-    static char subcontent_length_header[33];
-    static char subcontent_type_header[65];
-
-    static char http_version[16];
-    static char status_code[16];
-    static char status_mesg[256];
-    static char connection_type[32];
-    static int content_length;
-    static char content_type[32];
-    static char content_boundary[64];
-    static int content_boundary_len;
-
-    while ( !zm_terminate ) {
-      switch( state ) {
-        case HEADER :
-          {
-            n_headers = 0;
-            http_header = nullptr;
-            connection_header = nullptr;
-            content_length_header = nullptr;
-            content_type_header = nullptr;
-            authenticate_header = nullptr;
-
-            http_version[0] = '\0';
-            status_code [0]= '\0';
-            status_mesg [0]= '\0';
-            connection_type [0]= '\0';
-            content_length = 0;
-            content_type[0] = '\0';
-            content_boundary[0] = '\0';
-            content_boundary_len = 0;
-          }
-        case HEADERCONT :
-          {
-						buffer_len = GetData();
-            if ( buffer_len < 0 ) {
-              Error("Unable to read header");
-              return -1;
-            }
-						bytes += buffer_len;
-
-            char *crlf = nullptr;
-            char *header_ptr = (char *)buffer;
-            int header_len = buffer.size();
-            bool all_headers = false;
-
-            while( true ) {
-              int crlf_len = memspn(header_ptr, "\r\n", header_len);
-              if ( n_headers ) {
-                if ( (crlf_len == 2 && !strncmp( header_ptr, "\n\n", crlf_len )) || (crlf_len == 4 && !strncmp( header_ptr, "\r\n\r\n", crlf_len )) ) {
-									Debug(3, "Have double linefeed, done headers");
-                  *header_ptr = '\0';
-                  header_ptr += crlf_len;
-                  header_len -= buffer.consume( header_ptr-(char *)buffer );
-                  all_headers = true;
-                  break;
-                }
-              }
-              if ( crlf_len ) {
-                if ( header_len == crlf_len ) {
-                  break;
-                } else {
-                  *header_ptr = '\0';
-                  header_ptr += crlf_len;
-                  header_len -= buffer.consume( header_ptr-(char *)buffer );
-                }
-              }
-
-              Debug( 6, "%s", header_ptr );
-              if ( (crlf = mempbrk( header_ptr, "\r\n", header_len )) ) {
-                //headers[n_headers++] = header_ptr;
-                n_headers++;
-
-                if ( !http_header && (strncasecmp( header_ptr, http_match, http_match_len ) == 0) ) {
-                  http_header = header_ptr+http_match_len;
-                  Debug( 6, "Got http header '%s'", header_ptr );
-                } else if ( !connection_header && (strncasecmp( header_ptr, connection_match, connection_match_len) == 0) ) {
-                  connection_header = header_ptr+connection_match_len;
-                  Debug( 6, "Got connection header '%s'", header_ptr );
-                } else if ( !content_length_header && (strncasecmp( header_ptr, content_length_match, content_length_match_len) == 0) ) {
-                  content_length_header = header_ptr+content_length_match_len;
-                  Debug( 6, "Got content length header '%s'", header_ptr );
-                } else if ( !authenticate_header && (strncasecmp( header_ptr, authenticate_match, authenticate_match_len) == 0) ) {
-                  authenticate_header = header_ptr;
-                  Debug( 6, "Got authenticate header '%s'", header_ptr );
-                } else if ( !content_type_header && (strncasecmp( header_ptr, content_type_match, content_type_match_len) == 0) ) {
-                  content_type_header = header_ptr+content_type_match_len;
-                  Debug( 6, "Got content type header '%s'", header_ptr );
-                } else {
-                  Debug( 6, "Got ignored header '%s'", header_ptr );
-                }
-                header_ptr = crlf;
-                header_len -= buffer.consume( header_ptr-(char *)buffer );
-              } else {
-                // No end of line found
-                break;
-              }
-            } // end while search for headers
-
-            if ( all_headers ) {
-              char *start_ptr, *end_ptr;
-
-              if ( !http_header ) {
-                Error( "Unable to extract HTTP status from header" );
-                return( -1 );
-              }
-
-              start_ptr = http_header;
-              end_ptr = start_ptr+strspn( start_ptr, "10." );
-
-              // FIXME Why are we memsetting every time?  Can we not do it once?
-              memset( http_version, 0, sizeof(http_version) );
-              strncpy( http_version, start_ptr, end_ptr-start_ptr );
-
-              start_ptr = end_ptr;
-              start_ptr += strspn( start_ptr, " " );
-              end_ptr = start_ptr+strspn( start_ptr, "0123456789" );
-
-              memset( status_code, 0, sizeof(status_code) );
-              strncpy( status_code, start_ptr, end_ptr-start_ptr );
-              int status = atoi( status_code );
-
-              start_ptr = end_ptr;
-              start_ptr += strspn( start_ptr, " " );
-              strcpy( status_mesg, start_ptr );
-
-              if ( status == 401 ) {
-                if ( mNeedAuth ) {
-                  Error( "Failed authentication: " );
-                  return( -1 );
-                }
-                if ( ! authenticate_header ) {
-                  Error( "Failed authentication, but don't have an authentication header: " );
-                  return( -1 );
-                }
-                mNeedAuth = true;
-                std::string Header = authenticate_header;
-                Debug(2, "Checking for digest auth in %s", authenticate_header );
-
-                mAuthenticator->checkAuthResponse(Header);
-                if ( mAuthenticator->auth_method() == zm::AUTH_DIGEST ) {
-                  Debug( 2, "Need Digest Authentication" );
-                  request = stringtf( "GET %s HTTP/%s\r\n", path.c_str(), config.http_version );
-                  request += stringtf( "User-Agent: %s/%s\r\n", config.http_ua, ZM_VERSION );
-                  request += stringtf( "Host: %s\r\n", host.c_str());
-                  if ( strcmp( config.http_version, "1.0" ) == 0 )
-                    request += stringtf( "Connection: Keep-Alive\r\n" );
-                  request += mAuthenticator->getAuthHeader( "GET", path.c_str() );
-                  request += "\r\n";
-
-                  Debug( 2, "New request header: %s", request.c_str() );
-                  return( 0 );
-                } else {
-                  Debug( 2, "Need some other kind of Authentication" );
-                }
-              } else if ( status < 200 || status > 299 ) {
-                Error( "Invalid response status %s: %s", status_code, status_mesg );
-                return( -1 );
-              }
-              Debug( 3, "Got status '%d' (%s), http version %s", status, status_mesg, http_version );
-
-              if ( connection_header ) {
-                memset( connection_type, 0, sizeof(connection_type) );
-                start_ptr = connection_header + strspn( connection_header, " " );
-                // FIXME Should we not use strncpy?
-                strcpy( connection_type, start_ptr );
-                Debug( 3, "Got connection '%s'", connection_type );
-              }
-              if ( content_length_header ) {
-                start_ptr = content_length_header + strspn( content_length_header, " " );
-                content_length = atoi( start_ptr );
-                Debug( 3, "Got content length '%d'", content_length );
-              }
-              if ( content_type_header ) {
-                memset( content_type, 0, sizeof(content_type) );
-                start_ptr = content_type_header + strspn( content_type_header, " " );
-                if ( (end_ptr = strchr( start_ptr, ';' )) ) {
-                  strncpy( content_type, start_ptr, end_ptr-start_ptr );
-                  Debug( 3, "Got content type '%s'", content_type );
-
-                  start_ptr = end_ptr + strspn( end_ptr, "; " );
-
-                  if ( strncasecmp( start_ptr, boundary_match, boundary_match_len ) == 0 ) {
-                    start_ptr += boundary_match_len;
-                    start_ptr += strspn( start_ptr, "-" );
-                    content_boundary_len = sprintf( content_boundary, "--%s", start_ptr );
-                    Debug( 3, "Got content boundary '%s'", content_boundary );
-                  } else {
-                    Error( "No content boundary found in header '%s'", content_type_header );
-                  }
-                } else {
-                  strcpy( content_type, start_ptr );
-                  Debug( 3, "Got content type '%s'", content_type );
-                }
-              } // end if content_type_header
-
               if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) ) {
                 // Single image
                 mode = SINGLE_IMAGE;
@@ -838,7 +417,7 @@ int RemoteCameraHttp::GetResponse() {
               } else if ( !strcasecmp( content_type, "multipart/x-mixed-replace" ) ) {
                 // Image stream, so start processing
                 if ( !content_boundary[0] ) {
-                  Error( "No content boundary found in header '%s'", content_type_header );
+                  Error( "No content boundary found in header '%s'", header );
                   return( -1 );
                 }
                 mode = MULTI_IMAGE;
@@ -849,8 +428,396 @@ int RemoteCameraHttp::GetResponse() {
               //// MPEG stream, coming soon!
               //}
               else {
-                Error( "Unrecognised content type '%s'", content_type );
+                Error("Unrecognised content type '%s'", content_type);
+                return -1;
+              }
+              buffer.consume(header_len);
+            } else {
+              Debug(3, "Unable to extract header from stream, retrying");
+              //return( -1 );
+            }
+            break;
+          }
+        case SUBHEADER :
+          {
+            static RegExpr *subheader_expr = nullptr;
+            static RegExpr *subcontent_length_expr = nullptr;
+            static RegExpr *subcontent_type_expr = nullptr;
+
+            if ( !subheader_expr ) {
+              char subheader_pattern[256] = "";
+              snprintf( subheader_pattern, sizeof(subheader_pattern), "^((?:\r?\n){0,2}?(?:--)?%s\r?\n.+?\r?\n\r?\n)", content_boundary );
+              subheader_expr = new RegExpr( subheader_pattern, PCRE_DOTALL );
+            }
+            if ( subheader_expr->Match( (char *)buffer, (int)buffer ) == 2 ) {
+              subheader = subheader_expr->MatchString( 1 );
+              subheader_len = subheader_expr->MatchLength( 1 );
+              Debug( 4, "Captured subheader (%d bytes):'%s'", subheader_len, subheader );
+
+              if ( !subcontent_length_expr )
+                subcontent_length_expr = new RegExpr( "Content-length: ?([0-9]+)\r?\n", PCRE_CASELESS );
+              if ( subcontent_length_expr->Match( subheader, subheader_len ) == 2 ) {
+                content_length = atoi( subcontent_length_expr->MatchString( 1 ) );
+                Debug( 3, "Got subcontent length '%d'", content_length );
+              }
+
+              if ( !subcontent_type_expr )
+                subcontent_type_expr = new RegExpr( "Content-type: ?(.+?)\r?\n", PCRE_CASELESS );
+              if ( subcontent_type_expr->Match( subheader, subheader_len ) == 2 ) {
+                content_type = subcontent_type_expr->MatchString( 1 );
+                Debug( 3, "Got subcontent type '%s'", content_type );
+              }
+
+              buffer.consume( subheader_len );
+              state = CONTENT;
+            } else {
+              Debug( 3, "Unable to extract subheader from stream, retrying" );
+							int buffer_len = GetData();
+              if ( buffer_len < 0 ) {
+                Error( "Unable to extract subheader data" );
                 return( -1 );
+              }
+							bytes += buffer_len;
+            }
+            break;
+          }
+        case CONTENT :
+          {
+
+            // if content_type is something like image/jpeg;size=, this will strip the ;size=
+            char * semicolon = strchr( (char *)content_type, ';' );
+            if ( semicolon ) {
+              *semicolon = '\0';
+            }
+
+            if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) ) {
+              format = JPEG;
+            } else if ( !strcasecmp( content_type, "image/x-rgb" ) ) {
+              format = X_RGB;
+            } else if ( !strcasecmp( content_type, "image/x-rgbz" ) ) {
+              format = X_RGBZ;
+            } else {
+              Error( "Found unsupported content type '%s'", content_type );
+              return( -1 );
+            }
+
+            if (content_length) {
+              while (((long)buffer.size() < content_length ) and !zm_terminate) {
+                Debug(3, "Need more data buffer %d < content length %d", buffer.size(), content_length);
+								int bytes_read = ReadData(buffer, content_length - buffer.size());
+
+                if (bytes_read < 0) {
+                  Error("Unable to read content");
+                  return -1;
+                }
+								bytes += bytes_read;
+              }
+              Debug(3, "Got end of image by length, content-length = %d", content_length);
+            } else {
+              while (!content_length) {
+								int buffer_len = GetData();
+                if (buffer_len < 0) {
+                  Error("Unable to read content");
+                  return -1;
+                }
+								bytes += buffer_len;
+                static RegExpr *content_expr = 0;
+                if (mode == MULTI_IMAGE) {
+                  if (!content_expr) {
+                    char content_pattern[256] = "";
+                    snprintf(content_pattern, sizeof(content_pattern), "^(.+?)(?:\r?\n)*(?:--)?%s\r?\n", content_boundary);
+                    content_expr = new RegExpr(content_pattern, PCRE_DOTALL);
+                  }
+                  if (content_expr->Match( buffer, buffer.size()) == 2) {
+                    content_length = content_expr->MatchLength( 1 );
+                    Debug(3, "Got end of image by pattern, content-length = %d", content_length);
+                  }
+                }
+              }
+            }
+            if ( mode == SINGLE_IMAGE ) {
+              state = HEADER;
+              Disconnect();
+            } else {
+              state = SUBHEADER;
+            }
+            Debug( 3, "Returning %d (%d) bytes of captured content", content_length, buffer.size() );
+            return content_length;
+          }
+        case HEADERCONT :
+        case SUBHEADERCONT :
+            // Ignore
+            break;
+      }
+    }
+  } else
+#endif // HAVE_LIBPCRE
+  {
+    static const char *http_match = "HTTP/";
+    static const char *connection_match = "Connection:";
+    static const char *content_length_match = "Content-length:";
+    static const char *content_type_match = "Content-type:";
+    static const char *boundary_match = "boundary=";
+    static const char *authenticate_match = "WWW-Authenticate:";
+    static int http_match_len = 0;
+    static int connection_match_len = 0;
+    static int content_length_match_len = 0;
+    static int content_type_match_len = 0;
+    static int boundary_match_len = 0;
+    static int authenticate_match_len = 0;
+
+    if ( !http_match_len )
+      http_match_len = strlen(http_match);
+    if ( !connection_match_len )
+      connection_match_len = strlen(connection_match);
+    if ( !content_length_match_len )
+      content_length_match_len = strlen(content_length_match);
+    if ( !content_type_match_len )
+      content_type_match_len = strlen(content_type_match);
+    if ( !boundary_match_len )
+      boundary_match_len = strlen(boundary_match);
+    if ( !authenticate_match_len )
+      authenticate_match_len = strlen(authenticate_match);
+
+    static int n_headers;
+    static int n_subheaders;
+
+    static char *http_header;
+    static char *connection_header;
+    static char *content_length_header;
+    static char *content_type_header;
+    static char *boundary_header;
+    static char *authenticate_header;
+    static char subcontent_length_header[33];
+    static char subcontent_type_header[65];
+
+    static char http_version[16];
+    static char status_code[16];
+    static char status_mesg[256];
+    static char connection_type[32];
+    static int content_length;
+    static char content_type[32];
+    static char content_boundary[64];
+    static int content_boundary_len;
+
+    while (!zm_terminate) {
+      switch (state) {
+        case HEADER :
+            n_headers = 0;
+            http_header = nullptr;
+            connection_header = nullptr;
+            content_length_header = nullptr;
+            content_type_header = nullptr;
+            authenticate_header = nullptr;
+
+            http_version[0] = '\0';
+            status_code [0]= '\0';
+            status_mesg [0]= '\0';
+            connection_type [0]= '\0';
+            content_length = 0;
+            content_type[0] = '\0';
+            content_boundary[0] = '\0';
+            content_boundary_len = 0;
+            FALLTHROUGH;
+        case HEADERCONT :
+          {
+						int buffer_len = GetData();
+            if (buffer_len < 0) {
+              Error("Unable to read header");
+              return -1;
+            }
+						bytes += buffer_len;
+
+            char *crlf = nullptr;
+            char *header_ptr = buffer;
+            int header_len = buffer.size();
+            bool all_headers = false;
+
+            while (!zm_terminate) {
+              int crlf_len = memspn(header_ptr, "\r\n", header_len);
+              if (n_headers) {
+                if (
+                    (crlf_len == 2 && !strncmp(header_ptr, "\n\n", crlf_len))
+                    ||
+                    (crlf_len == 4 && !strncmp(header_ptr, "\r\n\r\n", crlf_len))
+                    ) {
+									Debug(3, "Have double linefeed, done headers");
+                  *header_ptr = '\0';
+                  header_ptr += crlf_len;
+                  header_len -= buffer.consume(header_ptr-(char *)buffer);
+                  all_headers = true;
+                  break;
+                }
+              }
+              if (crlf_len) {
+                if (header_len == crlf_len) {
+                  break;
+                } else {
+                  *header_ptr = '\0';
+                  header_ptr += crlf_len;
+                  header_len -= buffer.consume(header_ptr-(char *)buffer);
+                }
+              }
+
+              Debug(6, "%s", header_ptr);
+              if ((crlf = mempbrk(header_ptr, "\r\n", header_len))) {
+                //headers[n_headers++] = header_ptr;
+                n_headers++;
+
+                if (!http_header && (strncasecmp(header_ptr, http_match, http_match_len) == 0)) {
+                  http_header = header_ptr+http_match_len;
+                  Debug(6, "Got http header '%s'", header_ptr);
+                } else if ( !connection_header && (strncasecmp(header_ptr, connection_match, connection_match_len) == 0) ) {
+                  connection_header = header_ptr+connection_match_len;
+                  Debug(6, "Got connection header '%s'", header_ptr);
+                } else if ( !content_length_header && (strncasecmp(header_ptr, content_length_match, content_length_match_len) == 0) ) {
+                  content_length_header = header_ptr+content_length_match_len;
+                  Debug(6, "Got content length header '%s'", header_ptr);
+                } else if ( !authenticate_header && (strncasecmp(header_ptr, authenticate_match, authenticate_match_len) == 0) ) {
+                  authenticate_header = header_ptr;
+                  Debug(6, "Got authenticate header '%s'", header_ptr);
+                } else if ( !content_type_header && (strncasecmp(header_ptr, content_type_match, content_type_match_len) == 0) ) {
+                  content_type_header = header_ptr+content_type_match_len;
+                  Debug(6, "Got content type header '%s'", header_ptr);
+                } else {
+                  Debug(6, "Got ignored header '%s'", header_ptr);
+                }
+                header_ptr = crlf;
+                header_len -= buffer.consume(header_ptr-(char *)buffer);
+              } else {
+                // No end of line found
+                break;
+              }
+            } // end while search for headers
+
+            if (all_headers) {
+              char *start_ptr, *end_ptr;
+
+              if (!http_header) {
+                Error("Unable to extract HTTP status from header");
+                return -1;
+              }
+
+              start_ptr = http_header;
+              end_ptr = start_ptr+strspn(start_ptr, "10.");
+
+              // FIXME Why are we memsetting every time?  Can we not do it once?
+              //memset(http_version, 0, sizeof(http_version));
+              strncpy(http_version, start_ptr, end_ptr-start_ptr);
+
+              start_ptr = end_ptr;
+              start_ptr += strspn(start_ptr, " ");
+              end_ptr = start_ptr+strspn(start_ptr, "0123456789");
+
+              memset(status_code, 0, sizeof(status_code));
+              strncpy(status_code, start_ptr, end_ptr-start_ptr);
+              int status = atoi(status_code);
+
+              start_ptr = end_ptr;
+              start_ptr += strspn(start_ptr, " ");
+              strcpy(status_mesg, start_ptr);
+
+              if (status == 401) {
+                if (mNeedAuth) {
+                  Error("Failed authentication");
+                  return -1;
+                }
+                if (!authenticate_header) {
+                  Error("Failed authentication, but don't have an authentication header.");
+                  return -1;
+                }
+                mNeedAuth = true;
+                std::string Header = authenticate_header;
+                Debug(2, "Checking for digest auth in %s", authenticate_header);
+
+                mAuthenticator->checkAuthResponse(Header);
+                if (mAuthenticator->auth_method() == zm::AUTH_DIGEST) {
+                  Debug(2, "Need Digest Authentication");
+                  request = stringtf("GET %s HTTP/%s\r\n", path.c_str(), config.http_version);
+                  request += stringtf("User-Agent: %s/%s\r\n", config.http_ua, ZM_VERSION);
+                  request += stringtf("Host: %s\r\n", host.c_str());
+                  if ( strcmp(config.http_version, "1.0") == 0 )
+                    request += "Connection: Keep-Alive\r\n";
+                  request += mAuthenticator->getAuthHeader("GET", path.c_str());
+                  request += "\r\n";
+
+                  Debug(2, "New request header: %s", request.c_str());
+                  return 0;
+                } else {
+                  Debug(2, "Need some other kind of Authentication");
+                }
+              } else if (status < 200 || status > 299) {
+                Error("Invalid response status %s: %s", status_code, status_mesg);
+                return -1;
+              }
+              Debug(3, "Got status '%d' (%s), http version %s", status, status_mesg, http_version);
+
+              if (connection_header) {
+                memset(connection_type, 0, sizeof(connection_type));
+                start_ptr = connection_header + strspn(connection_header, " ");
+                // FIXME Should we not use strncpy?
+                strcpy(connection_type, start_ptr);
+                Debug(3, "Got connection '%s'", connection_type);
+              }
+              if (content_length_header) {
+                start_ptr = content_length_header + strspn(content_length_header, " ");
+                content_length = atoi(start_ptr);
+                Debug(3, "Got content length '%d'", content_length);
+              }
+              if (content_type_header) {
+                //memset(content_type, 0, sizeof(content_type));
+                start_ptr = content_type_header + strspn(content_type_header, " ");
+                if ( (end_ptr = strchr(start_ptr, ';')) ) {
+                  strncpy(content_type, start_ptr, end_ptr-start_ptr);
+                  Debug(3, "Got content type '%s'", content_type);
+
+                  start_ptr = end_ptr + strspn(end_ptr, "; ");
+
+                  if (strncasecmp(start_ptr, boundary_match, boundary_match_len) == 0) {
+                    start_ptr += boundary_match_len;
+                    start_ptr += strspn(start_ptr, "-");
+                    content_boundary_len = sprintf(content_boundary, "--%s", start_ptr);
+                    Debug(3, "Got content boundary '%s'", content_boundary);
+                  } else {
+                    Error("No content boundary found in header '%s'", content_type_header);
+                  }
+                } else {
+                  strcpy(content_type, start_ptr);
+                  Debug(3, "Got content type '%s'", content_type);
+                }
+              } // end if content_type_header
+
+              if (!strcasecmp(content_type, "image/jpeg") || !strcasecmp(content_type, "image/jpg")) {
+                // Single image
+                mode = SINGLE_IMAGE;
+                format = JPEG;
+                state = CONTENT;
+              } else if (!strcasecmp(content_type, "image/x-rgb")) {
+                // Single image
+                mode = SINGLE_IMAGE;
+                format = X_RGB;
+                state = CONTENT;
+              } else if (!strcasecmp(content_type, "image/x-rgbz")) {
+                // Single image
+                mode = SINGLE_IMAGE;
+                format = X_RGBZ;
+                state = CONTENT;
+              } else if (!strcasecmp(content_type, "multipart/x-mixed-replace")) {
+                // Image stream, so start processing
+                if (!content_boundary[0]) {
+                  Error("No content boundary found in header '%s'", content_type_header);
+                  return -1;
+                }
+                mode = MULTI_IMAGE;
+                state = SUBHEADER;
+              }
+              //else if ( !strcasecmp( content_type, "video/mpeg" ) || !strcasecmp( content_type, "video/mpg" ) )
+              //{
+              //// MPEG stream, coming soon!
+              //}
+              else {
+                Error("Unrecognised content type '%s'", content_type);
+                return -1;
               }
             } else {
               Debug(3, "Unable to extract entire header from stream, continuing");
@@ -860,14 +827,13 @@ int RemoteCameraHttp::GetResponse() {
             break;
           }
         case SUBHEADER :
-          {
             n_subheaders = 0;
             boundary_header = 0;
             subcontent_length_header[0] = '\0';
             subcontent_type_header[0] = '\0';
             content_length = 0;
             content_type[0] = '\0';
-          }
+            FALLTHROUGH;
         case SUBHEADERCONT :
           {
             char *crlf = nullptr;
@@ -875,24 +841,27 @@ int RemoteCameraHttp::GetResponse() {
             int subheader_len = buffer.size();
             bool all_headers = false;
 
-            while( true ) {
-              int crlf_len = memspn( subheader_ptr, "\r\n", subheader_len );
-              if ( n_subheaders ) {
-                if ( (crlf_len == 2 && !strncmp( subheader_ptr, "\n\n", crlf_len )) || (crlf_len == 4 && !strncmp( subheader_ptr, "\r\n\r\n", crlf_len )) ) {
+            while (!zm_terminate) {
+              int crlf_len = memspn(subheader_ptr, "\r\n", subheader_len);
+              if (n_subheaders) {
+                if ( (crlf_len == 2 && !strncmp(subheader_ptr, "\n\n", crlf_len))
+                    ||
+                    (crlf_len == 4 && !strncmp( subheader_ptr, "\r\n\r\n", crlf_len ))
+                    ) {
                   *subheader_ptr = '\0';
                   subheader_ptr += crlf_len;
-                  subheader_len -= buffer.consume( subheader_ptr-(char *)buffer );
+                  subheader_len -= buffer.consume(subheader_ptr-(char *)buffer);
                   all_headers = true;
                   break;
                 }
               }
-              if ( crlf_len ) {
-                if ( subheader_len == crlf_len ) {
+              if (crlf_len) {
+                if (subheader_len == crlf_len) {
                   break;
                 } else {
                   *subheader_ptr = '\0';
                   subheader_ptr += crlf_len;
-                  subheader_len -= buffer.consume( subheader_ptr-(char *)buffer );
+                  subheader_len -= buffer.consume(subheader_ptr-(char *)buffer);
                 }
               }
 
@@ -936,29 +905,29 @@ int RemoteCameraHttp::GetResponse() {
               }
             }
 
-            if ( all_headers && boundary_header ) {
+            if (all_headers && boundary_header) {
               char *start_ptr/*, *end_ptr*/;
 
-              Debug( 3, "Got boundary '%s'", boundary_header );
+              Debug(3, "Got boundary '%s'", boundary_header);
 
-              if ( subcontent_length_header[0] ) {
-                start_ptr = subcontent_length_header + strspn( subcontent_length_header, " " );
-                content_length = atoi( start_ptr );
-                Debug( 3, "Got subcontent length '%d'", content_length );
+              if (subcontent_length_header[0]) {
+                start_ptr = subcontent_length_header + strspn(subcontent_length_header, " ");
+                content_length = atoi(start_ptr);
+                Debug(3, "Got subcontent length '%d'", content_length);
               }
-              if ( subcontent_type_header[0] ) {
-                memset( content_type, 0, sizeof(content_type) );
-                start_ptr = subcontent_type_header + strspn( subcontent_type_header, " " );
-                strcpy( content_type, start_ptr );
-                Debug( 3, "Got subcontent type '%s'", content_type );
+              if (subcontent_type_header[0]) {
+                //memset(content_type, 0, sizeof(content_type));
+                start_ptr = subcontent_type_header + strspn(subcontent_type_header, " ");
+                strcpy(content_type, start_ptr);
+                Debug(3, "Got subcontent type '%s'", content_type);
               }
               state = CONTENT;
             } else {
-              Debug( 3, "Unable to extract subheader from stream, retrying" );
-							buffer_len = GetData();
-              if ( buffer_len < 0 ) {
-                Error( "Unable to read subheader" );
-                return( -1 );
+              Debug(3, "Unable to extract subheader from stream, retrying");
+							int buffer_len = GetData();
+              if (buffer_len < 0) {
+                Error("Unable to read subheader");
+                return -1;
               }
 							bytes += buffer_len;
               state = SUBHEADERCONT;
@@ -966,108 +935,108 @@ int RemoteCameraHttp::GetResponse() {
             break;
           }
         case CONTENT : {
-
             // if content_type is something like image/jpeg;size=, this will strip the ;size=
-            char * semicolon = strchr( content_type, ';' );
-            if ( semicolon ) {
+            char * semicolon = strchr(content_type, ';');
+            if (semicolon) {
               *semicolon = '\0';
             }
 
-            if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) ) {
+            if (!strcasecmp(content_type, "image/jpeg") || !strcasecmp(content_type, "image/jpg")) {
               format = JPEG;
-            } else if ( !strcasecmp( content_type, "image/x-rgb" ) ) {
+            } else if (!strcasecmp(content_type, "image/x-rgb")) {
               format = X_RGB;
-            } else if ( !strcasecmp( content_type, "image/x-rgbz" ) ) {
+            } else if (!strcasecmp(content_type, "image/x-rgbz")) {
               format = X_RGBZ;
             } else {
-              Error( "Found unsupported content type '%s'", content_type );
-              return( -1 );
+              Error("Found unsupported content type '%s'", content_type);
+              return -1;
             }
 
             // This is an early test for jpeg content, so we can bail early
-            if ( format == JPEG && buffer.size() >= 2 ) {
-              if ( buffer[0] != 0xff || buffer[1] != 0xd8 ) {
-                Error( "Found bogus jpeg header '%02x%02x'", buffer[0], buffer[1] );
-                return( -1 );
+            if (format == JPEG and buffer.size() >= 2) {
+              if (buffer[0] != 0xff or buffer[1] != 0xd8) {
+                Error("Found bogus jpeg header '%02x%02x'", buffer[0], buffer[1]);
+                return -1;
               }
             }
 
-            if ( content_length ) {
-              while ( ( (long)buffer.size() < content_length ) && ! zm_terminate ) {
+            if (content_length) {
+              while (((long)buffer.size() < content_length) and !zm_terminate) {
 								Debug(4, "getting more data");
-								int bytes_read = GetData();
-                if ( bytes_read < 0 ) {
+								int bytes_read = ReadData(buffer, content_length-buffer.size());
+                if (bytes_read < 0) {
                   Error("Unable to read content");
                   return -1;
                 }
 								bytes += bytes_read;
               }
-              Debug( 3, "Got end of image by length, content-length = %d", content_length );
+              Debug(3, "Got end of image by length, content-length = %d", content_length);
             } else {
               // Read until we find the end of image or the stream closes.
-              while ( !content_length && !zm_terminate ) {
+              while (!content_length && !zm_terminate) {
 								Debug(4, "!content_length, ReadData");
-                buffer_len = ReadData( buffer );
-                if ( buffer_len < 0 ) {
-                  Error( "Unable to read content" );
-                  return( -1 );
+                int buffer_len = ReadData(buffer);
+                if (buffer_len < 0) {
+                  Error("Unable to read content");
+                  return -1;
                 }
 								bytes += buffer_len;
                 int buffer_size = buffer.size();
-                if ( buffer_len ) {
+                if (buffer_len) {
                   // Got some data
 
-                  if ( mode == MULTI_IMAGE ) {
+                  if (mode == MULTI_IMAGE) {
                     // Look for the boundary marker, determine content length using it's position
-                    if ( char *start_ptr = (char *)memstr( (char *)buffer, "\r\n--", buffer_size ) ) {
+                    if (char *start_ptr = (char *)memstr( (char *)buffer, "\r\n--", buffer_size)) {
                       content_length = start_ptr - (char *)buffer;
-                      Debug( 2, "Got end of image by pattern (crlf--), content-length = %d", content_length );
+                      Debug(2, "Got end of image by pattern (crlf--), content-length = %d", content_length);
                     } else {
-                      Debug( 2, "Did not find end of image by patten (crlf--) yet, content-length = %d", content_length );
+                      Debug(2, "Did not find end of image by patten (crlf--) yet, content-length = %d", content_length);
                     }
                   } // end if MULTI_IMAGE
                 } else {
                   content_length = buffer_size;
-                  Debug( 2, "Got end of image by closure, content-length = %d", content_length );
-                  if ( mode == SINGLE_IMAGE ) {
+                  Debug(2, "Got end of image by closure, content-length = %d", content_length);
+                  if (mode == SINGLE_IMAGE) {
                     char *end_ptr = (char *)buffer+buffer_size;
 
                     // strip off any last line feeds
-                    while( *end_ptr == '\r' || *end_ptr == '\n' ) {
+                    while (*end_ptr == '\r' || *end_ptr == '\n') {
                       content_length--;
                       end_ptr--;
                     }
 
-                    if ( end_ptr != ((char *)buffer+buffer_size) ) {
-                      Debug( 2, "Trimmed end of image, new content-length = %d", content_length );
+                    if (end_ptr != ((char *)buffer+buffer_size)) {
+                      Debug(2, "Trimmed end of image, new content-length = %d", content_length);
                     }
                   } // end if SINGLE_IMAGE
                 } // end if read some data
               } // end while ! content_length
             } // end if content_length
 
-            if ( mode == SINGLE_IMAGE ) {
+            if (mode == SINGLE_IMAGE) {
               state = HEADER;
               Disconnect();
             } else {
               state = SUBHEADER;
             }
 
-            if ( format == JPEG && buffer.size() >= 2 ) {
-              if ( buffer[0] != 0xff || buffer[1] != 0xd8 ) {
-                Error( "Found bogus jpeg header '%02x%02x'", buffer[0], buffer[1] );
-                return( -1 );
+            if (format == JPEG && buffer.size() >= 2) {
+              if (buffer[0] != 0xff || buffer[1] != 0xd8) {
+                Error("Found bogus jpeg header '%02x%02x'", buffer[0], buffer[1]);
+                return -1;
               }
             }
 
-            Debug( 3, "Returning %d bytes, buffer size: (%d) bytes of captured content", content_length, buffer.size() );
-            return( content_length );
-          } // end cast CONTENT
+            Debug(3, "Returning %d bytes, buffer size: (%d) bytes of captured content",
+                content_length, buffer.size());
+            return content_length;
+        } // end case CONTENT
       } // end switch
     }
   }
-  return( 0 );
-}
+  return 0;
+} // end RemoteCameraHttp::GetResponse
 
 int RemoteCameraHttp::PrimeCapture() {
   if ( sd < 0 ) {
@@ -1078,7 +1047,8 @@ int RemoteCameraHttp::PrimeCapture() {
     mode = SINGLE_IMAGE;
     buffer.clear();
   }
-  return 0;
+  getVideoStream();
+  return 1;
 }
 
 int RemoteCameraHttp::PreCapture() {
@@ -1093,64 +1063,62 @@ int RemoteCameraHttp::PreCapture() {
   if ( mode == SINGLE_IMAGE ) {
     if ( SendRequest() < 0 ) {
       Error("Unable to send request");
-      Disconnect();
       return -1;
     }
   }
-  return 0;
-}
+  return 1;
+}  // end int RemoteCameraHttp::PreCapture()
 
-int RemoteCameraHttp::Capture( Image &image ) {
+int RemoteCameraHttp::Capture(ZMPacket &packet) {
   int content_length = GetResponse();
-  if ( content_length == 0 ) {
-    Warning( "Unable to capture image, retrying" );
+  if (content_length == 0) {
+    Warning("Unable to capture image, retrying");
     return 0;
   }
-  if ( content_length < 0 ) {
-    Error( "Unable to get response, disconnecting" );
-    Disconnect();
+  if (content_length < 0) {
+    Error("Unable to get response, disconnecting");
     return -1;
   }
-  switch( format ) {
+
+  if (!packet.image) {
+    Debug(4, "Allocating image");
+    packet.image = new Image(width, height, colours, subpixelorder);
+  }
+  Image *image = packet.image;
+  packet.keyframe = 1;
+  packet.codec_type = AVMEDIA_TYPE_VIDEO;
+  packet.packet.stream_index = mVideoStreamId;
+  packet.stream = mVideoStream;
+
+  switch (format) {
     case JPEG :
-      {
-        if ( !image.DecodeJpeg( buffer.extract( content_length ), content_length, colours, subpixelorder ) ) {
-          Error( "Unable to decode jpeg" );
-          Disconnect();
-          return -1;
-        }
-        break;
-      }
-    case X_RGB :
-      {
-        if ( content_length != (long)image.Size() ) {
-          Error( "Image length mismatch, expected %d bytes, content length was %d", image.Size(), content_length );
-          Disconnect();
-          return -1;
-        }
-        image.Assign( width, height, colours, subpixelorder, buffer, imagesize );
-        break;
-      }
-    case X_RGBZ :
-      {
-        if ( !image.Unzip( buffer.extract( content_length ), content_length ) ) {
-          Error( "Unable to unzip RGB image" );
-          Disconnect();
-          return -1;
-        }
-        image.Assign( width, height, colours, subpixelorder, buffer, imagesize );
-        break;
-      }
-    default :
-      {
-        Error( "Unexpected image format encountered" );
-        Disconnect();
+      if (!image->DecodeJpeg(buffer.extract(content_length), content_length, colours, subpixelorder)) {
+        Error("Unable to decode jpeg");
         return -1;
       }
+      break;
+    case X_RGB :
+      if (content_length != (long)image->Size()) {
+        Error("Image length mismatch, expected %d bytes, content length was %d",
+            image->Size(), content_length);
+        return -1;
+      }
+      image->Assign(width, height, colours, subpixelorder, buffer.head(), imagesize);
+      break;
+    case X_RGBZ :
+      if (!image->Unzip(buffer.extract(content_length), content_length)) {
+        Error("Unable to unzip RGB image");
+        return -1;
+      }
+      image->Assign(width, height, colours, subpixelorder, buffer.head(), imagesize);
+      break;
+    default :
+      Error("Unexpected image format encountered");
+      return -1;
   }
   return 1;
-}
+} // end ZmPacket *RmoteCameraHttp::Capture( &image );
 
 int RemoteCameraHttp::PostCapture() {
-  return 0;
+  return 1;
 }
diff --git a/src/zm_remote_camera_http.h b/src/zm_remote_camera_http.h
index d9154608c..dc793459b 100644
--- a/src/zm_remote_camera_http.h
+++ b/src/zm_remote_camera_http.h
@@ -20,11 +20,8 @@
 #ifndef ZM_REMOTE_CAMERA_HTTP_H
 #define ZM_REMOTE_CAMERA_HTTP_H
 
-#include "zm_remote_camera.h"
-
 #include "zm_buffer.h"
-#include "zm_regexp.h"
-#include "zm_utils.h"
+#include "zm_remote_camera.h"
 
 //
 // Class representing 'http' cameras, i.e. those which are
@@ -44,23 +41,37 @@ protected:
   enum { SIMPLE, REGEXP } method;
 
 public:
-  RemoteCameraHttp( unsigned int p_monitor_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  RemoteCameraHttp(
+      const Monitor *monitor,
+      const std::string &method,
+      const std::string &host,
+      const std::string &port,
+      const std::string &path,
+      int p_width,
+      int p_height,
+      int p_colours,
+      int p_brightness,
+      int p_contrast,
+      int p_hue,
+      int p_colour,
+      bool p_capture,
+      bool p_record_audio
+      );
   ~RemoteCameraHttp();
 
-  void Initialise();
-  void Terminate() { Disconnect(); }
-  int Connect();
-  int Disconnect();
+  void Initialise() override;
+  void Terminate() override { Disconnect(); }
+  int Connect() override;
+  int Disconnect() override;
   int SendRequest();
   int ReadData( Buffer &buffer, unsigned int bytes_expected=0 );
 	int GetData();
   int GetResponse();
-  int PrimeCapture();
-  int PreCapture();
-  int Capture( Image &image );
-  int PostCapture();
-  int CaptureAndRecord( Image &image, timeval recording, char* event_directory ) {return 0;};
-  int Close() { Disconnect(); return 0; };
+  int PrimeCapture() override;
+  int PreCapture() override;
+  int Capture( ZMPacket &p ) override;
+  int PostCapture() override;
+  int Close() override { Disconnect(); return 0; };
 };
 
 #endif // ZM_REMOTE_CAMERA_HTTP_H
diff --git a/src/zm_remote_camera_nvsocket.cpp b/src/zm_remote_camera_nvsocket.cpp
index 9045b962a..f66d31fcb 100644
--- a/src/zm_remote_camera_nvsocket.cpp
+++ b/src/zm_remote_camera_nvsocket.cpp
@@ -19,12 +19,12 @@
 
 #include "zm_remote_camera_nvsocket.h"
 
-#include "zm_mem_utils.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <errno.h>
+#include "zm_monitor.h"
+#include "zm_packet.h"
 #include <netdb.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #ifdef SOLARIS
 #include <sys/filio.h> // FIONREAD and friends
@@ -34,7 +34,7 @@
 #endif
 
 RemoteCameraNVSocket::RemoteCameraNVSocket(
-  unsigned int p_monitor_id,
+  const Monitor *monitor,
   const std::string &p_host,
   const std::string &p_port,
   const std::string &p_path,
@@ -48,7 +48,7 @@ RemoteCameraNVSocket::RemoteCameraNVSocket(
   bool p_capture,
   bool p_record_audio ) :
   RemoteCamera(
-    p_monitor_id,
+    monitor,
     "http",
     p_host,
     p_port,
@@ -68,6 +68,7 @@ RemoteCameraNVSocket::RemoteCameraNVSocket(
   timeout.tv_sec = 0;
   timeout.tv_usec = 0;
   subpixelorder = ZM_SUBPIX_ORDER_BGR;
+  mVideoStream = NULL;
 
   if ( capture ) {
     Initialise();
@@ -116,7 +117,7 @@ int RemoteCameraNVSocket::Connect() {
     close(sd);
     sd = -1;
 
-    Warning("Can't connect to socket mid: %d : %s", monitor_id, strerror(errno) );
+    Warning("Can't connect to socket mid: %d : %s", monitor->Id(), strerror(errno));
     return -1;
   }
 
@@ -137,13 +138,13 @@ int RemoteCameraNVSocket::Disconnect() {
 }
 
 int RemoteCameraNVSocket::SendRequest( std::string request ) {
-  Debug( 4, "Sending request: %s", request.c_str() );
+  //Debug( 4, "Sending request: %s", request.c_str() );
   if ( write( sd, request.data(), request.length() ) < 0 ) {
     Error( "Can't write: %s", strerror(errno) );
     Disconnect();
     return( -1 );
   }
-  Debug( 4, "Request sent" );
+  //Debug( 4, "Request sent" );
   return( 0 );
 }
 
@@ -178,11 +179,12 @@ int RemoteCameraNVSocket::PrimeCapture() {
     Disconnect();
     return -1;
   }
+  mVideoStreamId=0;
 
   return 0;
 }
 
-int RemoteCameraNVSocket::Capture( Image &image ) {
+int RemoteCameraNVSocket::Capture( ZMPacket &zm_packet ) {
   if ( SendRequest("GetNextImage\n") < 0 ) {
     Warning( "Unable to capture image, retrying" );
     return 0;
@@ -202,7 +204,8 @@ int RemoteCameraNVSocket::Capture( Image &image ) {
     return 0;
   }
 
-  image.Assign(width, height, colours, subpixelorder, buffer, imagesize);
+  zm_packet.image->Assign(width, height, colours, subpixelorder, buffer, imagesize);
+  zm_packet.keyframe = 1;
   return 1;
 }
 
diff --git a/src/zm_remote_camera_nvsocket.h b/src/zm_remote_camera_nvsocket.h
index fbd7fcd86..1cd740af2 100644
--- a/src/zm_remote_camera_nvsocket.h
+++ b/src/zm_remote_camera_nvsocket.h
@@ -20,28 +20,19 @@
 #ifndef ZM_REMOTE_CAMERA_NVSOCKET_H
 #define ZM_REMOTE_CAMERA_NVSOCKET_H
 
+#include "zm_buffer.h"
 #include "zm_remote_camera.h"
 
-#include "zm_buffer.h"
-#include "zm_regexp.h"
-#include "zm_utils.h"
-
-//
-// Class representing 'http' cameras, i.e. those which are
-// accessed over a network connection using http
-//
 class RemoteCameraNVSocket : public RemoteCamera {
 protected:
   std::string request;
   struct timeval timeout;
-  //struct hostent *hp;
-  //struct sockaddr_in sa;
   int sd;
   Buffer buffer;
 
 public:
   RemoteCameraNVSocket(
-      unsigned int p_monitor_id,
+      const Monitor *monitor,
       const std::string &host,
       const std::string &port,
       const std::string &path,
@@ -56,18 +47,16 @@ public:
       bool p_record_audio );
   ~RemoteCameraNVSocket();
 
-  void Initialise();
-  void Terminate() { Disconnect(); }
-  int Connect();
-  int Disconnect();
-  int SendRequest( std::string );
-  int ReadData( Buffer &buffer, unsigned int bytes_expected=0 );
+  void Initialise() override;
+  void Terminate() override { Disconnect(); }
+  int Connect() override;
+  int Disconnect() override;
+  int SendRequest(std::string);
   int GetResponse();
-  int PrimeCapture();
-  int Capture( Image &image );
-  int PostCapture();
-  int CaptureAndRecord( Image &image, timeval recording, char* event_directory ) {return(0);};
-  int Close() { return 0; };
+  int PrimeCapture() override;
+  int Capture(ZMPacket &p) override;
+  int PostCapture() override;
+  int Close() override { return 0; };
 };
 
 #endif // ZM_REMOTE_CAMERA_NVSOCKET_H
diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp
index 98b0e3030..78c947faa 100644
--- a/src/zm_remote_camera_rtsp.cpp
+++ b/src/zm_remote_camera_rtsp.cpp
@@ -17,19 +17,16 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-#include "zm.h"
+#include "zm_remote_camera_rtsp.h"
+
+#include "zm_config.h"
+#include "zm_monitor.h"
+#include "zm_packet.h"
 
 #if HAVE_LIBAVFORMAT
 
-#include "zm_remote_camera_rtsp.h"
-#include "zm_ffmpeg.h"
-#include "zm_mem_utils.h"
-
-#include <sys/types.h>
-#include <sys/socket.h>
-
 RemoteCameraRtsp::RemoteCameraRtsp(
-    unsigned int p_monitor_id,
+    const Monitor *monitor,
     const std::string &p_method,
     const std::string &p_host,
     const std::string &p_port,
@@ -44,10 +41,14 @@ RemoteCameraRtsp::RemoteCameraRtsp(
     int p_colour,
     bool p_capture,
     bool p_record_audio ) :
-  RemoteCamera( p_monitor_id, "rtsp", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
-  rtsp_describe( p_rtsp_describe ),
-  rtspThread( 0 )
-
+  RemoteCamera(
+      monitor, "rtsp",
+      p_host, p_port, p_path,
+      p_width, p_height, p_colours,
+      p_brightness, p_contrast, p_hue, p_colour,
+      p_capture, p_record_audio),
+  rtsp_describe(p_rtsp_describe),
+  frameCount(0)
 {
   if ( p_method == "rtpUni" )
     method = RtspThread::RTP_UNICAST;
@@ -58,25 +59,12 @@ RemoteCameraRtsp::RemoteCameraRtsp(
   else if ( p_method == "rtpRtspHttp" )
     method = RtspThread::RTP_RTSP_HTTP;
   else
-    Fatal("Unrecognised method '%s' when creating RTSP camera %d", p_method.c_str(), monitor_id);
+    Fatal("Unrecognised method '%s' when creating RTSP camera %d", p_method.c_str(), monitor->Id());
 
   if ( capture ) {
     Initialise();
   }
   
-  mFormatContext = nullptr;
-  mVideoStreamId = -1;
-  mAudioStreamId = -1;
-  mCodecContext = nullptr;
-  mCodec = nullptr;
-  mRawFrame = nullptr;
-  mFrame = nullptr;
-  frameCount = 0;
-  startTime=0;
-  
-#if HAVE_LIBSWSCALE
-  mConvertContext = nullptr;
-#endif
   /* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
   if ( colours == ZM_COLOUR_RGB32 ) {
     subpixelorder = ZM_SUBPIX_ORDER_RGBA;
@@ -93,20 +81,13 @@ RemoteCameraRtsp::RemoteCameraRtsp(
 } // end RemoteCameraRtsp::RemoteCameraRtsp(...)
 
 RemoteCameraRtsp::~RemoteCameraRtsp() {
-  av_frame_free(&mFrame);
-  av_frame_free(&mRawFrame);
-  
-#if HAVE_LIBSWSCALE
-  if ( mConvertContext ) {
-    sws_freeContext(mConvertContext);
-    mConvertContext = nullptr;
-  }
-#endif
 
-  if ( mCodecContext ) {
-     avcodec_close(mCodecContext);
-     mCodecContext = nullptr; // Freed by avformat_free_context in the destructor of RtspThread class
+  if ( mVideoCodecContext ) {
+     avcodec_close(mVideoCodecContext);
+     mVideoCodecContext = nullptr; // Freed by avformat_free_context in the destructor of RtspThread class
   }
+  // Is allocated in RTSPThread and is free there as well
+  mFormatContext = nullptr;
 
   if ( capture ) {
     Terminate();
@@ -132,19 +113,15 @@ void RemoteCameraRtsp::Terminate() {
 }
 
 int RemoteCameraRtsp::Connect() {
-  rtspThread = new RtspThread(monitor_id, method, protocol, host, port, path, auth, rtsp_describe);
-
-  rtspThread->start();
+  rtspThread = ZM::make_unique<RtspThread>(monitor->Id(), method, protocol, host, port, path, auth, rtsp_describe);
 
   return 0;
 }
 
 int RemoteCameraRtsp::Disconnect() {
-  if ( rtspThread ) {
-    rtspThread->stop();
-    rtspThread->join();
-    delete rtspThread;
-    rtspThread = nullptr;
+  if (rtspThread) {
+    rtspThread->Stop();
+    rtspThread.reset();
   }
   return 0;
 }
@@ -166,22 +143,27 @@ int RemoteCameraRtsp::PrimeCapture() {
   // Find first video stream present
   mVideoStreamId = -1;
   mAudioStreamId = -1;
-  
+
   // Find the first video stream. 
   for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ ) {
     if ( is_video_stream(mFormatContext->streams[i]) ) {
       if ( mVideoStreamId == -1 ) {
         mVideoStreamId = i;
+        mVideoStream = mFormatContext->streams[i];
+        mVideoStream->time_base = AV_TIME_BASE_Q;
         continue;
       } else {
         Debug(2, "Have another video stream.");
       }
+#if 0
     } else if ( is_audio_stream(mFormatContext->streams[i]) ) {
       if ( mAudioStreamId == -1 ) {
         mAudioStreamId = i;
+        mAudioStream = mFormatContext->streams[i];
       } else {
         Debug(2, "Have another audio stream.");
       }
+#endif
     } else {
       Debug(1, "Have unknown codec type in stream %d", i);
     }
@@ -193,30 +175,26 @@ int RemoteCameraRtsp::PrimeCapture() {
     Debug(3, "Unable to locate audio stream");
 
   // Get a pointer to the codec context for the video stream
-  mCodecContext = mFormatContext->streams[mVideoStreamId]->codec;
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  mVideoCodecContext = avcodec_alloc_context3(NULL);
+  avcodec_parameters_to_context(mVideoCodecContext, mFormatContext->streams[mVideoStreamId]->codecpar);
+#else
+  mVideoCodecContext = mFormatContext->streams[mVideoStreamId]->codec;
+#endif
 
   // Find the decoder for the video stream
-  mCodec = avcodec_find_decoder(mCodecContext->codec_id);
-  if ( mCodec == nullptr )
-    Panic("Unable to locate codec %d decoder", mCodecContext->codec_id);
+  AVCodec *codec = avcodec_find_decoder(mVideoCodecContext->codec_id);
+  if ( codec == nullptr )
+    Panic("Unable to locate codec %d decoder", mVideoCodecContext->codec_id);
 
   // Open codec
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
-  if ( avcodec_open(mCodecContext, mCodec) < 0 )
+  if ( avcodec_open(mVideoCodecContext, codec) < 0 )
 #else
-  if ( avcodec_open2(mCodecContext, mCodec, 0) < 0 )
+  if ( avcodec_open2(mVideoCodecContext, codec, 0) < 0 )
 #endif
     Panic("Can't open codec");
 
-  // Allocate space for the native video frame
-  mRawFrame = zm_av_frame_alloc();
-
-  // Allocate space for the converted video frame
-  mFrame = zm_av_frame_alloc();
-
-  if ( mRawFrame == nullptr || mFrame == nullptr )
-    Fatal("Unable to allocate frame(s)");
-
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
   int pSize = av_image_get_buffer_size(imagePixFormat, width, height, 1);
 #else
@@ -224,51 +202,34 @@ int RemoteCameraRtsp::PrimeCapture() {
 #endif
 
   if ( (unsigned int)pSize != imagesize ) {
-    Fatal("Image size mismatch. Required: %d Available: %d", pSize, imagesize);
-  }
-/*  
-#if HAVE_LIBSWSCALE
-  if(!sws_isSupportedInput(mCodecContext->pix_fmt)) {
-    Fatal("swscale does not support the codec format: %c%c%c%c",(mCodecContext->pix_fmt)&0xff,((mCodecContext->pix_fmt>>8)&0xff),((mCodecContext->pix_fmt>>16)&0xff),((mCodecContext->pix_fmt>>24)&0xff));
+    Fatal("Image size mismatch. Required: %d Available: %llu", pSize, imagesize);
   }
 
-  if(!sws_isSupportedOutput(imagePixFormat)) {
-    Fatal("swscale does not support the target format: %c%c%c%c",(imagePixFormat)&0xff,((imagePixFormat>>8)&0xff),((imagePixFormat>>16)&0xff),((imagePixFormat>>24)&0xff));
-  }
-  
-#else // HAVE_LIBSWSCALE
-  Fatal( "You must compile ffmpeg with the --enable-swscale option to use RTSP cameras" );
-#endif // HAVE_LIBSWSCALE
-*/
-
-  return 0;
-}
+  return 1;
+}  // end PrimeCapture
 
 int RemoteCameraRtsp::PreCapture() {
-  if ( !rtspThread->isRunning() )
+  if (!rtspThread || rtspThread->IsStopped())
     return -1;
   if ( !rtspThread->hasSources() ) {
     Error("Cannot precapture, no RTP sources");
     return -1;
   }
-  return 0;
+  return 1;
 }
 
-int RemoteCameraRtsp::Capture( Image &image ) {
-  AVPacket packet;
-  uint8_t* directbuffer;
+int RemoteCameraRtsp::Capture(ZMPacket &zm_packet) {
   int frameComplete = false;
-  
-  /* Request a writeable buffer of the target image */
-  directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
-  if ( directbuffer == nullptr ) {
-    Error("Failed requesting writeable buffer for the captured image.");
-    return -1;
+  AVPacket *packet = &zm_packet.packet;
+  if ( !zm_packet.image ) {
+    Debug(1, "Allocating image %dx%d %d colours %d", width, height, colours, subpixelorder);
+    zm_packet.image = new Image(width, height, colours, subpixelorder);
   }
+
   
-  while ( true ) {
+  while ( !frameComplete ) {
     buffer.clear();
-    if ( !rtspThread->isRunning() )
+    if (!rtspThread || rtspThread->IsStopped())
       return -1;
 
     if ( rtspThread->getFrame(buffer) ) {
@@ -278,12 +239,13 @@ int RemoteCameraRtsp::Capture( Image &image ) {
       if ( !buffer.size() )
         return -1;
 
-      if ( mCodecContext->codec_id == AV_CODEC_ID_H264 ) {
+      if ( mVideoCodecContext->codec_id == AV_CODEC_ID_H264 ) {
         // SPS and PPS frames should be saved and appended to IDR frames
         int nalType = (buffer.head()[3] & 0x1f);
         
         // SPS The SPS NAL unit contains parameters that apply to a series of consecutive coded video pictures
-        if ( nalType == 7 ) {
+        if ( nalType == 1 ) {
+        } else if ( nalType == 7 ) {
           lastSps = buffer;
           continue;
         } else if ( nalType == 8 ) {
@@ -291,6 +253,8 @@ int RemoteCameraRtsp::Capture( Image &image ) {
           lastPps = buffer;
           continue;
         } else if ( nalType == 5 ) {
+          packet->flags |= AV_PKT_FLAG_KEY;
+          zm_packet.keyframe = 1;
         // IDR
           buffer += lastSps;
           buffer += lastPps;
@@ -301,92 +265,59 @@ int RemoteCameraRtsp::Capture( Image &image ) {
         Debug(3, "Not an h264 packet");
       }
 
-      av_init_packet(&packet);
-      while ( (!frameComplete) && (buffer.size() > 0) ) {
-        packet.data = buffer.head();
-        packet.size = buffer.size();
-        bytes += packet.size;
+      //while ( (!frameComplete) && (buffer.size() > 0) ) {
+      if ( buffer.size() > 0 ) {
+        packet->data = buffer.head();
+        packet->size = buffer.size();
+        bytes += packet->size;
 
-        // So I think this is the magic decode step. Result is a raw image?
-        int len = zm_send_packet_receive_frame(mCodecContext, mRawFrame, packet);
-        if ( len < 0 ) {
+        struct timeval now;
+        gettimeofday(&now, NULL);
+        packet->pts = packet->dts = now.tv_sec*1000000+now.tv_usec;
+
+        int bytes_consumed = zm_packet.decode(mVideoCodecContext);
+        if ( bytes_consumed < 0 ) {
           Error("Error while decoding frame %d", frameCount);
-          Hexdump(Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size());
-          buffer.clear();
-          continue;
-        }
-        frameComplete = true;
-        Debug(2, "Frame: %d - %d/%d", frameCount, len, buffer.size());
-        //if ( buffer.size() < 400 )
-        //Hexdump( 0, buffer.head(), buffer.size() );
-        
-        buffer -= len;
-      }
-      // At this point, we either have a frame or ran out of buffer. What happens if we run out of buffer?
-      if ( frameComplete ) {
-         
-        Debug(3, "Got frame %d", frameCount);
-            
-#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-        // From what I've read, we should align the linesizes to 32bit so that ffmpeg can use SIMD instructions too.
-        int size = av_image_fill_arrays(
-            mFrame->data, mFrame->linesize,
-            directbuffer, imagePixFormat, width, height,
-            (AV_PIX_FMT_RGBA == imagePixFormat ? 32 : 1)
-            );
-        if ( size < 0 ) {
-          Error("Problem setting up data pointers into image %s",
-              av_make_error_string(size).c_str());
+          //Hexdump(Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size());
         }
+        buffer -= packet->size;
+        if ( bytes_consumed ) {
+          zm_dump_video_frame(zm_packet.in_frame, "remote_rtsp_decode");
+          if ( ! mVideoStream->
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+              codecpar
 #else
-        avpicture_fill((AVPicture *)mFrame, directbuffer, imagePixFormat, width, height);
+              codec
+#endif
+              ->width ) {
+            zm_dump_codec(mVideoCodecContext);
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+            zm_dump_codecpar(mVideoStream->codecpar);
+            mVideoStream->codecpar->width = zm_packet.in_frame->width;
+            mVideoStream->codecpar->height = zm_packet.in_frame->height;
+#else
+            mVideoStream->codec->width = zm_packet.in_frame->width;
+            mVideoStream->codec->height = zm_packet.in_frame->height;
+#endif
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+            zm_dump_codecpar(mVideoStream->codecpar);
 #endif
-          
-    #if HAVE_LIBSWSCALE
-        if ( mConvertContext == nullptr ) {
-          mConvertContext = sws_getContext(
-              mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt,
-              width, height, imagePixFormat, SWS_BICUBIC, nullptr, nullptr, nullptr);
-
-          if ( mConvertContext == nullptr )
-            Fatal("Unable to create conversion context");
-
-          if (
-              ((unsigned int)mRawFrame->width != width)
-              ||
-              ((unsigned int)mRawFrame->height != height)
-             ) {
-            Warning("Monitor dimensions are %dx%d but camera is sending %dx%d",
-                width, height, mRawFrame->width, mRawFrame->height);
           }
+          zm_packet.codec_type = mVideoCodecContext->codec_type;
+          zm_packet.stream = mVideoStream;
+          frameComplete = true;
+          Debug(2, "Frame: %d - %d/%d", frameCount, bytes_consumed, buffer.size());
+          packet->data = nullptr;
+          packet->size = 0;
         }
-      
-        if ( sws_scale(mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize) < 0 )
-          Fatal("Unable to convert raw format %u to target format %u at frame %d",
-              mCodecContext->pix_fmt, imagePixFormat, frameCount );
-    #else // HAVE_LIBSWSCALE
-        Fatal("You must compile ffmpeg with the --enable-swscale option to use RTSP cameras");
-    #endif // HAVE_LIBSWSCALE
-      
-        frameCount++;
-
-      } /* frame complete */
-       
-      zm_av_packet_unref(&packet);
+      }
     } /* getFrame() */
-   
-    if ( frameComplete )
-      return 1;
-  
   } // end while true
 
-  // can never get here.
-  return 0;
-}
-
-//Function to handle capture and store
+  return 1;
+} // end int RemoteCameraRtsp::Capture(ZMPacket &packet)
 
 int RemoteCameraRtsp::PostCapture() {
-  return 0;
+  return 1;
 }
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_remote_camera_rtsp.h b/src/zm_remote_camera_rtsp.h
index be7542a84..c4734ebee 100644
--- a/src/zm_remote_camera_rtsp.h
+++ b/src/zm_remote_camera_rtsp.h
@@ -20,14 +20,9 @@
 #ifndef ZM_REMOTE_CAMERA_RTSP_H
 #define ZM_REMOTE_CAMERA_RTSP_H
 
-#include "zm_remote_camera.h"
-
-#include "zm_buffer.h"
-#include "zm_utils.h"
-#include "zm_rtsp.h"
 #include "zm_ffmpeg.h"
-#include "zm_videostore.h"
-#include "zm_packetqueue.h"
+#include "zm_remote_camera.h"
+#include "zm_rtsp.h"
 
 //
 // Class representing 'rtsp' cameras, i.e. those which are
@@ -49,44 +44,57 @@ protected:
 
   RtspThread::RtspMethod method;
 
-  RtspThread *rtspThread;
+  std::unique_ptr<RtspThread> rtspThread;
 
   int frameCount;
 
 #if HAVE_LIBAVFORMAT
   AVFormatContext     *mFormatContext;
-  int                 mVideoStreamId;
-  int                 mAudioStreamId;
-  AVCodecContext      *mCodecContext;
-  AVCodec             *mCodec;
-  AVFrame             *mRawFrame; 
-  AVFrame             *mFrame;
   _AVPIXELFORMAT         imagePixFormat;
 #endif // HAVE_LIBAVFORMAT
-  bool                wasRecording;
-  VideoStore          *videoStore;
-  char                oldDirectory[4096];
-  int64_t             startTime;
-
-#if HAVE_LIBSWSCALE
-  struct SwsContext   *mConvertContext;
-#endif
 
 public:
-  RemoteCameraRtsp( unsigned int p_monitor_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  RemoteCameraRtsp(
+      const Monitor *monitor,
+      const std::string &method,
+      const std::string &host,
+      const std::string &port,
+      const std::string &path,
+      int p_width,
+      int p_height,
+      bool p_rtsp_describe,
+      int p_colours,
+      int p_brightness,
+      int p_contrast,
+      int p_hue,
+      int p_colour,
+      bool p_capture,
+      bool p_record_audio);
   ~RemoteCameraRtsp();
 
-  void Initialise();
-  void Terminate();
-  int Connect();
-  int Disconnect();
+  void Initialise() override;
+  void Terminate() override;
+  int Connect() override;
+  int Disconnect() override;
 
-  int PrimeCapture();
-  int PreCapture();
-  int Capture( Image &image );
-  int PostCapture();
-  int CaptureAndRecord( Image &image, timeval recording, char* event_directory ) {return 0;};
-  int Close() { return 0; };
+  int PrimeCapture() override;
+  int PreCapture() override;
+  int Capture(ZMPacket &p) override;
+  int PostCapture() override;
+  int Close() override { return 0; };
+
+  AVStream *get_VideoStream() { 
+    if ( mVideoStreamId != -1 )
+      return mFormatContext->streams[mVideoStreamId];
+    return nullptr;
+  }
+  AVStream *get_AudioStream() {
+    if ( mAudioStreamId != -1 )
+      return mFormatContext->streams[mAudioStreamId];
+    return nullptr;
+  }
+  AVCodecContext      *get_VideoCodecContext() { return mVideoCodecContext; };
+  AVCodecContext      *get_AudioCodecContext() { return mAudioCodecContext; };
 };
 
 #endif // ZM_REMOTE_CAMERA_RTSP_H
diff --git a/src/zm_rgb.h b/src/zm_rgb.h
index 1b6cb7550..58ad9bfae 100644
--- a/src/zm_rgb.h
+++ b/src/zm_rgb.h
@@ -20,26 +20,28 @@
 #ifndef ZM_RGB_H
 #define ZM_RGB_H
 
-typedef uint32_t Rgb;  // RGB colour type
+#include "zm_define.h"
 
-#define WHITE     0xff
-#define WHITE_R   0xff
-#define WHITE_G   0xff
-#define WHITE_B   0xff
+typedef uint32 Rgb;  // RGB colour type
 
-#define BLACK     0x00
-#define BLACK_R   0x00
-#define BLACK_G   0x00
-#define BLACK_B   0x00
+constexpr uint8 kWhite = 0xff;
+constexpr uint8 kWhiteR = 0xff;
+constexpr uint8 kWhiteG = 0xff;
+constexpr uint8 kWhiteB = 0xff;
 
-#define RGB_WHITE     (0x00ffffff)
-#define RGB_BLACK     (0x00000000)
-#define RGB_RED     (0x000000ff)
-#define RGB_GREEN     (0x0000ff00)
-#define RGB_BLUE    (0x00ff0000)
-#define RGB_ORANGE    (0x0000a5ff)
-#define RGB_PURPLE    (0x00800080)
-#define RGB_TRANSPARENT  (0x01000000)
+constexpr uint8 kBlack = 0x00;
+constexpr uint8 kBlackR = 0x00;
+constexpr uint8 kBlackG = 0x00;
+constexpr uint8 kBlackB = 0x00;
+
+constexpr Rgb kRGBWhite = 0x00ffffff;
+constexpr Rgb kRGBBlack = 0x00000000;
+constexpr Rgb kRGBRed = 0x000000ff;
+constexpr Rgb kRGBGreen = 0x0000ff00;
+constexpr Rgb kRGBBlue = 0x00ff0000;
+constexpr Rgb kRGBOrange = 0x0000a5ff;
+constexpr Rgb kRGBPurple = 0x00800080;
+constexpr Rgb kRGBTransparent = 0x01000000;
 
 #define RGB_VAL(v,c)    (((v)>>(16-((c)*8)))&0xff)
 
diff --git a/src/zm_rtp.h b/src/zm_rtp.h
index 25403f1a5..f45e14c74 100644
--- a/src/zm_rtp.h
+++ b/src/zm_rtp.h
@@ -20,8 +20,6 @@
 #ifndef ZM_RTP_H
 #define ZM_RTP_H
 
-#include "zm.h"
-
 #define RTP_VERSION  2
 
 #endif // ZM_RTP_H
diff --git a/src/zm_rtp_ctrl.cpp b/src/zm_rtp_ctrl.cpp
index 2ffc0c404..9d74359fc 100644
--- a/src/zm_rtp_ctrl.cpp
+++ b/src/zm_rtp_ctrl.cpp
@@ -15,22 +15,26 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
-
-#include "zm.h"
-
-#if HAVE_LIBAVFORMAT
+//
 
 #include "zm_rtp_ctrl.h"
 
-#include "zm_time.h"
+#include "zm_config.h"
+#include "zm_rtp.h"
 #include "zm_rtsp.h"
 
-#include <errno.h>
+#if HAVE_LIBAVFORMAT
 
-RtpCtrlThread::RtpCtrlThread( RtspThread &rtspThread, RtpSource &rtpSource )
-  : mRtspThread( rtspThread ), mRtpSource( rtpSource ), mStop( false )
+RtpCtrlThread::RtpCtrlThread(RtspThread &rtspThread, RtpSource &rtpSource)
+    : mRtspThread(rtspThread), mRtpSource(rtpSource), mTerminate(false)
 {
+  mThread = std::thread(&RtpCtrlThread::Run, this);
+}
+
+RtpCtrlThread::~RtpCtrlThread() {
+  Stop();
+  if (mThread.joinable())
+    mThread.join();
 }
 
 int RtpCtrlThread::recvPacket( const unsigned char *packet, ssize_t packetLen ) {
@@ -124,7 +128,7 @@ int RtpCtrlThread::recvPacket( const unsigned char *packet, ssize_t packetLen )
     }
     case RTCP_BYE :
       Debug(5, "RTCP Got BYE");
-      mStop = true;
+      Stop();
       break;
     case RTCP_APP :
       // Ignoring as per RFC 3550
@@ -244,12 +248,12 @@ int RtpCtrlThread::recvPackets( unsigned char *buffer, ssize_t nBytes ) {
   return nBytes;
 }
 
-int RtpCtrlThread::run() {
+void RtpCtrlThread::Run() {
   Debug( 2, "Starting control thread %x on port %d", mRtpSource.getSsrc(), mRtpSource.getLocalCtrlPort() );
-  SockAddrInet localAddr, remoteAddr;
+  ZM::SockAddrInet localAddr, remoteAddr;
 
   bool sendReports;
-  UdpInetSocket rtpCtrlServer;
+  ZM::UdpInetSocket rtpCtrlServer;
   if ( mRtpSource.getLocalHost() != "" ) {
     if ( !rtpCtrlServer.bind( mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalCtrlPort() ) )
       Fatal( "Failed to bind RTCP server" );
@@ -267,7 +271,7 @@ int RtpCtrlThread::run() {
 
   // The only reason I can think of why we would have a timeout period is so that we can regularly send RR packets.
   // Why 10 seconds? If anything I think this should be whatever timeout value was given in the DESCRIBE response
-  Select select( 10 );
+  ZM::Select select( 10 );
   select.addReader( &rtpCtrlServer );
 
   unsigned char buffer[ZM_NETWORK_BUFSIZ];
@@ -275,10 +279,9 @@ int RtpCtrlThread::run() {
   time_t  last_receive = time(nullptr);
   bool  timeout = false; // used as a flag that we had a timeout, and then sent an RR to see if we wake back up. Real timeout will happen when this is true.
 
-  while ( !mStop && select.wait() >= 0 ) {
-
+  while (!mTerminate && select.wait() >= 0) {
     time_t now = time(nullptr);
-    Select::CommsList readable = select.getReadable();
+    ZM::Select::CommsList readable = select.getReadable();
     if ( readable.size() == 0 ) {
       if ( ! timeout ) {
         // With this code here, we will send an SDES and RR packet every 10 seconds
@@ -286,15 +289,14 @@ int RtpCtrlThread::run() {
         unsigned char *bufferPtr = buffer;
         bufferPtr += generateRr( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
         bufferPtr += generateSdes( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
-        Debug( 3, "Preventing timeout by sending %zd bytes on sd %d. Time since last receive: %d",
-            bufferPtr-buffer, rtpCtrlServer.getWriteDesc(), ( now-last_receive) );
+        Debug(3, "Preventing timeout by sending %zd bytes on sd %d. Time since last receive: %" PRIi64,
+              bufferPtr - buffer, rtpCtrlServer.getWriteDesc(), static_cast<int64>(now - last_receive));
         if ( (nBytes = rtpCtrlServer.send(buffer, bufferPtr-buffer)) < 0 )
           Error("Unable to send: %s", strerror(errno));
         timeout = true;
         continue;
       } else {
-        //Error( "RTCP timed out" );
-        Debug(1, "RTCP timed out. Time since last receive: %d", ( now-last_receive) );
+        Debug(1, "RTCP timed out. Time since last receive: %" PRIi64, static_cast<int64>(now - last_receive));
         continue;
         //break;
       }
@@ -302,8 +304,8 @@ int RtpCtrlThread::run() {
       timeout = false;
       last_receive = time(nullptr);
     }
-    for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); ++iter ) {
-      if ( UdpInetSocket *socket = dynamic_cast<UdpInetSocket *>(*iter) ) {
+    for ( ZM::Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); ++iter ) {
+      if ( ZM::UdpInetSocket *socket = dynamic_cast<ZM::UdpInetSocket *>(*iter) ) {
         ssize_t nBytes = socket->recv( buffer, sizeof(buffer) );
         Debug( 4, "Read %zd bytes on sd %d", nBytes, socket->getReadDesc() );
 
@@ -321,7 +323,7 @@ int RtpCtrlThread::run() {
           }
         } else {
           // Here is another case of not receiving some data causing us to terminate... why?  Sometimes there are pauses in the interwebs.
-          mStop = true;
+          Stop();
           break;
         }
       } else {
@@ -330,8 +332,7 @@ int RtpCtrlThread::run() {
     } // end foeach comms iterator
   }
   rtpCtrlServer.close();
-  mRtspThread.stop();
-  return 0;
+  mRtspThread.Stop();
 }
 
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_rtp_ctrl.h b/src/zm_rtp_ctrl.h
index 9e5306f92..9346496f7 100644
--- a/src/zm_rtp_ctrl.h
+++ b/src/zm_rtp_ctrl.h
@@ -20,9 +20,9 @@
 #ifndef ZM_RTP_CTRL_H
 #define ZM_RTP_CTRL_H
 
-#include "zm_rtp.h"
-#include "zm_comms.h"
-#include "zm_thread.h"
+#include <atomic>
+#include <sys/types.h>
+#include <thread>
 
 // Defined in ffmpeg rtp.h
 //#define RTP_MAX_SDES 255    // maximum text length for SDES
@@ -34,7 +34,7 @@
 class RtspThread;
 class RtpSource;
 
-class RtpCtrlThread : public Thread {
+class RtpCtrlThread {
 friend class RtspThread;
 
 private:
@@ -123,7 +123,9 @@ private:
   RtspThread &mRtspThread;
   RtpSource &mRtpSource;
   int mPort;
-  bool mStop;
+
+  std::atomic<bool> mTerminate;
+  std::thread mThread;
 
 private:
   int recvPacket( const unsigned char *packet, ssize_t packetLen );
@@ -131,14 +133,13 @@ private:
   int generateSdes( const unsigned char *packet, ssize_t packetLen );
   int generateBye( const unsigned char *packet, ssize_t packetLen );
   int recvPackets( unsigned char *buffer, ssize_t nBytes );
-  int run();
+  void Run();
 
 public:
   RtpCtrlThread( RtspThread &rtspThread, RtpSource &rtpSource );
+  ~RtpCtrlThread();
 
-  void stop() {
-    mStop = true;
-  }
+  void Stop() { mTerminate = true; }
 };
 
 #endif // ZM_RTP_CTRL_H
diff --git a/src/zm_rtp_data.cpp b/src/zm_rtp_data.cpp
index de7c732d3..aed02aea6 100644
--- a/src/zm_rtp_data.cpp
+++ b/src/zm_rtp_data.cpp
@@ -17,19 +17,24 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-#include "zm.h"
+#include "zm_rtp_data.h"
+
+#include "zm_config.h"
+#include "zm_rtsp.h"
+#include "zm_signal.h"
 
 #if HAVE_LIBAVFORMAT
 
-#include "zm_rtp_data.h"
-
-#include "zm_rtsp.h"
-
-#include <arpa/inet.h>
-
 RtpDataThread::RtpDataThread(RtspThread &rtspThread, RtpSource &rtpSource) :
-  mRtspThread(rtspThread), mRtpSource(rtpSource), mStop(false)
+  mRtspThread(rtspThread), mRtpSource(rtpSource), mTerminate(false)
 {
+  mThread = std::thread(&RtpDataThread::Run, this);
+}
+
+RtpDataThread::~RtpDataThread() {
+  Stop();
+  if (mThread.joinable())
+    mThread.join();
 }
 
 bool RtpDataThread::recvPacket(const unsigned char *packet, size_t packetLen) {
@@ -56,12 +61,12 @@ bool RtpDataThread::recvPacket(const unsigned char *packet, size_t packetLen) {
   return mRtpSource.handlePacket(packet, packetLen);
 }
 
-int RtpDataThread::run() {
+void RtpDataThread::Run() {
   Debug(2, "Starting data thread %d on port %d",
       mRtpSource.getSsrc(), mRtpSource.getLocalDataPort());
 
-  SockAddrInet localAddr;
-  UdpInetServer rtpDataSocket;
+  ZM::SockAddrInet localAddr;
+  ZM::UdpInetServer rtpDataSocket;
   if ( mRtpSource.getLocalHost() != "" ) {
     if ( !rtpDataSocket.bind(mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort()) )
       Fatal("Failed to bind RTP server");
@@ -73,25 +78,25 @@ int RtpDataThread::run() {
   }
   Debug(3, "Bound to %s:%d",  mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort());
 
-  Select select(3);
+  ZM::Select select(3);
   select.addReader(&rtpDataSocket);
 
   unsigned char buffer[ZM_NETWORK_BUFSIZ];
-  while ( !zm_terminate && !mStop && (select.wait() >= 0) ) {
-     Select::CommsList readable = select.getReadable();
+  while ( !zm_terminate && !mTerminate && (select.wait() >= 0) ) {
+    ZM::Select::CommsList readable = select.getReadable();
      if ( readable.size() == 0 ) {
        Error("RTP timed out");
-       mStop = true;
+       Stop();
        break;
      }
-     for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); ++iter ) {
-       if ( UdpInetServer *socket = dynamic_cast<UdpInetServer *>(*iter) ) {
+     for ( ZM::Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); ++iter ) {
+       if ( ZM::UdpInetServer *socket = dynamic_cast<ZM::UdpInetServer *>(*iter) ) {
          int nBytes = socket->recv(buffer, sizeof(buffer));
          Debug(4, "Got %d bytes on sd %d", nBytes, socket->getReadDesc());
          if ( nBytes ) {
            recvPacket(buffer, nBytes);
          } else {
-          mStop = true;
+          Stop();
           break;
          }
        } else {
@@ -100,8 +105,7 @@ int RtpDataThread::run() {
      }  // end foreach commsList
   }
   rtpDataSocket.close();
-  mRtspThread.stop();
-  return 0;
+  mRtspThread.Stop();
 }
 
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_rtp_data.h b/src/zm_rtp_data.h
index dae449ea5..e20878212 100644
--- a/src/zm_rtp_data.h
+++ b/src/zm_rtp_data.h
@@ -20,10 +20,9 @@
 #ifndef ZM_RTP_DATA_H
 #define ZM_RTP_DATA_H
 
-#include "zm_thread.h"
-#include "zm_buffer.h"
-
-#include <stdint.h>
+#include "zm_define.h"
+#include <atomic>
+#include <thread>
 
 class RtspThread;
 class RtpSource;
@@ -42,26 +41,26 @@ struct RtpDataHeader
   uint32_t csrc[];    // optional CSRC list
 };
 
-class RtpDataThread : public Thread
+class RtpDataThread
 {
 friend class RtspThread;
 
 private:
   RtspThread &mRtspThread;
   RtpSource &mRtpSource;
-  bool mStop;
+
+  std::atomic<bool> mTerminate;
+  std::thread mThread;
 
 private:
   bool recvPacket( const unsigned char *packet, size_t packetLen );
-  int run();
+  void Run();
 
 public:
   RtpDataThread( RtspThread &rtspThread, RtpSource &rtpSource );
+  ~RtpDataThread();
 
-  void stop()
-  {
-    mStop = true;
-  }
+  void Stop() { mTerminate = true; }
 };
 
 #endif // ZM_RTP_DATA_H
diff --git a/src/zm_rtp_source.cpp b/src/zm_rtp_source.cpp
index 0ac963947..ff69a6069 100644
--- a/src/zm_rtp_source.cpp
+++ b/src/zm_rtp_source.cpp
@@ -21,8 +21,9 @@
 
 #include "zm_time.h"
 #include "zm_rtp_data.h"
-
+#include "zm_utils.h"
 #include <arpa/inet.h>
+#include <unistd.h>
 
 #if HAVE_LIBAVCODEC
 
@@ -79,6 +80,12 @@ RtpSource::RtpSource(
     Warning("The device is using a codec (%d) that may not be supported. Do not be surprised if things don't work.", mCodecId);
 }
 
+RtpSource::~RtpSource() {
+  mTerminate = true;
+  mFrameReadyCv.notify_all();
+  mFrameProcessedCv.notify_all();
+}
+
 void RtpSource::init(uint16_t seq) {
   Debug(3, "Initialising sequence");
   mBaseSeq = seq;
@@ -158,14 +165,12 @@ void RtpSource::updateJitter( const RtpDataHeader *header ) {
     uint32_t localTimeRtp = mBaseTimeRtp + uint32_t(tvDiffSec(mBaseTimeReal) * mRtpFactor);
     uint32_t packetTransit = localTimeRtp - ntohl(header->timestampN);
 
-    Debug(5, "Delta rtp = %.6f\n"
-        "Local RTP time = %x",
-        "Packet RTP time = %x",
-        "Packet transit RTP time = %x",
-        tvDiffSec(mBaseTimeReal),
-        localTimeRtp,
-        ntohl(header->timestampN),
-        packetTransit);
+    Debug(5,
+          "Delta rtp = %.6f\n Local RTP time = %x Packet RTP time = %x Packet transit RTP time = %x",
+          tvDiffSec(mBaseTimeReal),
+          localTimeRtp,
+          ntohl(header->timestampN),
+          packetTransit);
 
     if ( mTransit > 0 ) {
       // Jitter
@@ -232,19 +237,13 @@ void RtpSource::updateRtcpStats() {
     mLostFraction = (lostInterval << 8) / expectedInterval;
 
   Debug(5,
-      "Expected packets = %d\n",
-      "Lost packets = %d\n",
-      "Expected interval = %d\n",
-      "Received interval = %d\n",
-      "Lost interval = %d\n",
-      "Lost fraction = %d\n",
-
-      mExpectedPackets,
-      mLostPackets,
-      expectedInterval,
-      receivedInterval,
-      lostInterval,
-      mLostFraction);
+        "Expected packets = %d\n Lost packets = %d\n Expected interval = %d\n Received interval = %d\n Lost interval = %d\n Lost fraction = %d\n",
+        mExpectedPackets,
+        mLostPackets,
+        expectedInterval,
+        receivedInterval,
+        lostInterval,
+        mLostFraction);
 }
 
 bool RtpSource::handlePacket(const unsigned char *packet, size_t packetLen) {
@@ -292,7 +291,7 @@ bool RtpSource::handlePacket(const unsigned char *packet, size_t packetLen) {
 
               extraHeader = 2;
               break;
-          default: 
+          default:
               Debug(3, "Unhandled nalType %d", nalType);
         }
 
@@ -301,7 +300,7 @@ bool RtpSource::handlePacket(const unsigned char *packet, size_t packetLen) {
           mFrame.append("\x0\x0\x1", 3);
       } // end if H264
       mFrame.append(packet+rtpHeaderSize+extraHeader,
-          packetLen-rtpHeaderSize-extraHeader); 
+          packetLen-rtpHeaderSize-extraHeader);
     } else {
       Debug(3, "NOT H264 frame: type is %d", mCodecId);
     }
@@ -312,16 +311,21 @@ bool RtpSource::handlePacket(const unsigned char *packet, size_t packetLen) {
       if ( mFrameGood ) {
         Debug(3, "Got new frame %d, %d bytes", mFrameCount, mFrame.size());
 
-        mFrameProcessed.setValueImmediate(false);
-        mFrameReady.updateValueSignal(true);
-        if ( !mFrameProcessed.getValueImmediate() ) {
-          // What is the point of this for loop? Is it just me, or will it call getUpdatedValue once or twice? Could it not be better written as
-          // if ( ! mFrameProcessed.getUpdatedValue( 1 ) && mFrameProcessed.getUpdatedValue( 1 ) ) return false;
-
-          for ( int count = 0; !mFrameProcessed.getUpdatedValue( 1 ); count++ )
-            if ( count > 1 )
-              return false;
+        {
+          std::lock_guard<std::mutex> lck(mFrameReadyMutex);
+          mFrameReady = true;
         }
+        mFrameReadyCv.notify_all();
+
+        {
+          std::unique_lock<std::mutex> lck(mFrameProcessedMutex);
+          mFrameProcessedCv.wait(lck, [&]{ return mFrameProcessed || mTerminate; });
+          mFrameProcessed = false;
+        }
+
+        if (mTerminate)
+          return false;
+
         mFrameCount++;
       } else {
         Warning("Discarding incomplete frame %d, %d bytes", mFrameCount, mFrame.size());
@@ -349,16 +353,21 @@ bool RtpSource::handlePacket(const unsigned char *packet, size_t packetLen) {
 }
 
 bool RtpSource::getFrame(Buffer &buffer) {
-  if ( !mFrameReady.getValueImmediate() ) {
-    Debug(3, "Getting frame but not ready");
-    // Allow for a couple of spurious returns
-    for ( int count = 0; !mFrameReady.getUpdatedValue(1); count++ )
-      if ( count > 1 )
-        return false;
+  {
+    std::unique_lock<std::mutex> lck(mFrameReadyMutex);
+    mFrameReadyCv.wait(lck, [&]{ return mFrameReady || mTerminate; });
+    mFrameReady = false;
   }
+
+  if (mTerminate)
+    return false;
+
   buffer = mFrame;
-  mFrameReady.setValueImmediate(false);
-  mFrameProcessed.updateValueSignal(true);
+  {
+    std::lock_guard<std::mutex> lck(mFrameProcessedMutex);
+    mFrameProcessed = true;
+  }
+  mFrameProcessedCv.notify_all();
   Debug(4, "Copied %d bytes", buffer.size());
   return true;
 }
diff --git a/src/zm_rtp_source.h b/src/zm_rtp_source.h
index f91ba20f7..0d1bdee83 100644
--- a/src/zm_rtp_source.h
+++ b/src/zm_rtp_source.h
@@ -21,12 +21,13 @@
 #define ZM_RTP_SOURCE_H
 
 #include "zm_buffer.h"
+#include "zm_config.h"
+#include "zm_define.h"
 #include "zm_ffmpeg.h"
-#include "zm_thread.h"
-
-#include <sys/time.h>
-#include <stdint.h>
+#include <condition_variable>
+#include <mutex>
 #include <string>
+#include <sys/time.h>
 
 #if HAVE_LIBAVCODEC
 
@@ -90,14 +91,23 @@ private:
   int mFrameCount;
   bool mFrameGood;
   bool prevM;
-  ThreadData<bool> mFrameReady;
-  ThreadData<bool> mFrameProcessed;
+
+  bool mTerminate;
+
+  bool mFrameReady;
+  std::condition_variable mFrameReadyCv;
+  std::mutex mFrameReadyMutex;
+
+  bool mFrameProcessed;
+  std::condition_variable mFrameProcessedCv;
+  std::mutex mFrameProcessedMutex;
 
 private:
   void init(uint16_t seq);
 
 public:
   RtpSource( int id, const std::string &localHost, int localPortBase, const std::string &remoteHost, int remotePortBase, uint32_t ssrc, uint16_t seq, uint32_t rtpClock, uint32_t rtpTime, _AVCODECID codecId );
+  ~RtpSource();
   
   bool updateSeq( uint16_t seq );
   void updateJitter( const RtpDataHeader *header );
diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp
index 53452bb94..4efe0a43b 100644
--- a/src/zm_rtsp.cpp
+++ b/src/zm_rtsp.cpp
@@ -17,20 +17,16 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-#include "zm.h"
-
-#if HAVE_LIBAVFORMAT
-
 #include "zm_rtsp.h"
 
+#include "zm_config.h"
 #include "zm_rtp_data.h"
 #include "zm_rtp_ctrl.h"
 #include "zm_db.h"
 
-#include <sys/time.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <errno.h>
+#include <algorithm>
+
+#if HAVE_LIBAVFORMAT
 
 int RtspThread::smMinDataPort = 0;
 int RtspThread::smMaxDataPort = 0;
@@ -38,7 +34,7 @@ RtspThread::PortSet RtspThread::smAssignedPorts;
 
 bool RtspThread::sendCommand(std::string message) {
   if ( mNeedAuth ) {
-    StringVector parts = split(message, " ");
+    StringVector parts = Split(message, " ");
     if ( parts.size() > 1 )
       message += mAuthenticator->getAuthHeader(parts[0], parts[1]);
   }
@@ -46,7 +42,7 @@ bool RtspThread::sendCommand(std::string message) {
   message += stringtf("CSeq: %d\r\n\r\n", ++mSeq);
   Debug(2, "Sending RTSP message: %s", message.c_str());
   if ( mMethod == RTP_RTSP_HTTP ) {
-    message = base64Encode(message);
+    message = Base64Encode(message);
     Debug(2, "Sending encoded RTSP message: %s", message.c_str());
     if ( mRtspSocket2.send(message.c_str(), message.size()) != (int)message.length() ) {
       Error("Unable to send message '%s': %s", message.c_str(), strerror(errno));
@@ -74,7 +70,7 @@ bool RtspThread::recvResponse(std::string &response) {
     } else {
       Error("Response parse failure, %zd bytes follow", response.size());
       if ( response.size() )
-        Hexdump(Logger::ERROR, response.data(), min(response.size(),16));
+        Hexdump(Logger::ERROR, response.data(), std::min(int(response.size()), 16));
     }
     return false;
   }
@@ -95,16 +91,9 @@ int RtspThread::requestPorts() {
     char sql[ZM_SQL_SML_BUFSIZ];
     //FIXME Why not load specifically by Id?  This will get ineffeicient with a lot of monitors
     strncpy(sql, "SELECT `Id` FROM `Monitors` WHERE `Function` != 'None' AND `Type` = 'Remote' AND `Protocol` = 'rtsp' AND `Method` = 'rtpUni' ORDER BY `Id` ASC", sizeof(sql));
-    if ( mysql_query(&dbconn, sql) ) {
-      Error("Can't run query: %s", mysql_error(&dbconn));
-      exit(mysql_errno(&dbconn));
-    }
 
-    MYSQL_RES *result = mysql_store_result(&dbconn);
-    if ( !result ) {
-      Error("Can't use query result: %s", mysql_error(&dbconn));
-      exit(mysql_errno(&dbconn));
-    }
+    MYSQL_RES *result = zmDbFetch(sql);
+
     int nMonitors = mysql_num_rows(result);
     int position = 0;
     if ( nMonitors ) {
@@ -165,7 +154,7 @@ RtspThread::RtspThread(
   mSsrc(0),
   mDist(UNDEFINED),
   mRtpTime(0),
-  mStop(false)
+  mTerminate(false)
 {
   mUrl = mProtocol+"://"+mHost+":"+mPort;
   if ( !mPath.empty() ) {
@@ -183,15 +172,21 @@ RtspThread::RtspThread(
     mHttpSession = stringtf("%d", rand());
   
   mNeedAuth = false;
-  StringVector parts = split(auth, ":");
-  Debug(2, "# of auth parts %d", parts.size());
+  StringVector parts = Split(auth, ":");
+  Debug(2, "# of auth parts %zu", parts.size());
   if ( parts.size() > 1 ) 
     mAuthenticator = new zm::Authenticator(parts[0], parts[1]);
   else
     mAuthenticator = new zm::Authenticator(parts[0], "");
+
+  mThread = std::thread(&RtspThread::Run, this);
 }
 
 RtspThread::~RtspThread() {
+  Stop();
+  if (mThread.joinable())
+    mThread.join();
+
   if ( mFormatContext ) {
 #if LIBAVFORMAT_VERSION_CHECK(52, 96, 0, 96, 0)
     avformat_free_context(mFormatContext);
@@ -208,7 +203,7 @@ RtspThread::~RtspThread() {
   mAuthenticator = nullptr;
 }
 
-int RtspThread::run() {
+void RtspThread::Run() {
   std::string message;
   std::string response;
 
@@ -250,11 +245,11 @@ int RtspThread::run() {
       Debug(2, "Sending HTTP message: %s", message.c_str());
       if ( mRtspSocket.send(message.c_str(), message.size()) != (int)message.length() ) {
         Error("Unable to send message '%s': %s", message.c_str(), strerror(errno));
-        return -1;
+        return;
       }
       if ( mRtspSocket.recv(response) < 0 ) {
         Error("Recv failed; %s", strerror(errno));
-        return -1;
+        return;
       }
     
       Debug(2, "Received HTTP response: %s (%zd bytes)", response.c_str(), response.size());
@@ -266,9 +261,9 @@ int RtspThread::run() {
         } else {
           Error("Response parse failure, %zd bytes follow", response.size());
           if ( response.size() )
-            Hexdump(Logger::ERROR, response.data(), min(response.size(),16));
+            Hexdump(Logger::ERROR, response.data(), std::min(int(response.size()), 16));
         }
-        return -1;
+        return;
       }
       // If Server requests authentication, check WWW-Authenticate header and fill required fields
       // for requested authentication method
@@ -286,7 +281,7 @@ int RtspThread::run() {
     
     if ( respCode != 200 ) {
       Error("Unexpected response code %d, text is '%s'", respCode, respText);
-      return -1;
+      return;
     }
 
     message = "POST "+mPath+" HTTP/1.0\r\n";
@@ -299,7 +294,7 @@ int RtspThread::run() {
     Debug(2, "Sending HTTP message: %s", message.c_str());
     if ( mRtspSocket2.send(message.c_str(), message.size()) != (int)message.length() ) {
       Error("Unable to send message '%s': %s", message.c_str(), strerror(errno));
-      return -1;
+      return;
     }
   }  // end if ( mMethod == RTP_RTSP_HTTP )
 
@@ -309,23 +304,23 @@ int RtspThread::run() {
   // Request supported RTSP commands by the server
   message = "OPTIONS "+mUrl+" RTSP/1.0\r\n";
   if ( !sendCommand(message) )
-    return -1;
+    return;
 
   // A negative return here may indicate auth failure, but we will have setup the auth mechanisms so we need to retry.
   if ( !recvResponse(response) ) {
     if ( mNeedAuth ) {
       Debug(2, "Resending OPTIONS due to possible auth requirement");
       if ( !sendCommand(message) )
-        return -1;
+        return;
       if ( !recvResponse(response) )
-        return -1;
+        return;
     } else {
-      return -1;
+      return;
     }
   } // end if failed response maybe due to auth
 
   char publicLine[256] = "";
-  StringVector lines = split(response, "\r\n");
+  StringVector lines = Split(response, "\r\n");
   for ( size_t i = 0; i < lines.size(); i++ )
     sscanf(lines[i].c_str(), "Public: %[^\r\n]\r\n", publicLine);
 
@@ -351,17 +346,17 @@ int RtspThread::run() {
   const std::string endOfHeaders = "\r\n\r\n";
   size_t sdpStart = response.find(endOfHeaders);
   if ( sdpStart == std::string::npos )
-    return -1;
+    return;
 
   if ( mRtspDescribe ) {
     std::string DescHeader = response.substr(0, sdpStart);
     Debug(1, "Processing DESCRIBE response header '%s'", DescHeader.c_str());
 
-    lines = split(DescHeader, "\r\n");
+    lines = Split(DescHeader, "\r\n");
     for ( size_t i = 0; i < lines.size(); i++ ) {
       // If the device sends us a url value for Content-Base in the response header, we should use that instead
       if ( ( lines[i].size() > 13 ) && ( lines[i].substr( 0, 13 ) == "Content-Base:" ) ) {
-        mUrl = trimSpaces( lines[i].substr( 13 ) );
+        mUrl = TrimSpaces(lines[i].substr(13));
         Info("Received new Content-Base in DESCRIBE response header. Updated device Url to: '%s'", mUrl.c_str() );
         break;
       }
@@ -376,9 +371,9 @@ int RtspThread::run() {
   try {
     mSessDesc = new SessionDescriptor( mUrl, sdp );
     mFormatContext = mSessDesc->generateFormatContext();
-  } catch( const Exception &e ) {
-    Error( e.getMessage().c_str() );
-    return -1;
+  } catch ( const Exception &e ) {
+    Error("%s", e.getMessage().c_str());
+    return;
   }
 
 #if 0
@@ -402,8 +397,10 @@ int RtspThread::run() {
   
   if ( mFormatContext->nb_streams >= 1 ) {
     for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ ) {
-      SessionDescriptor::MediaDescriptor *mediaDesc = mSessDesc->getStream( i );
-#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
+      SessionDescriptor::MediaDescriptor *mediaDesc = mSessDesc->getStream(i);
+#if LIBAVFORMAT_VERSION_CHECK(57, 33, 0, 33, 0)
+      if ( mFormatContext->streams[i]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO )
+#elif (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
       if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
 #else
       if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
@@ -411,113 +408,108 @@ int RtspThread::run() {
       {
         // Check if control Url is absolute or relative
         controlUrl = mediaDesc->getControlUrl();
-        if (std::equal(trackUrl.begin(), trackUrl.end(), controlUrl.begin())) {
+        if (trackUrl == controlUrl) {
           trackUrl = controlUrl;
         } else {
-          if ( *trackUrl.rbegin() != '/') {
+          if ( *trackUrl.rbegin() != '/' ) {
             trackUrl += "/" + controlUrl;
           } else {
             trackUrl += controlUrl;
           }
         }
         rtpClock = mediaDesc->getClock();
+#if LIBAVFORMAT_VERSION_CHECK(57, 33, 0, 33, 0)
+        codecId = mFormatContext->streams[i]->codecpar->codec_id;
+#else
         codecId = mFormatContext->streams[i]->codec->codec_id;
-        // Hackery pokery
-        //rtpClock = mFormatContext->streams[i]->codec->sample_rate;
+#endif
         break;
-      }
-    }
-  }
+      }  // end if is video
+    }  // end foreach stream
+  }  // end if have stream
 
-  switch( mMethod ) {
+  switch ( mMethod ) {
     case RTP_UNICAST :
-    {
       localPorts[0] = requestPorts();
       localPorts[1] = localPorts[0]+1;
 
-      message = "SETUP "+trackUrl+" RTSP/1.0\r\nTransport: RTP/AVP;unicast;client_port="+stringtf( "%d", localPorts[0] )+"-"+stringtf( "%d", localPorts[1] )+"\r\n";
+      message = "SETUP "+trackUrl+" RTSP/1.0\r\nTransport: RTP/AVP;unicast;client_port="
+        +stringtf("%d", localPorts[0] )+"-"+stringtf( "%d", localPorts[1])+"\r\n";
       break;
-    }
     case RTP_MULTICAST :
-    {
       message = "SETUP "+trackUrl+" RTSP/1.0\r\nTransport: RTP/AVP;multicast\r\n";
       break;
-    }
     case RTP_RTSP :
     case RTP_RTSP_HTTP :
-    {
       message = "SETUP "+trackUrl+" RTSP/1.0\r\nTransport: RTP/AVP/TCP;unicast\r\n";
       break;
-    }
     default:
-    {
-      Panic( "Got unexpected method %d", mMethod );
+      Panic("Got unexpected method %d", mMethod);
       break;
-    }
   }
 
-  if ( !sendCommand( message ) )
-    return( -1 );
-  if ( !recvResponse( response ) )
-    return( -1 );
+  if ( !sendCommand(message) )
+    return;
+  if ( !recvResponse(response) )
+    return;
 
-  lines = split( response, "\r\n" );
+  lines = Split(response, "\r\n");
   std::string session;
   int timeout = 0;
   char transport[256] = "";
 
   for ( size_t i = 0; i < lines.size(); i++ ) {
-    if ( ( lines[i].size() > 8 ) && ( lines[i].substr( 0, 8 ) == "Session:" ) ) {
-      StringVector sessionLine = split( lines[i].substr(9), ";" );
-      session = trimSpaces( sessionLine[0] );
+    if ( ( lines[i].size() > 8 ) && ( lines[i].substr(0, 8) == "Session:" ) ) {
+      StringVector sessionLine = Split(lines[i].substr(9), ";");
+      session = TrimSpaces(sessionLine[0]);
       if ( sessionLine.size() == 2 )
-        sscanf( trimSpaces( sessionLine[1] ).c_str(), "timeout=%d", &timeout );
+        sscanf(TrimSpaces(sessionLine[1]).c_str(), "timeout=%d", &timeout);
     }
-    sscanf( lines[i].c_str(), "Transport: %s", transport );
+    sscanf(lines[i].c_str(), "Transport: %s", transport);
   }
 
   if ( session.empty() )
-    Fatal( "Unable to get session identifier from response '%s'", response.c_str() );
+    Fatal("Unable to get session identifier from response '%s'", response.c_str());
 
-  Debug( 2, "Got RTSP session %s, timeout %d secs", session.c_str(), timeout );
+  Debug(2, "Got RTSP session %s, timeout %d secs", session.c_str(), timeout);
 
   if ( !transport[0] )
-    Fatal( "Unable to get transport details from response '%s'", response.c_str() );
+    Fatal("Unable to get transport details from response '%s'", response.c_str());
 
-  Debug( 2, "Got RTSP transport %s", transport );
+  Debug(2, "Got RTSP transport %s", transport);
 
   std::string method = "";
   int remotePorts[2] = { 0, 0 };
   int remoteChannels[2] = { 0, 0 };
   std::string distribution = "";
   unsigned long ssrc = 0;
-  StringVector parts = split( transport, ";" );
+  StringVector parts = Split(transport, ";");
   for ( size_t i = 0; i < parts.size(); i++ ) {
     if ( parts[i] == "unicast" || parts[i] == "multicast" )
       distribution = parts[i];
-    else if ( startsWith( parts[i], "server_port=" ) ) {
+    else if (StartsWith(parts[i], "server_port=") ) {
       method = "RTP/UNICAST";
-      StringVector subparts = split( parts[i], "=" );
-      StringVector ports = split( subparts[1], "-" );
+      StringVector subparts = Split(parts[i], "=");
+      StringVector ports = Split(subparts[1], "-");
       remotePorts[0] = strtol( ports[0].c_str(), nullptr, 10 );
       remotePorts[1] = strtol( ports[1].c_str(), nullptr, 10 );
-    } else if ( startsWith( parts[i], "interleaved=" ) ) {
+    } else if (StartsWith(parts[i], "interleaved=") ) {
       method = "RTP/RTSP";
-      StringVector subparts = split( parts[i], "=" );
-      StringVector channels = split( subparts[1], "-" );
+      StringVector subparts = Split(parts[i], "=");
+      StringVector channels = Split(subparts[1], "-");
       remoteChannels[0] = strtol( channels[0].c_str(), nullptr, 10 );
       remoteChannels[1] = strtol( channels[1].c_str(), nullptr, 10 );
-    } else if ( startsWith( parts[i], "port=" ) ) {
+    } else if (StartsWith(parts[i], "port=") ) {
       method = "RTP/MULTICAST";
-      StringVector subparts = split( parts[i], "=" );
-      StringVector ports = split( subparts[1], "-" );
+      StringVector subparts = Split(parts[i], "=");
+      StringVector ports = Split(subparts[1], "-");
       localPorts[0] = strtol( ports[0].c_str(), nullptr, 10 );
       localPorts[1] = strtol( ports[1].c_str(), nullptr, 10 );
-    } else if ( startsWith( parts[i], "destination=" ) ) {
-      StringVector subparts = split( parts[i], "=" );
+    } else if (StartsWith(parts[i], "destination=") ) {
+      StringVector subparts = Split(parts[i], "=");
       localHost = subparts[1];
-    } else if ( startsWith( parts[i], "ssrc=" ) ) {
-      StringVector subparts = split( parts[i], "=" );
+    } else if (StartsWith(parts[i], "ssrc=") ) {
+      StringVector subparts = Split(parts[i], "=");
       ssrc = strtoll( subparts[1].c_str(), nullptr, 16 );
     }
   }
@@ -531,23 +523,23 @@ int RtspThread::run() {
   Debug( 2, "RTSP Remote Channels are %d/%d", remoteChannels[0], remoteChannels[1] );
 
   message = "PLAY "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\nRange: npt=0.000-\r\n";
-  if ( !sendCommand( message ) )
-    return( -1 );
-  if ( !recvResponse( response ) )
-    return( -1 );
+  if ( !sendCommand(message) )
+    return;
+  if ( !recvResponse(response) )
+    return;
 
-  lines = split( response, "\r\n" );
+  lines = Split(response, "\r\n");
   std::string rtpInfo;
   for ( size_t i = 0; i < lines.size(); i++ ) {
-    if ( ( lines[i].size() > 9 ) && ( lines[i].substr( 0, 9 ) == "RTP-Info:" ) )
-      rtpInfo = trimSpaces( lines[i].substr( 9 ) );
-  // Check for a timeout again. Some rtsp devices don't send a timeout until after the PLAY command is sent
-    if ( ( lines[i].size() > 8 ) && ( lines[i].substr( 0, 8 ) == "Session:" ) && ( timeout == 0 ) ) {
-      StringVector sessionLine = split( lines[i].substr(9), ";" );
+    if ( ( lines[i].size() > 9 ) && ( lines[i].substr(0, 9) == "RTP-Info:" ) )
+      rtpInfo = TrimSpaces(lines[i].substr(9));
+    // Check for a timeout again. Some rtsp devices don't send a timeout until after the PLAY command is sent
+    if ( ( lines[i].size() > 8 ) && ( lines[i].substr(0, 8) == "Session:" ) && ( timeout == 0 ) ) {
+      StringVector sessionLine = Split(lines[i].substr(9), ";");
       if ( sessionLine.size() == 2 )
-        sscanf( trimSpaces( sessionLine[1] ).c_str(), "timeout=%d", &timeout );
+        sscanf(TrimSpaces(sessionLine[1]).c_str(), "timeout=%d", &timeout);
       if ( timeout > 0 )
-        Debug( 2, "Got timeout %d secs from PLAY command response", timeout );
+        Debug(2, "Got timeout %d secs from PLAY command response", timeout);
     }
   }
 
@@ -559,18 +551,18 @@ int RtspThread::run() {
   } else {
     Debug( 2, "Got RTP Info %s", rtpInfo.c_str() );
     // More than one stream can be included in the RTP Info
-    streams = split( rtpInfo.c_str(), "," );
+    streams = Split(rtpInfo.c_str(), ",");
     for ( size_t i = 0; i < streams.size(); i++ ) {
       // We want the stream that matches the trackUrl we are using
       if ( streams[i].find(controlUrl.c_str()) != std::string::npos ) {
         // Parse the sequence and rtptime values
-        parts = split( streams[i].c_str(), ";" );
+        parts = Split(streams[i].c_str(), ";");
         for ( size_t j = 0; j < parts.size(); j++ ) {
-          if ( startsWith( parts[j], "seq=" ) ) {
-            StringVector subparts = split( parts[j], "=" );
+          if (StartsWith(parts[j], "seq=") ) {
+            StringVector subparts = Split(parts[j], "=");
             seq = strtol( subparts[1].c_str(), nullptr, 10 );
-          } else if ( startsWith( parts[j], "rtptime=" ) ) {
-            StringVector subparts = split( parts[j], "=" );
+          } else if (StartsWith(parts[j], "rtptime=") ) {
+            StringVector subparts = Split(parts[j], "=");
             rtpTime = strtol( subparts[1].c_str(), nullptr, 10 );
           }
         }
@@ -594,17 +586,18 @@ int RtspThread::run() {
       RtpDataThread rtpDataThread( *this, *source );
       RtpCtrlThread rtpCtrlThread( *this, *source );
 
-      rtpDataThread.start();
-      rtpCtrlThread.start();
-
-      while( !mStop ) {
+      while (!mTerminate) {
         now = time(nullptr);
         // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
-        Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d",
-            sendKeepalive, timeout, now, lastKeepalive, (now-lastKeepalive) );
+        Debug(5, "sendkeepalive %d, timeout %d, now: %" PRIi64 " last: %" PRIi64 " since: %" PRIi64,
+              sendKeepalive,
+              timeout,
+              static_cast<int64>(now),
+              static_cast<int64>(lastKeepalive),
+              static_cast<int64>(now - lastKeepalive));
         if ( sendKeepalive && (timeout > 0) && ((now-lastKeepalive) > (timeout-5)) ) {
           if ( !sendCommand( message ) )
-            return( -1 );
+            return;
           lastKeepalive = now;
         }
         usleep( 100000 );
@@ -619,19 +612,16 @@ int RtspThread::run() {
 
       message = "TEARDOWN "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
       if ( !sendCommand( message ) )
-        return( -1 );
+        return;
       if ( !recvResponse( response ) )
-        return( -1 );
+        return;
 
-      rtpDataThread.stop();
-      rtpCtrlThread.stop();
+      rtpDataThread.Stop();
+      rtpCtrlThread.Stop();
 
       //rtpDataThread.kill( SIGTERM );
       //rtpCtrlThread.kill( SIGTERM );
 
-      rtpDataThread.join();
-      rtpCtrlThread.join();
-     
       delete mSources[ssrc];
       mSources.clear();
 
@@ -648,14 +638,14 @@ int RtspThread::run() {
       RtpDataThread rtpDataThread( *this, *source );
       RtpCtrlThread rtpCtrlThread( *this, *source );
 
-      Select select( double(config.http_timeout)/1000.0 );
+      ZM::Select select( double(config.http_timeout)/1000.0 );
       select.addReader( &mRtspSocket );
 
       Buffer buffer( ZM_NETWORK_BUFSIZ );
       std::string keepaliveMessage = "OPTIONS "+mUrl+" RTSP/1.0\r\n";
       std::string keepaliveResponse = "RTSP/1.0 200 OK\r\n";
-      while ( !mStop && select.wait() >= 0 ) {
-        Select::CommsList readable = select.getReadable();
+      while (!mTerminate && select.wait() >= 0) {
+        ZM::Select::CommsList readable = select.getReadable();
         if ( readable.size() == 0 ) {
           Error( "RTSP timed out" );
           break;
@@ -723,11 +713,16 @@ int RtspThread::run() {
         // FIXME: Is this really necessary when using tcp ?
         now = time(nullptr);
         // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
-Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepalive, timeout, now, lastKeepalive, (now-lastKeepalive) );
+        Debug(5, "sendkeepalive %d, timeout %d, now: %" PRIi64 " last: %" PRIi64 " since: %" PRIi64,
+              sendKeepalive,
+              timeout,
+              static_cast<int64>(now),
+              static_cast<int64>(lastKeepalive),
+              static_cast<int64>(now - lastKeepalive));
         if ( sendKeepalive && (timeout > 0) && ((now-lastKeepalive) > (timeout-5)) )
         {
           if ( !sendCommand( message ) )
-            return( -1 );
+            return;
           lastKeepalive = now;
         }
         buffer.tidy( 1 );
@@ -742,7 +737,7 @@ Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepali
       // Send a teardown message but don't expect a response as this may not be implemented on the server when using TCP
       message = "TEARDOWN "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
       if ( !sendCommand( message ) )
-        return( -1 );
+        return;
 
       delete mSources[ssrc];
       mSources.clear();
@@ -756,14 +751,12 @@ Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepali
       RtpDataThread rtpDataThread( *this, *source );
       RtpCtrlThread rtpCtrlThread( *this, *source );
 
-      rtpDataThread.start();
-      rtpCtrlThread.start();
 
-      while ( !mStop ) {
+      while (!mTerminate) {
         // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
         if ( sendKeepalive && (timeout > 0) && ((time(nullptr)-lastKeepalive) > (timeout-5)) ) {
           if ( !sendCommand( message ) )
-            return -1;
+            return;
           lastKeepalive = time(nullptr);
         }
         usleep(100000);
@@ -777,15 +770,12 @@ Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepali
 #endif
       message = "TEARDOWN "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
       if ( !sendCommand(message) )
-        return -1;
+        return;
       if ( !recvResponse(response) )
-        return -1;
+        return;
 
-      rtpDataThread.stop();
-      rtpCtrlThread.stop();
-
-      rtpDataThread.join();
-      rtpCtrlThread.join();
+      rtpDataThread.Stop();
+      rtpCtrlThread.Stop();
      
       delete mSources[ssrc];
       mSources.clear();
@@ -798,7 +788,7 @@ Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepali
       break;
   }
 
-  return 0;
+  return;
 }
 
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_rtsp.h b/src/zm_rtsp.h
index 14ef02010..6cb88d091 100644
--- a/src/zm_rtsp.h
+++ b/src/zm_rtsp.h
@@ -20,18 +20,16 @@
 #ifndef ZM_RTSP_H
 #define ZM_RTSP_H
 
-#include "zm.h"
-#include "zm_ffmpeg.h"
 #include "zm_comms.h"
-#include "zm_thread.h"
 #include "zm_rtp_source.h"
 #include "zm_rtsp_auth.h"
 #include "zm_sdp.h"
-
-#include <set>
+#include <atomic>
 #include <map>
+#include <set>
+#include <thread>
 
-class RtspThread : public Thread {
+class RtspThread {
 public:
   typedef enum { RTP_UNICAST, RTP_MULTICAST, RTP_RTSP, RTP_RTSP_HTTP } RtspMethod;
   typedef enum { UNDEFINED, UNICAST, MULTICAST } RtspDist;
@@ -70,8 +68,8 @@ private:
 
   std::string mHttpSession;       ///< Only for RTSP over HTTP sessions
 
-  TcpInetClient mRtspSocket;
-  TcpInetClient mRtspSocket2;
+  ZM::TcpInetClient mRtspSocket;
+  ZM::TcpInetClient mRtspSocket2;
 
   SourceMap mSources;
 
@@ -88,12 +86,14 @@ private:
 
   unsigned long mRtpTime; 
 
-  bool mStop;
+  std::thread mThread;
+  std::atomic<bool> mTerminate;
 
 private:
   bool sendCommand( std::string message );
   bool recvResponse( std::string &response );
-  void checkAuthResponse(std::string &response);  
+  void checkAuthResponse(std::string &response);
+  void Run();
 
 public:
   RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth, bool rtsp_describe );
@@ -128,15 +128,10 @@ public:
       return( false );
     return( iter->second->getFrame( frame ) );
   }
-  int run();
-  void stop()
-  {
-    mStop = true;
-  }
-  bool stopped() const
-  {
-    return( mStop );
-  }
+
+  void Stop() { mTerminate = true; }
+  bool IsStopped() const { return mTerminate; }
+
   int getAddressFamily ()
   {
     return mRtspSocket.getDomain();
diff --git a/src/zm_rtsp_auth.cpp b/src/zm_rtsp_auth.cpp
index 5cd05063c..4a1c6b2e2 100644
--- a/src/zm_rtsp_auth.cpp
+++ b/src/zm_rtsp_auth.cpp
@@ -14,15 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
+//
 
-#include "zm.h"
-#include "zm_utils.h"
 #include "zm_rtsp_auth.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include "zm_logger.h"
+#include "zm_utils.h"
+#include <cstring>
 
 namespace zm {
 
@@ -70,21 +68,21 @@ void Authenticator::authHandleHeader(std::string headerData) {
   else if ( strncasecmp(headerData.c_str(), digest_match, digest_match_len) == 0) {
     fAuthMethod = AUTH_DIGEST;
     Debug(2, "Set authMethod to Digest");
-    StringVector subparts = split(headerData.substr(digest_match_len, headerData.length() - digest_match_len), ",");
+    StringVector subparts = Split(headerData.substr(digest_match_len, headerData.length() - digest_match_len), ",");
     // subparts are key="value"
     for ( size_t i = 0; i < subparts.size(); i++ ) {
-      StringVector kvPair = split(trimSpaces(subparts[i]), "=");
-      std::string key = trimSpaces(kvPair[0]);
+      StringVector kvPair = Split(TrimSpaces(subparts[i]), "=");
+      std::string key = TrimSpaces(kvPair[0]);
       if ( key == "realm" ) {
-        fRealm = trimSet(kvPair[1], "\"");
+        fRealm = Trim(kvPair[1], "\"");
         continue;
       }
       if ( key == "nonce" ) {
-        fNonce = trimSet(kvPair[1], "\"");
+        fNonce = Trim(kvPair[1], "\"");
         continue;
       }
       if ( key == "qop" ) {
-        fQop = trimSet(kvPair[1], "\"");
+        fQop = Trim(kvPair[1], "\"");
         continue;
       }
     }
@@ -94,13 +92,13 @@ void Authenticator::authHandleHeader(std::string headerData) {
 }  // end void Authenticator::authHandleHeader(std::string headerData)
 
 std::string Authenticator::quote( const std::string &src ) {
-  return replaceAll(replaceAll(src, "\\", "\\\\"), "\"", "\\\"");
+  return ReplaceAll(ReplaceAll(src, "\\", "\\\\"), "\"", "\\\"");
 }
 
 std::string Authenticator::getAuthHeader(std::string method, std::string uri) {
   std::string result = "Authorization: ";
   if ( fAuthMethod == AUTH_BASIC ) {
-    result += "Basic " + base64Encode(username() + ":" + password());
+    result += "Basic " + Base64Encode(username() + ":" + password());
   } else if ( fAuthMethod == AUTH_DIGEST ) {
     result += std::string("Digest ") + 
           "username=\"" + quote(username()) + "\", realm=\"" + quote(realm()) + "\", " +
@@ -129,7 +127,7 @@ std::string Authenticator::getAuthHeader(std::string method, std::string uri) {
   return result;
 }
 
-std::string Authenticator::computeDigestResponse(std::string &method, std::string &uri) {
+std::string Authenticator::computeDigestResponse(const std::string &method, const std::string &uri) {
 #if HAVE_DECL_MD5 || HAVE_DECL_GNUTLS_FINGERPRINT
   // The "response" field is computed as:
   //  md5(md5(<username>:<realm>:<password>):<nonce>:md5(<cmd>:<url>))
@@ -194,9 +192,9 @@ std::string Authenticator::computeDigestResponse(std::string &method, std::strin
 #endif // HAVE_DECL_MD5
 }
 
-void Authenticator::checkAuthResponse(std::string &response) {
+void Authenticator::checkAuthResponse(const std::string &response) {
   std::string authLine;
-  StringVector lines = split(response, "\r\n");
+  StringVector lines = Split(response, "\r\n");
   const char* authenticate_match = "WWW-Authenticate:";
   size_t authenticate_match_len = strlen(authenticate_match);
 
@@ -207,13 +205,13 @@ void Authenticator::checkAuthResponse(std::string &response) {
 
     if ( strncasecmp(lines[i].c_str(), authenticate_match, authenticate_match_len) == 0 ) {
       authLine = lines[i];
-      Debug(2, "Found auth line at %d:", i);
+      Debug(2, "Found auth line at %zu:", i);
       //break;
     }
   }
   if ( !authLine.empty() ) {
     Debug(2, "Analyze auth line %s", authLine.c_str());
-    authHandleHeader(trimSpaces(authLine.substr(authenticate_match_len, authLine.length()-authenticate_match_len)));
+    authHandleHeader(TrimSpaces(authLine.substr(authenticate_match_len, authLine.length() - authenticate_match_len)));
   } else {
     Debug(2, "Didn't find auth line in %s", authLine.c_str());
   }
diff --git a/src/zm_rtsp_auth.h b/src/zm_rtsp_auth.h
index 8e65746de..701b4b128 100644
--- a/src/zm_rtsp_auth.h
+++ b/src/zm_rtsp_auth.h
@@ -19,6 +19,9 @@
 #ifndef ZM_RTSP_AUTH_H
 #define ZM_RTSP_AUTH_H
 
+#include "zm_config.h"
+#include <string>
+
 #if HAVE_GNUTLS_GNUTLS_H
 #include <gnutls/gnutls.h>
 #endif
@@ -43,10 +46,10 @@ public:
   std::string username() { return fUsername; }
   AuthMethod  auth_method() const { return fAuthMethod; } 
   
-  std::string computeDigestResponse( std::string &cmd, std::string &url );
+  std::string computeDigestResponse(const std::string &cmd, const std::string &url);
   void authHandleHeader( std::string headerData );
   std::string getAuthHeader( std::string method, std::string path );
-  void checkAuthResponse(std::string &response);
+  void checkAuthResponse(const std::string &response);
   
 private:
   std::string password() { return fPassword; }
diff --git a/src/zm_rtsp_server.cpp b/src/zm_rtsp_server.cpp
new file mode 100644
index 000000000..194cd57f2
--- /dev/null
+++ b/src/zm_rtsp_server.cpp
@@ -0,0 +1,357 @@
+//
+// ZoneMinder RTSP Daemon
+// Copyright (C) 2021 Isaac Connor
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+/*
+
+=head1 NAME
+
+zm_rtsp_server - The ZoneMinder Server
+
+=head1 SYNOPSIS
+
+ zmc -m <monitor_id>
+ zmc --monitor <monitor_id>
+ zmc -h
+ zmc --help
+ zmc -v
+ zmc --version
+
+=head1 DESCRIPTION
+
+This binary's job is to connect to fifo's provided by local zmc processes
+and provide that stream over rtsp
+
+=head1 OPTIONS
+
+ -m, --monitor_id           - ID of a monitor to stream
+ -h, --help                 - Display usage information
+ -v, --version              - Print the installed version of ZoneMinder
+
+=cut
+
+*/
+
+#include "zm.h"
+#include "zm_db.h"
+#include "zm_define.h"
+#include "zm_monitor.h"
+#include "zm_rtsp_server_authenticator.h"
+#include "zm_rtsp_server_fifo_h264_source.h"
+#include "zm_rtsp_server_fifo_adts_source.h"
+#include "zm_signal.h"
+#include "zm_time.h"
+#include "zm_utils.h"
+
+#include <getopt.h>
+#include <iostream>
+#include <vector>
+
+
+#include "xop/RtspServer.h"
+
+void Usage() {
+  fprintf(stderr, "zm_rtsp_server -m <monitor_id>\n");
+
+  fprintf(stderr, "Options:\n");
+  fprintf(stderr, "  -m, --monitor <monitor_id> : We default to all monitors use this to specify just one\n");
+  fprintf(stderr, "  -h, --help                 : This screen\n");
+  fprintf(stderr, "  -v, --version              : Report the installed version of ZoneMinder\n");
+  exit(0);
+}
+
+int main(int argc, char *argv[]) {
+  self = argv[0];
+
+  srand(getpid() * time(nullptr));
+
+  int monitor_id = -1;
+
+  static struct option long_options[] = {
+    {"monitor", 1, nullptr, 'm'},
+    {"help", 0, nullptr, 'h'},
+    {"version", 0, nullptr, 'v'},
+    {nullptr, 0, nullptr, 0}
+  };
+
+  while (1) {
+    int option_index = 0;
+
+    int c = getopt_long(argc, argv, "m:h:v", long_options, &option_index);
+    if ( c == -1 ) {
+      break;
+    }
+
+    switch (c) {
+      case 'm':
+        monitor_id = atoi(optarg);
+        break;
+      case 'h':
+      case '?':
+        Usage();
+        break;
+      case 'v':
+        std::cout << ZM_VERSION << "\n";
+        exit(0);
+      default:
+        // fprintf(stderr, "?? getopt returned character code 0%o ??\n", c);
+        break;
+    }
+  }
+
+  if (optind < argc) {
+    fprintf(stderr, "Extraneous options, ");
+    while (optind < argc)
+      printf("%s ", argv[optind++]);
+    printf("\n");
+    Usage();
+  }
+
+  const char *log_id_string = "zm_rtsp_server";
+  ///std::string log_id_string = std::string("zm_rtsp_server");
+  ///if ( monitor_id > 0 ) log_id_string += stringtf("_m%d", monitor_id);
+
+  logInit(log_id_string);
+  zmLoadStaticConfig();
+  zmDbConnect();
+  zmLoadDBConfig();
+  logInit(log_id_string);
+  if (!config.min_rtsp_port) {
+    Debug(1, "Not starting RTSP server because min_rtsp_port not set");
+    exit(-1);
+  }
+
+  HwCapsDetect();
+
+  std::string where = "`Function` != 'None' AND `RTSPServer` != false";
+  if (staticConfig.SERVER_ID)
+    where += stringtf(" AND `ServerId`=%d", staticConfig.SERVER_ID);
+  if (monitor_id > 0)
+    where += stringtf(" AND `Id`=%d", monitor_id);
+
+  Info("Starting RTSP Server version %s", ZM_VERSION);
+  zmSetDefaultHupHandler();
+  zmSetDefaultTermHandler();
+  zmSetDefaultDieHandler();
+
+  std::shared_ptr<xop::EventLoop> eventLoop(new xop::EventLoop());
+	std::shared_ptr<xop::RtspServer> rtspServer = xop::RtspServer::Create(eventLoop.get());
+
+  if (config.opt_use_auth) {
+    std::shared_ptr<ZM_RtspServer_Authenticator> authenticator(new ZM_RtspServer_Authenticator());
+    rtspServer->SetAuthenticator(authenticator);
+  }
+
+  if (!rtspServer->Start("0.0.0.0", config.min_rtsp_port)) {
+    Debug(1, "Failed starting RTSP server on port %d", config.min_rtsp_port);
+    exit(-1);
+  }
+
+  //xop::MediaSession **sessions = new xop::MediaSession *[monitors.size()];
+
+  std::map<unsigned int, xop::MediaSession *> sessions;
+  std::map<unsigned int, ZoneMinderFifoSource *> video_sources;
+  std::map<unsigned int, ZoneMinderFifoSource *> audio_sources;
+  std::map<unsigned int, std::shared_ptr<Monitor>> monitors;
+  //std::vector<std::shared_ptr<Monitor>> monitors;
+  //= Monitor::LoadMonitors(where, Monitor::QUERY);
+
+  while (!zm_terminate) {
+    std::map<unsigned int, std::shared_ptr<Monitor>> old_monitors = monitors;
+
+    std::vector<std::shared_ptr<Monitor>> new_monitors = Monitor::LoadMonitors(where, Monitor::QUERY);
+    for (const auto &monitor : new_monitors) {
+      if (
+          (old_monitors.find(monitor->Id()) != old_monitors.end())
+          and
+          (old_monitors[monitor->Id()]->GetRTSPStreamName() == monitor->GetRTSPStreamName())
+         ) {
+        Debug(1, "Found monitor in oldmonitors, clearing it");
+        old_monitors.erase(monitor->Id());
+      } else {
+        Debug(1, "Adding monitor %d to monitors", monitor->Id());
+        monitors[monitor->Id()] = monitor;
+      }
+    }
+    // Remove monitors that are no longer doing rtsp
+    for (auto it = old_monitors.begin(); it != old_monitors.end(); ++it) {
+      auto mid = it->first;
+      auto &monitor = it->second;
+      Debug(1, "Removing %d %s from monitors", monitor->Id(), monitor->Name());
+      monitors.erase(mid);
+      if (sessions.find(mid) != sessions.end()) {
+        if (video_sources.find(monitor->Id()) != video_sources.end()) {
+          delete video_sources[monitor->Id()];
+          video_sources.erase(monitor->Id());
+        }
+        if (audio_sources.find(monitor->Id()) != audio_sources.end()) {
+          delete audio_sources[monitor->Id()];
+          audio_sources.erase(monitor->Id());
+        }
+        rtspServer->RemoveSession(sessions[mid]->GetMediaSessionId());
+        //Debug(1, "Deleting session");
+        //delete sessions[mid];
+        sessions.erase(mid);
+      }
+    }
+
+    for (auto it = monitors.begin(); it != monitors.end(); ++it) {
+      auto &monitor = it->second;
+
+      if (!monitor->ShmValid()) {
+        Debug(1, "monitor %d !shmvalid", monitor->Id());
+        monitor->disconnect();
+        if (!monitor->connect()) {
+          Warning("Couldn't connect to monitor %d", monitor->Id());
+          if (sessions.find(monitor->Id()) != sessions.end()) {
+            if (video_sources.find(monitor->Id()) != video_sources.end()) {
+              video_sources.erase(monitor->Id());
+            }
+            if (audio_sources.find(monitor->Id()) != audio_sources.end()) {
+              audio_sources.erase(monitor->Id());
+            }
+            rtspServer->RemoveSession(sessions[monitor->Id()]->GetMediaSessionId());
+            delete sessions[monitor->Id()];
+            sessions.erase(monitor->Id());
+          }
+
+          continue;
+        }
+      }
+
+
+      if (sessions.end() == sessions.find(monitor->Id())) {
+        Debug(1, "Monitor not found in sessions, opening it");
+        std::string videoFifoPath = monitor->GetVideoFifoPath();
+        if (videoFifoPath.empty()) {
+          Debug(1, "video fifo is empty. Skipping.");
+          continue;
+        }
+
+        std::string streamname = monitor->GetRTSPStreamName();
+        xop::MediaSession *session = sessions[monitor->Id()] = xop::MediaSession::CreateNew(streamname);
+        if (!session) {
+          Error("Unable to create session for %s", streamname.c_str());
+          continue;
+        }
+        session->AddNotifyConnectedCallback([] (xop::MediaSessionId sessionId, const std::string &peer_ip, uint16_t peer_port){
+            Debug(1, "RTSP client connect, ip=%s, port=%hu", peer_ip.c_str(), peer_port);
+            });
+
+        session->AddNotifyDisconnectedCallback([](xop::MediaSessionId sessionId, const std::string &peer_ip, uint16_t peer_port) {
+            Debug(1, "RTSP client disconnect, ip=%s, port=%hu", peer_ip.c_str(), peer_port);
+            });
+
+        rtspServer->AddSession(session);
+        //char *url = rtspServer->rtspURL(session);
+        //Debug(1, "url is %s for stream %s", url, streamname.c_str());
+        //delete[] url;
+        monitors[monitor->Id()] = monitor;
+
+        Debug(1, "Adding video fifo %s", videoFifoPath.c_str());
+        ZoneMinderFifoVideoSource *videoSource = nullptr;
+
+        if (std::string::npos != videoFifoPath.find("h264")) {
+          session->AddSource(xop::channel_0, xop::H264Source::CreateNew());
+          videoSource = new H264_ZoneMinderFifoSource(rtspServer, session->GetMediaSessionId(), xop::channel_0, videoFifoPath);
+        } else if (
+            std::string::npos != videoFifoPath.find("hevc")
+            or
+            std::string::npos != videoFifoPath.find("h265")) {
+          session->AddSource(xop::channel_0, xop::H265Source::CreateNew());
+          videoSource = new H265_ZoneMinderFifoSource(rtspServer, session->GetMediaSessionId(), xop::channel_0, videoFifoPath);
+        } else {
+          Warning("Unknown format in %s", videoFifoPath.c_str());
+        }
+        if (videoSource == nullptr) {
+          Error("Unable to create source");
+          rtspServer->RemoveSession(sessions[monitor->Id()]->GetMediaSessionId());
+          delete sessions[monitor->Id()];
+          sessions.erase(monitor->Id());
+          continue;
+        }
+        video_sources[monitor->Id()] = videoSource;
+        videoSource->setWidth(monitor->Width());
+        videoSource->setHeight(monitor->Height());
+
+        std::string audioFifoPath = monitor->GetAudioFifoPath();
+        if (audioFifoPath.empty()) {
+          Debug(1, "audio fifo is empty. Skipping.");
+          continue;
+        }
+        Debug(1, "Adding audio fifo %s", audioFifoPath.c_str());
+
+        ZoneMinderFifoAudioSource *audioSource = nullptr;
+
+        if (std::string::npos != audioFifoPath.find("aac")) {
+          Debug(1, "Adding aac source at %dHz %d channels",
+              monitor->GetAudioFrequency(), monitor->GetAudioChannels());
+          session->AddSource(xop::channel_1, xop::AACSource::CreateNew(
+                monitor->GetAudioFrequency(),
+                monitor->GetAudioChannels(),
+                false /* has_adts */));
+          audioSource = new ADTS_ZoneMinderFifoSource(rtspServer,
+              session->GetMediaSessionId(), xop::channel_1, audioFifoPath);
+          audioSource->setFrequency(monitor->GetAudioFrequency());
+          audioSource->setChannels(monitor->GetAudioChannels());
+        } else {
+          Warning("Unknown format in %s", audioFifoPath.c_str());
+        }
+        if (audioSource == nullptr) {
+          Error("Unable to create source");
+        }
+        audio_sources[monitor->Id()] = audioSource;
+      }  // end if ! sessions[monitor->Id()]
+    }  // end foreach monitor
+
+
+    sleep(5);
+
+    if (zm_reload) {
+      logTerm();
+      logInit(log_id_string);
+      zm_reload = false;
+    }  // end if zm_reload
+  } // end while !zm_terminate
+  Info("RTSP Server shutting down");
+
+  for (const std::pair<const unsigned int, std::shared_ptr<Monitor>> &mon_pair : monitors) {
+    unsigned int i = mon_pair.first;
+    if (video_sources.find(i) != video_sources.end()) {
+      delete video_sources[i];
+    }
+    if (audio_sources.find(i) != audio_sources.end()) {
+      delete audio_sources[i];
+    }
+    if (sessions.find(i) != sessions.end()) {
+      Debug(1, "Removing session for %s", mon_pair.second->Name());
+      rtspServer->RemoveSession(sessions[i]->GetMediaSessionId());
+      sessions.erase(i);
+    }
+  }  // end foreach monitor
+
+  rtspServer->Stop();
+
+  sessions.clear();
+
+  Image::Deinitialise();
+  logTerm();
+  zmDbClose();
+
+	return 0;
+}
diff --git a/src/zm_rtsp_server_adts_source.cpp b/src/zm_rtsp_server_adts_source.cpp
new file mode 100644
index 000000000..f6d1d81c0
--- /dev/null
+++ b/src/zm_rtsp_server_adts_source.cpp
@@ -0,0 +1,54 @@
+/* ---------------------------------------------------------------------------
+**
+** ADTS_DeviceSource.cpp
+**
+** ADTS Live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#include "zm_rtsp_server_adts_source.h"
+
+#include "zm_config.h"
+#include <sstream>
+
+#if HAVE_RTSP_SERVER
+// live555
+#include <Base64.hh>
+
+static unsigned const samplingFrequencyTable[16] = {
+  96000, 88200, 64000, 48000,
+  44100, 32000, 24000, 22050,
+  16000, 12000, 11025, 8000,
+  7350, 0, 0, 0
+};
+// ---------------------------------
+// ADTS ZoneMinder FramedSource
+// ---------------------------------
+//
+ADTS_ZoneMinderDeviceSource::ADTS_ZoneMinderDeviceSource(
+    UsageEnvironment& env,
+    std::shared_ptr<Monitor> monitor,
+    AVStream *stream,
+    unsigned int queueSize
+    )
+  :
+    ZoneMinderDeviceSource(env, std::move(monitor), stream, queueSize),
+    samplingFrequencyIndex(0),
+    channels(
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+        stream->codecpar->channels
+#else
+        stream->codec->channels
+#endif
+        )
+{
+  std::ostringstream os;
+  os <<
+    "profile-level-id=1;"
+    "mode=AAC-hbr;sizelength=13;indexlength=3;"
+    "indexdeltalength=3"
+    //<< extradata2psets(nullptr, m_stream)
+    << "\r\n";
+  m_auxLine.assign(os.str());    
+}
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_adts_source.h b/src/zm_rtsp_server_adts_source.h
new file mode 100644
index 000000000..b6f906a12
--- /dev/null
+++ b/src/zm_rtsp_server_adts_source.h
@@ -0,0 +1,67 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+** ADTS_ZoneMinderDeviceSource.h
+**
+** ADTS ZoneMinder live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#ifndef ZM_RTSP_SERVER_ADTS_SOURCE_H
+#define ZM_RTSP_SERVER_ADTS_SOURCE_H
+
+#include "zm_config.h"
+#include "zm_rtsp_server_device_source.h"
+
+#if HAVE_RTSP_SERVER
+// ---------------------------------
+// ADTS(AAC) ZoneMinder FramedSource
+// ---------------------------------
+
+class ADTS_ZoneMinderDeviceSource : public ZoneMinderDeviceSource {
+  public:
+		static ADTS_ZoneMinderDeviceSource* createNew(
+        UsageEnvironment& env,
+        std::shared_ptr<Monitor> monitor,
+        AVStream * stream,
+        unsigned int queueSize
+        ) {
+			return new ADTS_ZoneMinderDeviceSource(env, std::move(monitor), stream, queueSize);
+    };
+	protected:
+		ADTS_ZoneMinderDeviceSource(
+        UsageEnvironment& env,
+        std::shared_ptr<Monitor> monitor,
+        AVStream *stream,
+        unsigned int queueSize
+        );
+
+		virtual ~ADTS_ZoneMinderDeviceSource() {}
+
+    /*
+		virtual unsigned char* extractFrame(unsigned char* frame, size_t& size, size_t& outsize);
+    virtual unsigned char* findMarker(unsigned char *frame, size_t size, size_t &length);
+    */
+  public:
+    int samplingFrequency() { return 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      m_stream->codecpar->sample_rate;
+#else
+      m_stream->codec->sample_rate;
+#endif
+    };
+    const char *configStr() { return config.c_str(); };
+    int numChannels() {
+      return channels;
+    }
+
+	protected:
+    std::string config;
+    int samplingFrequencyIndex;
+    int channels;
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_ADTS_SOURCE_H
diff --git a/src/zm_rtsp_server_authenticator.h b/src/zm_rtsp_server_authenticator.h
new file mode 100644
index 000000000..5793feb32
--- /dev/null
+++ b/src/zm_rtsp_server_authenticator.h
@@ -0,0 +1,95 @@
+#ifndef ZM_RTSP_SERVER_AUTHENTICATOR_H
+#define ZM_RTSP_SERVER_AUTHENTICATOR_H
+
+#include "zm_config.h"
+#include "zm_user.h"
+
+#include <string>
+#include <sstream>
+
+#include "xop/Authenticator.h"
+#include "xop/RtspMessage.h"
+
+#if HAVE_RTSP_SERVER
+
+class ZM_RtspServer_Authenticator : public xop::Authenticator {
+  public:
+    ZM_RtspServer_Authenticator() {};
+    ~ZM_RtspServer_Authenticator() {};
+
+    bool Authenticate(std::shared_ptr<xop::RtspRequest> request, std::string &nonce) {
+
+      if (!config.opt_use_auth) {
+        Debug(1, "Not doing auth");
+        return true;
+      }
+      std::string url = request->GetRtspUrl();
+      Debug(1, "Doing auth %s", url.c_str());
+
+      User *user = nullptr;
+
+      size_t found = url.find("?");
+      if (found == std::string::npos) return false;
+
+      std::string queryString = url.substr(found+1, std::string::npos);
+
+#if 0
+      found = suffix_string.find("/");
+        if ( found != std::string::npos )
+          suffix_string = suffix_string.substr(0, found);
+#endif
+
+      Debug(1, "suffix %s", queryString.c_str());
+      std::istringstream requestStream(queryString);
+      QueryString query(requestStream);
+
+      if (query.has("jwt_token")) {
+        const QueryParameter *jwt_token = query.get("jwt_token");
+        user = zmLoadTokenUser(jwt_token->firstValue(), false);
+      } else if (query.has("token")) {
+        const QueryParameter *jwt_token = query.get("token");
+        user = zmLoadTokenUser(jwt_token->firstValue(), false);
+      } else if (strcmp(config.auth_relay, "none") == 0) {
+        if (query.has("username")) {
+          std::string username = query.get("username")->firstValue();
+          if (checkUser(username.c_str())) {
+            user = zmLoadUser(username.c_str());
+          } else {
+            Debug(1, "Bad username %s", username.c_str());
+          }
+        }
+      } else {
+        if (query.has("auth")) {
+          std::string auth_hash = query.get("auth")->firstValue();
+          if ( !auth_hash.empty() )
+            user = zmLoadAuthUser(auth_hash.c_str(), config.auth_hash_ips);
+        }
+        Debug(1, "Query has username ? %d", query.has("username"));
+        if ((!user) and query.has("username") and query.has("password")) {
+          std::string username = query.get("username")->firstValue();
+          std::string password = query.get("password")->firstValue();
+          Debug(1, "username %s password %s", username.c_str(), password.c_str());
+          user = zmLoadUser(username.c_str(), password.c_str());
+        }
+      }  // end if query string
+
+      if (user) {
+        Debug(1, "Authenticated");
+        delete user;
+        return true;
+      }
+      return false;
+    }
+
+    size_t GetFailedResponse(
+        std::shared_ptr<xop::RtspRequest> request,
+        std::shared_ptr<char> buf,
+        size_t size) {
+      return request->BuildUnauthorizedRes(buf.get(), size);
+    }
+
+};  // end class ZM_RtspServer_Authenticator
+
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_AUTHENTICATOR_H
diff --git a/src/zm_rtsp_server_device_source.cpp b/src/zm_rtsp_server_device_source.cpp
new file mode 100644
index 000000000..abd1f8381
--- /dev/null
+++ b/src/zm_rtsp_server_device_source.cpp
@@ -0,0 +1,217 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+**
+** ZoneMinder Live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#include "zm_rtsp_server_device_source.h"
+
+#include "zm_config.h"
+#include "zm_logger.h"
+#include "zm_rtsp_server_frame.h"
+#include "zm_signal.h"
+
+#if HAVE_RTSP_SERVER
+ZoneMinderDeviceSource::ZoneMinderDeviceSource(
+    UsageEnvironment& env,
+    std::shared_ptr<Monitor> monitor,
+    AVStream *stream,
+    unsigned int queueSize
+    ) :
+  FramedSource(env),
+	m_stream(stream),
+	m_monitor(std::move(monitor)),
+  m_packetqueue(nullptr),
+  m_packetqueue_it(nullptr),
+	m_queueSize(queueSize)
+{
+	m_eventTriggerId = envir().taskScheduler().createEventTrigger(ZoneMinderDeviceSource::deliverFrameStub);
+	memset(&m_thid, 0, sizeof(m_thid));
+	memset(&m_mutex, 0, sizeof(m_mutex));
+	if ( m_monitor ) {
+    m_packetqueue = m_monitor->GetPacketQueue();
+    if ( !m_packetqueue ) {
+      Fatal("No packetqueue");
+    }
+    pthread_mutex_init(&m_mutex, nullptr);
+    pthread_create(&m_thid, nullptr, threadStub, this);
+  } else {
+    Error("No monitor in ZoneMinderDeviceSource");
+	}
+}
+
+ZoneMinderDeviceSource::~ZoneMinderDeviceSource() {
+  stop = 1;
+	envir().taskScheduler().deleteEventTrigger(m_eventTriggerId);
+	pthread_join(m_thid, nullptr);
+  while ( m_captureQueue.size() ) {
+    NAL_Frame * f = m_captureQueue.front();
+    m_captureQueue.pop_front();
+    delete f;
+  }
+
+	pthread_mutex_destroy(&m_mutex);
+}
+
+// thread mainloop
+void* ZoneMinderDeviceSource::thread() {
+	stop = 0;
+
+	while ( !stop ) {
+		getNextFrame();
+	}
+	return nullptr;
+}
+
+// getting FrameSource callback
+void ZoneMinderDeviceSource::doGetNextFrame() {
+	deliverFrame();
+}
+
+// stopping FrameSource callback
+void ZoneMinderDeviceSource::doStopGettingFrames() {
+  stop = 1;
+	Debug(1, "ZoneMinderDeviceSource::doStopGettingFrames");
+	FramedSource::doStopGettingFrames();
+}
+
+// deliver frame to the sink
+void ZoneMinderDeviceSource::deliverFrame() {
+	if ( !isCurrentlyAwaitingData() ) {
+    Debug(4, "not awaiting data");
+    return;
+  } 
+
+  pthread_mutex_lock(&m_mutex);
+  if ( m_captureQueue.empty() ) {
+    Debug(4, "Queue is empty");
+    pthread_mutex_unlock(&m_mutex);
+    return;
+  }
+
+  NAL_Frame *frame = m_captureQueue.front();
+  m_captureQueue.pop_front();
+  pthread_mutex_unlock(&m_mutex);
+
+  fDurationInMicroseconds = 0;
+  fFrameSize = 0;
+
+  unsigned int nal_size = frame->size();
+
+  if ( nal_size > fMaxSize ) {
+    fFrameSize = fMaxSize;
+    fNumTruncatedBytes = nal_size - fMaxSize;
+  } else {
+    fFrameSize = nal_size;
+  }
+  Debug(2, "deliverFrame stream: %d timestamp: %ld.%06ld size: %d queuesize: %d",
+      m_stream->index,
+      frame->m_timestamp.tv_sec, frame->m_timestamp.tv_usec,
+      fFrameSize, 
+      m_captureQueue.size()
+      );
+
+  fPresentationTime = frame->m_timestamp;
+  memcpy(fTo, frame->buffer(), fFrameSize);
+
+  if ( fFrameSize > 0 ) {
+    // send Frame to the consumer
+    FramedSource::afterGetting(this);
+  }
+  delete frame;
+}  // end void ZoneMinderDeviceSource::deliverFrame()
+
+// FrameSource callback on read event
+void ZoneMinderDeviceSource::incomingPacketHandler() {
+	if ( this->getNextFrame() <= 0 ) {
+		handleClosure(this);
+	}
+}
+
+// read from monitor
+int ZoneMinderDeviceSource::getNextFrame() {
+  if ( zm_terminate )
+    return -1;
+  
+  if ( !m_packetqueue_it ) {
+    m_packetqueue_it = m_packetqueue->get_video_it(true);
+  }
+  ZMPacket *zm_packet = m_packetqueue->get_packet(m_packetqueue_it);
+  while ( zm_packet and (zm_packet->packet.stream_index != m_stream->index) ) {
+    zm_packet->unlock();
+    // We want our stream to start at the same it as the video
+    // but if this is an audio stream we need to increment past that first packet
+    Debug(4, "Have audio packet, skipping");
+    m_packetqueue->increment_it(m_packetqueue_it, m_stream->index);
+    zm_packet = m_packetqueue->get_packet(m_packetqueue_it);
+  }
+  if ( !zm_packet ) {
+    Debug(1, "null zm_packet %p", zm_packet);
+    return -1;
+  }
+  // packet is locked
+  AVPacket *pkt = &zm_packet->packet;
+
+  // Convert pts to timeval
+  int64_t pts = av_rescale_q(pkt->dts, m_stream->time_base, AV_TIME_BASE_Q);
+  timeval tv = { pts/1000000, pts%1000000 };
+  ZM_DUMP_STREAM_PACKET(m_stream, (*pkt), "rtspServer");
+  Debug(2, "pts %" PRId64 " pkt.pts %" PRId64 " tv %d.%d", pts, pkt->pts, tv.tv_sec, tv.tv_usec);
+
+  std::list< std::pair<unsigned char*, size_t> > framesList = this->splitFrames(pkt->data, pkt->size);
+  zm_packet->unlock();
+  zm_packet = nullptr;// we no longer have the lock so shouldn't be accessing it
+  m_packetqueue->increment_it(m_packetqueue_it, m_stream->index);
+
+  while ( framesList.size() ) {
+    std::pair<unsigned char*, size_t> nal = framesList.front();
+    framesList.pop_front();
+
+    NAL_Frame *frame  = new NAL_Frame(nal.first, nal.second, tv);
+
+    pthread_mutex_lock(&m_mutex);
+    if ( m_captureQueue.size() ) {
+      NAL_Frame * f = m_captureQueue.front();
+      while ( m_captureQueue.size() and ((f->m_timestamp.tv_sec - tv.tv_sec) > 10) ) {
+        m_captureQueue.pop_front();
+        delete f;
+        f = m_captureQueue.front();
+      }
+    }
+#if 0
+    while ( m_captureQueue.size() >= m_queueSize ) {
+      Debug(2, "Queue full dropping frame %d", m_captureQueue.size());
+      NAL_Frame * f = m_captureQueue.front();
+      m_captureQueue.pop_front();
+      delete f;
+    }
+#endif
+    m_captureQueue.push_back(frame);
+    pthread_mutex_unlock(&m_mutex);
+
+    // post an event to ask to deliver the frame
+    envir().taskScheduler().triggerEvent(m_eventTriggerId, this);
+  }  // end while we get frame from data
+  return 1;
+}
+
+// split packet in frames
+std::list< std::pair<unsigned char*,size_t> > ZoneMinderDeviceSource::splitFrames(unsigned char* frame, unsigned frameSize) {
+	std::list< std::pair<unsigned char*,size_t> > frameList;
+	if ( frame != nullptr ) {
+		frameList.push_back(std::pair<unsigned char*,size_t>(frame, frameSize));
+	}
+	return frameList;
+}
+
+// extract a frame
+unsigned char*  ZoneMinderDeviceSource::extractFrame(unsigned char* frame, size_t& size, size_t& outsize) {
+  outsize = size;
+  size = 0;
+  return frame;
+}
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_device_source.h b/src/zm_rtsp_server_device_source.h
new file mode 100644
index 000000000..b74a8a606
--- /dev/null
+++ b/src/zm_rtsp_server_device_source.h
@@ -0,0 +1,78 @@
+/* ---------------------------------------------------------------------------
+**
+** DeviceSource.h
+** 
+**  live555 source 
+**
+** -------------------------------------------------------------------------*/
+
+#ifndef ZM_RTSP_SERVER_DEVICE_SOURCE_H
+#define ZM_RTSP_SERVER_DEVICE_SOURCE_H
+
+#include "zm_config.h"
+#include "zm_define.h"
+#include "zm_monitor.h"
+#include <list>
+#include <string>
+#include <utility>
+
+#if HAVE_RTSP_SERVER
+#include <liveMedia.hh>
+
+class NAL_Frame;
+
+class ZoneMinderDeviceSource: public FramedSource {
+		
+	public:
+		static ZoneMinderDeviceSource* createNew(
+        UsageEnvironment& env,
+        std::shared_ptr<Monitor> monitor,
+        AVStream * stream,
+        unsigned int queueSize
+        ) {
+			return new ZoneMinderDeviceSource(env, monitor, stream, queueSize);
+    };
+		std::string getAuxLine() { return m_auxLine; };	
+		int getWidth() { return m_monitor->Width(); };	
+		int getHeight() { return m_monitor->Height(); };	
+
+	protected:
+		ZoneMinderDeviceSource(UsageEnvironment& env, std::shared_ptr<Monitor> monitor, AVStream * stream, unsigned int queueSize);
+		virtual ~ZoneMinderDeviceSource();
+
+	protected:	
+		static void* threadStub(void* clientData) { return ((ZoneMinderDeviceSource*) clientData)->thread();};
+		void* thread();
+		static void deliverFrameStub(void* clientData) {((ZoneMinderDeviceSource*) clientData)->deliverFrame();};
+		void deliverFrame();
+		static void incomingPacketHandlerStub(void* clientData, int mask) { ((ZoneMinderDeviceSource*) clientData)->incomingPacketHandler(); };
+		void incomingPacketHandler();
+		int getNextFrame();
+		void processFrame(char * frame, int frameSize, const timeval &ref);
+		void queueFrame(char * frame, int frameSize, const timeval &tv);
+
+		// split packet in frames
+		virtual std::list< std::pair<unsigned char*, size_t> > splitFrames(unsigned char* frame, unsigned frameSize);
+		
+		// overide FramedSource
+		virtual void doGetNextFrame();	
+		virtual void doStopGettingFrames();
+    virtual unsigned char *extractFrame(unsigned char *data, size_t& size, size_t& outsize);
+					
+	protected:
+		std::list<NAL_Frame*> m_captureQueue;
+		EventTriggerId m_eventTriggerId;
+    AVStream *m_stream;
+		std::shared_ptr<Monitor> m_monitor;
+    PacketQueue *m_packetqueue;
+    std::list<ZMPacket *>::iterator *m_packetqueue_it;
+
+		unsigned int m_queueSize;
+		pthread_t m_thid;
+		pthread_mutex_t m_mutex;
+		std::string m_auxLine;
+    int stop;
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_DEVICE_SOURCE_H
diff --git a/src/zm_rtsp_server_fifo_adts_source.cpp b/src/zm_rtsp_server_fifo_adts_source.cpp
new file mode 100644
index 000000000..6c01371e5
--- /dev/null
+++ b/src/zm_rtsp_server_fifo_adts_source.cpp
@@ -0,0 +1,51 @@
+/* ---------------------------------------------------------------------------
+**
+** ADTS_FifoSource.cpp
+**
+** ADTS Live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#include "zm_logger.h"
+#include "zm_rtsp_server_fifo_adts_source.h"
+
+#include <iomanip>
+#include <sstream>
+
+#if HAVE_RTSP_SERVER
+
+// ---------------------------------
+// ADTS ZoneMinder FramedSource
+// ---------------------------------
+//
+ADTS_ZoneMinderFifoSource::ADTS_ZoneMinderFifoSource(
+     std::shared_ptr<xop::RtspServer>& rtspServer,
+    xop::MediaSessionId sessionId,
+    xop::MediaChannelId channelId,
+    std::string fifo
+    )
+  :
+    ZoneMinderFifoAudioSource(rtspServer, sessionId, channelId, fifo)
+{
+#if 0
+  int profile = 0;
+
+  unsigned char audioSpecificConfig[2];
+  u_int8_t const audioObjectType = profile + 1;
+  audioSpecificConfig[0] = (audioObjectType<<3) | (samplingFrequencyIndex>>1);
+  audioSpecificConfig[1] = (samplingFrequencyIndex<<7) | (channels<<3);
+
+  std::ostringstream os;
+  os <<
+    "profile-level-id=1;"
+    "mode=AAC-hbr;sizelength=13;indexlength=3;"
+    "indexdeltalength=3;config=" << std::hex << std::setw(2) << std::setfill('0') << audioSpecificConfig[0]
+    << std::hex << std::setw(2) << std::setfill('0') << audioSpecificConfig[1]
+    << "\r\n";
+  // Construct the 'AudioSpecificConfig', and from it, the corresponding ASCII string:
+
+  m_auxLine.assign(os.str());    
+  Debug(1, "m_auxline is %s", m_auxLine.c_str());
+#endif
+}
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_fifo_adts_source.h b/src/zm_rtsp_server_fifo_adts_source.h
new file mode 100644
index 000000000..0bbe0890c
--- /dev/null
+++ b/src/zm_rtsp_server_fifo_adts_source.h
@@ -0,0 +1,36 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+** ADTS_ZoneMinderFifoSource.h
+**
+** ADTS ZoneMinder live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#ifndef ZM_RTSP_SERVER_ADTS_FIFO_SOURCE_H
+#define ZM_RTSP_SERVER_ADTS_FIFO_SOURCE_H
+
+#include "zm_config.h"
+#include "zm_rtsp_server_fifo_audio_source.h"
+
+#if HAVE_RTSP_SERVER
+// ---------------------------------
+// ADTS(AAC) ZoneMinder FramedSource
+// ---------------------------------
+
+class ADTS_ZoneMinderFifoSource : public ZoneMinderFifoAudioSource {
+	public:
+    ADTS_ZoneMinderFifoSource(
+        std::shared_ptr<xop::RtspServer>& rtspServer,
+        xop::MediaSessionId sessionId,
+        xop::MediaChannelId channelId,
+        std::string fifo
+        );
+
+		virtual ~ADTS_ZoneMinderFifoSource() {}
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_ADTS_FIFO_SOURCE_H
diff --git a/src/zm_rtsp_server_fifo_audio_source.cpp b/src/zm_rtsp_server_fifo_audio_source.cpp
new file mode 100644
index 000000000..96ccf2075
--- /dev/null
+++ b/src/zm_rtsp_server_fifo_audio_source.cpp
@@ -0,0 +1,48 @@
+/* ---------------------------------------------------------------------------
+**
+** ADTS_FifoSource.cpp
+**
+** ADTS Live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#include "zm_rtsp_server_fifo_audio_source.h"
+
+#if HAVE_RTSP_SERVER
+
+static const int samplingFrequencyTable[16] = {
+  96000, 88200, 64000, 48000,
+  44100, 32000, 24000, 22050,
+  16000, 12000, 11025, 8000,
+  7350, 0, 0, 0
+};
+// ---------------------------------
+// ADTS ZoneMinder FramedSource
+// ---------------------------------
+//
+ZoneMinderFifoAudioSource::ZoneMinderFifoAudioSource(
+    std::shared_ptr<xop::RtspServer>& rtspServer,
+    xop::MediaSessionId sessionId,
+    xop::MediaChannelId channelId,
+    const std::string &fifo
+    )
+  :
+    ZoneMinderFifoSource(rtspServer, sessionId, channelId, fifo),
+    samplingFrequencyIndex(-1),
+    frequency(-1),
+    channels(1)
+{
+}
+int ZoneMinderFifoAudioSource::getFrequencyIndex() {
+  for (int i=0; i<16; i++)
+    if (samplingFrequencyTable[i] == frequency) return i;
+  return -1;
+}
+
+void ZoneMinderFifoAudioSource::PushFrame(const uint8_t *data, size_t size, int64_t pts) {
+  xop::AVFrame frame(data, size);
+  frame.type = xop::AUDIO_FRAME;
+  frame.timestamp = av_rescale_q(pts, AV_TIME_BASE_Q, m_timeBase);
+  m_rtspServer->PushFrame(m_sessionId, m_channelId, frame);
+}
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_fifo_audio_source.h b/src/zm_rtsp_server_fifo_audio_source.h
new file mode 100644
index 000000000..f5610052d
--- /dev/null
+++ b/src/zm_rtsp_server_fifo_audio_source.h
@@ -0,0 +1,56 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+** ADTS_ZoneMinderFifoSource.h
+**
+** ADTS ZoneMinder live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#ifndef ZM_RTSP_SERVER_FIFO_AUDIO_SOURCE_H
+#define ZM_RTSP_SERVER_FIFO_AUDIO_SOURCE_H
+
+#include "zm_config.h"
+#include "zm_rtsp_server_fifo_source.h"
+
+#if HAVE_RTSP_SERVER
+// ---------------------------------
+// ZoneMinder AUDIO FramedSource
+// ---------------------------------
+
+class ZoneMinderFifoAudioSource : public ZoneMinderFifoSource {
+  public:
+		ZoneMinderFifoAudioSource(
+        std::shared_ptr<xop::RtspServer>& rtspServer,
+        xop::MediaSessionId sessionId,
+        xop::MediaChannelId channelId,
+        const std::string &fifo
+        );
+
+		virtual ~ZoneMinderFifoAudioSource() {}
+
+    void setFrequency(int p_frequency) {
+      frequency = p_frequency;
+      samplingFrequencyIndex = getFrequencyIndex();
+      m_timeBase = {1, frequency};
+    };
+    int getFrequency() { return frequency; };
+    int getFrequencyIndex();
+    const char *configStr() const { return config.c_str(); };
+    void setChannels(int p_channels) { channels = p_channels; };
+    int getChannels() const { return channels; };
+
+  protected:
+    void PushFrame(const uint8_t *data, size_t size, int64_t pts) override;
+
+	protected:
+    std::string config;
+    int samplingFrequencyIndex;
+    int frequency;
+    int channels;
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_FIFO_AUDIO_SOURCE_H
diff --git a/src/zm_rtsp_server_fifo_h264_source.cpp b/src/zm_rtsp_server_fifo_h264_source.cpp
new file mode 100644
index 000000000..9963ea26c
--- /dev/null
+++ b/src/zm_rtsp_server_fifo_h264_source.cpp
@@ -0,0 +1,239 @@
+/* ---------------------------------------------------------------------------
+**
+** H264_FifoSource.cpp
+**
+** H264 Live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#include "zm_rtsp_server_fifo_h264_source.h"
+
+#include "zm_config.h"
+#include "zm_logger.h"
+#include <iomanip>
+#include <sstream>
+
+#if HAVE_RTSP_SERVER
+
+// ---------------------------------
+// H264 ZoneMinder FramedSource
+// ---------------------------------
+//
+H264_ZoneMinderFifoSource::H264_ZoneMinderFifoSource(
+    std::shared_ptr<xop::RtspServer>& rtspServer,
+    xop::MediaSessionId sessionId,
+    xop::MediaChannelId channelId,
+    std::string fifo
+    )
+  : H26X_ZoneMinderFifoSource(rtspServer, sessionId, channelId, fifo)
+{
+  // extradata appears to simply be the SPS and PPS NAL's
+  //this->splitFrames(m_stream->codecpar->extradata, m_stream->codecpar->extradata_size);
+  m_hType = 264;
+}
+
+// split packet into frames
+std::list< std::pair<unsigned char*, size_t> > H264_ZoneMinderFifoSource::splitFrames(unsigned char* frame, size_t &frameSize) {
+	std::list< std::pair<unsigned char*, size_t> > frameList;
+
+	size_t bufSize = frameSize;
+	size_t size = 0;
+	unsigned char* buffer = this->extractFrame(frame, bufSize, size);
+	while ( buffer != nullptr ) {
+#if 0
+  bool updateAux = false;
+		switch ( m_frameType & 0x1F ) {
+			case 7:
+        Debug(4, "SPS_Size: %d bufSize %d", size, bufSize);
+        m_sps.assign((char*)buffer, size);
+        updateAux = true;
+        break;
+			case 8:
+        Debug(4, "PPS_Size: %d bufSize %d", size, bufSize);
+        m_pps.assign((char*)buffer, size);
+        updateAux = true;
+        break;
+			case 5:
+        Debug(4, "IDR_Size: %d bufSize %d", size, bufSize);
+				if ( m_repeatConfig && !m_sps.empty() && !m_pps.empty() ) {
+					frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_sps.c_str(), m_sps.size()));
+					frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_pps.c_str(), m_pps.size()));
+				}
+				break;
+			default:
+				break;
+		}
+
+		if ( updateAux and !m_sps.empty() and !m_pps.empty() ) {
+			u_int32_t profile_level_id = 0;
+			if ( m_sps.size() >= 4 ) profile_level_id = (m_sps[1]<<16)|(m_sps[2]<<8)|m_sps[3];
+
+			char* sps_base64 = base64Encode(m_sps.c_str(), m_sps.size());
+			char* pps_base64 = base64Encode(m_pps.c_str(), m_pps.size());
+
+			std::ostringstream os;
+			os << "profile-level-id=" << std::hex << std::setw(6) << std::setfill('0') << profile_level_id;
+			os << ";sprop-parameter-sets=" << sps_base64 << "," << pps_base64 << "\r\n";
+      if (!(m_width and m_height))
+        os << "a=x-dimensions:" << m_width << "," <<  m_height  << "\r\n";
+			m_auxLine.assign(os.str());
+      Debug(3, "auxLine: %s", m_auxLine.c_str());
+
+			delete [] sps_base64;
+			delete [] pps_base64;
+		}
+#endif
+		frameList.push_back(std::pair<unsigned char*,size_t>(buffer, size));
+    if (!bufSize) break;
+
+		buffer = this->extractFrame(&buffer[size], bufSize, size);
+	}  // end while buffer
+  frameSize = bufSize;
+	return frameList;
+}
+
+H265_ZoneMinderFifoSource::H265_ZoneMinderFifoSource(
+    std::shared_ptr<xop::RtspServer>& rtspServer,
+    xop::MediaSessionId sessionId,
+    xop::MediaChannelId channelId,
+    std::string fifo
+    )
+  : H26X_ZoneMinderFifoSource(rtspServer, sessionId, channelId, fifo)
+{
+  // extradata appears to simply be the SPS and PPS NAL's
+  // this->splitFrames(m_stream->codecpar->extradata, m_stream->codecpar->extradata_size);
+  m_hType = 265;
+}
+
+// split packet in frames
+std::list< std::pair<unsigned char*,size_t> >
+H265_ZoneMinderFifoSource::splitFrames(unsigned char* frame, size_t &frameSize) {
+	std::list< std::pair<unsigned char*, size_t> > frameList;
+
+	size_t bufSize = frameSize;
+	size_t size = 0;
+	unsigned char* buffer = this->extractFrame(frame, bufSize, size);
+	while ( buffer != nullptr ) {
+#if 0
+  bool updateAux = false;
+		switch ((m_frameType&0x7E)>>1) {
+			case 32: 
+        Debug(4, "VPS_Size: %d bufSize %d", size, bufSize);
+        m_vps.assign((char*)buffer,size);
+        updateAux = true;
+        break;
+			case 33:
+        Debug(4, "SPS_Size: %d bufSize %d", size, bufSize);
+        m_sps.assign((char*)buffer,size);
+        updateAux = true;
+        break;
+			case 34:
+        Debug(4, "PPS_Size: %d bufSize %d", size, bufSize);
+        m_pps.assign((char*)buffer,size);
+        updateAux = true;
+        break;
+			case 19:
+			case 20:
+        Debug(4, "IDR_Size: %d bufSize %d", size, bufSize);
+				if ( m_repeatConfig && !m_vps.empty() && !m_sps.empty() && !m_pps.empty() ) {
+					frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_vps.c_str(), m_vps.size()));
+					frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_sps.c_str(), m_sps.size()));
+					frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_pps.c_str(), m_pps.size()));
+				}
+        break;
+      default:
+        //Debug(4, "Unknown frametype!? %d %d", m_frameType, ((m_frameType & 0x7E) >> 1));
+        break;
+		}
+
+		if ( updateAux and !m_vps.empty() and !m_sps.empty() and !m_pps.empty() ) {
+			char* vps_base64 = base64Encode(m_vps.c_str(), m_vps.size());
+			char* sps_base64 = base64Encode(m_sps.c_str(), m_sps.size());
+			char* pps_base64 = base64Encode(m_pps.c_str(), m_pps.size());
+
+			std::ostringstream os;
+			os << "sprop-vps=" << vps_base64;
+			os << ";sprop-sps=" << sps_base64;
+			os << ";sprop-pps=" << pps_base64;
+      os << "\r\n" << "a=x-dimensions:" << m_width << "," <<  m_height  << "\r\n";
+			m_auxLine.assign(os.str());
+      Debug(1, "Assigned h265 auxLine to %s", m_auxLine.c_str());
+
+			delete [] vps_base64;
+			delete [] sps_base64;
+			delete [] pps_base64;
+		}
+#endif
+		frameList.push_back(std::pair<unsigned char*,size_t>(buffer, size));
+
+		buffer = this->extractFrame(&buffer[size], bufSize, size);
+	}  // end while buffer
+  frameSize = bufSize;
+	return frameList;
+}  // end H265_ZoneMinderFifoSource::splitFrames(unsigned char* frame, unsigned frameSize)
+
+unsigned char * H26X_ZoneMinderFifoSource::findMarker(
+    unsigned char *frame, size_t size, size_t &length
+    ) {
+  //Debug(1, "findMarker %p %d", frame, size);
+  unsigned char *start = nullptr;
+  for ( size_t i = 0; i < size-2; i += 1 ) {
+    //Debug(1, "%d: %d %d %d", i, frame[i], frame[i+1], frame[i+2]);
+    if ( (frame[i] == 0) and (frame[i+1]) == 0 and (frame[i+2] == 1) ) {
+      if ( i and (frame[i-1] == 0) ) {
+        start = frame + i - 1;
+        length = sizeof(H264marker);
+      } else {
+        start = frame + i;
+        length = sizeof(H264shortmarker);
+      }
+      break;
+    }
+  }
+  return start;
+}
+
+// extract a frame
+unsigned char*  H26X_ZoneMinderFifoSource::extractFrame(unsigned char* frame, size_t& size, size_t& outsize) {
+	unsigned char *outFrame = nullptr;
+	Debug(4, "ExtractFrame: %p %zu", frame, size);
+	outsize = 0;
+	size_t markerLength = 0;
+	size_t endMarkerLength = 0;
+	m_frameType = 0;
+  unsigned char *startFrame = nullptr;
+  if ( size >= 3 )
+    startFrame = this->findMarker(frame, size, markerLength);
+	if ( startFrame != nullptr ) {
+		Debug(4, "startFrame: %p marker Length %zu", startFrame, markerLength);
+		m_frameType = startFrame[markerLength];
+
+		int remainingSize = size-(startFrame-frame+markerLength);
+		unsigned char *endFrame = nullptr;
+    if ( remainingSize > 3 ) {
+      endFrame = this->findMarker(startFrame+markerLength, remainingSize, endMarkerLength);
+    }
+		Debug(4, "endFrame: %p marker Length %zu, remaining size %d", endFrame, endMarkerLength, remainingSize);
+
+		if ( m_keepMarker ) {
+			size -=  startFrame-frame;
+			outFrame = startFrame;
+		} else {
+			size -=  startFrame-frame+markerLength;
+			outFrame = &startFrame[markerLength];
+		}
+
+		if ( endFrame != nullptr ) {
+			outsize = endFrame - outFrame;
+		} else {
+			outsize = size;
+		}
+		size -= outsize;
+		Debug(4, "Have frame type: %d size %zu, keepmarker %d", m_frameType, outsize, m_keepMarker);
+	} else if ( size >= sizeof(H264shortmarker) ) {
+		Info("No marker found size %zu", size);
+	}
+
+	return outFrame;
+}
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_fifo_h264_source.h b/src/zm_rtsp_server_fifo_h264_source.h
new file mode 100644
index 000000000..d771c9ac7
--- /dev/null
+++ b/src/zm_rtsp_server_fifo_h264_source.h
@@ -0,0 +1,77 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+** H264_ZoneMinderFifoSource.h
+**
+** H264 ZoneMinder live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#ifndef ZM_RTSP_H264_FIFO_SOURCE_H
+#define ZM_RTSP_H264_FIFO_SOURCE_H
+
+#include "zm_config.h"
+#include "zm_rtsp_server_fifo_video_source.h"
+
+// ---------------------------------
+// H264 ZoneMinder FramedSource
+// ---------------------------------
+#if HAVE_RTSP_SERVER
+class H26X_ZoneMinderFifoSource : public ZoneMinderFifoVideoSource {
+	public:
+		H26X_ZoneMinderFifoSource(
+        std::shared_ptr<xop::RtspServer>& rtspServer,
+        xop::MediaSessionId sessionId,
+        xop::MediaChannelId channelId,
+        const std::string &fifo
+        )
+			:
+        ZoneMinderFifoVideoSource(rtspServer, sessionId, channelId, fifo),
+        m_keepMarker(false),
+        m_frameType(0) { }
+
+		virtual ~H26X_ZoneMinderFifoSource() {}
+
+		virtual unsigned char* extractFrame(unsigned char* frame, size_t& size, size_t& outsize) override;
+    virtual unsigned char* findMarker(unsigned char *frame, size_t size, size_t &length);
+
+	protected:
+		std::string m_sps;
+		std::string m_pps;
+		bool        m_keepMarker;
+		int         m_frameType;
+};
+
+class H264_ZoneMinderFifoSource : public H26X_ZoneMinderFifoSource {
+	public:
+		H264_ZoneMinderFifoSource(
+        std::shared_ptr<xop::RtspServer>& rtspServer,
+        xop::MediaSessionId sessionId,
+        xop::MediaChannelId channelId,
+        std::string fifo
+        );
+
+		// overide ZoneMinderFifoSource
+		virtual std::list< std::pair<unsigned char*,size_t> > splitFrames(unsigned char* frame, size_t &frameSize) override;
+};
+
+class H265_ZoneMinderFifoSource : public H26X_ZoneMinderFifoSource {
+	public:
+		H265_ZoneMinderFifoSource(
+        std::shared_ptr<xop::RtspServer>& rtspServer,
+        xop::MediaSessionId sessionId,
+        xop::MediaChannelId channelId,
+        std::string fifo
+        );
+
+		// overide ZoneMinderFifoSource
+		virtual std::list< std::pair<unsigned char*,size_t> > splitFrames(unsigned char* frame, size_t &frameSize) override;
+
+	protected:
+		std::string m_vps;
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_H264_FIFO_SOURCE_H
diff --git a/src/zm_rtsp_server_fifo_source.cpp b/src/zm_rtsp_server_fifo_source.cpp
new file mode 100644
index 000000000..6a6066bcf
--- /dev/null
+++ b/src/zm_rtsp_server_fifo_source.cpp
@@ -0,0 +1,284 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+**
+** ZoneMinder Live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#include "zm_rtsp_server_fifo_source.h"
+#include "zm_rtsp_server_frame.h"
+
+#include "zm_config.h"
+#include "zm_ffmpeg.h"
+#include "zm_logger.h"
+#include "zm_signal.h"
+
+#include <fcntl.h>
+#include <sys/file.h>
+
+#if HAVE_RTSP_SERVER
+ZoneMinderFifoSource::ZoneMinderFifoSource(
+    std::shared_ptr<xop::RtspServer>& rtspServer,
+    xop::MediaSessionId sessionId,
+    xop::MediaChannelId channelId,
+    std::string fifo
+    ) :
+  stop_(false),
+  m_rtspServer(rtspServer),
+  m_sessionId(sessionId),
+  m_channelId(channelId),
+	m_fifo(fifo),
+  m_fd(-1),
+  m_hType(0)
+{
+  read_thread_ = std::thread(&ZoneMinderFifoSource::ReadRun, this);
+  write_thread_ = std::thread(&ZoneMinderFifoSource::WriteRun, this);
+}
+
+ZoneMinderFifoSource::~ZoneMinderFifoSource() {
+  Debug(1, "Deleting Fifo Source");
+    Stop();
+  if (read_thread_.joinable())
+    read_thread_.join();
+  if (write_thread_.joinable())
+    write_thread_.join();
+  Debug(1, "Deleting Fifo Source done");
+}
+
+// thread mainloop
+void ZoneMinderFifoSource::ReadRun() {
+  if (stop_) Warning("bad value for stop_ in ReadRun");
+	while (!stop_) {
+		if (getNextFrame() < 0) {
+      Debug(1, "Sleeping");
+      sleep(1);
+    }
+	}
+}
+void ZoneMinderFifoSource::WriteRun() {
+  size_t maxNalSize = 1400;
+
+  if (stop_) Warning("bad value for stop_ in WriteRun");
+	while (!stop_) {
+    NAL_Frame *nal = nullptr;
+    while (!stop_ and !nal) {
+      std::unique_lock<std::mutex> lck(mutex_);
+      if (m_nalQueue.empty()) {
+        Debug(3, "waiting");
+        condition_.wait(lck);
+      }
+      if (!m_nalQueue.empty()) {
+        nal = m_nalQueue.front();
+        m_nalQueue.pop();
+      }
+    }
+
+    if (nal) {
+      if (1 and (nal->size() > maxNalSize)) {
+        Debug(1, "Splitting NAL %zu", nal->size());
+        size_t nalRemaining = nal->size();
+        u_int8_t *nalSrc = nal->buffer();
+
+        int fuNalSize = maxNalSize;
+       // ? nalRemaining : maxNalSize;
+        NAL_Frame fuNal(nullptr, fuNalSize, nal->pts());
+        memcpy(fuNal.buffer()+1, nalSrc, fuNalSize-1);
+
+        if (m_hType == 264) {
+          fuNal.buffer()[0] = (nalSrc[0] & 0xE0) | 28; // FU indicator
+          fuNal.buffer()[1] = 0x80 | (nalSrc[0] & 0x1F); // FU header (with S bit)
+        } else { // 265
+          u_int8_t nalUnitType = (nalSrc[0]&0x7E)>>1;
+          fuNal.buffer()[0] = (nalSrc[0] & 0x81) | (49<<1); // Payload header (1st byte)
+          fuNal.buffer()[1] = nalSrc[1]; // Payload header (2nd byte)
+          fuNal.buffer()[2] = 0x80 | nalUnitType; // FU header (with S bit)
+        }
+        PushFrame(fuNal.buffer(), fuNal.size(), fuNal.pts());
+        nalRemaining -= maxNalSize-1;
+        nalSrc += maxNalSize-1;
+        int nal_count = 0;
+
+        int headerSize = 0;
+        if (m_hType == 264) {
+          fuNal.buffer()[1] = fuNal.buffer()[1]&~0x80; // FU header (no S bit)
+          headerSize = 2;
+        } else { // 265
+          fuNal.buffer()[2] = fuNal.buffer()[2]&~0x80; // FU header (no S bit)
+          headerSize = 3;
+        }
+        while (nalRemaining) {
+          if ( nalRemaining < maxNalSize ) {
+            // This is the last fragment:
+            fuNal.buffer()[headerSize-1] |= 0x40; // set the E bit in the FU header
+          }
+          fuNalSize = (nalRemaining < maxNalSize-headerSize) ? nalRemaining : maxNalSize-headerSize;
+          fuNal.size(fuNalSize+headerSize);
+          memcpy(fuNal.buffer()+headerSize, nalSrc, fuNalSize);
+
+          PushFrame(fuNal.buffer(), fuNal.size(), fuNal.pts());
+          nalRemaining -= fuNalSize;
+          nalSrc += fuNalSize;
+          nal_count += 1;
+        }
+        Debug(1, "Sending %d NALs @ %zu and 1 @ %zu", nal_count, maxNalSize, fuNal.size());
+      } else {
+        Debug(3, "Pushing nal of size %zu at %" PRId64, nal->size(), nal->pts());
+        PushFrame(nal->buffer(), nal->size(), nal->pts());
+      }
+      delete nal;
+      nal = nullptr;
+      Debug(3, "Done Pushing nal");
+    }  // end if nal
+	}  // end while !_stop
+}
+
+// read from monitor
+int ZoneMinderFifoSource::getNextFrame() {
+  if (zm_terminate or stop_) {
+    Debug(1, "Terminating %d %d", zm_terminate, (stop_==true?1:0));
+    return -1;
+  }
+
+  if (m_fd == -1) {
+    Debug(1, "Opening fifo %s", m_fifo.c_str());
+    m_fd = open(m_fifo.c_str(), O_RDONLY);
+    if (m_fd < 0) {
+      Error("Can't open %s: %s", m_fifo.c_str(), strerror(errno));
+      return -1;
+    }
+  }
+
+  int bytes_read = m_buffer.read_into(m_fd, 32);
+  //int bytes_read = m_buffer.read_into(m_fd, 4096, {1,0});
+  if (bytes_read == 0) {
+    Debug(3, "No bytes read");
+    sleep(1);
+    return -1;
+  }
+  if (bytes_read < 0) {
+    Error("Problem during reading: %s", strerror(errno));
+    ::close(m_fd);
+    m_fd = -1;
+    return -1;
+  }
+
+  Debug(3, "%s bytes read %d bytes, buffer size %u", m_fifo.c_str(), bytes_read, m_buffer.size());
+  while (m_buffer.size()) {
+    unsigned int data_size = 0;
+    int64_t pts;
+    unsigned char *header_end = nullptr;
+    unsigned char *header_start = nullptr;
+
+    if ((header_start = (unsigned char *)memmem(m_buffer.head(), m_buffer.size(), "ZM", 2))) {
+      // next step, look for \n
+      header_end = (unsigned char *)memchr(header_start, '\n', m_buffer.tail()-header_start);
+      if (!header_end) {
+        // Must not have enough data.  So... keep all.
+        Debug(1, "Didn't find newline buffer size is %d", m_buffer.size());
+        return 0;
+      }
+
+      unsigned int header_size = header_end-header_start;
+      char *header = new char[header_size+1];
+      strncpy(header, reinterpret_cast<const char *>(header_start), header_size);
+      header[header_size] = '\0';
+
+      char *content_length_ptr = strchr(header, ' ');
+      if (!content_length_ptr) {
+        Debug(1, "Didn't find space delineating size in %s", header);
+        m_buffer.consume((header_start-m_buffer.head()) + 2);
+        delete[] header;
+        return 0;
+      }
+      *content_length_ptr = '\0';
+      content_length_ptr ++;
+      char *pts_ptr = strchr(content_length_ptr, ' ');
+      if (!pts_ptr) {
+        m_buffer.consume((header_start-m_buffer.head()) + 2);
+        Debug(1, "Didn't find space delineating pts in %s", header);
+        delete[] header;
+        return 0;
+      }
+      *pts_ptr = '\0';
+      pts_ptr ++;
+      data_size = atoi(content_length_ptr);
+      pts = strtoll(pts_ptr, nullptr, 10);
+      Debug(4, "ZM Packet %s header_size %d packet size %u pts %s %" PRId64, header, header_size, data_size, pts_ptr, pts);
+      delete[] header;
+    } else {
+      Debug(1, "ZM header not found in %d of buffer:%s.", m_buffer.size(), m_buffer.head());
+      m_buffer.clear();
+      return 0;
+    }
+    if (header_start != m_buffer) {
+      Debug(4, "ZM Packet didn't start at beginning of buffer %ld. %c%c",
+            header_start - m_buffer.head(), m_buffer[0], m_buffer[1]);
+    }
+
+    // read_into may invalidate packet_start
+    unsigned int header_size = (header_end+1) /*packet_start*/ - m_buffer.head(); // includes any bytes before header
+
+    int bytes_needed = data_size - (m_buffer.size() - header_size);
+    if (bytes_needed > 0) {
+      Debug(4, "Need another %d bytes. Trying to read them", bytes_needed);
+      while (bytes_needed) {
+        int bytes_read = m_buffer.read_into(m_fd, bytes_needed);
+        if (bytes_read <= 0) {
+          Debug(1, "Failed to read another %d bytes, got %d.", bytes_needed, bytes_read);
+          return -1;
+        }
+
+        if (bytes_read != bytes_needed) {
+          Debug(4, "Failed to read another %d bytes, got %d.", bytes_needed, bytes_read);
+        }
+        bytes_needed -= bytes_read;
+      }  // end while bytes_neeeded
+    }
+    //Debug(4, "Consuming %d", header_size);
+    //m_buffer.consume(header_size);
+
+    unsigned char *packet_start = m_buffer.head() + header_size;
+    size_t bytes_remaining = data_size;
+    std::list< std::pair<unsigned char*, size_t> > framesList = this->splitFrames(packet_start, bytes_remaining);
+    m_buffer.consume(data_size+header_size);
+    Debug(3, "Got %zu frames, consuming %d bytes, remaining %zu",
+          framesList.size(),
+          data_size + header_size,
+          bytes_remaining);
+
+    {
+      std::unique_lock<std::mutex> lck(mutex_);
+      Debug(3, "have lock");
+      while (framesList.size()) {
+        std::pair<unsigned char*, size_t> nal = framesList.front();
+        framesList.pop_front();
+        NAL_Frame *Nal = new NAL_Frame(nal.first, nal.second, pts);
+        m_nalQueue.push(Nal);
+      }
+    }
+    Debug(1, "notifying");
+    condition_.notify_all();
+  } // end while m_buffer.size()
+  return 1;
+}
+
+// split packet in frames
+std::list< std::pair<unsigned char*,size_t> > ZoneMinderFifoSource::splitFrames(unsigned char* frame, size_t &frameSize) {
+  std::list< std::pair<unsigned char*,size_t> > frameList;
+  if ( frame != nullptr ) {
+    frameList.push_back(std::pair<unsigned char*,size_t>(frame, frameSize));
+  }
+  frameSize = 0;
+  return frameList;
+}
+
+// extract a frame
+unsigned char*  ZoneMinderFifoSource::extractFrame(unsigned char* frame, size_t& size, size_t& outsize) {
+  outsize = size;
+  size = 0;
+  return frame;
+}
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_fifo_source.h b/src/zm_rtsp_server_fifo_source.h
new file mode 100644
index 000000000..eb9fd4fe9
--- /dev/null
+++ b/src/zm_rtsp_server_fifo_source.h
@@ -0,0 +1,73 @@
+/* ---------------------------------------------------------------------------
+**
+** FifoSource.h
+** 
+**  live555 source 
+**
+** -------------------------------------------------------------------------*/
+
+#ifndef ZM_RTSP_SERVER_FIFO_SOURCE_H
+#define ZM_RTSP_SERVER_FIFO_SOURCE_H
+
+#include "zm_buffer.h"
+#include "zm_config.h"
+#include "zm_ffmpeg.h"
+#include "zm_define.h"
+#include "zm_rtsp_server_frame.h"
+#include <list>
+#include <string>
+#include <thread>
+#include <utility>
+
+#if HAVE_RTSP_SERVER
+#include "xop/RtspServer.h"
+
+class ZoneMinderFifoSource {
+		
+	public:
+
+    void Stop() {
+      stop_ = true;
+      condition_.notify_all();
+    };
+
+    ZoneMinderFifoSource(
+        std::shared_ptr<xop::RtspServer>& rtspServer,
+        xop::MediaSessionId sessionId,
+        xop::MediaChannelId channelId,
+        std::string fifo
+        );
+		virtual ~ZoneMinderFifoSource();
+
+	protected:	
+		void ReadRun();
+		void WriteRun();
+
+		int getNextFrame();
+    virtual void PushFrame(const uint8_t *data, size_t size, int64_t pts) = 0;
+     // split packet in frames
+    virtual std::list< std::pair<unsigned char*, size_t> > splitFrames(unsigned char* frame, size_t &frameSize);
+    virtual unsigned char *extractFrame(unsigned char *data, size_t& size, size_t& outsize);
+
+	protected:
+
+    std::mutex  mutex_;
+    std::condition_variable condition_;
+
+    std::thread read_thread_;
+    std::thread write_thread_;
+    std::atomic<bool> stop_;
+
+    std::shared_ptr<xop::RtspServer>& m_rtspServer;
+    xop::MediaSessionId m_sessionId;
+    xop::MediaChannelId m_channelId;
+    std::string m_fifo;
+    int m_fd;
+    Buffer  m_buffer;
+    AVRational m_timeBase;
+    std::queue<NAL_Frame *> m_nalQueue;
+    int m_hType;
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_FIFO_SOURCE_H
diff --git a/src/zm_rtsp_server_fifo_video_source.cpp b/src/zm_rtsp_server_fifo_video_source.cpp
new file mode 100644
index 000000000..df8c32955
--- /dev/null
+++ b/src/zm_rtsp_server_fifo_video_source.cpp
@@ -0,0 +1,31 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+**
+** ZoneMinder Live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#include "zm_rtsp_server_fifo_video_source.h"
+
+#if HAVE_RTSP_SERVER
+ZoneMinderFifoVideoSource::ZoneMinderFifoVideoSource(
+    std::shared_ptr<xop::RtspServer>& rtspServer,
+    xop::MediaSessionId sessionId,
+    xop::MediaChannelId channelId,
+    std::string fifo
+    ) :
+  ZoneMinderFifoSource(rtspServer, sessionId, channelId, fifo)
+{
+  m_timeBase = {1, 90000};
+}
+
+void ZoneMinderFifoVideoSource::PushFrame(const uint8_t *data, size_t size, int64_t pts) {
+  xop::AVFrame frame(data, size);
+  frame.timestamp = av_rescale_q(pts, AV_TIME_BASE_Q, m_timeBase);
+  m_rtspServer->PushFrame(m_sessionId, m_channelId, frame);
+}
+
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_fifo_video_source.h b/src/zm_rtsp_server_fifo_video_source.h
new file mode 100644
index 000000000..765b79092
--- /dev/null
+++ b/src/zm_rtsp_server_fifo_video_source.h
@@ -0,0 +1,39 @@
+/* ---------------------------------------------------------------------------
+**
+** FifoSource.h
+** 
+**  live555 source 
+**
+** -------------------------------------------------------------------------*/
+
+#ifndef ZM_RTSP_SERVER_FIFO_VIDEO_SOURCE_H
+#define ZM_RTSP_SERVER_FIFO_VIDEO_SOURCE_H
+
+#include "zm_rtsp_server_fifo_source.h"
+
+#if HAVE_RTSP_SERVER
+
+class ZoneMinderFifoVideoSource: public ZoneMinderFifoSource {
+		
+  public:
+		int getWidth() { return m_width; };	
+		int getHeight() { return m_height; };	
+		int setWidth(int width) { return m_width=width; };	
+		int setHeight(int height) { return m_height=height; };	
+
+		ZoneMinderFifoVideoSource(
+        std::shared_ptr<xop::RtspServer>& rtspServer,
+        xop::MediaSessionId sessionId,
+        xop::MediaChannelId channelId,
+        std::string fifo
+        );
+  protected:
+    void PushFrame(const uint8_t *data, size_t size, int64_t pts) override;
+
+	protected:
+    int m_width;
+    int m_height;
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_FIFO_VIDEO_SOURCE_H
diff --git a/src/zm_rtsp_server_frame.h b/src/zm_rtsp_server_frame.h
new file mode 100644
index 000000000..363ac7995
--- /dev/null
+++ b/src/zm_rtsp_server_frame.h
@@ -0,0 +1,79 @@
+#ifndef ZM_RTSP_SERVER_FRAME_H
+#define ZM_RTSP_SERVER_FRAME_H
+
+#include "zm_config.h"
+#include "zm_logger.h"
+#include <cstring>
+#include <sys/time.h>
+
+#if HAVE_RTSP_SERVER
+// ---------------------------------
+// Captured frame
+// ---------------------------------
+const char H264marker[] = {0,0,0,1};
+const char H264shortmarker[] = {0,0,1};
+
+class NAL_Frame {
+  public:
+    NAL_Frame(unsigned char * buffer, size_t size, int64 pts) :
+      m_buffer(nullptr),
+      m_size(size),
+      m_pts(pts),
+      m_ref_count(1) {
+        m_buffer = new unsigned char[m_size];
+        if (buffer) {
+          memcpy(m_buffer, buffer, m_size);
+        }
+      };
+    NAL_Frame& operator=(const NAL_Frame&);
+    ~NAL_Frame()  {
+      delete[] m_buffer;
+      m_buffer = nullptr;
+    };
+    unsigned char *buffer() const { return m_buffer; };
+    // The buffer has a 32bit nal size value at the front, so if we want the nal, it's
+    // the address of the buffer plus 4 bytes.
+    unsigned char *nal() const { return m_buffer+4; };
+    size_t size() const { return m_size; };
+    size_t size(size_t new_size) { m_size=new_size; return m_size; };
+    size_t nal_size() const { return m_size-4; };
+    int64_t pts() const { return m_pts; };
+    bool check() const {
+      // Look for marker at beginning
+      unsigned char *marker = (unsigned char*)memmem(m_buffer, sizeof(H264marker), H264marker, sizeof(H264marker));
+      if ( marker ) {
+        Debug(1, "marker found at beginning");
+        return true;
+      } else {
+        marker = (unsigned char*)memmem(m_buffer, m_size, H264marker, sizeof(H264marker));
+        if ( marker ) {
+          Debug(1, "marker not found at beginning");
+          return false;
+        }
+      }
+      return false;
+    }
+
+    void debug() {
+      if (m_size <= 4) {
+        Debug(1, "NAL: %zu: %.2x %.2x %.2x %.2x", m_size,
+              m_buffer[0], m_buffer[1], m_buffer[2], m_buffer[3]);
+      } else {
+        Debug(1, "NAL: %zu: %.2x %.2x %.2x %.2x   %.2x %.2x %.2x %.2x ", m_size,
+              m_buffer[0], m_buffer[1], m_buffer[2], m_buffer[3],
+              m_buffer[4], m_buffer[5], m_buffer[6], m_buffer[7]
+        );
+      }
+    }
+
+  private:
+    unsigned char* m_buffer;
+    size_t m_size;
+  public:
+    int64 m_pts;
+  private:
+    int m_ref_count;
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_FRAME_H
diff --git a/src/zm_rtsp_server_h264_device_source.cpp b/src/zm_rtsp_server_h264_device_source.cpp
new file mode 100644
index 000000000..71b641021
--- /dev/null
+++ b/src/zm_rtsp_server_h264_device_source.cpp
@@ -0,0 +1,241 @@
+/* ---------------------------------------------------------------------------
+**
+** H264_DeviceSource.cpp
+**
+** H264 Live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#include "zm_rtsp_server_h264_device_source.h"
+
+#include "zm_config.h"
+#include "zm_logger.h"
+#include "zm_rtsp_server_frame.h"
+#include <iomanip>
+#include <sstream>
+
+#if HAVE_RTSP_SERVER
+// live555
+#include <Base64.hh>
+
+// ---------------------------------
+// H264 ZoneMinder FramedSource
+// ---------------------------------
+//
+H264_ZoneMinderDeviceSource::H264_ZoneMinderDeviceSource(
+    UsageEnvironment& env,
+    std::shared_ptr<Monitor> monitor,
+    AVStream *stream,
+    unsigned int queueSize,
+    bool repeatConfig,
+    bool keepMarker)
+  : H26X_ZoneMinderDeviceSource(env, std::move(monitor), stream, queueSize, repeatConfig, keepMarker)
+{
+  // extradata appears to simply be the SPS and PPS NAL's
+  this->splitFrames(
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      m_stream->codecpar->extradata, m_stream->codecpar->extradata_size
+#else
+      m_stream->codec->extradata, m_stream->codec->extradata_size
+#endif
+      );
+}
+
+// split packet into frames
+std::list< std::pair<unsigned char*, size_t> > H264_ZoneMinderDeviceSource::splitFrames(unsigned char* frame, unsigned frameSize) {
+	std::list< std::pair<unsigned char*, size_t> > frameList;
+
+	size_t bufSize = frameSize;
+	size_t size = 0;
+	unsigned char* buffer = this->extractFrame(frame, bufSize, size);
+	while ( buffer != nullptr ) {
+		switch ( m_frameType & 0x1F ) {
+			case 7:
+        Debug(1, "SPS_Size: %d bufSize %d", size, bufSize);
+        m_sps.assign((char*)buffer, size);
+        break;
+			case 8:
+        Debug(1, "PPS_Size: %d bufSize %d", size, bufSize);
+        m_pps.assign((char*)buffer, size);
+        break;
+			case 5:
+        Debug(1, "IDR_Size: %d bufSize %d", size, bufSize);
+				if ( m_repeatConfig && !m_sps.empty() && !m_pps.empty() ) {
+					frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_sps.c_str(), m_sps.size()));
+					frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_pps.c_str(), m_pps.size()));
+				}
+				break;
+			default:
+        Debug(1, "Unknown frametype!? %d %d", m_frameType, m_frameType & 0x1F);
+				break;
+		}
+
+		if ( !m_sps.empty() && !m_pps.empty() ) {
+			u_int32_t profile_level_id = 0;
+			if ( m_sps.size() >= 4 ) profile_level_id = (m_sps[1]<<16)|(m_sps[2]<<8)|m_sps[3];
+
+			char* sps_base64 = base64Encode(m_sps.c_str(), m_sps.size());
+			char* pps_base64 = base64Encode(m_pps.c_str(), m_pps.size());
+
+			std::ostringstream os;
+			os << "profile-level-id=" << std::hex << std::setw(6) << std::setfill('0') << profile_level_id;
+			os << ";sprop-parameter-sets=" << sps_base64 << "," << pps_base64;
+			m_auxLine.assign(os.str());
+      Debug(1, "auxLine: %s", m_auxLine.c_str());
+
+			delete [] sps_base64;
+			delete [] pps_base64;
+		}
+		frameList.push_back(std::pair<unsigned char*,size_t>(buffer, size));
+
+		buffer = this->extractFrame(&buffer[size], bufSize, size);
+	}  // end while buffer
+	return frameList;
+}
+
+H265_ZoneMinderDeviceSource::H265_ZoneMinderDeviceSource(
+    UsageEnvironment& env,
+    std::shared_ptr<Monitor> monitor,
+    AVStream *stream,
+    unsigned int queueSize,
+    bool repeatConfig,
+    bool keepMarker)
+  : H26X_ZoneMinderDeviceSource(env, std::move(monitor), stream, queueSize, repeatConfig, keepMarker)
+{
+  // extradata appears to simply be the SPS and PPS NAL's
+  this->splitFrames(
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      m_stream->codecpar->extradata, m_stream->codecpar->extradata_size
+#else
+      m_stream->codec->extradata, m_stream->codec->extradata_size
+#endif
+      );
+}
+
+// split packet in frames
+std::list< std::pair<unsigned char*,size_t> >
+H265_ZoneMinderDeviceSource::splitFrames(unsigned char* frame, unsigned frameSize) {
+	std::list< std::pair<unsigned char*,size_t> > frameList;
+
+	size_t bufSize = frameSize;
+	size_t size = 0;
+	unsigned char* buffer = this->extractFrame(frame, bufSize, size);
+	while ( buffer != nullptr ) {
+		switch ((m_frameType&0x7E)>>1) {
+			case 32: 
+        Debug(1, "VPS_Size: %d bufSize %d", size, bufSize);
+        m_vps.assign((char*)buffer,size);
+        break;
+			case 33:
+        Debug(1, "SPS_Size: %d bufSize %d", size, bufSize);
+        m_sps.assign((char*)buffer,size);
+        break;
+			case 34:
+        Debug(1, "PPS_Size: %d bufSize %d", size, bufSize);
+        m_pps.assign((char*)buffer,size);
+        break;
+			case 19:
+			case 20:
+        Debug(1, "IDR_Size: %d bufSize %d", size, bufSize);
+				if ( m_repeatConfig && !m_vps.empty() && !m_sps.empty() && !m_pps.empty() ) {
+					frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_vps.c_str(), m_vps.size()));
+					frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_sps.c_str(), m_sps.size()));
+					frameList.push_back(std::pair<unsigned char*,size_t>((unsigned char*)m_pps.c_str(), m_pps.size()));
+				}
+        break;
+      default:
+        Debug(1, "Unknown frametype!? %d %d", m_frameType, ((m_frameType & 0x7E) >> 1));
+        break;
+		}
+
+		if ( !m_vps.empty() && !m_sps.empty() && !m_pps.empty() ) {
+			char* vps_base64 = base64Encode(m_vps.c_str(), m_vps.size());
+			char* sps_base64 = base64Encode(m_sps.c_str(), m_sps.size());
+			char* pps_base64 = base64Encode(m_pps.c_str(), m_pps.size());
+
+			std::ostringstream os;
+			os << "sprop-vps=" << vps_base64;
+			os << ";sprop-sps=" << sps_base64;
+			os << ";sprop-pps=" << pps_base64;
+			m_auxLine.assign(os.str());
+      Debug(1, "Assigned auxLine to %s", m_auxLine.c_str());
+
+			delete [] vps_base64;
+			delete [] sps_base64;
+			delete [] pps_base64;
+		}
+		frameList.push_back(std::pair<unsigned char*,size_t>(buffer, size));
+
+		buffer = this->extractFrame(&buffer[size], bufSize, size);
+	}  // end while buffer
+  if ( bufSize ) {
+    Debug(1, "%d bytes remaining", bufSize);
+  }
+	return frameList;
+}  // end H265_ZoneMinderDeviceSource::splitFrames(unsigned char* frame, unsigned frameSize)
+
+unsigned char * H26X_ZoneMinderDeviceSource::findMarker(
+    unsigned char *frame, size_t size, size_t &length
+    ) {
+  //Debug(1, "findMarker %p %d", frame, size);
+  unsigned char *start = nullptr;
+  for ( size_t i = 0; i < size-2; i += 1 ) {
+    //Debug(1, "%d: %d %d %d", i, frame[i], frame[i+1], frame[i+2]);
+    if ( (frame[i] == 0) and (frame[i+1]) == 0 and (frame[i+2] == 1) ) {
+      if ( i and (frame[i-1] == 0) ) {
+        start = frame + i - 1;
+        length = sizeof(H264marker);
+      } else {
+        start = frame + i;
+        length = sizeof(H264shortmarker);
+      }
+      break;
+    }
+  }
+  return start;
+}
+
+// extract a frame
+unsigned char*  H26X_ZoneMinderDeviceSource::extractFrame(unsigned char* frame, size_t& size, size_t& outsize) {
+	unsigned char *outFrame = nullptr;
+  Debug(1, "ExtractFrame: %p %d", frame, size);
+	outsize = 0;
+	size_t markerLength = 0;
+	size_t endMarkerLength = 0;
+	m_frameType = 0;
+  unsigned char *startFrame = nullptr;
+  if ( size >= 3 )
+    startFrame = this->findMarker(frame, size, markerLength);
+	if ( startFrame != nullptr ) {
+    Debug(1, "startFrame: %p marker Length %d", startFrame, markerLength);
+		m_frameType = startFrame[markerLength];
+
+		int remainingSize = size-(startFrame-frame+markerLength);
+		unsigned char *endFrame = nullptr;
+    if ( remainingSize > 3 ) {
+      endFrame = this->findMarker(startFrame+markerLength, remainingSize, endMarkerLength);
+    }
+    Debug(1, "endFrame: %p marker Length %d, remaining size %d", endFrame, endMarkerLength, remainingSize);
+
+		if ( m_keepMarker ) {
+			size -=  startFrame-frame;
+			outFrame = startFrame;
+		} else {
+			size -=  startFrame-frame+markerLength;
+			outFrame = &startFrame[markerLength];
+		}
+
+		if ( endFrame != nullptr ) {
+			outsize = endFrame - outFrame;
+		} else {
+			outsize = size;
+		}
+		size -= outsize;
+    Debug(1, "Have frame type: %d size %d, keepmarker %d", m_frameType, outsize, m_keepMarker);
+	} else if ( size >= sizeof(H264shortmarker) ) {
+		 Info("No marker found");
+	}
+
+	return outFrame;
+}
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_h264_device_source.h b/src/zm_rtsp_server_h264_device_source.h
new file mode 100644
index 000000000..5c01717c5
--- /dev/null
+++ b/src/zm_rtsp_server_h264_device_source.h
@@ -0,0 +1,104 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+** H264_ZoneMinderDeviceSource.h
+**
+** H264 ZoneMinder live555 source
+**
+** -------------------------------------------------------------------------*/
+
+#ifndef ZM_RTSP_H264_DEVICE_SOURCE_H
+#define ZM_RTSP_H264_DEVICE_SOURCE_H
+
+#include "zm_config.h"
+#include "zm_rtsp_server_device_source.h"
+
+// ---------------------------------
+// H264 ZoneMinder FramedSource
+// ---------------------------------
+#if HAVE_RTSP_SERVER
+class H26X_ZoneMinderDeviceSource : public ZoneMinderDeviceSource {
+	protected:
+		H26X_ZoneMinderDeviceSource(
+        UsageEnvironment& env,
+        std::shared_ptr<Monitor> monitor,
+        AVStream *stream,
+        unsigned int queueSize,
+        bool repeatConfig,
+        bool keepMarker)
+			:
+        ZoneMinderDeviceSource(env, std::move(monitor), stream, queueSize),
+        m_repeatConfig(repeatConfig),
+        m_keepMarker(keepMarker),
+        m_frameType(0) { }
+
+		virtual ~H26X_ZoneMinderDeviceSource() {}
+
+		virtual unsigned char* extractFrame(unsigned char* frame, size_t& size, size_t& outsize);
+    virtual unsigned char* findMarker(unsigned char *frame, size_t size, size_t &length);
+
+	protected:
+		std::string m_sps;
+		std::string m_pps;
+		bool        m_repeatConfig;
+		bool        m_keepMarker;
+		int         m_frameType;
+};
+
+class H264_ZoneMinderDeviceSource : public H26X_ZoneMinderDeviceSource {
+	public:
+		static H264_ZoneMinderDeviceSource* createNew(
+				UsageEnvironment& env,
+				std::shared_ptr<Monitor> monitor,
+				AVStream *stream,
+				unsigned int queueSize,
+				bool repeatConfig,
+				bool keepMarker) {
+			return new H264_ZoneMinderDeviceSource(env, std::move(monitor), stream, queueSize, repeatConfig, keepMarker);
+		}
+
+	protected:
+		H264_ZoneMinderDeviceSource(
+        UsageEnvironment& env,
+        std::shared_ptr<Monitor> monitor,
+        AVStream *stream,
+        unsigned int queueSize,
+        bool repeatConfig,
+        bool keepMarker);
+
+		// overide ZoneMinderDeviceSource
+		virtual std::list< std::pair<unsigned char*,size_t> > splitFrames(unsigned char* frame, unsigned frameSize);
+};
+
+class H265_ZoneMinderDeviceSource : public H26X_ZoneMinderDeviceSource {
+	public:
+		static H265_ZoneMinderDeviceSource* createNew(
+        UsageEnvironment& env,
+        std::shared_ptr<Monitor> monitor,
+        AVStream *stream,
+        unsigned int queueSize,
+        bool repeatConfig,
+        bool keepMarker) {
+			return new H265_ZoneMinderDeviceSource(env, std::move(monitor), stream, queueSize, repeatConfig, keepMarker);
+		}
+
+	protected:
+		H265_ZoneMinderDeviceSource(
+        UsageEnvironment& env,
+        std::shared_ptr<Monitor> monitor,
+        AVStream *stream,
+        unsigned int queueSize,
+        bool repeatConfig,
+        bool keepMarker);
+
+		// overide ZoneMinderDeviceSource
+		virtual std::list< std::pair<unsigned char*,size_t> > splitFrames(unsigned char* frame, unsigned frameSize);
+
+	protected:
+		std::string m_vps;
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_H264_DEVICE_SOURCE_H
diff --git a/src/zm_rtsp_server_server_media_subsession.cpp b/src/zm_rtsp_server_server_media_subsession.cpp
new file mode 100644
index 000000000..141e8dad1
--- /dev/null
+++ b/src/zm_rtsp_server_server_media_subsession.cpp
@@ -0,0 +1,108 @@
+/* ---------------------------------------------------------------------------
+**
+** ServerMediaSubsession.cpp
+** 
+** -------------------------------------------------------------------------*/
+
+#include "zm_rtsp_server_server_media_subsession.h"
+
+#include "zm_config.h"
+#include "zm_rtsp_server_adts_source.h"
+#include "zm_rtsp_server_adts_fifo_source.h"
+#include <sstream>
+
+#if HAVE_RTSP_SERVER
+// ---------------------------------
+//   BaseServerMediaSubsession
+// ---------------------------------
+FramedSource* BaseServerMediaSubsession::createSource(
+    UsageEnvironment& env,
+    FramedSource* inputSource,
+    const std::string& format)
+{
+	FramedSource* source = nullptr;
+	if (format == "video/MP2T") {
+		source = MPEG2TransportStreamFramer::createNew(env, inputSource);
+	} else if (format == "video/H264") {
+		source = H264VideoStreamDiscreteFramer::createNew(env, inputSource
+        /*Boolean includeStartCodeInOutput, Boolean insertAccessUnitDelimiters*/
+        );
+	}
+#if LIVEMEDIA_LIBRARY_VERSION_INT > 1414454400
+	else if (format == "video/H265") {
+		source = H265VideoStreamDiscreteFramer::createNew(env, inputSource);
+	}
+#endif
+#if 0
+	else if (format == "video/JPEG") {
+		source = MJPEGVideoSource::createNew(env, inputSource);
+	}
+#endif
+	else {
+		source = inputSource;
+	}
+	return source;
+}
+
+/* source is generally a replica */
+RTPSink*  BaseServerMediaSubsession::createSink(
+    UsageEnvironment& env,
+    Groupsock* rtpGroupsock,
+    unsigned char rtpPayloadTypeIfDynamic,
+    const std::string& format,
+    FramedSource *source
+    ) {
+
+	RTPSink* sink = nullptr;
+	if (format == "video/MP2T") {
+		sink = SimpleRTPSink::createNew(env, rtpGroupsock, rtpPayloadTypeIfDynamic, 90000, "video", "MP2T", 1, true, false);
+	} else if (format == "video/H264") {
+		sink = H264VideoRTPSink::createNew(env, rtpGroupsock, rtpPayloadTypeIfDynamic);
+	} else if (format == "video/VP8") {
+		sink = VP8VideoRTPSink::createNew(env, rtpGroupsock, rtpPayloadTypeIfDynamic);
+	}
+#if LIVEMEDIA_LIBRARY_VERSION_INT > 1414454400
+	else if (format == "video/VP9") {
+		sink = VP9VideoRTPSink::createNew(env, rtpGroupsock, rtpPayloadTypeIfDynamic);
+	} else if (format == "video/H265") {
+		sink = H265VideoRTPSink::createNew(env, rtpGroupsock, rtpPayloadTypeIfDynamic);
+#endif	
+  } else if (format == "audio/AAC") {
+    ADTS_ZoneMinderFifoSource *adts_source = (ADTS_ZoneMinderFifoSource *)(m_replicator->inputSource());
+    sink = MPEG4GenericRTPSink::createNew(env, rtpGroupsock,
+        rtpPayloadTypeIfDynamic,
+        adts_source->getFrequency(),
+        "audio", "AAC-hbr",
+        adts_source->configStr(),
+        adts_source->getChannels()
+        );
+  } else {
+    Error("unknown format");
+	}
+#if 0
+	else if (format == "video/JPEG") {
+		sink = JPEGVideoRTPSink::createNew (env, rtpGroupsock); 
+	}
+#endif
+	return sink;
+}
+
+char const* BaseServerMediaSubsession::getAuxLine(
+    ZoneMinderFifoSource* source,
+    unsigned char rtpPayloadType
+    ) {
+	const char* auxLine = nullptr;
+	if (source) {
+		std::ostringstream os; 
+		os << "a=fmtp:" << int(rtpPayloadType) << " ";
+		os << source->getAuxLine();
+		//os << "\r\n";
+		auxLine = strdup(os.str().c_str());
+    Debug(1, "BaseServerMediaSubsession::auxLine: %s", auxLine);
+  } else {
+    Error("No source auxLine:");
+    return "";
+	}
+	return auxLine;
+}
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_server_media_subsession.h b/src/zm_rtsp_server_server_media_subsession.h
new file mode 100644
index 000000000..d3780cd6e
--- /dev/null
+++ b/src/zm_rtsp_server_server_media_subsession.h
@@ -0,0 +1,48 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+** ServerMediaSubsession.h
+** 
+** -------------------------------------------------------------------------*/
+
+#ifndef ZM_RTSP_SERVER_SERVER_MEDIA_SUBSESSION_H
+#define ZM_RTSP_SERVER_SERVER_MEDIA_SUBSESSION_H
+
+#include "zm_config.h"
+#include "zm_rtsp_server_fifo_source.h"
+#include <string>
+
+#if HAVE_RTSP_SERVER
+#include <liveMedia.hh>
+
+class ZoneMinderDeviceSource;
+
+class BaseServerMediaSubsession {
+	public:
+    BaseServerMediaSubsession(StreamReplicator* replicator):
+      m_replicator(replicator) {};
+
+		FramedSource* createSource(
+        UsageEnvironment& env,
+        FramedSource * videoES,
+        const std::string& format);
+
+		RTPSink * createSink(
+        UsageEnvironment& env,
+        Groupsock * rtpGroupsock,
+        unsigned char rtpPayloadTypeIfDynamic,
+        const std::string& format,
+        FramedSource *source);
+
+		char const* getAuxLine(
+        ZoneMinderFifoSource* source,
+        unsigned char rtpPayloadType);
+		
+	protected:
+		StreamReplicator* m_replicator;
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_SERVER_MEDIA_SUBSESSION_H
diff --git a/src/zm_rtsp_server_thread.cpp b/src/zm_rtsp_server_thread.cpp
new file mode 100644
index 000000000..cbe7b905b
--- /dev/null
+++ b/src/zm_rtsp_server_thread.cpp
@@ -0,0 +1,128 @@
+#include "zm_rtsp_server_thread.h"
+
+#include "zm_config.h"
+#include "zm_logger.h"
+
+#if HAVE_RTSP_SERVER
+
+RTSPServerThread::RTSPServerThread(int p_port) :
+    terminate_(false), scheduler_watch_var_(0), port(p_port)
+{
+  //unsigned short rtsp_over_http_port = 0;
+  //const char *realm = "ZoneMinder";
+  //
+  eventLoop = std::make_shared<xop::EventLoop>();
+  rtspServer = xop::RtspServer::Create(eventLoop.get());
+
+  if ( rtspServer == nullptr ) {
+    Fatal("Failed to create rtspServer");
+    return;
+  }
+
+  thread_ = std::thread(&RTSPServerThread::Run, this);
+}
+
+RTSPServerThread::~RTSPServerThread() {
+  Stop();
+  if (thread_.joinable())
+    thread_.join();
+
+}
+
+void RTSPServerThread::Run() {
+  Debug(1, "RTSPServerThread::Run()");
+  if (rtspServer) {
+    while (!scheduler_watch_var_) {
+      //if (clients > 0) {
+       sleep(1); 
+      //}
+    }
+  }
+  Debug(1, "RTSPServerThread::done()");
+}
+
+int RTSPServerThread::Start() {
+  return rtspServer->Start(std::string("0.0.0.0"), port);
+}
+
+void RTSPServerThread::Stop() {
+  Debug(1, "RTSPServerThread::stop()");
+  terminate_ = true;
+
+  {
+    std::lock_guard<std::mutex> lck(scheduler_watch_var_mutex_);
+    scheduler_watch_var_ = 1;
+  }
+
+  for ( std::list<ZoneMinderFifoSource *>::iterator it = sources.begin(); it != sources.end(); ++it ) {
+  Debug(1, "RTSPServerThread::stopping source");
+    (*it)->Stop();
+  }
+  while ( sources.size() ) {
+    Debug(1, "RTSPServerThread::stop closing source");
+    ZoneMinderFifoSource *source = sources.front();
+    sources.pop_front();
+    delete source;
+  }
+}
+
+xop::MediaSession *RTSPServerThread::addSession(std::string &streamname) {
+  
+  xop::MediaSession *session = xop::MediaSession::CreateNew(streamname);
+  if (session) {
+    session->AddNotifyConnectedCallback([] (xop::MediaSessionId sessionId, std::string peer_ip, uint16_t peer_port){
+  Debug(1, "RTSP client connect, ip=%s, port=%hu \n", peer_ip.c_str(), peer_port);
+});
+
+    session->AddNotifyDisconnectedCallback([](xop::MediaSessionId sessionId, std::string peer_ip, uint16_t peer_port) {
+  Debug(1, "RTSP client disconnect, ip=%s, port=%hu \n", peer_ip.c_str(), peer_port);
+});
+
+    rtspServer->AddSession(session);
+    //char *url = rtspServer->rtspURL(session);
+    //Debug(1, "url is %s for stream %s", url, streamname.c_str());
+    //delete[] url;
+  }
+  return session;
+}
+
+void RTSPServerThread::removeSession(xop::MediaSession *session) {
+  //rtspServer->removeServerMediaSession(session);
+}
+
+ZoneMinderFifoSource *RTSPServerThread::addFifo(
+    xop::MediaSession *session,
+    std::string fifo) {
+  if (!rtspServer) return nullptr;
+
+  ZoneMinderFifoSource *source = nullptr;
+
+  if (!fifo.empty()) {
+    std::string rtpFormat;
+    if (std::string::npos != fifo.find("h264")) {
+      rtpFormat = "video/H264";
+      session->AddSource(xop::channel_0, xop::H264Source::CreateNew());
+      source = new ZoneMinderFifoSource(rtspServer, session->GetMediaSessionId(), xop::channel_0, fifo);
+    } else if (
+        std::string::npos != fifo.find("hevc")
+        or
+        std::string::npos != fifo.find("h265")) {
+      rtpFormat = "video/H265";
+      session->AddSource(xop::channel_0, xop::H265Source::CreateNew());
+      source = new ZoneMinderFifoSource(rtspServer, session->GetMediaSessionId(), xop::channel_0, fifo);
+    } else if (std::string::npos != fifo.find("aac")) {
+      Debug(1, "ADTS source %p", source);
+    } else {
+      Warning("Unknown format in %s", fifo.c_str());
+    }
+    if (source == nullptr) {
+      Error("Unable to create source");
+    }
+    sources.push_back(source);
+  } else {
+    Debug(1, "Not Adding stream as fifo was empty");
+  }
+  return source;
+}  // end void addFifo
+
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_thread.h b/src/zm_rtsp_server_thread.h
new file mode 100644
index 000000000..393203831
--- /dev/null
+++ b/src/zm_rtsp_server_thread.h
@@ -0,0 +1,45 @@
+#ifndef ZM_RTSP_SERVER_THREAD_H
+#define ZM_RTSP_SERVER_THREAD_H
+
+#include "zm_config.h"
+#include "zm_ffmpeg.h"
+#include "xop/RtspServer.h"
+
+#include "zm_rtsp_server_fifo_source.h"
+#include <atomic>
+#include <list>
+#include <memory>
+
+#if HAVE_RTSP_SERVER
+
+class Monitor;
+
+class RTSPServerThread {
+  private:
+    std::shared_ptr<Monitor> monitor_;
+
+    std::thread thread_;
+    std::atomic<bool> terminate_;
+    std::mutex scheduler_watch_var_mutex_;
+    char scheduler_watch_var_;
+
+    std::shared_ptr<xop::EventLoop> eventLoop;
+    std::shared_ptr<xop::RtspServer> rtspServer;
+
+    std::list<ZoneMinderFifoSource *> sources;
+    int port;
+
+  public:
+    explicit RTSPServerThread(int port);
+    ~RTSPServerThread();
+    xop::MediaSession *addSession(std::string &streamname);
+    void removeSession(xop::MediaSession *sms);
+    ZoneMinderFifoSource *addFifo(xop::MediaSession *sms, std::string fifo);
+    void Run();
+    void Stop();
+    int Start();
+    bool IsStopped() const { return terminate_; };
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_THREAD_H
diff --git a/src/zm_rtsp_server_unicast_server_media_subsession.cpp b/src/zm_rtsp_server_unicast_server_media_subsession.cpp
new file mode 100644
index 000000000..2376748d5
--- /dev/null
+++ b/src/zm_rtsp_server_unicast_server_media_subsession.cpp
@@ -0,0 +1,52 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+** ServerMediaSubsession.cpp
+**
+** -------------------------------------------------------------------------*/
+
+#include "zm_rtsp_server_unicast_server_media_subsession.h"
+
+#include "zm_config.h"
+#include "zm_rtsp_server_fifo_source.h"
+
+#if HAVE_RTSP_SERVER
+// -----------------------------------------
+//    ServerMediaSubsession for Unicast
+// -----------------------------------------
+UnicastServerMediaSubsession* UnicastServerMediaSubsession::createNew(
+    UsageEnvironment& env,
+    StreamReplicator* replicator,
+    //FramedSource *source,
+    const std::string& format
+    ) {
+	return new UnicastServerMediaSubsession(env, replicator, format);
+	//return new UnicastServerMediaSubsession(env, replicator, source, format);
+}
+
+FramedSource* UnicastServerMediaSubsession::createNewStreamSource(
+    unsigned clientSessionId,
+    unsigned& estBitrate
+    ) {
+	FramedSource* replica = m_replicator->createStreamReplica();
+	return createSource(envir(), replica, m_format);
+}
+
+RTPSink* UnicastServerMediaSubsession::createNewRTPSink(
+    Groupsock* rtpGroupsock,
+    unsigned char rtpPayloadTypeIfDynamic,
+    FramedSource* inputSource
+    ) {
+	return createSink(envir(), rtpGroupsock, rtpPayloadTypeIfDynamic, m_format, inputSource);
+}
+
+char const* UnicastServerMediaSubsession::getAuxSDPLine(
+    RTPSink* rtpSink, FramedSource* inputSource
+    ) {
+	return this->getAuxLine(
+      dynamic_cast<ZoneMinderFifoSource*>(m_replicator->inputSource()),
+      rtpSink->rtpPayloadType());
+}
+#endif // HAVE_RTSP_SERVER
diff --git a/src/zm_rtsp_server_unicast_server_media_subsession.h b/src/zm_rtsp_server_unicast_server_media_subsession.h
new file mode 100644
index 000000000..d10e3abf1
--- /dev/null
+++ b/src/zm_rtsp_server_unicast_server_media_subsession.h
@@ -0,0 +1,51 @@
+/* ---------------------------------------------------------------------------
+** This software is in the public domain, furnished "as is", without technical
+** support, and with no warranty, express or implied, as to its usefulness for
+** any purpose.
+**
+** ServerMediaSubsession.h
+**
+** -------------------------------------------------------------------------*/
+
+#ifndef ZM_RTSP_SERVER_UNICAST_SERVER_MEDIA_SUBSESSION_H
+#define ZM_RTSP_SERVER_UNICAST_SERVER_MEDIA_SUBSESSION_H
+
+#include "zm_config.h"
+#include "zm_rtsp_server_server_media_subsession.h"
+
+// -----------------------------------------
+//    ServerMediaSubsession for Unicast
+// -----------------------------------------
+#if HAVE_RTSP_SERVER
+class UnicastServerMediaSubsession :
+  public OnDemandServerMediaSubsession,
+  public BaseServerMediaSubsession
+{
+	public:
+		static UnicastServerMediaSubsession* createNew(
+        UsageEnvironment& env,
+        StreamReplicator* replicator,
+        const std::string& format);
+
+	protected:
+		UnicastServerMediaSubsession(
+        UsageEnvironment& env,
+        StreamReplicator* replicator,
+        const std::string& format)
+				:
+          OnDemandServerMediaSubsession(env, true
+              /* Boolean reuseFirstSource, portNumBits initialPortNum=6970, Boolean multiplexRTCPWithRTP=False */
+              ),
+          BaseServerMediaSubsession(replicator),
+          m_format(format) {};
+
+		virtual FramedSource* createNewStreamSource(unsigned clientSessionId, unsigned& estBitrate);
+		virtual RTPSink* createNewRTPSink(Groupsock* rtpGroupsock, unsigned char rtpPayloadTypeIfDynamic, FramedSource* inputSource);
+		virtual char const* getAuxSDPLine(RTPSink* rtpSink, FramedSource* inputSource);
+
+	protected:
+		const std::string m_format;
+};
+#endif // HAVE_RTSP_SERVER
+
+#endif // ZM_RTSP_SERVER_UNICAST_SERVER_MEDIA_SUBSESSION_H
diff --git a/src/zm_sdp.cpp b/src/zm_sdp.cpp
index de48e169d..63bb8d9bd 100644
--- a/src/zm_sdp.cpp
+++ b/src/zm_sdp.cpp
@@ -17,12 +17,14 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-#include "zm.h"
+#include "zm_sdp.h"
+
+#include "zm_config.h"
+#include "zm_exception.h"
+#include "zm_logger.h"
 
 #if HAVE_LIBAVFORMAT
 
-#include "zm_sdp.h"
-
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
 SessionDescriptor::StaticPayloadDesc SessionDescriptor::smStaticPayloads[] = {
   { 0, "PCMU",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_PCM_MULAW,  8000,  1 },
@@ -105,7 +107,7 @@ SessionDescriptor::ConnInfo::ConnInfo( const std::string &connInfo ) :
   mTtl( 16 ),
   mNoAddresses( 0 )
 {
-  StringVector tokens = split(connInfo, " ");
+  StringVector tokens = Split(connInfo, " ");
   if ( tokens.size() < 3 )
     throw Exception( "Unable to parse SDP connection info from '"+connInfo+"'" );
   mNetworkType = tokens[0];
@@ -114,7 +116,7 @@ SessionDescriptor::ConnInfo::ConnInfo( const std::string &connInfo ) :
   mAddressType = tokens[1];
   if ( mAddressType != "IP4" && mAddressType != "IP6" )
     throw Exception( "Invalid SDP address type '"+mAddressType+"' in connection info '"+connInfo+"'" );
-  StringVector addressTokens = split( tokens[2], "/" );
+  StringVector addressTokens = Split(tokens[2], "/");
   if ( addressTokens.size() < 1 ) 
     throw Exception( "Invalid SDP address '"+tokens[2]+"' in connection info '"+connInfo+"'" );
   mAddress = addressTokens[0];
@@ -127,7 +129,7 @@ SessionDescriptor::ConnInfo::ConnInfo( const std::string &connInfo ) :
 SessionDescriptor::BandInfo::BandInfo( const std::string &bandInfo ) :
   mValue( 0 )
 {
-  StringVector tokens = split( bandInfo, ":" );
+  StringVector tokens = Split(bandInfo, ":");
   if ( tokens.size() < 2 )
     throw Exception( "Unable to parse SDP bandwidth info from '"+bandInfo+"'" );
   mType = tokens[0];
@@ -163,7 +165,7 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
 {
   MediaDescriptor *currMedia = nullptr;
 
-  StringVector lines = split( sdp, "\r\n" );
+  StringVector lines = Split(sdp, "\r\n");
   for ( StringVector::const_iterator iter = lines.begin(); iter != lines.end(); ++iter ) {
     std::string line = *iter;
     if ( line.empty() )
@@ -206,7 +208,7 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
       case 'a' :
       {
         mAttributes.push_back( line );
-        StringVector tokens = split( line, ":", 2 );
+        StringVector tokens = Split(line, ":", 2);
         std::string attrName = tokens[0];
         if ( currMedia ) {
           if ( attrName == "control" ) {
@@ -218,14 +220,12 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
             // a=rtpmap:96 MP4V-ES/90000
             if ( tokens.size() < 2 )
               throw Exception( "Unable to parse SDP rtpmap attribute '"+line+"' for media '"+currMedia->getType()+"'" );
-            StringVector attrTokens = split( tokens[1], " " );
+            StringVector attrTokens = Split(tokens[1], " ");
             int payloadType = atoi(attrTokens[0].c_str());
             if ( payloadType != currMedia->getPayloadType() )
               throw Exception( stringtf( "Payload type mismatch, expected %d, got %d in '%s'", currMedia->getPayloadType(), payloadType, line.c_str() ) );
-            std::string payloadDesc = attrTokens[1];
-            //currMedia->setPayloadType( payloadType );
             if ( attrTokens.size() > 1 ) {
-              StringVector payloadTokens = split( attrTokens[1], "/" );
+              StringVector payloadTokens = Split(attrTokens[1], "/");
               std::string payloadDesc = payloadTokens[0];
               int payloadClock = atoi(payloadTokens[1].c_str());
               currMedia->setPayloadDesc( payloadDesc );
@@ -235,13 +235,13 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
             // a=framesize:96 320-240
             if ( tokens.size() < 2 )
               throw Exception("Unable to parse SDP framesize attribute '"+line+"' for media '"+currMedia->getType()+"'");
-            StringVector attrTokens = split(tokens[1], " ");
+            StringVector attrTokens = Split(tokens[1], " ");
             int payloadType = atoi(attrTokens[0].c_str());
             if ( payloadType != currMedia->getPayloadType() )
               throw Exception( stringtf("Payload type mismatch, expected %d, got %d in '%s'",
                     currMedia->getPayloadType(), payloadType, line.c_str()));
             //currMedia->setPayloadType( payloadType );
-            StringVector sizeTokens = split(attrTokens[1], "-");
+            StringVector sizeTokens = Split(attrTokens[1], "-");
             int width = atoi(sizeTokens[0].c_str());
             int height = atoi(sizeTokens[1].c_str());
             currMedia->setFrameSize(width, height);
@@ -255,16 +255,16 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
             // a=fmtp:96 profile-level-id=247; config=000001B0F7000001B509000001000000012008D48D8803250F042D14440F
             if ( tokens.size() < 2 )
               throw Exception("Unable to parse SDP fmtp attribute '"+line+"' for media '"+currMedia->getType()+"'");
-            StringVector attrTokens = split(tokens[1], " ", 2);
+            StringVector attrTokens = Split(tokens[1], " ", 2);
             int payloadType = atoi(attrTokens[0].c_str());
             if ( payloadType != currMedia->getPayloadType() )
               throw Exception(stringtf("Payload type mismatch, expected %d, got %d in '%s'",
                     currMedia->getPayloadType(), payloadType, line.c_str()));
             //currMedia->setPayloadType( payloadType );
             if ( attrTokens.size() > 1 ) {
-              StringVector attr2Tokens = split( attrTokens[1], "; " );
+              StringVector attr2Tokens = Split(attrTokens[1], "; ");
               for ( unsigned int i = 0; i < attr2Tokens.size(); i++ ) {
-                StringVector attr3Tokens = split( attr2Tokens[i], "=" );
+                StringVector attr3Tokens = Split(attr2Tokens[i], "=");
                 //Info( "Name = %s, Value = %s", attr3Tokens[0].c_str(), attr3Tokens[1].c_str() );
                 if ( attr3Tokens[0] == "profile-level-id" ) {
                 } else if ( attr3Tokens[0] == "config" ) {
@@ -274,7 +274,9 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
                     Debug(4, "sprop-parameter-sets value %s", c);
                   currMedia->setSprops(std::string(c));
                 } else {
-                  Debug( 3, "Ignoring SDP fmtp attribute '%s' for media '%s'", attr3Tokens[0].c_str(), currMedia->getType().c_str() )
+                  Debug(3, "Ignoring SDP fmtp attribute '%s' for media '%s'",
+                        attr3Tokens[0].c_str(),
+                        currMedia->getType().c_str());
                 }
               }
             }
@@ -292,13 +294,13 @@ SessionDescriptor::SessionDescriptor( const std::string &url, const std::string
       }
       case 'm' :
       {
-        StringVector tokens = split(line, " ");
+        StringVector tokens = Split(line, " ");
         if ( tokens.size() < 4 )
           throw Exception("Can't parse SDP media description '"+line+"'");
         std::string mediaType = tokens[0];
         if ( mediaType != "audio" && mediaType != "video"  && mediaType != "application" )
           throw Exception("Unsupported media type '"+mediaType+"' in SDP media attribute '"+line+"'");
-        StringVector portTokens = split(tokens[1], "/");
+        StringVector portTokens = Split(tokens[1], "/");
         int mediaPort = atoi(portTokens[0].c_str());
         int mediaNumPorts = 1;
         if ( portTokens.size() > 1 )
@@ -350,8 +352,6 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const {
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     AVCodecContext *codec_context = avcodec_alloc_context3(nullptr);
-    avcodec_parameters_to_context(codec_context, stream->codecpar);
-    stream->codec = codec_context;
 #else
     AVCodecContext *codec_context = stream->codec;
 #endif
@@ -376,47 +376,45 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const {
 #endif
     else
       Warning("Unknown media_type %s", type.c_str());
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-      stream->codecpar->codec_type = codec_context->codec_type;
-#endif
 
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
     std::string codec_name;
 #endif
     if ( mediaDesc->getPayloadType() < PAYLOAD_TYPE_DYNAMIC ) {
       // Look in static table
-      for ( unsigned int i = 0; i < (sizeof(smStaticPayloads)/sizeof(*smStaticPayloads)); i++ ) {
-        if ( smStaticPayloads[i].payloadType == mediaDesc->getPayloadType() ) {
-          Debug( 1, "Got static payload type %d, %s", smStaticPayloads[i].payloadType, smStaticPayloads[i].payloadName );
+      for ( unsigned int j = 0; j < (sizeof(smStaticPayloads)/sizeof(*smStaticPayloads)); j++ ) {
+        if ( smStaticPayloads[j].payloadType == mediaDesc->getPayloadType() ) {
+          Debug( 1, "Got static payload type %d, %s", smStaticPayloads[j].payloadType, smStaticPayloads[j].payloadName );
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
-          codec_name = std::string(smStaticPayloads[i].payloadName);
+          codec_name = std::string(smStaticPayloads[j].payloadName);
 #else
-          strncpy(codec_context->codec_name, smStaticPayloads[i].payloadName, sizeof(codec_context->codec_name));
+          strncpy(codec_context->codec_name, smStaticPayloads[j].payloadName, sizeof(codec_context->codec_name));
 #endif
-          codec_context->codec_type = smStaticPayloads[i].codecType;
-          codec_context->codec_id = smStaticPayloads[i].codecId;
-          codec_context->sample_rate = smStaticPayloads[i].clockRate;
+          codec_context->codec_type = smStaticPayloads[j].codecType;
+          codec_context->codec_id = smStaticPayloads[j].codecId;
+          codec_context->sample_rate = smStaticPayloads[j].clockRate;
           break;
         }
       }
     } else {
       // Look in dynamic table
-      for ( unsigned int i = 0; i < (sizeof(smDynamicPayloads)/sizeof(*smDynamicPayloads)); i++ ) {
-        if ( smDynamicPayloads[i].payloadName == mediaDesc->getPayloadDesc() ) {
-          Debug(1, "Got dynamic payload type %d, %s", mediaDesc->getPayloadType(), smDynamicPayloads[i].payloadName);
+      for ( unsigned int j = 0; j < (sizeof(smDynamicPayloads)/sizeof(*smDynamicPayloads)); j++ ) {
+        if ( smDynamicPayloads[j].payloadName == mediaDesc->getPayloadDesc() ) {
+          Debug(1, "Got dynamic payload type %d, %s", mediaDesc->getPayloadType(), smDynamicPayloads[j].payloadName);
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
-          codec_name = std::string(smStaticPayloads[i].payloadName);
+          codec_name = std::string(smStaticPayloads[j].payloadName);
 #else
-          strncpy(codec_context->codec_name, smDynamicPayloads[i].payloadName, sizeof(codec_context->codec_name));
+          strncpy(codec_context->codec_name, smDynamicPayloads[j].payloadName, sizeof(codec_context->codec_name));
 #endif
-          codec_context->codec_type = smDynamicPayloads[i].codecType;
-          codec_context->codec_id = smDynamicPayloads[i].codecId;
+          codec_context->codec_type = smDynamicPayloads[j].codecType;
+          codec_context->codec_id = smDynamicPayloads[j].codecId;
           codec_context->sample_rate = mediaDesc->getClock();
           break;
         }
       }
     } /// end if static or dynamic
 
+
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
     if ( codec_name.empty() )
 #else
@@ -425,7 +423,6 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const {
     {
       Warning( "Can't find payload details for %s payload type %d, name %s",
           mediaDesc->getType().c_str(), mediaDesc->getPayloadType(), mediaDesc->getPayloadDesc().c_str() );
-      //return( 0 );
     }
     if ( mediaDesc->getWidth() )
       codec_context->width = mediaDesc->getWidth();
@@ -439,7 +436,7 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const {
     
       strcpy(pvalue, mediaDesc->getSprops().c_str());
     
-      while (*value) {
+      while ( *value ) {
         char base64packet[1024];
         uint8_t decoded_packet[1024];
         uint32_t packet_size;
@@ -454,9 +451,9 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const {
         if ( *value == ',' )
           value++;
 
-        packet_size= av_base64_decode(decoded_packet, (const char *)base64packet, (int)sizeof(decoded_packet));
+        packet_size = av_base64_decode(decoded_packet, (const char *)base64packet, (int)sizeof(decoded_packet));
         Hexdump(4, (char *)decoded_packet, packet_size);
-        if (packet_size) {
+        if ( packet_size ) {
           uint8_t *dest = 
           (uint8_t *)av_malloc(packet_size + sizeof(start_sequence) +
                        codec_context->extradata_size +
@@ -493,7 +490,10 @@ AVFormatContext *SessionDescriptor::generateFormatContext() const {
         }
       }
     }
-  }
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+    avcodec_parameters_from_context(stream->codecpar, codec_context);
+#endif
+  }  // end foreach mediaList
 
   return formatContext;
 }
diff --git a/src/zm_sdp.h b/src/zm_sdp.h
index 403c8a740..e99c12920 100644
--- a/src/zm_sdp.h
+++ b/src/zm_sdp.h
@@ -20,14 +20,8 @@
 #ifndef ZM_SDP_H
 #define ZM_SDP_H
 
-#include "zm.h"
-
-#include "zm_utils.h"
-#include "zm_exception.h"
 #include "zm_ffmpeg.h"
-
-#include <stdlib.h>
-
+#include "zm_utils.h"
 #include <string>
 #include <vector>
 
@@ -120,7 +114,7 @@ public:
     {
       return( mTransport );
     }
-    const int getPayloadType() const
+    int getPayloadType() const
     {
       return( mPayloadType );
     }
@@ -142,7 +136,7 @@ public:
       mControlUrl = controlUrl;
     }
 
-    const int getClock() const {
+    int getClock() const {
       return( mClock );
     }
     void setClock( int clock ) {
@@ -163,10 +157,10 @@ public:
     void setSprops(const std::string &props) {
       mSprops = props;
     }
-    const std::string getSprops() const {
+    std::string getSprops() const {
       return ( mSprops );
     }
-    const double getFrameRate() const {
+    double getFrameRate() const {
       return( mFrameRate );
     }
     void setFrameRate( double frameRate ) {
diff --git a/src/zm_signal.cpp b/src/zm_signal.cpp
index 81012c07e..9a92b5eac 100644
--- a/src/zm_signal.cpp
+++ b/src/zm_signal.cpp
@@ -17,27 +17,24 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-#include "zm.h"
 #include "zm_signal.h"
 
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
+#include "zm.h"
+#include "zm_logger.h"
+#include <cstring>
 
 #define TRACE_SIZE 16
 
 bool zm_reload = false;
 bool zm_terminate = false;
 
-RETSIGTYPE zm_hup_handler(int signal)
-{
+RETSIGTYPE zm_hup_handler(int signal) {
   // Shouldn't do complex things in signal handlers, logging is complex and can block due to mutexes.
 	//Info("Got signal %d (%s), reloading", signal, strsignal(signal));
 	zm_reload = true;
 }
 
-RETSIGTYPE zm_term_handler(int signal)
-{
+RETSIGTYPE zm_term_handler(int signal) {
   // Shouldn't do complex things in signal handlers, logging is complex and can block due to mutexes.
 	//Info("Got signal %d (%s), exiting", signal, strsignal(signal));
 	zm_terminate = true;
@@ -55,8 +52,7 @@ RETSIGTYPE zm_die_handler(int signal)
   #if ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
 	void *ip = nullptr;
 	void *cr2 = nullptr;
-	if (info && context) {
-
+	if ( info && context ) {
 		Debug(1,
 		      "Signal information: number %d code %d errno %d pid %d uid %d status %d",
 		      signal, info->si_code, info->si_errno, info->si_pid,
@@ -79,7 +75,7 @@ RETSIGTYPE zm_die_handler(int signal)
     #endif				// defined(__x86_64__)
 
 		// Print the signal address and instruction pointer if available
-		if (ip) {
+		if ( ip ) {
 			Error("Signal address is %p, from %p", cr2, ip);
 		} else {
 			Error("Signal address is %p, no instruction pointer", cr2);
@@ -108,15 +104,13 @@ RETSIGTYPE zm_die_handler(int signal)
 	}
 	free(messages);
 
-	Info("Backtrace complete, please execute the following command for more information");
-	Info(cmd);
+	Info("Backtrace complete, please execute the following command for more information: %s", cmd);
   #endif				// ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
 #endif                          // (defined(__i386__) || defined(__x86_64__)
 	exit(signal);
 }
 
-void zmSetHupHandler(SigHandler * handler)
-{
+void zmSetHupHandler(SigHandler * handler) {
 	sigset_t block_set;
 	sigemptyset(&block_set);
 	struct sigaction action, old_action;
@@ -127,8 +121,7 @@ void zmSetHupHandler(SigHandler * handler)
 	sigaction(SIGHUP, &action, &old_action);
 }
 
-void zmSetTermHandler(SigHandler * handler)
-{
+void zmSetTermHandler(SigHandler * handler) {
 	sigset_t block_set;
 	sigemptyset(&block_set);
 	struct sigaction action, old_action;
@@ -141,8 +134,7 @@ void zmSetTermHandler(SigHandler * handler)
 	sigaction(SIGQUIT, &action, &old_action);
 }
 
-void zmSetDieHandler(SigHandler * handler)
-{
+void zmSetDieHandler(SigHandler * handler) {
 	sigset_t block_set;
 	sigemptyset(&block_set);
 	struct sigaction action, old_action;
@@ -163,19 +155,16 @@ void zmSetDieHandler(SigHandler * handler)
 	sigaction(SIGFPE, &action, &old_action);
 }
 
-void zmSetDefaultHupHandler()
-{
+void zmSetDefaultHupHandler() {
 	zmSetHupHandler((SigHandler *) zm_hup_handler);
 }
 
-void zmSetDefaultTermHandler()
-{
+void zmSetDefaultTermHandler() {
 	zmSetTermHandler((SigHandler *) zm_term_handler);
 }
 
-void zmSetDefaultDieHandler()
-{
-	if (config.dump_cores) {
+void zmSetDefaultDieHandler() {
+	if ( config.dump_cores ) {
 		// Do nothing
 	} else {
 		zmSetDieHandler((SigHandler *) zm_die_handler);
diff --git a/src/zm_signal.h b/src/zm_signal.h
index 89a4b408a..27fa2e766 100644
--- a/src/zm_signal.h
+++ b/src/zm_signal.h
@@ -20,7 +20,8 @@
 #ifndef ZM_SIGNAL_H
 #define ZM_SIGNAL_H
 
-#include <signal.h>
+#include "zm_config.h"
+#include <csignal>
 
 #if HAVE_EXECINFO_H
 #include <execinfo.h>
@@ -29,9 +30,6 @@
 #include <ucontext.h>
 #endif
 
-
-#include "zm.h"
-
 typedef RETSIGTYPE (SigHandler)( int );
 
 extern bool zm_reload;
diff --git a/src/zm_storage.cpp b/src/zm_storage.cpp
index 4bba82bab..5edc36e00 100644
--- a/src/zm_storage.cpp
+++ b/src/zm_storage.cpp
@@ -15,36 +15,33 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/ 
-
-#include "zm.h"
-#include "zm_db.h"
+*/
 
 #include "zm_storage.h"
 
-#include <string.h>
-#include <stdlib.h>
-#include <stdio.h>
+#include "zm_db.h"
+#include "zm_logger.h"
+#include <cstring>
 
-Storage::Storage() {
+Storage::Storage() : id(0) {
 	Warning("Instantiating default Storage Object. Should not happen.");
-	id = 0;
 	strcpy(name, "Default");
   if ( staticConfig.DIR_EVENTS[0] != '/' ) {
     // not using an absolute path. Make it one by appending ZM_PATH_WEB
-    snprintf( path, sizeof (path), "%s/%s", staticConfig.PATH_WEB.c_str( ), staticConfig.DIR_EVENTS.c_str() );
+    snprintf(path, sizeof(path), "%s/%s",
+        staticConfig.PATH_WEB.c_str(), staticConfig.DIR_EVENTS.c_str());
   } else {
-    strncpy(path, staticConfig.DIR_EVENTS.c_str(), sizeof(path)-1 );
+    strncpy(path, staticConfig.DIR_EVENTS.c_str(), sizeof(path)-1);
   }
   scheme = MEDIUM;
   scheme_str = "Medium";
 }
 
-Storage::Storage( MYSQL_ROW &dbrow ) {
+Storage::Storage(MYSQL_ROW &dbrow) {
 	unsigned int index = 0;
-	id = atoi( dbrow[index++] );
-	strncpy( name, dbrow[index++], sizeof(name)-1 );
-	strncpy( path, dbrow[index++], sizeof(path)-1 );
+	id = atoi(dbrow[index++]);
+	strncpy(name, dbrow[index++], sizeof(name)-1);
+	strncpy(path, dbrow[index++], sizeof(path)-1);
   type_str = std::string(dbrow[index++]);
   scheme_str = std::string(dbrow[index++]);
   if ( scheme_str == "Deep" ) {
@@ -57,16 +54,15 @@ Storage::Storage( MYSQL_ROW &dbrow ) {
 }
 
 /* If a zero or invalid p_id is passed, then the old default path will be assumed.  */
-Storage::Storage( unsigned int p_id ) {
-	id = 0;
+Storage::Storage(unsigned int p_id) : id(p_id) {
 
-	if ( p_id ) {
+	if ( id ) {
 		char sql[ZM_SQL_SML_BUFSIZ];
-		snprintf(sql, sizeof(sql), "SELECT `Id`, `Name`, `Path`, `Type`, `Scheme` FROM `Storage` WHERE `Id`=%d", p_id);
-		Debug(2,"Loading Storage for %d using %s", p_id, sql );
+		snprintf(sql, sizeof(sql), "SELECT `Id`, `Name`, `Path`, `Type`, `Scheme` FROM `Storage` WHERE `Id`=%u", id);
+		Debug(2, "Loading Storage for %u using %s", id, sql);
 		zmDbRow dbrow;
 		if ( !dbrow.fetch(sql) ) {
-			Error("Unable to load storage area for id %d: %s", p_id, mysql_error(&dbconn));
+			Error("Unable to load storage area for id %d: %s", id, mysql_error(&dbconn));
 		} else {
 			unsigned int index = 0;
 			id = atoi(dbrow[index++]);
@@ -81,17 +77,18 @@ Storage::Storage( unsigned int p_id ) {
       } else {
         scheme = SHALLOW;
       }
-			Debug(1, "Loaded Storage area %d '%s'", id, this->Name());
+			Debug(1, "Loaded Storage area %d '%s'", id, name);
 		}
 	}
 	if ( !id ) {
     if ( staticConfig.DIR_EVENTS[0] != '/' ) {
       // not using an absolute path. Make it one by appending ZM_PATH_WEB
-      snprintf(path, sizeof (path), "%s/%s", staticConfig.PATH_WEB.c_str(), staticConfig.DIR_EVENTS.c_str());
+      snprintf(path, sizeof(path), "%s/%s",
+          staticConfig.PATH_WEB.c_str(), staticConfig.DIR_EVENTS.c_str());
     } else {
       strncpy(path, staticConfig.DIR_EVENTS.c_str(), sizeof(path)-1);
     }
-		Debug(1,"No id passed to Storage constructor.  Using default path %s instead", path);
+		Debug(1, "No id passed to Storage constructor.  Using default path %s instead", path);
 		strcpy(name, "Default");
     scheme = MEDIUM;
     scheme_str = "Medium";
diff --git a/src/zm_storage.h b/src/zm_storage.h
index f0886c9f3..6ea0bae5a 100644
--- a/src/zm_storage.h
+++ b/src/zm_storage.h
@@ -15,13 +15,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/  
-
-#include "zm_db.h"
+*/
 
 #ifndef ZM_STORAGE_H
 #define ZM_STORAGE_H
 
+#include "zm_db.h"
+#include <string>
+
 class Storage {
 	public:
     typedef enum {
@@ -47,8 +48,8 @@ public:
 	unsigned int	Id() const { return id; }
 	const char *Name() const { return name; }
 	const char *Path() const { return path; }
-  const Schemes  Scheme() const { return scheme; }
-  const std::string  SchemeString() const { return scheme_str; }
+  Schemes  Scheme() const { return scheme; }
+  std::string  SchemeString() const { return scheme_str; }
 };
 
 #endif // ZM_STORAGE_H
diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index 05236c3ba..0968c9514 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -17,18 +17,16 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-#include <sys/un.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <sys/file.h>
-
-#include "zm.h"
-#include "zm_mpeg.h"
-#include "zm_monitor.h"
-
 #include "zm_stream.h"
 
+#include "zm_box.h"
+#include "zm_monitor.h"
+#include <cmath>
+#include <sys/file.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 StreamBase::~StreamBase() {
 #if HAVE_LIBAVCODEC
   if ( vid_stream ) {
@@ -37,28 +35,28 @@ StreamBase::~StreamBase() {
   }
 #endif
   closeComms();
-  if ( monitor ) {
-    delete monitor;
-    monitor = NULL;
-  }
 }
 
 bool StreamBase::loadMonitor(int p_monitor_id) {
   monitor_id = p_monitor_id;
-  if ( monitor )
-    delete monitor;
 
-  if ( !(monitor = Monitor::Load(monitor_id, false, Monitor::QUERY)) ) {
+  if ( !(monitor or (monitor = Monitor::Load(monitor_id, false, Monitor::QUERY))) ) {
     Error("Unable to load monitor id %d for streaming", monitor_id);
     return false;
   }
+
   if ( monitor->GetFunction() == Monitor::NONE ) {
-    Error("Monitor %d has function NONE. Will not be able to connect to it.", monitor_id);
+    Info("Monitor %d has function NONE. Will not be able to connect to it.", monitor_id);
     return false;
   }
 
+  if ( monitor->isConnected() ) {
+    monitor->disconnect();
+  }
+
   if ( !monitor->connect() ) {
     Error("Unable to connect to monitor id %d for streaming", monitor_id);
+    monitor->disconnect();
     return false;
   }
 
@@ -66,24 +64,28 @@ bool StreamBase::loadMonitor(int p_monitor_id) {
 }
 
 bool StreamBase::checkInitialised() {
-  if ( !monitor ) {
+  if (!monitor) {
     Error("Cannot stream, not initialised");
     return false;
   }
-  if ( monitor->GetFunction() == Monitor::NONE ) {
-    Error("Monitor %d has function NONE. Will not be able to connect to it.", monitor_id);
+  if (monitor->GetFunction() == Monitor::NONE) {
+    Info("Monitor %d has function NONE. Will not be able to connect to it.", monitor_id);
     return false;
   }
-  if ( !monitor->ShmValid() ) {
+  if (!monitor->ShmValid()) {
     Error("Monitor shm is not connected");
     return false;
   }
+  if ((monitor->GetType() == Monitor::FFMPEG) and !monitor->DecodingEnabled() ) {
+    Debug(1, "Monitor is not decoding.");
+    return false;
+  }
   return true;
 }
 
 void StreamBase::updateFrameRate(double fps) {
   frame_mod = 1;
-  if ( (fps < 0) || !fps || isinf(fps) ) {
+  if ( (fps < 0) || !fps || std::isinf(fps) ) {
     Debug(1, "Zero or negative fps %f in updateFrameRate. Setting frame_mod=1 and effective_fps=0.0", fps);
     effective_fps = 0.0;
     base_fps = 0.0;
@@ -124,11 +126,14 @@ bool StreamBase::checkCommandQueue() {
       processCommand(&msg);
       return true;
     }
-  } else {
+  } else if ( connkey ) {
     Warning("No sd in checkCommandQueue, comms not open?");
+  } else {
+    // Perfectly valid if only getting a snapshot
+    Debug(1, "No sd in checkCommandQueue, comms not open?");
   }
   return false;
-}
+}  // end bool StreamBase::checkCommandQueue()
 
 Image *StreamBase::prepareImage(Image *image) {
 
@@ -252,7 +257,8 @@ bool StreamBase::sendTextFrame(const char *frame_text) {
       monitor->Width(), monitor->Height(), scale, frame_text);
 
   Image image(monitor->Width(), monitor->Height(), monitor->Colours(), monitor->SubpixelOrder());
-  image.Annotate(frame_text, image.centreCoord(frame_text));
+  image.Clear();
+  image.Annotate(frame_text, image.centreCoord(frame_text, monitor->LabelSize()), monitor->LabelSize());
 
   if ( scale != 100 ) {
     image.Scale(scale);
@@ -353,7 +359,7 @@ void StreamBase::openComms() {
     // Unlink before bind, in case it already exists
     unlink(loc_sock_path);
     if ( sizeof(loc_addr.sun_path) < length ) {
-      Error("Not enough space %d in loc_addr.sun_path for socket file %s", sizeof(loc_addr.sun_path), loc_sock_path);
+      Error("Not enough space %zu in loc_addr.sun_path for socket file %s", sizeof(loc_addr.sun_path), loc_sock_path);
     }
 
     strncpy(loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path));
diff --git a/src/zm_stream.h b/src/zm_stream.h
index d906b2de6..6d752689d 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -20,12 +20,12 @@
 #ifndef ZM_STREAM_H
 #define ZM_STREAM_H
 
-#include <sys/un.h>
-#include <sys/socket.h>
-
-#include "zm.h"
+#include "zm_logger.h"
 #include "zm_mpeg.h"
+#include <memory>
+#include <sys/un.h>
 
+class Image;
 class Monitor;
 
 #define TV_2_FLOAT( tv ) ( double((tv).tv_sec) + (double((tv).tv_usec) / 1000000.0) )
@@ -33,7 +33,13 @@ class Monitor;
 
 class StreamBase {
 public:
-  typedef enum { STREAM_JPEG, STREAM_RAW, STREAM_ZIP, STREAM_SINGLE, STREAM_MPEG } StreamType;
+  typedef enum {
+    STREAM_JPEG,
+    STREAM_RAW,
+    STREAM_ZIP,
+    STREAM_SINGLE,
+    STREAM_MPEG
+  } StreamType;
 
 protected:
   static const int MAX_STREAM_DELAY = 5; // Seconds
@@ -57,12 +63,37 @@ protected:
     char msg_data[256];
   } DataMsg;
 
-  typedef enum { MSG_CMD=1, MSG_DATA_WATCH, MSG_DATA_EVENT } MsgType;
-  typedef enum { CMD_NONE=0, CMD_PAUSE, CMD_PLAY, CMD_STOP, CMD_FASTFWD, CMD_SLOWFWD, CMD_SLOWREV, CMD_FASTREV, CMD_ZOOMIN, CMD_ZOOMOUT, CMD_PAN, CMD_SCALE, CMD_PREV, CMD_NEXT, CMD_SEEK, CMD_VARPLAY, CMD_GET_IMAGE, CMD_QUIT, CMD_QUERY=99 } MsgCommand;
+  typedef enum {
+    MSG_CMD=1,
+    MSG_DATA_WATCH,
+    MSG_DATA_EVENT
+  } MsgType;
+
+  typedef enum {
+    CMD_NONE=0,
+    CMD_PAUSE,
+    CMD_PLAY,
+    CMD_STOP,
+    CMD_FASTFWD,
+    CMD_SLOWFWD,
+    CMD_SLOWREV,
+    CMD_FASTREV,
+    CMD_ZOOMIN,
+    CMD_ZOOMOUT,
+    CMD_PAN,
+    CMD_SCALE,
+    CMD_PREV,
+    CMD_NEXT,
+    CMD_SEEK,
+    CMD_VARPLAY,
+    CMD_GET_IMAGE,
+    CMD_QUIT,
+    CMD_QUERY=99
+  } MsgCommand;
 
 protected:
   int monitor_id;
-  Monitor *monitor;
+  std::shared_ptr<Monitor> monitor;
 
   StreamType type;
   const char *format;
@@ -109,14 +140,13 @@ protected:
   bool checkInitialised();
   void updateFrameRate(double fps);
   Image *prepareImage(Image *image);
-  bool sendTextFrame(const char *text);
   bool checkCommandQueue();
   virtual void processCommand(const CmdMsg *msg)=0;
 
 public:
   StreamBase(): 
     monitor_id(0),
-    monitor(0),
+    monitor(nullptr),
     type(DEFAULT_TYPE),
     format(""),
     replay_rate(DEFAULT_RATE),
@@ -137,7 +167,7 @@ public:
     lock_fd(0),
     paused(false),
     step(0)
-    {
+  {
     memset(&loc_sock_path, 0, sizeof(loc_sock_path));
     memset(&loc_addr, 0, sizeof(loc_addr));
     memset(&rem_sock_path, 0, sizeof(rem_sock_path));
@@ -152,7 +182,7 @@ public:
     vid_stream = 0;
 #endif // HAVE_LIBAVCODEC   
     last_frame_sent = 0.0;
-    last_frame_timestamp = (struct timeval){0};
+    last_frame_timestamp = {};
     msg = { 0, { 0 } };
   }
   virtual ~StreamBase();
@@ -188,6 +218,7 @@ public:
   void setStreamQueue(int p_connkey) {
     connkey = p_connkey;
   }
+  bool sendTextFrame(const char *text);
   virtual void openComms();
   virtual void closeComms();
   virtual void runStream()=0;
diff --git a/src/zm_swscale.cpp b/src/zm_swscale.cpp
index 7afb9521c..b5cf6eded 100644
--- a/src/zm_swscale.cpp
+++ b/src/zm_swscale.cpp
@@ -15,18 +15,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/ 
-
-#include "zm_ffmpeg.h"
-#include "zm_image.h"
-#include "zm_rgb.h"
+*/
 
 #include "zm_swscale.h"
 
+#include "zm_image.h"
+#include "zm_logger.h"
+
 #if HAVE_LIBSWSCALE && HAVE_LIBAVUTIL
 SWScale::SWScale() : gotdefaults(false), swscale_ctx(nullptr), input_avframe(nullptr), output_avframe(nullptr) {
-  Debug(4,"SWScale object created");
-
+  Debug(4, "SWScale object created");
 }
 
 bool SWScale::init() {
@@ -68,10 +66,14 @@ SWScale::~SWScale() {
     swscale_ctx = nullptr;
   }
 
-  Debug(4,"SWScale object destroyed");
+  Debug(4, "SWScale object destroyed");
 }
 
-int SWScale::SetDefaults(enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height) {
+int SWScale::SetDefaults(
+    enum _AVPIXELFORMAT in_pf,
+    enum _AVPIXELFORMAT out_pf,
+    unsigned int width,
+    unsigned int height) {
 
   /* Assign the defaults */
   default_input_pf = in_pf;
@@ -84,55 +86,105 @@ int SWScale::SetDefaults(enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf,
   return 0;
 }
 
-int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height, unsigned int new_width, unsigned int new_height) {
+int SWScale::Convert( 
+  AVFrame *in_frame,
+  AVFrame *out_frame
+) {
+
+  AVPixelFormat format = fix_deprecated_pix_fmt((AVPixelFormat)in_frame->format);
+  /* Get the context */
+  swscale_ctx = sws_getCachedContext(swscale_ctx,
+      in_frame->width, in_frame->height, format,
+      out_frame->width, out_frame->height, (AVPixelFormat)out_frame->format,
+      SWS_FAST_BILINEAR, NULL, NULL, NULL);
+  if ( swscale_ctx == NULL ) {
+    Error("Failed getting swscale context");
+    return -6;
+  }
+  /* Do the conversion */
+  if (!sws_scale(swscale_ctx,
+        in_frame->data, in_frame->linesize, 0, in_frame->height,
+        out_frame->data, out_frame->linesize)) {
+    Error("swscale conversion failed");
+    return -10;
+  }
+
+  return 0;
+}
+
+int SWScale::Convert(
+    const uint8_t* in_buffer,
+    const size_t in_buffer_size,
+    uint8_t* out_buffer,
+    const size_t out_buffer_size,
+    enum _AVPIXELFORMAT in_pf,
+    enum _AVPIXELFORMAT out_pf,
+    unsigned int width,
+    unsigned int height,
+    unsigned int new_width,
+    unsigned int new_height
+    ) {
+  Debug(1, "Convert: in_buffer %p in_buffer_size %zu out_buffer %p size %zu width %d height %d width %d height %d %d %d",
+      in_buffer, in_buffer_size, out_buffer, out_buffer_size, width, height, new_width, new_height,
+      in_pf, out_pf);
   /* Parameter checking */
-  if(in_buffer == nullptr || out_buffer == nullptr) {
-    Error("NULL Input or output buffer");
+  if ( in_buffer == nullptr ) {
+    Error("NULL Input buffer");
+    return -1;
+  }
+  if ( out_buffer == nullptr ) {
+    Error("NULL output buffer");
     return -1;
   }
   //  if(in_pf == 0 || out_pf == 0) {
   //    Error("Invalid input or output pixel formats");
   //    return -2;
   //  }
-  if (!width || !height || !new_height || !new_width) {
+  if ( !width || !height || !new_height || !new_width ) {
     Error("Invalid width or height");
     return -3;
   }
 
+  in_pf = fix_deprecated_pix_fmt(in_pf);
+
 #if LIBSWSCALE_VERSION_CHECK(0, 8, 0, 8, 0)
   /* Warn if the input or output pixelformat is not supported */
-  if(!sws_isSupportedInput(in_pf)) {
-    Warning("swscale does not support the input format: %c%c%c%c",(in_pf)&0xff,((in_pf)&0xff),((in_pf>>16)&0xff),((in_pf>>24)&0xff));
+  if ( !sws_isSupportedInput(in_pf) ) {
+    Warning("swscale does not support the input format: %c%c%c%c",
+        (in_pf)&0xff,((in_pf)&0xff),((in_pf>>16)&0xff),((in_pf>>24)&0xff));
   }
-  if(!sws_isSupportedOutput(out_pf)) {
-    Warning("swscale does not support the output format: %c%c%c%c",(out_pf)&0xff,((out_pf>>8)&0xff),((out_pf>>16)&0xff),((out_pf>>24)&0xff));
+  if ( !sws_isSupportedOutput(out_pf) ) {
+    Warning("swscale does not support the output format: %c%c%c%c",
+        (out_pf)&0xff,((out_pf>>8)&0xff),((out_pf>>16)&0xff),((out_pf>>24)&0xff));
   }
 #endif
 
+  int alignment = 1;
   /* Check the buffer sizes */
-#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-  size_t insize = av_image_get_buffer_size(in_pf, width, height, 1);
-#else
-  size_t insize = avpicture_get_size(in_pf, width, height);
-#endif
-  if(insize != in_buffer_size) {
-    Error("The input buffer size does not match the expected size for the input format. Required: %d Available: %d", insize, in_buffer_size);
-    return -4;
+  size_t needed_insize = GetBufferSize(in_pf, width, height);
+  if ( needed_insize > in_buffer_size ) {
+    Debug(1,
+          "The input buffer size does not match the expected size for the input format. Required: %zu for %dx%d %d Available: %zu",
+          needed_insize,
+          width,
+          height,
+          in_pf,
+          in_buffer_size);
   }
-#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-  size_t outsize = av_image_get_buffer_size(out_pf, new_width, new_height, 1);
-#else
-  size_t outsize = avpicture_get_size(out_pf, new_width, new_height);
-#endif
-
-  if(outsize < out_buffer_size) {
-    Error("The output buffer is undersized for the output format. Required: %d Available: %d", outsize, out_buffer_size);
+  size_t needed_outsize = GetBufferSize(out_pf, new_width, new_height);
+  if ( needed_outsize > out_buffer_size ) {
+    Error("The output buffer is undersized for the output format. Required: %zu Available: %zu",
+          needed_outsize,
+          out_buffer_size);
     return -5;
   }
 
   /* Get the context */
-  swscale_ctx = sws_getCachedContext( swscale_ctx, width, height, in_pf, new_width, new_height, out_pf, SWS_FAST_BILINEAR, nullptr, nullptr, nullptr );
-  if(swscale_ctx == nullptr) {
+  swscale_ctx = sws_getCachedContext(swscale_ctx,
+      width, height, in_pf,
+      new_width, new_height, out_pf,
+      SWS_FAST_BILINEAR, nullptr, nullptr, nullptr);
+  if ( swscale_ctx == nullptr ) {
     Error("Failed getting swscale context");
     return -6;
   }
@@ -140,7 +192,7 @@ int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint
   /* Fill in the buffers */
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
   if (av_image_fill_arrays(input_avframe->data, input_avframe->linesize,
-                           (uint8_t*) in_buffer, in_pf, width, height, 1) <= 0) {
+                           (uint8_t*) in_buffer, in_pf, width, height, alignment) <= 0) {
 #else
   if (avpicture_fill((AVPicture*) input_avframe, (uint8_t*) in_buffer,
                      in_pf, width, height) <= 0) {
@@ -150,7 +202,7 @@ int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint
   }
 #if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
   if (av_image_fill_arrays(output_avframe->data, output_avframe->linesize,
-                           out_buffer, out_pf, new_width, new_height, 1) <= 0) {
+                           out_buffer, out_pf, new_width, new_height, alignment) <= 0) {
 #else
   if (avpicture_fill((AVPicture*) output_avframe, out_buffer, out_pf, new_width,
                      new_height) <= 0) {
@@ -160,7 +212,10 @@ int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint
   }
 
   /* Do the conversion */
-  if(!sws_scale(swscale_ctx, input_avframe->data, input_avframe->linesize, 0, height, output_avframe->data, output_avframe->linesize ) ) {
+  if ( !sws_scale(swscale_ctx,
+        input_avframe->data, input_avframe->linesize,
+        0, height,
+        output_avframe->data, output_avframe->linesize) ) {
     Error("swscale conversion failed");
     return -10;
   }
@@ -168,27 +223,42 @@ int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint
   return 0;
 }
 
-int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height) {
+int SWScale::Convert(
+    const uint8_t* in_buffer,
+    const size_t in_buffer_size,
+    uint8_t* out_buffer,
+    const size_t out_buffer_size,
+    enum _AVPIXELFORMAT in_pf,
+    enum _AVPIXELFORMAT out_pf,
+    unsigned int width,
+    unsigned int height) {
   return Convert(in_buffer, in_buffer_size, out_buffer, out_buffer_size, in_pf, out_pf, width, height, width, height);
 }
 
-int SWScale::Convert(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height) {
-  if(img->Width() != width) {
-    Error("Source image width differs. Source: %d Output: %d",img->Width(), width);
+int SWScale::Convert(
+    const Image* img,
+    uint8_t* out_buffer,
+    const size_t out_buffer_size,
+    enum _AVPIXELFORMAT in_pf,
+    enum _AVPIXELFORMAT out_pf,
+    unsigned int width,
+    unsigned int height) {
+  if ( img->Width() != width ) {
+    Error("Source image width differs. Source: %d Output: %d", img->Width(), width);
     return -12;
   }
 
-  if(img->Height() != height) {
-    Error("Source image height differs. Source: %d Output: %d",img->Height(), height);
+  if ( img->Height() != height ) {
+    Error("Source image height differs. Source: %d Output: %d", img->Height(), height);
     return -13;
   }
 
-  return Convert(img->Buffer(),img->Size(),out_buffer,out_buffer_size,in_pf,out_pf,width,height);
+  return Convert(img->Buffer(), img->Size(), out_buffer, out_buffer_size, in_pf, out_pf, width, height);
 }
 
 int SWScale::ConvertDefaults(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size) {
 
-  if(!gotdefaults) {
+  if ( !gotdefaults ) {
     Error("Defaults are not set");
     return -24;
   }
@@ -198,11 +268,19 @@ int SWScale::ConvertDefaults(const Image* img, uint8_t* out_buffer, const size_t
 
 int SWScale::ConvertDefaults(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size) {
 
-  if(!gotdefaults) {
+  if ( !gotdefaults ) {
     Error("Defaults are not set");
     return -24;
   }
 
   return Convert(in_buffer,in_buffer_size,out_buffer,out_buffer_size,default_input_pf,default_output_pf,default_width,default_height);
 }
+
+size_t SWScale::GetBufferSize(enum _AVPIXELFORMAT pf, unsigned int width, unsigned int height) {
+#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
+  return av_image_get_buffer_size(pf, width, height, 1);
+#else
+  return outsize = avpicture_get_size(pf, width,height);
+#endif
+}
 #endif // HAVE_LIBSWSCALE && HAVE_LIBAVUTIL
diff --git a/src/zm_swscale.h b/src/zm_swscale.h
index 4d559b4fc..8e7e1fa19 100644
--- a/src/zm_swscale.h
+++ b/src/zm_swscale.h
@@ -1,9 +1,11 @@
 #ifndef ZM_SWSCALE_H
 #define ZM_SWSCALE_H
 
-#include "zm_image.h"
+#include "zm_config.h"
 #include "zm_ffmpeg.h"
 
+class Image;
+
 /* SWScale wrapper class to make our life easier and reduce code reuse */
 #if HAVE_LIBSWSCALE && HAVE_LIBAVUTIL
 class SWScale {
@@ -14,9 +16,11 @@ class SWScale {
     int SetDefaults(enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
     int ConvertDefaults(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size);
     int ConvertDefaults(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size);
+    int Convert( AVFrame *in_frame, AVFrame *out_frame );
     int Convert(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
     int Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
     int Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height, unsigned int new_width, unsigned int new_height);
+    static size_t GetBufferSize(enum _AVPIXELFORMAT in_pf, unsigned int width, unsigned int height);
     
   protected:
     bool gotdefaults;
diff --git a/src/zm_thread.cpp b/src/zm_thread.cpp
deleted file mode 100644
index a4bbe763a..000000000
--- a/src/zm_thread.cpp
+++ /dev/null
@@ -1,315 +0,0 @@
-//
-// ZoneMinder Thread Class Implementation, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
-
-#include "zm_thread.h"
-
-#include "zm_logger.h"
-#include "zm_utils.h"
-
-#include <string.h>
-#include <signal.h>
-#include <errno.h>
-#include <sys/time.h>
-
-struct timespec getTimeout( int secs ) {
-  struct timespec timeout;
-  struct timeval temp_timeout;
-  gettimeofday(&temp_timeout, nullptr);
-  timeout.tv_sec = temp_timeout.tv_sec + secs;
-  timeout.tv_nsec = temp_timeout.tv_usec*1000;
-  return timeout;
-}
-
-struct timespec getTimeout( double secs ) {
-  struct timespec timeout;
-  struct timeval temp_timeout;
-  gettimeofday( &temp_timeout, nullptr );
-  timeout.tv_sec = temp_timeout.tv_sec + int(secs);
-  timeout.tv_nsec = temp_timeout.tv_usec += (long int)(1000000000.0*(secs-int(secs)));
-  if ( timeout.tv_nsec > 1000000000 ) {
-    timeout.tv_sec += 1;
-    timeout.tv_nsec -= 1000000000;
-  }
-  return timeout;
-}
-
-Mutex::Mutex() {
-  if ( pthread_mutex_init(&mMutex, nullptr) < 0 )
-    Error("Unable to create pthread mutex: %s", strerror(errno));
-}
-
-Mutex::~Mutex() {
-  if ( locked() )
-    Warning("Destroying mutex when locked");
-  if ( pthread_mutex_destroy(&mMutex) < 0 )
-    Error("Unable to destroy pthread mutex: %s", strerror(errno));
-}
-
-int Mutex::trylock() {
-  return pthread_mutex_trylock(&mMutex);
-}
-void Mutex::lock() {
-  if ( pthread_mutex_lock(&mMutex) < 0 )
-    throw ThreadException( stringtf( "Unable to lock pthread mutex: %s", strerror(errno) ) );
-}
-
-void Mutex::lock( int secs ) {
-  struct timespec timeout = getTimeout( secs );
-  if ( pthread_mutex_timedlock( &mMutex, &timeout ) < 0 )
-    throw ThreadException( stringtf( "Unable to timedlock pthread mutex: %s", strerror(errno) ) );
-}
-
-void Mutex::lock( double secs ) {
-  struct timespec timeout = getTimeout( secs );
-  if ( pthread_mutex_timedlock( &mMutex, &timeout ) < 0 )
-    throw ThreadException( stringtf( "Unable to timedlock pthread mutex: %s", strerror(errno) ) );
-}
-
-void Mutex::unlock() {
-  if ( pthread_mutex_unlock( &mMutex ) < 0 )
-    throw ThreadException( stringtf( "Unable to unlock pthread mutex: %s", strerror(errno) ) );
-}
-
-bool Mutex::locked() {
-  int state = pthread_mutex_trylock( &mMutex );
-  if ( state != 0 && state != EBUSY )
-    throw ThreadException( stringtf( "Unable to trylock pthread mutex: %s", strerror(errno) ) );
-  if ( state != EBUSY )
-    unlock();
-  return( state == EBUSY );
-}
-
-RecursiveMutex::RecursiveMutex() {
-  pthread_mutexattr_t attr;
-  pthread_mutexattr_init(&attr);
-  pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-
-  if ( pthread_mutex_init(&mMutex, &attr) < 0 )
-    Error("Unable to create pthread mutex: %s", strerror(errno));
-}
-
-Condition::Condition( Mutex &mutex ) : mMutex( mutex ) {
-  if ( pthread_cond_init( &mCondition, nullptr ) < 0 )
-    throw ThreadException( stringtf( "Unable to create pthread condition: %s", strerror(errno) ) );
-}
-
-Condition::~Condition() {
-  if ( pthread_cond_destroy( &mCondition ) < 0 )
-    Error("Unable to destroy pthread condition: %s", strerror(errno));
-}
-
-void Condition::wait() {
-  // Locking done outside of this function
-  if ( pthread_cond_wait(&mCondition, mMutex.getMutex()) < 0 )
-    throw ThreadException(stringtf("Unable to wait pthread condition: %s", strerror(errno)));
-}
-
-bool Condition::wait(int secs) {
-  // Locking done outside of this function
-  Debug(8, "Waiting for %d seconds", secs);
-  struct timespec timeout = getTimeout(secs);
-  if (
-      ( pthread_cond_timedwait(&mCondition, mMutex.getMutex(), &timeout) < 0 )
-      &&
-     ( errno != ETIMEDOUT ) 
-     )
-    throw ThreadException(stringtf("Unable to timedwait pthread condition: %s", strerror(errno)));
-  return errno != ETIMEDOUT;
-}
-
-bool Condition::wait( double secs ) {
-  // Locking done outside of this function
-  struct timespec timeout = getTimeout( secs );
-  if (
-      (pthread_cond_timedwait( &mCondition, mMutex.getMutex(), &timeout ) < 0)
-      &&
-      (errno != ETIMEDOUT) )
-    throw ThreadException( stringtf( "Unable to timedwait pthread condition: %s", strerror(errno) ) );
-  return errno != ETIMEDOUT;
-}
-
-void Condition::signal() {
-  if ( pthread_cond_signal( &mCondition ) < 0 )
-    throw ThreadException( stringtf( "Unable to signal pthread condition: %s", strerror(errno) ) );
-}
-
-void Condition::broadcast() {
-  if ( pthread_cond_broadcast( &mCondition ) < 0 )
-    throw ThreadException( stringtf( "Unable to broadcast pthread condition: %s", strerror(errno) ) );
-}
-
-template <class T> const T ThreadData<T>::getValue() const {
-  mMutex.lock();
-  const T valueCopy = mValue;
-  mMutex.unlock();
-  return valueCopy;
-}
-
-template <class T> T ThreadData<T>::setValue(const T value) {
-  mMutex.lock();
-  const T valueCopy = mValue = value;
-  mMutex.unlock();
-  return valueCopy;
-}
-
-template <class T> const T ThreadData<T>::getUpdatedValue() const {
-  Debug(8, "Waiting for value update, %p", this);
-  mMutex.lock();
-  mChanged = false;
-  mCondition.wait();
-  const T valueCopy = mValue;
-  mMutex.unlock();
-  Debug(9, "Got value update, %p", this);
-  return valueCopy;
-}
-
-template <class T> const T ThreadData<T>::getUpdatedValue(double secs) const {
-  Debug(8, "Waiting for value update, %.2f secs, %p", secs, this);
-  mMutex.lock();
-  mChanged = false;
-  //do {
-    mCondition.wait(secs);
-  //} while ( !mChanged );
-  const T valueCopy = mValue;
-  mMutex.unlock();
-  Debug(9, "Got value update, %p", this);
-  return valueCopy;
-}
-
-template <class T> const T ThreadData<T>::getUpdatedValue(int secs) const {
-  Debug(8, "Waiting for value update, %d secs, %p", secs, this);
-  mMutex.lock();
-  mChanged = false;
-  //do {
-    mCondition.wait(secs);
-  //} while ( !mChanged );
-  const T valueCopy = mValue;
-  mMutex.unlock();
-  Debug(9, "Got value update, %p", this);
-  return valueCopy;
-}
-
-template <class T> void ThreadData<T>::updateValueSignal(const T value) {
-  Debug(8, "Updating value with signal, %p", this);
-  mMutex.lock();
-  mValue = value;
-  mChanged = true;
-  mCondition.signal();
-  mMutex.unlock();
-  Debug(9, "Updated value, %p", this);
-}
-
-template <class T> void ThreadData<T>::updateValueBroadcast( const T value ) {
-  Debug(8, "Updating value with broadcast, %p", this);
-  mMutex.lock();
-  mValue = value;
-  mChanged = true;
-  mCondition.broadcast();
-  mMutex.unlock();
-  Debug(9, "Updated value, %p", this);
-}
-
-Thread::Thread() :
-  mThreadCondition( mThreadMutex ),
-  mPid( -1 ),
-  mStarted( false ),
-  mRunning( false )
-{
-  Debug( 1, "Creating thread" );
-}
-
-Thread::~Thread() {
-  Debug( 1, "Destroying thread %d", mPid );
-  if ( mStarted )
-    join();
-}
-
-void *Thread::mThreadFunc( void *arg ) {
-  Debug( 2, "Invoking thread" );
-
-  Thread *thisPtr = (Thread *)arg;
-  thisPtr->status = 0;
-  try {
-    thisPtr->mThreadMutex.lock();
-    thisPtr->mPid = thisPtr->id();
-    thisPtr->mThreadCondition.signal();
-    thisPtr->mThreadMutex.unlock();
-    thisPtr->mRunning = true;
-    thisPtr->status = thisPtr->run();
-    thisPtr->mRunning = false;
-    Debug( 2, "Exiting thread, status %p", (void *)&(thisPtr->status) );
-    return (void *)&(thisPtr->status);
-  } catch ( const ThreadException &e ) {
-    Error( "%s", e.getMessage().c_str() );
-    thisPtr->mRunning = false;
-    Debug( 2, "Exiting thread after exception, status %p", (void *)-1 );
-    return (void *)-1;
-  }
-}
-
-void Thread::start() {
-  Debug( 1, "Starting thread" );
-  if ( isThread() )
-    throw ThreadException( "Can't self start thread" );
-  mThreadMutex.lock();
-  if ( !mStarted ) {
-    pthread_attr_t threadAttrs;
-    pthread_attr_init( &threadAttrs );
-    pthread_attr_setscope( &threadAttrs, PTHREAD_SCOPE_SYSTEM );
-
-    mStarted = true;
-    if ( pthread_create( &mThread, &threadAttrs, mThreadFunc, this ) < 0 )
-      throw ThreadException( stringtf( "Can't create thread: %s", strerror(errno) ) );
-    pthread_attr_destroy( &threadAttrs );
-  } else {
-    Error( "Attempt to start already running thread %d", mPid );
-  }
-  mThreadCondition.wait();
-  mThreadMutex.unlock();
-  Debug( 1, "Started thread %d", mPid );
-}
-
-void Thread::join() {
-  Debug( 1, "Joining thread %d", mPid );
-  if ( isThread() )
-    throw ThreadException( "Can't self join thread" );
-  mThreadMutex.lock();
-  if ( mPid >= 0 ) {
-    if ( mStarted ) {
-      void *threadStatus = 0;
-      if ( pthread_join( mThread, &threadStatus ) < 0 )
-        throw ThreadException( stringtf( "Can't join sender thread: %s", strerror(errno) ) );
-      mStarted = false;
-      Debug( 1, "Thread %d exited, status %p", mPid, threadStatus );
-    } else {
-      Warning( "Attempt to join already finished thread %d", mPid );
-    }
-  } else {
-    Warning( "Attempt to join non-started thread %d", mPid );
-  }
-  mThreadMutex.unlock();
-  Debug( 1, "Joined thread %d", mPid );
-}
-
-void Thread::kill( int signal ) {
-  pthread_kill( mThread, signal );
-}
-
-// Some explicit template instantiations
-#include "zm_threaddata.cpp"
diff --git a/src/zm_thread.h b/src/zm_thread.h
deleted file mode 100644
index 3f3e8c6b9..000000000
--- a/src/zm_thread.h
+++ /dev/null
@@ -1,269 +0,0 @@
-//
-// ZoneMinder Thread Class Interface, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
-
-#ifndef ZM_THREAD_H
-#define ZM_THREAD_H
-
-class RecursiveMutex;
-
-
-#include "zm_config.h"
-#include <unistd.h>
-#include <pthread.h>
-#ifdef HAVE_SYS_SYSCALL_H
-#include <sys/syscall.h>
-#endif // HAVE_SYS_SYSCALL_H
-#include "zm_exception.h"
-#include "zm_utils.h"
-#ifdef __FreeBSD__
-#include <sys/thr.h>
-#endif
-
-class ThreadException : public Exception {
-private:
-#ifndef SOLARIS
-  pid_t pid() {
-    pid_t tid; 
-#ifdef __FreeBSD__ 
-    long lwpid; 
-    thr_self(&lwpid); 
-    tid = lwpid; 
-#else 
-  #ifdef __FreeBSD_kernel__
-    if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
-  # else
-    tid=syscall(SYS_gettid); 
-  #endif
-#endif
-    return tid;
-  }  
-#else
-  pthread_t pid() { return( pthread_self() ); }
-#endif
-public:
-  explicit ThreadException(const std::string &message) :
-    Exception(stringtf("(%d) ", (long int)pid())+message)
-  {
-  }
-};
-
-class Mutex {
-  friend class Condition;
-
-  private:
-    pthread_mutex_t mMutex;
-
-  public:
-    Mutex();
-    ~Mutex();
-
-  private:
-    pthread_mutex_t *getMutex() {
-      return &mMutex;
-    }
-
-  public:
-    int trylock();
-    void lock();
-    void lock( int secs );
-    void lock( double secs );
-    void unlock();
-    bool locked();
-};
-
-class RecursiveMutex : public Mutex {
-  private:
-    pthread_mutex_t mMutex;
-  public:
-    RecursiveMutex();
-};
-
-class ScopedMutex {
-private:
-  Mutex &mMutex;
-
-public:
-  explicit ScopedMutex( Mutex &mutex ) : mMutex( mutex ) {
-    mMutex.lock();
-  }
-  ~ScopedMutex() {
-    mMutex.unlock();
-  }
-
-private:
-  ScopedMutex( const ScopedMutex & );
-};
-
-class Condition {
-private:
-  Mutex &mMutex;
-  pthread_cond_t mCondition;
-
-public:
-  explicit Condition(Mutex &mutex);
-  ~Condition();
-
-  void wait();
-  bool wait(int secs);
-  bool wait(double secs);
-  void signal();
-  void broadcast();
-};
-
-class Semaphore : public Condition {
-private:
-  Mutex mMutex;
-
-public:
-  Semaphore() : Condition(mMutex) {
-  }
-
-  void wait() {
-    mMutex.lock();
-    Condition::wait();
-    mMutex.unlock();
-  }
-  bool wait(int secs) {
-    mMutex.lock();
-    bool result = Condition::wait(secs);
-    mMutex.unlock();
-    return result;
-  }
-  bool wait(double secs) {
-    mMutex.lock();
-    bool result = Condition::wait(secs);
-    mMutex.unlock();
-    return result;
-  }
-  void signal() {
-    mMutex.lock();
-    Condition::signal();
-    mMutex.unlock();
-  }
-  void broadcast() {
-    mMutex.lock();
-    Condition::broadcast();
-    mMutex.unlock();
-  }
-};
-
-template <class T> class ThreadData {
-private:
-  T mValue;
-  mutable bool mChanged;
-  mutable Mutex mMutex;
-  mutable Condition mCondition;
-
-public:
-  __attribute__((used)) ThreadData() :
-    mValue(0), mCondition(mMutex)
-  {
-    mChanged = false;
-  }
-  explicit __attribute__((used)) ThreadData(T value) :
-    mValue(value), mCondition(mMutex) {
-    mChanged = false;
-  }
-
-  __attribute__((used)) operator T() const {
-    return getValue();
-  }
-  __attribute__((used)) const T operator=( const T value ) {
-    return setValue(value);
-  }
-
-  __attribute__((used)) const T getValueImmediate() const {
-    return mValue;
-  }
-  __attribute__((used)) T setValueImmediate( const T value ) {
-    return mValue = value;
-  }
-  __attribute__((used)) const T getValue() const;
-  __attribute__((used)) T setValue( const T value );
-  __attribute__((used)) const T getUpdatedValue() const;
-  __attribute__((used)) const T getUpdatedValue(double secs) const;
-  __attribute__((used)) const T getUpdatedValue(int secs) const;
-  __attribute__((used)) void updateValueSignal(const T value);
-  __attribute__((used)) void updateValueBroadcast(const T value);
-};
-
-class Thread {
-public:
-  typedef void *(*ThreadFunc)( void * );
-
-protected:
-  pthread_t mThread;
-
-  Mutex mThreadMutex;
-  Condition mThreadCondition;
-#ifndef SOLARIS
-  pid_t mPid;
-#else
-  pthread_t mPid;
-#endif
-  bool  mStarted;
-  bool  mRunning;
-  int   status;		// Used in various functions to get around return a local variable
-
-protected:
-  Thread();
-  virtual ~Thread();
-
-#ifndef SOLARIS
-  pid_t id() const {
-    pid_t tid; 
-#ifdef __FreeBSD__ 
-    long lwpid; 
-    thr_self(&lwpid); 
-    tid = lwpid; 
-#else 
-  #ifdef __FreeBSD_kernel__
-    if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
-
-  #else
-    tid=syscall(SYS_gettid); 
-  #endif
-#endif
-    return tid;
-  }
-#else
-  pthread_t id() const {
-    return pthread_self();
-  }
-#endif
-  void exit( int p_status = 0 ) {
-    //INFO( "Exiting" );
-    pthread_exit( (void *)&p_status );
-  }
-  static void *mThreadFunc( void *arg );
-
-public:
-  virtual int run() = 0;
-
-  void start();
-  void join();
-  void kill( int signal );
-  bool isThread() {
-    return( mPid > -1 && pthread_equal( pthread_self(), mThread ) );
-  }
-  bool isStarted() const { return mStarted; }
-  bool isRunning() const { return mRunning; }
-};
-
-#endif // ZM_THREAD_H
diff --git a/src/zm_time.h b/src/zm_time.h
index 0f7dbc794..5a54bea46 100644
--- a/src/zm_time.h
+++ b/src/zm_time.h
@@ -20,8 +20,7 @@
 #ifndef ZM_TIME_H
 #define ZM_TIME_H
 
-#include "zm.h"
-
+#include <zm_logger.h>
 #include <sys/time.h>
 
 // Structure used for storing the results of the subtraction
@@ -76,7 +75,9 @@ struct DeltaTimeval
 #define USEC_PER_SEC 1000000
 #define MSEC_PER_SEC 1000
 
+/*
 extern struct timeval tv;
+*/
 
 inline int tvDiffUsec( struct timeval first, struct timeval last )
 {
diff --git a/src/zm_timer.cpp b/src/zm_timer.cpp
deleted file mode 100644
index e6d6d16da..000000000
--- a/src/zm_timer.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-//
-// ZoneMinder Timer Class Implementation, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
-
-#include "zm_timer.h"
-
-#include "zm_logger.h"
-
-int Timer::TimerThread::mNextTimerId = 0;
-
-Timer::TimerThread::TimerThread( Timer &timer, int duration, bool repeat ) :
-  mTimerId( 0 ),
-  mTimer( timer ),
-  mDuration( duration ),
-  mRepeat( repeat ),
-  mReset( false ),
-  mExpiryFlag( true )
-{
-  mAccessMutex.lock();
-  mTimerId = mNextTimerId++;
-  Debug( 5, "Creating timer %d for %d seconds%s", mTimerId, mDuration, mRepeat?", repeating":"" );
-  mAccessMutex.unlock();
-}
-
-Timer::TimerThread::~TimerThread()
-{
-  cancel();
-}
-
-void Timer::TimerThread::cancel()
-{
-  mAccessMutex.lock();
-  if ( mRunning )
-  {
-    Debug( 4, "Cancelling timer %d", mTimerId );
-    mRepeat = false;
-    mReset = false;
-    mExpiryFlag.updateValueSignal( false );
-  }
-  mAccessMutex.unlock();
-}
-
-void Timer::TimerThread::reset()
-{
-  mAccessMutex.lock();
-  if ( mRunning )
-  {
-    Debug( 4, "Resetting timer" );
-    mReset = true;
-    mExpiryFlag.updateValueSignal( false );
-  }
-  else
-  {
-    Error( "Attempting to reset expired timer %d", mTimerId );
-  }
-  mAccessMutex.unlock();
-}
-
-int Timer::TimerThread::run()
-{
-  Debug( 4, "Starting timer %d for %d seconds", mTimerId, mDuration );
-  bool timerExpired = false;
-  do
-  {
-    mAccessMutex.lock();
-    mReset = false;
-    mExpiryFlag.setValue( true );
-    mAccessMutex.unlock();
-    timerExpired = mExpiryFlag.getUpdatedValue( mDuration );
-    mAccessMutex.lock();
-    if ( timerExpired )
-    {
-      Debug( 4, "Timer %d expired", mTimerId );
-      mTimer.expire();
-    }
-    else
-    {
-      Debug( 4, "Timer %d %s", mTimerId, mReset?"reset":"cancelled" );
-    }
-    mAccessMutex.unlock();
-  } while ( mRepeat || (mReset && !timerExpired) );
-  return( timerExpired );
-}
-
-Timer::Timer( int timeout, bool repeat ) : mTimerThread( *this, timeout, repeat )
-{
-  mTimerThread.start();
-}
-
-Timer::~Timer()
-{
-  //cancel();
-}
-
-void Timer::Timer::cancel()
-{
-  mTimerThread.cancel();
-}
-
-void Timer::Timer::reset()
-{
-  mTimerThread.reset();
-}
-
diff --git a/src/zm_timer.h b/src/zm_timer.h
deleted file mode 100644
index da3b95783..000000000
--- a/src/zm_timer.h
+++ /dev/null
@@ -1,109 +0,0 @@
-//
-// ZoneMinder Timer Class Interface, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
-
-#ifndef ZM_TIMER_H
-#define ZM_TIMER_H
-
-#ifdef HAVE_SYS_SYSCALL_H
-#include <sys/syscall.h>
-#endif // HAVE_SYS_SYSCALL_H
-#include "zm_thread.h"
-
-#include "zm_exception.h"
-
-class Timer
-{
-private:
-  class TimerException : public Exception
-  {
-  private:
-#ifndef SOLARIS
-    pid_t pid() {
-    pid_t tid;
-#ifdef __FreeBSD__
-    long lwpid;
-    thr_self(&lwpid);
-    tid = lwpid;
-#else
-  #ifdef __FreeBSD_kernel__
-    if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
-  #else
-    tid=syscall(SYS_gettid);
-  #endif
-#endif
-    return tid;
-  }
-#else
-  pthread_t pid() { return( pthread_self() ); }
-#endif
-  public:
-    explicit TimerException( const std::string &message ) : Exception( stringtf("(%d) ", (long int)pid())+message ) {
-    }
-  };
-
-  class TimerThread : public Thread
-  {
-  private:
-    typedef ThreadData<bool> ExpiryFlag;
-
-  private:
-    static int mNextTimerId;
-
-  private:
-    int mTimerId;
-    Timer &mTimer;
-    int mDuration;
-    int mRepeat;
-    int mReset;
-    ExpiryFlag mExpiryFlag;
-    Mutex mAccessMutex;
-
-  private:
-    void quit()
-    {
-      cancel();
-    }
-
-  public:
-    TimerThread( Timer &timer, int timeout, bool repeat );
-    ~TimerThread();
-
-    void cancel();
-    void reset();
-    int run();
-  };
-
-protected:
-  TimerThread mTimerThread;
-
-protected:
-  Timer( int timeout, bool repeat=false );
-
-public:
-  virtual ~Timer();
-
-protected:
-  virtual void expire()=0;
-
-public:
-  void cancel();
-  void reset();
-};
-
-#endif // ZM_TIMER_H
diff --git a/src/zm_user.cpp b/src/zm_user.cpp
index 06b53abbe..254663a04 100644
--- a/src/zm_user.cpp
+++ b/src/zm_user.cpp
@@ -17,16 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "zm.h"
-#include "zm_db.h"
-
 #include "zm_user.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-#include <utility>
+#include "zm_crypt.h"
+#include "zm_logger.h"
+#include "zm_utils.h"
+#include <cstring>
 
 #if HAVE_GNUTLS_GNUTLS_H
 #include <gnutls/gnutls.h>
@@ -38,9 +34,6 @@
 #include <openssl/md5.h>
 #endif  // HAVE_GCRYPT_H || HAVE_LIBCRYPTO
 
-#include "zm_utils.h"
-#include "zm_crypt.h"
-
 User::User() {
   id = 0;
   username[0] = password[0] = 0;
@@ -61,7 +54,7 @@ User::User(const MYSQL_ROW &dbrow) {
   system = (Permission)atoi(dbrow[index++]);
   char *monitor_ids_str = dbrow[index++];
   if ( monitor_ids_str && *monitor_ids_str ) {
-    StringVector ids = split(monitor_ids_str, ",");
+    StringVector ids = Split(monitor_ids_str, ",");
     for ( StringVector::iterator i = ids.begin(); i < ids.end(); ++i ) {
       monitor_ids.push_back(atoi((*i).c_str()));
     }
@@ -101,43 +94,35 @@ bool User::canAccess(int monitor_id) {
 // Function to load a user from username and password
 // Please note that in auth relay mode = none, password is NULL
 User *zmLoadUser(const char *username, const char *password) {
-  char sql[ZM_SQL_MED_BUFSIZ] = "";
   int username_length = strlen(username);
-  char *safer_username = new char[(username_length * 2) + 1];
 
   // According to docs, size of safer_whatever must be 2*length+1
   // due to unicode conversions + null terminator.
-  mysql_real_escape_string(&dbconn, safer_username, username, username_length);
+  std::string escaped_username((username_length * 2) + 1, '\0');
 
-  snprintf(sql, sizeof(sql),
-      "SELECT `Id`, `Username`, `Password`, `Enabled`,"
-      " `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
-      " `MonitorIds`"
-      " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1",
-      safer_username);
-  delete[] safer_username;
-  safer_username = nullptr;
 
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't run query: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
-  }
+  size_t escaped_len = mysql_real_escape_string(&dbconn, &escaped_username[0], username, username_length);
+  escaped_username.resize(escaped_len);
 
-  MYSQL_RES *result = mysql_store_result(&dbconn);
-  if ( !result ) {
-    Error("Can't use query result: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
-  }
+  std::string sql = stringtf("SELECT `Id`, `Username`, `Password`, `Enabled`,"
+                             " `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
+                             " `MonitorIds`"
+                             " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1",
+                             escaped_username.c_str());
+
+  MYSQL_RES *result = zmDbFetch(sql.c_str());
+  if (!result)
+    return nullptr;
 
   if ( mysql_num_rows(result) == 1 ) {
     MYSQL_ROW dbrow = mysql_fetch_row(result);
     User *user = new User(dbrow);
-    mysql_free_result(result);
 
     if ( 
         (! password )  // relay type must be none
         ||
         verifyPassword(username, password, user->getPassword()) ) {
+      mysql_free_result(result);
       Info("Authenticated user '%s'", user->getUsername());
       return user;
     } 
@@ -148,7 +133,7 @@ User *zmLoadUser(const char *username, const char *password) {
   return nullptr;
 }  // end User *zmLoadUser(const char *username, const char *password)
 
-User *zmLoadTokenUser(std::string jwt_token_str, bool use_remote_addr) {
+User *zmLoadTokenUser(const std::string &jwt_token_str, bool use_remote_addr) {
   std::string key = config.auth_hash_secret;
   std::string remote_addr = "";
 
@@ -172,22 +157,13 @@ User *zmLoadTokenUser(std::string jwt_token_str, bool use_remote_addr) {
     return nullptr;
   }
 
-  char sql[ZM_SQL_MED_BUFSIZ] = "";
-  snprintf(sql, sizeof(sql),
-    "SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0,"
-    " `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`, `TokenMinExpiry`"
-    " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", username.c_str());
+  std::string sql = stringtf("SELECT `Id`, `Username`, `Password`, `Enabled`, `Stream`+0, `Events`+0,"
+                             " `Control`+0, `Monitors`+0, `System`+0, `MonitorIds`, `TokenMinExpiry`"
+                             " FROM `Users` WHERE `Username` = '%s' AND `Enabled` = 1", username.c_str());
 
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't run query: %s", mysql_error(&dbconn));
+  MYSQL_RES *result = zmDbFetch(sql.c_str());
+  if (!result)
     return nullptr;
-  }
-
-  MYSQL_RES *result = mysql_store_result(&dbconn);
-  if ( !result ) {
-    Error("Can't use query result: %s", mysql_error(&dbconn));
-    return nullptr;
-  }
 
   int n_users = mysql_num_rows(result);
   if ( n_users != 1 ) {
@@ -233,23 +209,15 @@ User *zmLoadAuthUser(const char *auth, bool use_remote_addr) {
     }
   }
 
-  Debug(1, "Attempting to authenticate user from auth string '%s'", auth);
-  char sql[ZM_SQL_SML_BUFSIZ] = "";
-  snprintf(sql, sizeof(sql),
-      "SELECT `Id`, `Username`, `Password`, `Enabled`,"
-      " `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
-      " `MonitorIds` FROM `Users` WHERE `Enabled` = 1");
+  Debug(1, "Attempting to authenticate user from auth string '%s', remote addr(%s)", auth, remote_addr);
+  std::string sql = "SELECT `Id`, `Username`, `Password`, `Enabled`,"
+                    " `Stream`+0, `Events`+0, `Control`+0, `Monitors`+0, `System`+0,"
+                    " `MonitorIds` FROM `Users` WHERE `Enabled` = 1";
 
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't run query: %s", mysql_error(&dbconn));
-    exit(mysql_errno(&dbconn));
-  }
-
-  MYSQL_RES *result = mysql_store_result(&dbconn);
-  if ( !result ) {
-    Error("Can't use query result: %s", mysql_error(&dbconn));
+  MYSQL_RES *result = zmDbFetch(sql.c_str());
+  if (!result)
     return nullptr;
-  }
+
   int n_users = mysql_num_rows(result);
   if ( n_users < 1 ) {
     mysql_free_result(result);
@@ -257,13 +225,14 @@ User *zmLoadAuthUser(const char *auth, bool use_remote_addr) {
     return nullptr;
   }
 
+  // getting the time is expensive, so only do it once.
   time_t now = time(nullptr);
   unsigned int hours = config.auth_hash_ttl;
-  if ( ! hours ) {
+  if ( !hours ) {
     Warning("No value set for ZM_AUTH_HASH_TTL. Defaulting to 2.");
     hours = 2;
   } else {
-    Debug(1, "AUTH_HASH_TTL is %d", hours);
+    Debug(1, "AUTH_HASH_TTL is %d, time is %" PRIi64, hours, static_cast<int64>(now));
   }
   char auth_key[512] = "";
   char auth_md5[32+1] = "";
@@ -272,22 +241,23 @@ User *zmLoadAuthUser(const char *auth, bool use_remote_addr) {
 
   const char * hex = "0123456789abcdef";
   while ( MYSQL_ROW dbrow = mysql_fetch_row(result) ) {
-    const char *user = dbrow[1];
-    const char *pass = dbrow[2];
+    const char *username = dbrow[1];
+    const char *password = dbrow[2];
 
     time_t our_now = now;
+    tm now_tm = {};
     for ( unsigned int i = 0; i < hours; i++, our_now -= 3600 ) {
-      struct tm *now_tm = localtime(&our_now);
+      localtime_r(&our_now, &now_tm);
 
       snprintf(auth_key, sizeof(auth_key)-1, "%s%s%s%s%d%d%d%d",
         config.auth_hash_secret,
-        user,
-        pass,
+        username,
+        password,
         remote_addr,
-        now_tm->tm_hour,
-        now_tm->tm_mday,
-        now_tm->tm_mon,
-        now_tm->tm_year);
+        now_tm.tm_hour,
+        now_tm.tm_mday,
+        now_tm.tm_mon,
+        now_tm.tm_year);
 
 #if HAVE_DECL_MD5
       MD5((unsigned char *)auth_key, strlen(auth_key), md5sum);
diff --git a/src/zm_user.h b/src/zm_user.h
index 42fe07554..a8b78b488 100644
--- a/src/zm_user.h
+++ b/src/zm_user.h
@@ -17,12 +17,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */  
 
-#include "zm.h"
-#include "zm_db.h"
+
 
 #ifndef ZM_USER_H
 #define ZM_USER_H
 
+#include "zm_db.h"
 #include <string>
 #include <vector>
 
@@ -46,13 +46,13 @@ class User {
   User();
   explicit User(const MYSQL_ROW &dbrow);
   ~User();
-  User(User &u) { Copy(u); }
+  User(const User &u) { Copy(u); }
   void Copy(const User &u);
   User& operator=(const User &u) {
     Copy(u); return *this;
   }
 
-  const int  Id() const { return id; }
+  int  Id() const { return id; }
   const char *getUsername() const { return username; }
   const char *getPassword() const { return password; }
   bool isEnabled() const { return enabled; }
@@ -66,7 +66,7 @@ class User {
 
 User *zmLoadUser(const char *username, const char *password=0);
 User *zmLoadAuthUser(const char *auth, bool use_remote_addr);
-User *zmLoadTokenUser(std::string jwt, bool use_remote_addr);
+User *zmLoadTokenUser(const std::string &jwt, bool use_remote_addr);
 bool checkUser(const char *username);
 bool checkPass(const char *password);
 
diff --git a/src/zm_utils.cpp b/src/zm_utils.cpp
index 0f7a9bca9..7d2bbc888 100644
--- a/src/zm_utils.cpp
+++ b/src/zm_utils.cpp
@@ -17,156 +17,135 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-//#include "zm_logger.h"
-#include "zm.h"
 #include "zm_utils.h"
 
-#include <string.h>
-#include <algorithm>
-#include <stdio.h>
-#include <stdarg.h>
+#include "zm_config.h"
+#include "zm_logger.h"
+#include <array>
+#include <cstring>
 #include <fcntl.h> /* Definition of AT_* constants */
+#include <sstream>
 #include <sys/stat.h>
+
 #if defined(__arm__)
 #include <sys/auxv.h>
 #endif
 
-#ifdef HAVE_CURL_CURL_H
-#include <curl/curl.h>
-#endif
-
 unsigned int sse_version = 0;
 unsigned int neonversion = 0;
 
-std::string trimSet(std::string str, std::string trimset) {
-  // Trim Both leading and trailing sets
-  size_t startpos = str.find_first_not_of(trimset); // Find the first character position after excluding leading blank spaces
-  size_t endpos = str.find_last_not_of(trimset); // Find the first character position from reverse af
- 
+// Trim Both leading and trailing sets
+std::string Trim(const std::string &str, const std::string &char_set) {
+  size_t start_pos = str.find_first_not_of(char_set);
+  size_t end_pos = str.find_last_not_of(char_set);
+
   // if all spaces or empty return an empty string
-  if ( ( std::string::npos == startpos ) || ( std::string::npos == endpos ) )
-    return std::string("");
-  return str.substr(startpos, endpos-startpos+1);
+  if ((start_pos == std::string::npos) || (end_pos == std::string::npos))
+    return "";
+  return str.substr(start_pos, end_pos - start_pos + 1);
 }
 
-std::string trimSpaces(const std::string &str) {
-  return trimSet(str, " \t");
-}
-
-std::string replaceAll(std::string str, std::string from, std::string to) {
-  if ( from.empty() )
+std::string ReplaceAll(std::string str, const std::string &old_value, const std::string &new_value) {
+  if (old_value.empty())
     return str;
   size_t start_pos = 0;
-  while ( (start_pos = str.find(from, start_pos)) != std::string::npos ) {
-    str.replace(start_pos, from.length(), to);
-    start_pos += to.length(); // In case 'to' contains 'from', like replacing 'x' with 'yx'
+  while ((start_pos = str.find(old_value, start_pos)) != std::string::npos) {
+    str.replace(start_pos, old_value.length(), new_value);
+    start_pos += new_value.length(); // In case 'new_value' contains 'old_value', like replacing 'x' with 'yx'
   }
   return str;
 }
 
-const std::string stringtf( const char *format, ... ) {
-  va_list ap;
-  char tempBuffer[8192];
-  std::string tempString;
+StringVector Split(const std::string &str, char delim) {
+  std::vector<std::string> tokens;
 
-  va_start(ap, format);
-  vsnprintf(tempBuffer, sizeof(tempBuffer), format , ap);
-  va_end(ap);
+  size_t start = 0;
+  for (size_t end = str.find(delim); end != std::string::npos; end = str.find(delim, start)) {
+    tokens.push_back(str.substr(start, end - start));
+    start = end + 1;
+  }
 
-  tempString = tempBuffer;
+  tokens.push_back(str.substr(start));
 
-  return tempString;
+  return tokens;
 }
 
-const std::string stringtf(const std::string format, ...) {
-  va_list ap;
-  char tempBuffer[8192];
-  std::string tempString;
+StringVector Split(const std::string &str, const std::string &delim, size_t limit) {
+  StringVector tokens;
+  size_t start = 0;
 
-  va_start(ap, format);
-  vsnprintf(tempBuffer, sizeof(tempBuffer), format.c_str(), ap);
-  va_end(ap);
-
-  tempString = tempBuffer;
-
-  return tempString;
-}
-
-bool startsWith(const std::string &haystack, const std::string &needle) {
-  return ( haystack.substr(0, needle.length()) == needle );
-}
-
-StringVector split(const std::string &string, const std::string &chars, int limit) {
-  StringVector stringVector;
-  std::string tempString = string;
-  std::string::size_type startIndex = 0;
-  std::string::size_type endIndex = 0;
-
-  //Info( "Looking for '%s' in '%s', limit %d", chars.c_str(), string.c_str(), limit );
   do {
-    // Find delimiters
-    endIndex = string.find_first_of( chars, startIndex );
-    //Info( "Got endIndex at %d", endIndex );
-    if ( endIndex > 0 ) {
-      //Info( "Adding '%s'", string.substr( startIndex, endIndex-startIndex ).c_str() );
-      stringVector.push_back( string.substr( startIndex, endIndex-startIndex ) );
+    size_t end = str.find_first_of(delim, start);
+    if (end > 0) {
+      tokens.push_back(str.substr(start, end - start));
     }
-    if ( endIndex == std::string::npos )
+    if (end == std::string::npos) {
       break;
+    }
     // Find non-delimiters
-    startIndex = tempString.find_first_not_of( chars, endIndex );
-    if ( limit && (stringVector.size() == (unsigned int)(limit-1)) ) {
-      stringVector.push_back( string.substr( startIndex ) );
+    start = str.find_first_not_of(delim, end);
+    if (limit && (tokens.size() == limit - 1)) {
+      tokens.push_back(str.substr(start));
       break;
     }
-    //Info( "Got new startIndex at %d", startIndex );
-  } while ( startIndex != std::string::npos );
-  //Info( "Finished with %d strings", stringVector.size() );
+  } while (start != std::string::npos);
 
-  return stringVector;
+  return tokens;
 }
 
-const std::string join(const StringVector &v, const char * delim=",") {
+std::pair<std::string, std::string> PairSplit(const std::string &str, char delim) {
+  if (str.empty())
+    return std::make_pair("", "");
+
+  size_t pos = str.find(delim);
+
+  if (pos == std::string::npos)
+    return std::make_pair("", "");
+
+  return std::make_pair(str.substr(0, pos), str.substr(pos + 1, std::string::npos));
+}
+
+std::string Join(const StringVector &values, const std::string &delim) {
   std::stringstream ss;
 
-  for (size_t i = 0; i < v.size(); ++i) {
-    if ( i != 0 )
+  for (size_t i = 0; i < values.size(); ++i) {
+    if (i != 0)
       ss << delim;
-    ss << v[i];
+    ss << values[i];
   }
   return ss.str();
 }
 
-const std::string base64Encode(const std::string &inString) {
-  static char base64_table[64] = { '\0' };
+std::string Base64Encode(const std::string &str) {
+  static char base64_table[64] = {'\0'};
 
-  if ( !base64_table[0] ) {
+  if (!base64_table[0]) {
     int i = 0;
-    for ( char c = 'A'; c <= 'Z'; c++ )
+    for (char c = 'A'; c <= 'Z'; c++)
       base64_table[i++] = c;
-    for ( char c = 'a'; c <= 'z'; c++ )
+    for (char c = 'a'; c <= 'z'; c++)
       base64_table[i++] = c;
-    for ( char c = '0'; c <= '9'; c++ )
+    for (char c = '0'; c <= '9'; c++)
       base64_table[i++] = c;
     base64_table[i++] = '+';
     base64_table[i++] = '/';
   }
 
   std::string outString;
-  outString.reserve(2 * inString.size());
+  outString.reserve(2 * str.size());
 
-  const char *inPtr = inString.c_str();
-  while ( *inPtr ) {
+  const char *inPtr = str.c_str();
+  while (*inPtr) {
     unsigned char selection = *inPtr >> 2;
     unsigned char remainder = (*inPtr++ & 0x03) << 4;
     outString += base64_table[selection];
 
-    if ( *inPtr ) {
+    if (*inPtr) {
       selection = remainder | (*inPtr >> 4);
       remainder = (*inPtr++ & 0x0f) << 2;
       outString += base64_table[selection];
-    
-      if ( *inPtr ) {
+
+      if (*inPtr) {
         selection = remainder | (*inPtr >> 6);
         outString += base64_table[selection];
         selection = (*inPtr++ & 0x3f);
@@ -184,114 +163,64 @@ const std::string base64Encode(const std::string &inString) {
   return outString;
 }
 
-int split(const char* string, const char delim, std::vector<std::string>& items) {
-  if ( string == nullptr )
-    return -1;
-
-  if ( string[0] == 0 )
-    return -2;
-
-  std::string str(string);
-  
-  while ( true ) {
-    size_t pos = str.find(delim);
-    items.push_back(str.substr(0, pos));
-    str.erase(0, pos+1);
-
-    if ( pos == std::string::npos )
-      break;
+void TimespecDiff(struct timespec *start, struct timespec *end, struct timespec *diff) {
+  if (((end->tv_nsec) - (start->tv_nsec)) < 0) {
+    diff->tv_sec = end->tv_sec - start->tv_sec - 1;
+    diff->tv_nsec = 1000000000 + end->tv_nsec - start->tv_nsec;
+  } else {
+    diff->tv_sec = end->tv_sec - start->tv_sec;
+    diff->tv_nsec = end->tv_nsec - start->tv_nsec;
   }
-
-  return items.size();
 }
 
-int pairsplit(const char* string, const char delim, std::string& name, std::string& value) {
-  if ( string == nullptr )
-    return -1;
+std::string TimevalToString(timeval tv) {
+  tm now = {};
+  std::array<char, 26> tm_buf = {};
 
-  if ( string[0] == 0 )
-    return -2;
+  localtime_r(&tv.tv_sec, &now);
+  size_t tm_buf_len = strftime(tm_buf.data(), tm_buf.size(), "%Y-%m-%d %H:%M:%S", &now);
+  if (tm_buf_len == 0) {
+    return "";
+  }
 
-  std::string str(string);
-  size_t pos = str.find(delim);
-
-  if ( pos == std::string::npos || pos == 0 || pos >= str.length() )
-    return -3;
-
-  name = str.substr(0, pos);
-  value = str.substr(pos+1, std::string::npos);
-
-  return 0;
+  return stringtf("%s.%06ld", tm_buf.data(), tv.tv_usec);
 }
 
 /* Detect special hardware features, such as SIMD instruction sets */
-void hwcaps_detect() {
+void HwCapsDetect() {
   neonversion = 0;
   sse_version = 0;
 #if (defined(__i386__) || defined(__x86_64__))
-  /* x86 or x86-64 processor */
-  uint32_t r_edx, r_ecx, r_ebx;
+  __builtin_cpu_init();
 
-#ifdef __x86_64__
-  __asm__ __volatile__(
-  "push %%rbx\n\t"
-  "mov $0x0,%%ecx\n\t"
-  "mov $0x7,%%eax\n\t"
-  "cpuid\n\t"
-  "push %%rbx\n\t"
-  "mov $0x1,%%eax\n\t"
-  "cpuid\n\t"
-  "pop %%rax\n\t"
-  "pop %%rbx\n\t"
-  : "=d" (r_edx), "=c" (r_ecx), "=a" (r_ebx)
-  :
-  :
-  );
-#else
-  __asm__ __volatile__(
-  "push %%ebx\n\t"
-  "mov $0x0,%%ecx\n\t"
-  "mov $0x7,%%eax\n\t"
-  "cpuid\n\t"
-  "push %%ebx\n\t"
-  "mov $0x1,%%eax\n\t"
-  "cpuid\n\t"
-  "pop %%eax\n\t"
-  "pop %%ebx\n\t"
-  : "=d" (r_edx), "=c" (r_ecx), "=a" (r_ebx)
-  :
-  :
-  );
-#endif
-
-  if ( r_ebx & 0x00000020 ) {
+  if (__builtin_cpu_supports("avx2")) {
     sse_version = 52; /* AVX2 */
     Debug(1, "Detected a x86\\x86-64 processor with AVX2");
-  } else if ( r_ecx & 0x10000000 ) {
+  } else if (__builtin_cpu_supports("avx")) {
     sse_version = 51; /* AVX */
     Debug(1, "Detected a x86\\x86-64 processor with AVX");
-  } else if ( r_ecx & 0x00100000 ) {
+  } else if (__builtin_cpu_supports("sse4.2")) {
     sse_version = 42; /* SSE4.2 */
     Debug(1, "Detected a x86\\x86-64 processor with SSE4.2");
-  } else if ( r_ecx & 0x00080000 ) {
+  } else if (__builtin_cpu_supports("sse4.1")) {
     sse_version = 41; /* SSE4.1 */
     Debug(1, "Detected a x86\\x86-64 processor with SSE4.1");
-  } else if ( r_ecx & 0x00000200 ) {
+  } else if (__builtin_cpu_supports("ssse3")) {
     sse_version = 35; /* SSSE3 */
-    Debug(1,"Detected a x86\\x86-64 processor with SSSE3");
-  } else if ( r_ecx & 0x00000001 ) {
+    Debug(1, "Detected a x86\\x86-64 processor with SSSE3");
+  } else if (__builtin_cpu_supports("sse3")) {
     sse_version = 30; /* SSE3 */
     Debug(1, "Detected a x86\\x86-64 processor with SSE3");
-  } else if ( r_edx & 0x04000000 ) {
+  } else if (__builtin_cpu_supports("sse2")) {
     sse_version = 20; /* SSE2 */
     Debug(1, "Detected a x86\\x86-64 processor with SSE2");
-  } else if ( r_edx & 0x02000000 ) {
+  } else if (__builtin_cpu_supports("sse")) {
     sse_version = 10; /* SSE */
     Debug(1, "Detected a x86\\x86-64 processor with SSE");
   } else {
     sse_version = 0;
     Debug(1, "Detected a x86\\x86-64 processor");
-  } 
+  }
 #elif defined(__arm__)
   // ARM processor in 32bit mode
   // To see if it supports NEON, we need to get that information from the kernel
@@ -316,19 +245,19 @@ void hwcaps_detect() {
 /* SSE2 aligned memory copy. Useful for big copying of aligned memory like image buffers in ZM */
 /* For platforms without SSE2 we will use standard x86 asm memcpy or glibc's memcpy() */
 #if defined(__i386__) || defined(__x86_64__)
-__attribute__((noinline,__target__("sse2")))
+__attribute__((noinline, __target__("sse2")))
 #endif
-void* sse2_aligned_memcpy(void* dest, const void* src, size_t bytes) {
+void *sse2_aligned_memcpy(void *dest, const void *src, size_t bytes) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
-  if ( bytes > 128 ) {
+  if (bytes > 128) {
     unsigned int remainder = bytes % 128;
-    const uint8_t* lastsrc = (uint8_t*)src + (bytes - remainder);
+    const uint8_t *lastsrc = (uint8_t *) src + (bytes - remainder);
 
     __asm__ __volatile__(
     "sse2_copy_iter:\n\t"
     "movdqa (%0),%%xmm0\n\t"
     "movdqa 0x10(%0),%%xmm1\n\t"
-    "movdqa 0x20(%0),%%xmm2\n\t"  
+    "movdqa 0x20(%0),%%xmm2\n\t"
     "movdqa 0x30(%0),%%xmm3\n\t"
     "movdqa 0x40(%0),%%xmm4\n\t"
     "movdqa 0x50(%0),%%xmm5\n\t"
@@ -358,90 +287,120 @@ void* sse2_aligned_memcpy(void* dest, const void* src, size_t bytes) {
 
   } else {
     /* Standard memcpy */
-    __asm__ __volatile__("cld; rep movsb" :: "S"(src), "D"(dest), "c"(bytes) : "cc", "memory");
+    __asm__ __volatile__("cld; rep movsb"::"S"(src), "D"(dest), "c"(bytes) : "cc", "memory");
   }
 #else
   /* Non x86\x86-64 platform, use memcpy */
-  memcpy(dest, src, bytes);
+  memcpy(dest,src,bytes);
 #endif
   return dest;
 }
 
-void timespec_diff(struct timespec *start, struct timespec *end, struct timespec *diff) {
-  if (((end->tv_nsec)-(start->tv_nsec))<0) {
-    diff->tv_sec = end->tv_sec-start->tv_sec-1;
-    diff->tv_nsec = 1000000000+end->tv_nsec-start->tv_nsec;
-  } else {
-    diff->tv_sec = end->tv_sec-start->tv_sec;
-    diff->tv_nsec = end->tv_nsec-start->tv_nsec;
-  }
-}
-
-char *timeval_to_string( struct timeval tv ) {
-  time_t nowtime;
-  struct tm *nowtm;
-  static char tmbuf[20], buf[28];
-
-  nowtime = tv.tv_sec;
-  nowtm = localtime(&nowtime);
-  strftime(tmbuf, sizeof tmbuf, "%Y-%m-%d %H:%M:%S", nowtm);
-  snprintf(buf, sizeof buf-1, "%s.%06ld", tmbuf, tv.tv_usec);
-  return buf;
-}
-
-std::string UriDecode( const std::string &encoded ) {
-  char a, b;
-  const char *src = encoded.c_str();
-  std::string retbuf;
-  retbuf.resize(encoded.length() + 1);
-  char *dst = &retbuf[0];
-  while (*src) {
-    if ((*src == '%') && ((a = src[1]) && (b = src[2])) && (isxdigit(a) && isxdigit(b))) {
-      if (a >= 'a')
-        a -= 'a'-'A';
-      if (a >= 'A')
-        a -= ('A' - 10);
-      else
-        a -= '0';
-      if (b >= 'a')
-        b -= 'a'-'A';
-      if (b >= 'A')
-        b -= ('A' - 10);
-      else
-        b -= '0';
-      *dst++ = 16*a+b;
-      src+=3;
-    } else if (*src == '+') {
-      *dst++ = ' ';
-      src++;
-    } else {
-      *dst++ = *src++;
-    }
-  }
-  *dst++ = '\0';
-  return retbuf;
-}
-
-void string_toupper( std::string& str) {
-  std::transform(str.begin(), str.end(), str.begin(), ::toupper);
-}
-
 void touch(const char *pathname) {
-  int fd = open(pathname,
-      O_WRONLY|O_CREAT|O_NOCTTY|O_NONBLOCK,
-      0666);
-  if ( fd < 0 ) {
+  int fd = open(pathname, O_WRONLY | O_CREAT | O_NOCTTY | O_NONBLOCK, 0666);
+  if (fd < 0) {
     // Couldn't open that path.
     Error("Couldn't open() path %s in touch", pathname);
     return;
   }
-  int rc = utimensat(AT_FDCWD,
-      pathname,
-      nullptr,
-      0);
-  if ( rc ) {
+  int rc = utimensat(AT_FDCWD, pathname, nullptr, 0);
+  if (rc) {
     Error("Couldn't utimensat() path %s in touch", pathname);
     return;
   }
 }
 
+std::string UriDecode(const std::string &encoded) {
+  const char *src = encoded.c_str();
+  std::string retbuf;
+  retbuf.reserve(encoded.length());
+  while (*src) {
+    char a, b;
+    if ((*src == '%') && ((a = src[1]) && (b = src[2])) && (isxdigit(a) && isxdigit(b))) {
+      if (a >= 'a')
+        a -= 'a' - 'A';
+      if (a >= 'A')
+        a -= ('A' - 10);
+      else
+        a -= '0';
+      if (b >= 'a')
+        b -= 'a' - 'A';
+      if (b >= 'A')
+        b -= ('A' - 10);
+      else
+        b -= '0';
+      retbuf.push_back(16 * a + b);
+      src += 3;
+    } else if (*src == '+') {
+      retbuf.push_back(' ');
+      src++;
+    } else {
+      retbuf.push_back(*src++);
+    }
+  }
+  return retbuf;
+}
+
+QueryString::QueryString(std::istream &input) {
+  while (!input.eof() && input.peek() > 0) {
+    //Should eat "param1="
+    auto name = parseName(input);
+    //Should eat value1&
+    std::string value = parseValue(input);
+
+    auto foundItr = parameters_.find(name);
+    if (foundItr == parameters_.end()) {
+      std::unique_ptr<QueryParameter> newParam = ZM::make_unique<QueryParameter>(name);
+      if (!value.empty()) {
+        newParam->addValue(value);
+      }
+      parameters_.emplace(name, std::move(newParam));
+    } else {
+      foundItr->second->addValue(value);
+    }
+  }
+}
+
+std::vector<std::string> QueryString::names() const {
+  std::vector<std::string> names;
+  for (auto const &pair : parameters_)
+    names.push_back(pair.second->name());
+
+  return names;
+}
+
+const QueryParameter *QueryString::get(const std::string &name) const {
+  auto itr = parameters_.find(name);
+  return itr == parameters_.end() ? nullptr : itr->second.get();
+}
+
+std::string QueryString::parseName(std::istream &input) {
+  std::string name;
+
+  while (!input.eof() && input.peek() != '=') {
+    name.push_back(input.get());
+  }
+
+  //Eat the '='
+  if (!input.eof()) {
+    input.get();
+  }
+
+  return name;
+}
+
+std::string QueryString::parseValue(std::istream &input) {
+  std::string url_encoded_value;
+
+  int c = input.get();
+  while (c > 0 && c != '&') {
+    url_encoded_value.push_back(c);
+    c = input.get();
+  }
+
+  if (url_encoded_value.empty()) {
+    return "";
+  }
+
+  return UriDecode(url_encoded_value);
+}
diff --git a/src/zm_utils.h b/src/zm_utils.h
index 9c8cc01a0..88e00a785 100644
--- a/src/zm_utils.h
+++ b/src/zm_utils.h
@@ -20,49 +20,130 @@
 #ifndef ZM_UTILS_H
 #define ZM_UTILS_H
 
-#include <time.h>
-#include <sys/time.h>
+#include <algorithm>
+#include <chrono>
+#include <ctime>
+#include <functional>
+#include <map>
+#include <memory>
+#include <stdexcept>
 #include <string>
-#include <sstream>
+#include <sys/time.h>
 #include <vector>
 
 typedef std::vector<std::string> StringVector;
 
-std::string trimSpaces(const std::string &str);
-std::string trimSet(std::string str, std::string trimset);
-std::string replaceAll(std::string str, std::string from, std::string to);
+std::string Trim(const std::string &str, const std::string &char_set);
+inline std::string TrimSpaces(const std::string &str) { return Trim(str, " \t"); }
+std::string ReplaceAll(std::string str, const std::string& old_value, const std::string& new_value);
+inline void StringToUpper(std::string &str) { std::transform(str.begin(), str.end(), str.begin(), ::toupper); }
 
-const std::string stringtf( const char *format, ... );
-const std::string stringtf( const std::string &format, ... );
+StringVector Split(const std::string &str, char delim);
+StringVector Split(const std::string &str, const std::string &delim, size_t limit = 0);
+std::pair<std::string, std::string> PairSplit(const std::string &str, char delim);
 
-bool startsWith( const std::string &haystack, const std::string &needle );
-StringVector split( const std::string &string, const std::string &chars, int limit=0 );
-const std::string join( const StringVector &, const char * );
+std::string Join(const StringVector &values, const std::string &delim = ",");
 
-const std::string base64Encode( const std::string &inString );
-void string_toupper(std::string& str);
-
-int split(const char* string, const char delim, std::vector<std::string>& items);
-int pairsplit(const char* string, const char delim, std::string& name, std::string& value);
-
-inline int max( int a, int b )
-{
-  return( a>=b?a:b );
+inline bool StartsWith(const std::string &haystack, const std::string &needle) {
+  return (haystack.substr(0, needle.length()) == needle);
 }
 
-inline int min( int a, int b )
-{
-  return( a<=b?a:b );
+template<typename... Args>
+std::string stringtf(const std::string &format, Args... args) {
+  int size = snprintf(nullptr, 0, format.c_str(), args...) + 1; // Extra space for '\0'
+  if (size <= 0) {
+    throw std::runtime_error("Error during formatting.");
+  }
+  std::unique_ptr<char[]> buf(new char[size]);
+  snprintf(buf.get(), size, format.c_str(), args...);
+  return std::string(buf.get(), buf.get() + size - 1); // We don't want the '\0' inside
 }
 
-void* sse2_aligned_memcpy(void* dest, const void* src, size_t bytes);
-void timespec_diff(struct timespec *start, struct timespec *end, struct timespec *diff);
+std::string Base64Encode(const std::string &str);
+
+void TimespecDiff(timespec *start, timespec *end, timespec *diff);
+std::string TimevalToString(timeval tv);
 
-void hwcaps_detect();
 extern unsigned int sse_version;
 extern unsigned int neonversion;
+void HwCapsDetect();
+void *sse2_aligned_memcpy(void *dest, const void *src, size_t bytes);
 
-char *timeval_to_string( struct timeval tv );
-std::string UriDecode( const std::string &encoded );
-void touch( const char *pathname );
+void touch(const char *pathname);
+
+namespace ZM {
+//! std::make_unique implementation (TODO: remove this once C++14 is supported)
+template<typename T, typename ...Args>
+inline auto make_unique(Args &&...args) ->
+typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type {
+  return std::unique_ptr<T>(new T(std::forward<Args>(args)...));
+}
+
+template<typename T>
+inline auto make_unique(std::size_t size) ->
+typename std::enable_if<std::is_array<T>::value && std::extent<T>::value == 0, std::unique_ptr<T>>::type {
+  return std::unique_ptr<T>(new typename std::remove_extent<T>::type[size]());
+}
+
+template<typename T, typename... Args>
+inline auto make_unique(Args &&...) ->
+typename std::enable_if<std::extent<T>::value != 0, void>::type = delete;
+
+template<class T, class Compare>
+constexpr const T &clamp(const T &v, const T &lo, const T &hi, Compare comp) {
+  return comp(v, lo) ? lo : comp(hi, v) ? hi : v;
+}
+
+template<class T>
+constexpr const T &clamp(const T &v, const T &lo, const T &hi) {
+  return clamp(v, lo, hi, std::less<T>{});
+}
+}
+
+typedef std::chrono::microseconds Microseconds;
+typedef std::chrono::milliseconds Milliseconds;
+typedef std::chrono::seconds Seconds;
+typedef std::chrono::minutes Minutes;
+typedef std::chrono::hours Hours;
+
+typedef std::chrono::steady_clock::time_point TimePoint;
+typedef std::chrono::system_clock::time_point SystemTimePoint;
+
+std::string UriDecode(const std::string &encoded);
+
+class QueryParameter {
+ public:
+  explicit QueryParameter(std::string name) : name_(std::move(name)) {}
+
+  const std::string &name() const { return name_; }
+  const std::string &firstValue() const { return values_[0]; }
+
+  const std::vector<std::string> &values() const { return values_; }
+  size_t size() const { return values_.size(); }
+
+  template<class T>
+  void addValue(T &&value) { values_.emplace_back(std::forward<T>(value)); }
+ private:
+  std::string name_;
+  std::vector<std::string> values_;
+};
+
+class QueryString {
+ public:
+  explicit QueryString(std::istream &input);
+
+  size_t size() const { return parameters_.size(); }
+  bool has(const char *name) const { return parameters_.find(std::string(name)) != parameters_.end(); }
+
+  std::vector<std::string> names() const;
+
+  const QueryParameter *get(const std::string &name) const;
+  const QueryParameter *get(const char *name) const { return get(std::string(name)); };
+
+ private:
+  static std::string parseName(std::istream &input);
+  static std::string parseValue(std::istream &input);
+
+  std::map<std::string, std::unique_ptr<QueryParameter>> parameters_;
+};
 #endif // ZM_UTILS_H
diff --git a/src/zm_video.cpp b/src/zm_video.cpp
deleted file mode 100644
index d97c75167..000000000
--- a/src/zm_video.cpp
+++ /dev/null
@@ -1,590 +0,0 @@
-// Copyright (C) 2001-2017 ZoneMinder LLC
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-#include "zm.h"
-#include "zm_video.h"
-#include "zm_image.h"
-#include "zm_utils.h"
-#include "zm_rgb.h"
-#include <sstream>
-#include <string>
-#include <vector>
-
-VideoWriter::VideoWriter(
-    const char* p_container,
-    const char* p_codec,
-    const char* p_path,
-    const unsigned int p_width,
-    const unsigned int p_height,
-    const unsigned int p_colours,
-    const unsigned int p_subpixelorder) :
-  container(p_container),
-  codec(p_codec),
-  path(p_path),
-  width(p_width),
-  height(p_height),
-  colours(p_colours),
-  subpixelorder(p_subpixelorder),
-  frame_count(0) {
-  Debug(7, "Video object created");
-
-  /* Parameter checking */
-  if ( path.empty() ) {
-    Error("Invalid file path");
-  }
-  if ( !width || !height ) {
-    Error("Invalid width or height");
-  }
-}
-
-VideoWriter::~VideoWriter() {
-  Debug(7, "Video object destroyed");
-}
-
-int VideoWriter::Reset(const char* new_path) {
-  /* Common variables reset */
-
-  /* If there is a new path, use it */
-  if ( new_path != nullptr ) {
-    path = new_path;
-  }
-
-  /* Reset frame counter */
-  frame_count = 0;
-
-  return 0;
-}
-
-
-#if ZM_HAVE_VIDEOWRITER_X264MP4
-X264MP4Writer::X264MP4Writer(
-    const char* p_path,
-    const unsigned int p_width,
-    const unsigned int p_height,
-    const unsigned int p_colours,
-    const unsigned int p_subpixelorder,
-    const std::vector<EncoderParameter_t>* p_user_params) :
-  VideoWriter(
-      "mp4",
-      "h264",
-      p_path,
-      p_width,
-      p_height,
-      p_colours,
-      p_subpixelorder),
-  bOpen(false),
-  bGotH264AVCInfo(false),
-  bFirstFrame(true) {
-  /* Initialize ffmpeg if it hasn't been initialized yet */
-  FFMPEGInit();
-
-  /* Initialize swscale */
-  zm_pf = GetFFMPEGPixelFormat(colours, subpixelorder);
-  if ( zm_pf == 0 ) {
-    Error("Unable to match ffmpeg pixelformat");
-  }
-  codec_pf = AV_PIX_FMT_YUV420P;
-
-  if ( ! swscaleobj.init() ) {
-    Error("Failed init swscaleobj");
-    return;
-  }
-
-  swscaleobj.SetDefaults(zm_pf, codec_pf, width, height);
-
-  /* Calculate the image sizes. We will need this for parameter checking */
-  zm_imgsize = colours * width * height;
-#if LIBAVUTIL_VERSION_CHECK(54, 6, 0, 6, 0)
-  codec_imgsize = av_image_get_buffer_size(codec_pf, width, height, 1);
-#else
-  codec_imgsize = avpicture_get_size(codec_pf, width, height);
-#endif
-  if ( !codec_imgsize ) {
-    Error("Failed calculating codec pixel format image size");
-  }
-
-  /* If supplied with user parameters to the encoder, copy them */
-  if ( p_user_params != nullptr ) {
-    user_params = *p_user_params;
-  }
-
-  /* Setup x264 parameters */
-  if ( x264config() < 0 ) {
-    Error("Failed setting x264 parameters");
-  }
-
-  /* Allocate x264 input picture */
-  x264_picture_alloc(
-      &x264picin,
-      X264_CSP_I420,
-      x264params.i_width,
-      x264params.i_height);
-}
-
-X264MP4Writer::~X264MP4Writer() {
-  /* Free x264 input picture */
-  x264_picture_clean(&x264picin);
-
-  if ( bOpen )
-    Close();
-}
-
-int X264MP4Writer::Open() {
-  /* Open the encoder */
-  x264enc = x264_encoder_open(&x264params);
-  if ( x264enc == nullptr ) {
-    Error("Failed opening x264 encoder");
-    return -1;
-  }
-
-  // Debug(4,"x264 maximum delayed frames: %d",
-  // x264_encoder_maximum_delayed_frames(x264enc));
-
-  x264_nal_t* nals;
-  int i_nals;
-  if ( !x264_encoder_headers(x264enc, &nals, &i_nals) ) {
-    Error("Failed getting encoder headers");
-    return -2;
-  }
-
-  /* Search SPS NAL for AVC information */
-  for ( int i = 0; i < i_nals; i++ ) {
-    if ( nals[i].i_type == NAL_SPS ) {
-      x264_profleindication = nals[i].p_payload[5];
-      x264_profilecompat = nals[i].p_payload[6];
-      x264_levelindication = nals[i].p_payload[7];
-      bGotH264AVCInfo = true;
-      break;
-    }
-  }
-  if ( !bGotH264AVCInfo ) {
-    Warning("Missing AVC information");
-  }
-
-  /* Create the file */
-  mp4h = MP4Create((path + ".incomplete").c_str());
-  if ( mp4h == MP4_INVALID_FILE_HANDLE ) {
-    Error("Failed creating mp4 file: %s", path.c_str());
-    return -10;
-  }
-
-  /* Set the global timescale */
-  if ( !MP4SetTimeScale(mp4h, 1000) ) {
-    Error("Failed setting timescale");
-    return -11;
-  }
-
-  /* Set the global video profile */
-  /* I am a bit confused about this one.
-     I couldn't find what the value should be
-     Some use 0x15 while others use 0x7f. */
-  MP4SetVideoProfileLevel(mp4h, 0x7f);
-
-  /* Add H264 video track */
-  mp4vtid = MP4AddH264VideoTrack(
-      mp4h,
-      1000,
-      MP4_INVALID_DURATION,
-      width,
-      height,
-      x264_profleindication,
-      x264_profilecompat,
-      x264_levelindication,
-      3);
-  if ( mp4vtid == MP4_INVALID_TRACK_ID ) {
-    Error("Failed adding H264 video track");
-    return -12;
-  }
-
-  bOpen = true;
-
-  return 0;
-}
-
-int X264MP4Writer::Close() {
-  /* Flush all pending frames */
-  for ( int i = (x264_encoder_delayed_frames(x264enc) + 1); i > 0; i-- ) {
-Debug(1,"Encoding delayed frame");
-    if ( x264encodeloop(true) < 0 )
-      break;
-  }
-
-  /* Close the encoder */
-  x264_encoder_close(x264enc);
-
-  /* Close MP4 handle */
-  MP4Close(mp4h);
-
-  Debug(1,"Optimising");
-  /* Required for proper HTTP streaming */
-  MP4Optimize((path + ".incomplete").c_str(), path.c_str());
-
-  /* Delete the temporary file */
-  unlink((path + ".incomplete").c_str());
-
-  bOpen = false;
-
-  Debug(1, "Video closed. Total frames: %d", frame_count);
-
-  return 0;
-}
-
-int X264MP4Writer::Reset(const char* new_path) {
-  /* Close the encoder and file */
-  if ( bOpen )
-    Close();
-
-  /* Reset common variables */
-  VideoWriter::Reset(new_path);
-
-  /* Reset local variables */
-  bFirstFrame = true;
-  bGotH264AVCInfo = false;
-  prevnals.clear();
-  prevpayload.clear();
-
-  /* Reset x264 parameters */
-  x264config();
-
-  /* Open the encoder */
-  Open();
-
-  return 0;
-}
-
-int X264MP4Writer::Encode(
-    const uint8_t* data,
-    const size_t data_size,
-    const unsigned int frame_time) {
-  /* Parameter checking */
-  if ( data == nullptr ) {
-    Error("NULL buffer");
-    return -1;
-  }
-
-  if ( data_size != zm_imgsize ) {
-    Error("The data buffer size (%d) != expected (%d)", data_size, zm_imgsize);
-    return -2;
-  }
-
-  if ( !bOpen ) {
-    Warning("The encoder was not initialized, initializing now");
-    Open();
-  }
-
-  /* Convert the image into the x264 input picture */
-  if ( swscaleobj.ConvertDefaults(data, data_size, x264picin.img.plane[0], codec_imgsize) < 0 ) {
-    Error("Image conversion failed");
-    return -3;
-  }
-
-  /* Set PTS */
-  x264picin.i_pts = frame_time;
-
-  /* Do the encoding */
-  x264encodeloop();
-
-  /* Increment frame counter */
-  frame_count++;
-
-  return 0;
-}
-
-int X264MP4Writer::Encode(const Image* img, const unsigned int frame_time) {
-  if ( img->Width() != width ) {
-    Error("Source image width differs. Source: %d Output: %d", img->Width(), width);
-    return -12;
-  }
-
-  if ( img->Height() != height ) {
-    Error("Source image height differs. Source: %d Output: %d", img->Height(), height);
-    return -13;
-  }
-
-  return Encode(img->Buffer(), img->Size(), frame_time);
-}
-
-int X264MP4Writer::x264config() {
-  /* Sets up the encoder configuration */
-
-  int x264ret;
-
-  /* Defaults */
-  const char* preset = "veryfast";
-  const char* tune = "stillimage";
-  const char* profile = "main";
-
-  /* Search the user parameters for preset, tune and profile */
-  for ( unsigned int i = 0; i < user_params.size(); i++ ) {
-    if ( strcmp(user_params[i].pname, "preset") == 0 ) {
-      /* Got preset */
-      preset = user_params[i].pvalue;
-    } else if ( strcmp(user_params[i].pname, "tune") == 0 ) {
-      /* Got tune */
-      tune = user_params[i].pvalue;
-    } else if ( strcmp(user_params[i].pname, "profile") == 0 ) {
-      /* Got profile */
-      profile = user_params[i].pvalue;
-    }
-  }
-
-  /* Set the defaults and preset and tune */
-  x264ret = x264_param_default_preset(&x264params, preset, tune);
-  if ( x264ret != 0 ) {
-    Error("Failed setting x264 preset %s and tune %s : %d", preset, tune, x264ret);
-  }
-
-  /* Set the profile */
-  x264ret = x264_param_apply_profile(&x264params, profile);
-  if ( x264ret != 0 ) {
-    Error("Failed setting x264 profile %s : %d", profile, x264ret);
-  }
-
-  /* Input format */
-  x264params.i_width = width;
-  x264params.i_height = height;
-  x264params.i_csp = X264_CSP_I420;
-
-  /* Quality control */
-  x264params.rc.i_rc_method = X264_RC_CRF;
-  x264params.rc.f_rf_constant = 23.0;
-
-  /* Enable b-frames */
-  x264params.i_bframe = 16;
-  x264params.i_bframe_adaptive = 1;
-
-  /* Timebase */
-  x264params.i_timebase_num = 1;
-  x264params.i_timebase_den = 1000;
-
-  /* Enable variable frame rate */
-  x264params.b_vfr_input = 1;
-
-  /* Disable annex-b (start codes) */
-  x264params.b_annexb = 0;
-
-  /* TODO: Setup error handler */
-  if ( logDebugging() )
-    x264params.i_log_level = X264_LOG_DEBUG;
-  else
-    x264params.i_log_level = X264_LOG_NONE;
-
-  /* Process user parameters (excluding preset, tune and profile) */
-  for ( unsigned int i = 0; i < user_params.size(); i++ ) {
-    /* Skip preset, tune and profile */
-    if (
-        (strcmp(user_params[i].pname, "preset") == 0) ||
-        (strcmp(user_params[i].pname, "tune") == 0) ||
-        (strcmp(user_params[i].pname, "profile") == 0) ) {
-      continue;
-    }
-
-    /* Pass the name and value to x264 */
-    x264ret = x264_param_parse(&x264params, user_params[i].pname, user_params[i].pvalue);
-
-    /* Error checking */
-    if ( x264ret != 0 ) {
-      if ( x264ret == X264_PARAM_BAD_NAME ) {
-        Error("Failed processing x264 user parameter %s=%s : Bad name",
-            user_params[i].pname, user_params[i].pvalue);
-      } else if ( x264ret == X264_PARAM_BAD_VALUE ) {
-        Error("Failed processing x264 user parameter %s=%s : Bad value",
-            user_params[i].pname, user_params[i].pvalue);
-      } else  {
-        Error("Failed processing x264 user parameter %s=%s : Unknown error (%d)",
-            user_params[i].pname, user_params[i].pvalue, x264ret);
-      }
-    }
-  }
-
-  return 0;
-}
-
-int X264MP4Writer::x264encodeloop(bool bFlush) {
-  x264_nal_t* nals;
-  int i_nals;
-  int frame_size;
-
-  if ( bFlush ) {
-    frame_size = x264_encoder_encode(x264enc, &nals, &i_nals, nullptr, &x264picout);
-  } else {
-    frame_size = x264_encoder_encode(x264enc, &nals, &i_nals, &x264picin, &x264picout);
-  }
-
-  if ( frame_size > 0 || bFlush ) {
-    Debug(1, "x264 Frame: %d PTS: %d DTS: %d Size: %d\n",
-        frame_count, x264picout.i_pts, x264picout.i_dts, frame_size);
-
-    /* Handle the previous frame */
-    if ( !bFirstFrame ) {
-      buffer.clear();
-
-      /* Process the NALs for the previous frame */
-      for ( unsigned int i = 0; i < prevnals.size(); i++ ) {
-        Debug(9, "Processing NAL: Type %d Size %d",
-            prevnals[i].i_type,
-            prevnals[i].i_payload);
-
-        switch ( prevnals[i].i_type ) {
-          case NAL_PPS:
-            /* PPS NAL */
-            MP4AddH264PictureParameterSet(mp4h, mp4vtid, prevnals[i].p_payload+4, prevnals[i].i_payload-4);
-            break;
-          case NAL_SPS:
-            /* SPS NAL */
-            MP4AddH264SequenceParameterSet(mp4h, mp4vtid, prevnals[i].p_payload+4, prevnals[i].i_payload-4);
-            break;
-          default:
-            /* Anything else, hopefully frames, so copy it into the sample */
-            buffer.append(prevnals[i].p_payload, prevnals[i].i_payload);
-        }
-      }
-
-      /* Calculate frame duration and offset */
-      int duration = x264picout.i_dts - prevDTS;
-      int offset = prevPTS - prevDTS;
-
-      /* Write the sample */
-      if ( !buffer.empty() ) {
-        unsigned int bufSize = buffer.size();
-        if ( !MP4WriteSample(
-              mp4h,
-              mp4vtid,
-              buffer.extract(bufSize),
-              bufSize,
-              duration,
-              offset,
-              prevKeyframe) ) {
-          Error("Failed writing sample");
-        }
-      }
-
-      /* Cleanup */
-      prevnals.clear();
-      prevpayload.clear();
-    }
-
-    /* Got a frame. Copy this new frame into the previous frame */
-    if ( frame_size > 0 ) {
-      /* Copy the NALs and the payloads */
-      for ( int i = 0; i < i_nals; i++ ) {
-        prevnals.push_back(nals[i]);
-        prevpayload.append(nals[i].p_payload, nals[i].i_payload);
-      }
-
-      /* Update the payload pointers */
-      /* This is done in a separate loop because the previous loop might reallocate memory when appending,
-         making the pointers invalid */
-      unsigned int payload_offset = 0;
-      for ( unsigned int i = 0; i < prevnals.size(); i++ ) {
-        prevnals[i].p_payload = prevpayload.head() + payload_offset;
-        payload_offset += nals[i].i_payload;
-      }
-
-      /* We need this for the next frame */
-      prevPTS = x264picout.i_pts;
-      prevDTS = x264picout.i_dts;
-      prevKeyframe = x264picout.b_keyframe;
-
-      bFirstFrame = false;
-    }
-
-  } else if ( frame_size == 0 ) {
-    Debug(1, "x264 encode returned zero. Delayed frames: %d",
-        x264_encoder_delayed_frames(x264enc));
-  } else {
-    Error("x264 encode failed: %d", frame_size);
-  }
-  return frame_size;
-}
-#endif  // ZM_VIDEOWRITER_X264MP4
-
-int ParseEncoderParameters(
-    const char* str,
-    std::vector<EncoderParameter_t>* vec
-    ) {
-  if ( vec == nullptr ) {
-    Error("NULL Encoder parameters vector pointer");
-    return -1;
-  }
-
-  if ( str == nullptr ) {
-    Error("NULL Encoder parameters string");
-    return -2;
-  }
-
-  vec->clear();
-
-  if ( str[0] == 0 ) {
-    /* Empty */
-    return 0;
-  }
-
-  std::string line;
-  std::stringstream ss(str);
-  size_t valueoffset;
-  size_t valuelen;
-  unsigned int lineno = 0;
-  EncoderParameter_t param;
-
-  while ( std::getline(ss, line) ) {
-    lineno++;
-
-    /* Remove CR if exists */
-    if ( line.length() >= 1 && line[line.length()-1] == '\r' ) {
-      line.erase(line.length() - 1);
-    }
-
-    /* Skip comments and empty lines */
-    if ( line.empty() || line[0] == '#' ) {
-      continue;
-    }
-
-    valueoffset = line.find('=');
-    if ( valueoffset == std::string::npos || valueoffset+1 >= line.length() || valueoffset == 0 ) {
-      Warning("Failed parsing encoder parameters line %d: Invalid pair", lineno);
-      continue;
-    }
-
-    if ( valueoffset > (sizeof(param.pname) - 1 ) ) {
-      Warning("Failed parsing encoder parameters line %d: Name too long", lineno);
-      continue;
-    }
-
-    valuelen = line.length() - (valueoffset+1);
-
-    if ( valuelen > (sizeof(param.pvalue) - 1 ) ) {
-      Warning("Failed parsing encoder parameters line %d: Value too long", lineno);
-      continue;
-    }
-
-    /* Copy and NULL terminate */
-    line.copy(param.pname, valueoffset, 0);
-    line.copy(param.pvalue, valuelen, valueoffset+1);
-    param.pname[valueoffset] = 0;
-    param.pvalue[valuelen] = 0;
-
-    /* Push to the vector */
-    vec->push_back(param);
-
-    Debug(7, "Parsed encoder parameter: %s = %s", param.pname, param.pvalue);
-  }
-
-  Debug(7, "Parsed %d lines", lineno);
-
-  return 0;
-}
-
-
diff --git a/src/zm_video.h b/src/zm_video.h
deleted file mode 100644
index e185f82fc..000000000
--- a/src/zm_video.h
+++ /dev/null
@@ -1,174 +0,0 @@
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// 
-
-#ifndef ZM_VIDEO_H
-#define ZM_VIDEO_H
-
-#include "zm.h"
-#include "zm_rgb.h"
-#include "zm_utils.h"
-#include "zm_ffmpeg.h"
-#include "zm_buffer.h"
-#include "zm_swscale.h"
-
-/*
-#define HAVE_LIBX264 1
-#define HAVE_LIBMP4V2 1
-#define HAVE_X264_H 1
-#define HAVE_MP4_H 1
-*/
-
-#if HAVE_MP4V2_MP4V2_H
-#include <mp4v2/mp4v2.h>
-#endif
-#if HAVE_MP4V2_H
-#include <mp4v2.h>
-#endif
-#if HAVE_MP4_H
-#include <mp4.h>
-#endif
-
-#if HAVE_X264_H
-#ifdef __cplusplus
-extern "C" {
-#endif
-#include <x264.h>
-#ifdef __cplusplus
-}
-#endif
-#endif
-
-/* Structure for user parameters to the encoder */
-struct EncoderParameter_t {
-	char pname[48];
-	char pvalue[48];
-
-};
-int ParseEncoderParameters(const char* str, std::vector<EncoderParameter_t>* vec);
-
-/* VideoWriter is a generic interface that ZM uses to save events as videos */
-/* It is relatively simple and the functions are pure virtual, so they must be implemented by the deriving class */
-
-class VideoWriter {
-
-protected:
-	std::string container;
-	std::string codec;
-	std::string path;
-	unsigned int width;
-	unsigned int height;
-	unsigned int colours;
-	unsigned int subpixelorder;
-	
-	unsigned int frame_count;
-
-public:
-	VideoWriter(const char* p_container, const char* p_codec, const char* p_path, const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder);
-	virtual ~VideoWriter();
-	virtual int Encode(const uint8_t* data, const size_t data_size, const unsigned int frame_time) = 0;
-	virtual int Encode(const Image* img, const unsigned int frame_time) = 0;
-	virtual int Open() = 0;
-	virtual int Close() = 0;
-	virtual int Reset(const char* new_path = nullptr);
-	
-	const char* GetContainer() const {
-		return container.c_str();
-	}
-	const char* GetCodec() const {
-		return codec.c_str();
-	}
-	const char* GetPath() const {
-		return path.c_str();
-	}
-	unsigned int GetWidth() const {
-		return width;
-	}
-	unsigned int GetHeight() const {
-		return height;
-	}
-	unsigned int GetColours() const {
-		return colours;
-	}
-	unsigned int GetSubpixelorder () const {
-		return subpixelorder;
-	}
-	unsigned int GetFrameCount() const {
-		return frame_count;
-	}
-};
-
-#if HAVE_LIBX264 && HAVE_LIBMP4V2 && HAVE_LIBAVUTIL && HAVE_LIBSWSCALE
-#define ZM_HAVE_VIDEOWRITER_X264MP4 1
-class X264MP4Writer : public VideoWriter {
-
-protected:
-	
-	bool bOpen;
-	bool bGotH264AVCInfo;
-	bool bFirstFrame;
-	
-	/* SWScale */
-	SWScale swscaleobj;
-	enum _AVPIXELFORMAT zm_pf;
-	enum _AVPIXELFORMAT codec_pf;
-	size_t codec_imgsize;
-	size_t zm_imgsize;
-
-	/* User parameters */
-	std::vector<EncoderParameter_t> user_params;
-	
-	/* AVC Information */
-	uint8_t x264_profleindication;
-	uint8_t x264_profilecompat;
-	uint8_t x264_levelindication;
-
-	/* NALs */
-	Buffer buffer;
-
-	/* Previous frame */
-	int prevPTS;
-	int prevDTS;
-	bool prevKeyframe;
-	Buffer prevpayload;
-	std::vector<x264_nal_t> prevnals;
-
-	/* Internal functions */
-	int x264config();
-	int x264encodeloop(bool bFlush = false);
-
-	/* x264 objects */
-	x264_t* x264enc;
-	x264_param_t x264params;
-	x264_picture_t x264picin;
-	x264_picture_t x264picout;
-	
-	/* MP4v2 objects */
-	MP4FileHandle mp4h;
-	MP4TrackId mp4vtid;
-
-
-public:
-	X264MP4Writer(const char* p_path, const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder, const std::vector<EncoderParameter_t>* p_user_params = nullptr);
-	~X264MP4Writer();
-	int Encode(const uint8_t* data, const size_t data_size, const unsigned int frame_time);
-	int Encode(const Image* img, const unsigned int frame_time);
-	int Open();
-	int Close();
-	int Reset(const char* new_path = nullptr);
-	
-};
-#endif // HAVE_LIBX264 && HAVE_LIBMP4V2 && HAVE_LIBAVUTIL && HAVE_LIBSWSCALE
-
-#endif // ZM_VIDEO_H
diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
index 8892c6443..843558de3 100644
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -18,49 +18,101 @@
 // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //
 
-#define __STDC_FORMAT_MACROS 1
-
-
-#include "zm.h"
 #include "zm_videostore.h"
 
-#include <stdlib.h>
-#include <string.h>
-#include <cinttypes>
+#include "zm_logger.h"
+#include "zm_monitor.h"
 
 extern "C" {
 #include "libavutil/time.h"
 }
 
+/*
+      AVCodecID codec_id;
+      char *codec_codec;
+      char *codec_name;
+      enum AVPixelFormat sw_pix_fmt;
+      enum AVPixelFormat hw_pix_fmt;
+      AVHWDeviceType hwdevice_type;
+      */
+
+VideoStore::CodecData VideoStore::codec_data[] = {
+#if HAVE_LIBAVUTIL_HWCONTEXT_H
+  { AV_CODEC_ID_H265, "h265", "hevc_vaapi", AV_PIX_FMT_NV12, AV_PIX_FMT_VAAPI, AV_HWDEVICE_TYPE_VAAPI },
+  { AV_CODEC_ID_H265, "h265", "hevc_nvenc", AV_PIX_FMT_NV12, AV_PIX_FMT_NV12, AV_HWDEVICE_TYPE_NONE },
+  { AV_CODEC_ID_H265, "h265", "libx265", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P, AV_HWDEVICE_TYPE_NONE  },
+
+  { AV_CODEC_ID_H264, "h264", "h264_vaapi", AV_PIX_FMT_NV12, AV_PIX_FMT_VAAPI, AV_HWDEVICE_TYPE_VAAPI },
+  { AV_CODEC_ID_H264, "h264", "h264_nvenc", AV_PIX_FMT_NV12, AV_PIX_FMT_NV12, AV_HWDEVICE_TYPE_NONE },
+  { AV_CODEC_ID_H264, "h264", "h264_omx", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P,  AV_HWDEVICE_TYPE_NONE },
+  { AV_CODEC_ID_H264, "h264", "h264", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P,  AV_HWDEVICE_TYPE_NONE },
+  { AV_CODEC_ID_H264, "h264", "libx264", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P, AV_HWDEVICE_TYPE_NONE  },
+  { AV_CODEC_ID_MJPEG, "mjpeg", "mjpeg", AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ422P, AV_HWDEVICE_TYPE_NONE },
+#else
+  { AV_CODEC_ID_H265, "h265", "libx265", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P },
+
+  { AV_CODEC_ID_H264, "h264", "h264", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P },
+  { AV_CODEC_ID_H264, "h264", "libx264", AV_PIX_FMT_YUV420P, AV_PIX_FMT_YUV420P },
+  { AV_CODEC_ID_MJPEG, "mjpeg", "mjpeg", AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ422P },
+#endif
+};
+
 VideoStore::VideoStore(
     const char *filename_in,
     const char *format_in,
     AVStream *p_video_in_stream,
+    AVCodecContext *p_video_in_ctx,
     AVStream *p_audio_in_stream,
+    AVCodecContext *p_audio_in_ctx,
     Monitor *p_monitor
-    ) {
-
-  video_in_stream = p_video_in_stream;
-  audio_in_stream = p_audio_in_stream;
-  monitor = p_monitor;
-
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  //video_in_ctx = avcodec_alloc_context3(NULL);
-  //avcodec_parameters_to_context(video_in_ctx,
-                                //video_in_stream->codecpar);
-  //video_in_ctx->time_base = video_in_stream->time_base;
-// zm_dump_codecpar( video_in_stream->codecpar );
-#else
+    ) :
+  chosen_codec_data(nullptr),
+  monitor(p_monitor),
+  out_format(nullptr),
+  oc(nullptr),
+  video_out_stream(nullptr),
+  audio_out_stream(nullptr),
+  video_out_codec(nullptr),
+  video_in_ctx(p_video_in_ctx),
+  video_out_ctx(nullptr),
+  video_in_stream(p_video_in_stream),
+  audio_in_stream(p_audio_in_stream),
+  audio_in_codec(nullptr),
+  audio_in_ctx(p_audio_in_ctx),
+  audio_out_codec(nullptr),
+  audio_out_ctx(nullptr),
+  video_in_frame(nullptr),
+  in_frame(nullptr),
+  out_frame(nullptr),
+  hw_frame(nullptr),
+  packets_written(0),
+  frame_count(0),
+  hw_device_ctx(nullptr),
+#if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
+  resample_ctx(nullptr),
+#if defined(HAVE_LIBSWRESAMPLE)
+  fifo(nullptr),
 #endif
+#endif
+  converted_in_samples(nullptr),
+  filename(filename_in),
+  format(format_in),
+  video_first_pts(0), /* starting pts of first in frame/packet */
+  video_first_dts(0),
+  audio_first_pts(0),
+  audio_first_dts(0),
+  video_last_pts(AV_NOPTS_VALUE),
+  audio_last_pts(AV_NOPTS_VALUE),
+  next_dts(nullptr),
+  audio_next_pts(0),
+  max_stream_index(-1)
+{
+  FFMPEGInit();
+  swscale.init();
+}  // VideoStore::VideoStore
 
-  // In future, we should just pass in the codec context instead of the stream.  Don't really need the stream.
-  video_in_ctx = video_in_stream->codec;
-
-  // store ins in variables local to class
-  filename = filename_in;
-  format = format_in;
-
-  Info("Opening video storage stream %s format: %s", filename, format);
+bool VideoStore::open() {
+  Debug(1, "Opening video storage stream %s format: %s", filename, format);
 
   int ret = avformat_alloc_output_context2(&oc, nullptr, nullptr, filename);
   if ( ret < 0 ) {
@@ -68,8 +120,6 @@ VideoStore::VideoStore(
         "Could not create video storage stream %s as no out ctx"
         " could be assigned based on filename: %s",
         filename, av_make_error_string(ret).c_str());
-  } else {
-    Debug(4, "Success allocating out format ctx");
   }
 
   // Couldn't deduce format from filename, trying from format name
@@ -80,220 +130,244 @@ VideoStore::VideoStore(
           "Could not create video storage stream %s as no out ctx"
           " could not be assigned based on filename or format %s",
           filename, format);
-      return;
-    } else {
-      Debug(4, "Success allocating out ctx");
+      return false;
     }
-  }  // end if ! oc
+  } // end if ! oc
 
   AVDictionary *pmetadata = nullptr;
-  int dsr =
-      av_dict_set(&pmetadata, "title", "Zoneminder Security Recording", 0);
-  if ( dsr < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
+  ret = av_dict_set(&pmetadata, "title", "Zoneminder Security Recording", 0);
+  if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
 
   oc->metadata = pmetadata;
   out_format = oc->oformat;
   out_format->flags |= AVFMT_TS_NONSTRICT; // allow non increasing dts
 
-  video_out_codec = avcodec_find_encoder(video_in_ctx->codec_id);
-  if ( !video_out_codec ) {
-#if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
-    Fatal("Could not find encoder for '%s'", avcodec_get_name(video_out_ctx->codec_id));
-#else
-    Fatal("Could not find encoder for '%d'", video_out_ctx->codec_id);
+  if ( video_in_stream ) {
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+    zm_dump_codecpar(video_in_stream->codecpar);
 #endif
-  }
+    if ( monitor->GetOptVideoWriter() == Monitor::PASSTHROUGH ) {
+      // Don't care what codec, just copy parameters
+      video_out_ctx = avcodec_alloc_context3(nullptr);
+      // There might not be a useful video_in_stream.  v4l in might not populate this very
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+      ret = avcodec_parameters_to_context(video_out_ctx, video_in_stream->codecpar);
+#else
+      ret = avcodec_copy_context(video_out_ctx, video_in_ctx);
+#endif
+      if ( ret < 0 ) {
+        Error("Could not initialize ctx parameters");
+        return false;
+      }
+      video_out_ctx->pix_fmt = fix_deprecated_pix_fmt(video_out_ctx->pix_fmt);
+      if ( oc->oformat->flags & AVFMT_GLOBALHEADER ) {
+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
+        video_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#else
+        video_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif
+      }
+      video_out_ctx->time_base = video_in_ctx->time_base;
+      if ( ! (video_out_ctx->time_base.num && video_out_ctx->time_base.den) ) {
+        Debug(2,"No timebase found in video in context, defaulting to Q");
+        video_out_ctx->time_base = AV_TIME_BASE_Q;
+      }
+    } else if ( monitor->GetOptVideoWriter() == Monitor::ENCODE ) {
+      int wanted_codec = monitor->OutputCodec();
+      if ( !wanted_codec ) {
+        // default to h264
+        //Debug(2, "Defaulting to H264");
+        //wanted_codec = AV_CODEC_ID_H264;
+        // FIXME what is the optimal codec?  Probably low latency h264 which is effectively mjpeg
+      } else {
+				if ( AV_CODEC_ID_H264 != 27 and wanted_codec > 3 ) {
+					// Older ffmpeg had AV_CODEC_ID_MPEG2VIDEO_XVMC at position 3 has been deprecated
+					wanted_codec += 1;
+				}
+        Debug(2, "Codec wanted %d %s", wanted_codec, avcodec_get_name((AVCodecID)wanted_codec));
+      }
+      std::string wanted_encoder = monitor->Encoder();
 
-  video_out_stream = avformat_new_stream(oc, nullptr);
+      for (unsigned int i = 0; i < sizeof(codec_data) / sizeof(*codec_data); i++) {
+        chosen_codec_data = &codec_data[i];
+        if (wanted_encoder != "" and wanted_encoder != "auto") {
+          if (wanted_encoder != codec_data[i].codec_name) {
+            Debug(1, "Not the right codec name %s != %s", codec_data[i].codec_name, wanted_encoder.c_str());
+            continue;
+          }
+        }
+        if (wanted_codec and (codec_data[i].codec_id != wanted_codec)) {
+          Debug(1, "Not the right codec %d %s != %d %s",
+							codec_data[i].codec_id,
+							avcodec_get_name(codec_data[i].codec_id),
+							wanted_codec,
+							avcodec_get_name((AVCodecID)wanted_codec)
+							);
+          continue;
+        }
+
+        video_out_codec = avcodec_find_encoder_by_name(codec_data[i].codec_name);
+        if (!video_out_codec) {
+          Debug(1, "Didn't find encoder for %s", codec_data[i].codec_name);
+          continue;
+        }
+        Debug(1, "Found video codec for %s", codec_data[i].codec_name);
+        video_out_ctx = avcodec_alloc_context3(video_out_codec);
+        if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
+#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
+          video_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
+#else
+          video_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
+#endif
+        }
+
+        // When encoding, we are going to use the timestamp values instead of packet pts/dts
+        video_out_ctx->time_base = AV_TIME_BASE_Q;
+        video_out_ctx->codec_id = codec_data[i].codec_id;
+        video_out_ctx->pix_fmt = codec_data[i].hw_pix_fmt;
+        Debug(1, "Setting pix fmt to %d %s", codec_data[i].hw_pix_fmt, av_get_pix_fmt_name(codec_data[i].hw_pix_fmt));
+        video_out_ctx->level = 32;
+
+        // Don't have an input stream, so need to tell it what we are sending it, or are transcoding
+        video_out_ctx->width = monitor->Width();
+        video_out_ctx->height = monitor->Height();
+        video_out_ctx->codec_type = AVMEDIA_TYPE_VIDEO;
+
+        if ( video_out_ctx->codec_id == AV_CODEC_ID_H264 ) {
+          video_out_ctx->bit_rate = 2000000;
+          video_out_ctx->gop_size = 12;
+          video_out_ctx->max_b_frames = 1;
+        } else if ( video_out_ctx->codec_id == AV_CODEC_ID_MPEG2VIDEO ) {
+          /* just for testing, we also add B frames */
+          video_out_ctx->max_b_frames = 2;
+        } else if ( video_out_ctx->codec_id == AV_CODEC_ID_MPEG1VIDEO ) {
+          /* Needed to avoid using macroblocks in which some coeffs overflow.
+           * This does not happen with normal video, it just happens here as
+           * the motion of the chroma plane does not match the luma plane. */
+          video_out_ctx->mb_decision = 2;
+        }
+#if HAVE_LIBAVUTIL_HWCONTEXT_H
+        if (codec_data[i].hwdevice_type != AV_HWDEVICE_TYPE_NONE) {
+          Debug(1, "Setting up hwdevice");
+          ret = av_hwdevice_ctx_create(&hw_device_ctx,
+              codec_data[i].hwdevice_type,
+              nullptr, nullptr, 0);
+
+          AVBufferRef *hw_frames_ref;
+          AVHWFramesContext *frames_ctx = nullptr;
+
+          if (!(hw_frames_ref = av_hwframe_ctx_alloc(hw_device_ctx))) {
+            Error("Failed to create hwaccel frame context.");
+            return -1;
+          }
+          frames_ctx = (AVHWFramesContext *)(hw_frames_ref->data);
+          frames_ctx->format    = codec_data[i].hw_pix_fmt;
+          frames_ctx->sw_format = codec_data[i].sw_pix_fmt;
+          frames_ctx->width     = monitor->Width();
+          frames_ctx->height    = monitor->Height();
+          frames_ctx->initial_pool_size = 20;
+          if ((ret = av_hwframe_ctx_init(hw_frames_ref)) < 0) {
+            Error("Failed to initialize hwaccel frame context."
+                "Error code: %s",av_err2str(ret));
+            av_buffer_unref(&hw_frames_ref);
+          } else {
+            video_out_ctx->hw_frames_ctx = av_buffer_ref(hw_frames_ref);
+            if (!video_out_ctx->hw_frames_ctx) {
+              Error("Failed to allocate hw_frames_ctx");
+            }
+          }
+          av_buffer_unref(&hw_frames_ref);
+        }
+#endif
+
+        AVDictionary *opts = 0;
+        std::string Options = monitor->GetEncoderOptions();
+        Debug(2, "Options? %s", Options.c_str());
+        ret = av_dict_parse_string(&opts, Options.c_str(), "=", ",#\n", 0);
+        if (ret < 0) {
+          Warning("Could not parse ffmpeg encoder options list '%s'\n", Options.c_str());
+        } else {
+          AVDictionaryEntry *e = nullptr;
+          while ((e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != nullptr) {
+            Debug(3, "Encoder Option %s=%s", e->key, e->value);
+          }
+        }
+
+        if ((ret = avcodec_open2(video_out_ctx, video_out_codec, &opts)) < 0) {
+          if (wanted_encoder != "" and wanted_encoder != "auto") {
+            Warning("Can't open video codec (%s) %s",
+                video_out_codec->name,
+                av_make_error_string(ret).c_str()
+                );
+          } else {
+            Debug(1, "Can't open video codec (%s) %s",
+                video_out_codec->name,
+                av_make_error_string(ret).c_str()
+                );
+          }
+          video_out_codec = nullptr;
+        }
+
+        Debug(1, "Success");
+        AVDictionaryEntry *e = nullptr;
+        while ((e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != nullptr) {
+          Warning("Encoder Option %s not recognized by ffmpeg codec", e->key);
+        }
+        if (video_out_codec) break;
+        avcodec_free_context(&video_out_ctx);
+        if (hw_device_ctx) av_buffer_unref(&hw_device_ctx);
+      }  // end foreach codec
+
+      if (!video_out_codec) {
+        Error("Can't open video codec!");
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+        // We allocate and copy in newer ffmpeg, so need to free it
+        avcodec_free_context(&video_out_ctx);
+#endif
+        return false;
+      }  // end if can't open codec
+      Debug(2, "Success opening codec");
+    }  // end if copying or transcoding
+    zm_dump_codec(video_out_ctx);
+  }  // end if video_in_stream
+
+  video_out_stream = avformat_new_stream(oc, video_out_codec);
   if ( !video_out_stream ) {
     Error("Unable to create video out stream");
-    return;
-  } else {
-    Debug(2, "Success creating video out stream");
+    return false;
   }
   max_stream_index = video_out_stream->index;
-
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  // by allocating our own copy, we don't run into the problems when we free the streams
-  video_out_ctx = avcodec_alloc_context3(video_out_codec);
-  // Since we are not re-encoding, all we have to do is copy the parameters
-  // Copy params from instream to ctx
-  ret = avcodec_parameters_to_context(video_out_ctx, video_in_stream->codecpar);
-  if ( ret < 0 ) {
-    Error("Could not initialize video_out_ctx parameters");
-    return;
-  }
-#else
-  video_out_ctx = video_out_stream->codec;
-  // This will wipe out the codec defaults
-  ret = avcodec_copy_context(video_out_ctx, video_in_ctx);
-  if ( ret < 0 ) {
-    Fatal("Unable to copy in video ctx to out video ctx %s",
-          av_make_error_string(ret).c_str());
-  } else {
-    Debug(3, "Success copying ctx");
-  }
-#endif
-
-  // Just copy them from the in, no reason to choose different
-  video_out_ctx->time_base = video_in_ctx->time_base;
-  if ( ! (video_out_ctx->time_base.num && video_out_ctx->time_base.den) ) {
-    Debug(2,"No timebase found in video in context, defaulting to Q");
-    video_out_ctx->time_base = AV_TIME_BASE_Q;
-  }
-
-  zm_dump_codec(video_out_ctx);
-
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  //// Fix deprecated formats
-  switch ( video_out_ctx->pix_fmt ) {
-    case AV_PIX_FMT_YUVJ422P  :
-      video_out_ctx->pix_fmt = AV_PIX_FMT_YUV422P;
-      break;
-    case AV_PIX_FMT_YUVJ444P   :
-      video_out_ctx->pix_fmt = AV_PIX_FMT_YUV444P;
-      break;
-    case AV_PIX_FMT_YUVJ440P :
-      video_out_ctx->pix_fmt = AV_PIX_FMT_YUV440P;
-      break;
-    case AV_PIX_FMT_NONE :
-    case AV_PIX_FMT_YUVJ420P :
-    default:
-      video_out_ctx->pix_fmt = AV_PIX_FMT_YUV420P;
-      break;
-  }
-
-  if ( !video_out_ctx->codec_tag ) {
-    Debug(2, "No codec_tag");
-    if (
-        !oc->oformat->codec_tag
-        ||
-        av_codec_get_id(oc->oformat->codec_tag, video_in_ctx->codec_tag) == video_out_ctx->codec_id
-        ||
-        av_codec_get_tag(oc->oformat->codec_tag, video_in_ctx->codec_id) <= 0
-        ) {
-      Warning("Setting codec tag");
-      video_out_ctx->codec_tag = video_in_ctx->codec_tag;
-    }
-  }
-#endif
-
-  video_out_stream->time_base = video_in_stream->time_base;
-  if ( video_in_stream->avg_frame_rate.num ) {
-    Debug(3,"Copying avg_frame_rate (%d/%d)",
-        video_in_stream->avg_frame_rate.num,
-        video_in_stream->avg_frame_rate.den
-        );
-    video_out_stream->avg_frame_rate = video_in_stream->avg_frame_rate;
-  }
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  if ( video_in_stream->r_frame_rate.num ) {
-    Debug(3,"Copying r_frame_rate (%d/%d) to out (%d/%d)",
-        video_in_stream->r_frame_rate.num,
-        video_in_stream->r_frame_rate.den ,
-        video_out_stream->r_frame_rate.num,
-        video_out_stream->r_frame_rate.den
-        );
-    video_out_stream->r_frame_rate = video_in_stream->r_frame_rate;
-  }
-#endif
-  Debug(3,
-        "Time bases: VIDEO in stream (%d/%d) in codec: (%d/%d) out "
-        "stream: (%d/%d) out codec (%d/%d)",
-        video_in_stream->time_base.num, video_in_stream->time_base.den,
-        video_in_ctx->time_base.num, video_in_ctx->time_base.den,
-        video_out_stream->time_base.num, video_out_stream->time_base.den,
-        video_out_ctx->time_base.num, video_out_ctx->time_base.den);
-
-  if ( oc->oformat->flags & AVFMT_GLOBALHEADER ) {
-#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
-    video_out_ctx->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-#else
-    video_out_ctx->flags |= CODEC_FLAG_GLOBAL_HEADER;
-#endif
-  }
-
-#if LIBAVCODEC_VERSION_CHECK(56, 35, 0, 64, 0)
-#if 0
-# This is commented out because we are only doing passthrough right now
-  /* I'm not entirely sure that this is a good idea.  We may have to do it someday but really only when transcoding
-   * * think what I was trying to achieve here was to have zm_dump_codecpar output nice info
-   * */
-
-  AVDictionary *opts = 0;
-  ret = av_dict_parse_string(&opts, monitor->GetOptEncoderParams().c_str(), "=", ",", 0);
-  if ( ret < 0 ) {
-    Warning("Could not parse ffmpeg encoder options '%s'", monitor->GetOptEncoderParams().c_str());
-  }
-
-  if ( (ret = avcodec_open2(video_out_ctx, video_out_codec, &opts)) < 0 ) {
-    Warning("Can't open video codec (%s) %s",
-        video_out_codec->name,
-        av_make_error_string(ret).c_str()
-        );
-    video_out_codec = nullptr;
-  }
-
-  AVDictionaryEntry *e = nullptr;
-  while ( (e = av_dict_get(opts, "", e, AV_DICT_IGNORE_SUFFIX)) != nullptr ) {
-    Warning("Encoder Option %s not recognized by ffmpeg codec", e->key);
-  }
   ret = avcodec_parameters_from_context(video_out_stream->codecpar, video_out_ctx);
   if ( ret < 0 ) {
-    Error("Could not initialize video_out_ctx parameters");
-    return;
-  } else {
-    zm_dump_codec(video_out_ctx);
+    Error("Could not initialize stream parameteres");
+    return false;
   }
 #else
-  ret = avcodec_parameters_from_context(video_out_stream->codecpar, video_in_ctx);
-  if ( ret < 0 ) {
-    Error("Could not initialize video_out_ctx parameters");
-    return;
-  } else {
-    zm_dump_codec(video_out_ctx);
-  }
+  avcodec_copy_context(video_out_stream->codec, video_out_ctx);
 #endif
-  zm_dump_codecpar(video_in_stream->codecpar);
-  zm_dump_codecpar(video_out_stream->codecpar);
-#endif
-
+  // Only set orientation if doing passthrough, otherwise the frame image will be rotated
   Monitor::Orientation orientation = monitor->getOrientation();
   if ( orientation ) {
+    Debug(3, "Have orientation %d", orientation);
     if ( orientation == Monitor::ROTATE_0 ) {
     } else if ( orientation == Monitor::ROTATE_90 ) {
-      dsr = av_dict_set(&video_out_stream->metadata, "rotate", "90", 0);
-      if ( dsr < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
+      ret = av_dict_set(&video_out_stream->metadata, "rotate", "90", 0);
+      if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
     } else if ( orientation == Monitor::ROTATE_180 ) {
-      dsr = av_dict_set(&video_out_stream->metadata, "rotate", "180", 0);
-      if ( dsr < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
+      ret = av_dict_set(&video_out_stream->metadata, "rotate", "180", 0);
+      if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
     } else if ( orientation == Monitor::ROTATE_270 ) {
-      dsr = av_dict_set(&video_out_stream->metadata, "rotate", "270", 0);
-      if ( dsr < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
+      ret = av_dict_set(&video_out_stream->metadata, "rotate", "270", 0);
+      if ( ret < 0 ) Warning("%s:%d: title set failed", __FILE__, __LINE__);
     } else {
       Warning("Unsupported Orientation(%d)", orientation);
     }
-  }
+  } // end if orientation
+  video_out_stream->time_base = video_in_stream ? video_in_stream->time_base : AV_TIME_BASE_Q;
 
-  converted_in_samples = nullptr;
-  audio_out_codec = nullptr;
-  audio_in_codec = nullptr;
-  audio_in_ctx = nullptr;
-  audio_out_stream = nullptr;
-  in_frame = nullptr;
-  out_frame = nullptr;
-#if defined(HAVE_LIBSWRESAMPLE) || defined(HAVE_LIBAVRESAMPLE)
-  resample_ctx = nullptr;
-  fifo = nullptr;
-#endif
-  video_first_pts = 0;
-  video_first_dts = 0;
-
-  audio_first_pts = 0;
-  audio_first_dts = 0;
-
-  if ( audio_in_stream ) {
-    Debug(3, "Have audio stream");
+  if ( audio_in_stream and audio_in_ctx ) {
+    Debug(2, "Have audio_in_stream %p", audio_in_stream);
 
     if (
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
@@ -301,38 +375,47 @@ VideoStore::VideoStore(
 #else
         audio_in_stream->codec->codec_id
 #endif
-        != AV_CODEC_ID_AAC ) {
+        != AV_CODEC_ID_AAC
+       ) {
 
       audio_out_codec = avcodec_find_encoder(AV_CODEC_ID_AAC);
       if ( !audio_out_codec ) {
         Error("Could not find codec for AAC");
-        return;
-      }
+      } else {
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+        audio_in_ctx = avcodec_alloc_context3(audio_out_codec);
+        ret = avcodec_parameters_to_context(audio_in_ctx,
+            audio_in_stream->codecpar);
+        audio_in_ctx->time_base = audio_in_stream->time_base;
+#else
+        audio_in_ctx = audio_in_stream->codec;
+#endif
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-      audio_out_stream = avformat_new_stream(oc, nullptr);
-      audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
-      if ( !audio_out_ctx ) {
-        Error("could not allocate codec ctx for AAC");
-        audio_out_stream = nullptr;
-        return;
-      }
+        audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
+        if ( !audio_out_ctx ) {
+          Error("could not allocate codec ctx for AAC");
+          return false;
+        }
 #else
-      audio_out_stream = avformat_new_stream(oc, audio_out_codec);
-      audio_out_ctx = audio_out_stream->codec;
+        audio_out_ctx = audio_out_stream->codec;
 #endif
-      audio_out_stream->time_base = audio_in_stream->time_base;
+        audio_out_stream = avformat_new_stream(oc, audio_out_codec);
+        audio_out_stream->time_base = audio_in_stream->time_base;
 
-      if ( !setup_resampler() ) {
-        return;
-      }
+        if ( !setup_resampler() ) {
+          return false;
+        }
+      }  // end if found AAC codec
     } else {
       Debug(2, "Got AAC");
 
-      audio_out_stream = avformat_new_stream(oc, nullptr);
+      // normally we want to pass params from codec in here
+      // but since we are doing audio passthrough we don't care
+      audio_out_stream = avformat_new_stream(oc, audio_out_codec);
       if ( !audio_out_stream ) {
         Error("Could not allocate new stream");
-        return;
+        return false;
       }
       audio_out_stream->time_base = audio_in_stream->time_base;
 
@@ -341,11 +424,11 @@ VideoStore::VideoStore(
       audio_out_ctx = avcodec_alloc_context3(audio_out_codec);
       if ( !audio_out_ctx ) {
         Error("Could not allocate new output_context");
-        return;
+        return false;
       }
 
       // We don't actually care what the time_base is..
-      audio_out_ctx->time_base = audio_in_stream->time_base;
+      audio_out_ctx->time_base = audio_in_ctx->time_base;
 
       // Copy params from instream to ctx
       ret = avcodec_parameters_to_context(
@@ -367,8 +450,8 @@ VideoStore::VideoStore(
         Error("Unable to copy audio ctx %s",
               av_make_error_string(ret).c_str());
         audio_out_stream = nullptr;
-        return;
-      } // end if
+        return false;
+      }  // end if
       audio_out_ctx->codec_tag = 0;
 #endif
 
@@ -397,16 +480,13 @@ VideoStore::VideoStore(
   for ( int i = 0; i <= max_stream_index; i++ ) {
     next_dts[i] = 0;
   }
-}  // VideoStore::VideoStore
 
-bool VideoStore::open() {
-  int ret;
   /* open the out file, if needed */
   if ( !(out_format->flags & AVFMT_NOFILE) ) {
     ret = avio_open2(&oc->pb, filename, AVIO_FLAG_WRITE, nullptr, nullptr);
     if ( ret < 0 ) {
       Error("Could not open out file '%s': %s", filename,
-            av_make_error_string(ret).c_str());
+          av_make_error_string(ret).c_str());
       return false;
     }
   }
@@ -416,7 +496,7 @@ bool VideoStore::open() {
 
   AVDictionary *opts = nullptr;
 
-  std::string option_string = monitor->GetOptEncoderParams();
+  std::string option_string = monitor->GetEncoderOptions();
   ret = av_dict_parse_string(&opts, option_string.c_str(), "=", ",\n", 0);
   if ( ret < 0 ) {
     Warning("Could not parse ffmpeg output options '%s'", option_string.c_str());
@@ -425,11 +505,8 @@ bool VideoStore::open() {
   const AVDictionaryEntry *movflags_entry = av_dict_get(opts, "movflags", nullptr, AV_DICT_MATCH_CASE);
   if ( !movflags_entry ) {
     Debug(1, "setting movflags to frag_keyframe+empty_moov");
-    // av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
     // Shiboleth reports that this may break seeking in mp4 before it downloads
     av_dict_set(&opts, "movflags", "frag_keyframe+empty_moov", 0);
-    // av_dict_set(&opts, "movflags",
-    // "frag_keyframe+empty_moov+default_base_moof", 0);
   } else {
     Debug(1, "using movflags %s", movflags_entry->value);
   }
@@ -449,91 +526,116 @@ bool VideoStore::open() {
   if ( opts ) av_dict_free(&opts);
   if ( ret < 0 ) {
     Error("Error occurred when writing out file header to %s: %s",
-          filename, av_make_error_string(ret).c_str());
-    /* free the stream */
+        filename, av_make_error_string(ret).c_str());
     avio_closep(&oc->pb);
-    //avformat_free_context(oc);
     return false;
   }
+
+  zm_dump_stream_format(oc, 0, 0, 1);
+  if (audio_out_stream) zm_dump_stream_format(oc, 1, 0, 1);
   return true;
-} // end VideoStore::open()
+} // end bool VideoStore::open()
 
-VideoStore::~VideoStore() {
+void VideoStore::flush_codecs() {
+  int ret;
+  // The codec queues data.  We need to send a flush command and out
+  // whatever we get. Failures are not fatal.
+  AVPacket pkt;
+  // Without these we seg fault becuse av_init_packet doesn't init them
+  pkt.data = nullptr;
+  pkt.size = 0;
+  av_init_packet(&pkt);
 
-  if ( oc->pb ) {
+  // I got crashes if the codec didn't do DELAY, so let's test for it.
+  if ( video_out_ctx->codec && ( video_out_ctx->codec->capabilities & 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+        AV_CODEC_CAP_DELAY
+#else
+        CODEC_CAP_DELAY
+#endif
+        ) ) {
+    // Put encoder into flushing mode
+    while ( (ret = zm_send_frame_receive_packet(video_out_ctx, nullptr, pkt) ) > 0 ) {
+      av_packet_rescale_ts(&pkt,
+          video_out_ctx->time_base,
+          video_out_stream->time_base);
+      write_packet(&pkt, video_out_stream);
+      zm_av_packet_unref(&pkt);
+    } // while have buffered frames
+    Debug(1, "Done writing buffered video.");
+  } // end if have delay capability
 
-    if ( audio_out_codec ) {
+  if ( audio_out_codec ) {
+    // The codec queues data.  We need to send a flush command and out
+    // whatever we get. Failures are not fatal.
 
-      // The codec queues data.  We need to send a flush command and out
-      // whatever we get. Failures are not fatal.
-      AVPacket pkt;
-      // Without these we seg fault I don't know why.
-      pkt.data = nullptr;
-      pkt.size = 0;
-      av_init_packet(&pkt);
-
-      int frame_size = audio_out_ctx->frame_size;
-      /*
-       * At the end of the file, we pass the remaining samples to
-       * the encoder. */
-      while ( zm_resample_get_delay(resample_ctx, audio_out_ctx->sample_rate) ) {
-        zm_resample_audio(resample_ctx, nullptr, out_frame);
-
-        if ( zm_add_samples_to_fifo(fifo, out_frame) ) {
-          // Should probably set the frame size to what is reported FIXME
-          if ( zm_get_samples_from_fifo(fifo, out_frame) ) {
-            if ( zm_send_frame_receive_packet(audio_out_ctx, out_frame, pkt) ) {
-              pkt.stream_index = audio_out_stream->index;
-
-              av_packet_rescale_ts(&pkt,
-                  audio_out_ctx->time_base,
-                  audio_out_stream->time_base);
-              write_packet(&pkt, audio_out_stream);
-            }
-          }  // end if data returned from fifo
-        }
-
-      } // end if have buffered samples in the resampler
-
-      Debug(2, "av_audio_fifo_size = %d", av_audio_fifo_size(fifo));
-      while ( av_audio_fifo_size(fifo) > 0 ) {
-        /* Take one frame worth of audio samples from the FIFO buffer,
-         * encode it and write it to the output file. */
-
-        Debug(1, "Remaining samples in fifo for AAC codec frame_size %d > fifo size %d",
-            frame_size, av_audio_fifo_size(fifo));
-
-        // SHould probably set the frame size to what is reported FIXME
-        if ( av_audio_fifo_read(fifo, (void **)out_frame->data, frame_size) ) {
-          if ( zm_send_frame_receive_packet(audio_out_ctx, out_frame, pkt) ) {
-            pkt.stream_index = audio_out_stream->index;
+    int frame_size = audio_out_ctx->frame_size;
+    /*
+     * At the end of the file, we pass the remaining samples to
+     * the encoder. */
+    while ( zm_resample_get_delay(resample_ctx, audio_out_ctx->sample_rate) ) {
+      zm_resample_audio(resample_ctx, nullptr, out_frame);
 
+      if ( zm_add_samples_to_fifo(fifo, out_frame) ) {
+        // Should probably set the frame size to what is reported FIXME
+        if ( zm_get_samples_from_fifo(fifo, out_frame) ) {
+          if ( zm_send_frame_receive_packet(audio_out_ctx, out_frame, pkt) > 0 ) {
             av_packet_rescale_ts(&pkt,
                 audio_out_ctx->time_base,
                 audio_out_stream->time_base);
             write_packet(&pkt, audio_out_stream);
+            zm_av_packet_unref(&pkt);
           }
         }  // end if data returned from fifo
-      }  // end while still data in the fifo
+      }
+
+    } // end while have buffered samples in the resampler
+
+    Debug(2, "av_audio_fifo_size = %d", av_audio_fifo_size(fifo));
+    while ( av_audio_fifo_size(fifo) > 0 ) {
+      /* Take one frame worth of audio samples from the FIFO buffer,
+       * encode it and write it to the output file. */
+
+      Debug(1, "Remaining samples in fifo for AAC codec frame_size %d > fifo size %d",
+          frame_size, av_audio_fifo_size(fifo));
+
+      // SHould probably set the frame size to what is reported FIXME
+      if ( av_audio_fifo_read(fifo, (void **)out_frame->data, frame_size) ) {
+        if ( zm_send_frame_receive_packet(audio_out_ctx, out_frame, pkt) ) {
+          pkt.stream_index = audio_out_stream->index;
+
+          av_packet_rescale_ts(&pkt,
+              audio_out_ctx->time_base,
+              audio_out_stream->time_base);
+          write_packet(&pkt, audio_out_stream);
+          zm_av_packet_unref(&pkt);
+        }
+      }  // end if data returned from fifo
+    }  // end while still data in the fifo
 
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
       // Put encoder into flushing mode
       avcodec_send_frame(audio_out_ctx, nullptr);
 #endif
 
-      while (1) {
-        if ( ! zm_receive_packet(audio_out_ctx, pkt) ) {
-          Debug(1, "No more packets");
-          break;
-        }
+    while (1) {
+      if ( 0 >= zm_receive_packet(audio_out_ctx, pkt) ) {
+        Debug(1, "No more packets");
+        break;
+      }
 
-        dumpPacket(&pkt, "raw from encoder");
-        av_packet_rescale_ts(&pkt, audio_out_ctx->time_base, audio_out_stream->time_base);
-        dumpPacket(audio_out_stream, &pkt, "writing flushed packet");
-        write_packet(&pkt, audio_out_stream);
-        zm_av_packet_unref(&pkt);
-      }  // while have buffered frames
-    }  // end if audio_out_codec
+      ZM_DUMP_PACKET(pkt, "raw from encoder");
+      av_packet_rescale_ts(&pkt, audio_out_ctx->time_base, audio_out_stream->time_base);
+      ZM_DUMP_STREAM_PACKET(audio_out_stream, pkt, "writing flushed packet");
+      write_packet(&pkt, audio_out_stream);
+      zm_av_packet_unref(&pkt);
+    }  // while have buffered frames
+  }  // end if audio_out_codec
+}  // end flush_codecs
+
+VideoStore::~VideoStore() {
+  if ( oc->pb ) {
+    flush_codecs();
 
     // Flush Queues
     Debug(1, "Flushing interleaved queues");
@@ -552,59 +654,41 @@ VideoStore::~VideoStore() {
       /* Close the out file. */
       Debug(2, "Closing");
       if ( int rc = avio_close(oc->pb) ) {
-        oc->pb = nullptr;
         Error("Error closing avio %s", av_err2str(rc));
       }
     } else {
       Debug(3, "Not closing avio because we are not writing to a file.");
     }
-  } // end if ( oc->pb )
+    oc->pb = nullptr;
+  } // end if oc->pb
 
   // I wonder if we should be closing the file first.
   // I also wonder if we really need to be doing all the ctx
   // allocation/de-allocation constantly, or whether we can just re-use it.
   // Just do a file open/close/writeheader/etc.
   // What if we were only doing audio recording?
+
   if ( video_out_stream ) {
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-    // We allocate and copy in newer ffmpeg, so need to free it
-    //avcodec_free_context(&video_in_ctx);
-#endif
     video_in_ctx = nullptr;
 
-    if ( video_out_codec ) {
-      avcodec_close(video_out_ctx);
-      Debug(4, "Success closing video_out_ctx");
-      video_out_codec = nullptr;
-    } // end if video_out_codec
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+    Debug(4, "Freeing video_out_ctx");
     avcodec_free_context(&video_out_ctx);
-#endif
-    video_out_ctx = nullptr;
   } // end if video_out_stream
 
   if ( audio_out_stream ) {
-    if ( audio_in_codec ) {
-      avcodec_close(audio_in_ctx);
-      Debug(4, "Success closing audio_in_ctx");
-      audio_in_codec = nullptr;
-    } // end if audio_in_codec
-
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
     // We allocate and copy in newer ffmpeg, so need to free it
-    avcodec_free_context(&audio_in_ctx);
+    //avcodec_free_context(&audio_in_ctx);
 #endif
-    Debug(4, "Success freeing audio_in_ctx");
-    audio_in_ctx = nullptr;
+    //Debug(4, "Success freeing audio_in_ctx");
+    audio_in_codec = nullptr;
 
     if ( audio_out_ctx ) {
-      avcodec_close(audio_out_ctx);
       Debug(4, "Success closing audio_out_ctx");
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
       avcodec_free_context(&audio_out_ctx);
 #endif
     }
-    audio_out_ctx = nullptr;
 
 #if defined(HAVE_LIBAVRESAMPLE) || defined(HAVE_LIBSWRESAMPLE)
     if ( resample_ctx ) {
@@ -636,16 +720,16 @@ VideoStore::~VideoStore() {
 #endif
   } // end if audio_out_stream
 
+  Debug(4, "free context");
   /* free the streams */
   avformat_free_context(oc);
   delete[] next_dts;
+  next_dts = nullptr;
 } // VideoStore::~VideoStore()
 
 bool VideoStore::setup_resampler() {
 #if !defined(HAVE_LIBSWRESAMPLE) && !defined(HAVE_LIBAVRESAMPLE)
-  Error(
-     "Not built with resample library. "
-     "Cannot do audio conversion to AAC");
+  Error("%s", "Not built with resample library. Cannot do audio conversion to AAC");
   return false;
 #else
   int ret;
@@ -668,25 +752,12 @@ bool VideoStore::setup_resampler() {
 // codec is already open in ffmpeg_camera
   audio_in_ctx = audio_in_stream->codec;
   audio_in_codec = reinterpret_cast<const AVCodec *>(audio_in_ctx->codec);
-  if ( !audio_in_codec ) {
+  if (!audio_in_codec) {
     audio_in_codec = avcodec_find_decoder(audio_in_stream->codec->codec_id);
+    if (!audio_in_codec) {
+      return false;
+    }
   }
-  if ( !audio_in_codec ) {
-    return false;
-  }
-#endif
-
-#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-#else
-#if 0
-  ret = avcodec_copy_context(audio_in_ctx, audio_in_stream->codec);
-  if ( ret < 0 ) {
-    Fatal("Unable to copy in video ctx to out video ctx %s",
-          av_make_error_string(ret).c_str());
-  } else {
-    Debug(3, "Success copying ctx");
-  }
-#endif
 #endif
 
   // if the codec is already open, nothing is done.
@@ -707,12 +778,13 @@ bool VideoStore::setup_resampler() {
   /* put sample parameters */
   audio_out_ctx->bit_rate = audio_in_ctx->bit_rate <= 32768 ? audio_in_ctx->bit_rate : 32768;
   audio_out_ctx->sample_rate = audio_in_ctx->sample_rate;
+  audio_out_ctx->sample_fmt = audio_in_ctx->sample_fmt;
   audio_out_ctx->channels = audio_in_ctx->channels;
   audio_out_ctx->channel_layout = audio_in_ctx->channel_layout;
   audio_out_ctx->sample_fmt = audio_in_ctx->sample_fmt;
 #if LIBAVCODEC_VERSION_CHECK(56, 8, 0, 60, 100)
   if ( !audio_out_ctx->channel_layout ) {
-    Debug(3, "Correcting channel layout from (%d) to (%d)",
+    Debug(3, "Correcting channel layout from (%" PRIi64 ") to (%" PRIi64 ")",
         audio_out_ctx->channel_layout,
         av_get_default_channel_layout(audio_out_ctx->channels)
         );
@@ -732,7 +804,7 @@ bool VideoStore::setup_resampler() {
       Debug(3, "Sample rate is good %d", audio_out_ctx->sample_rate);
     } else {
       audio_out_ctx->sample_rate =
-          audio_out_codec->supported_samplerates[0];
+        audio_out_codec->supported_samplerates[0];
       Debug(1, "Sample rate is no good, setting to (%d)",
             audio_out_codec->supported_samplerates[0]);
     }
@@ -740,14 +812,16 @@ bool VideoStore::setup_resampler() {
 
   /* check that the encoder supports s16 pcm in */
   if ( !check_sample_fmt(audio_out_codec, audio_out_ctx->sample_fmt) ) {
-    Debug(2, "Encoder does not support sample format %s, setting to FLTP",
-          av_get_sample_fmt_name(audio_out_ctx->sample_fmt));
+    Debug(3, "Encoder does not support sample format %s, setting to FLTP",
+        av_get_sample_fmt_name(audio_out_ctx->sample_fmt));
     audio_out_ctx->sample_fmt = AV_SAMPLE_FMT_FLTP;
   }
 
-  audio_out_ctx->time_base = (AVRational){1, audio_out_ctx->sample_rate};
+  // Example code doesn't set the codec tb.  I think it just uses whatever defaults
+  //audio_out_ctx->time_base = (AVRational){1, audio_out_ctx->sample_rate};
 
   AVDictionary *opts = nullptr;
+  // Needed to allow AAC
   if ( (ret = av_dict_set(&opts, "strict", "experimental", 0)) < 0 ) {
     Error("Couldn't set experimental");
   }
@@ -763,10 +837,11 @@ bool VideoStore::setup_resampler() {
   }
   zm_dump_codec(audio_out_ctx);
 
+  audio_out_stream->time_base = (AVRational){1, audio_out_ctx->sample_rate};
 #if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
-  ret = avcodec_parameters_from_context(
-      audio_out_stream->codecpar, audio_out_ctx);
-  if ( ret < 0 ) {
+  if ( (ret = avcodec_parameters_from_context(
+          audio_out_stream->codecpar,
+          audio_out_ctx)) < 0 ) {
     Error("Could not initialize stream parameteres");
     return false;
   }
@@ -782,22 +857,37 @@ bool VideoStore::setup_resampler() {
         audio_out_ctx->time_base.num, audio_out_ctx->time_base.den);
 
   Debug(1,
-        "Audio in bit_rate (%d) sample_rate(%d) channels(%d) fmt(%d) "
-        "layout(%d) frame_size(%d)",
+        "Audio in bit_rate (%" AV_PACKET_DURATION_FMT ") sample_rate(%d) channels(%d) fmt(%d) layout(%" PRIi64 ") frame_size(%d)",
         audio_in_ctx->bit_rate, audio_in_ctx->sample_rate,
         audio_in_ctx->channels, audio_in_ctx->sample_fmt,
         audio_in_ctx->channel_layout, audio_in_ctx->frame_size);
   Debug(1,
-        "Audio out bit_rate (%d) sample_rate(%d) channels(%d) fmt(%d) "
-        "layout(%d) frame_size(%d)",
+        "Audio out context bit_rate (%" AV_PACKET_DURATION_FMT ") sample_rate(%d) channels(%d) fmt(%d) layout(% " PRIi64 ") frame_size(%d)",
         audio_out_ctx->bit_rate, audio_out_ctx->sample_rate,
         audio_out_ctx->channels, audio_out_ctx->sample_fmt,
         audio_out_ctx->channel_layout, audio_out_ctx->frame_size);
 
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+  Debug(1,
+        "Audio out stream bit_rate (%" PRIi64 ") sample_rate(%d) channels(%d) fmt(%d) layout(%" PRIi64 ") frame_size(%d)",
+        audio_out_stream->codecpar->bit_rate, audio_out_stream->codecpar->sample_rate,
+        audio_out_stream->codecpar->channels, audio_out_stream->codecpar->format,
+        audio_out_stream->codecpar->channel_layout, audio_out_stream->codecpar->frame_size);
+#else
+  Debug(1,
+      "Audio out bit_rate (%d) sample_rate(%d) channels(%d) fmt(%d) "
+      "layout(%" PRIi64 ") frame_size(%d)",
+      audio_out_stream->codec->bit_rate, audio_out_stream->codec->sample_rate,
+      audio_out_stream->codec->channels, audio_out_stream->codec->sample_fmt,
+      audio_out_stream->codec->channel_layout, audio_out_stream->codec->frame_size);
+#endif
+
   /** Create a new frame to store the audio samples. */
-  if ( !(in_frame = zm_av_frame_alloc()) ) {
-    Error("Could not allocate in frame");
-    return false;
+  if ( ! in_frame ) {
+    if (!(in_frame = zm_av_frame_alloc())) {
+      Error("Could not allocate in frame");
+      return false;
+    }
   }
 
   /** Create a new frame to store the audio samples. */
@@ -806,6 +896,7 @@ bool VideoStore::setup_resampler() {
     av_frame_free(&in_frame);
     return false;
   }
+  out_frame->sample_rate = audio_out_ctx->sample_rate;
 
   if ( !(fifo = av_audio_fifo_alloc(
           audio_out_ctx->sample_fmt,
@@ -840,6 +931,7 @@ bool VideoStore::setup_resampler() {
 #if defined(HAVE_LIBAVRESAMPLE)
   // Setup the audio resampler
   resample_ctx = avresample_alloc_context();
+
   if ( !resample_ctx ) {
     Error("Could not allocate resample ctx");
     av_frame_free(&in_frame);
@@ -864,8 +956,7 @@ bool VideoStore::setup_resampler() {
   av_opt_set_int(resample_ctx, "out_channels",
       audio_out_ctx->channels, 0);
 
-  ret = avresample_open(resample_ctx);
-  if ( ret < 0 ) {
+  if ( (ret = avresample_open(resample_ctx)) < 0 ) {
     Error("Could not open resample ctx");
     return false;
   } else {
@@ -911,65 +1002,251 @@ bool VideoStore::setup_resampler() {
 #endif
 }  // end bool VideoStore::setup_resampler()
 
-int VideoStore::writeVideoFramePacket(AVPacket *ipkt) {
-  av_init_packet(&opkt);
-
-  dumpPacket(video_in_stream, ipkt, "video input packet");
-
-  opkt.flags = ipkt->flags;
-  opkt.data = ipkt->data;
-  opkt.size = ipkt->size;
-  opkt.duration = ipkt->duration;
-
-  // Just because the in stream wraps, doesn't mean the out needs to.
-  // Really, if we are limiting ourselves to 10min segments I can't imagine every wrapping in the out.
-  // So need to handle in wrap, without causing out wrap.
-  // The cameras that Icon has seem to do EOF instead of wrapping
-
-  if ( ipkt->dts != AV_NOPTS_VALUE ) {
-    if ( !video_first_dts ) {
-      Debug(2, "Starting video first_dts will become %" PRId64, ipkt->dts);
-      video_first_dts = ipkt->dts;
-    }
-    opkt.dts = ipkt->dts - video_first_dts;
-  } else {
-    opkt.dts = next_dts[video_out_stream->index] ? av_rescale_q(next_dts[video_out_stream->index], video_out_stream->time_base, video_in_stream->time_base) : 0;
-    Debug(3, "Setting dts to video_next_dts %" PRId64 " from %" PRId64, opkt.dts, next_dts[video_out_stream->index]);
+int VideoStore::writePacket(ZMPacket *ipkt) {
+  if ( ipkt->codec_type == AVMEDIA_TYPE_VIDEO ) {
+    return writeVideoFramePacket(ipkt);
+  } else if ( ipkt->codec_type == AVMEDIA_TYPE_AUDIO ) {
+    return writeAudioFramePacket(ipkt);
   }
-  if ( ipkt->pts != AV_NOPTS_VALUE ) {
-    opkt.pts = ipkt->pts - video_first_dts;
-  } else {
-    opkt.pts = AV_NOPTS_VALUE;
-  }
-  av_packet_rescale_ts(&opkt, video_in_stream->time_base, video_out_stream->time_base);
-
-  dumpPacket(video_out_stream, &opkt, "after pts adjustment");
-  write_packet(&opkt, video_out_stream);
-
-  zm_av_packet_unref(&opkt);
-
+  Error("Unknown stream type in packet (%d)", ipkt->codec_type);
   return 0;
+}
+
+int VideoStore::writeVideoFramePacket(ZMPacket *zm_packet) {
+  int ret;
+  frame_count += 1;
+
+  // if we have to transcode
+  if (monitor->GetOptVideoWriter() == Monitor::ENCODE) {
+    Debug(3, "Have encoding video frame count (%d)", frame_count);
+
+    if (!zm_packet->out_frame) {
+      Debug(3, "Have no out frame. codec is %s sw_pf %d %s hw_pf %d %s",
+          chosen_codec_data->codec_name,
+          chosen_codec_data->sw_pix_fmt, av_get_pix_fmt_name(chosen_codec_data->sw_pix_fmt),
+          chosen_codec_data->hw_pix_fmt, av_get_pix_fmt_name(chosen_codec_data->hw_pix_fmt)
+          );
+      AVFrame *out_frame = zm_packet->get_out_frame(video_out_ctx->width, video_out_ctx->height, chosen_codec_data->sw_pix_fmt);
+      if (!out_frame) {
+        Error("Unable to allocate a frame");
+        return 0;
+      }
+
+      if (zm_packet->image) {
+        Debug(2, "Have an image, convert it");
+        //Go straight to out frame
+        swscale.Convert(
+            zm_packet->image, 
+            zm_packet->buffer,
+            zm_packet->codec_imgsize,
+            zm_packet->image->AVPixFormat(),
+            chosen_codec_data->sw_pix_fmt,
+            video_out_ctx->width,
+            video_out_ctx->height
+            );
+      } else if ( !zm_packet->in_frame ) {
+        Debug(4, "Have no in_frame");
+        if (zm_packet->packet.size and !zm_packet->decoded) {
+          Debug(4, "Decoding");
+          if ( !zm_packet->decode(video_in_ctx) ) {
+            Debug(2, "unable to decode yet.");
+            return 0;
+          }
+          // Go straight to out frame
+          swscale.Convert(zm_packet->in_frame, out_frame);
+
+        } else {
+          Error("Have neither in_frame or image in packet %p %d!",
+              zm_packet, zm_packet->image_index);
+          return 0;
+        } // end if has packet or image
+      } else {
+        // Have in_frame.... may need to convert it to out_frame
+        swscale.Convert(zm_packet->in_frame, zm_packet->out_frame);
+      } // end if no in_frame
+    } // end if no out_frame
+
+    AVFrame *frame = zm_packet->out_frame;
+
+#if HAVE_LIBAVUTIL_HWCONTEXT_H
+    if (video_out_ctx->hw_frames_ctx) {
+      if (!(hw_frame = av_frame_alloc())) {
+        ret = AVERROR(ENOMEM);
+        return ret;
+      }
+      if ((ret = av_hwframe_get_buffer(video_out_ctx->hw_frames_ctx, hw_frame, 0)) < 0) {
+        Error("Error code: %s", av_err2str(ret));
+        av_frame_free(&hw_frame);
+        return ret;
+      }
+      if (!hw_frame->hw_frames_ctx) {
+        Error("Outof ram!");
+        av_frame_free(&hw_frame);
+        return 0;
+      }
+      if ((ret = av_hwframe_transfer_data(hw_frame, zm_packet->out_frame, 0)) < 0) {
+        Error("Error while transferring frame data to surface: %s.", av_err2str(ret));
+        av_frame_free(&hw_frame);
+        return ret;
+      }
+
+      frame = hw_frame;
+    }  // end if hwaccel
+#endif
+
+    //zm_packet->out_frame->coded_picture_number = frame_count;
+    //zm_packet->out_frame->display_picture_number = frame_count;
+    //zm_packet->out_frame->sample_aspect_ratio = (AVRational){ 0, 1 };
+    // Do this to allow the encoder to choose whether to use I/P/B frame
+    //zm_packet->out_frame->pict_type = AV_PICTURE_TYPE_NONE;
+    //zm_packet->out_frame->key_frame = zm_packet->keyframe;
+#if LIBAVCODEC_VERSION_CHECK(57, 64, 0, 64, 0)
+    frame->pkt_duration = 0;
+#endif
+
+    int64_t in_pts = zm_packet->timestamp->tv_sec * (uint64_t)1000000 + zm_packet->timestamp->tv_usec;
+    if ( !video_first_pts ) {
+      video_first_pts = in_pts;
+      Debug(2, "No video_first_pts, set to (%" PRId64 ") secs(%" PRIi64 ") usecs(%" PRIi64 ")",
+            video_first_pts,
+            static_cast<int64>(zm_packet->timestamp->tv_sec),
+            static_cast<int64>(zm_packet->timestamp->tv_usec));
+      frame->pts = 0;
+    } else {
+      uint64_t useconds = in_pts - video_first_pts;
+      frame->pts = av_rescale_q(useconds, AV_TIME_BASE_Q, video_out_ctx->time_base);
+      Debug(2,
+            "Setting pts for frame(%d) to (%" PRId64 ") from (start %" PRIu64 " - %" PRIu64 " - secs(%" PRIi64 ") usecs(%" PRIi64 ") @ %d/%d",
+            frame_count,
+            frame->pts,
+            video_first_pts,
+            useconds,
+            static_cast<int64>(zm_packet->timestamp->tv_sec),
+            static_cast<int64>(zm_packet->timestamp->tv_usec),
+            video_out_ctx->time_base.num,
+            video_out_ctx->time_base.den);
+    }
+
+    av_init_packet(&opkt);
+    opkt.data = nullptr;
+    opkt.size = 0;
+
+    ret = zm_send_frame_receive_packet(video_out_ctx, frame, opkt);
+    if (ret <= 0) {
+      if (ret < 0) {
+        Error("Could not send frame (error '%s')", av_make_error_string(ret).c_str());
+      }
+      return ret;
+    }
+    ZM_DUMP_PACKET(opkt, "packet returned by codec");
+
+    // Need to adjust pts/dts values from codec time to stream time
+    if ( opkt.pts != AV_NOPTS_VALUE )
+      opkt.pts = av_rescale_q(opkt.pts, video_out_ctx->time_base, video_out_stream->time_base);
+    if ( opkt.dts != AV_NOPTS_VALUE )
+      opkt.dts = av_rescale_q(opkt.dts, video_out_ctx->time_base, video_out_stream->time_base);
+    Debug(1, "Timebase conversions using %d/%d -> %d/%d",
+        video_out_ctx->time_base.num,
+        video_out_ctx->time_base.den,
+        video_out_stream->time_base.num,
+        video_out_stream->time_base.den);
+
+
+    int64_t duration = 0;
+    if ( zm_packet->in_frame ) {
+      if ( zm_packet->in_frame->pkt_duration ) {
+        duration = av_rescale_q(
+            zm_packet->in_frame->pkt_duration,
+            video_in_stream->time_base,
+            video_out_stream->time_base);
+        Debug(1, "duration from ipkt: pts(%" PRId64 ") = pkt_duration(%" PRId64 ") => (%" PRId64 ") (%d/%d) (%d/%d)",
+            zm_packet->in_frame->pts,
+            zm_packet->in_frame->pkt_duration,
+            duration,
+            video_in_stream->time_base.num,
+            video_in_stream->time_base.den,
+            video_out_stream->time_base.num,
+            video_out_stream->time_base.den
+            );
+      } else if ( video_last_pts != AV_NOPTS_VALUE ) {
+        duration =
+          av_rescale_q(
+              zm_packet->in_frame->pts - video_last_pts,
+              video_in_stream->time_base,
+              video_out_stream->time_base);
+        Debug(1, "duration calc: pts(%" PRId64 ") - last_pts(%" PRId64 ") = (%" PRId64 ") => (%" PRId64 ")",
+            zm_packet->in_frame->pts,
+            video_last_pts,
+            zm_packet->in_frame->pts - video_last_pts,
+            duration
+            );
+        if ( duration <= 0 ) {
+          duration = zm_packet->in_frame->pkt_duration ? zm_packet->in_frame->pkt_duration : av_rescale_q(1, video_in_stream->time_base, video_out_stream->time_base);
+        }
+      }  // end if in_frmae->pkt_duration
+      video_last_pts = zm_packet->in_frame->pts;
+    } else {
+      //duration = av_rescale_q(zm_packet->out_frame->pts - video_last_pts, video_in_stream->time_base, video_out_stream->time_base);
+    }  // end if in_frmae
+    opkt.duration = duration;
+
+  } else { // Passthrough
+    AVPacket *ipkt = &zm_packet->packet;
+    ZM_DUMP_STREAM_PACKET(video_in_stream, (*ipkt), "Doing passthrough, just copy packet");
+    // Just copy it because the codec is the same
+    av_init_packet(&opkt);
+    opkt.data = ipkt->data;
+    opkt.size = ipkt->size;
+    opkt.flags = ipkt->flags;
+    opkt.duration = ipkt->duration;
+
+    if ( ipkt->dts != AV_NOPTS_VALUE ) {
+      if ( !video_first_dts ) {
+        Debug(2, "Starting video first_dts will become %" PRId64, ipkt->dts);
+        video_first_dts = ipkt->dts;
+      }
+      opkt.dts = ipkt->dts - video_first_dts;
+    } else {
+      opkt.dts = next_dts[video_out_stream->index] ? av_rescale_q(next_dts[video_out_stream->index], video_out_stream->time_base, video_in_stream->time_base) : 0;
+      Debug(3, "Setting dts to video_next_dts %" PRId64 " from %" PRId64, opkt.dts, next_dts[video_out_stream->index]);
+    }
+    if ( ipkt->pts != AV_NOPTS_VALUE ) {
+      opkt.pts = ipkt->pts - video_first_dts;
+    } else {
+      opkt.pts = AV_NOPTS_VALUE;
+    }
+
+    av_packet_rescale_ts(&opkt, video_in_stream->time_base, video_out_stream->time_base);
+
+    ZM_DUMP_STREAM_PACKET(video_out_stream, opkt, "after pts adjustment");
+  } // end if codec matches
+
+  write_packet(&opkt, video_out_stream);
+  zm_av_packet_unref(&opkt);
+  if (hw_frame) av_frame_free(&hw_frame);
+
+  return 1;
 }  // end int VideoStore::writeVideoFramePacket( AVPacket *ipkt )
 
-int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
+int VideoStore::writeAudioFramePacket(ZMPacket *zm_packet) {
+
+  AVPacket *ipkt = &zm_packet->packet;
   int ret;
 
   if ( !audio_out_stream ) {
     Debug(1, "Called writeAudioFramePacket when no audio_out_stream");
-    return 0;  // FIXME -ve return codes do not free packet in ffmpeg_camera at
-               // the moment
+    return 0;
+    // FIXME -ve return codes do not free packet in ffmpeg_camera at the moment
   }
-  dumpPacket(audio_in_stream, ipkt, "input packet");
+  ZM_DUMP_STREAM_PACKET(audio_in_stream, (*ipkt), "input packet");
 
   if ( !audio_first_dts ) {
     audio_first_dts = ipkt->dts;
     audio_next_pts = audio_out_ctx->frame_size;
   }
 
+  Debug(3, "audio first_dts to %" PRId64, audio_first_dts);
   // Need to adjust pts before feeding to decoder.... should really copy the pkt instead of modifying it
-  ipkt->pts -= audio_first_dts;
-  ipkt->dts -= audio_first_dts;
-  dumpPacket(audio_in_stream, ipkt, "after pts adjustment");
 
   if ( audio_out_codec ) {
     // I wonder if we can get multiple frames per packet? Probably
@@ -1017,16 +1294,18 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt) {
     } // end while there is data in the resampler
 
   } else {
-    Debug(2,"copying");
     av_init_packet(&opkt);
     opkt.data = ipkt->data;
     opkt.size = ipkt->size;
     opkt.flags = ipkt->flags;
 
     opkt.duration = ipkt->duration;
-    opkt.pts = ipkt->pts;
-    opkt.dts = ipkt->dts;
+    opkt.pts = ipkt->pts - audio_first_dts;
+    opkt.dts = ipkt->dts - audio_first_dts;
+
+    ZM_DUMP_STREAM_PACKET(audio_in_stream, (*ipkt), "after pts adjustment");
     av_packet_rescale_ts(&opkt, audio_in_stream->time_base, audio_out_stream->time_base);
+    ZM_DUMP_STREAM_PACKET(audio_out_stream, opkt, "after stream pts adjustment");
     write_packet(&opkt, audio_out_stream);
 
     zm_av_packet_unref(&opkt);
@@ -1045,7 +1324,7 @@ int VideoStore::write_packet(AVPacket *pkt, AVStream *stream) {
   } else if ( pkt->dts < stream->cur_dts ) {
     Debug(1, "non increasing dts, fixing. our dts %" PRId64 " stream cur_dts %" PRId64, pkt->dts, stream->cur_dts);
     pkt->dts = stream->cur_dts;
-  } 
+  }
 
   if ( pkt->dts > pkt->pts ) {
     Debug(1,
@@ -1055,16 +1334,17 @@ int VideoStore::write_packet(AVPacket *pkt, AVStream *stream) {
     pkt->pts = pkt->dts;
   }
 
-  dumpPacket(stream, pkt, "finished pkt");
-  next_dts[stream->index] = opkt.dts + opkt.duration;
-  Debug(3, "video_next_dts has become %" PRId64, next_dts[stream->index]);
+  ZM_DUMP_STREAM_PACKET(stream, (*pkt), "finished pkt");
+  next_dts[stream->index] = pkt->dts + pkt->duration;
+  Debug(3, "next_dts for stream %d has become %" PRId64,
+      stream->index, next_dts[stream->index]);
 
   int ret = av_interleaved_write_frame(oc, pkt);
   if ( ret != 0 ) {
     Error("Error writing packet: %s",
           av_make_error_string(ret).c_str());
   } else {
-    Debug(2, "Success writing packet");
+    Debug(4, "Success writing packet");
   }
   return ret;
 }  // end int VideoStore::write_packet(AVPacket *pkt, AVStream *stream)
diff --git a/src/zm_videostore.h b/src/zm_videostore.h
index 64c2296ba..47872db2f 100644
--- a/src/zm_videostore.h
+++ b/src/zm_videostore.h
@@ -1,7 +1,11 @@
 #ifndef ZM_VIDEOSTORE_H
 #define ZM_VIDEOSTORE_H
 
+#include "zm_config.h"
+#include "zm_define.h"
 #include "zm_ffmpeg.h"
+#include "zm_swscale.h"
+
 extern "C"  {
 #ifdef HAVE_LIBSWRESAMPLE
   #include "libswresample/swresample.h"
@@ -11,85 +15,115 @@ extern "C"  {
   #endif
 #endif
 #include "libavutil/audio_fifo.h"
+#if HAVE_LIBAVUTIL_HWCONTEXT_H
+  #include "libavutil/hwcontext.h"
+#endif
 }
 
 #if HAVE_LIBAVCODEC
 
-#include "zm_monitor.h"
+class Monitor;
+class ZMPacket;
+class PacketQueue;
 
 class VideoStore {
-private:
-  AVOutputFormat *out_format;
-  AVFormatContext *oc;
+  private:
 
-  AVCodec *video_out_codec;
-  AVCodecContext *video_out_ctx;
-  AVStream *video_out_stream;
+    struct CodecData {
+      const AVCodecID codec_id;
+      const char *codec_codec;
+      const char *codec_name;
+      const enum AVPixelFormat sw_pix_fmt;
+      const enum AVPixelFormat hw_pix_fmt;
+#if HAVE_LIBAVUTIL_HWCONTEXT_H
+      const AVHWDeviceType hwdevice_type;
+#endif
+    };
 
-  AVStream *video_in_stream;
+    static struct CodecData codec_data[];
+    CodecData *chosen_codec_data;
 
-  AVStream *audio_in_stream;
-  Monitor *monitor;
+    Monitor *monitor;
+    AVOutputFormat *out_format;
+    AVFormatContext *oc;
+    AVStream *video_out_stream;
+    AVStream *audio_out_stream;
 
-  // Move this into the object so that we aren't constantly allocating/deallocating it on the stack
-  AVPacket opkt;
-  // we are transcoding
-  AVFrame *in_frame;
-  AVFrame *out_frame;
+    AVCodec *video_out_codec;
+    AVCodecContext *video_in_ctx;
+    AVCodecContext *video_out_ctx;
 
-  AVCodecContext *video_in_ctx;
-  const AVCodec *audio_in_codec;
-  AVCodecContext *audio_in_ctx;
+    AVStream *video_in_stream;
+    AVStream *audio_in_stream;
+
+    const AVCodec *audio_in_codec;
+    AVCodecContext *audio_in_ctx;
+    // The following are used when encoding the audio stream to AAC
+    AVCodec *audio_out_codec;
+    AVCodecContext *audio_out_ctx;
+    // Move this into the object so that we aren't constantly allocating/deallocating it on the stack
+    AVPacket opkt;
+    // we are transcoding
+    AVFrame *video_in_frame;
+    AVFrame *in_frame;
+    AVFrame *out_frame;
+    AVFrame *hw_frame;
+
+    SWScale swscale;
+    unsigned int packets_written;
+    unsigned int frame_count;
+
+    AVBufferRef *hw_device_ctx;
 
-  // The following are used when encoding the audio stream to AAC
-  AVStream *audio_out_stream;
-  AVCodec *audio_out_codec;
-  AVCodecContext *audio_out_ctx;
 #ifdef HAVE_LIBSWRESAMPLE
-  SwrContext *resample_ctx;
+    SwrContext *resample_ctx;
+    AVAudioFifo *fifo;
 #else
 #ifdef HAVE_LIBAVRESAMPLE
-  AVAudioResampleContext* resample_ctx;
+    AVAudioResampleContext* resample_ctx;
 #endif
 #endif
-  AVAudioFifo *fifo;
-  uint8_t *converted_in_samples;
-    
-	const char *filename;
-	const char *format;
-    
-  // These are for in
-  int64_t video_last_pts;
-  int64_t video_last_dts;
-  int64_t audio_last_pts;
-  int64_t audio_last_dts;
+    uint8_t *converted_in_samples;
 
-  int64_t video_first_pts;
-  int64_t video_first_dts;
-  int64_t audio_first_pts;
-  int64_t audio_first_dts;
+    const char *filename;
+    const char *format;
 
-  // These are for out, should start at zero.  We assume they do not wrap because we just aren't going to save files that big.
-  int64_t *next_dts;
-  int64_t audio_next_pts;
+    // These are for in
+    int64_t video_first_pts;
+    int64_t video_first_dts;
+    int64_t audio_first_pts;
+    int64_t audio_first_dts;
+    int64_t video_last_pts;
+    int64_t audio_last_pts;
 
-  int max_stream_index;
+    // These are for out, should start at zero.  We assume they do not wrap because we just aren't going to save files that big.
+    int64_t *next_dts;
+    int64_t audio_next_pts;
 
-  bool setup_resampler();
-  int write_packet(AVPacket *pkt, AVStream *stream);
+    int max_stream_index;
 
-public:
-	VideoStore(
-      const char *filename_in,
-      const char *format_in,
-      AVStream *video_in_stream,
-      AVStream *audio_in_stream,
-      Monitor * p_monitor);
-  bool  open();
-	~VideoStore();
+    bool setup_resampler();
+    int write_packet(AVPacket *pkt, AVStream *stream);
 
-  int writeVideoFramePacket( AVPacket *pkt );
-  int writeAudioFramePacket( AVPacket *pkt );
+  public:
+    VideoStore(
+        const char *filename_in,
+        const char *format_in,
+        AVStream *video_in_stream,
+        AVCodecContext  *video_in_ctx,
+        AVStream *audio_in_stream,
+        AVCodecContext  *audio_in_ctx,
+        Monitor * p_monitor);
+    ~VideoStore();
+    bool  open();
+
+    void write_video_packet(AVPacket &pkt);
+    void write_audio_packet(AVPacket &pkt);
+    int writeVideoFramePacket(ZMPacket *pkt);
+    int writeAudioFramePacket(ZMPacket *pkt);
+    int writePacket(ZMPacket *pkt);
+    int write_packets(PacketQueue &queue);
+    void flush_codecs();
 };
 
 #endif //havelibav
diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp
index 9bb8d26e5..106ab2ce0 100644
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@@ -17,20 +17,13 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 // 
 
-#define __STDC_FORMAT_MACROS 1
-#include <cinttypes>
-#include "zm.h"
-#include "zm_db.h"
 #include "zm_zone.h"
-#include "zm_image.h"
-#include "zm_monitor.h"
-#include "zm_fifo.h"
 
+#include "zm_fifo.h"
+#include "zm_fifo_debug.h"
+#include "zm_monitor.h"
 
 void Zone::Setup( 
-  Monitor *p_monitor,
-  int p_id,
-  const char *p_label,
   ZoneType p_type,
   const Polygon &p_polygon,
   const Rgb p_alarm_rgb,
@@ -49,11 +42,6 @@ void Zone::Setup(
   int p_overload_frames,
   int p_extend_alarm_frames
 ) {
-  monitor = p_monitor;
-
-  id = p_id;
-  label = new char[strlen(p_label)+1];
-  strcpy(label, p_label);
   type = p_type;
   polygon = p_polygon;
   alarm_rgb = p_alarm_rgb;
@@ -72,19 +60,13 @@ void Zone::Setup(
   overload_frames = p_overload_frames;
   extend_alarm_frames = p_extend_alarm_frames;
 
-  //Debug( 1, "Initialised zone %d/%s - %d - %dx%d - Rgb:%06x, CM:%d, MnAT:%d, MxAT:%d, MnAP:%d, MxAP:%d, FB:%dx%d, MnFP:%d, MxFP:%d, MnBS:%d, MxBS:%d, MnB:%d, MxB:%d, OF: %d, AF: %d", id, label, type, polygon.Width(), polygon.Height(), alarm_rgb, check_method, min_pixel_threshold, max_pixel_threshold, min_alarm_pixels, max_alarm_pixels, filter_box.X(), filter_box.Y(), min_filter_pixels, max_filter_pixels, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs, overload_frames, extend_alarm_frames );
+#if 0
+  Debug( 1, "Initialised zone %d/%s - %d - %dx%d - Rgb:%06x, CM:%d, MnAT:%d, MxAT:%d, MnAP:%d, MxAP:%d, FB:%dx%d, MnFP:%d, MxFP:%d, MnBS:%d, MxBS:%d, MnB:%d, MxB:%d, OF: %d, AF: %d",
+      id, label.c_str(), type, polygon.Width(), polygon.Height(), alarm_rgb, check_method, min_pixel_threshold, max_pixel_threshold, min_alarm_pixels, max_alarm_pixels, filter_box.X(), filter_box.Y(), min_filter_pixels, max_filter_pixels, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs, overload_frames, extend_alarm_frames );
+#endif
 
-  alarmed = false;
-  was_alarmed = false;
-  pixel_diff = 0;
-  alarm_pixels = 0;
-  alarm_filter_pixels = 0;
-  alarm_blob_pixels = 0;
-  alarm_blobs = 0;
-  min_blob_size = 0;
-  max_blob_size = 0;
+  ResetStats();
   image = nullptr;
-  score = 0;
 
   overload_count = 0;
   extend_alarm_count = 0;
@@ -112,36 +94,49 @@ void Zone::Setup(
     }
   }
 
-  if ( config.record_diag_images ) {
-    snprintf(diag_path, sizeof(diag_path),
-        config.record_diag_images_fifo ? "%s/diagpipe-%d-poly.jpg" : "%s/diag-%d-poly.jpg",
-        monitor->getStorage()->Path(), id);
-    if ( config.record_diag_images_fifo )
-      FifoStream::fifo_create_if_missing(diag_path);
-    pg_image->WriteJpeg(diag_path, config.record_diag_images_fifo);
-  } else {
-    diag_path[0] = 0;
+  if (config.record_diag_images) {
+    if (config.record_diag_images_fifo) {
+      diag_path = stringtf("%s/diagpipe-%d-poly.jpg",
+          staticConfig.PATH_SOCKS.c_str(), id);
+
+      Fifo::fifo_create_if_missing(diag_path.c_str());
+    } else {
+      diag_path = stringtf("%s/diag-%d-poly.jpg",
+          monitor->getStorage()->Path(), id);
+    }
+    pg_image->WriteJpeg(diag_path.c_str(), config.record_diag_images_fifo);
   }
 }  // end Zone::Setup
 
 Zone::~Zone() {
-  delete[] label;
-  delete image;
+  if ( image )
+    delete image;
   delete pg_image;
   delete[] ranges;
 }
 
 void Zone::RecordStats(const Event *event) {
   static char sql[ZM_SQL_MED_BUFSIZ];
-  db_mutex.lock();
   snprintf(sql, sizeof(sql),
-      "INSERT INTO Stats SET MonitorId=%d, ZoneId=%d, EventId=%" PRIu64 ", FrameId=%d, PixelDiff=%d, AlarmPixels=%d, FilterPixels=%d, BlobPixels=%d, Blobs=%d, MinBlobSize=%d, MaxBlobSize=%d, MinX=%d, MinY=%d, MaxX=%d, MaxY=%d, Score=%d",
-      monitor->Id(), id, event->Id(), event->Frames(), pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, min_blob_size, max_blob_size, alarm_box.LoX(), alarm_box.LoY(), alarm_box.HiX(), alarm_box.HiY(), score
+      "INSERT INTO Stats SET MonitorId=%d, ZoneId=%d, EventId=%" PRIu64 ", FrameId=%d, "
+      "PixelDiff=%d, AlarmPixels=%d, FilterPixels=%d, BlobPixels=%d, "
+      "Blobs=%d, MinBlobSize=%d, MaxBlobSize=%d, "
+      "MinX=%d, MinY=%d, MaxX=%d, MaxY=%d, Score=%d",
+      monitor->Id(), id, event->Id(), event->Frames(), 
+      stats.pixel_diff_,
+      stats.alarm_pixels_,
+      stats.alarm_filter_pixels_,
+      stats.alarm_blob_pixels_,
+      stats.alarm_blobs_,
+      stats.min_blob_size_,
+      stats.max_blob_size_,
+      stats.alarm_box_.LoX(),
+      stats.alarm_box_.LoY(),
+      stats.alarm_box_.HiX(),
+      stats.alarm_box_.HiY(),
+      stats.score_
       );
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't insert event stats: %s", mysql_error(&dbconn));
-  }
-  db_mutex.unlock();
+  zmDbDo(sql);
 }  // end void Zone::RecordStats( const Event *event )
 
 bool Zone::CheckOverloadCount() {
@@ -154,11 +149,12 @@ bool Zone::CheckOverloadCount() {
 }  // end bool Zone::CheckOverloadCount()
 
 void Zone::SetScore(unsigned int nScore) {
-  score = nScore;
+  stats.score_ = nScore;
 }  // end void Zone::SetScore(unsigned int nScore)
 
 void Zone::SetAlarmImage(const Image* srcImage) {
-  delete image;
+  if ( image )
+    delete image;
   image = new Image(*srcImage);
 }  // end void Zone::SetAlarmImage( const Image* srcImage )
 
@@ -199,13 +195,14 @@ bool Zone::CheckExtendAlarmCount() {
 bool Zone::CheckAlarms(const Image *delta_image) {
   ResetStats();
 
-  if ( overload_count ) {
+  if (overload_count) {
     Info("In overload mode, %d frames of %d remaining", overload_count, overload_frames);
     overload_count--;
     return false;
   }
 
-  delete image;
+  if (image)
+    delete image;
   // Get the difference image
   Image *diff_image = image = new Image(*delta_image);
   int diff_width = diff_image->Width();
@@ -227,34 +224,34 @@ bool Zone::CheckAlarms(const Image *delta_image) {
   unsigned int hi_x = polygon.HiX();
   unsigned int hi_y = polygon.HiY();
 
-  Debug(4, "Checking alarms for zone %d/%s in lines %d -> %d", id, label, lo_y, hi_y);
+  Debug(4, "Checking alarms for zone %d/%s in lines %d -> %d", id, label.c_str(), lo_y, hi_y);
 
   /* if(config.cpu_extensions && sse_version >= 20) {
      sse2_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
      } else {
      std_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
      } */
-  std_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
+  std_alarmedpixels(diff_image, pg_image, &stats.alarm_pixels_, &pixel_diff_count);
 
-  if ( config.record_diag_images )
-    diff_image->WriteJpeg(diag_path, config.record_diag_images_fifo);
+  if (config.record_diag_images)
+    diff_image->WriteJpeg(diag_path.c_str(), config.record_diag_images_fifo);
 
-  if ( pixel_diff_count && alarm_pixels )
-    pixel_diff = pixel_diff_count/alarm_pixels;
+  if (pixel_diff_count && stats.alarm_pixels_)
+    stats.pixel_diff_ = pixel_diff_count/stats.alarm_pixels_;
 
   Debug(5, "Got %d alarmed pixels, need %d -> %d, avg pixel diff %d",
-      alarm_pixels, min_alarm_pixels, max_alarm_pixels, pixel_diff);
+        stats.alarm_pixels_, min_alarm_pixels, max_alarm_pixels, stats.pixel_diff_);
 
-  if ( config.record_diag_images_fifo ) {
+  if (config.record_diag_images_fifo) {
     FifoDebug(5, "{\"zone\":%d,\"type\":\"ALRM\",\"pixels\":%d,\"avg_diff\":%d}",
-        id,alarm_pixels, pixel_diff);
+              id, stats.alarm_pixels_, stats.pixel_diff_);
   }
 
-  if ( alarm_pixels ) {
-    if ( min_alarm_pixels && (alarm_pixels < (unsigned int)min_alarm_pixels) ) {
+  if (stats.alarm_pixels_) {
+    if (min_alarm_pixels && (stats.alarm_pixels_ < (unsigned int)min_alarm_pixels)) {
       /* Not enough pixels alarmed */
       return false;
-    } else if ( max_alarm_pixels && (alarm_pixels > (unsigned int)max_alarm_pixels) ) {
+    } else if (max_alarm_pixels && (stats.alarm_pixels_ > (unsigned int)max_alarm_pixels)) {
       /* Too many pixels alarmed */
       overload_count = overload_frames;
       return false;
@@ -264,146 +261,136 @@ bool Zone::CheckAlarms(const Image *delta_image) {
     return false;
   }
 
-  if ( max_alarm_pixels != 0 )
-    score = (100*alarm_pixels)/max_alarm_pixels;
-  else
-    score = (100*alarm_pixels)/polygon.Area();
-  
-  if ( score < 1 )
-    score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
-  Debug(5, "Current score is %d", score);
+  stats.score_ = (100*stats.alarm_pixels_)/(max_alarm_pixels ? max_alarm_pixels : polygon.Area());
+  if (stats.score_ < 1)
+    stats.score_ = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
+  Debug(5, "Current score is %d", stats.score_);
 
-  if ( check_method >= FILTERED_PIXELS ) {
+  if (check_method >= FILTERED_PIXELS) {
     int bx = filter_box.X();
     int by = filter_box.Y();
     int bx1 = bx-1;
     int by1 = by-1;
 
     Debug(5, "Checking for filtered pixels");
-    if ( bx > 1 || by > 1 ) {
+    if (bx > 1 || by > 1) {
       // Now remove any pixels smaller than our filter size
       unsigned char *cpdiff;
       int ldx, hdx, ldy, hdy;
       bool block;
-      for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
+      for (unsigned int y = lo_y; y <= hi_y; y++) {
         int lo_x = ranges[y].lo_x;
         int hi_x = ranges[y].hi_x;
 
         pdiff = (uint8_t*)diff_image->Buffer(lo_x, y);
 
-        for ( int x = lo_x; x <= hi_x; x++, pdiff++ ) {
-          if ( *pdiff == WHITE ) {
+        for (int x = lo_x; x <= hi_x; x++, pdiff++) {
+          if (*pdiff == kWhite) {
             // Check participation in an X block
             ldx = (x>=(lo_x+bx1))?-bx1:lo_x-x;
             hdx = (x<=(hi_x-bx1))?0:((hi_x-x)-bx1);
             ldy = (y>=(lo_y+by1))?-by1:lo_y-y;
             hdy = (y<=(hi_y-by1))?0:((hi_y-y)-by1);
             block = false;
-            for ( int dy = ldy; !block && dy <= hdy; dy++ ) {
-              for ( int dx = ldx; !block && dx <= hdx; dx++ ) {
+            for (int dy = ldy; !block && dy <= hdy; dy++) {
+              for (int dx = ldx; !block && dx <= hdx; dx++) {
                 block = true;
-                for ( int dy2 = 0; block && dy2 < by; dy2++ ) {
-                  for ( int dx2 = 0; block && dx2 < bx; dx2++ ) {
+                for (int dy2 = 0; block && dy2 < by; dy2++) {
+                  for (int dx2 = 0; block && dx2 < bx; dx2++) {
                     cpdiff = diff_buff + (((y+dy+dy2)*diff_width) + (x+dx+dx2));
-                    if ( !*cpdiff ) {
+                    if (!*cpdiff ) {
                       block = false;
                     }
                   }
                 }
               }
             }
-            if ( !block ) {
-              *pdiff = BLACK;
+            if (!block) {
+              *pdiff = kBlack;
               continue;
             }
-            alarm_filter_pixels++;
-          } // end if white
-        } // end for x
-      } // end foreach y line
+            stats.alarm_filter_pixels_++;
+          }  // end if white
+        }  // end for x
+      }  // end foreach y line
     } else {
-      alarm_filter_pixels = alarm_pixels;
+      stats.alarm_filter_pixels_ = stats.alarm_pixels_;
     }
 
-    if ( config.record_diag_images )
-      diff_image->WriteJpeg(diag_path, config.record_diag_images_fifo);
+    if (config.record_diag_images)
+      diff_image->WriteJpeg(diag_path.c_str(), config.record_diag_images_fifo);
 
     Debug(5, "Got %d filtered pixels, need %d -> %d",
-        alarm_filter_pixels, min_filter_pixels, max_filter_pixels);
+          stats.alarm_filter_pixels_, min_filter_pixels, max_filter_pixels);
 
-    if ( config.record_diag_images_fifo )
-      FifoDebug(5, "{\"zone\":%d,\"type\":\"FILT\",\"pixels\":%d}", id, alarm_filter_pixels);
+    if (config.record_diag_images_fifo)
+      FifoDebug(5, "{\"zone\":%d,\"type\":\"FILT\",\"pixels\":%d}", id, stats.alarm_filter_pixels_);
 
-    if ( alarm_filter_pixels ) {
-      if ( min_filter_pixels && (alarm_filter_pixels < min_filter_pixels) ) {
+    if (stats.alarm_filter_pixels_) {
+      if (min_filter_pixels && (stats.alarm_filter_pixels_ < min_filter_pixels)) {
         /* Not enough pixels alarmed */
+        stats.score_ = 0;
         return false;
-      } else if ( max_filter_pixels && (alarm_filter_pixels > max_filter_pixels) ) {
+      } else if (max_filter_pixels && (stats.alarm_filter_pixels_ > max_filter_pixels)) {
         /* Too many pixels alarmed */
         overload_count = overload_frames;
+        stats.score_ = 0;
         return false;
       }
     } else {
       /* No filtered pixels */
+      stats.score_ = 0;
       return false;
     }
 
-    if ( max_filter_pixels != 0 )
-       score = (100*alarm_filter_pixels)/max_filter_pixels;
-     else
-       score = (100*alarm_filter_pixels)/polygon.Area();
+    if (max_filter_pixels != 0)
+       stats.score_ = (100*stats.alarm_filter_pixels_)/max_filter_pixels;
+    else
+       stats.score_ = (100*stats.alarm_filter_pixels_)/polygon.Area();
 
-    if ( score < 1 )
-      score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
-    Debug(5, "Current score is %d", score);
+    if (stats.score_ < 1)
+      stats.score_ = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
+    Debug(5, "Current score is %d", stats.score_);
 
-    if ( check_method >= BLOBS ) {
+    if (check_method >= BLOBS) {
       Debug(5, "Checking for blob pixels");
-      typedef struct { unsigned char tag; int count; int lo_x; int hi_x; int lo_y; int hi_y; } BlobStats;
-      BlobStats blob_stats[256];
+      // ICON FIXME Would like to get rid of this memset
       memset(blob_stats, 0, sizeof(BlobStats)*256);
       uint8_t *spdiff;
       uint8_t last_x, last_y;
       BlobStats *bsx, *bsy;
       BlobStats *bsm, *bss;
-      for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
+      for (unsigned int y = lo_y; y <= hi_y; y++) {
         int lo_x = ranges[y].lo_x;
         int hi_x = ranges[y].hi_x;
 
-        pdiff = (uint8_t*)diff_image->Buffer( lo_x, y );
-        for ( int x = lo_x; x <= hi_x; x++, pdiff++ ) {
-          if ( *pdiff == WHITE ) {
+        pdiff = (uint8_t*)diff_image->Buffer(lo_x, y);
+        for (int x = lo_x; x <= hi_x; x++, pdiff++) {
+          if (*pdiff == kWhite) {
             Debug(9, "Got white pixel at %d,%d (%p)", x, y, pdiff);
-            //last_x = (x>lo_x)?*(pdiff-1):0;
-            //last_y = (y>lo_y&&x>=last_lo_x&&x<=last_hi_x)?*(pdiff-diff_width):0;
-
-            last_x = 0;
-            if ( x > 0 ) {
-              if ( (x-1) >= lo_x ) {
-                last_x = *(pdiff-1);
-              }
-            }
 
+            last_x = ((x > 0) && ( (x-1) >= lo_x )) ? *(pdiff-1) : 0;
             last_y = 0;
-            if (y > 0 ) {
+            if ( y > 0 ) {
               if ( (y-1) >= lo_y && ranges[(y-1)].lo_x <= x && ranges[(y-1)].hi_x >= x ) {
                 last_y = *(pdiff-diff_width);
               }
             }
 
-            if ( last_x ) {
+            if (last_x) {
               Debug(9, "Left neighbour is %d", last_x);
               bsx = &blob_stats[last_x];
-              if ( last_y ) {
+              if (last_y) {
                 Debug(9, "Top neighbour is %d", last_y);
                 bsy = &blob_stats[last_y];
-                if ( last_x == last_y ) {
+                if (last_x == last_y) {
                   Debug(9, "Matching neighbours, setting to %d", last_x);
                   // Add to the blob from the x side (either side really)
                   *pdiff = last_x;
-                  alarm_blob_pixels++;
+                  stats.alarm_blob_pixels_++;
                   bsx->count++;
-                  if ( x > bsx->hi_x ) bsx->hi_x = x;
-                  if ( (int)y > bsx->hi_y ) bsx->hi_y = y;
+                  if (x > bsx->hi_x) bsx->hi_x = x;
+                  if ((int)y > bsx->hi_y) bsx->hi_y = y;
                 } else {
                   // Aggregate blobs
                   bsm = bsx->count>=bsy->count?bsx:bsy;
@@ -419,7 +406,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
                       );
                   // Now change all those pixels to the other setting
                   int changed = 0;
-                  for ( int sy = bss->lo_y; sy <= bss->hi_y; sy++ ) {
+                  for (int sy = bss->lo_y; sy <= bss->hi_y; sy++) {
                     int lo_sx = bss->lo_x>=ranges[sy].lo_x?bss->lo_x:ranges[sy].lo_x;
                     int hi_sx = bss->hi_x<=ranges[sy].hi_x?bss->hi_x:ranges[sy].hi_x;
 
@@ -428,18 +415,18 @@ bool Zone::CheckAlarms(const Image *delta_image) {
                         sy, lo_sx, hi_sx, ranges[sy].lo_x, ranges[sy].hi_x
                         );
                     spdiff = diff_buff + ((diff_width * sy) + lo_sx);
-                    for ( int sx = lo_sx; sx <= hi_sx; sx++, spdiff++ ) {
+                    for (int sx = lo_sx; sx <= hi_sx; sx++, spdiff++) {
                       Debug(9, "Pixel at %d,%d (%p) is %d", sx, sy, spdiff, *spdiff);
-                      if ( *spdiff == bss->tag ) {
+                      if (*spdiff == bss->tag) {
                         Debug(9, "Setting pixel");
                         *spdiff = bsm->tag;
                         changed++;
                       }
                     }
-                  }
+                  }  // end for sy = lo_y .. hi_y
                   *pdiff = bsm->tag;
-                  alarm_blob_pixels++;
-                  if ( !changed ) {
+                  stats.alarm_blob_pixels_++;
+                  if (!changed) {
                     Info(
                         "Master blob t:%d, c:%d, lx:%d, hx:%d, ly:%d, hy:%d\n"
                         "Slave blob t:%d, c:%d, lx:%d, hx:%d, ly:%d, hy:%d",
@@ -452,17 +439,17 @@ bool Zone::CheckAlarms(const Image *delta_image) {
 
                   // Merge the slave blob into the master
                   bsm->count += bss->count+1;
-                  if ( x > bsm->hi_x ) bsm->hi_x = x;
-                  if ( (int)y > bsm->hi_y ) bsm->hi_y = y;
-                  if ( bss->lo_x < bsm->lo_x ) bsm->lo_x = bss->lo_x;
-                  if ( bss->lo_y < bsm->lo_y ) bsm->lo_y = bss->lo_y;
-                  if ( bss->hi_x > bsm->hi_x ) bsm->hi_x = bss->hi_x;
-                  if ( bss->hi_y > bsm->hi_y ) bsm->hi_y = bss->hi_y;
+                  if (x > bsm->hi_x) bsm->hi_x = x;
+                  if ((int)y > bsm->hi_y) bsm->hi_y = y;
+                  if (bss->lo_x < bsm->lo_x) bsm->lo_x = bss->lo_x;
+                  if (bss->lo_y < bsm->lo_y) bsm->lo_y = bss->lo_y;
+                  if (bss->hi_x > bsm->hi_x) bsm->hi_x = bss->hi_x;
+                  if (bss->hi_y > bsm->hi_y) bsm->hi_y = bss->hi_y;
 
-                  alarm_blobs--;
+                  stats.alarm_blobs_--;
 
                   Debug(6, "Merging blob %d with %d at %d,%d, %d current blobs",
-                      bss->tag, bsm->tag, x, y, alarm_blobs);
+                      bss->tag, bsm->tag, x, y, stats.alarm_blobs_);
 
                   // Clear out the old blob
                   bss->tag = 0;
@@ -476,50 +463,50 @@ bool Zone::CheckAlarms(const Image *delta_image) {
                 Debug(9, "Setting to left neighbour %d", last_x);
                 // Add to the blob from the x side 
                 *pdiff = last_x;
-                alarm_blob_pixels++;
+                stats.alarm_blob_pixels_++;
                 bsx->count++;
-                if ( x > bsx->hi_x ) bsx->hi_x = x;
-                if ( (int)y > bsx->hi_y ) bsx->hi_y = y;
+                if (x > bsx->hi_x) bsx->hi_x = x;
+                if ((int)y > bsx->hi_y) bsx->hi_y = y;
               }
             } else {
-              if ( last_y ) {
+              if (last_y) {
                 Debug(9, "Top neighbour is %d", last_y);
 
                 // Add to the blob from the y side
                 BlobStats *bsy = &blob_stats[last_y];
 
                 *pdiff = last_y;
-                alarm_blob_pixels++;
+                stats.alarm_blob_pixels_++;
                 bsy->count++;
-                if ( x > bsy->hi_x ) bsy->hi_x = x;
-                if ( (int)y > bsy->hi_y ) bsy->hi_y = y;
+                if (x > bsy->hi_x) bsy->hi_x = x;
+                if ((int)y > bsy->hi_y) bsy->hi_y = y;
               } else {
                 // Create a new blob
                 int i;
-                for ( i = (WHITE-1); i > 0; i-- ) {
+                for (i = (kWhite-1); i > 0; i--) {
                   BlobStats *bs = &blob_stats[i];
                   // See if we can recycle one first, only if it's at least two rows up
-                  if ( bs->count && bs->hi_y < (int)(y-1) ) {
+                  if (bs->count && bs->hi_y < (int)(y-1)) {
                     if (
                         (min_blob_pixels && bs->count < min_blob_pixels)
                         ||
                         (max_blob_pixels && bs->count > max_blob_pixels)
                        ) {
-                      if ( ( monitor->GetOptSaveJPEGs() > 1 ) || config.record_diag_images ) {
-                        for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ ) {
+                      if (( monitor->GetOptSaveJPEGs() > 1 ) || config.record_diag_images) {
+                        for (int sy = bs->lo_y; sy <= bs->hi_y; sy++) {
                           spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
-                          for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ ) {
-                            if ( *spdiff == bs->tag ) {
-                              *spdiff = BLACK;
+                          for (int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++) {
+                            if (*spdiff == bs->tag) {
+                              *spdiff = kBlack;
                             }
                           }
                         }
                       }
-                      alarm_blobs--;
-                      alarm_blob_pixels -= bs->count;
+                      stats.alarm_blobs_--;
+                      stats.alarm_blob_pixels_ -= bs->count;
 
                       Debug(6, "Eliminated blob %d, %d pixels (%d,%d - %d,%d), %d current blobs",
-                          i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, alarm_blobs);
+                          i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, stats.alarm_blobs_);
 
                       bs->tag = 0;
                       bs->count = 0;
@@ -529,21 +516,21 @@ bool Zone::CheckAlarms(const Image *delta_image) {
                       bs->hi_y = 0;
                     }
                   }
-                  if ( !bs->count ) {
+                  if (!bs->count) {
                     Debug(9, "Creating new blob %d", i);
                     *pdiff = i;
-                    alarm_blob_pixels++;
+                    stats.alarm_blob_pixels_++;
                     bs->tag = i;
                     bs->count++;
                     bs->lo_x = bs->hi_x = x;
                     bs->lo_y = bs->hi_y = y;
-                    alarm_blobs++;
+                    stats.alarm_blobs_++;
 
-                    Debug(6, "Created blob %d at %d,%d, %d current blobs", bs->tag, x, y, alarm_blobs);
+                    Debug(6, "Created blob %d at %d,%d, %d current blobs", bs->tag, x, y, stats.alarm_blobs_);
                     break;
                   }
                 }
-                if ( i == 0 ) {
+                if (i == 0) {
                   Warning("Max blob count reached. Unable to allocate new blobs so terminating. Zone settings may be too sensitive.");
                   x = hi_x+1;
                   y = hi_y+1;
@@ -554,41 +541,42 @@ bool Zone::CheckAlarms(const Image *delta_image) {
         }
       }
 
-      if ( config.record_diag_images )
-        diff_image->WriteJpeg(diag_path, config.record_diag_images_fifo);
+      if (config.record_diag_images)
+        diff_image->WriteJpeg(diag_path.c_str(), config.record_diag_images_fifo);
 
-      if ( !alarm_blobs ) {
+      if (!stats.alarm_blobs_) {
+        stats.score_ = 0;
         return false;
       }
 
       Debug(5, "Got %d raw blob pixels, %d raw blobs, need %d -> %d, %d -> %d",
-          alarm_blob_pixels, alarm_blobs, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs);
+            stats.alarm_blob_pixels_, stats.alarm_blobs_, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs);
 
-      if ( config.record_diag_images_fifo ) {
+      if (config.record_diag_images_fifo) {
         FifoDebug(5, "{\"zone\":%d,\"type\":\"RBLB\",\"pixels\":%d,\"blobs\":%d}",
-            id, alarm_blob_pixels, alarm_blobs);
+                  id, stats.alarm_blob_pixels_, stats.alarm_blobs_);
       }
 
       // Now eliminate blobs under the threshold
-      for ( int i = 1; i < WHITE; i++ ) {
+      for (uint32 i = 1; i < kWhite; i++) {
         BlobStats *bs = &blob_stats[i];
-        if ( bs->count ) {
-          if ( (min_blob_pixels && bs->count < min_blob_pixels) || (max_blob_pixels && bs->count > max_blob_pixels) ) {
-            if ( ( monitor->GetOptSaveJPEGs() > 1 ) || config.record_diag_images ) {
-              for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ ) {
+        if (bs->count) {
+          if ((min_blob_pixels && bs->count < min_blob_pixels) || (max_blob_pixels && bs->count > max_blob_pixels)) {
+            if (( monitor->GetOptSaveJPEGs() > 1 ) || config.record_diag_images) {
+              for (int sy = bs->lo_y; sy <= bs->hi_y; sy++) {
                 spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
-                for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ ) {
-                  if ( *spdiff == bs->tag ) {
-                    *spdiff = BLACK;
+                for (int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++) {
+                  if (*spdiff == bs->tag) {
+                    *spdiff = kBlack;
                   }
                 }
               }
             }
-            alarm_blobs--;
-            alarm_blob_pixels -= bs->count;
+            stats.alarm_blobs_--;
+            stats.alarm_blob_pixels_ -= bs->count;
 
             Debug(6, "Eliminated blob %d, %d pixels (%d,%d - %d,%d), %d current blobs",
-                i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, alarm_blobs);
+                i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, stats.alarm_blobs_);
 
             bs->tag = 0;
             bs->count = 0;
@@ -598,69 +586,72 @@ bool Zone::CheckAlarms(const Image *delta_image) {
             bs->hi_y = 0;
           } else {
             Debug(6, "Preserved blob %d, %d pixels (%d,%d - %d,%d), %d current blobs",
-                i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, alarm_blobs);
-            if ( !min_blob_size || bs->count < min_blob_size ) min_blob_size = bs->count;
-            if ( !max_blob_size || bs->count > max_blob_size ) max_blob_size = bs->count;
+                i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, stats.alarm_blobs_);
+            if (!stats.min_blob_size_ || bs->count < stats.min_blob_size_) stats.min_blob_size_ = bs->count;
+            if (!stats.max_blob_size_ || bs->count > stats.max_blob_size_) stats.max_blob_size_ = bs->count;
           }
         } // end if bs_count
       } // end for i < WHITE
 
-      if ( config.record_diag_images )
-        diff_image->WriteJpeg(diag_path, config.record_diag_images_fifo);
+      if (config.record_diag_images)
+        diff_image->WriteJpeg(diag_path.c_str(), config.record_diag_images_fifo);
 
       Debug(5, "Got %d blob pixels, %d blobs, need %d -> %d, %d -> %d",
-          alarm_blob_pixels, alarm_blobs, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs);
+            stats.alarm_blob_pixels_, stats.alarm_blobs_, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs);
 
-      if ( config.record_diag_images_fifo ) {
+      if (config.record_diag_images_fifo) {
         FifoDebug(5, "{\"zone\":%d,\"type\":\"FBLB\",\"pixels\":%d,\"blobs\":%d}",
-            id, alarm_blob_pixels, alarm_blobs);
+                  id, stats.alarm_blob_pixels_, stats.alarm_blobs_);
       }
 
-      if ( alarm_blobs ) {
-        if ( min_blobs && (alarm_blobs < min_blobs) ) {
+      if (stats.alarm_blobs_) {
+        if (min_blobs && (stats.alarm_blobs_ < min_blobs)) {
           /* Not enough pixels alarmed */
+          stats.score_ = 0;
           return false;
-        } else if ( max_blobs && (alarm_blobs > max_blobs) ) {
+        } else if (max_blobs && (stats.alarm_blobs_ > max_blobs)) {
           /* Too many pixels alarmed */
           overload_count = overload_frames;
+          stats.score_ = 0;
           return false;
         }
       } else {
         /* No blobs */
+        stats.score_ = 0;
         return false;
       }
       
-      if ( max_blob_pixels != 0 )
-        score = (100*alarm_blob_pixels)/(max_blob_pixels);
+      if (max_blob_pixels != 0)
+        stats.score_ = (100*stats.alarm_blob_pixels_)/max_blob_pixels;
       else 
-        score = (100*alarm_blob_pixels)/polygon.Area();
+        stats.score_ = (100*stats.alarm_blob_pixels_)/polygon.Area();
       
-      if ( score < 1 )
-        score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
-      Debug(5, "Current score is %d", score);
+      if (stats.score_ < 1)
+        stats.score_ = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
+      Debug(5, "Current score is %d", stats.score_);
 
       alarm_lo_x = polygon.HiX()+1;
       alarm_hi_x = polygon.LoX()-1;
       alarm_lo_y = polygon.HiY()+1;
       alarm_hi_y = polygon.LoY()-1;
 
-      for ( int i = 1; i < WHITE; i++ ) {
+      for (uint32 i = 1; i < kWhite; i++) {
         BlobStats *bs = &blob_stats[i];
-        if ( bs->count ) {
-          if ( bs->count == max_blob_size ) {
-            if ( config.weighted_alarm_centres ) {
+        if (bs->count) {
+          if (bs->count == stats.max_blob_size_) {
+            if (config.weighted_alarm_centres) {
               unsigned long x_total = 0;
               unsigned long y_total = 0;
 
-              for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ ) {
+              for (int sy = bs->lo_y; sy <= bs->hi_y; sy++) {
                 spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
-                for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ ) {
-                  if ( *spdiff == bs->tag ) {
+                for (int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++) {
+                  if (*spdiff == bs->tag) {
                     x_total += sx;
                     y_total += sy;
                   }
                 }
-              }
+              }  // end for sy = lo_y .. hi_y
               alarm_mid_x = int(round(x_total/bs->count));
               alarm_mid_y = int(round(y_total/bs->count));
             } else {
@@ -669,10 +660,10 @@ bool Zone::CheckAlarms(const Image *delta_image) {
             }
           }
 
-          if ( alarm_lo_x > bs->lo_x ) alarm_lo_x = bs->lo_x;
-          if ( alarm_lo_y > bs->lo_y ) alarm_lo_y = bs->lo_y;
-          if ( alarm_hi_x < bs->hi_x ) alarm_hi_x = bs->hi_x;
-          if ( alarm_hi_y < bs->hi_y ) alarm_hi_y = bs->hi_y;
+          if (alarm_lo_x > bs->lo_x) alarm_lo_x = bs->lo_x;
+          if (alarm_lo_y > bs->lo_y) alarm_lo_y = bs->lo_y;
+          if (alarm_hi_x < bs->hi_x) alarm_hi_x = bs->hi_x;
+          if (alarm_hi_y < bs->hi_y) alarm_hi_y = bs->hi_y;
         } // end if bs->count
       } // end for i < WHITE
     } else {
@@ -681,64 +672,64 @@ bool Zone::CheckAlarms(const Image *delta_image) {
     }
   }
 
-  if ( type == INCLUSIVE ) {
+  if (type == INCLUSIVE) {
     // score >>= 1;
-    score /= 2;
-  } else if ( type == EXCLUSIVE ) {
-    // score <<= 1;
-    score *= 2;
+    stats.score_ /= 2;
+  } else if (type == EXCLUSIVE) {
+    // stats.score <<= 1;
+    stats.score_ *= 2;
   }
 
-  Debug(5, "Adjusted score is %d", score);
+  Debug(5, "Adjusted score is %d", stats.score_);
 
   // Now outline the changed region
-  if ( score ) {
-    alarm_box = Box(Coord(alarm_lo_x, alarm_lo_y), Coord(alarm_hi_x, alarm_hi_y));
+  if (stats.score_) {
+    stats.alarm_box_ = Box(Coord(alarm_lo_x, alarm_lo_y), Coord(alarm_hi_x, alarm_hi_y));
 
     //if ( monitor->followMotion() )
     if ( true ) {
-      alarm_centre = Coord(alarm_mid_x, alarm_mid_y);
+      stats.alarm_centre_ = Coord(alarm_mid_x, alarm_mid_y);
     } else {
-      alarm_centre = alarm_box.Centre();
+      stats.alarm_centre_ = stats.alarm_box_.Centre();
     }
 
-    if ( (type < PRECLUSIVE) && (check_method >= BLOBS) && (monitor->GetOptSaveJPEGs() > 1) ) {
+    if ((type < PRECLUSIVE) && (check_method >= BLOBS) && (monitor->GetOptSaveJPEGs() > 1)) {
 
       // First mask out anything we don't want
-      for ( unsigned int y = lo_y; y <= hi_y; y++ ) {
+      for (unsigned int y = lo_y; y <= hi_y; y++) {
         pdiff = diff_buff + ((diff_width * y) + lo_x);
 
         int lo_x2 = ranges[y].lo_x;
         int hi_x2 = ranges[y].hi_x;
 
         int lo_gap = lo_x2-lo_x;
-        if ( lo_gap > 0 ) {
-          if ( lo_gap == 1 ) {
-            *pdiff++ = BLACK;
+        if (lo_gap > 0) {
+          if (lo_gap == 1) {
+            *pdiff++ = kBlack;
           } else {
-            memset(pdiff, BLACK, lo_gap);
+            memset(pdiff, kBlack, lo_gap);
             pdiff += lo_gap;
           }
         }
 
         const uint8_t* ppoly = pg_image->Buffer(lo_x2, y);
-        for ( int x = lo_x2; x <= hi_x2; x++, pdiff++, ppoly++ ) {
-          if ( !*ppoly ) {
-            *pdiff = BLACK;
+        for (int x = lo_x2; x <= hi_x2; x++, pdiff++, ppoly++) {
+          if (!*ppoly) {
+            *pdiff = kBlack;
           }
         }
 
         int hi_gap = hi_x-hi_x2;
-        if ( hi_gap > 0 ) {
-          if ( hi_gap == 1 ) {
-            *pdiff = BLACK;
+        if (hi_gap > 0) {
+          if (hi_gap == 1) {
+            *pdiff = kBlack;
           } else {
-            memset(pdiff, BLACK, hi_gap);
+            memset(pdiff, kBlack, hi_gap);
           }
         }
-      } // end for y
+      }  // end for y
 
-      if ( monitor->Colours() == ZM_COLOUR_GRAY8 ) {
+      if (monitor->Colours() == ZM_COLOUR_GRAY8) {
         image = diff_image->HighlightEdges(alarm_rgb, ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB, &polygon.Extent());
       } else {
         image = diff_image->HighlightEdges(alarm_rgb, monitor->Colours(), monitor->SubpixelOrder(), &polygon.Extent());
@@ -746,79 +737,49 @@ bool Zone::CheckAlarms(const Image *delta_image) {
 
       // Only need to delete this when 'image' becomes detached and points somewhere else
       delete diff_image;
-    } else {
-      delete image;
-      image = 0;
-    }
+      diff_image = nullptr;
+    }  // end if ( (type < PRECLUSIVE) && (check_method >= BLOBS) && (monitor->GetOptSaveJPEGs() > 1)
 
     Debug(1, "%s: Pixel Diff: %d, Alarm Pixels: %d, Filter Pixels: %d, Blob Pixels: %d, Blobs: %d, Score: %d",
-        Label(), pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, score);
-  }
+          Label(), stats.pixel_diff_, stats.alarm_pixels_, stats.alarm_filter_pixels_, stats.alarm_blob_pixels_, stats.alarm_blobs_, stats.score_);
+  }  // end if score
   return true;
 }
 
 bool Zone::ParsePolygonString(const char *poly_string, Polygon &polygon) {
-  Debug(3, "Parsing polygon string '%s'", poly_string);
-
-  char *str_ptr = new char[strlen(poly_string)+1];
-  char *str = str_ptr;
-  strcpy(str, poly_string);
-
-  char *ws;
+  char *str = (char *)poly_string;
   int n_coords = 0;
   int max_n_coords = strlen(str)/4;
   Coord *coords = new Coord[max_n_coords];
-  while( true ) {
-    if ( *str == '\0' ) {
-      break;
-    }
-    ws = strchr(str, ' ');
-    if ( ws ) {
-      *ws = '\0';
-    }
+  while (*str != '\0') {
     char *cp = strchr(str, ',');
-    if ( !cp ) {
+    if (!cp) {
       Error("Bogus coordinate %s found in polygon string", str);
-      delete[] coords;
-      delete[] str_ptr;
-      return false;
-    } else {
-      *cp = '\0';
-      char *xp = str;
-      char *yp = cp+1;
+      break;
+    } 
+    int x = atoi(str);
+    int y = atoi(cp+1);
+    Debug(3, "Got coordinate %d,%d from polygon string", x, y);
+    coords[n_coords++] = Coord(x, y);
 
-      int x = atoi(xp);
-      int y = atoi(yp);
-
-      Debug(3, "Got coordinate %d,%d from polygon string", x, y);
-#if 0
-      if ( x < 0 )
-        x = 0;
-      else if ( x >= width )
-        x = width-1;
-      if ( y < 0 )
-        y = 0;
-      else if ( y >= height )
-        y = height-1;
-#endif
-      coords[n_coords++] = Coord( x, y );
-    }
-    if ( ws )
+    char *ws = strchr(cp+2, ' ');
+    if (ws)
       str = ws+1;
     else
       break;
-  }
-  polygon = Polygon(n_coords, coords);
+  }  // end while ! end of string
 
-  Debug(3, "Successfully parsed polygon string");
-  //printf( "Area: %d\n", pg.Area() );
-  //printf( "Centre: %d,%d\n", pg.Centre().X(), pg.Centre().Y() );
+  if (n_coords > 2) {
+    Debug(3, "Successfully parsed polygon string %s", str);
+    polygon = Polygon(n_coords, coords);
+  } else {
+    Error("Not enough coordinates to form a polygon!");
+    n_coords = 0;
+  }
 
   delete[] coords;
-  delete[] str_ptr;
-
-  return true;
-}
+  return n_coords ? true : false;
+}  // end bool Zone::ParsePolygonString(const char *poly_string, Polygon &polygon)
 
 bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, Polygon &polygon) {
   Debug(3, "Parsing zone string '%s'", zone_string);
@@ -827,13 +788,12 @@ bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, P
   char *str = str_ptr;
   strcpy(str, zone_string);
 
+  zone_id = strtol(str, 0, 10);
+  Debug(3, "Got zone %d from zone string", zone_id);
+
   char *ws = strchr(str, ' ');
   if ( !ws ) {
     Debug(3, "No initial whitespace found in zone string '%s', finishing", str);
-  }
-  zone_id = strtol(str, 0, 10);
-  Debug(3, "Got zone %d from zone string", zone_id);
-  if ( !ws ) {
     delete[] str_ptr;
     return true;
   }
@@ -841,13 +801,11 @@ bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, P
   *ws = '\0';
   str = ws+1;
 
+  colour = strtol(str, 0, 16);
+  Debug(3, "Got colour %06x from zone string", colour);
   ws = strchr(str, ' ');
   if ( !ws ) {
     Debug(3, "No secondary whitespace found in zone string '%s', finishing", zone_string);
-  }
-  colour = strtol(str, 0, 16);
-  Debug(3, "Got colour %06x from zone string", colour);
-  if ( !ws ) {
     delete[] str_ptr;
     return true;
   }
@@ -855,47 +813,40 @@ bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, P
   str = ws+1;
 
   bool result = ParsePolygonString(str, polygon);
-
-  //printf( "Area: %d\n", pg.Area() );
-  //printf( "Centre: %d,%d\n", pg.Centre().X(), pg.Centre().Y() );
-
   delete[] str_ptr;
 
   return result;
-}
+}  // end bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, Polygon &polygon)
 
-int Zone::Load(Monitor *monitor, Zone **&zones) {
-  static char sql[ZM_SQL_MED_BUFSIZ];
+std::vector<Zone> Zone::Load(Monitor *monitor) {
+  std::vector<Zone> zones;
 
-  db_mutex.lock();
-  snprintf(sql, sizeof(sql), "select Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,FilterX,FilterY,MinFilterPixels,MaxFilterPixels,MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,OverloadFrames,ExtendAlarmFrames from Zones where MonitorId = %d order by Type, Id", monitor->Id());
-  if ( mysql_query(&dbconn, sql) ) {
-    Error("Can't run query: %s", mysql_error(&dbconn));
-    db_mutex.unlock();
-    return 0;
+  std::string sql = stringtf("SELECT Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,"
+                             "MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,"
+                             "FilterX,FilterY,MinFilterPixels,MaxFilterPixels,"
+                             "MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,"
+                             "OverloadFrames,ExtendAlarmFrames"
+                             " FROM Zones WHERE MonitorId = %d ORDER BY Type, Id", monitor->Id());
+
+  MYSQL_RES *result = zmDbFetch(sql.c_str());
+  if (!result) {
+    return {};
   }
 
-  MYSQL_RES *result = mysql_store_result( &dbconn );
-  if ( !result ) {
-    Error("Can't use query result: %s", mysql_error(&dbconn));
-    db_mutex.unlock();
-    return 0;
-  }
-  db_mutex.unlock();
-  int n_zones = mysql_num_rows(result);
+  uint32 n_zones = mysql_num_rows(result);
   Debug(1, "Got %d zones for monitor %s", n_zones, monitor->Name());
-  delete[] zones;
-  zones = new Zone *[n_zones];
-  for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
+
+  zones.reserve(n_zones);
+  for (int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++) {
     int col = 0;
 
     int Id = atoi(dbrow[col++]);
     const char *Name = dbrow[col++];
-    int Type = atoi(dbrow[col++]);
+    ZoneType Type = static_cast<ZoneType>(atoi(dbrow[col++]));
     const char *Units = dbrow[col++];
     const char *Coords = dbrow[col++];
     int AlarmRGB = dbrow[col]?atoi(dbrow[col]):0; col++;
-    int CheckMethod = atoi(dbrow[col++]);
+    Zone::CheckMethod CheckMethod = static_cast<Zone::CheckMethod>(atoi(dbrow[col++]));
     int MinPixelThreshold = dbrow[col]?atoi(dbrow[col]):0; col++;
     int MaxPixelThreshold = dbrow[col]?atoi(dbrow[col]):0; col++;
     int MinAlarmPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
@@ -918,16 +869,17 @@ int Zone::Load(Monitor *monitor, Zone **&zones) {
     Polygon polygon;
     if ( !ParsePolygonString(Coords, polygon) ) {
       Error("Unable to parse polygon string '%s' for zone %d/%s for monitor %s, ignoring", Coords, Id, Name, monitor->Name());
-      n_zones -= 1;
       continue;
     }
 
     if ( polygon.LoX() < 0 || polygon.HiX() >= (int)monitor->Width() 
         || polygon.LoY() < 0 || polygon.HiY() >= (int)monitor->Height() ) {
-      Error("Zone %d/%s for monitor %s extends outside of image dimensions, (%d,%d), (%d,%d), ignoring",
+      Error("Zone %d/%s for monitor %s extends outside of image dimensions, (%d,%d), (%d,%d), fixing",
           Id, Name, monitor->Name(), polygon.LoX(), polygon.LoY(), polygon.HiX(), polygon.HiY());
-      n_zones -= 1;
-      continue;
+      if ( polygon.LoX() < 0 ) polygon.LoX(0);
+      if ( polygon.HiX() >= (int)monitor->Width()) polygon.HiX((int)monitor->Width());
+      if ( polygon.LoY() < 0 ) polygon.LoY(0);
+      if ( polygon.HiY() >= (int)monitor->Height() ) polygon.HiY((int)monitor->Height());
     }
 
     if ( false && !strcmp( Units, "Percent" ) ) {
@@ -939,23 +891,30 @@ int Zone::Load(Monitor *monitor, Zone **&zones) {
       MaxBlobPixels = (MaxBlobPixels*polygon.Area())/100;
     }
 
-    if ( atoi(dbrow[2]) == Zone::INACTIVE ) {
-      zones[i] = new Zone(monitor, Id, Name, polygon);
-    } else if ( atoi(dbrow[2]) == Zone::PRIVACY ) {
-      zones[i] = new Zone(monitor, Id, Name, (Zone::ZoneType)Type, polygon);
+    if (atoi(dbrow[2]) == Zone::INACTIVE) {
+      zones.emplace_back(monitor, Id, Name, polygon);
+    } else if (atoi(dbrow[2]) == Zone::PRIVACY) {
+      zones.emplace_back(monitor, Id, Name, Type, polygon);
+    } else {
+      zones.emplace_back(
+          monitor, Id, Name, Type, polygon, AlarmRGB,
+          CheckMethod, MinPixelThreshold, MaxPixelThreshold,
+          MinAlarmPixels, MaxAlarmPixels, Coord(FilterX, FilterY),
+          MinFilterPixels, MaxFilterPixels,
+          MinBlobPixels, MaxBlobPixels, MinBlobs, MaxBlobs,
+          OverloadFrames, ExtendAlarmFrames);
     }
-    zones[i] = new Zone(monitor, Id, Name, (Zone::ZoneType)Type, polygon, AlarmRGB, (Zone::CheckMethod)CheckMethod, MinPixelThreshold, MaxPixelThreshold, MinAlarmPixels, MaxAlarmPixels, Coord( FilterX, FilterY ), MinFilterPixels, MaxFilterPixels, MinBlobPixels, MaxBlobPixels, MinBlobs, MaxBlobs, OverloadFrames, ExtendAlarmFrames);
   } // end foreach row
   mysql_free_result(result);
-  return n_zones;
-} // end int Zone::Load(Monitor *monitor, Zone **&zones)
+  return zones;
+} // end std::vector<Zone> Zone::Load(Monitor *monitor)
 
-bool Zone::DumpSettings(char *output, bool /*verbose*/) {
+bool Zone::DumpSettings(char *output, bool /*verbose*/) const {
   output[0] = 0;
 
-  sprintf( output+strlen(output), "  Id : %d\n", id );
-  sprintf( output+strlen(output), "  Label : %s\n", label );
-  sprintf( output+strlen(output), "  Type: %d - %s\n", type,
+  sprintf(output+strlen(output), "  Id : %d\n", id );
+  sprintf(output+strlen(output), "  Label : %s\n", label.c_str() );
+  sprintf(output+strlen(output), "  Type: %d - %s\n", type,
       type==ACTIVE?"Active":(
         type==INCLUSIVE?"Inclusive":(
           type==EXCLUSIVE?"Exclusive":(
@@ -1015,15 +974,53 @@ void Zone::std_alarmedpixels(
       if ( *ppoly && (*pdiff > min_pixel_threshold) && (*pdiff <= calc_max_pixel_threshold) ) {
         pixelsalarmed++;
         pixelsdifference += *pdiff;
-        *pdiff = WHITE;
+        *pdiff = kWhite;
       } else {
-        *pdiff = BLACK;
+        *pdiff = kBlack;
       }
     }
-  }
+  }  // end for y = lo_y to hi_y
 
   /* Store the results */
   *pixel_count = pixelsalarmed;
   *pixel_sum = pixelsdifference;
   Debug(7, "STORED pixelsalarmed(%d), pixelsdifference(%d)", pixelsalarmed, pixelsdifference);
+}  // end void Zone::std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum)
+
+Zone::Zone(const Zone &z) :
+    monitor(z.monitor),
+    id(z.id),
+    label(z.label),
+    type(z.type),
+    polygon(z.polygon),
+    alarm_rgb(z.alarm_rgb),
+    check_method(z.check_method),
+    min_pixel_threshold(z.min_pixel_threshold),
+    max_pixel_threshold(z.max_pixel_threshold),
+    min_alarm_pixels(z.min_alarm_pixels),
+    max_alarm_pixels(z.max_alarm_pixels),
+    filter_box(z.filter_box),
+    min_filter_pixels(z.min_filter_pixels),
+    max_filter_pixels(z.max_filter_pixels),
+    min_blob_pixels(z.min_blob_pixels),
+    max_blob_pixels(z.max_blob_pixels),
+    min_blobs(z.min_blobs),
+    max_blobs(z.max_blobs),
+    overload_frames(z.overload_frames),
+    extend_alarm_frames(z.extend_alarm_frames),
+    alarmed(z.alarmed),
+    was_alarmed(z.was_alarmed),
+    stats(z.stats),
+    overload_count(z.overload_count),
+    extend_alarm_count(z.extend_alarm_count),
+    diag_path(z.diag_path)
+{
+  std::copy(z.blob_stats, z.blob_stats+256, blob_stats);
+  pg_image = z.pg_image ? new Image(*z.pg_image) : nullptr;
+  ranges = new Range[monitor->Height()];
+  std::copy(z.ranges, z.ranges+monitor->Height(), ranges);
+  image = z.image ? new Image(*z.image) : nullptr;
+  //z.stats.debug("Copy Source");
+  stats.DumpToLog("Copy dest");
 }
+
diff --git a/src/zm_zone.h b/src/zm_zone.h
index 0c7b26a57..30f7e29eb 100644
--- a/src/zm_zone.h
+++ b/src/zm_zone.h
@@ -20,160 +20,216 @@
 #ifndef ZM_ZONE_H
 #define ZM_ZONE_H
 
-#include "zm_rgb.h"
+#include "zm_box.h"
 #include "zm_coord.h"
+#include "zm_define.h"
+#include "zm_config.h"
 #include "zm_poly.h"
-#include "zm_image.h"
-#include "zm_event.h"
+#include "zm_rgb.h"
+#include "zm_zone_stats.h"
 
+#include <algorithm>
+#include <string>
+#include <vector>
+
+class Event;
+class Image;
 class Monitor;
 
 //
 // This describes a 'zone', or an area of an image that has certain
 // detection characteristics.
 //
-class Zone
-{
-protected:
-  struct Range
-  {
-    int lo_x;
-    int hi_x;
-    int off_x;
-  };
 
-public:
-  typedef enum { ACTIVE=1, INCLUSIVE, EXCLUSIVE, PRECLUSIVE, INACTIVE, PRIVACY } ZoneType;
-  typedef enum { ALARMED_PIXELS=1, FILTERED_PIXELS, BLOBS } CheckMethod;
+class Zone {
+  protected:
+    struct Range {
+      int lo_x;
+      int hi_x;
+      int off_x;
+    };
+    typedef struct {
+      unsigned char tag;
+      int count;
+      int lo_x;
+      int hi_x;
+      int lo_y;
+      int hi_y;
+    } BlobStats;
+  public:
+    typedef enum { ACTIVE=1, INCLUSIVE, EXCLUSIVE, PRECLUSIVE, INACTIVE, PRIVACY } ZoneType;
+    typedef enum { ALARMED_PIXELS=1, FILTERED_PIXELS, BLOBS } CheckMethod;
 
-protected:
-  // Inputs
-  Monitor      *monitor;
+  protected:
+    // Inputs
+    Monitor     *monitor;
 
-  int        id;
-  char      *label;
-  ZoneType    type;
-  Polygon      polygon;
-  Rgb        alarm_rgb;
-  CheckMethod    check_method;
+    int         id;
+    std::string label;
+    ZoneType    type;
+    Polygon     polygon;
+    Rgb         alarm_rgb;
+    CheckMethod    check_method;
 
-  int        min_pixel_threshold;
-  int        max_pixel_threshold;
+    int         min_pixel_threshold;
+    int         max_pixel_threshold;
 
-  int        min_alarm_pixels;
-  int        max_alarm_pixels;
+    int         min_alarm_pixels;
+    int         max_alarm_pixels;
 
-  Coord      filter_box;
-  int        min_filter_pixels;
-  int        max_filter_pixels;
+    Coord       filter_box;
+    int         min_filter_pixels;
+    int         max_filter_pixels;
 
-  int        min_blob_pixels;
-  int        max_blob_pixels;
-  int        min_blobs;
-  int        max_blobs;
+    BlobStats   blob_stats[256];
+    int         min_blob_pixels;
+    int         max_blob_pixels;
+    int         min_blobs;
+    int         max_blobs;
 
-  int       overload_frames;
-  int        extend_alarm_frames;
+    int         overload_frames;
+    int         extend_alarm_frames;
 
-  // Outputs/Statistics
-  bool      alarmed;
-  bool      was_alarmed;
-  int        pixel_diff;
-  unsigned int      alarm_pixels;
-  int        alarm_filter_pixels;
-  int        alarm_blob_pixels;
-  int        alarm_blobs;
-  int        min_blob_size;
-  int        max_blob_size;
-  Box        alarm_box;
-  Coord      alarm_centre;
-  unsigned int  score;
-  Image      *pg_image;
-  Range      *ranges;
-  Image      *image;
+    // Outputs/Statistics
+    bool        alarmed;
+    bool        was_alarmed;
+    ZoneStats   stats;
+    Image      *pg_image;
+    Range      *ranges;
+    Image      *image;
 
-  int       overload_count;
-  int       extend_alarm_count;
-  char      diag_path[PATH_MAX];
+    int         overload_count;
+    int         extend_alarm_count;
+    std::string diag_path;
 
-protected:
-  void Setup( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon, const Rgb p_alarm_rgb, CheckMethod p_check_method, int p_min_pixel_threshold, int p_max_pixel_threshold, int p_min_alarm_pixels, int p_max_alarm_pixels, const Coord &p_filter_box, int p_min_filter_pixels, int p_max_filter_pixels, int p_min_blob_pixels, int p_max_blob_pixels, int p_min_blobs, int p_max_blobs, int p_overload_frames, int p_extend_alarm_frames );
-  void std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum);
-  
-public:
-  Zone( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon, const Rgb p_alarm_rgb, CheckMethod p_check_method, int p_min_pixel_threshold=15, int p_max_pixel_threshold=0, int p_min_alarm_pixels=50, int p_max_alarm_pixels=75000, const Coord &p_filter_box=Coord( 3, 3 ), int p_min_filter_pixels=50, int p_max_filter_pixels=50000, int p_min_blob_pixels=10, int p_max_blob_pixels=0, int p_min_blobs=0, int p_max_blobs=0, int p_overload_frames=0, int p_extend_alarm_frames=0 )
-  {
-    Setup( p_monitor, p_id, p_label, p_type, p_polygon, p_alarm_rgb, p_check_method, p_min_pixel_threshold, p_max_pixel_threshold, p_min_alarm_pixels, p_max_alarm_pixels, p_filter_box, p_min_filter_pixels, p_max_filter_pixels, p_min_blob_pixels, p_max_blob_pixels, p_min_blobs, p_max_blobs, p_overload_frames, p_extend_alarm_frames );
-  }
-  Zone( Monitor *p_monitor, int p_id, const char *p_label, const Polygon &p_polygon, const Rgb p_alarm_rgb, CheckMethod p_check_method, int p_min_pixel_threshold=15, int p_max_pixel_threshold=0, int p_min_alarm_pixels=50, int p_max_alarm_pixels=75000, const Coord &p_filter_box=Coord( 3, 3 ), int p_min_filter_pixels=50, int p_max_filter_pixels=50000, int p_min_blob_pixels=10, int p_max_blob_pixels=0, int p_min_blobs=0, int p_max_blobs=0, int p_overload_frames=0, int p_extend_alarm_frames=0)
-  {
-    Setup( p_monitor, p_id, p_label, Zone::ACTIVE, p_polygon, p_alarm_rgb, p_check_method, p_min_pixel_threshold, p_max_pixel_threshold, p_min_alarm_pixels, p_max_alarm_pixels, p_filter_box, p_min_filter_pixels, p_max_filter_pixels, p_min_blob_pixels, p_max_blob_pixels, p_min_blobs, p_max_blobs, p_overload_frames, p_extend_alarm_frames );
-  }
-  Zone( Monitor *p_monitor, int p_id, const char *p_label, const Polygon &p_polygon )
-  {
-    Setup( p_monitor, p_id, p_label, Zone::INACTIVE, p_polygon, RGB_BLACK, (Zone::CheckMethod)0, 0, 0, 0, 0, Coord( 0, 0 ), 0, 0, 0, 0, 0, 0, 0, 0 );
-  }
-  Zone( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon )
-  {
-    Setup( p_monitor, p_id, p_label, p_type, p_polygon, RGB_BLACK, (Zone::CheckMethod)0, 0, 0, 0, 0, Coord( 0, 0 ), 0, 0, 0, 0, 0, 0, 0, 0 );
-  }
+  protected:
+    void Setup(
+        ZoneType p_type,
+        const Polygon &p_polygon,
+        const Rgb p_alarm_rgb,
+        CheckMethod p_check_method,
+        int p_min_pixel_threshold,
+        int p_max_pixel_threshold,
+        int p_min_alarm_pixels,
+        int p_max_alarm_pixels,
+        const Coord &p_filter_box,
+        int p_min_filter_pixels,
+        int p_max_filter_pixels,
+        int p_min_blob_pixels,
+        int p_max_blob_pixels,
+        int p_min_blobs,
+        int p_max_blobs,
+        int p_overload_frames,
+        int p_extend_alarm_frames);
 
-public:
-  ~Zone();
+    void std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum);
 
-  inline int Id() const { return( id ); }
-  inline const char *Label() const { return( label ); }
-  inline ZoneType Type() const { return( type ); }
-  inline bool IsActive() const { return( type == ACTIVE ); }
-  inline bool IsInclusive() const { return( type == INCLUSIVE ); }
-  inline bool IsExclusive() const { return( type == EXCLUSIVE ); }
-  inline bool IsPreclusive() const { return( type == PRECLUSIVE ); }
-  inline bool IsInactive() const { return( type == INACTIVE ); }
-  inline bool IsPrivacy() const { return( type == PRIVACY ); }
-  inline const Image *AlarmImage() const { return( image ); }
-  inline const Polygon &GetPolygon() const { return( polygon ); }
-  inline bool Alarmed() const { return( alarmed ); }
-	inline bool WasAlarmed() const { return( was_alarmed ); }
-	inline void SetAlarm() { was_alarmed = alarmed; alarmed = true; }
-	inline void ClearAlarm() { was_alarmed = alarmed; alarmed = false; }
-  inline Coord GetAlarmCentre() const { return( alarm_centre ); }
-  inline unsigned int Score() const { return( score ); }
+  public:
+    Zone(
+        Monitor *p_monitor,
+        int p_id,
+        const char *p_label,
+        ZoneType p_type,
+        const Polygon &p_polygon,
+        const Rgb p_alarm_rgb,
+        CheckMethod p_check_method,
+        int p_min_pixel_threshold=15,
+        int p_max_pixel_threshold=0,
+        int p_min_alarm_pixels=50,
+        int p_max_alarm_pixels=75000,
+        const Coord &p_filter_box=Coord( 3, 3 ),
+        int p_min_filter_pixels=50,
+        int p_max_filter_pixels=50000,
+        int p_min_blob_pixels=10,
+        int p_max_blob_pixels=0,
+        int p_min_blobs=0,
+        int p_max_blobs=0,
+        int p_overload_frames=0,
+        int p_extend_alarm_frames=0)
+          :
+            monitor(p_monitor),
+            id(p_id),
+            label(p_label),
+            blob_stats{},
+            stats(p_id)
+    {
+      Setup(p_type, p_polygon, p_alarm_rgb, p_check_method, p_min_pixel_threshold, p_max_pixel_threshold, p_min_alarm_pixels, p_max_alarm_pixels, p_filter_box, p_min_filter_pixels, p_max_filter_pixels, p_min_blob_pixels, p_max_blob_pixels, p_min_blobs, p_max_blobs, p_overload_frames, p_extend_alarm_frames );
+    }
 
-  inline void ResetStats()
-  {
-    alarmed = false;
-		was_alarmed = false;
-    pixel_diff = 0;
-    alarm_pixels = 0;
-    alarm_filter_pixels = 0;
-    alarm_blob_pixels = 0;
-    alarm_blobs = 0;
-    min_blob_size = 0;
-    max_blob_size = 0;
-    score = 0;
-  }
-  void RecordStats( const Event *event );
-  bool CheckAlarms( const Image *delta_image );
-  bool DumpSettings( char *output, bool verbose );
+    Zone(Monitor *p_monitor, int p_id, const char *p_label, const Polygon &p_polygon)
+      :
+        monitor(p_monitor),
+        id(p_id),
+        label(p_label),
+        blob_stats{},
+        stats(p_id)
+    {
+      Setup(Zone::INACTIVE, p_polygon, kRGBBlack, (Zone::CheckMethod)0, 0, 0, 0, 0, Coord(0, 0), 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+    Zone(Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon)
+      :
+        monitor(p_monitor),
+        id(p_id),
+        label(p_label),
+        blob_stats{},
+        stats(p_id)
+    {
+      Setup(p_type, p_polygon, kRGBBlack, (Zone::CheckMethod)0, 0, 0, 0, 0, Coord( 0, 0 ), 0, 0, 0, 0, 0, 0, 0, 0 );
+    }
 
-  static bool ParsePolygonString( const char *polygon_string, Polygon &polygon );
-  static bool ParseZoneString( const char *zone_string, int &zone_id, int &colour, Polygon &polygon );
-  static int Load( Monitor *monitor, Zone **&zones );
-  //=================================================
-  bool CheckOverloadCount();
-  int GetOverloadCount();
-  void SetOverloadCount(int nOverCount);
-  int GetOverloadFrames();
-  //=================================================
-  bool CheckExtendAlarmCount();
-  int GetExtendAlarmCount();
-  void SetExtendAlarmCount(int nOverCount);
-  int GetExtendAlarmFrames();
-  void SetScore(unsigned int nScore);
-  void SetAlarmImage(const Image* srcImage);
+    Zone(const Zone &z);
+    ~Zone();
 
-  inline const Image *getPgImage() const { return( pg_image ); }
-  inline const Range *getRanges() const { return( ranges ); }
+    inline int Id() const { return id; }
+    inline const char *Label() const { return label.c_str(); }
+    inline ZoneType Type() const { return type; }
+    inline bool IsActive() const { return( type == ACTIVE ); }
+    inline bool IsInclusive() const { return( type == INCLUSIVE ); }
+    inline bool IsExclusive() const { return( type == EXCLUSIVE ); }
+    inline bool IsPreclusive() const { return( type == PRECLUSIVE ); }
+    inline bool IsInactive() const { return( type == INACTIVE ); }
+    inline bool IsPrivacy() const { return( type == PRIVACY ); }
+    inline const Image *AlarmImage() const { return image; }
+    inline const Polygon &GetPolygon() const { return polygon; }
+    inline bool Alarmed() const { return alarmed; }
+    inline bool WasAlarmed() const { return was_alarmed; }
+    inline void SetAlarm() { was_alarmed = alarmed; alarmed = true; }
+    inline void ClearAlarm() { was_alarmed = alarmed; alarmed = false; }
+    inline Coord GetAlarmCentre() const { return stats.alarm_centre_; }
+    inline unsigned int Score() const { return stats.score_; }
+
+    inline void ResetStats() {
+      alarmed = false;
+      was_alarmed = false;
+      stats.Reset();
+    }
+    void RecordStats( const Event *event );
+    ZoneStats const &GetStats() const {
+      stats.DumpToLog("GetStats");
+      return stats;
+    };
+
+    bool CheckAlarms(const Image *delta_image);
+    bool DumpSettings(char *output, bool verbose) const;
+
+    static bool ParsePolygonString( const char *polygon_string, Polygon &polygon );
+    static bool ParseZoneString( const char *zone_string, int &zone_id, int &colour, Polygon &polygon );
+    static std::vector<Zone> Load(Monitor *monitor);
+    //=================================================
+    bool CheckOverloadCount();
+    int GetOverloadCount();
+    void SetOverloadCount(int nOverCount);
+    int GetOverloadFrames();
+    //=================================================
+    bool CheckExtendAlarmCount();
+    int GetExtendAlarmCount();
+    void SetExtendAlarmCount(int nOverCount);
+    int GetExtendAlarmFrames();
+    void SetScore(unsigned int nScore);
+    void SetAlarmImage(const Image* srcImage);
+
+    inline const Image *getPgImage() const { return pg_image; }
+    inline const Range *getRanges() const { return ranges; }
 };
 
 #endif // ZM_ZONE_H
diff --git a/src/zm_zone_stats.h b/src/zm_zone_stats.h
new file mode 100644
index 000000000..f963a0eb4
--- /dev/null
+++ b/src/zm_zone_stats.h
@@ -0,0 +1,94 @@
+//
+// ZoneMinder Zone Stats Class Interfaces, $Date$, $Revision$
+// Copyright (C) 2021 Isaac Connor
+// 
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// 
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+// 
+
+#ifndef ZM_ZONE_STATS_H
+#define ZM_ZONE_STATS_H
+
+#include "zm_box.h"
+#include "zm_coord.h"
+#include "zm_logger.h"
+
+class ZoneStats {
+ public:
+  explicit ZoneStats(int zone_id) :
+      zone_id_(zone_id),
+      pixel_diff_(0),
+      alarm_pixels_(0),
+      alarm_filter_pixels_(0),
+      alarm_blob_pixels_(0),
+      alarm_blobs_(0),
+      min_blob_size_(0),
+      max_blob_size_(0),
+      alarm_box_({}),
+      alarm_centre_({}),
+      score_(0) {};
+
+  void Reset() {
+    pixel_diff_ = 0;
+    alarm_pixels_ = 0;
+    alarm_filter_pixels_ = 0;
+    alarm_blob_pixels_ = 0;
+    alarm_blobs_ = 0;
+    min_blob_size_ = 0;
+    max_blob_size_ = 0;
+    alarm_box_.LoX(0);
+    alarm_box_.LoY(0);
+    alarm_box_.HiX(0);
+    alarm_box_.HiY(0);
+    alarm_centre_ = {};
+    score_ = 0;
+  }
+
+  void DumpToLog(const char *prefix) const {
+    Debug(1,
+          "ZoneStat: %s zone_id: %d pixel_diff=%d alarm_pixels=%d alarm_filter_pixels=%d alarm_blob_pixels=%d alarm_blobs=%d min_blob_size=%d max_blob_size=%d alarm_box=(%d,%d=>%d,%d) alarm_center=(%d,%d) score=%d",
+          prefix,
+          zone_id_,
+          pixel_diff_,
+          alarm_pixels_,
+          alarm_filter_pixels_,
+          alarm_blob_pixels_,
+          alarm_blobs_,
+          min_blob_size_,
+          max_blob_size_,
+          alarm_box_.LoX(),
+          alarm_box_.LoY(),
+          alarm_box_.HiX(),
+          alarm_box_.HiY(),
+          alarm_centre_.X(),
+          alarm_centre_.Y(),
+          score_
+    );
+  }
+
+ public:
+  int zone_id_;
+  int pixel_diff_;
+  unsigned int alarm_pixels_;
+  int alarm_filter_pixels_;
+  int alarm_blob_pixels_;
+  int alarm_blobs_;
+  int min_blob_size_;
+  int max_blob_size_;
+  Box alarm_box_;
+  Coord alarm_centre_;
+  unsigned int score_;
+};
+
+#endif // ZM_ZONE_STATS_H
diff --git a/src/zma.cpp b/src/zma.cpp
deleted file mode 100644
index edaf9c722..000000000
--- a/src/zma.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-//
-// ZoneMinder Analysis Daemon, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-/*
-
-=head1 NAME
-
-zma - The ZoneMinder Analysis daemon
-
-=head1 SYNOPSIS
-
- zma -m <monitor_id>
- zma --monitor <monitor_id>
- zma -h
- zma --help
- zma -v
- zma --version
-
-=head1 DESCRIPTION
-
-This is the component that goes through the captured frames and checks them
-for motion which might generate an alarm or event. It generally keeps up with
-the Capture daemon but if very busy may skip some frames to prevent it falling
-behind.
-
-=head1 OPTIONS
-
- -m, --monitor_id         - ID of the monitor to analyse
- -h, --help             - Display usage information
- -v, --version          - Print the installed version of ZoneMinder
-
-=cut
-
-*/
-
-#include <getopt.h>
-#include <signal.h>
-
-#include "zm.h"
-#include "zm_db.h"
-#include "zm_signal.h"
-#include "zm_monitor.h"
-#include "zm_fifo.h"
-
-void Usage() {
-  fprintf(stderr, "zma -m <monitor_id>\n");
-  fprintf(stderr, "Options:\n");
-  fprintf(stderr, "  -m, --monitor <monitor_id>   : Specify which monitor to use\n");
-  fprintf(stderr, "  -h, --help           : This screen\n");
-  fprintf(stderr, "  -v, --version        : Report the installed version of ZoneMinder\n");
-  exit(0);
-}
-
-int main( int argc, char *argv[] ) {
-  self = argv[0];
-
-  srand(getpid() * time(nullptr));
-
-  int id = -1;
-
-  static struct option long_options[] = {
-    {"monitor", 1, nullptr, 'm'},
-    {"help", 0, nullptr, 'h'},
-    {"version", 0, nullptr, 'v'},
-    {nullptr, 0, nullptr, 0}
-  };
-
-  while (1) {
-    int option_index = 0;
-
-    int c = getopt_long(argc, argv, "m:h:v", long_options, &option_index);
-    if ( c == -1 ) {
-      break;
-    }
-
-    switch (c) {
-      case 'm':
-        id = atoi(optarg);
-        break;
-      case 'h':
-      case '?':
-        Usage();
-        break;
-      case 'v':
-        std::cout << ZM_VERSION << "\n";
-        exit(0);
-      default:
-        //fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
-        break;
-    }
-  }
-
-  if (optind < argc) {
-    fprintf(stderr, "Extraneous options, ");
-    while (optind < argc)
-      printf("%s ", argv[optind++]);
-    printf("\n");
-    Usage();
-  }
-
-  if ( id < 0 ) {
-    fprintf(stderr, "Bogus monitor %d\n", id);
-    Usage();
-    exit(0);
-  }
-
-  char log_id_string[16];
-  snprintf(log_id_string, sizeof(log_id_string), "zma_m%d", id);
-
-  zmLoadConfig();
-
-  logInit(log_id_string);
-
-  hwcaps_detect();
-
-  Monitor *monitor = Monitor::Load(id, true, Monitor::ANALYSIS);
-  zmFifoDbgInit( monitor );  
-
-  if ( monitor ) {
-    Info("In mode %d/%d, warming up", monitor->GetFunction(), monitor->Enabled());
-
-    zmSetDefaultHupHandler();
-    zmSetDefaultTermHandler();
-    zmSetDefaultDieHandler();
-
-    sigset_t block_set;
-    sigemptyset(&block_set);
-
-    useconds_t analysis_rate = monitor->GetAnalysisRate();
-    unsigned int analysis_update_delay = monitor->GetAnalysisUpdateDelay();
-    time_t last_analysis_update_time, cur_time;
-    monitor->UpdateAdaptiveSkip();
-    last_analysis_update_time = time(nullptr);
-
-    while( (!zm_terminate) && monitor->ShmValid() ) {
-      // Process the next image
-      sigprocmask(SIG_BLOCK, &block_set, nullptr);
-
-      // Some periodic updates are required for variable capturing framerate
-      if ( analysis_update_delay ) {
-        cur_time = time(nullptr);
-        if ( (unsigned int)( cur_time - last_analysis_update_time ) > analysis_update_delay ) {
-          analysis_rate = monitor->GetAnalysisRate();
-          monitor->UpdateAdaptiveSkip();
-          last_analysis_update_time = cur_time;
-        }
-      }
-
-      if ( !monitor->Analyse() ) {
-        usleep(monitor->Active()?ZM_SAMPLE_RATE:ZM_SUSPENDED_RATE);
-      } else if ( analysis_rate ) {
-        usleep(analysis_rate);
-      }
-
-      if ( zm_reload ) {
-        monitor->Reload();
-        logTerm();
-        logInit(log_id_string);
-        zm_reload = false;
-      }
-      sigprocmask(SIG_UNBLOCK, &block_set, nullptr);
-    } // end while ! zm_terminate
-    delete monitor;
-  } else {
-    fprintf(stderr, "Can't find monitor with id of %d\n", id);
-  }
-  Image::Deinitialise();
-  logTerm();
-  zmDbClose();
-  return 0;
-}
diff --git a/src/zmc.cpp b/src/zmc.cpp
index 8376c91ba..c2ee0a071 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -53,35 +53,31 @@ possible, this should run at more or less constant speed.
 
 */
 
-#include <getopt.h>
-#include <signal.h>
-#if defined(__FreeBSD__)
-#include <limits.h>
-#else
-#include <values.h>
-#endif
-
-#if !defined(MAXINT)
-#define MAXINT INT_MAX
-#endif
-
 #include "zm.h"
+#include "zm_camera.h"
 #include "zm_db.h"
-#include "zm_time.h"
-#include "zm_signal.h"
+#include "zm_define.h"
+#include "zm_fifo.h"
 #include "zm_monitor.h"
+#include "zm_rtsp_server_thread.h"
+#include "zm_signal.h"
+#include "zm_time.h"
+#include "zm_utils.h"
+#include <getopt.h>
+#include <iostream>
+#include <unistd.h>
 
 void Usage() {
   fprintf(stderr, "zmc -d <device_path> or -r <proto> -H <host> -P <port> -p <path> or -f <file_path> or -m <monitor_id>\n");
 
   fprintf(stderr, "Options:\n");
 #if defined(BSD)
-  fprintf(stderr, "  -d, --device <device_path>         : For local cameras, device to access. E.g /dev/bktr0 etc\n");
+  fprintf(stderr, "  -d, --device <device_path> : For local cameras, device to access. E.g /dev/bktr0 etc\n");
 #else
-  fprintf(stderr, "  -d, --device <device_path>         : For local cameras, device to access. E.g /dev/video0 etc\n");
+  fprintf(stderr, "  -d, --device <device_path> : For local cameras, device to access. E.g /dev/video0 etc\n");
 #endif
-  fprintf(stderr, "  -f, --file <file_path>           : For local images, jpg file to access.\n");
-  fprintf(stderr, "  -m, --monitor <monitor_id>         : For sources associated with a single monitor\n");
+  fprintf(stderr, "  -f, --file <file_path>     : For local images, jpg file to access.\n");
+  fprintf(stderr, "  -m, --monitor <monitor_id> : For sources associated with a single monitor\n");
   fprintf(stderr, "  -h, --help                 : This screen\n");
   fprintf(stderr, "  -v, --version              : Report the installed version of ZoneMinder\n");
   exit(0);
@@ -188,36 +184,37 @@ int main(int argc, char *argv[]) {
   }
 
   logInit(log_id_string);
-  zmLoadConfig();
+  zmLoadStaticConfig();
+  zmDbConnect();
+  zmLoadDBConfig();
   logInit(log_id_string);
 
-  hwcaps_detect();
+  HwCapsDetect();
 
-  Monitor **monitors = nullptr;
-  int n_monitors = 0;
+  std::vector<std::shared_ptr<Monitor>> monitors;
 #if ZM_HAS_V4L
   if ( device[0] ) {
-    n_monitors = Monitor::LoadLocalMonitors(device, monitors, Monitor::CAPTURE);
+    monitors = Monitor::LoadLocalMonitors(device, Monitor::CAPTURE);
   } else
 #endif  // ZM_HAS_V4L
   if ( host[0] ) {
     if ( !port )
       port = "80";
-    n_monitors = Monitor::LoadRemoteMonitors(protocol, host, port, path, monitors, Monitor::CAPTURE);
+    monitors = Monitor::LoadRemoteMonitors(protocol, host, port, path, Monitor::CAPTURE);
   } else if ( file[0] ) {
-    n_monitors = Monitor::LoadFileMonitors(file, monitors, Monitor::CAPTURE);
+    monitors = Monitor::LoadFileMonitors(file, Monitor::CAPTURE);
   } else {
-    Monitor *monitor = Monitor::Load(monitor_id, true, Monitor::CAPTURE);
+    std::shared_ptr<Monitor> monitor = Monitor::Load(monitor_id, true, Monitor::CAPTURE);
     if ( monitor ) {
-      monitors = new Monitor *[1];
-      monitors[0] = monitor;
-      n_monitors = 1;
+      monitors.push_back(monitor);
     }
   }
 
-  if ( !n_monitors ) {
+  if (monitors.empty()) {
     Error("No monitors found");
     exit(-1);
+  } else {
+	  Debug(2, "%zu monitors loaded", monitors.size());
   }
 
   Info("Starting Capture version %s", ZM_VERSION);
@@ -233,148 +230,159 @@ int main(int argc, char *argv[]) {
   sigaddset(&block_set, SIGUSR2);
 
   int result = 0;
-
   int prime_capture_log_count = 0;
 
-  while ( !zm_terminate ) {
+  while (!zm_terminate) {
     result = 0;
     static char sql[ZM_SQL_SML_BUFSIZ];
-    for ( int i = 0; i < n_monitors; i++ ) {
+
+    for (const std::shared_ptr<Monitor> &monitor : monitors) {
+      monitor->LoadCamera();
+
+      if (!monitor->connect()) {
+        Warning("Couldn't connect to monitor %d", monitor->Id());
+      }
       time_t now = (time_t)time(nullptr);
-      monitors[i]->setStartupTime(now);
+      monitor->setStartupTime(now);
+      monitor->setHeartbeatTime(now);
+
+      snprintf(sql, sizeof(sql), 
+          "INSERT INTO Monitor_Status (MonitorId,Status,CaptureFPS,AnalysisFPS)"
+          " VALUES (%u, 'Running',0,0) ON DUPLICATE KEY UPDATE Status='Running',CaptureFPS=0,AnalysisFPS=0",
+          monitor->Id());
+      zmDbDo(sql);
+
+      int sleep_time = 0;
+      while (monitor->PrimeCapture() <= 0) {
+        if (prime_capture_log_count % 60) {
+          logPrintf(Logger::ERROR+monitor->Importance(),
+              "Failed to prime capture of initial monitor");
+        } else {
+          Debug(1, "Failed to prime capture of initial monitor");
+        }
+        prime_capture_log_count ++;
+        if (zm_terminate) break;
+        if (sleep_time < 60) sleep_time++;
+        sleep(sleep_time);
+      }
+      if (zm_terminate) break;
 
       snprintf(sql, sizeof(sql),
-          "REPLACE INTO Monitor_Status (MonitorId, Status) VALUES ('%d','Running')",
-          monitors[i]->Id());
-      if ( mysql_query(&dbconn, sql) ) {
-        Error("Can't run query: %s", mysql_error(&dbconn));
-      }
+          "INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%u, 'Connected') ON DUPLICATE KEY UPDATE Status='Connected'",
+               monitor->Id());
+      zmDbDo(sql);
     }  // end foreach monitor
+    if (zm_terminate) break;
 
-    // Outer primary loop, handles connection to camera
-    if ( monitors[0]->PrimeCapture() < 0 ) {
-      if ( prime_capture_log_count % 60 ) {
-        Error("Failed to prime capture of initial monitor");
-      } else {
-        Debug(1, "Failed to prime capture of initial monitor");
-      }
-      prime_capture_log_count ++;
-      if ( !zm_terminate )
-        sleep(10);
-      continue;
-    }
+    int *capture_delays = new int[monitors.size()];
+    int *alarm_capture_delays = new int[monitors.size()];
+    struct timeval * last_capture_times = new struct timeval[monitors.size()];
 
-    int *capture_delays = new int[n_monitors];
-    int *alarm_capture_delays = new int[n_monitors];
-    int *next_delays = new int[n_monitors];
-    struct timeval * last_capture_times = new struct timeval[n_monitors];
-    for ( int i = 0; i < n_monitors; i++ ) {
+    for (size_t i = 0; i < monitors.size(); i++) {
       last_capture_times[i].tv_sec = last_capture_times[i].tv_usec = 0;
       capture_delays[i] = monitors[i]->GetCaptureDelay();
       alarm_capture_delays[i] = monitors[i]->GetAlarmCaptureDelay();
-      snprintf(sql, sizeof(sql),
-          "REPLACE INTO Monitor_Status (MonitorId, Status) VALUES ('%d','Connected')",
-          monitors[i]->Id());
-      if ( mysql_query(&dbconn, sql) ) {
-        Error("Can't run query: %s", mysql_error(&dbconn));
-      }
-    } // end foreach monitor
+      Debug(2, "capture delay(%u mSecs 1000/capture_fps) alarm delay(%u)",
+          capture_delays[i], alarm_capture_delays[i]);
+    }
 
     struct timeval now;
     struct DeltaTimeval delta_time;
-    while ( !zm_terminate ) {
+    int sleep_time = 0;
+
+    while (!zm_terminate) {
       //sigprocmask(SIG_BLOCK, &block_set, 0);
-      for ( int i = 0; i < n_monitors; i++ ) {
-        long min_delay = MAXINT;
+      for (size_t i = 0; i < monitors.size(); i++) {
+        monitors[i]->CheckAction();
 
-        gettimeofday(&now, nullptr);
-        for ( int j = 0; j < n_monitors; j++ ) {
-          if ( last_capture_times[j].tv_sec ) {
-            DELTA_TIMEVAL(delta_time, now, last_capture_times[j], DT_PREC_3);
-            if ( monitors[i]->GetState() == Monitor::ALARM )
-              next_delays[j] = alarm_capture_delays[j]-delta_time.delta;
-            else
-              next_delays[j] = capture_delays[j]-delta_time.delta;
-            if ( next_delays[j] < 0 )
-              next_delays[j] = 0;
-          } else {
-            next_delays[j] = 0;
-          }
-          if ( next_delays[j] <= min_delay ) {
-            min_delay = next_delays[j];
-          }
-        }  // end foreach monitor
-
-        if ( next_delays[i] <= min_delay || next_delays[i] <= 0 ) {
-          if ( monitors[i]->PreCapture() < 0 ) {
-            Error("Failed to pre-capture monitor %d %s (%d/%d)",
-                monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors);
-            monitors[i]->Close();
-            result = -1;
-            break;
-          }
-          if ( monitors[i]->Capture() < 0 ) {
-            Info("Failed to capture image from monitor %d %s (%d/%d)",
-                monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors);
-            monitors[i]->Close();
-            result = -1;
-            break;
-          }
-          if ( monitors[i]->PostCapture() < 0 ) {
-            Error("Failed to post-capture monitor %d %s (%d/%d)",
-                monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors);
-            monitors[i]->Close();
-            result = -1;
-            break;
-          }
-
-          if ( next_delays[i] > 0 ) {
-            gettimeofday(&now, nullptr);
-            DELTA_TIMEVAL(delta_time, now, last_capture_times[i], DT_PREC_3);
-            long sleep_time = next_delays[i]-delta_time.delta;
-            if ( sleep_time > 0 ) {
-              usleep(sleep_time*(DT_MAXGRAN/DT_PREC_3));
-            }
-          }
-          gettimeofday(&(last_capture_times[i]), nullptr);
-        }  // end if next_delay <= min_delay || next_delays[i] <= 0 )
-
-      }  // end foreach n_monitors
-      //sigprocmask(SIG_UNBLOCK, &block_set, 0);
-      if ( zm_reload ) {
-        for ( int i = 0; i < n_monitors; i++ ) {
-          monitors[i]->Reload();
+        if (monitors[i]->PreCapture() < 0) {
+          Error("Failed to pre-capture monitor %d %s (%zu/%zu)",
+                monitors[i]->Id(), monitors[i]->Name(), i + 1, monitors.size());
+          result = -1;
+          break;
         }
-        logTerm();
-        logInit(log_id_string);
-        zm_reload = false;
-      }
-      if ( result < 0 ) {
+        if (monitors[i]->Capture() < 0) {
+          Error("Failed to capture image from monitor %d %s (%zu/%zu)",
+                monitors[i]->Id(), monitors[i]->Name(), i + 1, monitors.size());
+          result = -1;
+          break;
+        }
+        if (monitors[i]->PostCapture() < 0) {
+          Error("Failed to post-capture monitor %d %s (%zu/%zu)",
+                monitors[i]->Id(), monitors[i]->Name(), i + 1, monitors.size());
+          result = -1;
+          break;
+        }
+
+        // capture_delay is the amount of time we should sleep in useconds to achieve the desired framerate.
+        int delay = (monitors[i]->GetState() == Monitor::ALARM) ? alarm_capture_delays[i] : capture_delays[i];
+        if (delay) {
+          gettimeofday(&now, nullptr);
+          if (last_capture_times[i].tv_sec) {
+            // DT_PREC_3 means that the value will be in thousands of a second
+            DELTA_TIMEVAL(delta_time, now, last_capture_times[i], DT_PREC_6);
+
+            // You have to add back in the previous sleep time
+            sleep_time = delay - (delta_time.delta - sleep_time);
+            Debug(4,
+                  "Sleep time is %d from now: %" PRIi64 ".%" PRIi64" last: %" PRIi64 ".% " PRIi64 " delta %lu delay: %d",
+                  sleep_time,
+                  static_cast<int64>(now.tv_sec),
+                  static_cast<int64>(now.tv_usec),
+                  static_cast<int64>(last_capture_times[i].tv_sec),
+                  static_cast<int64>(last_capture_times[i].tv_usec),
+                  delta_time.delta,
+                  delay);
+
+            if (sleep_time > 0) {
+              Debug(4, "usleeping (%d)", sleep_time);
+              usleep(sleep_time);
+            }
+          }  // end if has a last_capture time
+          last_capture_times[i] = now;
+        }  // end if delay
+      }  // end foreach n_monitors
+
+      if ((result < 0) or zm_reload) {
         // Failure, try reconnecting
-				sleep(5);
         break;
       }
-    }  // end while ! zm_terminate
+    }  // end while ! zm_terminate and connected
+
+    for (size_t i = 0; i < monitors.size(); i++) {
+      monitors[i]->Close();
+      monitors[i]->disconnect();
+    }
+
     delete [] alarm_capture_delays;
     delete [] capture_delays;
-    delete [] next_delays;
     delete [] last_capture_times;
-  } // end while ! zm_terminate outer connection loop
 
-  for ( int i = 0; i < n_monitors; i++ ) {
+    if (zm_reload) {
+      for (std::shared_ptr<Monitor> &monitor : monitors) {
+        monitor->Reload();
+      }
+      logTerm();
+      logInit(log_id_string);
+      
+      zm_reload = false;
+    }  // end if zm_reload
+  }  // end while ! zm_terminate outer connection loop
+
+  Debug(1,"Updating Monitor status");
+
+  for (std::shared_ptr<Monitor> &monitor : monitors) {
     static char sql[ZM_SQL_SML_BUFSIZ];
     snprintf(sql, sizeof(sql),
-        "REPLACE INTO Monitor_Status (MonitorId, Status) VALUES ('%d','NotRunning')",
-        monitors[i]->Id());
-    if ( mysql_query(&dbconn, sql) ) {
-      Error("Can't run query: %s", mysql_error(&dbconn));
-    }
-    delete monitors[i];
+        "INSERT INTO Monitor_Status (MonitorId,Status) VALUES (%u, 'NotRunning') ON DUPLICATE KEY UPDATE Status='NotRunning'", 
+        monitor->Id());
+    zmDbDo(sql);
   }
-  delete [] monitors;
 
   Image::Deinitialise();
+  Debug(1, "terminating");
   logTerm();
+  dbQueue.stop();
   zmDbClose();
 
 	return zm_terminate ? 0 : result;
diff --git a/src/zms.cpp b/src/zms.cpp
index 9b661c564..d98f24418 100644
--- a/src/zms.cpp
+++ b/src/zms.cpp
@@ -17,19 +17,15 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-#include <sys/ipc.h>
-#include <sys/msg.h>
-#include <cinttypes>
-#include <string>
-
 #include "zm.h"
 #include "zm_db.h"
 #include "zm_user.h"
 #include "zm_signal.h"
-#include "zm_monitor.h"
 #include "zm_monitorstream.h"
 #include "zm_eventstream.h"
-#include "zm_fifo.h"
+#include "zm_fifo_stream.h"
+#include <string>
+#include <unistd.h>
 
 bool ValidateAccess(User *user, int mon_id) {
   bool allowed = true;
@@ -86,100 +82,107 @@ int main(int argc, const char *argv[], char **envp) {
     nph = true;
   }
 
-  zmLoadConfig();
   char log_id_string[32] = "zms";
   logInit(log_id_string);
+  zmLoadStaticConfig();
+  zmDbConnect();
+  zmLoadDBConfig();
+  logInit(log_id_string);
+
   for (char **env = envp; *env != 0; env++) {
     char *thisEnv = *env;
     Debug(1, "env: %s", thisEnv);
   }
 
   const char *query = getenv("QUERY_STRING");
-  if ( query ) {
-    Debug(1, "Query: %s", query);
-
-    char temp_query[1024];
-    strncpy(temp_query, query, sizeof(temp_query)-1);
-    char *q_ptr = temp_query;
-    char *parms[16];  // Shouldn't be more than this
-    int parm_no = 0;
-    while ( (parm_no < 16) && (parms[parm_no] = strtok(q_ptr, "&")) ) {
-      parm_no++;
-      q_ptr = nullptr;
-    }
-
-    for ( int p = 0; p < parm_no; p++ ) {
-      char *name = strtok(parms[p], "=");
-      char const *value = strtok(nullptr, "=");
-      if ( !value )
-        value = "";
-      if ( !strcmp(name, "source") ) {
-        source = !strcmp(value, "event")?ZMS_EVENT:ZMS_MONITOR;
-        if ( !strcmp(value, "fifo") )
-          source = ZMS_FIFO;
-      } else if ( !strcmp(name, "mode") ) {
-        mode = !strcmp(value, "jpeg")?ZMS_JPEG:ZMS_MPEG;
-        mode = !strcmp(value, "raw")?ZMS_RAW:mode;
-        mode = !strcmp(value, "zip")?ZMS_ZIP:mode;
-        mode = !strcmp(value, "single")?ZMS_SINGLE:mode;
-      } else if ( !strcmp(name, "format") ) {
-        strncpy( format, value, sizeof(format) );
-      } else if ( !strcmp(name, "monitor") ) {
-        monitor_id = atoi(value);
-        if ( source == ZMS_UNKNOWN )
-          source = ZMS_MONITOR;
-      } else if ( !strcmp(name, "time") ) {
-        event_time = atoi(value);
-      } else if ( !strcmp(name, "event") ) {
-        event_id = strtoull(value, nullptr, 10);
-        source = ZMS_EVENT;
-      } else if ( !strcmp(name, "frame") ) {
-        frame_id = strtoull(value, nullptr, 10);
-        source = ZMS_EVENT;
-      } else if ( !strcmp(name, "scale") ) {
-        scale = atoi(value);
-      } else if ( !strcmp(name, "rate") ) {
-        rate = atoi(value);
-      } else if ( !strcmp(name, "maxfps") ) {
-        maxfps = atof(value);
-      } else if ( !strcmp(name, "bitrate") ) {
-        bitrate = atoi(value);
-      } else if ( !strcmp(name, "ttl") ) {
-        ttl = atoi(value);
-      } else if ( !strcmp(name, "replay") ) {
-        if ( !strcmp(value, "gapless") ) {
-          replay = EventStream::MODE_ALL_GAPLESS;
-        } else if ( !strcmp(value, "all") ) {
-          replay = EventStream::MODE_ALL;
-        } else if ( !strcmp(value, "none") ) {
-          replay = EventStream::MODE_NONE;
-        } else if ( !strcmp(value, "single") ) {
-          replay = EventStream::MODE_SINGLE;
-        } else {
-          Error("Unsupported value %s for replay, defaulting to none", value);
-        }
-      } else if ( !strcmp(name, "connkey") ) {
-        connkey = atoi(value);
-      } else if ( !strcmp(name, "buffer") ) {
-        playback_buffer = atoi(value);
-      } else if ( !strcmp(name, "auth") ) {
-        strncpy(auth, value, sizeof(auth)-1);
-      } else if ( !strcmp(name, "token") ) {
-        jwt_token_str = value;
-        Debug(1, "ZMS: JWT token found: %s", jwt_token_str.c_str());
-      } else if ( !strcmp(name, "user") ) {
-        username = UriDecode(value);
-      } else if ( !strcmp(name, "pass") ) {
-        password = UriDecode(value);
-        Debug(1, "Have %s for password", password.c_str());
-      } else {
-        Debug(1, "Unknown parameter passed to zms %s=%s", name, value);
-      }  // end if possible parameter names
-    }  // end foreach parm
-  } else {
+  if ( query == nullptr ) {
     Fatal("No query string.");
+    return 0;
   }  // end if query
 
+  Debug(1, "Query: %s", query);
+
+  char *q_ptr = (char *)query;
+  char *parms[16];  // Shouldn't be more than this
+  int parm_no = 0;
+  while ( (parm_no < 16) && (parms[parm_no] = strtok(q_ptr, "&")) ) {
+    parm_no++;
+    q_ptr = nullptr;
+  }
+
+  for ( int p = 0; p < parm_no; p++ ) {
+    char *name = strtok(parms[p], "=");
+    char const *value = strtok(nullptr, "=");
+    if ( !value )
+      value = "";
+    if ( !strcmp(name, "source") ) {
+      if ( !strcmp(value, "event") ) {
+        source = ZMS_EVENT;
+      } else if ( !strcmp(value, "fifo") ) {
+        source = ZMS_FIFO;
+      } else {
+        source = ZMS_MONITOR;
+      }
+    } else if ( !strcmp(name, "mode") ) {
+      mode = !strcmp(value, "jpeg")?ZMS_JPEG:ZMS_MPEG;
+      mode = !strcmp(value, "raw")?ZMS_RAW:mode;
+      mode = !strcmp(value, "zip")?ZMS_ZIP:mode;
+      mode = !strcmp(value, "single")?ZMS_SINGLE:mode;
+    } else if ( !strcmp(name, "format") ) {
+      strncpy(format, value, sizeof(format)-1);
+    } else if ( !strcmp(name, "monitor") ) {
+      monitor_id = atoi(value);
+      if ( source == ZMS_UNKNOWN )
+        source = ZMS_MONITOR;
+    } else if ( !strcmp(name, "time") ) {
+      event_time = atoi(value);
+    } else if ( !strcmp(name, "event") ) {
+      event_id = strtoull(value, nullptr, 10);
+      source = ZMS_EVENT;
+    } else if ( !strcmp(name, "frame") ) {
+      frame_id = strtoull(value, nullptr, 10);
+      source = ZMS_EVENT;
+    } else if ( !strcmp(name, "scale") ) {
+      scale = atoi(value);
+    } else if ( !strcmp(name, "rate") ) {
+      rate = atoi(value);
+    } else if ( !strcmp(name, "maxfps") ) {
+      maxfps = atof(value);
+    } else if ( !strcmp(name, "bitrate") ) {
+      bitrate = atoi(value);
+    } else if ( !strcmp(name, "ttl") ) {
+      ttl = atoi(value);
+    } else if ( !strcmp(name, "replay") ) {
+      if ( !strcmp(value, "gapless") ) {
+        replay = EventStream::MODE_ALL_GAPLESS;
+      } else if ( !strcmp(value, "all") ) {
+        replay = EventStream::MODE_ALL;
+      } else if ( !strcmp(value, "none") ) {
+        replay = EventStream::MODE_NONE;
+      } else if ( !strcmp(value, "single") ) {
+        replay = EventStream::MODE_SINGLE;
+      } else {
+        Error("Unsupported value %s for replay, defaulting to none", value);
+      }
+    } else if ( !strcmp(name, "connkey") ) {
+      connkey = atoi(value);
+    } else if ( !strcmp(name, "buffer") ) {
+      playback_buffer = atoi(value);
+    } else if ( !strcmp(name, "auth") ) {
+      strncpy(auth, value, sizeof(auth)-1);
+    } else if ( !strcmp(name, "token") ) {
+      jwt_token_str = value;
+      Debug(1, "ZMS: JWT token found: %s", jwt_token_str.c_str());
+    } else if ( !strcmp(name, "user") ) {
+      username = UriDecode(value);
+    } else if ( !strcmp(name, "pass") ) {
+      password = UriDecode(value);
+      Debug(1, "Have %s for password", password.c_str());
+    } else {
+      Debug(1, "Unknown parameter passed to zms %s=%s", name, value);
+    }  // end if possible parameter names
+  }  // end foreach parm
+
   if ( monitor_id ) {
     snprintf(log_id_string, sizeof(log_id_string), "zms_m%d", monitor_id);
   } else {
@@ -227,7 +230,8 @@ int main(int argc, const char *argv[], char **envp) {
     user = nullptr;
   }  // end if config.opt_use_auth
 
-  hwcaps_detect();
+  HwCapsDetect();
+  Image::Initialise();
   zmSetDefaultTermHandler();
   zmSetDefaultDieHandler();
 
@@ -239,8 +243,9 @@ int main(int argc, const char *argv[], char **envp) {
 
   time_t now = time(nullptr);
   char date_string[64];
+  tm now_tm = {};
   strftime(date_string, sizeof(date_string)-1,
-      "%a, %d %b %Y %H:%M:%S GMT", gmtime(&now));
+      "%a, %d %b %Y %H:%M:%S GMT", gmtime_r(&now, &now_tm));
 
   fputs("Last-Modified: ", stdout);
   fputs(date_string, stdout);
@@ -259,7 +264,13 @@ int main(int argc, const char *argv[], char **envp) {
     stream.setStreamTTL(ttl);
     stream.setStreamQueue(connkey);
     stream.setStreamBuffer(playback_buffer);
-    stream.setStreamStart(monitor_id);
+    if ( !stream.setStreamStart(monitor_id) ) {
+      Error("Unable set start stream for monitor %d", monitor_id);
+      stream.sendTextFrame("Unable to connect to monitor");
+      logTerm();
+      zmDbClose();
+      return -1;
+    }
 
     if ( mode == ZMS_JPEG ) {
       stream.setStreamType(MonitorStream::STREAM_JPEG);
@@ -328,7 +339,10 @@ int main(int argc, const char *argv[], char **envp) {
     Error("Neither a monitor or event was specified.");
   }  // end if monitor or event
 
+  Debug(1, "Terminating");
+  Image::Deinitialise();
   logTerm();
+  dbQueue.stop();
   zmDbClose();
 
   return 0;
diff --git a/src/zmu.cpp b/src/zmu.cpp
index bdc467812..acc4b21dc 100644
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@@ -86,15 +86,14 @@ Options for use with monitors:
 
 */
 
-#include <getopt.h>
-#include <cinttypes>
-
 #include "zm.h"
 #include "zm_db.h"
 #include "zm_user.h"
 #include "zm_signal.h"
 #include "zm_monitor.h"
 #include "zm_local_camera.h"
+#include <getopt.h>
+#include <unistd.h>
 
 void Usage(int status=-1) {
   fputs(
@@ -184,7 +183,7 @@ bool ValidateAccess(User *user, int mon_id, int function) {
     if ( user->getMonitors() < User::PERM_VIEW )
       allowed = false;
   }
-  if ( function & (ZMU_ALARM|ZMU_NOALARM|ZMU_CANCEL|ZMU_RELOAD|ZMU_ENABLE|ZMU_DISABLE|ZMU_SUSPEND|ZMU_RESUME|ZMU_BRIGHTNESS|ZMU_CONTRAST|ZMU_HUE|ZMU_COLOUR) ) {
+  if ( function & (ZMU_NOALARM|ZMU_RELOAD|ZMU_ENABLE|ZMU_DISABLE|ZMU_SUSPEND|ZMU_RESUME|ZMU_BRIGHTNESS|ZMU_CONTRAST|ZMU_HUE|ZMU_COLOUR) ) {
     if ( user->getMonitors() < User::PERM_EDIT )
       allowed = false;
   }
@@ -275,7 +274,7 @@ int main(int argc, char *argv[]) {
   while (1) {
     int option_index = 0;
 
-    int c = getopt_long(argc, argv, "d:m:vsEDLurwei::S:t::fz::ancqhlB::C::H::O::U:P:A:V:T:", long_options, &option_index);
+    int c = getopt_long(argc, argv, "d:m:vsEDLurwei::S:t::fz::ancqhlB::C::H::O::RWU:P:A:V:T:", long_options, &option_index);
     if ( c == -1 ) {
       break;
     }
@@ -419,8 +418,10 @@ int main(int argc, char *argv[]) {
   }
   //printf( "Monitor %d, Function %d\n", mon_id, function );
 
-  zmLoadConfig();
-
+  logInit("zmu");
+  zmLoadStaticConfig();
+  zmDbConnect();
+  zmLoadDBConfig();
   logInit("zmu");
 
   zmSetDefaultTermHandler();
@@ -475,19 +476,17 @@ int main(int argc, char *argv[]) {
   } // end if auth
 
   if ( mon_id > 0 ) {
-    Monitor *monitor = Monitor::Load(mon_id, function&(ZMU_QUERY|ZMU_ZONES), Monitor::QUERY);
+    std::shared_ptr<Monitor> monitor = Monitor::Load(mon_id, function&(ZMU_QUERY|ZMU_ZONES), Monitor::QUERY);
     if ( !monitor ) {
       Error("Unable to load monitor %d", mon_id);
       exit_zmu(-1);
     } // end if ! MONITOR
 
     if ( verbose ) {
-      printf("Monitor %d(%s)\n", monitor->Id(), monitor->Name());
+      printf("Monitor %u(%s)\n", monitor->Id(), monitor->Name());
     }
     if ( !monitor->connect() ) {
       Error("Can't connect to capture daemon: %d %s", monitor->Id(), monitor->Name());
-      delete monitor;
-      monitor = nullptr;
       exit_zmu(-1);
     }
 
@@ -498,7 +497,6 @@ int main(int argc, char *argv[]) {
       if ( verbose ) {
         printf("Current state: %s\n", state==Monitor::ALARM?"Alarm":(state==Monitor::ALERT?"Alert":"Idle"));
       } else {
-        if ( have_output ) fputc(separator, stdout);
         printf("%d", state);
         have_output = true;
       }
@@ -507,8 +505,10 @@ int main(int argc, char *argv[]) {
       struct timeval timestamp = monitor->GetTimestamp(image_idx);
       if ( verbose ) {
         char timestamp_str[64] = "None";
-        if ( timestamp.tv_sec )
-          strftime(timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime(&timestamp.tv_sec));
+        if ( timestamp.tv_sec ) {
+          tm tm_info = {};
+          strftime(timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime_r(&timestamp.tv_sec, &tm_info));
+        }
         if ( image_idx == -1 )
           printf("Time of last image capture: %s.%02ld\n", timestamp_str, timestamp.tv_usec/10000);
         else
@@ -521,19 +521,19 @@ int main(int argc, char *argv[]) {
     }
     if ( function & ZMU_READ_IDX ) {
       if ( verbose )
-        printf("Last read index: %d\n", monitor->GetLastReadIndex());
+        printf("Last read index: %u\n", monitor->GetLastReadIndex());
       else {
         if ( have_output ) fputc(separator, stdout);
-        printf("%d", monitor->GetLastReadIndex());
+        printf("%u", monitor->GetLastReadIndex());
         have_output = true;
       }
     }
     if ( function & ZMU_WRITE_IDX ) {
       if ( verbose ) {
-        printf("Last write index: %d\n", monitor->GetLastWriteIndex());
+        printf("Last write index: %u\n", monitor->GetLastWriteIndex());
       } else {
         if ( have_output ) fputc(separator, stdout);
-        printf("%d", monitor->GetLastWriteIndex());
+        printf("%u", monitor->GetLastWriteIndex());
         have_output = true;
       }
     }
@@ -548,19 +548,20 @@ int main(int argc, char *argv[]) {
     }
     if ( function & ZMU_FPS ) {
       if ( verbose ) {
-        printf("Current capture rate: %.2f frames per second\n", monitor->GetFPS());
+        printf("Current capture rate: %.2f frames per second, analysis rate: %.2f frames per second\n",
+            monitor->get_capture_fps(), monitor->get_analysis_fps());
       } else {
         if ( have_output ) fputc(separator, stdout);
-        printf("%.2f", monitor->GetFPS());
+        printf("capture: %.2f, analysis: %.2f", monitor->get_capture_fps(), monitor->get_analysis_fps());
         have_output = true;
       }
     }
     if ( function & ZMU_IMAGE ) {
       if ( verbose ) {
         if ( image_idx == -1 )
-          printf("Dumping last image captured to Monitor%d.jpg", monitor->Id());
+          printf("Dumping last image captured to Monitor%u.jpg", monitor->Id());
         else
-          printf("Dumping buffer image %d to Monitor%d.jpg", image_idx, monitor->Id());
+          printf("Dumping buffer image %d to Monitor%u.jpg", image_idx, monitor->Id());
         if ( scale != -1 )
           printf(", scaling by %d%%", scale);
         printf("\n");
@@ -569,7 +570,7 @@ int main(int argc, char *argv[]) {
     }
     if ( function & ZMU_ZONES ) {
       if ( verbose )
-        printf("Dumping zone image to Zones%d.jpg\n", monitor->Id());
+        printf("Dumping zone image to Zones%u.jpg\n", monitor->Id());
       monitor->DumpZoneImage(zoneString);
     }
     if ( function & ZMU_ALARM ) {
@@ -584,12 +585,21 @@ int main(int argc, char *argv[]) {
               monitor->GetLastEventId()
               );
         }
+
+        // Ensure that we are not recording.  So the forced alarm is distinct from what was recording before
+        monitor->ForceAlarmOff();
         monitor->ForceAlarmOn(config.forced_alarm_score, "Forced Web");
-        while ( ((state = monitor->GetState()) != Monitor::ALARM) && !zm_terminate ) {
+        int wait = 10*1000*1000; // 10 seconds
+        while ((monitor->GetState() != Monitor::ALARM) and !zm_terminate and wait) {
           // Wait for monitor to notice.
           usleep(1000);
+          wait -= 1000;
+        }
+        if ( monitor->GetState() != Monitor::ALARM and !wait ) {
+          Error("Monitor failed to respond to forced alarm.");
+        } else {
+          printf("Alarmed event id: %" PRIu64 "\n", monitor->GetLastEventId());
         }
-        printf("Alarmed event id: %" PRIu64 "\n", monitor->GetLastEventId());
       }
     }  // end if ZMU_ALARM
 
@@ -700,8 +710,6 @@ int main(int argc, char *argv[]) {
     if ( !function ) {
       Usage();
     }
-    delete monitor;
-    monitor = nullptr;
   } else { // non monitor functions
     if ( function & ZMU_QUERY ) {
 #if ZM_HAS_V4L
@@ -717,35 +725,29 @@ int main(int argc, char *argv[]) {
 
     if ( function & ZMU_LIST ) {
       std::string sql = "SELECT `Id`, `Function`+0 FROM `Monitors`";
-      if ( !verbose ) {
+      if (!verbose) {
         sql += "WHERE `Function` != 'None'";
       }
       sql += " ORDER BY Id ASC";
 
-      if ( mysql_query(&dbconn, sql.c_str()) ) {
-        Error("Can't run query: %s", mysql_error(&dbconn));
-        exit_zmu(mysql_errno(&dbconn));
+      MYSQL_RES *result = zmDbFetch(sql.c_str());
+      if (!result) {
+        exit_zmu(-1);
       }
-
-      MYSQL_RES *result = mysql_store_result(&dbconn);
-      if ( !result ) {
-        Error("Can't use query result: %s", mysql_error(&dbconn));
-        exit_zmu(mysql_errno(&dbconn));
-      }
-      Debug(1, "Got %d monitors", mysql_num_rows(result));
+      Debug(1, "Got %" PRIu64 " monitors", static_cast<uint64>(mysql_num_rows(result)));
 
       printf("%4s%5s%6s%9s%14s%6s%6s%8s%8s\n", "Id", "Func", "State", "TrgState", "LastImgTim", "RdIdx", "WrIdx", "LastEvt", "FrmRate");
-      for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
-        int mon_id = atoi(dbrow[0]);
-        int function = atoi(dbrow[1]);
-        if ( !user || user->canAccess(mon_id) ) {
-          if ( function > 1 ) {
-            Monitor *monitor = Monitor::Load(mon_id, false, Monitor::QUERY);
+      for ( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row(result); i++ ) {
+        int monitor_id = atoi(dbrow[0]);
+        int monitor_function = atoi(dbrow[1]);
+        if ( !user || user->canAccess(monitor_id) ) {
+          if ( monitor_function > 1 ) {
+            std::shared_ptr<Monitor> monitor = Monitor::Load(monitor_id, false, Monitor::QUERY);
             if ( monitor && monitor->connect() ) {
               struct timeval tv = monitor->GetTimestamp();
               printf( "%4d%5d%6d%9d%11ld.%02ld%6d%6d%8" PRIu64 "%8.2f\n",
                 monitor->Id(),
-                function,
+                monitor_function,
                 monitor->GetState(),
                 monitor->GetTriggerState(),
                 tv.tv_sec, tv.tv_usec/10000,
@@ -754,7 +756,6 @@ int main(int argc, char *argv[]) {
                 monitor->GetLastEventId(),
                 monitor->GetFPS()
               );
-              delete monitor;
             }
           } else {
             struct timeval tv = { 0, 0 };
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644
index 000000000..e0c68aeff
--- /dev/null
+++ b/tests/CMakeLists.txt
@@ -0,0 +1,40 @@
+# This file is part of the ZoneMinder Project.
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+
+include(Catch)
+
+set(TEST_SOURCES
+  zm_comms.cpp
+  zm_crypt.cpp
+  zm_font.cpp
+  zm_utils.cpp)
+
+add_executable(tests main.cpp ${TEST_SOURCES})
+
+target_link_libraries(tests
+  PRIVATE
+    zm-core-interface
+    zm
+    ${ZM_BIN_LIBS}
+    bcrypt
+    Catch2::Catch2)
+
+target_include_directories(tests
+  PRIVATE
+    ${CMAKE_CURRENT_BINARY_DIR})
+
+catch_discover_tests(tests)
+
+add_custom_command(TARGET tests
+  PRE_BUILD
+  COMMAND ${CMAKE_COMMAND} -E copy_directory
+  ${CMAKE_CURRENT_SOURCE_DIR}/data/ ${CMAKE_CURRENT_BINARY_DIR}/data/
+  BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/data/)
diff --git a/tests/data/fonts/01_bad_magic.zmfnt b/tests/data/fonts/01_bad_magic.zmfnt
new file mode 100644
index 000000000..2cfaf0818
Binary files /dev/null and b/tests/data/fonts/01_bad_magic.zmfnt differ
diff --git a/tests/data/fonts/02_variant_invalid.zmfnt b/tests/data/fonts/02_variant_invalid.zmfnt
new file mode 100644
index 000000000..9b53e85ab
Binary files /dev/null and b/tests/data/fonts/02_variant_invalid.zmfnt differ
diff --git a/tests/data/fonts/03_missing_cps.zmfnt b/tests/data/fonts/03_missing_cps.zmfnt
new file mode 100644
index 000000000..71c58970d
Binary files /dev/null and b/tests/data/fonts/03_missing_cps.zmfnt differ
diff --git a/tests/data/fonts/04_valid.zmfnt b/tests/data/fonts/04_valid.zmfnt
new file mode 100644
index 000000000..0a4ad6653
Binary files /dev/null and b/tests/data/fonts/04_valid.zmfnt differ
diff --git a/tests/data/fonts/generate_fonts.py b/tests/data/fonts/generate_fonts.py
new file mode 100644
index 000000000..275c2021a
--- /dev/null
+++ b/tests/data/fonts/generate_fonts.py
@@ -0,0 +1,57 @@
+#!/bin/python
+
+import struct
+
+GOOD_MAGIC = b"ZMFNT\0"
+BAD_MAGIC = b"ABCDE\0"
+NUM_FONT_SIZES = 4
+
+ZMFNT_VERSION = 1
+
+
+class FontFile:
+    def __init__(self, path):
+        self.path = path
+
+    def write_file_header(self, magic):
+        with open(self.path, "wb") as f:
+            f.write(magic)
+            f.write(struct.pack("B", ZMFNT_VERSION))
+            f.write(struct.pack("B", 0))  # pad
+
+    def write_bm_header(self, height, width, cp_count, idx, padding):
+        with open(self.path, "ab") as f:
+            f.write(struct.pack("HHIIBBBB", height, width, cp_count, idx, padding, 0, 0, 0))
+
+    def write_codepoints(self, value, height, count):
+        with open(self.path, "ab") as f:
+            for _ in range(height * count):
+                f.write(struct.pack("Q", value))
+
+
+font = FontFile("01_bad_magic.zmfnt")
+font.write_file_header(BAD_MAGIC)
+
+# height, width and number of codepoints out of bounds
+font = FontFile("02_variant_invalid.zmfnt")
+font.write_file_header(GOOD_MAGIC)
+font.write_bm_header(201, 65, 256, 0, 2)
+
+# mismatch between number of codepoints specified in header and actually stored ones
+font = FontFile("03_missing_cps.zmfnt")
+font.write_file_header(GOOD_MAGIC)
+offs = 0
+for _ in range(NUM_FONT_SIZES):
+    font.write_bm_header(10, 10, 10, offs, 2)
+    offs += 10 * 10
+for _ in range(NUM_FONT_SIZES):
+    font.write_codepoints(1, 10, 9)
+
+font = FontFile("04_valid.zmfnt")
+font.write_file_header(GOOD_MAGIC)
+offs = 0
+for i in range(NUM_FONT_SIZES):
+    font.write_bm_header(10 + i, 10 + i, 10, offs, 2)
+    offs += 10 * (10 + i)
+for i in range(NUM_FONT_SIZES):
+    font.write_codepoints(i, 10 + i, 10)
diff --git a/tests/main.cpp b/tests/main.cpp
new file mode 100644
index 000000000..1a00d1291
--- /dev/null
+++ b/tests/main.cpp
@@ -0,0 +1,19 @@
+/*
+ * This file is part of the ZoneMinder Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define CATCH_CONFIG_MAIN
+#include "catch2/catch.hpp"
diff --git a/tests/zm_comms.cpp b/tests/zm_comms.cpp
new file mode 100644
index 000000000..dfe98e1bf
--- /dev/null
+++ b/tests/zm_comms.cpp
@@ -0,0 +1,316 @@
+/*
+ * This file is part of the ZoneMinder Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "catch2/catch.hpp"
+
+#include "zm_comms.h"
+#include <array>
+
+TEST_CASE("ZM::Pipe basics") {
+  ZM::Pipe pipe;
+
+  SECTION("setBlocking on non-opened") {
+    REQUIRE(pipe.setBlocking(true) == false);
+    REQUIRE(pipe.setBlocking(false) == false);
+  }
+
+  REQUIRE(pipe.open() == true);
+
+  REQUIRE(pipe.isOpen() == true);
+  REQUIRE(pipe.isClosed() == false);
+  REQUIRE(pipe.getReadDesc() != -1);
+  REQUIRE(pipe.getWriteDesc() != -1);
+
+  SECTION("double open") {
+    REQUIRE(pipe.open() == true); // is this expected?
+  }
+
+  SECTION("close") {
+    REQUIRE(pipe.close() == true);
+
+    REQUIRE(pipe.isOpen() == false);
+    REQUIRE(pipe.isClosed() == true);
+    REQUIRE(pipe.getReadDesc() == -1);
+    REQUIRE(pipe.getWriteDesc() == -1);
+
+    SECTION("double close") {
+      REQUIRE(pipe.close() == true);
+    }
+
+    SECTION("setBlocking on closed") {
+      REQUIRE(pipe.setBlocking(true) == false);
+      REQUIRE(pipe.setBlocking(false) == false);
+    }
+  }
+
+  SECTION("setBlocking") {
+    REQUIRE(pipe.setBlocking(true) == true);
+    REQUIRE(pipe.setBlocking(false) == true);
+  }
+}
+
+TEST_CASE("ZM::Pipe read/write") {
+  ZM::Pipe pipe;
+
+  std::array<char, 3> msg = {'a', 'b', 'c'};
+  std::array<char, msg.size()> rcv{};
+
+  SECTION("read/write on non-opened pipe") {
+    REQUIRE(pipe.write(msg.data(), msg.size()) == -1);
+    REQUIRE(pipe.read(rcv.data(), rcv.size()) == -1);
+  }
+
+  SECTION("read/write on opened pipe") {
+    REQUIRE(pipe.open() == true);
+
+    REQUIRE(pipe.write(msg.data(), msg.size()) == msg.size());
+    REQUIRE(pipe.read(rcv.data(), rcv.size()) == msg.size());
+
+    REQUIRE(rcv == msg);
+  }
+
+  SECTION("read/write on closed pipe") {
+    REQUIRE(pipe.open() == true);
+    REQUIRE(pipe.close() == true);
+
+    REQUIRE(pipe.write(msg.data(), msg.size()) == -1);
+    REQUIRE(pipe.read(rcv.data(), rcv.size()) == -1);
+  }
+}
+
+TEST_CASE("ZM::SockAddrInet") {
+  ZM::SockAddrInet addr;
+  REQUIRE(addr.getAddrSize() == sizeof(sockaddr_in));
+
+  SECTION("resolve") {
+    addr.resolve(80, "");
+    REQUIRE(addr.getDomain() == AF_INET);
+
+    SECTION("newSockAddr from resolved addr") {
+      ZM::SockAddr *addr2 = ZM::SockAddr::newSockAddr(&addr);
+      REQUIRE(addr2->getDomain() == AF_INET);
+      REQUIRE(addr2->getAddrSize() == sizeof(sockaddr_in));
+    }
+  }
+}
+
+TEST_CASE("ZM::SockAddrUnix") {
+  ZM::SockAddrUnix addr;
+  REQUIRE(addr.getAddrSize() == sizeof(sockaddr_un));
+
+  SECTION("resovle") {
+    addr.resolve("/", "");
+    REQUIRE(addr.getDomain() == AF_UNIX);
+
+    SECTION("newSockAddr from resolved addr") {
+      ZM::SockAddr *addr2 = ZM::SockAddr::newSockAddr(&addr);
+      REQUIRE(addr2->getDomain() == AF_UNIX);
+      REQUIRE(addr2->getAddrSize() == sizeof(sockaddr_un));
+    }
+  }
+}
+
+TEST_CASE("ZM::UdpInetSocket basics") {
+  ZM::UdpInetSocket socket;
+  REQUIRE(socket.isClosed() == true);
+  REQUIRE(socket.isOpen() == false);
+  REQUIRE(socket.isConnected() == false);
+  REQUIRE(socket.isDisconnected() == false);
+
+  SECTION("bind with host and port") {
+    REQUIRE(socket.bind(nullptr, "1234") == true);
+    REQUIRE(socket.isOpen() == true);
+    REQUIRE(socket.isDisconnected() == true);
+    REQUIRE(socket.isClosed() == false);
+    REQUIRE(socket.isConnected() == false);
+
+    SECTION("close") {
+      REQUIRE(socket.close() == true);
+      REQUIRE(socket.isClosed() == true);
+      REQUIRE(socket.isOpen() == false);
+      REQUIRE(socket.isConnected() == false);
+      REQUIRE(socket.isDisconnected() == false);
+    }
+  }
+
+  SECTION("bind with port") {
+    REQUIRE(socket.bind("1234") == true);
+  }
+
+  SECTION("bind with host and port number") {
+    REQUIRE(socket.bind(nullptr, 1234) == true);
+  }
+
+  SECTION("bind with port number") {
+    REQUIRE(socket.bind(1234) == true);
+  }
+}
+
+TEST_CASE("ZM::UdpInetSocket send/recv") {
+  ZM::UdpInetSocket srv_socket;
+  ZM::UdpInetSocket client_socket;
+
+  std::array<char, 3> msg = {'a', 'b', 'c'};
+  std::array<char, msg.size()> rcv{};
+
+  SECTION("send/recv on unbound socket") {
+    REQUIRE(client_socket.send(msg.data(), msg.size()) == -1);
+    REQUIRE(srv_socket.recv(rcv.data(), rcv.size()) == -1);
+  }
+
+  SECTION("send/recv") {
+    REQUIRE(srv_socket.bind("127.0.0.1", "1234") == true);
+    REQUIRE(srv_socket.isOpen() == true);
+
+    REQUIRE(client_socket.connect("127.0.0.1", "1234") == true);
+    REQUIRE(client_socket.isConnected() == true);
+
+    REQUIRE(client_socket.send(msg.data(), msg.size()) == msg.size());
+    REQUIRE(srv_socket.recv(rcv.data(), rcv.size()) == msg.size());
+
+    REQUIRE(rcv == msg);
+  }
+}
+
+TEST_CASE("ZM::UdpUnixSocket basics") {
+  std::string sock_path = "/tmp/zm.unittest.sock";
+  unlink(sock_path.c_str()); // make sure the socket file does not exist
+
+  ZM::UdpUnixSocket socket;
+  REQUIRE(socket.isClosed() == true);
+  REQUIRE(socket.isOpen() == false);
+  REQUIRE(socket.isConnected() == false);
+  REQUIRE(socket.isDisconnected() == false);
+
+  SECTION("bind") {
+    REQUIRE(socket.bind(sock_path.c_str()) == true);
+    REQUIRE(socket.isOpen() == true);
+    REQUIRE(socket.isDisconnected() == true);
+    REQUIRE(socket.isClosed() == false);
+    REQUIRE(socket.isConnected() == false);
+
+    SECTION("close") {
+      REQUIRE(socket.close() == true);
+      REQUIRE(socket.isClosed() == true);
+      REQUIRE(socket.isOpen() == false);
+      REQUIRE(socket.isConnected() == false);
+      REQUIRE(socket.isDisconnected() == false);
+    }
+  }
+
+  SECTION("connect to unbound socket") {
+    REQUIRE(socket.connect(sock_path.c_str()) == false);
+  }
+}
+
+TEST_CASE("ZM::UdpUnixSocket send/recv") {
+  std::string sock_path = "/tmp/zm.unittest.sock";
+  unlink(sock_path.c_str()); // make sure the socket file does not exist
+
+  ZM::UdpUnixSocket srv_socket;
+  ZM::UdpUnixSocket client_socket;
+
+  std::array<char, 3> msg = {'a', 'b', 'c'};
+  std::array<char, msg.size()> rcv{};
+
+  SECTION("send/recv on unbound socket") {
+    REQUIRE(client_socket.send(msg.data(), msg.size()) == -1);
+    REQUIRE(srv_socket.recv(rcv.data(), rcv.size()) == -1);
+  }
+
+  SECTION("send/recv") {
+    REQUIRE(srv_socket.bind(sock_path.c_str()) == true);
+    REQUIRE(srv_socket.isOpen() == true);
+
+    REQUIRE(client_socket.connect(sock_path.c_str()) == true);
+    REQUIRE(client_socket.isConnected() == true);
+
+    REQUIRE(client_socket.send(msg.data(), msg.size()) == msg.size());
+    REQUIRE(srv_socket.recv(rcv.data(), rcv.size()) == msg.size());
+
+    REQUIRE(rcv == msg);
+  }
+}
+
+TEST_CASE("ZM::TcpInetClient basics") {
+  ZM::TcpInetClient client;
+  REQUIRE(client.isClosed() == true);
+  REQUIRE(client.isOpen() == false);
+  REQUIRE(client.isConnected() == false);
+  REQUIRE(client.isDisconnected() == false);
+
+  REQUIRE(client.connect("127.0.0.1", 1234) == false);
+  REQUIRE(client.isClosed() == true);
+  REQUIRE(client.isOpen() == false);
+  REQUIRE(client.isConnected() == false);
+  REQUIRE(client.isDisconnected() == false);
+}
+
+TEST_CASE("ZM::TcpInetServer basics", "[notCI]") {
+  ZM::TcpInetServer server;
+  REQUIRE(server.isClosed() == true);
+  REQUIRE(server.isOpen() == false);
+  REQUIRE(server.isConnected() == false);
+  REQUIRE(server.isDisconnected() == false);
+
+  REQUIRE(server.bind(1234) == true);
+  REQUIRE(server.isOpen() == true);
+  REQUIRE(server.isClosed() == false);
+  REQUIRE(server.isConnected() == false);
+  REQUIRE(server.isDisconnected() == true);
+  REQUIRE(server.isListening() == false);
+
+  REQUIRE(server.listen() == true);
+  REQUIRE(server.isListening() == true);
+
+  SECTION("close") {
+    REQUIRE(server.close() == true);
+    REQUIRE(server.isClosed() == true);
+    REQUIRE(server.isOpen() == false);
+    REQUIRE(server.isConnected() == false);
+    REQUIRE(server.isDisconnected() == false);
+  }
+}
+
+TEST_CASE("ZM::TcpInetClient/Server send/recv", "[notCI]") {
+  ZM::TcpInetServer server;
+  ZM::TcpInetClient client;
+
+  std::array<char, 3> msg = {'a', 'b', 'c'};
+  std::array<char, msg.size()> rcv{};
+
+  SECTION("send/recv on unbound socket") {
+    REQUIRE(client.send(msg.data(), msg.size()) == -1);
+    REQUIRE(server.recv(rcv.data(), rcv.size()) == -1);
+  }
+
+  SECTION("send/recv") {
+    REQUIRE(server.bind(1234) == true);
+    REQUIRE(server.isOpen() == true);
+    REQUIRE(server.listen() == true);
+
+    REQUIRE(client.connect("127.0.0.1", 1234) == true);
+    REQUIRE(client.isConnected() == true);
+
+    REQUIRE(server.accept() == true);
+
+    REQUIRE(client.send(msg.data(), msg.size()) == msg.size());
+    REQUIRE(server.recv(rcv.data(), rcv.size()) == msg.size());
+
+    REQUIRE(rcv == msg);
+  }
+}
diff --git a/tests/zm_crypt.cpp b/tests/zm_crypt.cpp
new file mode 100644
index 000000000..d3a315ef4
--- /dev/null
+++ b/tests/zm_crypt.cpp
@@ -0,0 +1,78 @@
+/*
+ * This file is part of the ZoneMinder Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "catch2/catch.hpp"
+
+#include "zm_crypt.h"
+
+TEST_CASE("JWT validation") {
+  std::string key = "testsecret";
+
+  SECTION("Valid token") {
+    std::string token =
+        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJab25lTWluZGVyIiwidXNlciI6ImpvaG5kb2UiLCJ0eXBlIjoiYWNjZXNzIiwiaWF0IjoxMjM0fQ.94WPmBAVl_83KCI9B3Jq9sNpoOdi0Hm1dR4sc6MCPUA";
+    std::pair<std::string, unsigned int> result = verifyToken(token, key);
+
+    REQUIRE(result.first == "johndoe");
+    REQUIRE(result.second == 1234);
+  }
+
+  SECTION("Invalid signature") {
+    std::string token =
+        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJab25lTWluZGVyIiwidXNlciI6ImpvaG5kb2UiLCJ0eXBlIjoiYWNjZXNzIiwiaWF0IjoxMjM0fQ.DhviT6RkDLmbXh5F9zM4l0VbWNPCuKptF6fORv1lBlA";
+    std::pair<std::string, unsigned int> result = verifyToken(token, key);
+
+    REQUIRE(result.first == "");
+    REQUIRE(result.second == 0);
+  }
+
+  SECTION("Missing user claim") {
+    std::string token =
+        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJab25lTWluZGVyIiwidHlwZSI6ImFjY2VzcyIsImlhdCI6MTIzNH0.mfi3ZHnqUAPUh5ECxDIkAM9WW9a8HbKrP73LC3yYJmw";
+    std::pair<std::string, unsigned int> result = verifyToken(token, key);
+
+    REQUIRE(result.first == "");
+    REQUIRE(result.second == 0);
+  }
+
+  SECTION("Missing type claim") {
+    std::string token =
+        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJab25lTWluZGVyIiwidXNlciI6ImpvaG5kb2UiLCJpYXQiOjEyMzR9.D4Irs1gHfzO4psRY2xsOdClTg-Sp1kM__mmfNLs7CII";
+    std::pair<std::string, unsigned int> result = verifyToken(token, key);
+
+    REQUIRE(result.first == "");
+    REQUIRE(result.second == 0);
+  }
+
+  SECTION("Wrong type claim") {
+    std::string token =
+        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJab25lTWluZGVyIiwidXNlciI6ImpvaG5kb2UiLCJ0eXBlIjoid3JvbmciLCJpYXQiOjEyMzR9.I1Gd50J6mck05vzc_kzjaH4RNjLBaFGpOnie6-PbX28";
+    std::pair<std::string, unsigned int> result = verifyToken(token, key);
+
+    REQUIRE(result.first == "");
+    REQUIRE(result.second == 0);
+  }
+
+  SECTION("Missing iat claim") {
+    std::string token =
+        "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJab25lTWluZGVyIiwidXNlciI6ImpvaG5kb2UiLCJ0eXBlIjoid3JvbmcifQ.8iUFOUKJAK5vU8JWKm8D0EOEhm1rJoIulCO11O_Tsp0";
+    std::pair<std::string, unsigned int> result = verifyToken(token, key);
+
+    REQUIRE(result.first == "");
+    REQUIRE(result.second == 0);
+  }
+}
diff --git a/tests/zm_font.cpp b/tests/zm_font.cpp
new file mode 100644
index 000000000..d862c3291
--- /dev/null
+++ b/tests/zm_font.cpp
@@ -0,0 +1,161 @@
+/*
+ * This file is part of the ZoneMinder Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "catch2/catch.hpp"
+
+#include "zm_font.h"
+
+CATCH_REGISTER_ENUM(FontLoadError,
+                    FontLoadError::kOk,
+                    FontLoadError::kFileNotFound,
+                    FontLoadError::kInvalidFile)
+
+TEST_CASE("FontVariant: construction") {
+  FontVariant variant;
+
+  SECTION("default construction") {
+    REQUIRE(variant.GetCharHeight() == 0);
+    REQUIRE(variant.GetCharWidth() == 0);
+  }
+
+  SECTION("values in range") {
+    constexpr uint8 height = 10;
+    constexpr uint8 width = 10;
+    constexpr uint8 padding = 2;
+    std::vector<uint64> bitmap(FontVariant::kMaxNumCodePoints * height);
+
+    REQUIRE_NOTHROW(variant = FontVariant(height, width, padding, bitmap));
+
+    REQUIRE(variant.GetCharHeight() == height);
+    REQUIRE(variant.GetCharWidth() == width);
+    REQUIRE(variant.GetCodepointsCount() == FontVariant::kMaxNumCodePoints);
+  }
+
+  SECTION("height out of range") {
+    constexpr uint8 height = FontVariant::kMaxCharHeight + 1;
+    constexpr uint8 width = 10;
+    constexpr uint8 padding = 2;
+    std::vector<uint64> bitmap(FontVariant::kMaxNumCodePoints * height);
+
+    REQUIRE_THROWS(variant = FontVariant(height, width, padding, bitmap));
+  }
+
+  SECTION("width out of range") {
+    constexpr uint8 height = 10;
+    constexpr uint8 width = FontVariant::kMaxCharWidth + 1;
+    constexpr uint8 padding = 2;
+    std::vector<uint64> bitmap(FontVariant::kMaxNumCodePoints * height);
+
+    REQUIRE_THROWS(variant = FontVariant(height, width, padding, bitmap));
+  }
+
+  SECTION("bitmap of wrong size") {
+    constexpr uint8 height = 10;
+    constexpr uint8 width = 10;
+    constexpr uint8 padding = 2;
+    std::vector<uint64> bitmap(FontVariant::kMaxNumCodePoints * height + 1);
+
+    REQUIRE_THROWS(variant = FontVariant(height, width, padding, bitmap));
+  }
+}
+
+TEST_CASE("FontVariant: GetCodepoint") {
+  constexpr uint8 height = 10;
+  constexpr uint8 width = 10;
+  constexpr uint8 padding = 2;
+  std::vector<uint64> bitmap(FontVariant::kMaxNumCodePoints * height);
+
+  // fill bitmap for each codepoint alternating with 1 and std::numeric_limits<uint64>::max()
+  std::generate(bitmap.begin(), bitmap.end(),
+                [n = 0, zero = true]() mutable {
+                  if (n == height) {
+                    zero = !zero;
+                    n = 0;
+                  }
+                  n++;
+                  if (zero) {
+                    return static_cast<uint64>(1);
+                  } else {
+                    return std::numeric_limits<uint64>::max();
+                  }
+                });
+
+  FontVariant variant(height, width, padding, bitmap);
+  nonstd::span<const uint64> cp;
+
+  SECTION("in bounds") {
+    cp = variant.GetCodepoint(0);
+    REQUIRE(std::all_of(cp.begin(), cp.end(),
+                        [](uint64 l) { return l == 1; }) == true);
+
+    cp = variant.GetCodepoint(1);
+    REQUIRE(std::all_of(cp.begin(), cp.end(),
+                        [](uint64 l) { return l == std::numeric_limits<uint64>::max(); }) == true);
+  }
+
+  SECTION("out-of-bounds: all-zero bitmap") {
+    cp = variant.GetCodepoint(FontVariant::kMaxNumCodePoints);
+    REQUIRE(std::all_of(cp.begin(), cp.end(),
+                        [](uint64 l) { return l == 0; }) == true);
+  }
+}
+
+TEST_CASE("ZmFont: variants not loaded") {
+  ZmFont font;
+
+  SECTION("returns empty variant") {
+    FontVariant variant;
+    REQUIRE_NOTHROW(variant = font.GetFontVariant(0));
+
+    REQUIRE(variant.GetCharHeight() == 0);
+    REQUIRE(variant.GetCharWidth() == 0);
+    REQUIRE(variant.GetCodepoint(0).empty() == true);
+  }
+
+  SECTION("variant idx out-of-bounds") {
+    REQUIRE_THROWS(font.GetFontVariant(kNumFontSizes));
+  }
+}
+
+TEST_CASE("ZmFont: load font file") {
+  ZmFont font;
+
+  SECTION("file not found") {
+    REQUIRE(font.LoadFontFile("does_not_exist.zmfnt") == FontLoadError::kFileNotFound);
+  }
+
+  SECTION("invalid files") {
+    REQUIRE(font.LoadFontFile("data/fonts/01_bad_magic.zmfnt") == FontLoadError::kInvalidFile);
+    REQUIRE(font.LoadFontFile("data/fonts/02_variant_invalid.zmfnt") == FontLoadError::kInvalidFile);
+    REQUIRE(font.LoadFontFile("data/fonts/03_missing_cps.zmfnt") == FontLoadError::kInvalidFile);
+  }
+
+  SECTION("valid file") {
+    REQUIRE(font.LoadFontFile("data/fonts/04_valid.zmfnt") == FontLoadError::kOk);
+
+    uint8 var_idx = GENERATE(range(static_cast<std::remove_cv<decltype(kNumFontSizes)>::type>(0), kNumFontSizes));
+    FontVariant variant = font.GetFontVariant(var_idx);
+    REQUIRE(variant.GetCharHeight() == 10 + var_idx);
+    REQUIRE(variant.GetCharWidth() == 10 + var_idx);
+
+    uint8 cp_idx =
+        GENERATE_COPY(range(static_cast<decltype(variant.GetCodepointsCount())>(0), variant.GetCodepointsCount()));
+    nonstd::span<const uint64> cp = variant.GetCodepoint(cp_idx);
+    REQUIRE(std::all_of(cp.begin(), cp.end(),
+                        [=](uint64 l) { return l == var_idx; }) == true);
+  }
+}
diff --git a/tests/zm_utils.cpp b/tests/zm_utils.cpp
new file mode 100644
index 000000000..408b9f43e
--- /dev/null
+++ b/tests/zm_utils.cpp
@@ -0,0 +1,240 @@
+/*
+ * This file is part of the ZoneMinder Project. See AUTHORS file for Copyright information
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "catch2/catch.hpp"
+
+#include "zm_utils.h"
+#include <sstream>
+
+TEST_CASE("Trim") {
+  REQUIRE(Trim("", "") == "");
+  REQUIRE(Trim("test", "") == "test");
+  REQUIRE(Trim(" ", "") == " ");
+
+  REQUIRE(Trim("\"test", "\"") == "test");
+  REQUIRE(Trim("test\"", "\"") == "test");
+  REQUIRE(Trim("\"test\"", "\"") == "test");
+
+  REQUIRE(Trim("te\"st", "\"") == "te\"st");
+  REQUIRE(Trim("\"te\"st\"", "\"") == "te\"st");
+}
+
+TEST_CASE("TrimSpaces") {
+  REQUIRE(TrimSpaces(" ") == "");
+
+  REQUIRE(TrimSpaces("test") == "test");
+  REQUIRE(TrimSpaces(" test ") == "test");
+  REQUIRE(TrimSpaces("  test ") == "test");
+  REQUIRE(TrimSpaces("  test  ") == "test");
+  REQUIRE(TrimSpaces(" test") == "test");
+  REQUIRE(TrimSpaces("\ttest") == "test");
+  REQUIRE(TrimSpaces("test\t") == "test");
+  REQUIRE(TrimSpaces("\ttest\t") == "test");
+  REQUIRE(TrimSpaces(" test\t") == "test");
+  REQUIRE(TrimSpaces("\ttest ") == "test");
+  REQUIRE(TrimSpaces("\t test \t") == "test");
+
+  REQUIRE(TrimSpaces("\t te st \t") == "te st");
+}
+
+TEST_CASE("ReplaceAll") {
+  REQUIRE(ReplaceAll("", "", "") == "");
+
+  REQUIRE(ReplaceAll("a", "", "b") == "a");
+  REQUIRE(ReplaceAll("a", "a", "b") == "b");
+  REQUIRE(ReplaceAll("a", "b", "c") == "a");
+
+  REQUIRE(ReplaceAll("aa", "a", "b") == "bb");
+  REQUIRE(ReplaceAll("aba", "a", "c") == "cbc");
+
+  REQUIRE(ReplaceAll("aTOKENa", "TOKEN", "VAL") == "aVALa");
+  REQUIRE(ReplaceAll("aTOKENaTOKEN", "TOKEN", "VAL") == "aVALaVAL");
+}
+
+TEST_CASE("StartsWith") {
+  REQUIRE(StartsWith("", "") == true);
+
+  REQUIRE(StartsWith("test", "test") == true);
+  REQUIRE(StartsWith("test=abc", "test") == true);
+  REQUIRE(StartsWith(" test=abc", "test") == false);
+}
+
+TEST_CASE("Split (char delimiter)") {
+  std::vector<std::string> items = Split("", ' ');
+  REQUIRE(items == std::vector<std::string>{""});
+
+  items = Split("abc def ghi", ' ');
+  REQUIRE(items == std::vector<std::string>{"abc", "def", "ghi"});
+
+  items = Split("abc,def,,ghi", ',');
+  REQUIRE(items == std::vector<std::string>{"abc", "def", "", "ghi"});
+}
+
+TEST_CASE("Split (string delimiter)") {
+  std::vector<std::string> items;
+
+  items = Split("", "");
+  REQUIRE(items == std::vector<std::string>{""});
+
+  items = Split("", " ");
+  REQUIRE(items == std::vector<std::string>{""});
+
+  items = Split("", " \t");
+  REQUIRE(items == std::vector<std::string>{""});
+
+  items = Split("", " \t");
+  REQUIRE(items == std::vector<std::string>{""});
+
+  items = Split(" ", " ");
+  REQUIRE(items.size() == 0);
+
+  items = Split("  ", " ");
+  REQUIRE(items.size() == 0);
+
+  items = Split(" ", " \t");
+  REQUIRE(items.size() == 0);
+
+  items = Split("a b", "");
+  REQUIRE(items == std::vector<std::string>{"a b"});
+
+  items = Split("a b", " ");
+  REQUIRE(items == std::vector<std::string>{"a", "b"});
+
+  items = Split("a \tb", " \t");
+  REQUIRE(items == std::vector<std::string>{"a", "b"});
+
+  items = Split(" a \tb ", " \t");
+  REQUIRE(items == std::vector<std::string>{"a", "b"});
+
+  items = Split(" a=b ", "=");
+  REQUIRE(items == std::vector<std::string>{" a", "b "});
+
+  items = Split(" a=b ", " =");
+  REQUIRE(items == std::vector<std::string>{"a", "b"});
+
+  items = Split("a b c", " ", 2);
+  REQUIRE(items == std::vector<std::string>{"a", "b c"});
+}
+
+TEST_CASE("Join") {
+  REQUIRE(Join({}, "") == "");
+  REQUIRE(Join({}, " ") == "");
+  REQUIRE(Join({""}, "") == "");
+  REQUIRE(Join({"a"}, "") == "a");
+  REQUIRE(Join({"a"}, ",") == "a");
+  REQUIRE(Join({"a", "b"}, ",") == "a,b");
+  REQUIRE(Join({"a", "b"}, "") == "ab");
+}
+
+TEST_CASE("Base64Encode") {
+  REQUIRE(Base64Encode("") == "");
+  REQUIRE(Base64Encode("f") == "Zg==");
+  REQUIRE(Base64Encode("fo") == "Zm8=");
+  REQUIRE(Base64Encode("foo") == "Zm9v");
+  REQUIRE(Base64Encode("foob") == "Zm9vYg==");
+  REQUIRE(Base64Encode("fooba") == "Zm9vYmE=");
+  REQUIRE(Base64Encode("foobar") == "Zm9vYmFy");
+}
+
+TEST_CASE("ZM::clamp") {
+  REQUIRE(ZM::clamp(1, 0, 2) == 1);
+  REQUIRE(ZM::clamp(3, 0, 2) == 2);
+  REQUIRE(ZM::clamp(-1, 0, 2) == 0);
+}
+
+TEST_CASE("UriDecode") {
+  REQUIRE(UriDecode("abcABC123-_.~%21%28%29%26%3d%20") == "abcABC123-_.~!()&= ");
+  REQUIRE(UriDecode("abcABC123-_.~%21%28%29%26%3d+") == "abcABC123-_.~!()&= ");
+}
+
+TEST_CASE("QueryString") {
+  SECTION("no value") {
+    std::stringstream str("name1=");
+    QueryString qs(str);
+
+    REQUIRE(qs.size() == 1);
+    REQUIRE(qs.has("name1") == true);
+
+    const QueryParameter *p = qs.get("name1");
+    REQUIRE(p != nullptr);
+    REQUIRE(p->name() == "name1");
+    REQUIRE(p->size() == 0);
+  }
+
+  SECTION("no value and ampersand") {
+    std::stringstream str("name1=&");
+    QueryString qs(str);
+
+    REQUIRE(qs.size() == 1);
+    REQUIRE(qs.has("name1") == true);
+
+    const QueryParameter *p = qs.get("name1");
+    REQUIRE(p != nullptr);
+    REQUIRE(p->name() == "name1");
+    REQUIRE(p->size() == 0);
+  }
+
+  SECTION("one parameter, one value") {
+    std::stringstream str("name1=value1");
+    QueryString qs(str);
+
+    REQUIRE(qs.size() == 1);
+    REQUIRE(qs.has("name1") == true);
+
+    const QueryParameter *p = qs.get("name1");
+    REQUIRE(p != nullptr);
+    REQUIRE(p->name() == "name1");
+    REQUIRE(p->size() == 1);
+    REQUIRE(p->values()[0] == "value1");
+  }
+
+  SECTION("one parameter, multiple values") {
+    std::stringstream str("name1=value1&name1=value2");
+    QueryString qs(str);
+
+    REQUIRE(qs.size() == 1);
+    REQUIRE(qs.has("name1") == true);
+
+    const QueryParameter *p = qs.get("name1");
+    REQUIRE(p != nullptr);
+    REQUIRE(p->name() == "name1");
+    REQUIRE(p->size() == 2);
+    REQUIRE(p->values()[0] == "value1");
+    REQUIRE(p->values()[1] == "value2");
+  }
+
+  SECTION("multiple parameters, multiple values") {
+    std::stringstream str("name1=value1&name2=value2");
+    QueryString qs(str);
+
+    REQUIRE(qs.size() == 2);
+    REQUIRE(qs.has("name1") == true);
+    REQUIRE(qs.has("name2") == true);
+
+    const QueryParameter *p1 = qs.get("name1");
+    REQUIRE(p1 != nullptr);
+    REQUIRE(p1->name() == "name1");
+    REQUIRE(p1->size() == 1);
+    REQUIRE(p1->values()[0] == "value1");
+
+    const QueryParameter *p2 = qs.get("name2");
+    REQUIRE(p2 != nullptr);
+    REQUIRE(p2->name() == "name2");
+    REQUIRE(p2->size() == 1);
+    REQUIRE(p2->values()[0] == "value2");
+  }
+}
diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index d6107c5a9..289158c77 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -80,7 +80,7 @@ fi;
 
 if [ "$DISTROS" == "" ]; then
   if [ "$RELEASE" != "" ]; then
-    DISTROS="xenial,bionic,focal"
+    DISTROS="xenial,bionic,focal,groovy,hirsute"
   else
     DISTROS=`lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`;
   fi;
@@ -300,7 +300,7 @@ EOF
       DEBUILD="debuild -i -us -uc -b"
     else 
       # Source build, don't need build depends.
-      DEBUILD="debuild -S -sa"
+      DEBUILD="debuild -S -sa -sd"
     fi;
   fi;
   if [ "$DEBSIGN_KEYID" != "" ]; then
diff --git a/utils/mk_bigfont.pl b/utils/mk_bigfont.pl
index 41ebb34bf..96e6881c3 100755
--- a/utils/mk_bigfont.pl
+++ b/utils/mk_bigfont.pl
@@ -48,18 +48,18 @@ while (my $line = <F>) {
     $in_head-- if $line =~ /^$/ and $in_head;
     next while $in_head;
     unless ($line =~ /^\s+(0x..), \/\* (........)/) {
-        $line =~ s/static unsigned char fontdata/static unsigned int bigfontdata/;
+      #$line =~ s/static unsigned char fontdata/static unsigned int bigfontdata/;
         print $line;
         next;
     }
     my $code = $1;
     my $bincode = $2;
     $bincode = "$1$1$2$2$3$3$4$4$5$5$6$6$7$7$8$8" if $bincode =~ /(.)(.)(.)(.)(.)(.)(.)(.)$/;
-    $bincode =~ s/ /1/g;
-    my $intcode = unpack("N", pack("B32", substr("0" x 32 . $bincode, -32)));
-    my $hexcode = sprintf("%#x", $intcode);
-    $hexcode =~ s/^0$/0x0/;
-    $bincode =~ s/1/ /g;
+    #$bincode =~ s/ /1/g;
+    #my $intcode = unpack("N", pack("B32", substr("0" x 32 . $bincode, -32)));
+    #my $hexcode = sprintf("%#x", $intcode);
+    #$hexcode =~ s/^0$/0x0/;
+    #$bincode =~ s/1/ /g;
     print sprintf("\t%10s, /* %s */\n", $hexcode, $bincode);
     print sprintf("\t%10s, /* %s */\n", $hexcode, $bincode);
 }
diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index 1b2eafd8f..f2d629dbd 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -94,12 +94,12 @@ commonprep () {
 
     # The rpm specfile requires we download each submodule as a tarball then manually move it into place
     # Might as well do this for Debian as well, rather than git submodule init
-    CRUDVER="3.1.0-zm"
+    CRUDVER="3.2.0"
     if [ -e "build/crud-${CRUDVER}.tar.gz" ]; then
         echo "Found existing Crud ${CRUDVER} tarball..."
     else
         echo "Retrieving Crud ${CRUDVER} submodule..."
-        curl -L https://github.com/ZoneMinder/crud/archive/v${CRUDVER}.tar.gz > build/crud-${CRUDVER}.tar.gz
+        curl -L https://github.com/FriendsOfCake/crud/archive/v${CRUDVER}.tar.gz > build/crud-${CRUDVER}.tar.gz
         if [ $? -ne 0 ]; then
             echo "ERROR: Crud tarball retreival failed..."
             exit 1
@@ -117,6 +117,18 @@ commonprep () {
             exit 1
         fi
     fi
+
+    RTSPVER="cd7fd49becad6010a1b8466bfebbd93999a39878"
+    if [ -e "build/RtspServer-${RTSPVER}.tar.gz" ]; then
+        echo "Found existing RtspServer ${RTSPVER} tarball..."
+    else
+        echo "Retrieving RTSP ${RTSPVER} submodule..."
+        curl -L https://github.com/ZoneMinder/RtspServer/archive/${RTSPVER}.tar.gz > build/RtspServer-${RTSPVER}.tar.gz
+        if [ $? -ne 0 ]; then
+            echo "ERROR: RtspServer tarball retreival failed..."
+            exit 1
+        fi
+    fi
 }
 
 # Uncompress the submodule tarballs and move them into place
@@ -137,6 +149,14 @@ movecrud () {
         rmdir web/api/app/Plugin/CakePHP-Enum-Behavior
         mv -f CakePHP-Enum-Behavior-${CEBVER} web/api/app/Plugin/CakePHP-Enum-Behavior
     fi
+    if [ -e "dep/RtspServer/CMakeLists.txt" ]; then
+        echo "RtspServer already installed..."
+    else
+        echo "Unpacking RtspServer..."
+        tar -xzf build/RtspServer-${RTSPVER}.tar.gz
+        rmdir dep/RtspServer
+        mv -f RtspServer-${RTSPVER} dep/RtspServer
+    fi
 }
 
 # previsouly part of installzm.sh
@@ -200,7 +220,9 @@ setdebpkgname () {
 
     # Set VERSION to {zm version}~{today's date}.{number of commits} e.g. 1.31.0~20170605.82
     # Set RELEASE to the packpack DIST variable e.g. Trusty
-    export VERSION="${versionfile}~${thedate}.${numcommits}"
+    if [ "" == "$VERSION" ]; then
+      export VERSION="${versionfile}~${thedate}.${numcommits}"
+    fi
     export RELEASE="${DIST}"
 
     checkvars
@@ -347,7 +369,7 @@ elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbia
   setdebpkgname
   movecrud
 
-  if [ "${DIST}" == "focal" ] || [ "${DIST}" == "buster" ]; then
+  if [ "${DIST}" == "focal" ] || [ "${DIST}" == "groovy" ] || [ "${DIST}" == "hirsuit" ] || [ "${DIST}" == "buster" ]; then
     ln -sfT distros/ubuntu2004 debian
   elif [ "${DIST}" == "beowulf" ]; then
     ln -sfT distros/beowulf debian
diff --git a/version b/version
index 21cbe96c2..b538e3240 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.35.6
+1.35.28
diff --git a/web/CMakeLists.txt b/web/CMakeLists.txt
index b3d097739..9676f1cfa 100644
--- a/web/CMakeLists.txt
+++ b/web/CMakeLists.txt
@@ -2,27 +2,18 @@
 
 # Process the api subdirectory
 add_subdirectory(api)
-# Process the tools/mootools subdirectory
-add_subdirectory(tools/mootools)
-
 # Create files from the .in files
 configure_file(includes/config.php.in "${CMAKE_CURRENT_BINARY_DIR}/includes/config.php" @ONLY)
 
 # Install the web files
-install(DIRECTORY vendor api ajax css fonts graphics includes js lang skins tools views DESTINATION "${ZM_WEBDIR}" PATTERN "*.in" EXCLUDE PATTERN "*Make*" EXCLUDE PATTERN "*cmake*" EXCLUDE)
+install(DIRECTORY vendor api ajax css fonts graphics includes js lang skins views DESTINATION "${ZM_WEBDIR}" PATTERN "*.in" EXCLUDE PATTERN "*Make*" EXCLUDE PATTERN "*cmake*" EXCLUDE)
 install(FILES index.php robots.txt DESTINATION "${ZM_WEBDIR}")
 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/includes/config.php" DESTINATION "${ZM_WEBDIR}/includes")
 
 # Install the api config files (if its not in the source directory)
 if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/core.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/database.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/lib/Cake/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/lib/Cake")
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-
-# Install the mootools symlinks (if its not in the source directory)
-if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/mootools/mootools-core.js" DESTINATION "${ZM_WEBDIR}/tools/mootools")
-	install(FILES "${CMAKE_CURRENT_BINARY_DIR}/tools/mootools/mootools-more.js" DESTINATION "${ZM_WEBDIR}/tools/mootools")
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/core.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/database.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/app/Config/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/app/Config")
+  install(FILES "${CMAKE_CURRENT_BINARY_DIR}/api/lib/Cake/bootstrap.php" DESTINATION "${ZM_WEBDIR}/api/lib/Cake")
+endif()
diff --git a/web/ajax/add_monitors.php b/web/ajax/add_monitors.php
index e7048bb4a..4a6809cf9 100644
--- a/web/ajax/add_monitors.php
+++ b/web/ajax/add_monitors.php
@@ -1,14 +1,22 @@
 <?php
+error_reporting(0);
 
 $defaultMonitor = new ZM\Monitor();
 $defaultMonitor->set(array(
   'StorageId' =>  1,
   'ServerId'  =>  'auto',
-  'Function'  =>  'Record',
+  'Function'  =>  'Mocord',
   'Type'      =>  'Ffmpeg',
   'Enabled'   =>  '1',
   'Colour'    =>  '4', // 32bit
-  'PreEventCount' =>  0,
+  'ImageBufferCount'  =>  '20',
+  'WarmupCount' =>  '0',
+  'PreEventCount' =>  '0',
+  'StreamReplayBuffer'  =>  '0',
+  'SaveJPEGs' =>  '4',
+  'VideoWriter' =>  '1',
+  'MaxFPS'      =>  '20',
+  'AlarmMaxFPS' =>  '20',
 ) );
 
 function probe( &$url_bits ) {
@@ -19,11 +27,11 @@ function probe( &$url_bits ) {
 
     $cam_list_html = file_get_contents('http://'.$url_bits['host'].':5000/monitoring/');
     if ( $cam_list_html ) {
-      ZM\Logger::Debug("Have content at port 5000/monitoring");
+      ZM\Debug("Have content at port 5000/monitoring");
       $matches_count = preg_match_all(
           '/<a href="http:\/\/([.[:digit:]]+):([[:digit:]]+)\/\?action=stream" target="_blank">([^<]+)<\/a>/',
           $cam_list_html, $cam_list );
-      ZM\Logger::Debug(print_r($cam_list,true));
+      ZM\Debug(print_r($cam_list,true));
     }
     if ( $matches_count ) {
       for( $index = 0; $index < $matches_count; $index ++ ) {
@@ -33,7 +41,7 @@ function probe( &$url_bits ) {
         if ( ! isset($new_stream['scheme'] ) )
           $new_stream['scheme'] = 'http';
         $available_streams[] = $new_stream;          
-ZM\Logger::Debug("Have new stream " . print_r($new_stream,true) );
+ZM\Debug("Have new stream " . print_r($new_stream,true) );
       }
     } else {
       ZM\Info('No matches');
diff --git a/web/ajax/controlcaps.php b/web/ajax/controlcaps.php
new file mode 100644
index 000000000..9e655c128
--- /dev/null
+++ b/web/ajax/controlcaps.php
@@ -0,0 +1,33 @@
+<?php
+if ( !canEdit('Control') ) {
+  ZM\Warning('Need Control permissions to edit control capabilities');
+  return;
+}
+
+if ( empty($_REQUEST['action']) ) {
+  ajaxError('Action Not Provided');
+  return;
+} else {
+  $action = $_REQUEST['action'];
+}
+
+if ( isset($_REQUEST['cids']) ) {
+  $cids = $_REQUEST['cids'];
+} else {
+  ajaxError('At least one Control Id must be Provided.');
+  return;
+}
+
+if ( $action == 'delete' ) {
+    foreach( $cids as $cid ) {
+      dbQuery('UPDATE Monitors SET Controllable = 0, ControlId = 0 WHERE ControlId = ?', array($cid));
+      dbQuery('DELETE FROM Controls WHERE Id = ?', array($cid));
+    }
+} else {
+  ajaxError('Unrecognised action ' .$_REQUEST['action']);
+  return;
+}
+
+ajaxResponse();
+return;
+?>
diff --git a/web/ajax/device.php b/web/ajax/device.php
new file mode 100644
index 000000000..71e76d8f7
--- /dev/null
+++ b/web/ajax/device.php
@@ -0,0 +1,47 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+// Device view actions
+if ( !canEdit('Devices') ) {
+  ajaxError('Insufficient permissions for user '.$user['Username']);
+  return;
+}
+
+if ( $action == 'device' ) {
+  if ( !empty($_REQUEST['command']) ) {
+    setDeviceStatusX10($_REQUEST['key'], $_REQUEST['command']);
+  } else if ( isset($_REQUEST['newDevice']) ) {
+    if ( isset($_REQUEST['did']) && $_REQUEST['did'] ) {
+      ZM\Warning('did value is: '.$_REQUEST['did']);
+      ZM\Warning('newDevice array value is: '.print_r($_REQUEST['newDevice'],true));
+      dbQuery('UPDATE Devices SET Name=?, KeyString=? WHERE Id=?',
+        array($_REQUEST['newDevice']['Name'], $_REQUEST['newDevice']['KeyString'], $_REQUEST['did']) );
+    } else {
+
+      dbQuery('INSERT INTO Devices SET Name=?, KeyString=?',
+        array($_REQUEST['newDevice']['Name'], $_REQUEST['newDevice']['KeyString']) );
+    }
+  }
+  ajaxResponse();
+} else {
+  ajaxError('Unrecognised action '.$_REQUEST['action']);
+} // end if action
+
+?>
diff --git a/src/zm_threaddata.cpp b/web/ajax/devices.php
similarity index 58%
rename from src/zm_threaddata.cpp
rename to web/ajax/devices.php
index 6b25d5714..25d17af49 100644
--- a/src/zm_threaddata.cpp
+++ b/web/ajax/devices.php
@@ -1,21 +1,38 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
 //
-// ZoneMinder Explicit Thread Template Class Instantiations, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-// 
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License
 // as published by the Free Software Foundation; either version 2
 // of the License, or (at your option) any later version.
-// 
+//
 // This program is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 // GNU General Public License for more details.
-// 
+//
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-// 
+//
 
-template class ThreadData<bool>;
-template class ThreadData<int>;
+// Device view actions
+if ( !canEdit('Devices') ) {
+  ajaxError('Insufficient permissions for user '.$user['Username']);
+  return;
+}
+
+if ( $action == 'delete' ) {
+  if ( isset($_REQUEST['markDids']) ) {
+    foreach( $_REQUEST['markDids'] as $markDid ) {
+      dbQuery('DELETE FROM Devices WHERE Id=?', array($markDid));
+    }
+  }
+  ajaxResponse();
+} else {
+  ajaxError('Unrecognised action '.$_REQUEST['action']);
+}
+
+?>
diff --git a/web/ajax/events.php b/web/ajax/events.php
index 16c777ebf..8a8e3a4f1 100644
--- a/web/ajax/events.php
+++ b/web/ajax/events.php
@@ -1,41 +1,266 @@
 <?php
-ini_set('display_errors', '0');
+$message = '';
+$data = array();
 
-if ( empty($_REQUEST['eids']) ) {
-  ajaxError('No event id(s) supplied');
+//
+// INITIALIZE AND CHECK SANITY
+//
+
+if ( !canView('Events') ) $message = 'Insufficient permissions for user '.$user['Username'];
+
+if ( empty($_REQUEST['task']) ) {
+  $message = 'Must specify a task';
+} else {
+  $task = $_REQUEST['task'];
 }
 
-if ( canView('Events') ) {
-} // end if canView('Events')
+if ( empty($_REQUEST['eids']) ) {
+  if ( isset($_REQUEST['task']) && $_REQUEST['task'] != 'query' ) $message = 'No event id(s) supplied';
+} else {
+  $eids = $_REQUEST['eids'];
+}
 
-if ( canEdit('Events') ) {
+if ( $message ) {
+  ajaxError($message);
+  return;
+}
+
+require_once('includes/Filter.php');
+$filter = isset($_REQUEST['filter']) ? ZM\Filter::parse($_REQUEST['filter']) : new ZM\Filter();
+if ( $user['MonitorIds'] ) {
+  $filter = $filter->addTerm(array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'IN', 'val'=>$user['MonitorIds']));
+}
+
+// Search contains a user entered string to search on
+$search = isset($_REQUEST['search']) ? $_REQUEST['search'] : '';
+
+// Advanced search contains an array of "column name" => "search text" pairs
+// Bootstrap table sends json_ecoded array, which we must decode
+$advsearch = isset($_REQUEST['advsearch']) ? json_decode($_REQUEST['advsearch'], JSON_OBJECT_AS_ARRAY) : array();
+
+// Sort specifies the name of the column to sort on
+$sort = 'StartDateTime';
+if ( isset($_REQUEST['sort']) ) {
+  $sort = $_REQUEST['sort'];
+}
+
+// Offset specifies the starting row to return, used for pagination
+$offset = 0;
+if ( isset($_REQUEST['offset']) ) {
+  if ( ( !is_int($_REQUEST['offset']) and !ctype_digit($_REQUEST['offset']) ) ) {
+    ZM\Error('Invalid value for offset: ' . $_REQUEST['offset']);
+  } else {
+    $offset = $_REQUEST['offset'];
+  }
+}
+
+// Order specifies the sort direction, either asc or desc
+$order = (isset($_REQUEST['order']) and (strtolower($_REQUEST['order']) == 'asc')) ? 'ASC' : 'DESC';
+
+// Limit specifies the number of rows to return
+// Set the default to 0 for events view, to prevent an issue with ALL pagination
+$limit = 0;
+if ( isset($_REQUEST['limit']) ) {
+  if ( ( !is_int($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
+    ZM\Error('Invalid value for limit: ' . $_REQUEST['limit']);
+  } else {
+    $limit = $_REQUEST['limit'];
+  }
+}
+
+//
+// MAIN LOOP
+//
+
+switch ( $task ) {
+  case 'archive' :
+    foreach ( $eids as $eid ) archiveRequest($task, $eid);
+    break;
+  case 'unarchive' :
+		# The idea is that anyone can archive, but only people with Event Edit permission can unarchive..
+		if ( !canEdit('Events') )  {
+			ajaxError('Insufficient permissions for user '.$user['Username']);
+			return;
+		}
+    foreach ( $eids as $eid ) archiveRequest($task, $eid);
+    break;
+  case 'delete' :
+		if ( !canEdit('Events') )  {
+			ajaxError('Insufficient permissions for user '.$user['Username']);
+			return;
+		}
+
+    foreach ( $eids as $eid ) $data[] = deleteRequest($eid);
+    break;
+  case 'query' :
+    $data = queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $limit);
+    break;
+  default :
+    ZM\Fatal("Unrecognised task '$task'");
+} // end switch task
+
+ajaxResponse($data);
+
+//
+// FUNCTION DEFINITIONS
+//
+
+function archiveRequest($task, $eid) {
+  $archiveVal = ($task == 'archive') ? 1 : 0;
+  dbQuery(
+    'UPDATE Events SET Archived = ? WHERE Id = ?',
+    array($archiveVal, $eid)
+  );
+}
+
+function deleteRequest($eid) {
   $message = array();
+  $event = new ZM\Event($eid);
+  if ( !$event->Id() ) {
+    $message[] = array($eid=>'Event not found.');
+  } else if ( $event->Archived() ) {
+    $message[] = array($eid=>'Event is archived, cannot delete it.');
+  } else {
+    $event->delete();
+  }
+  
+  return $message;
+}
 
-  foreach ( $_REQUEST['eids'] as $eid ) {
+function queryRequest($filter, $search, $advsearch, $sort, $offset, $order, $limit) {
 
-    switch ( $_REQUEST['action'] ) {
-    case 'archive' :
-    case 'unarchive' :
-      $archiveVal = ($_REQUEST['action'] == 'archive') ? 1 : 0;
-      dbQuery(
-        'UPDATE Events SET Archived = ? WHERE Id = ?',
-        array($archiveVal, $eid)
-      );
-      break;
-    case 'delete' :
-      $event = new ZM\Event($eid);
-      if ( !$event->Id() ) {
-        $message[] = array($eid=>'Event not found.');
-      } else if ( $event->Archived() ) {
-        $message[] = array($eid=>'Event is archived, cannot delete it.');
-      } else {
-        $event->delete();
+  $data = array(
+    'total'   =>  0,
+    'totalNotFiltered' => 0,
+    'rows'    =>  array(),
+    'updated' =>  preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG)
+  );
+
+  $failed = !$filter->test_pre_sql_conditions();
+  if ( $failed ) {
+    ZM\Debug('Pre conditions failed, not doing sql');
+    return $data;
+  }
+
+  // Put server pagination code here
+  // The table we want our data from
+  $table = 'Events';
+
+  // The names of the dB columns in the events table we are interested in
+  $columns = array('Id', 'MonitorId', 'StorageId', 'Name', 'Cause', 'StartDateTime', 'EndDateTime', 'Length', 'Frames', 'AlarmFrames', 'TotScore', 'AvgScore', 'MaxScore', 'Archived', 'Emailed', 'Notes', 'DiskSpace');
+
+  // The names of columns shown in the event view that are NOT dB columns in the database
+  $col_alt = array('Monitor', 'Storage');
+
+  if ( !in_array($sort, array_merge($columns, $col_alt)) ) {
+    ZM\Error('Invalid sort field: ' . $sort);
+    $sort = 'Id';
+  }
+
+  $values = array();
+  $likes = array();
+  $where = $filter->sql()?' WHERE ('.$filter->sql().')' : '';
+
+  $sort = $sort == 'Monitor' ? 'M.Name' : 'E.'.$sort;
+  $col_str = 'E.*, M.Name AS Monitor';
+  $sql = 'SELECT ' .$col_str. ' FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id'.$where.' ORDER BY '.$sort.' '.$order;
+
+  $storage_areas = ZM\Storage::find();
+  $StorageById = array();
+  foreach ( $storage_areas as $S ) {
+    $StorageById[$S->Id()] = $S;
+  }
+
+  $unfiltered_rows = array();
+  $event_ids = array();
+
+  ZM\Debug('Calling the following sql query: ' .$sql);
+  $query = dbQuery($sql, $values);
+  if ( $query ) {
+    while ( $row = dbFetchNext($query) ) {
+      $event = new ZM\Event($row);
+      $event->remove_from_cache();
+      if ( !$filter->test_post_sql_conditions($event) ) {
+        continue;
       }
-      break;
-    } // end switch action
-  } // end foreach
-  ajaxResponse($message);
-} // end if canEdit('Events')
+      $event_ids[] = $event->Id();
+      $unfiltered_rows[] = $row;
+    } # end foreach row
+  }
 
-ajaxError('Unrecognised action '.$_REQUEST['action'].' or insufficient permissions for user '.$user['Username']);
+  ZM\Debug('Have ' . count($unfiltered_rows) . ' events matching base filter.');
+
+  $filtered_rows = null;
+
+  if ( count($advsearch) or $search != '' ) {
+    $search_filter = new ZM\Filter();
+    $search_filter = $search_filter->addTerm(array('cnj'=>'and', 'attr'=>'Id', 'op'=>'IN', 'val'=>$event_ids));
+
+    // There are two search bars in the log view, normal and advanced
+    // Making an exuctive decision to ignore the normal search, when advanced search is in use
+    // Alternatively we could try to do both
+    if ( count($advsearch) ) {
+      $terms = array();
+      foreach ( $advsearch as $col=>$text ) {
+        $terms[] = array('cnj'=>'and', 'attr'=>$col, 'op'=>'LIKE', 'val'=>$text);
+      } # end foreach col in advsearch
+      $terms[0]['obr'] = 1;
+      $terms[count($terms)-1]['cbr'] = 1;
+      $search_filter->addTerms($terms);
+    } else if ( $search != '' ) {
+      $search = '%' .$search. '%';
+      $terms = array();
+      foreach ( $columns as $col ) {
+        $terms[] = array('cnj'=>'or', 'attr'=>$col, 'op'=>'LIKE', 'val'=>$search);
+      }
+      $terms[0]['obr'] = 1;
+      $terms[0]['cnj'] = 'and';
+      $terms[count($terms)-1]['cbr'] = 1;
+      $search_filter = $search_filter->addTerms($terms, array('obr'=>1, 'cbr'=>1, 'op'=>'OR'));
+    } # end if search
+
+    $sql = 'SELECT ' .$col_str. ' FROM `Events` AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE '.$search_filter->sql().' ORDER BY ' .$sort. ' ' .$order;
+    ZM\Debug('Calling the following sql query: ' .$sql);
+    $filtered_rows = dbFetchAll($sql);
+    ZM\Debug('Have ' . count($filtered_rows) . ' events matching search filter.');
+  } else {
+    $filtered_rows = $unfiltered_rows;
+  } # end if search_filter->terms() > 1
+
+  $returned_rows = array();
+  foreach ( array_slice($filtered_rows, $offset, $limit) as $row ) {
+    $event = new ZM\Event($row);
+
+    $scale = intval(5*100*ZM_WEB_LIST_THUMB_WIDTH / $event->Width());
+    $imgSrc = $event->getThumbnailSrc(array(), '&amp;');
+    $streamSrc = $event->getStreamSrc(array(
+      'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single', 'rate'=>'400'), '&amp;');
+
+    // Modify the row data as needed
+    $row['imgHtml'] = '<img id="thumbnail' .$event->Id(). '" src="' .$imgSrc. '" alt="Event '.$event->Id().'" width="' .validInt($event->ThumbnailWidth()). '" height="' .validInt($event->ThumbnailHeight()).'" stream_src="' .$streamSrc. '" still_src="' .$imgSrc. '"/>';
+    $row['Name'] = validHtmlStr($row['Name']);
+    $row['Archived'] = $row['Archived'] ? translate('Yes') : translate('No');
+    $row['Emailed'] = $row['Emailed'] ? translate('Yes') : translate('No');
+    $row['Cause'] = validHtmlStr($row['Cause']);
+    $row['StartDateTime'] = strftime(STRF_FMT_DATETIME_SHORTER, strtotime($row['StartDateTime']));
+    $row['EndDateTime'] = $row['EndDateTime'] ? strftime(STRF_FMT_DATETIME_SHORTER, strtotime($row['EndDateTime'])) : null;
+    $row['Length'] = gmdate('H:i:s', $row['Length'] );
+    $row['Storage'] = ( $row['StorageId'] and isset($StorageById[$row['StorageId']]) ) ? $StorageById[$row['StorageId']]->Name() : 'Default';
+    $row['Notes'] = nl2br(htmlspecialchars($row['Notes']));
+    $row['DiskSpace'] = human_filesize($event->DiskSpace());
+    $returned_rows[] = $row;
+  } # end foreach row matching search
+
+  $data['rows'] = $returned_rows;
+
+  # totalNotFiltered must equal total, except when either search bar has been used
+  $data['totalNotFiltered'] = count($unfiltered_rows);
+  if ( $search != '' || count($advsearch) ) {
+    $data['total'] = count($filtered_rows);
+  } else {
+    $data['total'] = $data['totalNotFiltered'];
+  }
+
+  return $data;
+}
 ?>
diff --git a/web/ajax/frames.php b/web/ajax/frames.php
new file mode 100644
index 000000000..e129200e7
--- /dev/null
+++ b/web/ajax/frames.php
@@ -0,0 +1,204 @@
+<?php
+$data = array();
+$message = '';
+
+//
+// INITIALIZE AND CHECK SANITY
+//
+
+if ( !canView('Events') ) $message = 'Insufficient permissions to view frames for user '.$user['Username'];
+
+// task must be set
+if ( empty($_REQUEST['task']) ) {
+  $message = 'This request requires a task to be set';
+// query is the only supported task at the moment
+} else if ( $_REQUEST['task'] != 'query' ) {
+  $message = 'Unrecognised task '.$_REQUEST['task'];
+  } else {
+  $task = $_REQUEST['task'];
+}
+
+if ( empty($_REQUEST['eid']) ) {
+  $message = 'No event id supplied';
+} else {
+  $eid = validInt($_REQUEST['eid']);
+}
+
+if ( $message ) {
+  ajaxError($message);
+  return;
+}
+
+// Search contains a user entered string to search on
+$search = isset($_REQUEST['search']) ? $_REQUEST['search'] : '';
+
+// Advanced search contains an array of "column name" => "search text" pairs
+// Bootstrap table sends json_ecoded array, which we must decode
+$advsearch = isset($_REQUEST['advsearch']) ? json_decode($_REQUEST['advsearch'], JSON_OBJECT_AS_ARRAY) : array();
+
+// Sort specifies the name of the column to sort on
+$sort = 'FrameId';
+if ( isset($_REQUEST['sort']) ) {
+  $sort = $_REQUEST['sort'];
+}
+
+// Offset specifies the starting row to return, used for pagination
+$offset = 0;
+if ( isset($_REQUEST['offset']) ) {
+  if ( ( !is_int($_REQUEST['offset']) and !ctype_digit($_REQUEST['offset']) ) ) {
+    ZM\Error('Invalid value for offset: ' . $_REQUEST['offset']);
+  } else {
+    $offset = $_REQUEST['offset'];
+  }
+}
+
+// Order specifies the sort direction, either asc or desc
+$order = (isset($_REQUEST['order']) and (strtolower($_REQUEST['order']) == 'asc')) ? 'ASC' : 'DESC';
+
+// Limit specifies the number of rows to return
+$limit = 0;
+if ( isset($_REQUEST['limit']) ) {
+  if ( ( !is_int($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
+    ZM\Error('Invalid value for limit: ' . $_REQUEST['limit']);
+  } else {
+    $limit = $_REQUEST['limit'];
+  }
+}
+
+//
+// MAIN LOOP
+//
+
+// Only one supported task at the moment
+switch ( $task ) {
+  case 'query' :
+    $data = queryRequest($eid, $search, $advsearch, $sort, $offset, $order, $limit);
+    break;
+  default :
+    ZM\Fatal("Unrecognised task '$task'");
+} // end switch task
+
+ajaxResponse($data);
+
+//
+// FUNCTION DEFINITIONS
+//
+
+function queryRequest($eid, $search, $advsearch, $sort, $offset, $order, $limit) {
+
+  $data = array(
+    'total'   =>  0,
+    'totalNotFiltered' => 0,
+    'rows'    =>  array(),
+    'updated' =>  preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG)
+  );
+
+  // The names of the dB columns in the events table we are interested in
+  $columns = array('FrameId', 'Type', 'TimeStamp', 'Delta', 'Score');
+
+  if ( !in_array($sort, $columns) ) {
+    ZM\Error('Invalid sort field: ' . $sort);
+    $sort = 'FrameId';
+  }
+
+  $Event = new ZM\Event($eid);
+  $Monitor = $Event->Monitor();
+  $values = array();
+  $likes = array();
+  $where = 'WHERE EventId = '.$eid;
+
+  $sql = 'SELECT * FROM `Frames` '.$where.' ORDER BY '.$sort.' '.$order;
+
+  //ZM\Debug('Calling the following sql query: ' .$sql);
+
+  $unfiltered_rows = array();
+  $frame_ids = array();
+  require_once('includes/Frame.php');
+  foreach ( dbFetchAll($sql, NULL, $values) as $row ) {
+    $frame = new ZM\Frame($row);
+    $frame_ids[] = $frame->Id();
+    $unfiltered_rows[] = $row;
+  }
+
+  ZM\Debug('Have ' . count($unfiltered_rows) . ' frames matching base filter.');
+
+  $filtered_rows = null;
+  require_once('includes/Filter.php');
+  if ( count($advsearch) or $search != '' ) {
+    $search_filter = new ZM\Filter();
+    $search_filter = $search_filter->addTerm(array('cnj'=>'and', 'attr'=>'FrameId', 'op'=>'IN', 'val'=>$frame_ids));
+
+    // There are two search bars in the log view, normal and advanced
+    // Making an exuctive decision to ignore the normal search, when advanced search is in use
+    // Alternatively we could try to do both
+    if ( count($advsearch) ) {
+      $terms = array();
+      foreach ( $advsearch as $col=>$text ) {
+        $terms[] = array('cnj'=>'and', 'attr'=>$col, 'op'=>'LIKE', 'val'=>$text);
+      } # end foreach col in advsearch
+      $terms[0]['obr'] = 1;
+      $terms[count($terms)-1]['cbr'] = 1;
+      $search_filter->addTerms($terms);
+    } else if ( $search != '' ) {
+      $search = '%' .$search. '%';
+      $terms = array();
+      foreach ( $columns as $col ) {
+        $terms[] = array('cnj'=>'or', 'attr'=>$col, 'op'=>'LIKE', 'val'=>$search);
+      }
+      $terms[0]['obr'] = 1;
+      $terms[0]['cnj'] = 'and';
+      $terms[count($terms)-1]['cbr'] = 1;
+      $search_filter = $search_filter->addTerms($terms, array('obr'=>1, 'cbr'=>1, 'op'=>'OR'));
+    } # end if search
+
+    $sql = 'SELECT * FROM `Frames` WHERE '.$search_filter->sql().' ORDER BY ' .$sort. ' ' .$order;
+    $filtered_rows = dbFetchAll($sql);
+    ZM\Debug('Have ' . count($filtered_rows) . ' frames matching search filter.');
+  } else {
+    $filtered_rows = $unfiltered_rows;
+  } # end if search_filter->terms() > 1
+
+  $returned_rows = array();
+  foreach ( array_slice($filtered_rows, $offset, $limit) as $row ) {
+    if ( ZM_WEB_LIST_THUMBS ) {
+
+      # Build the path to the potential analysis image
+      $analImage = sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyse.jpg', $row['FrameId']);
+      $analPath = $Event->Path().'/'.$analImage;
+      $alarmFrame = $row['Type'] == 'Alarm';
+      $hasAnalImage = $alarmFrame && file_exists($analPath) && filesize($analPath);
+
+      # Our base img source component, which we will add on to
+      $base_img_src = '?view=image&amp;fid=' .$row['Id'];
+
+      # if an analysis images exists, use it as the thumbnail
+      if ( $hasAnalImage ) $base_img_src .= '&amp;show=analyse';
+
+      # Build the subcomponents needed for the image source
+      $ratio_factor = $Monitor->ViewHeight() / $Monitor->ViewWidth();
+      $thmb_width = ZM_WEB_LIST_THUMB_WIDTH ? 'width='.ZM_WEB_LIST_THUMB_WIDTH : '';
+      $thmb_height = 'height="'.( ZM_WEB_LIST_THUMB_HEIGHT ? ZM_WEB_LIST_THUMB_HEIGHT : ZM_WEB_LIST_THUMB_WIDTH*$ratio_factor ) .'"';
+      $thmb_fn = 'filename=' .$Event->MonitorId(). '_' .$row['EventId']. '_' .$row['FrameId']. '.jpg';
+
+      # Assemble the scaled and unscaled image source image source components
+      $img_src = join('&amp;', array_filter(array($base_img_src, $thmb_width, $thmb_height, $thmb_fn)));
+      $full_img_src = join('&amp;', array_filter(array($base_img_src, $thmb_fn)));
+      
+      # finally, we assemble the the entire thumbnail img src structure, whew
+      $row['Thumbnail'] = '<img src="' .$img_src. '" '.$thmb_width. ' ' .$thmb_height. 'img_src="' .$img_src. '" full_img_src="' .$full_img_src. '">';
+    }
+      $returned_rows[] = $row;
+  } # end foreach row matching search
+
+  $data['rows'] = $returned_rows;
+
+  # totalNotFiltered must equal total, except when either search bar has been used
+  $data['totalNotFiltered'] = count($unfiltered_rows);
+  if ( $search != '' || count($advsearch) ) {
+    $data['total'] = count($filtered_rows);
+  } else {
+    $data['total'] = $data['totalNotFiltered'];
+  }
+
+  return $data;
+}
diff --git a/web/ajax/log.php b/web/ajax/log.php
index d5483b7ca..c5181e49b 100644
--- a/web/ajax/log.php
+++ b/web/ajax/log.php
@@ -1,455 +1,184 @@
 <?php
-ini_set('display_errors', '0');
+$data = array();
+$message = '';
 
-# Moved up here because it is used in several spots.
-# These are the valid columns that you can filter on.
-$filterFields = array('Component', 'ServerId', 'Pid', 'Level', 'File', 'Line');
+//
+// INITIALIZE AND CHECK SANITY
+//
 
-function buildLogQuery($action) {
-  global $filterFields;
+if ( !canView('System') )
+  $message = 'Insufficient permissions to view log entries for user '.$user['Username'];
 
-  $minTime = isset($_REQUEST['minTime']) ? $_REQUEST['minTime'] : NULL;
-  $maxTime = isset($_REQUEST['maxTime']) ? $_REQUEST['maxTime'] : NULL;
+// task must be set
+if ( !isset($_REQUEST['task']) ) {
+  $message = 'This request requires a task to be set';
+} else if ( $_REQUEST['task'] != 'query' && $_REQUEST['task'] != 'create' ) {
+  // Only the query and create tasks are supported at the moment
+  $message = 'Unrecognised task '.$_REQUEST['task'];
+} else {
+  $task = $_REQUEST['task'];
+}
 
+if ( $message ) {
+  ajaxError($message);
+  return;
+}
+
+//
+// MAIN LOOP
+//
+
+switch ( $task ) {
+  case 'create' :
+    createRequest();
+    break;
+  case 'query' :
+    $data = queryRequest();
+    break;
+  default :
+    ZM\Fatal('Unrecognised task '.$task);
+} // end switch task
+
+ajaxResponse($data);
+
+//
+// FUNCTION DEFINITIONS
+//
+
+function createRequest() {
+  if ( !empty($_POST['level']) && !empty($_POST['message']) ) {
+    ZM\logInit(array('id'=>'web_js'));
+
+    $string = $_POST['message'];
+
+    $file = !empty($_POST['file']) ? preg_replace('/\w+:\/\/[\w.:]+\//', '', $_POST['file']) : '';
+    if ( !empty($_POST['line']) ) {
+      $line = validInt($_POST['line']);
+    } else {
+      $line = NULL;
+    }
+
+    $levels = array_flip(ZM\Logger::$codes);
+    if ( !isset($levels[$_POST['level']]) ) {
+      ZM\Panic('Unexpected logger level '.$_POST['level']);
+    }
+    $level = $levels[$_POST['level']];
+    ZM\Logger::fetch()->logPrint($level, $string, $file, $line);
+  } else {
+    ZM\Error('Invalid log create: '.print_r($_POST, true));
+  }
+}
+
+function queryRequest() {
+
+  // Offset specifies the starting row to return, used for pagination
+  $offset = 0;
+  if ( isset($_REQUEST['offset']) ) {
+    if ( ( !is_int($_REQUEST['offset']) and !ctype_digit($_REQUEST['offset']) ) ) {
+      ZM\Error('Invalid value for offset: ' . $_REQUEST['offset']);
+    } else {
+      $offset = $_REQUEST['offset'];
+    }
+  }
+
+  // Limit specifies the number of rows to return
   $limit = 100;
   if ( isset($_REQUEST['limit']) ) {
-    if ( ( !is_integer($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
-      ZM\Error('Invalid value for limit ' . $_REQUEST['limit']);
+    if ( ( !is_int($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
+      ZM\Error('Invalid value for limit: ' . $_REQUEST['limit']);
     } else {
       $limit = $_REQUEST['limit'];
     }
   }
-  $sortField = 'TimeKey';
-  if ( isset($_REQUEST['sortField']) ) {
-    if ( !in_array($_REQUEST['sortField'], $filterFields) and ( $_REQUEST['sortField'] != 'TimeKey' ) ) {
-      ZM\Error('Invalid sort field ' . $_REQUEST['sortField']);
-    } else {
-      $sortField = $_REQUEST['sortField'];
-    }
-  }
-  $sortOrder = (isset($_REQUEST['sortOrder']) and ($_REQUEST['sortOrder'] == 'asc')) ? 'asc' : 'desc';
-  $filter = isset($_REQUEST['filter']) ? $_REQUEST['filter'] : array();
+  // The table we want our data from
+  $table = 'Logs';
 
-  $sql = $action.' FROM Logs';
-  $where = array();
-  $values = array();
-  if ( $minTime ) {
-    $where[] = 'TimeKey > ?';
-    $values[] = $minTime;
-  } elseif ( $maxTime ) {
-    $where[] = 'TimeKey < ?';
-    $values[] = $maxTime;
+  // The names of the dB columns in the log table we are interested in
+  $columns = array('TimeKey', 'Component', 'ServerId', 'Pid', 'Code', 'Message', 'File', 'Line');
+
+  // The names of columns shown in the log view that are NOT dB columns in the database
+  $col_alt = array('DateTime', 'Server');
+
+  $sort = 'TimeKey';
+  if ( isset($_REQUEST['sort']) ) {
+    $sort = $_REQUEST['sort'];
+    if ( $sort == 'DateTime' ) $sort = 'TimeKey';
+  }
+  if ( !in_array($sort, array_merge($columns, $col_alt)) ) {
+    ZM\Error('Invalid sort field: ' . $sort);
+    return;
   }
 
-  foreach ( $filter as $field=>$value ) {
-    if ( !in_array($field, $filterFields) ) {
-      ZM\Error("'$field' is not in valid filter fields " . print_r($filterField, true));
-      continue;
-    }
-    if ( $field == 'Level' ) {
-      $where[] = $field.' <= ?';
-      $values[] = $value;
-    } else {
-      $where[] = $field.' = ?';
-      $values[] = $value;
-    }
-  }
-  if ( count($where) )
-    $sql.= ' WHERE '.join(' AND ', $where);
-  $sql .= ' ORDER BY '.$sortField.' '.$sortOrder.' LIMIT '.$limit;
+  // Order specifies the sort direction, either asc or desc
+  $order = (isset($_REQUEST['order']) and (strtolower($_REQUEST['order']) == 'asc')) ? 'ASC' : 'DESC';
 
-  return array('sql'=>$sql, 'values'=>$values);
-} # function buildLogQuery($action)
+  $col_str = implode(', ', $columns);
+  $data = array();
+  $query = array();
+  $query['values'] = array();
+  $likes = array();
+  $where = '';
+   // There are two search bars in the log view, normal and advanced
+  // Making an exuctive decision to ignore the normal search, when advanced search is in use
+  // Alternatively we could try to do both
+  //
+  // Advanced search contains an array of "column name" => "search text" pairs
+  // Bootstrap table sends json_ecoded array, which we must decode
+  $advsearch = isset($_REQUEST['filter']) ? json_decode($_REQUEST['filter'], JSON_OBJECT_AS_ARRAY) : array();
+  // Search contains a user entered string to search on
+  $search = isset($_REQUEST['search']) ? $_REQUEST['search'] : '';
+  if ( count($advsearch) ) {
 
-switch ( $_REQUEST['task'] ) {
-  case 'create' :
-  {
-    // Silently ignore bogus requests
-    if ( !empty($_POST['level']) && !empty($_POST['message']) ) {
-      ZM\logInit(array('id'=>'web_js'));
-
-      $string = $_POST['message'];
-
-      $file = !empty($_POST['file']) ? preg_replace('/\w+:\/\/[\w.:]+\//', '', $_POST['file']) : '';
-      if ( !empty($_POST['line']) ) {
-        $line = validInt($_POST['line']);
-      } else {
-        $line = NULL;
+    foreach ( $advsearch as $col=>$text ) {
+      if ( !in_array($col, array_merge($columns, $col_alt)) ) {
+        ZM\Error("'$col' is not a searchable column name");
+        continue;
       }
-
-      $levels = array_flip(ZM\Logger::$codes);
-      if ( !isset($levels[$_POST['level']]) ) {
-        ZM\Panic('Unexpected logger level '.$_POST['level']);
-      }
-      $level = $levels[$_POST['level']];
-      ZM\Logger::fetch()->logPrint($level, $string, $file, $line);
-    } else {
-      ZM\Error('Invalid log create: '.print_r($_POST, true));
+      // Don't use wildcards on advanced search
+      //$text = '%' .$text. '%';
+      array_push($likes, $col.' LIKE ?');
+      array_push($query['values'], $text);
     }
-    ajaxResponse();
-    break;
+    $wherevalues = $query['values'];
+    $where = ' WHERE (' .implode(' OR ', $likes). ')';
+
+  } else if ( $search != '' ) {
+
+    $search = '%' .$search. '%';
+    foreach ( $columns as $col ) {
+      array_push($likes, $col.' LIKE ?');
+      array_push($query['values'], $search);
+    }
+    $wherevalues = $query['values'];
+    $where = ' WHERE (' .implode(' OR ', $likes). ')';
+  }  
+
+  $query['sql'] = 'SELECT ' .$col_str. ' FROM `' .$table. '` ' .$where. ' ORDER BY ' .$sort. ' ' .$order. ' LIMIT ?, ?';
+  array_push($query['values'], $offset, $limit);
+
+  $data['totalNotFiltered'] = dbFetchOne('SELECT count(*) AS Total FROM ' .$table, 'Total');
+  if ( $search != '' || count($advsearch) ) {
+    $data['total'] = dbFetchOne('SELECT count(*) AS Total FROM ' .$table.$where , 'Total', $wherevalues);
+  } else {
+    $data['total'] = $data['totalNotFiltered'];
   }
-  case 'delete' :
-  {
-    if ( !canEdit('System') )
-      ajaxError('Insufficient permissions to delete log entries');
 
-    $query = buildLogQuery('DELETE');
-    $result = dbQuery($query['sql'], $query['values']);
-    ajaxResponse(array('result'=>'Ok', 'deleted'=>$result->rowCount()));
+  $rows = array();
+  $results = dbFetchAll($query['sql'], NULL, $query['values']);
+
+  foreach ( $results as $row ) {
+    $row['DateTime'] = strftime('%Y-%m-%d %H:%M:%S', intval($row['TimeKey']));
+    $Server = ZM\Server::find_one(array('Id'=>$row['ServerId']));
+
+    $row['Server'] = $Server ? $Server->Name() : '';
+    // First strip out any html tags
+    // Second strip out all characters that are not ASCII 32-126 (yes, 126)
+    $row['Message'] = preg_replace('/[^\x20-\x7E]/', '', strip_tags($row['Message']));
+    $rows[] = $row;
   }
-  case 'query' :
-  {
-    if ( !canView('System') )
-      ajaxError('Insufficient permissions to view log entries');
-    $total = dbFetchOne('SELECT count(*) AS Total FROM Logs', 'Total');
-    $query = buildLogQuery('SELECT *');
+  $data['rows'] = $rows;
+  $data['logstate'] = logState();
+  $data['updated'] = preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG);
 
-    global $Servers;
-    if ( !$Servers )
-      $Servers = ZM\Server::find();
-    $servers_by_Id = array();
-    # There is probably a better way to do this.
-    foreach ( $Servers as $server ) {
-      $servers_by_Id[$server->Id()] = $server;
-    }
-
-    $logs = array();
-    $options = array();
-
-    foreach ( dbFetchAll($query['sql'], NULL, $query['values']) as $log ) {
-
-      $log['DateTime'] = strftime('%Y-%m-%d %H:%M:%S', intval($log['TimeKey']));
-      $log['Server'] = ( $log['ServerId'] and isset($servers_by_Id[$log['ServerId']]) ) ? $servers_by_Id[$log['ServerId']]->Name() : '';
-      $log['Message'] = preg_replace('/[\x00-\x1F\x7F-\xFF]/', '', $log['Message']);
-      foreach ( $filterFields as $field ) {
-        if ( !isset($options[$field]) ) 
-          $options[$field] = array();
-        $value = $log[$field];
-
-        if ( $field == 'Level' ) {
-          if ( $value <= ZM\Logger::INFO )
-            $options[$field][$value] = ZM\Logger::$codes[$value];
-          else
-            $options[$field][$value] = 'DB'.$value;
-        } else if ( $field == 'ServerId' ) {
-            $options['ServerId'][$value] = ( $value and isset($servers_by_Id[$value]) ) ? $servers_by_Id[$value]->Name() : '';
-        } else if ( isset($log[$field]) ) {
-          $options[$field][$log[$field]] = $value;
-        }
-      }
-      $logs[] = $log;
-    } # end foreach log db row
-
-    foreach ( $options as $field => $values ) {
-      asort($options[$field]);
-    }
-
-    $available = count($logs);
-    ajaxResponse(array(
-      'updated' => preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG), 
-      'total' => $total,
-      'available' => isset($available) ? $available : $total,
-      'logs' => $logs,
-      'state' => logState(),
-      'options' => $options,
-    ));
-    break;
-  }
-  case 'export' :
-  {
-    if ( !canView('System') )
-      ajaxError('Insufficient permissions to export logs');
-
-    $minTime = isset($_POST['minTime']) ? $_POST['minTime'] : NULL;
-    $maxTime = isset($_POST['maxTime']) ? $_POST['maxTime'] : NULL;
-    if ( !is_null($minTime) && !is_null($maxTime) && ($minTime > $maxTime) ) {
-      $tempTime = $minTime;
-      $minTime = $maxTime;
-      $maxTime = $tempTime;
-    }
-    //$limit = isset($_POST['limit'])?$_POST['limit']:1000;
-    $filter = isset($_POST['filter'])?$_POST['filter']:array();
-    $sortField = 'TimeKey';
-    if ( isset($_POST['sortField']) ) {
-      if ( !in_array($_POST['sortField'], $filterFields) and ($_POST['sortField'] != 'TimeKey') ) {
-        ZM\Error('Invalid sort field '.$_POST['sortField']);
-      } else {
-        $sortField = $_POST['sortField'];
-      }
-    }
-    $sortOrder = (isset($_POST['sortOrder']) and $_POST['sortOrder']) == 'asc' ? 'asc' : 'desc';
-
-    global $Servers;
-    if ( !$Servers )
-      $Servers = ZM\Server::find();
-    $servers_by_Id = array();
-    # There is probably a better way to do this.
-    foreach ( $servers as $server ) {
-      $servers_by_Id[$server->Id()] = $server;
-    }
-
-    $sql = 'SELECT * FROM Logs';
-    $where = array();
-    $values = array();
-    if ( $minTime ) {
-      if ( preg_match('/(.+)(\.\d+)/', $minTime, $matches) ) {
-        # This handles sub second precision
-        $minTime = strtotime($matches[1]).$matches[2];
-      } else {
-        $minTime = strtotime($minTime);
-      }
-      $where[] = 'TimeKey >= ?';
-      $values[] = $minTime;
-    }
-    if ( $maxTime ) {
-      if ( preg_match('/(.+)(\.\d+)/', $maxTime, $matches) ) {
-        $maxTime = strtotime($matches[1]).$matches[2];
-      } else {
-        $maxTime = strtotime($maxTime);
-      }
-      $where[] = 'TimeKey <= ?';
-      $values[] = $maxTime;
-    }
-    foreach ( $filter as $field=>$value ) {
-      if ( $value != '' ) {
-        if ( $field == 'Level' ) {
-          $where[] = $field.' <= ?';
-          $values[] = $value;
-        } else {
-          $where[] = $field.' = ?';
-          $values[] = $value;
-        }
-      }
-    }
-    if ( count($where) )
-      $sql.= ' WHERE '.join(' AND ', $where);
-    $sql .= ' ORDER BY '.$sortField.' '.$sortOrder;
-    //$sql .= " limit ".dbEscape($limit);
-    $format = isset($_POST['format']) ? $_POST['format'] : 'text';
-    switch ( $format ) {
-      case 'text' :
-        $exportExt = 'txt';
-        break;
-      case 'tsv' :
-        $exportExt = 'tsv';
-        break;
-      case 'html' :
-        $exportExt = 'html';
-        break;
-      case 'xml' :
-        $exportExt = 'xml';
-        break;
-      default :
-        ZM\Fatal("Unrecognised log export format '$format'");
-    }
-    $exportKey = substr(md5(rand()), 0, 8);
-    $exportFile = 'zm-log.'.$exportExt;
-    if ( ! ( mkdir(ZM_DIR_EXPORTS) || file_exists(ZM_DIR_EXPORTS) ) ) {
-      ZM\Fatal('Can\'t create exports dir at \''.ZM_DIR_EXPORTS.'\'');
-    }
-    $exportPath = ZM_DIR_EXPORTS.'/zm-log-'.$exportKey.$exportExt;
-    ZM\Logger::Debug("Exporting to $exportPath");
-    if ( !($exportFP = fopen($exportPath, 'w')) )
-      ZM\Fatal("Unable to open log export file $exportPath");
-    $logs = array();
-    foreach ( dbFetchAll($sql, NULL, $values) as $log ) {
-      $log['DateTime'] = preg_replace('/^\d+/', strftime('%Y-%m-%d %H:%M:%S', intval($log['TimeKey'])), $log['TimeKey']);
-      $log['Server'] = ( $log['ServerId'] and isset($servers_by_Id[$log['ServerId']]) ) ? $servers_by_Id[$log['ServerId']]->Name() : '';
-      $logs[] = $log;
-    }
-    ZM\Logger::Debug(count($logs).' lines being exported by '.$sql.implode(',', $values));
-
-  switch( $format ) {
-    case 'text' :
-    {
-      foreach ( $logs as $log ) {
-        if ( $log['Line'] )
-          fprintf($exportFP, "%s %s[%d].%s-%s/%d [%s]\n",
-            $log['DateTime'], $log['Component'], $log['Pid'], $log['Code'], $log['File'], $log['Line'], $log['Message']);
-        else
-          fprintf($exportFP, "%s %s[%d].%s-%s [%s]\n",
-            $log['DateTime'], $log['Component'], $log['Pid'], $log['Code'], $log['File'], $log['Message']);
-      }
-      break;
-    }
-    case 'tsv' :
-    {
-      # This line doesn't need fprintf, it could use fwrite
-      fprintf($exportFP, join("\t",
-        translate('DateTime'),
-        translate('Component'),
-        translate('Server'),
-        translate('Pid'),
-        translate('Level'),
-        translate('Message'),
-        translate('File'),
-        translate('Line')
-      )."\n");
-      foreach ( $logs as $log ) {
-        fprintf($exportFP, "%s\t%s\t%s\t%d\t%s\t%s\t%s\t%s\n",
-          $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line']);
-      }
-      break;
-    }
-    case 'html' :
-    {
-    fwrite($exportFP,
-'<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-  <html xmlns="http://www.w3.org/1999/xhtml">
-    <head>
-      <title>'.translate('ZoneMinderLog').'</title>
-      <style type="text/css">
-      body, h3, p, table, td {
-      font-family: Verdana, Arial, Helvetica, sans-serif;
-      font-size: 11px;
-  }
-  table {
-  border-collapse: collapse;
-  width: 100%;
-  }
-  th {
-  font-weight: bold;
-  }
-  th, td {
-  border: 1px solid #888888;
-  padding: 1px 2px;
-  }
-  tr.log-fat td {
-  background-color:#ffcccc;
-  font-weight: bold;
-  font-style: italic;
-  }
-  tr.log-err td {
-  background-color:#ffcccc;
-  }
-  tr.log-war td {
-  background-color: #ffe4b5;
-  }
-  tr.log-dbg td {
-  color: #666666;
-  font-style: italic;
-  }
-  </style>
-    </head>
-    <body>
-    <h3>'.translate('ZoneMinderLog').'</h3>
-    <p>'.htmlspecialchars(preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG)).'</p>
-    <p>'.count($logs).' '.translate('Logs').'</p>
-    <table>
-    <tbody>
-    <tr><th>'.translate('DateTime').'</th><th>'.translate('Component').'</th><th>'.translate('Server').'</th><th>'.translate('Pid').'</th><th>'.translate('Level').'</th><th>'.translate('Message').'</th><th>'.translate('File').'</th><th>'.translate('Line').'</th></tr>
-    ');
-    foreach ( $logs as $log ) {
-      $classLevel = $log['Level'];
-      if ( $classLevel < ZM\Logger::FATAL ) {
-        $classLevel = ZM\Logger::FATAL;
-      } else if ( $classLevel > ZM\Logger::DEBUG ) {
-        $classLevel = ZM\Logger::DEBUG;
-      }
-      $logClass = 'log-'.strtolower(ZM\Logger::$codes[$classLevel]);
-      fprintf($exportFP, '        <tr class="%s"><td>%s</td><td>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td></tr>
-        ', $logClass, $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], $log['Message'], $log['File'], $log['Line']);
-    }
-    fwrite($exportFP, 
-      '      </tbody>
-      </table>
-      </body>
-      </html>');
-      break;
-    }
-    case 'xml' :
-    {
-        fwrite($exportFP,
-          '<?xml version="1.0" encoding="utf-8"?>
-          <logexport title="'.translate('ZoneMinderLog').'" date="'.htmlspecialchars(preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG)).'">
-          <selector>'.$_POST['selector'].'</selector>');
-        foreach ( $filter as $field=>$value )
-          if ( $value != '' )
-            fwrite( $exportFP, 
-            '  <filter>
-            <'.strtolower($field).'>'.htmlspecialchars($value).'</'.strtolower($field).'>
-            </filter>' );
-        fwrite( $exportFP, 
-          '  <columns>
-          <column field="datetime">'.translate('DateTime').'</column><column field="component">'.translate('Component').'</column><column field="'.translate('Server').'</column><column field="pid">'.translate('Pid').'</column><column field="level">'.translate('Level').'</column><column field="message">'.translate('Message').'</column><column field="file">'.translate('File').'</column><column field="line">'.translate('Line').'</column>
-          </columns>
-          <logs count="'.count($logs).'">
-          ' );
-      foreach ( $logs as $log ) {
-        fprintf( $exportFP, 
-          '    <log>
-          <datetime>%s</datetime>
-          <component>%s</component>
-          <server>%s</server>
-          <pid>%d</pid>
-          <level>%s</level>
-          <message><![CDATA[%s]]></message>
-          <file>%s</file>
-          <line>%d</line>
-          </log>
-', $log['DateTime'], $log['Component'], $log['Server'], $log['Pid'], $log['Code'], utf8_decode( $log['Message'] ), $log['File'], $log['Line'] );
-      }
-      fwrite( $exportFP, 
-        '  </logs>
-        </logexport>' );
-      break;
-    }
-    $exportExt = 'xml';
-    break;
-    }
-    fclose( $exportFP );
-    ajaxResponse( array(
-      'key' => $exportKey,
-      'format' => $format,
-    ) );
-    break;
-  }
-  case 'download' :
-  {
-    if ( !canView('System') )
-      ajaxError('Insufficient permissions to download logs');
-
-    if ( empty($_REQUEST['key']) )
-      ZM\Fatal('No log export key given');
-    $exportKey = $_REQUEST['key'];
-    if ( empty($_REQUEST['format']) )
-      ZM\Fatal('No log export format given');
-    $format = $_REQUEST['format'];
-
-    switch ( $format ) {
-    case 'text' :
-      $exportExt = 'txt';
-      break;
-    case 'tsv' :
-      $exportExt = 'tsv';
-      break;
-    case 'html' :
-      $exportExt = 'html';
-      break;
-    case 'xml' :
-      $exportExt = 'xml';
-      break;
-    default :
-      ZM\Fatal("Unrecognised log export format '$format'");
-    }
-
-    $exportFile = 'zm-log.'.$exportExt;
-    $exportPath = ZM_DIR_EXPORTS.'/zm-log-'.$exportKey.$exportExt;
-
-    header('Pragma: public');
-    header('Expires: 0');
-    header('Cache-Control: must-revalidate, post-check=0, pre-check=0');
-    header('Cache-Control: private', false); // required by certain browsers
-    header('Content-Description: File Transfer');
-    header('Content-Disposition: attachment; filename="'.$exportFile.'"');
-    header('Content-Transfer-Encoding: binary');
-    header('Content-Type: application/force-download');
-    header('Content-Length: '.filesize($exportPath));
-    readfile($exportPath);
-    exit(0);
-    break;
-  }
-} // end switch ( $_REQUEST['task'] )
-ajaxError('Unrecognised action or insufficient permissions');
-?>
+  return $data;
+}
diff --git a/web/ajax/modal.php b/web/ajax/modal.php
index bd96b137f..2794fb0af 100644
--- a/web/ajax/modal.php
+++ b/web/ajax/modal.php
@@ -8,7 +8,7 @@ if ( empty($_REQUEST['modal']) ) {
 $modal = validJsStr($_REQUEST['modal']);
 $data = array();
 
-ZM\Logger::Debug("Including modals/$modal.php");
+ZM\Debug("Including modals/$modal.php");
 # Shouldn't be necessary but at the moment we have last .conf file contents
 ob_start();
 @$result = include('modals/'.$modal.'.php');
diff --git a/web/ajax/modals/controlpreset.php b/web/ajax/modals/controlpreset.php
new file mode 100644
index 000000000..e3cc02db3
--- /dev/null
+++ b/web/ajax/modals/controlpreset.php
@@ -0,0 +1,53 @@
+<?php
+if (!canEdit('Monitors')) return ' ';
+
+$monitor = dbFetchOne('SELECT C.*,M.* FROM Monitors AS M INNER JOIN Controls AS C ON (M.ControlId = C.Id ) WHERE M.Id = ?', NULL, array($_REQUEST['mid']));
+
+$labels = array();
+foreach (dbFetchAll('SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, array($monitor['Id'])) as $row) {
+  $labels[$row['Preset']] = $row['Label'];
+}
+
+$presets = array();
+for ($i = 1; $i <= $monitor['NumPresets']; $i++) {
+  $presets[$i] = translate('Preset').' '.$i;
+  if (!empty($labels[$i])) {
+    $presets[$i] .= ' ('.validHtmlStr($labels[$i]).')';
+  }
+}
+?>
+<div class="modal" id="ctrlPresetModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('SetPreset') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <form name="contentForm" id="ctrlPresetForm" method="post" action="?">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="control"/>
+        <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
+        <input type="hidden" name="action" value="control"/>
+        <input type="hidden" name="control" value="presetSet"/>
+        <input type="hidden" name="showControls" value="1"/>
+        <p><?php echo buildSelect('preset', $presets) ?></p>
+        <p>
+          <label for="newLabel"><?php echo translate('NewLabel') ?></label>
+          <input type="text" name="newLabel" id="newLabel" value=""/>
+        </p>
+
+      </div>
+      <div class="modal-footer">
+        <button type="submit" class="btn btn-primary" id="cPresetSubmitModal" value="Save"><?php echo translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
diff --git a/web/ajax/modals/delconfirm.php b/web/ajax/modals/delconfirm.php
index 9aec739f4..02f742cff 100644
--- a/web/ajax/modals/delconfirm.php
+++ b/web/ajax/modals/delconfirm.php
@@ -1,18 +1,20 @@
 <?php
-// This is the HTML representing the Delete confirmation modal on the Events page
+// This is the HTML representing the Delete confirmation modal on the Events page and other pages
+
+$delTextKey = isset($_REQUEST['key']) ? $_REQUEST['key'] : 'ConfirmDeleteEvents';
 
 ?>  
 <div id="deleteConfirm" class="modal fade" class="modal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
       <div class="modal-header">
-        <h5 class="modal-title">Delete Confirmation</h5>
+        <h5 class="modal-title"><?php echo translate('ConfirmDeleteTitle') ?></h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">&times;</span>
         </button>
       </div>
       <div class="modal-body">
-        <p><?php echo translate('ConfirmDeleteEvents') ?></p>
+        <p><?php echo translate($delTextKey) ?></p>
       </div>
       <div class="modal-footer">
         <button id="delCancelBtn" type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
diff --git a/web/ajax/modals/device.php b/web/ajax/modals/device.php
new file mode 100644
index 000000000..5a29785ef
--- /dev/null
+++ b/web/ajax/modals/device.php
@@ -0,0 +1,54 @@
+<?php
+
+if ( !canEdit( 'Devices' ) ) return;
+
+if ( !empty($_REQUEST['did']) ) {
+    $newDevice = dbFetchOne( 'SELECT * FROM Devices WHERE Id = ?', NULL, array($_REQUEST['did']) );
+} else {
+    $newDevice = array(
+        "Id" => "",
+        "Name" => "New Device",
+        "KeyString" => ""
+    );
+}
+
+?>
+<div class="modal fade" id="deviceModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="staticBackdropLabel"><?php echo translate('Device')." - ".validHtmlStr($newDevice['Name']) ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form id="deviceModalForm" name="contentForm" method="get" action="?view=device&action=device">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="device"/>
+        <input type="hidden" name="action" value="device"/>
+        <input type="hidden" name="did" value="<?php echo $newDevice['Id'] ?>"/>
+        <table class="table-sm table-borderless" cellspacing="0">
+          <tbody>
+            <tr>
+              <th scope="row" class="text-right pr-2"><?php echo translate('Name') ?></th>
+              <td><input type="text" name="newDevice[Name]" value="<?php echo validHtmlStr($newDevice['Name']) ?>"/></td>
+            </tr>
+            <tr>
+              <th scope="row" class="text-right pr-2"><?php echo translate('KeyString') ?></th>
+              <td><input type="text" name="newDevice[KeyString]" value="<?php echo validHtmlStr($newDevice['KeyString']) ?>"/></td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" id="deviceSaveBtn" class="btn btn-primary"><?php echo translate('Save') ?></button>        
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
diff --git a/web/skins/classic/views/donate.php b/web/ajax/modals/donate.php
similarity index 70%
rename from web/skins/classic/views/donate.php
rename to web/ajax/modals/donate.php
index 502377133..374d4e0d2 100644
--- a/web/skins/classic/views/donate.php
+++ b/web/ajax/modals/donate.php
@@ -18,10 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
+if ( !canEdit('System') ) return;
 
 $options = array( 
   'go'      => translate('DonateYes'),
@@ -45,25 +42,25 @@ $options = array(
         </button>
       </div>
       <div class="modal-body">
-        <form name="contentForm" id="contentForm" method="post" action="?">
-          <input type="hidden" name="view" value="donate"/>
-          <input type="hidden" name="action" value="donate"/>
-          <p>
-            <?php echo translate('DonateEnticement') ?>
-          </p>
-          <p>
-            <?php echo buildSelect('option', $options); ?>
-          </p>
-          <div id="contentButtons">
-            <button type="submit"><?php echo translate('Apply') ?></button>
-            <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-          </div>
-        </form>
+      <form name="contentForm" id="donateForm" method="post" action="?">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="donate"/>
+        <input type="hidden" name="action" value="donate"/>
+        <p>
+          <?php echo translate('DonateEnticement') ?>
+        </p>
+        <p>
+          <?php echo buildSelect('option', $options); ?>
+        </p>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary">Understood</button>
+        <button type="submit" class="btn btn-primary" id="donateApplyBtn"><?php echo translate('Apply') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Close') ?></button>
       </div>
+    </form>
     </div>
   </div>
 </div>
diff --git a/web/ajax/modals/download.php b/web/ajax/modals/download.php
new file mode 100644
index 000000000..7009f8738
--- /dev/null
+++ b/web/ajax/modals/download.php
@@ -0,0 +1,119 @@
+<?php
+// This is the HTML representing the Download event modal on the Events page and other pages
+
+function getDLEventHTML($eid, $eids) {
+  $result = '';
+
+  if ( !empty($eid) ) {
+    $result .= '<input type="hidden" name="id" value="' .validInt($eid). '"/>'.PHP_EOL;
+
+    $Event = new ZM\Event($eid);
+    if ( !$Event->Id() ) {
+      ZM\Error('Invalid event id');
+      $result .= '<div class="error">Invalid event id</div>'.PHP_EOL;
+    } else {
+      $result .= 'Downloading event ' . $Event->Id . '. Resulting file should be approximately ' . human_filesize( $Event->DiskSpace() ).PHP_EOL;
+    }
+  } else if ( !empty($eids) ) {
+    $total_size = 0;
+    foreach ( $eids as $eid ) {
+      if ( !validInt($eid) ) {
+        ZM\Warning("Invalid event id in eids[] $eid");
+        continue;
+      }
+      $Event = new ZM\Event($eid);
+      $total_size += $Event->DiskSpace();
+      $result .= '<input type="hidden" name="eids[]" value="' .validInt($eid). '"/>'.PHP_EOL;
+    }
+    unset($eid);
+    $result .= 'Downloading ' . count($eids) . ' events.  Resulting file should be approximately ' . human_filesize($total_size).PHP_EOL;
+  } else {
+    $result .= '<div class="warning">There are no events found.  Resulting download will be empty.</div>';
+  }
+  
+  return $result;
+}
+
+if ( !canView('Events') ) {
+  $view = 'error';
+  return;
+}
+
+$eid = isset($_REQUEST['eid']) ? $_REQUEST['eid'] : '';
+$eids = isset($_REQUEST['eids']) ? $_REQUEST['eids'] : array();
+$generated = isset($_REQUEST['generated']) ? $_REQUEST['generated'] : '';
+
+$total_size = 0;
+if ( isset($_SESSION['montageReviewFilter']) and !$eids ) {
+  # Handles montageReview filter
+  $eventsSql = 'SELECT E.Id, E.DiskSpace FROM Events AS E WHERE 1';
+  $eventsSql .= $_SESSION['montageReviewFilter']['sql'];
+  $results = dbQuery($eventsSql);
+  while ( $event_row = dbFetchNext( $results ) ) {
+    array_push($eids, $event_row['Id']);
+    $total_size += $event_row['DiskSpace'];
+  }
+  if ( ! count($eids) ) {
+    ZM\Error("No events found for download using $eventsSql");
+  } 
+  #session_start();
+  #unset($_SESSION['montageReviewFilter']);
+  #session_write_close();
+#} else {
+#Debug("NO montageReviewFilter");
+}
+
+$exportFormat = '';
+if ( isset($_REQUEST['exportFormat']) ) {
+  if ( !in_array($_REQUEST['exportFormat'], array('zip', 'tar')) ) {
+    ZM\Error('Invalid exportFormat: '.$_REQUEST['exportFormat']);
+  } else {
+    $exportFormat = $_REQUEST['exportFormat'];
+  }
+}
+
+$focusWindow = true;
+$connkey = isset($_REQUEST['connkey']) ? validInt($_REQUEST['connkey']) : generateConnKey();
+
+?>
+<div id="downloadModal" class="modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Download') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form name="contentForm" id="downloadForm" method="post" action="?">
+          <?php
+          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+          echo getCSRFinputHTML();
+          ?>
+        <input type="hidden" name="connkey" value="<?php echo $connkey; ?>"/>
+        <input type="hidden" name="exportVideo" value="1"/>
+        <div>
+          <?php echo getDLEventHTML($eid, $eids) ?>
+        </div>
+        <div class="font-weight-bold py-2">
+          <span class="pr-3"><?php echo translate('ExportFormat') ?></span>
+          <input type="radio" id="exportFormatTar" name="exportFormat" value="tar"/>
+          <label for="exportFormatTar"><?php echo translate('ExportFormatTar') ?></label>
+          <input type="radio" id="exportFormatZip" name="exportFormat" value="zip" checked="checked"/>
+          <label for="exportFormatZip"><?php echo translate('ExportFormatZip') ?></label>
+        </div>
+        <button type="button" id="exportButton" name="exportButton" value="GenerateDownload"><?php echo translate('GenerateDownload') ?></button>
+      </form>
+      </div>
+      <h2 id="exportProgress" class="text-warning invisible"> 
+        <span class="spinner-grow" role="status" aria-hidden="true"></span> 
+        Exporting...
+      </h2>
+      <h3><a id="downloadLink" href="#"></a></h3>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/web/ajax/modals/eventrename.php b/web/ajax/modals/eventrename.php
new file mode 100644
index 000000000..c877d57b4
--- /dev/null
+++ b/web/ajax/modals/eventrename.php
@@ -0,0 +1,27 @@
+<?php
+if ( !canEdit('Events') ) return;
+
+$eid = isset($_REQUEST['eid']) ? $_REQUEST['eid'] : '';
+$eid = validInt($eid);
+$Event = new ZM\Event($eid);
+
+?>
+<div class="modal" id="eventRenameModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Rename') .' '. translate('Event') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <input type="text" value="<?php echo validHtmlStr($Event->Name()) ?>"/>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" id="eventRenameBtn"><?php echo translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/web/skins/classic/views/function.php b/web/ajax/modals/function.php
similarity index 54%
rename from web/skins/classic/views/function.php
rename to web/ajax/modals/function.php
index 83d67d54a..08b470840 100644
--- a/web/skins/classic/views/function.php
+++ b/web/ajax/modals/function.php
@@ -18,17 +18,18 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit('Monitors') ) {
-  $view = 'error';
-  return;
-}
-?>
+if ( !canEdit('Monitors') ) return;
 
+?>
 <div id="modalFunction" class="modal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
-<form id="function_form" action="?view=function&action=function" method="post">
-  <input type="hidden" name="mid"/>
+    <form id="function_form" action="?view=function&action=function" method="post">
+      <?php
+      // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+      echo getCSRFinputHTML();
+      ?>
+      <input type="hidden" name="mid"/>
       <div class="modal-header">
         <h5 class="modal-title"><?php echo translate('Function') ?> - <span id="function_monitor_name"></span></h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -36,17 +37,45 @@ if ( !canEdit('Monitors') ) {
         </button>
       </div>
       <div class="modal-body">
-        <p>
+        <div class="form-group" id="FunctionFunction">
+          <label for="newFunction"><?php echo translate('Function') ?></label>
           <?php echo htmlSelect('newFunction', ZM\getMonitorFunctionTypes(), null, array('id'=>'newFunction')); ?>
-          <label for="newEnabled"><?php echo translate('Enabled') ?></label>
+          <div id="function_help">
+<?php
+  foreach ( ZM\getMonitorFunctionTypes() as $fn => $translated ) {
+    if ( isset($OLANG['FUNCTION_'.strtoupper($fn)]) ) {
+      echo '<div class="form-text" id="'.$fn.'Help">'.$OLANG['FUNCTION_'.strtoupper($fn)]['Help'].'</div>';
+    }
+  }
+?>
+          </div>
+        </div>
+        <div class="form-group" id="FunctionAnalysisEnabled">
+          <label for="newEnabled"><?php echo translate('Analysis Enabled') ?></label>
           <input type="checkbox" name="newEnabled" id="newEnabled" value="1"/>
-        </p>
+<?php
+  if ( isset($OLANG['FUNCTION_ANALYSIS_ENABLED']) ) {
+    echo '<div class="form-text">'.$OLANG['FUNCTION_ANALYSIS_ENABLED']['Help'].'</div>';
+  }
+?>
+
+        </div>
+        <div class="form-group" id="FunctionDecodingEnabled">
+          <label for="newDecodingEnabled"><?php echo translate('Decoding Enabled') ?></label>
+          <input type="checkbox" name="newDecodingEnabled" id="newDecodingEnabled" value="1"/>
+<?php
+  if ( isset($OLANG['FUNCTION_DECODING_ENABLED']) ) {
+    echo '<div class="form-text">'.$OLANG['FUNCTION_DECODING_ENABLED']['Help'].'</div>';
+  }
+?>
+
+        </div>
       </div>
       <div class="modal-footer">
         <button type="button" class="funcSaveBtn btn btn-primary"><?php echo translate('Save') ?></button>
         <button type="button" class="funcCancelBtn btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
       </div>
-</form>
+    </form>
     </div>
   </div>
 </div>
diff --git a/web/ajax/modals/group.php b/web/ajax/modals/group.php
new file mode 100644
index 000000000..119149951
--- /dev/null
+++ b/web/ajax/modals/group.php
@@ -0,0 +1,135 @@
+<?php
+// This is the HTML representing the Group modal accessed from the Groups (plural) view
+
+//
+// DEFINE SUPPORTING FUNCTIONS
+//
+
+function get_Id( $G ) {
+  return $G->Id();
+}
+
+function get_children($Group) {
+  global $children;
+
+  $kids = array();
+  if ( isset( $children[$Group->Id()] ) ) {
+    $kids += array_map('get_Id', $children[$Group->Id()]);
+    foreach ( $children[$Group->Id()] as $G ) {
+      foreach ( get_children($G) as $id ) {
+        $kids[] = $id;
+      }
+    }
+  }
+  return $kids;
+}
+
+function parentGrpSelect($newGroup) {
+  $Groups = array();
+  foreach ( ZM\Group::find() as $Group ) {
+    $Groups[$Group->Id()] = $Group;
+  }
+
+  # This  array is indexed by parent_id
+  $children = array();
+
+  foreach ( $Groups as $id=>$Group ) {
+    if ( $Group->ParentId() != null ) {
+      if ( ! isset( $children[$Group->ParentId()] ) )
+        $children[$Group->ParentId()] = array();
+      $children[$Group->ParentId()][] = $Group;
+    }
+  }
+
+  $kids = get_children($newGroup);
+  if ( $newGroup->Id() )
+    $kids[] = $newGroup->Id();
+  $sql = 'SELECT Id,Name FROM `Groups`'.(count($kids)?' WHERE Id NOT IN ('.implode(',',array_map(function(){return '?';}, $kids)).')' : '').' ORDER BY Name';
+  $options = array(''=>'None');
+
+  foreach ( dbFetchAll($sql, null, $kids) as $option ) {
+    $options[$option['Id']] = str_repeat('&nbsp;&nbsp;', $Groups[$option['Id']]->depth()) . $option['Name'];
+  }
+
+  return htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('data-on-change'=>'configModalBtns'));
+}
+
+function monitorList($newGroup) {
+  $result = '';
+
+  $monitors = dbFetchAll('SELECT Id,Name FROM Monitors ORDER BY Sequence ASC');
+  $monitorIds = $newGroup->MonitorIds();
+  foreach ( $monitors as $monitor ) {
+    if ( visibleMonitor($monitor['Id']) ) {
+      $result .= '<option value="' .$monitor['Id']. '"' .( in_array( $monitor['Id'], $monitorIds ) ? ' selected="selected"' : ''). '>' .validHtmlStr($monitor['Name']). '</option>'.PHP_EOL;
+    }
+  }
+  
+  return $result;
+}
+
+//
+// INITIAL SANITY CHECKS
+//
+
+if ( !canEdit('Groups') ) {
+  $view = 'error';
+  return;
+}
+
+if ( !empty($_REQUEST['gid']) ) {
+  $newGroup = new ZM\Group($_REQUEST['gid']);
+} else {
+  $newGroup = new ZM\Group();
+}
+
+//
+// BEGIN HTML
+//
+?>
+<div id="groupModal" class="modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Group').($newGroup->Name() ? ' - ' .validHtmlStr($newGroup->Name()) : '') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form id="groupForm" name="groupForm" method="post" action="?view=group&action=save">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="group"/>
+        <input type="hidden" name="gid" value="<?php echo $newGroup->Id() ?>"/>
+        <table id="groupModalTable" class="table-sm table-borderless">
+          <tbody>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Name') ?></th>
+              <td><input type="text" name="newGroup[Name]" value="<?php echo validHtmlStr($newGroup->Name()) ?>" data-on-input="configModalBtns"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('ParentGroup') ?></th>
+              <td><?php echo parentGrpSelect($newGroup) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Monitor') ?></th>
+              <td>
+                <select name="newGroup[MonitorIds][]" class="chosen" multiple="multiple" data-on-change="configModalBtns">
+                  <?php echo monitorList($newGroup) ?>
+                </select>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" class="btn btn-primary" name="action" id="grpModalSaveBtn" value="save"<?php $newGroup->Id() ? '' : ' disabled="disabled"'?>><?php echo translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
diff --git a/web/ajax/modals/log_export.php b/web/ajax/modals/log_export.php
new file mode 100644
index 000000000..8f359bb86
--- /dev/null
+++ b/web/ajax/modals/log_export.php
@@ -0,0 +1,46 @@
+<div class="modal fade" id="log_exportModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('ExportLog') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+
+        <form id="exportForm" action="" method="post">
+          <?php
+          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+          echo getCSRFinputHTML();
+          echo $inputs;
+          ?>
+          <fieldset title="<?php echo translate('ChooseLogSelection') ?>">
+            <legend><?php echo translate('SelectLog') ?></legend>
+            <label for="selectorAll"><?php echo translate('All') ?></label>
+            <input type="radio" id="selectorAll" name="selector" value="all"/>
+            <label for="selectorFilter"><?php echo translate('Filter') ?></label>
+            <input type="radio" id="selectorFilter" name="selector" value="filter"/>
+            <label for="selectorCurrent"><?php echo translate('Current') ?></label>
+            <input type="radio" id="selectorCurrent" name="selector" value="current" data-validators="validate-one-required"/>
+          </fieldset>
+          <fieldset title="<?php echo translate('ChooseLogFormat') ?>">
+            <legend><?php echo translate('SelectFormat') ?></legend>
+            <label for="formatText">TXT</label><input type="radio" id="formatText" name="format" value="text"/>
+            <label for="formatTSV">TSV</label><input type="radio" id="formatTSV" name="format" value="tsv"/>
+            <label for="formatXML">HTML</label><input type="radio" id="formatHTML" name="format" value="html"/>
+            <label for="formatXML">XML</label><input type="radio" id="formatXML" name="format" value="xml" class="validate-one-required"/>
+          </fieldset>
+          <div id="exportError">
+            <?php echo translate('ExportFailed') ?>: <span id="exportErrorText"></span>
+          </div>
+
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" id="exportButton" value="Export" data-on-click="exportRequest"><?php echo translate('Export') ?></button>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
diff --git a/web/skins/classic/views/logout.php b/web/ajax/modals/logout.php
similarity index 51%
rename from web/skins/classic/views/logout.php
rename to web/ajax/modals/logout.php
index 86e07605a..a0648a70c 100644
--- a/web/skins/classic/views/logout.php
+++ b/web/ajax/modals/logout.php
@@ -30,10 +30,73 @@ global $CLANG;
       </div>
       <div class="modal-body">
         <p><?php echo sprintf( $CLANG['CurrentLogin'], $user['Username'] ) ?></p>
+<?php if ( canView('System') ) { ?>
+        <p>Other logged in users:<br/>
+<table class="table table-striped">
+  <thead>
+  <tr>
+    <th class="text-left"><?php echo translate('Username') ?></th>
+    <th class="text-left"><?php echo translate('IPAddress') ?></th>
+    <th class="text-left"><?php echo translate('Last Access') ?></th>
+  </tr>
+  </thead>
+  <tbody>
+<?php
+require_once('includes/User.php');
+$result = dbQuery('SELECT * FROM Sessions ORDER BY access DESC');
+if ( ! $result ) return;
+
+$current_session = $_SESSION;
+zm_session_start();
+
+$user_cache = array();
+while ( $row = $result->fetch(PDO::FETCH_ASSOC) ) {
+  $_SESSION = array();
+  if ( ! session_decode($row['data']) ) {
+    ZM\Warning('Failed to decode ' . $row['data']);
+    continue;
+  }
+  ZM\Debug(print_r($_SESSION, true));
+  if ( isset($_SESSION['last_time']) )  {
+    # This is a dead session
+    continue;
+  }
+  if ( !isset($_SESSION['username']) ) {
+    # Not logged in
+    continue;
+  }
+  if ( isset($user_cache[$_SESSION['username']]) ) {
+    $user = $user_cache[$_SESSION['username']];
+  } else {
+    $user = ZM\User::find_one(array('Username'=>$_SESSION['username']));
+    if ( ! $user ) {
+      ZM\Debug('User not found for ' . $_SESSION['username']);
+      continue;
+    }
+    $user_cache[$_SESSION['username']] = $user;
+  }
+
+  echo '
+  <tr>
+    <td>'.$user->Username().'</td>
+    <td>'.$_SESSION['remoteAddr'].'</td>
+    <td>'.strftime(STRF_FMT_DATETIME_SHORTER, $row['access']).'</td>
+  </tr>
+';
+} # end while
+session_abort();
+$_SESSION = $current_session;
+?>
+          </tbody>
+        </table>
+<?php } # end if canView(System) ?>
       </div>
       <div class="modal-footer">
-        <form name="logoutForm" id="logoutForm" method="post" action="?">
-          <input type="hidden" name="view" value="logout"/>
+        <form name="logoutForm" id="logoutForm" method="post" action="?view=logout">
+          <?php
+          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+          echo getCSRFinputHTML();
+          ?>
           <button type="submit" name="action" value="logout"><?php echo translate('Logout') ?></button>
           <?php if ( ZM_USER_SELF_EDIT ) echo '<button type="submit" name="action" value="config">'.translate('Config').'</button>'.PHP_EOL; ?>
           <button type="button" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
diff --git a/web/ajax/modals/objdetect.php b/web/ajax/modals/objdetect.php
new file mode 100644
index 000000000..0b5e9523c
--- /dev/null
+++ b/web/ajax/modals/objdetect.php
@@ -0,0 +1,29 @@
+<?php
+// This is the HTML representing the Object Detection modal on the Events page
+
+$eid = isset($_REQUEST['eid']) ? $_REQUEST['eid'] : '';
+
+if ( !validInt($eid) ) {
+  ZM\Error("Invalid event id: $eid");
+  return;
+}
+
+?>
+<div id="objdetectModal" class="modal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Object Detection</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <img src="?view=image&amp;eid=<?php echo $eid ?>&amp;fid=objdetect">
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/web/skins/classic/views/settings.php b/web/ajax/modals/settings.php
similarity index 53%
rename from web/skins/classic/views/settings.php
rename to web/ajax/modals/settings.php
index 0c51add26..59d19ddbb 100644
--- a/web/skins/classic/views/settings.php
+++ b/web/ajax/modals/settings.php
@@ -1,27 +1,6 @@
 <?php
-//
-// ZoneMinder web settings view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
+if ( !canView('Control') ) return;
 
-if ( !canView('Control') ) {
-  $view = 'error';
-  return;
-}
 $monitor = ZM\Monitor::find_one(array('Id'=>$_REQUEST['mid']));
 
 $zmuCommand = getZmuCommand(' -m '.escapeshellarg($_REQUEST['mid']).' -B -C -H -O');
@@ -35,17 +14,22 @@ if ( $zmuOutput ) {
   $monitor->Colour($colour);
 }
 
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, validHtmlStr($monitor->Name()).' - '.translate('Settings'));
 ?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo validHtmlStr($monitor->Name()) ?> - <?php echo translate('Settings') ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="?">
+<div class="modal" id="settingsModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo validHtmlStr($monitor->Name()) ?> - <?php echo translate('Settings') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form name="contentForm" id="settingsForm" method="post" action="?">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="action" value="settings"/>
         <input type="hidden" name="mid" value="<?php echo validInt($_REQUEST['mid']) ?>"/>
@@ -69,11 +53,12 @@ xhtmlHeaders(__FILE__, validHtmlStr($monitor->Name()).' - '.translate('Settings'
             </tr>
           </tbody>
         </table>
-        <div id="contentButtons">
-          <button type="submit" value="Save"<?php echo canView('Control') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
-          <button type="button" value="Close" data-on-click="closeWindow"/><?php echo translate('Close') ?></button>
-        </div>
-      </form>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" class="btn btn-primary" id="settingsSubmitModal" value="Save"<?php echo canView('Control') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+      </div>
+    </form>
     </div>
   </div>
-<?php xhtmlFooter() ?>
+</div>
diff --git a/web/ajax/modals/shutdown.php b/web/ajax/modals/shutdown.php
new file mode 100644
index 000000000..c73b442dd
--- /dev/null
+++ b/web/ajax/modals/shutdown.php
@@ -0,0 +1,47 @@
+<?php
+$error='';
+
+if ( !canEdit('System') ) {
+  $error = 'Insufficient permissions';
+} else if ( !defined('ZM_PATH_SHUTDOWN') or ZM_PATH_SHUTDOWN == '' ) {
+  $error = 'ZM_PATH_SHUTDOWN is not defined. This is normally configured in /etc/zm/conf.d/01-system-paths.conf';
+} else if ( !file_exists(ZM_PATH_SHUTDOWN) ) {
+  $error = 'Path does not exist for ZM_PATH_SHUTDOWN. Current value is '.ZM_PATH_SHUTDOWN;
+}
+
+if ( $error ) {
+  ZM\Error($error);
+  return;
+}
+
+?>
+<div class="modal" id="shutdownModal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Shutdown').' '.translate('Restart') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <p class="warning"><h2>Warning</h2>
+          This command will either shutdown or restart all ZoneMinder Servers<br/>
+        </p>
+        <p>
+          <input type="radio" name="when" value="now" id="whennow"/><label for="whennow">Now</label>
+          <input type="radio" name="when" value="1min" id="when1min" checked="checked"/><label for="when1min">1 Minute</label>
+        </p>
+        <p id="respText" class="invisible">
+        </p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-command="cancel" data-on-click-this="manageShutdownBtns" id="cancelBtn" disabled><?php echo translate('Cancel') ?></button>
+        <button type="button" class="btn btn-primary" data-command="restart" data-on-click-this="manageShutdownBtns"><?php echo translate('Restart') ?></button>
+        <button type="button" class="btn btn-primary" data-command="shutdown" data-on-click-this="manageShutdownBtns"><?php echo translate('Shutdown') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Close') ?></button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
diff --git a/web/skins/classic/views/state.php b/web/ajax/modals/state.php
similarity index 93%
rename from web/skins/classic/views/state.php
rename to web/ajax/modals/state.php
index d10b28e41..a3b6734a3 100644
--- a/web/skins/classic/views/state.php
+++ b/web/ajax/modals/state.php
@@ -17,12 +17,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
-global $running;
 
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
+if ( !canEdit('System') ) return;
+
+$running = daemonCheck();
 
 $content = '';
 if ( $running ) {
@@ -53,6 +51,10 @@ foreach ( $states as $state ) {
       </div>
       <div class="modal-body">
           <form class="" name="contentForm" method="get" action="?view=state">
+            <?php
+            // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+            echo getCSRFinputHTML();
+            ?>
             <input type="hidden" name="view" value="state"/>
             <input type="hidden" name="action" value="state"/>
             <input type="hidden" name="apply" value="1"/>
diff --git a/web/ajax/modals/storage.php b/web/ajax/modals/storage.php
index 70cc956dc..c439c384c 100644
--- a/web/ajax/modals/storage.php
+++ b/web/ajax/modals/storage.php
@@ -31,12 +31,11 @@
     'Shallow' => translate('Shallow'),
   );
 
-  $servers = ZM\Server::find( null, array('order'=>'lower(Name)') );
+  global $Servers;
   $ServersById = array();
-  foreach ( $servers as $S ) {
+  foreach ( $Servers as $S ) {
     $ServersById[$S->Id()] = $S;
   }
-
 ?>
 <div class="modal fade" id="storageModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
   <div class="modal-dialog">
@@ -56,48 +55,54 @@
         <input type="hidden" name="view" value="storage"/>
         <input type="hidden" name="object" value="storage"/>
         <input type="hidden" name="id" value="<?php echo validHtmlStr($sid) ?>"/>
-        <table class="major table-sm">
+<div class="table-responsive">
+        <table class="major table table-sm">
           <tbody>
             <tr>
-              <th class="text-right pr-3" scope="row"><?php echo translate('Name') ?></th>
+              <th class="text-right " scope="row"><?php echo translate('Name') ?></th>
               <td><input type="text" name="newStorage[Name]" value="<?php echo $newStorage->Name() ?>"/></td>
             </tr>
             <tr>
-              <th class="text-right pr-3" scope="row"><?php echo translate('Path') ?></th>
+              <th class="text-right " scope="row"><?php echo translate('Path') ?></th>
               <td><input type="text" name="newStorage[Path]" value="<?php echo $newStorage->Path() ?>"/></td>
             </tr>
             <tr>
-              <th class="text-right pr-3" scope="row"><?php echo translate('Url') ?></th>
+              <th class="text-right " scope="row"><?php echo translate('Url') ?></th>
               <td><input type="text" name="newStorage[Url]" value="<?php echo $newStorage->Url() ?>"/></td>
             </tr>
             <tr>
-              <th class="text-right pr-3" scope="row"><?php echo translate('Server') ?></th>
+              <th class="text-right " scope="row"><?php echo translate('Server') ?></th>
               <td><?php echo htmlSelect('newStorage[ServerId]', array(''=>'Remote / No Specific Server') + $ServersById, $newStorage->ServerId()) ?></td>
             </tr>
             <tr>
-              <th class="text-right pr-3" scope="row"><?php echo translate('Type') ?></th>
+              <th class="text-right " scope="row"><?php echo translate('Type') ?></th>
               <td><?php echo htmlSelect('newStorage[Type]', $type_options, $newStorage->Type()) ?></td>
             </tr>
             <tr>
-              <th class="text-right pr-3" scope="row"><?php echo translate('StorageScheme') ?></th>
+              <th class="text-right " scope="row"><?php echo translate('StorageScheme') ?></th>
               <td><?php echo htmlSelect('newStorage[Scheme]', $scheme_options, $newStorage->Scheme()) ?></td>
             </tr>
             <tr>
-              <th class="text-right pr-3" scope="row"><?php echo translate('StorageDoDelete') ?></th>
+              <th class="text-right " scope="row"><?php echo translate('StorageDoDelete') ?></th>
               <td>
-              <input type="radio" name="newStorage[DoDelete]" value="1" <?php echo $newStorage->DoDelete() ? $checked : $null ?>>Yes
-              <input type="radio" name="newStorage[DoDelete]" value="0" <?php echo $newStorage->DoDelete() ? $null : $checked ?>>No
+                <input type="radio" name="newStorage[DoDelete]" id="newStorage[DoDelete]1" value="1" <?php echo $newStorage->DoDelete() ? $checked : $null ?>/>
+                <label class="form-check-label" for="newStorage[DoDelete]1">Yes</label>
+                <input type="radio" name="newStorage[DoDelete]" id="newStorage[DoDelete]0" value="0" <?php echo $newStorage->DoDelete() ? $null : $checked ?>/>
+                <label class="form-check-label" for="newStorage[DoDelete]0">No</label>
               </td>
             </tr>
             <tr>
-              <th class="text-right pr-3" scope="row"><?php echo translate('Enabled') ?></th>
+              <th class="text-right " scope="row"><?php echo translate('Enabled') ?></th>
               <td>
-              <input type="radio" name="newStorage[Enabled]" value="1" <?php echo $newStorage->Enabled() ? $checked : $null ?>>Yes
-              <input type="radio" name="newStorage[Enabled]" value="0" <?php echo $newStorage->Enabled() ? $null : $checked ?>>No
+                <input type="radio" name="newStorage[Enabled]" id="newStorage[Enabled]1" value="1" <?php echo $newStorage->Enabled() ? $checked : $null ?>/>
+                <label class="form-check-label" for="newStorage[Enabled]1">Yes</label>
+                <input type="radio" name="newStorage[Enabled]" id="newStorage[Enabled]0" value="0" <?php echo $newStorage->Enabled() ? $null : $checked ?>/>
+                <label class="form-check-label" for="newStorage[Enabled]0">No</label>
               </td>
             </tr>
           </tbody>
         </table>
+</div>
       </div>
       <div class="modal-footer">
         <button name="action" id="storageSubmitBtn" type="submit" class="btn btn-primary" value="Save"><?php echo translate('Save') ?></button>
diff --git a/web/ajax/shutdown.php b/web/ajax/shutdown.php
new file mode 100644
index 000000000..8b474b495
--- /dev/null
+++ b/web/ajax/shutdown.php
@@ -0,0 +1,58 @@
+<?php
+//
+// ZoneMinder web action file
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+$message = '';
+if ( !canEdit('System') ) {
+  $message = 'Need System permissions to shutdown server';
+} else if ( !isset($_REQUEST['command']) ) {
+  $message = 'A command is required. Cannot continue';
+}
+
+if ( $message ) {
+  ZM\Warning($message);
+  ajaxError($message);
+  return;
+}
+
+$data = array();
+$when = isset($_REQUEST['when']) and $_REQUEST['when'] == 'now' ? 'now' : '+1';
+$command = $_REQUEST['command'];
+
+if ( $command == 'shutdown' ) {
+  exec('sudo -n '.ZM_PATH_SHUTDOWN." -P $when 2>&1", $data['output'], $data['rc']);
+  #exec('sudo -n /bin/systemctl poweroff -i 2>&1', $data['output'], $data['rc']);
+  ZM\Debug('Shutdown output ' .$data['rc'].' '.implode("\n",$data['output']));
+  #ZM\Debug("Shutdown output " . shell_exec('/bin/systemctl poweroff -i 2>&1'));
+} else if ( $command == 'restart' ) {
+  $data['output'] = array();
+  exec('sudo -n '.ZM_PATH_SHUTDOWN." -r $when 2>&1", $data['output'], $data['rc']);
+  #exec('sudo -n /bin/systemctl reboot -i 2>&1', $data['output'], $data['rc']);
+  ZM\Debug("Shutdown output " . implode("\n",$data['output']));
+} else if ( $command == 'cancel' ) {
+  $data['output'] = array();
+  exec('sudo '.ZM_PATH_SHUTDOWN.' -c 2>&1', $data['output'], $data['rc']);
+} else {
+  ajaxError('Unknwn command:'.$command);
+  return;
+}
+
+ajaxResponse($data);
+return;
+?>
diff --git a/web/ajax/snapshots.php b/web/ajax/snapshots.php
new file mode 100644
index 000000000..de64230b0
--- /dev/null
+++ b/web/ajax/snapshots.php
@@ -0,0 +1,230 @@
+<?php
+require_once('includes/Snapshot.php');
+require_once('includes/Filter.php');
+$message = '';
+$data = array();
+
+//
+// INITIALIZE AND CHECK SANITY
+//
+
+if ( !canView('Snapshots') ) $message = 'Insufficient permissions for user '.$user['Username'];
+
+if ( empty($_REQUEST['task']) ) {
+  $message = 'Must specify a task';
+} else {
+  $task = $_REQUEST['task'];
+}
+
+if ( empty($_REQUEST['ids']) ) {
+  if ( isset($_REQUEST['task']) && $_REQUEST['task'] != 'query' ) $message = 'No snapshot id(s) supplied';
+} else {
+  $eids = $_REQUEST['ids'];
+}
+
+if ( $message ) {
+  ajaxError($message);
+  return;
+}
+
+// Search contains a user entered string to search on
+$search = isset($_REQUEST['search']) ? $_REQUEST['search'] : '';
+
+// Advanced search contains an array of "column name" => "search text" pairs
+// Bootstrap table sends json_ecoded array, which we must decode
+$advsearch = isset($_REQUEST['advsearch']) ? json_decode($_REQUEST['advsearch'], JSON_OBJECT_AS_ARRAY) : array();
+
+// Sort specifies the name of the column to sort on
+$sort = 'Id';
+if ( isset($_REQUEST['sort']) ) {
+  $sort = $_REQUEST['sort'];
+}
+
+// Offset specifies the starting row to return, used for pagination
+$offset = 0;
+if ( isset($_REQUEST['offset']) ) {
+  if ( ( !is_int($_REQUEST['offset']) and !ctype_digit($_REQUEST['offset']) ) ) {
+    ZM\Error('Invalid value for offset: ' . $_REQUEST['offset']);
+  } else {
+    $offset = $_REQUEST['offset'];
+  }
+}
+
+// Order specifies the sort direction, either asc or desc
+$order = (isset($_REQUEST['order']) and (strtolower($_REQUEST['order']) == 'asc')) ? 'ASC' : 'DESC';
+
+// Limit specifies the number of rows to return
+// Set the default to 0 for events view, to prevent an issue with ALL pagination
+$limit = 0;
+if ( isset($_REQUEST['limit']) ) {
+  if ( ( !is_int($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
+    ZM\Error('Invalid value for limit: ' . $_REQUEST['limit']);
+  } else {
+    $limit = $_REQUEST['limit'];
+  }
+}
+
+//
+// MAIN LOOP
+//
+
+switch ( $task ) {
+  case 'delete' :
+		if ( !canEdit('Snapshots') )  {
+			ajaxError('Insufficient permissions for user '.$user['Username']);
+			return;
+		}
+
+    foreach ( $ids as $id ) $data[] = deleteRequest($id);
+    break;
+  case 'query' :
+    $data = queryRequest($search, $advsearch, $sort, $offset, $order, $limit);
+    break;
+  default :
+    ZM\Fatal("Unrecognised task '$task'");
+} // end switch task
+
+ajaxResponse($data);
+
+//
+// FUNCTION DEFINITIONS
+//
+
+function deleteRequest($id) {
+  $message = array();
+  $snapshot = new ZM\Snapshot($id);
+  if ( !$snapshot->Id() ) {
+    $message[] = array($id=>'Snapshot not found.');
+  //} else if ( $snapshot->Archived() ) {
+    //$message[] = array($id=>'Event is archived, cannot delete it.');
+  } else {
+    $snapshot->delete();
+  }
+  
+  return $message;
+}
+
+function queryRequest($search, $advsearch, $sort, $offset, $order, $limit) {
+
+  $data = array(
+    'total'   =>  0,
+    'totalNotFiltered' => 0,
+    'rows'    =>  array(),
+    'updated' =>  preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG)
+  );
+
+  // Put server pagination code here
+  // The table we want our data from
+  $table = 'Snapshots';
+
+  // The names of the dB columns in the events table we are interested in
+  $columns = array('Id', 'Name', 'Description', 'CreatedOn');
+
+  if ( !in_array($sort, array_merge($columns)) ) {
+    ZM\Error('Invalid sort field: ' . $sort);
+    $sort = 'Id';
+  }
+
+  $values = array();
+  $likes = array();
+  $where = '';
+
+  $col_str = '*';
+  $sql = 'SELECT ' .$col_str. ' FROM `Snapshots`'.$where.' ORDER BY '.$sort.' '.$order;
+
+  $unfiltered_rows = array();
+  $snapshot_ids = array();
+
+  ZM\Debug('Calling the following sql query: ' .$sql);
+  $query = dbQuery($sql, $values);
+  if ( $query ) {
+    while ( $row = dbFetchNext($query) ) {
+      $snapshot = new ZM\Snapshot($row);
+      $snapshot->remove_from_cache();
+      $snapshot_ids[] = $snapshot->Id();
+      $unfiltered_rows[] = $row;
+    } # end foreach row
+  }
+
+  ZM\Debug('Have ' . count($unfiltered_rows) . ' snapshots matching base filter.');
+
+  $filtered_rows = null;
+
+  if ( count($advsearch) or $search != '' ) {
+    $search_filter = new ZM\Filter();
+
+    if (count($snapshot_ids))
+      $search_filter = $search_filter->addTerm(array('cnj'=>'and', 'attr'=>'Id', 'op'=>'IN', 'val'=>$snapshot_ids, 'tablename'=>'Snapshots'));
+
+    // There are two search bars in the log view, normal and advanced
+    // Making an exuctive decision to ignore the normal search, when advanced search is in use
+    // Alternatively we could try to do both
+    if ( count($advsearch) ) {
+      $terms = array();
+      foreach ( $advsearch as $col=>$text ) {
+        $terms[] = array('cnj'=>'and', 'attr'=>$col, 'op'=>'LIKE', 'val'=>$text, 'tablename'=>'Snapshots');
+      } # end foreach col in advsearch
+      $terms[0]['obr'] = 1;
+      $terms[count($terms)-1]['cbr'] = 1;
+      $search_filter->addTerms($terms);
+    } else if ( $search != '' ) {
+      $search = '%' .$search. '%';
+      $terms = array();
+      foreach ( $columns as $col ) {
+        $terms[] = array('cnj'=>'or', 'attr'=>$col, 'op'=>'LIKE', 'val'=>$search, 'tablename'=>'Snapshots');
+      }
+      $terms[0]['obr'] = 1;
+      $terms[0]['cnj'] = 'and';
+      $terms[count($terms)-1]['cbr'] = 1;
+      $search_filter = $search_filter->addTerms($terms, array('obr'=>1, 'cbr'=>1, 'op'=>'OR'));
+    } # end if search
+
+    $sql = 'SELECT ' .$col_str. ' FROM `Snapshots` WHERE '.$search_filter->sql().' ORDER BY ' .$sort. ' ' .$order;
+    ZM\Debug('Calling the following sql query: ' .$sql);
+    $filtered_rows = dbFetchAll($sql);
+    ZM\Debug('Have ' . count($filtered_rows) . ' snapshots matching search filter.');
+  } else {
+    $filtered_rows = $unfiltered_rows;
+  } # end if search_filter->terms() > 1
+
+  $returned_rows = array();
+  foreach ( array_slice($filtered_rows, $offset, $limit) as $row ) {
+    $snapshot = new ZM\Snapshot($row);
+
+    $row['imgHtml'] = '';
+    // Modify the row data as needed
+    foreach ( $snapshot->Events() as $event ) {
+      $scale = intval(5*100*ZM_WEB_LIST_THUMB_WIDTH / $event->Width());
+      $imgSrc = $event->getThumbnailSrc(array(), '&amp;');
+
+      $row['imgHtml'] .= '<img id="thumbnail' .$event->Id(). '" src="' .$imgSrc. '" alt="Event '.$event->Id().'" width="' .validInt($event->ThumbnailWidth()). '" height="' .validInt($event->ThumbnailHeight()).'"/>';
+    }
+    $row['Name'] = validHtmlStr($row['Name']);
+    $row['Description'] = validHtmlStr($row['Description']);
+    //$row['Archived'] = $row['Archived'] ? translate('Yes') : translate('No');
+    //$row['Emailed'] = $row['Emailed'] ? translate('Yes') : translate('No');
+    //$row['Cause'] = validHtmlStr($row['Cause']);
+    $row['CreatedOn'] = strftime(STRF_FMT_DATETIME_SHORTER, strtotime($row['CreatedOn']));
+    //$row['StartDateTime'] = strftime(STRF_FMT_DATETIME_SHORTER, strtotime($row['StartDateTime']));
+    //$row['EndDateTime'] = $row['EndDateTime'] ? strftime(STRF_FMT_DATETIME_SHORTER, strtotime($row['EndDateTime'])) : null;
+    //$row['Length'] = gmdate('H:i:s', $row['Length'] );
+    //$row['Storage'] = ( $row['StorageId'] and isset($StorageById[$row['StorageId']]) ) ? $StorageById[$row['StorageId']]->Name() : 'Default';
+    //$row['Notes'] = nl2br(htmlspecialchars($row['Notes']));
+    //$row['DiskSpace'] = human_filesize($event->DiskSpace());
+    //
+    $returned_rows[] = $row;
+  } # end foreach row matching search
+
+  $data['rows'] = $returned_rows;
+
+  # totalNotFiltered must equal total, except when either search bar has been used
+  $data['totalNotFiltered'] = count($unfiltered_rows);
+  if ( $search != '' || count($advsearch) ) {
+    $data['total'] = count($filtered_rows);
+  } else {
+    $data['total'] = $data['totalNotFiltered'];
+  }
+
+  return $data;
+}
+?>
diff --git a/web/ajax/stats.php b/web/ajax/stats.php
index 3789ff448..06ce9d733 100644
--- a/web/ajax/stats.php
+++ b/web/ajax/stats.php
@@ -6,6 +6,7 @@ if ( empty($_REQUEST['fid']) ) ajaxError('Frame Id Not Provided');
 $eid = $_REQUEST['eid'];
 $fid = $_REQUEST['fid'];
 $row = ( isset($_REQUEST['row']) ) ? $_REQUEST['row'] : '';
+$raw = isset($_REQUEST['raw']);
 $data = array();
 
 // Not sure if this is required
@@ -16,8 +17,28 @@ if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) {
   }
 }
 
-$data['html'] = getStatsTableHTML($eid, $fid, $row);
-$data['id'] = '#contentStatsTable' .$row;
+if ( $raw ) {
+  $sql = 'SELECT S.*,E.*,Z.Name AS ZoneName,Z.Units,Z.Area,M.Name AS MonitorName FROM Stats AS S LEFT JOIN Events AS E ON S.EventId = E.Id LEFT JOIN Zones AS Z ON S.ZoneId = Z.Id LEFT JOIN Monitors AS M ON E.MonitorId = M.Id WHERE S.EventId = ? AND S.FrameId = ? ORDER BY S.ZoneId';
+  $stat = dbFetchOne( $sql, NULL, array( $eid, $fid ) );
+  if ( $stat ) {
+    $stat['ZoneName'] = validHtmlStr($stat['ZoneName']);
+    $stat['PixelDiff'] = validHtmlStr($stat['PixelDiff']);
+    $stat['AlarmPixels'] = sprintf( "%d (%d%%)", $stat['AlarmPixels'], (100*$stat['AlarmPixels']/$stat['Area']) );
+    $stat['FilterPixels'] = sprintf( "%d (%d%%)", $stat['FilterPixels'], (100*$stat['FilterPixels']/$stat['Area']) );
+    $stat['BlobPixels'] = sprintf( "%d (%d%%)", $stat['BlobPixels'], (100*$stat['BlobPixels']/$stat['Area']) );
+    $stat['Blobs'] = validHtmlStr($stat['Blobs']);
+    if ( $stat['Blobs'] > 1 ) {
+      $stat['BlobSizes'] = sprintf( "%d-%d (%d%%-%d%%)", $stat['MinBlobSize'], $stat['MaxBlobSize'], (100*$stat['MinBlobSize']/$stat['Area']), (100*$stat['MaxBlobSize']/$stat['Area']) );
+    } else {
+      $stat['BlobSizes'] = sprintf( "%d (%d%%)", $stat['MinBlobSize'], 100*$stat['MinBlobSize']/$stat['Area'] );
+    }
+    $stat['AlarmLimits'] = validHtmlStr($stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY']);
+  }
+  $data['raw'] = $stat;
+} else {
+  $data['html'] = getStatsTableHTML($eid, $fid, $row);
+  $data['id'] = '#contentStatsTable' .$row;
+}
 
 ajaxResponse($data);
 return;
diff --git a/web/ajax/status.php b/web/ajax/status.php
index a80559998..9d14dd24d 100644
--- a/web/ajax/status.php
+++ b/web/ajax/status.php
@@ -4,9 +4,8 @@ if ( $_REQUEST['entity'] == 'navBar' ) {
   $data = array();
   if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) {
     $auth_hash = generateAuthHash(ZM_AUTH_HASH_IPS);
-    if ( isset($_REQUEST['auth']) and ($_REQUEST['auth'] != $auth_hash) ) {
-      $data['auth'] = $auth_hash;
-    }
+    $data['auth'] = $auth_hash;
+    $data['auth_relay'] = get_auth_relay();
   }
   // Each widget on the navbar has its own function
   // Call the functions we want to dynamically update
@@ -108,9 +107,9 @@ $statusData = array(
       'Name' => true,
       'Cause' => true,
       'Notes' => true,
-      'StartTime' => true,
-      'StartTimeShort' => array( 'sql' => 'date_format( StartTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
-      'EndTime' => true,
+      'StartDateTime' => true,
+      'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
+      'EndDateTime' => true,
       'Width' => true,
       'Height' => true,
       'Length' => true,
@@ -132,9 +131,9 @@ $statusData = array(
       'MonitorName' => array('sql' => '(SELECT Monitors.Name FROM Monitors WHERE Monitors.Id = Events.MonitorId)'),
       'Name' => true,
       'Cause' => true,
-      'StartTime' => true,
-      'StartTimeShort' => array( 'sql' => 'date_format( StartTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
-      'EndTime' => true,
+      'StartDateTime' => true,
+      'StartTimeShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
+      'EndDateTime' => true,
       'Width' => true,
       'Height' => true,
       'Length' => true,
@@ -179,7 +178,7 @@ $statusData = array(
       'EventId' => true,
       'Type' => true,
       'TimeStamp' => true,
-      'TimeStampShort' => array( 'sql' => 'date_format( StartTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
+      'TimeStampShort' => array( 'sql' => 'date_format( StartDateTime, \''.MYSQL_FMT_DATETIME_SHORT.'\' )' ), 
       'Delta' => true,
       'Score' => true,
       //'Image' => array( 'postFunc' => 'getFrameImage' ),
@@ -266,7 +265,6 @@ function collectData() {
 
     if ( count($fieldSql) ) {
       $sql = 'SELECT '.join(', ', $fieldSql).' FROM '.$entitySpec['table'];
-      #$sql = 'SELECT '.join(', ', array_map($fieldSql, function($f){return '`'.$f.'`';})).' FROM '.$entitySpec['table'];
       if ( $joinSql )
         $sql .= ' '.join(' ', array_unique($joinSql));
       if ( $id && !empty($entitySpec['selector']) ) {
@@ -313,30 +311,30 @@ function collectData() {
         $limit = $entitySpec['limit'];
       elseif ( !empty($_REQUEST['count']) )
         $limit = validInt($_REQUEST['count']);
-      $limit_offset='';
+      $limit_offset = '';
       if ( !empty($_REQUEST['offset']) )
         $limit_offset = validInt($_REQUEST['offset']) . ', ';
-      if ( !empty( $limit ) )
+      if ( !empty($limit) )
         $sql .= ' limit '.$limit_offset.$limit;
       if ( isset($limit) && $limit == 1 ) {
         if ( $sqlData = dbFetchOne($sql, NULL, $values) ) {
           foreach ( $postFuncs as $element=>$func )
             $sqlData[$element] = eval( 'return( '.$func.'( $sqlData ) );' );
-          $data = array_merge( $data, $sqlData );
+          $data = array_merge($data, $sqlData);
         }
       } else {
         $count = 0;
-        foreach( dbFetchAll( $sql, NULL, $values ) as $sqlData ) {
+        foreach ( dbFetchAll($sql, NULL, $values) as $sqlData ) {
           foreach ( $postFuncs as $element=>$func )
-            $sqlData[$element] = eval( 'return( '.$func.'( $sqlData ) );' );
+            $sqlData[$element] = eval('return( '.$func.'( $sqlData ) );');
           $data[] = $sqlData;
-          if ( isset($limi) && ++$count >= $limit )
+          if ( isset($limit) && ++$count >= $limit )
             break;
-        }
-      }
+        } # end foreach
+      } # end if have limit == 1
     }
   }
-  #ZM\Logger::Debug(print_r($data, true));
+  #ZM\Debug(print_r($data, true));
   return $data;
 }
 
@@ -346,33 +344,34 @@ if ( !isset($_REQUEST['layout']) ) {
   $_REQUEST['layout'] = 'json';
 }
 
-switch( $_REQUEST['layout'] ) {
+switch ( $_REQUEST['layout'] ) {
   case 'xml NOT CURRENTLY SUPPORTED' :
-      header('Content-type: application/xml');
-      echo('<?xml version="1.0" encoding="iso-8859-1"?>
-');
-      echo '<'.strtolower($_REQUEST['entity']).'>
+    header('Content-type: application/xml');
+    echo('<?xml version="1.0" encoding="iso-8859-1"?>
+      ');
+    echo '<'.strtolower($_REQUEST['entity']).'>
 ';
-      foreach ( $data as $key=>$value ) {
-        $key = strtolower($key);
-        echo "<$key>".htmlentities($value)."</$key>\n";
-      }
-      echo '</'.strtolower($_REQUEST['entity']).">\n";
-      break;
+    foreach ( $data as $key=>$value ) {
+      $key = strtolower($key);
+      echo "<$key>".htmlentities($value)."</$key>\n";
+    }
+    echo '</'.strtolower($_REQUEST['entity']).">\n";
+    break;
   case 'json' :
     {
       $response = array( strtolower(validJsStr($_REQUEST['entity'])) => $data );
       if ( isset($_REQUEST['loopback']) )
         $response['loopback'] = validJsStr($_REQUEST['loopback']);
+        #ZM\Warning(print_r($response, true));
       ajaxResponse($response);
       break;
     }
   case 'text' :
-      header('Content-type: text/plain' );
-      echo join( ' ', array_values( $data ) );
-      break;
+    header('Content-type: text/plain');
+    echo join(' ', array_values($data));
+    break;
   default:
-    ZM\Error('Unsupported layout: '. $_REQUEST['layout']);
+    ZM\Error('Unsupported layout: '.$_REQUEST['layout']);
 }
 
 function getFrameImage() {
@@ -380,86 +379,96 @@ function getFrameImage() {
   $frameId = $_REQUEST['id'][1];
 
   $sql = 'SELECT * FROM Frames WHERE EventId = ? AND FrameId = ?';
-  if ( !($frame = dbFetchOne( $sql, NULL, array($eventId, $frameId ) )) ) {
+  if ( !($frame = dbFetchOne($sql, NULL, array($eventId, $frameId))) ) {
     $frame = array();
     $frame['EventId'] = $eventId;
     $frame['FrameId'] = $frameId;
     $frame['Type'] = 'Virtual';
   }
-  $event = dbFetchOne( 'select * from Events where Id = ?', NULL, array( $frame['EventId'] ) );
-  $frame['Image'] = getImageSrc( $event, $frame, SCALE_BASE );
-  return( $frame );
+  $event = dbFetchOne('SELECT * FROM Events WHERE Id = ?', NULL, array($frame['EventId']));
+  $frame['Image'] = getImageSrc($event, $frame, SCALE_BASE);
+  return $frame;
 }
 
 function getNearFrame() {
   $eventId = $_REQUEST['id'][0];
   $frameId = $_REQUEST['id'][1];
 
-  $sql = 'select FrameId from Frames where EventId = ? and FrameId <= ? order by FrameId desc limit 1';
-  if ( !$nearFrameId = dbFetchOne( $sql, 'FrameId', array( $eventId, $frameId ) ) ) {
-    $sql = 'select * from Frames where EventId = ? and FrameId > ? order by FrameId asc limit 1';
-    if ( !$nearFrameId = dbFetchOne( $sql, 'FrameId', array( $eventId, $frameId ) ) ) {
+  $sql = 'SELECT FrameId FROM Frames WHERE EventId = ? AND FrameId <= ? ORDER BY FrameId DESC LIMIT 1';
+  if ( !$nearFrameId = dbFetchOne($sql, 'FrameId', array($eventId, $frameId)) ) {
+    $sql = 'SELECT * FROM Frames WHERE EventId = ? AND FrameId > ? ORDER BY FrameId ASC LIMIT 1';
+    if ( !$nearFrameId = dbFetchOne($sql, 'FrameId', array($eventId, $frameId)) ) {
       return( array() );
     }
   }
   $_REQUEST['entity'] = 'frame';
   $_REQUEST['id'][1] = $nearFrameId;
-  return( collectData() );
+  return collectData();
 }
 
 function getNearEvents() {
   global $user, $sortColumn, $sortOrder;
 
   $eventId = $_REQUEST['id'];
+  $NearEvents = array('EventId'=>$eventId);
+
   $event = dbFetchOne('SELECT * FROM Events WHERE Id=?', NULL, array($eventId));
+  if ( !$event ) return $NearEvents;
 
-  parseFilter($_REQUEST['filter']);
+  $filter = ZM\Filter::parse($_REQUEST['filter']);
   parseSort();
-
-  if ( $user['MonitorIds'] )
-    $midSql = ' AND MonitorId IN ('.join( ',', preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).')';
-  else
-    $midSql = '';
-
-  # When listing, it may make sense to list them in descending order.  But when viewing Prev should timewise earlier and Next should be after.
-  if ( $sortColumn == 'E.Id' or $sortColumn == 'E.StartTime' ) {
-    $sortOrder = 'asc';
+  if ( $user['MonitorIds'] ) {
+    $filter = $filter->addTerm(array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'IN', 'val'=>$user['MonitorIds']));
   }
 
-  $sql = "SELECT E.Id AS Id, E.StartTime AS StartTime FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE $sortColumn ".($sortOrder=='asc'?'<=':'>=')." '".$event[$_REQUEST['sort_field']]."'".$_REQUEST['filter']['sql'].$midSql.' AND E.Id<'.$event['Id'] . " ORDER BY $sortColumn ".($sortOrder=='asc'?'desc':'asc');
+  # When listing, it may make sense to list them in descending order.
+  # But when viewing Prev should timewise earlier and Next should be after.
+  if ( $sortColumn == 'E.Id' or $sortColumn == 'E.StartDateTime' ) {
+    $sortOrder = 'ASC';
+  }
+
+  $sql = 'SELECT E.Id AS Id, E.StartDateTime AS StartDateTime FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE '.$sortColumn.' '.($sortOrder=='ASC'?'<=':'>=').' \''.$event[$_REQUEST['sort_field']].'\' AND ('.$filter->sql().') AND E.Id<'.$event['Id'] . ' ORDER BY '.$sortColumn.' '.($sortOrder=='ASC'?'DESC':'ASC');
   if ( $sortColumn != 'E.Id' ) {
     # When sorting by starttime, if we have two events with the same starttime (diffreent monitors) then we should sort secondly by Id
     $sql .= ', E.Id DESC';
   }
   $sql .= ' LIMIT 1';
   $result = dbQuery($sql);
+  if ( !$result ) {
+    ZM\Error('Failed to load previous event using '.$sql);
+    return $NearEvents;
+  }
+
   $prevEvent = dbFetchNext($result);
 
-  $sql = "SELECT E.Id AS Id, E.StartTime AS StartTime FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE $sortColumn ".($sortOrder=='asc'?'>=':'<=')." '".$event[$_REQUEST['sort_field']]."'".$_REQUEST['filter']['sql'].$midSql.' AND E.Id>'.$event['Id'] . " ORDER BY $sortColumn $sortOrder";
+  $sql = 'SELECT E.Id AS Id, E.StartDateTime AS StartDateTime FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE '.$sortColumn .' '.($sortOrder=='ASC'?'>=':'<=').' \''.$event[$_REQUEST['sort_field']]."' AND (".$filter->sql().') AND E.Id>'.$event['Id'] . ' ORDER BY '.$sortColumn.' '.($sortOrder=='ASC'?'ASC':'DESC');
   if ( $sortColumn != 'E.Id' ) {
     # When sorting by starttime, if we have two events with the same starttime (diffreent monitors) then we should sort secondly by Id
     $sql .= ', E.Id ASC';
   }
   $sql .= ' LIMIT 1';
-  $result = dbQuery( $sql );
-  $nextEvent = dbFetchNext( $result );
+  $result = dbQuery($sql);
+  if ( !$result ) {
+    ZM\Error('Failed to load next event using '.$sql);
+    return $NearEvents;
+  }
+  $nextEvent = dbFetchNext($result);
 
-  $result = array( 'EventId'=>$eventId );
   if ( $prevEvent ) {
-    $result['PrevEventId'] = $prevEvent['Id'];
-    $result['PrevEventStartTime'] = $prevEvent['StartTime'];
-    $result['PrevEventDefVideoPath'] = getEventDefaultVideoPath($prevEvent['Id']);
+    $NearEvents['PrevEventId'] = $prevEvent['Id'];
+    $NearEvents['PrevEventStartTime'] = $prevEvent['StartDateTime'];
+    $NearEvents['PrevEventDefVideoPath'] = getEventDefaultVideoPath($prevEvent['Id']);
   } else {
-    $result['PrevEventId'] = $result['PrevEventStartTime'] = $result['PrevEventDefVideoPath'] = 0;
+    $NearEvents['PrevEventId'] = $NearEvents['PrevEventStartTime'] = $NearEvents['PrevEventDefVideoPath'] = 0;
   }
   if ( $nextEvent ) {
-    $result['NextEventId'] = $nextEvent['Id'];
-    $result['NextEventStartTime'] = $nextEvent['StartTime'];
-    $result['NextEventDefVideoPath'] = getEventDefaultVideoPath($nextEvent['Id']);
+    $NearEvents['NextEventId'] = $nextEvent['Id'];
+    $NearEvents['NextEventStartTime'] = $nextEvent['StartDateTime'];
+    $NearEvents['NextEventDefVideoPath'] = getEventDefaultVideoPath($nextEvent['Id']);
   } else {
-    $result['NextEventId'] = $result['NextEventStartTime'] = $result['NextEventDefVideoPath'] = 0;
+    $NearEvents['NextEventId'] = $NearEvents['NextEventStartTime'] = $NearEvents['NextEventDefVideoPath'] = 0;
   }
-  return $result;
-}
+  return $NearEvents;
+} # end function getNearEvents()
 
 ?>
diff --git a/web/ajax/stream.php b/web/ajax/stream.php
index 297b744c6..5c8c07312 100644
--- a/web/ajax/stream.php
+++ b/web/ajax/stream.php
@@ -31,27 +31,29 @@ if ( sem_acquire($semaphore,1) !== false ) {
 
   switch ( $_REQUEST['command'] ) {
   case CMD_VARPLAY :
-    ZM\Logger::Debug('Varplaying to '.$_REQUEST['rate']);
+    ZM\Debug('Varplaying to '.$_REQUEST['rate']);
     $msg = pack('lcn', MSG_CMD, $_REQUEST['command'], $_REQUEST['rate']+32768);
     break;
   case CMD_ZOOMIN :
-    ZM\Logger::Debug('Zooming to '.$_REQUEST['x'].','.$_REQUEST['y']);
+    ZM\Debug('Zooming to '.$_REQUEST['x'].','.$_REQUEST['y']);
     $msg = pack('lcnn', MSG_CMD, $_REQUEST['command'], $_REQUEST['x'], $_REQUEST['y']);
     break;
   case CMD_PAN :
-    ZM\Logger::Debug('Panning to '.$_REQUEST['x'].','.$_REQUEST['y']);
+    ZM\Debug('Panning to '.$_REQUEST['x'].','.$_REQUEST['y']);
     $msg = pack('lcnn', MSG_CMD, $_REQUEST['command'], $_REQUEST['x'], $_REQUEST['y']);
     break;
   case CMD_SCALE :
-    ZM\Logger::Debug('Scaling to '.$_REQUEST['scale']);
+    ZM\Debug('Scaling to '.$_REQUEST['scale']);
     $msg = pack('lcn', MSG_CMD, $_REQUEST['command'], $_REQUEST['scale']);
     break;
   case CMD_SEEK :
-    ZM\Logger::Debug('Seeking to '.$_REQUEST['offset']);
-    $msg = pack('lcN', MSG_CMD, $_REQUEST['command'], $_REQUEST['offset']);
+    # Pack int two 32 bit integers instead of trying to deal with floats
+    $msg = pack('lcNN', MSG_CMD, $_REQUEST['command'],
+      intval($_REQUEST['offset']),
+      1000000*( $_REQUEST['offset']-intval($_REQUEST['offset'])));
     break;
   default :
-    ZM\Logger::Debug('Sending command ' . $_REQUEST['command']);
+    ZM\Debug('Sending command ' . $_REQUEST['command']);
     $msg = pack('lc', MSG_CMD, $_REQUEST['command']);
     break;
   }
@@ -65,7 +67,7 @@ if ( sem_acquire($semaphore,1) !== false ) {
     // WHY? We will just send another one... 
     // ANSWER: Because otherwise we get a log of errors logged
 
-    //ZM\Logger::Debug("$remSockFile does not exist, waiting, current " . (time() - $start_time) . ' seconds' );
+    //ZM\Debug("$remSockFile does not exist, waiting, current " . (time() - $start_time) . ' seconds' );
     usleep(1000);
   }
 
@@ -115,8 +117,10 @@ if ( sem_acquire($semaphore,1) !== false ) {
   $data = unpack('ltype', $msg);
   switch ( $data['type'] ) {
   case MSG_DATA_WATCH :
-    $data = unpack('ltype/imonitor/istate/dfps/ilevel/irate/ddelay/izoom/Cdelayed/Cpaused/Cenabled/Cforced', $msg);
+    $data = unpack('ltype/imonitor/istate/dfps/dcapturefps/danalysisfps/ilevel/irate/ddelay/izoom/Cdelayed/Cpaused/Cenabled/Cforced', $msg);
     $data['fps'] = round( $data['fps'], 2 );
+    $data['capturefps'] = round( $data['capturefps'], 2 );
+    $data['analysisfps'] = round( $data['analysisfps'], 2 );
     $data['rate'] /= RATE_BASE;
     $data['delay'] = round( $data['delay'], 2 );
     $data['zoom'] = round( $data['zoom']/SCALE_BASE, 1 );
@@ -124,20 +128,20 @@ if ( sem_acquire($semaphore,1) !== false ) {
       $auth_hash = generateAuthHash(ZM_AUTH_HASH_IPS);
       if ( isset($_REQUEST['auth']) and ($_REQUEST['auth'] != $auth_hash) ) {
         $data['auth'] = $auth_hash;
-        ZM\Logger::Debug("including nw auth hash " . $data['auth']);
+        ZM\Debug("including nw auth hash " . $data['auth']);
       } else {
-        ZM\Logger::Debug('Not including nw auth hash becase it hashn\'t changed '.$auth_hash);
+        ZM\Debug('Not including new auth hash becase it hasn\'t changed '.$auth_hash);
       } 
     }
     ajaxResponse(array('status'=>$data));
     break;
   case MSG_DATA_EVENT :
     if ( version_compare( phpversion(), '5.6.0', '<') ) {
-      ZM\Logger::Debug('Using old unpack methods to handle 64bit event id');
-      $data = unpack('ltype/ieventlow/ieventhigh/iprogress/irate/izoom/Cpaused', $msg);
+      ZM\Debug('Using old unpack methods to handle 64bit event id');
+      $data = unpack('ltype/ieventlow/ieventhigh/dduration/dprogress/irate/izoom/Cpaused', $msg);
       $data['event'] = $data['eventhigh'] << 32 | $data['eventlow'];
     } else {
-      $data = unpack('ltype/Qevent/iprogress/irate/izoom/Cpaused', $msg);
+      $data = unpack('ltype/Qevent/dduration/dprogress/irate/izoom/Cpaused', $msg);
     }
     $data['rate'] /= RATE_BASE;
     $data['zoom'] = round($data['zoom']/SCALE_BASE, 1);
@@ -154,7 +158,7 @@ if ( sem_acquire($semaphore,1) !== false ) {
   }
   sem_release($semaphore);
 } else {
-  ZM\Logger::Debug('Couldn\'t get semaphore');
+  ZM\Debug('Couldn\'t get semaphore');
   ajaxResponse(array());
 }
 
diff --git a/web/ajax/watch.php b/web/ajax/watch.php
new file mode 100644
index 000000000..e8c551643
--- /dev/null
+++ b/web/ajax/watch.php
@@ -0,0 +1,75 @@
+<?php
+//
+// This is simplified version of the logic from ajax/events.php
+// For efficency, sorting and and pagination functionality have been exlcuded
+//
+
+$message = '';
+$data = array();
+
+//
+// INITIALIZE AND CHECK SANITY
+//
+
+if ( !canView('Events') ) $message = 'Insufficient permissions for user '.$user['Username'];
+
+// Mid specifies the monitor id we are searching on
+if ( empty($_REQUEST['mid']) ) {
+  $message = 'Must specify a monitor Id';
+} else {
+  $mid = $_REQUEST['mid'];
+}
+
+// Limit specifies the number of rows to return
+if ( ( !is_int($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
+  $message = 'Invalid value for limit: '.$_REQUEST['limit'];
+} else {
+  $limit = $_REQUEST['limit'];
+}
+
+if ( $message ) {
+  ZM\Error($message);
+  ajaxError($message);
+  return;
+}
+
+// Sort specifies the name of the column to sort on
+$sort = 'Id';
+if ( isset($_REQUEST['sort']) ) {
+  $sort = $_REQUEST['sort'];
+}
+
+// Order specifies the sort direction, either asc or desc
+$order = (isset($_REQUEST['order']) and (strtolower($_REQUEST['order']) == 'asc')) ? 'ASC' : 'DESC';
+
+//
+// MAIN LOOP
+//
+
+$where = 'WHERE MonitorId = '.$mid;
+$col_str = 'E.*';
+$sql = 'SELECT ' .$col_str. ' FROM `Events` AS E '.$where.' ORDER BY '.$sort.' '.$order. ' LIMIT ?';
+ZM\Debug('Calling the following sql query: ' .$sql);
+$rows = dbQuery($sql, array($limit));
+
+$returned_rows = array();
+foreach ( $rows as $row ) {
+  $event = new ZM\Event($row['Id']);
+
+  $scale = intval(5*100*ZM_WEB_LIST_THUMB_WIDTH / $event->Width());
+  $imgSrc = $event->getThumbnailSrc(array(), '&amp;');
+  $streamSrc = $event->getStreamSrc(array(
+    'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single', 'rate'=>'400'), '&amp;');
+
+  // Modify the row data as needed
+  $row['imgHtml'] = '<img id="thumbnail' .$event->Id(). '" src="' .$imgSrc. '" alt="Event '.$event->Id().'" width="' .validInt($event->ThumbnailWidth()). '" height="' .validInt($event->ThumbnailHeight()).'" stream_src="' .$streamSrc. '" still_src="' .$imgSrc. '"/>';
+  $row['Name'] = validHtmlStr($row['Name']);
+  $row['StartDateTime'] = strftime(STRF_FMT_DATETIME_SHORTER, strtotime($row['StartDateTime']));
+  $row['Length'] = gmdate('H:i:s', $row['Length'] );
+
+  $returned_rows[] = $row;
+} # end foreach row matching search
+
+$data['rows'] = $returned_rows;
+ajaxResponse($data);
+?>
diff --git a/web/api/CONTRIBUTING.md b/web/api/CONTRIBUTING.md
index 211d68744..8c7ceb48b 100644
--- a/web/api/CONTRIBUTING.md
+++ b/web/api/CONTRIBUTING.md
@@ -9,6 +9,10 @@ CakePHP loves to welcome your contributions. There are several ways to help out:
 There are a few guidelines that we need contributors to follow so that we have a
 chance of keeping on top of things.
 
+## Code of Conduct
+
+Help us keep CakePHP open and inclusive. Please read and follow our [Code of Conduct](https://github.com/cakephp/code-of-conduct/blob/master/CODE_OF_CONDUCT.md).
+
 ## Getting Started
 
 * Make sure you have a [GitHub account](https://github.com/signup/free).
@@ -33,14 +37,14 @@ chance of keeping on top of things.
 * Core test cases should continue to pass. You can run tests locally or enable
   [travis-ci](https://travis-ci.org/) for your fork, so all tests and codesniffs
   will be executed.
-* Your work should apply the CakePHP coding standards.
+* Your work should apply the [CakePHP coding standards](https://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html).
 
 ## Which branch to base the work
 
 * Bugfix branches will be based on master.
 * New features that are backwards compatible will be based on next minor release
   branch.
-* New features or other non-BC changes will go in the next major release branch.
+* New features or other non backwards compatible changes will go in the next major release branch.
 
 ## Submitting Changes
 
@@ -50,8 +54,8 @@ chance of keeping on top of things.
 
 ## Test cases and codesniffer
 
-CakePHP tests requires [PHPUnit](http://www.phpunit.de/manual/current/en/installation.html)
-3.5 or higher. To run the test cases locally use the following command:
+CakePHP tests requires [PHPUnit](https://phpunit.de/manual/current/en/installation.html)
+3.7, version 4 is not compatible. To run the test cases locally use the following command:
 
     ./lib/Cake/Console/cake test core AllTests --stderr
 
@@ -60,12 +64,16 @@ To run the sniffs for CakePHP coding standards:
     phpcs -p --extensions=php --standard=CakePHP ./lib/Cake
 
 Check the [cakephp-codesniffer](https://github.com/cakephp/cakephp-codesniffer)
-repository to setup the CakePHP standard. The README contains installation info
+repository to setup the CakePHP standard. The [README](https://github.com/cakephp/cakephp-codesniffer/blob/master/README.md) contains installation info
 for the sniff and phpcs.
 
+## Reporting a Security Issue
+
+If you've found a security related issue in CakePHP, please don't open an issue in GitHub. Instead contact us at security@cakephp.org. For more information on how we handle security issues, [see the CakePHP Security Issue Process](https://book.cakephp.org/2.0/en/contributing/tickets.html#reporting-security-issues).
+
 # Additional Resources
 
-* [CakePHP coding standards](http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html)
+* [CakePHP coding standards](https://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html)
 * [Existing issues](https://github.com/cakephp/cakephp/issues)
 * [Development Roadmaps](https://github.com/cakephp/cakephp/wiki#roadmaps)
 * [General GitHub documentation](https://help.github.com/)
diff --git a/web/api/app/Config/Schema/db_acl.sql b/web/api/app/Config/Schema/db_acl.sql
index cbb0ccece..e0a0e02fb 100644
--- a/web/api/app/Config/Schema/db_acl.sql
+++ b/web/api/app/Config/Schema/db_acl.sql
@@ -40,7 +40,7 @@ CREATE TABLE aros (
   PRIMARY KEY  (id)
 );
 
-/* this indexes will improve acl perfomance */
+/* this indexes will improve acl performance */
 CREATE INDEX idx_acos_lft_rght ON `acos` (`lft`, `rght`);
 
 CREATE INDEX idx_acos_alias ON `acos` (`alias`);
diff --git a/web/api/app/Config/Schema/sessions.php b/web/api/app/Config/Schema/sessions.php
index 14ff2c6d4..b766ebff0 100644
--- a/web/api/app/Config/Schema/sessions.php
+++ b/web/api/app/Config/Schema/sessions.php
@@ -4,37 +4,57 @@
  *
  * Use it to configure database for Sessions
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.Config.Schema
  * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
-/*
- *
+/**
  * Using the Schema command line utility
  * cake schema run create Sessions
- *
  */
 class SessionsSchema extends CakeSchema {
 
+/**
+ * Name property
+ *
+ * @var string
+ */
 	public $name = 'Sessions';
 
+/**
+ * Before callback.
+ *
+ * @param array $event Schema object properties
+ * @return bool Should process continue
+ */
 	public function before($event = array()) {
 		return true;
 	}
 
+/**
+ * After callback.
+ *
+ * @param array $event Schema object properties
+ * @return void
+ */
 	public function after($event = array()) {
 	}
 
+/**
+ * The cake_sessions table definition
+ *
+ * @var array
+ */
 	public $cake_sessions = array(
 		'id' => array('type' => 'string', 'null' => false, 'key' => 'primary'),
 		'data' => array('type' => 'text', 'null' => true, 'default' => null),
diff --git a/web/api/app/Config/email.php.default b/web/api/app/Config/email.php.default
index 6dcfdd8f9..353548e6a 100644
--- a/web/api/app/Config/email.php.default
+++ b/web/api/app/Config/email.php.default
@@ -1,7 +1,5 @@
 <?php
 /**
- *
- *
  * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
@@ -10,7 +8,7 @@
  * Redistributions of files must retain the above copyright notice.
  *
  * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.Config
  * @since         CakePHP(tm) v 2.0.0
  * @license       https://opensource.org/licenses/mit-license.php MIT License
@@ -35,7 +33,6 @@
  *
  * from =>
  * The origin email. See CakeEmail::from() about the valid values
- *
  */
 class EmailConfig {
 
diff --git a/web/api/app/Config/routes.php b/web/api/app/Config/routes.php
index a684f241e..8dd2c1f63 100644
--- a/web/api/app/Config/routes.php
+++ b/web/api/app/Config/routes.php
@@ -23,20 +23,21 @@
 /**
  * Load the API / REST routes
  */
-	Router::mapResources('monitors');
-	Router::mapResources('zones');
-	Router::mapResources('configs');
-	Router::mapResources('events');
-	Router::mapResources('frames');
-	Router::mapResources('host');
-	Router::mapResources('logs');
-	Router::mapResources('states');
-	Router::mapResources('zonepresets');
-
 	/* Add new API to retrieve camera controls - for PTZ */
 	/* refer to https://github.com/ZoneMinder/ZoneMinder/issues/799#issuecomment-105233112 */
+	Router::mapResources('configs');
 	Router::mapResources('controls');
+	Router::mapResources('events');
+	Router::mapResources('frames');
   Router::mapResources('groups');	
+	Router::mapResources('host');
+	Router::mapResources('logs');
+	Router::mapResources('monitors');
+	Router::mapResources('states');
+	Router::mapResources('users');
+	Router::mapResources('zonepresets');
+	Router::mapResources('zones');
+
 	Router::parseExtensions();
 
 /**
diff --git a/web/api/app/Controller/AppController.php b/web/api/app/Controller/AppController.php
index 737dedacf..60c7492c3 100644
--- a/web/api/app/Controller/AppController.php
+++ b/web/api/app/Controller/AppController.php
@@ -5,18 +5,18 @@
  * This file is application-wide controller file. You can put all
  * application-wide controller-related methods here.
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.Controller
  * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://www.opensource.org/licenses/mit-license.php MIT License
  */
 App::uses('Controller', 'Controller');
 App::uses('CrudControllerTrait', 'Crud.Lib');
@@ -27,8 +27,8 @@ App::uses('CrudControllerTrait', 'Crud.Lib');
  * Add your application-wide methods in the class below, your controllers
  * will inherit them.
  *
- * @package   app.Controller
- * @link    http://book.cakephp.org/2.0/en/controllers.html#the-app-controller
+ * @package           app.Controller
+ * @link              https://book.cakephp.org/2.0/en/controllers.html#the-app-controller
  */
 class AppController extends Controller {
   use CrudControllerTrait;
@@ -100,12 +100,12 @@ class AppController extends Controller {
           }
           generateAuthHash(ZM_AUTH_HASH_IPS);
           session_write_close();
-        } else if ( $_COOKIE['ZMSESSID'] and !$user ) {
+        } else if ( isset($_COOKIE['ZMSESSID']) and !$user ) {
           # Have a cookie set, try to load user by session
           if ( ! is_session_started() )
             zm_session_start();
 
-          ZM\Logger::Debug(print_r($_SESSION, true));
+          ZM\Debug(print_r($_SESSION, true));
           $user = userFromSession();
           session_write_close();
         }
diff --git a/web/api/app/Controller/Component/ImageComponent.php b/web/api/app/Controller/Component/ImageComponent.php
index 2033e0d8c..567333a71 100644
--- a/web/api/app/Controller/Component/ImageComponent.php
+++ b/web/api/app/Controller/Component/ImageComponent.php
@@ -89,11 +89,11 @@ class ImageComponent extends Component {
 
 	}
 
-	// Take the StartTime of an Event and return
+	// Take the StartDateTime of an Event and return
 	// the path to its location on the filesystem
 	public function getEventPath( $event ) {
     if ( $config['ZM_USE_DEEP_STORAGE'] == 1 )
-      return $event['Event']['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['Event']['StartTime']) );
+      return $event['Event']['MonitorId'].'/'.strftime( '%y/%m/%d/%H/%M/%S', strtotime($event['Event']['StartDateTime']) );
     else
       return $event['Event']['MonitorId'].'/'.$event['Event']['Id'];
   }
diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php
index 5188c18b4..d18409387 100644
--- a/web/api/app/Controller/EventsController.php
+++ b/web/api/app/Controller/EventsController.php
@@ -48,9 +48,24 @@ class EventsController extends AppController {
       $mon_options = '';
     }
 
-    if ( $this->request->params['named'] ) {
+    $named_params = $this->request->params['named'];
+    if ( $named_params ) {
+      # In 1.35.13 we renamed StartTime and EndTime to StartDateTime and EndDateTime.
+      # This hack renames the query string params
+      foreach ( $named_params as $k=>$v ) {
+        if ( false !== strpos($k, 'StartTime') ) {
+          $new_k = preg_replace('/StartTime/', 'StartDateTime', $k);
+          $named_params[$new_k] = $named_params[$k];
+          unset($named_params[$k]);
+        }
+        if ( false !== strpos($k, 'EndTime') ) {
+          $new_k = preg_replace('/EndTime/', 'EndDateTime', $k);
+          $named_params[$new_k] = $named_params[$k];
+          unset($named_params[$k]);
+        }
+      }
       $this->FilterComponent = $this->Components->load('Filter');
-      $conditions = $this->FilterComponent->buildFilter($this->request->params['named']);
+      $conditions = $this->FilterComponent->buildFilter($named_params);
     } else {
       $conditions = array();
     }
@@ -65,7 +80,7 @@ class EventsController extends AppController {
       // API
 
       'limit' => '100',
-      'order' => array('StartTime'),
+      'order' => array('StartDateTime'),
       'paramType' => 'querystring',
     );
     if ( isset($conditions['GroupId']) ) {
@@ -309,7 +324,7 @@ class EventsController extends AppController {
     } else {
       $conditions = array();
     } 
-    array_push($conditions, array("StartTime >= DATE_SUB(NOW(), INTERVAL $expr $unit)"));
+    array_push($conditions, array("StartDateTime >= DATE_SUB(NOW(), INTERVAL $expr $unit)"));
     $query = $this->Event->find('all', array(
                                              'fields' => array(
                                                                'MonitorId',
@@ -434,14 +449,11 @@ class EventsController extends AppController {
     // Find the max Frame for this Event.  Error out otherwise.
     $this->loadModel('Frame');
 
-    if (! $frame = $this->Frame->find('first', array(
+    $frame = $this->Frame->find('first', array(
       'conditions' => array(
-        'EventId' => $event['Event']['Id'],
-        'Score' => $event['Event']['MaxScore']
-      )
-    ))) {
-      throw new NotFoundException(__('Can not find Frame for Event ' . $event['Event']['Id']));
-    }
-    return $frame['Frame']['Id'];
+      'EventId' => $event['Event']['Id'],
+      'Score' => $event['Event']['MaxScore']
+    )));
+    return empty($frame)?null:$frame['Frame']['Id'];
   }
 } // end class EventsController
diff --git a/web/api/app/Controller/GroupsController.php b/web/api/app/Controller/GroupsController.php
index f4185fe76..fe83bd3b3 100644
--- a/web/api/app/Controller/GroupsController.php
+++ b/web/api/app/Controller/GroupsController.php
@@ -31,8 +31,31 @@ class GroupsController extends AppController {
  * @return void
  */
 	public function index() {
-		$this->Group->recursive = -1;
-		$groups = $this->Group->find('all');
+		$this->Group->recursive = 0;
+
+    if ( $this->request->params['named'] ) {
+      $this->FilterComponent = $this->Components->load('Filter');
+      $conditions = $this->FilterComponent->buildFilter($this->request->params['named']);
+    } else {
+      $conditions = array();
+    }
+
+    $find_array = array(
+      'conditions' => &$conditions,
+      'contain'    => array('Monitor'),
+      'joins'      => array(
+        array(
+          'table' => 'Groups_Monitors',
+          'type'  => 'left',
+          'conditions' => array(
+            'Groups_Monitors.GroupId = Group.Id',
+          ),
+        ),
+      ),
+      'group' => '`Group`.`Id`',
+    );
+
+		$groups = $this->Group->find('all', $find_array);
 		$this->set(array(
 			'groups' => $groups,
 			'_serialize' => array('groups')
@@ -116,23 +139,23 @@ class GroupsController extends AppController {
         throw new UnauthorizedException(__('Insufficient Privileges'));
         return;
       }
+      $this->Group->id = $id;
 			if ( $this->Group->save($this->request->data) ) {
-        return $this->flash(
-          __('The group has been saved.'),
-          array('action' => 'index')
-        );
+        $message = 'Saved';
       } else {
         $message = 'Error';
+        // if there is a validation message, use it
+        if ( !$this->group->validates() ) {
+          $message .= ': '.$this->Group->validationErrors;
+        }
 			}
-		} else {
-			$options = array('conditions' => array('Group.' . $this->Group->primaryKey => $id));
-			$this->request->data = $this->Group->find('first', $options);
-		}
-		$monitors = $this->Group->Monitor->find('list');
+		} # end if post/put
+
+		$group = $this->Group->findById($id);
 		$this->set(array(
 			'message' => $message,
-      'monitors'=> $monitors,
-			'_serialize' => array('message')
+			'group' => $group,
+			'_serialize' => array('group')
 		));
 	}
 
diff --git a/web/api/app/Controller/HostController.php b/web/api/app/Controller/HostController.php
index cf6e99b53..3cfcaf8e2 100644
--- a/web/api/app/Controller/HostController.php
+++ b/web/api/app/Controller/HostController.php
@@ -21,6 +21,30 @@ class HostController extends AppController {
     ));
   }
 
+  // an interface to individually control the various ZM daemons
+  // invocation: https://server/zm/api/host/daemonControl/<daemon>.pl/<command>.json
+  // note that this API is only for interaction with a specific
+  // daemon. zmdc also allows other functions like logrot/etc
+  public function daemonControl($daemon_name, $command) {
+    global $user;
+    if ($command == 'check' || $command == 'status') {
+      $permission = 'View';
+    } else {
+      $permission = 'Edit';
+    }
+    $allowed = (!$user) || ($user['System'] == $permission );
+    if ( !$allowed ) {
+      throw new UnauthorizedException(__("Insufficient privileges"));
+      return;
+    }
+    $string = ZM_PATH_BIN."/zmdc.pl $command $daemon_name";
+    $result = exec($string);
+    $this->set(array(
+      'result' => $result,
+      '_serialize' => array('result')
+    ));
+  }
+
   function getLoad() {
     $load = sys_getloadavg();
 
@@ -50,10 +74,10 @@ class HostController extends AppController {
     $cred_depr = [];
 
     if ( $username && $password ) {
-      ZM\Logger::Debug('Username and password provided, generating access and refresh tokens');
+      ZM\Debug('Username and password provided, generating access and refresh tokens');
       $cred = $this->_getCredentials(true, '', $username); // generate refresh
     } else {
-      ZM\Logger::Debug('Only generating access token');
+      ZM\Debug('Only generating access token');
       $cred = $this->_getCredentials(false, $token); // don't generate refresh
     }
 
@@ -72,7 +96,7 @@ class HostController extends AppController {
       $login_array['credentials'] = $cred_depr[0];
       $login_array['append_password'] = $cred_depr[1];
     } else {
-      ZM\Logger::Debug('Legacy Auth is disabled, not generating auth= credentials');
+      ZM\Debug('Legacy Auth is disabled, not generating auth= credentials');
     }
 
     $login_array['version'] = $ver[0];
@@ -113,7 +137,7 @@ class HostController extends AppController {
   private function _getCredentials($generate_refresh_token=false, $token='', $username='') {
 
     if ( !ZM_OPT_USE_AUTH ) {
-      ZM\Error('OPT_USE_AUTH is turned off. Tokens will be null');
+      ZM\Debug('OPT_USE_AUTH is turned off. Tokens will be null');
       return;
     }
       
@@ -203,7 +227,7 @@ class HostController extends AppController {
 
     if ( $mid ) {
       // Get disk usage for $mid
-      ZM\Logger::Debug("Executing du -s0 $zm_dir_events/$mid | awk '{print $1}'");
+      ZM\Debug("Executing du -s0 $zm_dir_events/$mid | awk '{print $1}'");
       $usage = shell_exec("du -s0 $zm_dir_events/$mid | awk '{print $1}'");
     } else {
       $monitors = $this->Monitor->find('all', array(
diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 3818f69d3..4ecca6236 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -156,32 +156,21 @@ class MonitorsController extends AppController {
       return;
     }
 
+    $monitor = $this->Monitor->find('first', array(
+      'conditions' => array('Id' => $id)
+    ))['Monitor'];
+
     $message = '';
     if ( $this->Monitor->save($this->request->data) ) {
       $message = 'Saved';
-      $Monitor = $this->Monitor->find('first', array(
-        'fields' => array('Function','ServerId'),
+
+      // Stop the monitor. Should happen before saving
+      $this->Monitor->daemonControl($monitor, 'stop');
+      $monitor = $this->Monitor->find('first', array(
         'conditions' => array('Id' => $id)
       ))['Monitor'];
 
-      // - restart or stop this monitor after change
-      $func = $Monitor['Function'];
-      // We don't pass the request data as the monitor object because it may be a subset of the full monitor array
-      $this->daemonControl($this->Monitor->id, 'stop');
-      if (
-        ( $func != 'None' )
-        and
-        (
-          (!defined('ZM_SERVER_ID'))
-          or
-          ($Monitor['ServerId']==ZM_SERVER_ID)
-        )
-      ) {
-        if ( !defined('ZM_SERVER_ID')) {
-          ZM\Logger::Debug("Not defined ZM_SERVER_ID");
-        }
-        $this->daemonControl($this->Monitor->id, 'start');
-      }
+      $this->Monitor->daemonControl($monitor, 'start');
     } else {
       $message = 'Error ' . print_r($this->Monitor->invalidFields(), true);
     }
@@ -239,7 +228,7 @@ class MonitorsController extends AppController {
   // arm/disarm alarms
   // expected format: http(s):/portal-api-url/monitors/alarm/id:M/command:C.json
   // where M=monitorId
-  // where C=on|off|status
+  // where C=on|off|status|disable
   public function alarm() {
     $id = $this->request->params['named']['id'];
     if ( !$this->Monitor->exists($id) ) {
@@ -256,6 +245,10 @@ class MonitorsController extends AppController {
         $q = '-c';
         $verbose = '-v';
         break;
+      case 'disable':
+        $q = '-n';
+        $verbose = '-v';
+        break;
       case 'status':
         $verbose = ''; // zmu has a bug - gives incorrect verbose output in this case
         $q = '-s';
@@ -353,43 +346,15 @@ class MonitorsController extends AppController {
   }
 
   public function daemonControl($id, $command, $daemon=null) {
-
     // Need to see if it is local or remote
     $monitor = $this->Monitor->find('first', array(
-      'fields' => array('Type', 'Function', 'Device'),
+      'fields' => array('Id', 'Type', 'Function', 'Device', 'ServerId'),
       'conditions' => array('Id' => $id)
     ));
     $monitor = $monitor['Monitor'];
 
-    $daemons = array();
-    if ( ! $daemon ) {
-      if ( $monitor['Function'] == 'Monitor' ) {
-        array_push($daemons, 'zmc');
-      } else {
-        array_push($daemons, 'zmc', 'zma');
-      }
-    } else {
-      array_push($daemons, $daemon);
-    }
-    
-    $zm_path_bin = Configure::read('ZM_PATH_BIN');
+    $status_text = $this->Monitor->daemonControl($monitor, $command, $daemon);
 
-    $status_text = '';
-    foreach ( $daemons as $daemon ) {
-      $args = '';
-      if ( $daemon == 'zmc' and $monitor['Type'] == 'Local' ) {
-        $args = '-d ' . $monitor['Device'];
-      } else if ( $daemon == 'zmcontrol.pl' ) {
-        $args = '--id '.$id;
-      } else {
-        $args = '-m ' . $id;
-      }
-
-      $shellcmd = escapeshellcmd("$zm_path_bin/zmdc.pl $command $daemon $args");
-      ZM\Logger::Debug("Command $shellcmd");
-      $status = exec($shellcmd);
-      $status_text .= $status."\n";
-    }
     $this->set(array(
       'status' => 'ok',
       'statustext' => $status_text,
diff --git a/web/api/app/Controller/UsersController.php b/web/api/app/Controller/UsersController.php
index 502a929ff..7096da669 100644
--- a/web/api/app/Controller/UsersController.php
+++ b/web/api/app/Controller/UsersController.php
@@ -12,7 +12,7 @@ class UsersController extends AppController {
  *
  * @var array
  */
-	public $components = array('RequestHandler', 'Paginator');
+  public $components = array( 'Paginator', 'RequestHandler');
 
   public function beforeFilter() {
     parent::beforeFilter();
@@ -20,7 +20,7 @@ class UsersController extends AppController {
     global $user;
     # We already tested for auth in appController, so we just need to test for specific permission
     $canView = (!$user) || ($user['System'] != 'None');
-    if ( !$canView ) {
+    if (!$canView) {
       throw new UnauthorizedException(__('Insufficient Privileges'));
       return;
     }
@@ -30,14 +30,13 @@ class UsersController extends AppController {
  * index method
  *
  * @return void
- * This also creates a thumbnail for each user.
  */
 	public function index() {
 		$this->User->recursive = 0;
 
     global $user;
     # We should actually be able to list our own user, but I'm not bothering at this time.
-    if ( $user['System'] == 'None' ) {
+    if ($user['System'] == 'None' ) {
       throw new UnauthorizedException(__('Insufficient Privileges'));
       return;
     }
@@ -59,12 +58,12 @@ class UsersController extends AppController {
     global $user;
     # We can view ourselves
     $canView = ($user['System'] != 'None') or ($user['Id'] == $id);
-    if ( !$canView ) {
+    if (!$canView) {
       throw new UnauthorizedException(__('Insufficient Privileges'));
       return;
     }
 
-		if ( !$this->User->exists($id) ) {
+		if (!$this->User->exists($id)) {
 			throw new NotFoundException(__('Invalid user'));
 		}
 
@@ -83,22 +82,31 @@ class UsersController extends AppController {
  * @return void
  */
 	public function add() {
-		if ( $this->request->is('post') ) {
-
+		if ($this->request->is('post')) {
       global $user;
-      if ( $user['System'] != 'Edit' ) {
+      if ($user['System'] != 'Edit') {
         throw new UnauthorizedException(__('Insufficient Privileges'));
         return;
       }
 
-			$this->User->create();
-			if ( $this->User->save($this->request->data) ) {
-				return $this->flash(__('The user has been saved.'), array('action' => 'index'));
-			}
-			$this->Session->setFlash(
-					__('The user could not be saved. Please, try again.')
-					);
-		}
+      $this->User->create();
+      if ($this->User->save($this->request->data)) {
+        $message = 'Saved';
+      } else {
+        $message = 'Error';
+        // if there is a validation message, use it
+        if (!$this->User->validates()) {
+          $message = $this->User->validationErrors;
+        }
+      }
+    } else {
+      $message = 'Add without post data';
+    }
+    $this->set(array(
+      'user'        => $this->User,
+      'message'     => $message,
+      '_serialize'  => array('message')
+    ));
 	}
 
 /**
@@ -113,20 +121,23 @@ class UsersController extends AppController {
 
     global $user;
     $canEdit = ($user['System'] == 'Edit') or (($user['Id'] == $id) and ZM_USER_SELF_EDIT);
-    if ( !$canEdit ) {
+    if (!$canEdit) {
       throw new UnauthorizedException(__('Insufficient Privileges'));
       return;
     }
 
-		if ( !$this->User->exists($id) ) {
+		if (!$this->User->exists($id)) {
 			throw new NotFoundException(__('Invalid user'));
 		}
 
-		if ( $this->request->is('post') || $this->request->is('put') ) {
+		if ($this->request->is('post') || $this->request->is('put')) {
 			if ( $this->User->save($this->request->data) ) {
 				$message = 'Saved';
 			} else {
 				$message = 'Error';
+        if (!$this->User->validates()) {
+          $message = $this->User->validationErrors;
+        }
 			}
 		} else {
       # What is this doing? Resetting the request data? I understand clearing the password field
@@ -161,7 +172,7 @@ class UsersController extends AppController {
 			throw new NotFoundException(__('Invalid user'));
 		}
 		$this->request->allowMethod('post', 'delete');
-		if ( $this->User->delete() ) {
+		if ($this->User->delete()) {
 			$message = 'The user has been deleted.';
 		} else {
 			$message = 'The user could not be deleted. Please, try again.';
diff --git a/web/api/app/Controller/ZonesController.php b/web/api/app/Controller/ZonesController.php
index 8d5e661bb..37cc6a8a5 100644
--- a/web/api/app/Controller/ZonesController.php
+++ b/web/api/app/Controller/ZonesController.php
@@ -84,7 +84,7 @@ class ZonesController extends AppController {
     if ( $zone ) {
       require_once __DIR__ .'/../../../includes/Monitor.php';
       $monitor = new ZM\Monitor($zone['Zone']['MonitorId']);
-      $monitor->zmaControl('restart');
+      $monitor->zmcControl('restart');
       $message = 'Saved';
       //$zone = $this->Zone->find('first', array('conditions' => array( array('Zone.' . $this->Zone->primaryKey => $this->Zone),
     } else {
diff --git a/web/api/app/Model/AppModel.php b/web/api/app/Model/AppModel.php
index 27836464d..bf4b88add 100644
--- a/web/api/app/Model/AppModel.php
+++ b/web/api/app/Model/AppModel.php
@@ -5,18 +5,18 @@
  * This file is application-wide model file. You can put all
  * application-wide model-related methods here.
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.Model
  * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 App::uses('Model', 'Model');
diff --git a/web/api/app/Model/Event.php b/web/api/app/Model/Event.php
index 2c686d79a..e54fd125f 100644
--- a/web/api/app/Model/Event.php
+++ b/web/api/app/Model/Event.php
@@ -31,6 +31,10 @@ class Event extends AppModel {
  */
 	public $displayField = 'Name';
 
+  public $virtualFields = array(
+    'StartTime' => 'StartDateTime',
+    'EndTime' => 'EndDateTime'
+  );
 
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
 
@@ -133,10 +137,10 @@ class Event extends AppModel {
       if ( file_exists($this->Path().'/'.$event['DefaultVideo']) ) {
         return 1;
       } else {
-        ZM\Logger::Debug('File does not exist at ' . $this->Path().'/'.$event['DefaultVideo'] );
+        ZM\Debug('File does not exist at ' . $this->Path().'/'.$event['DefaultVideo'] );
       }
     } else {
-      ZM\Logger::Debug('No DefaultVideo in Event' . $this->Event);
+      ZM\Debug('No DefaultVideo in Event' . $this->Event);
       return 0;
     }
   } // end function fileExists($event)
diff --git a/web/api/app/Model/Monitor.php b/web/api/app/Model/Monitor.php
index 2de0b6fcb..1a80fed41 100644
--- a/web/api/app/Model/Monitor.php
+++ b/web/api/app/Model/Monitor.php
@@ -136,4 +136,40 @@ class Monitor extends AppModel {
       'joinTable' =>  'Monitor_Status',
     )
   );
+
+  public function daemonControl($monitor, $command, $daemon=null) {
+    if ( $monitor['Function'] == 'None' ) {
+      ZM\Debug('Calling daemonControl when Function == None');
+      return;
+    }
+    if ( defined('ZM_SERVER_ID') and ($monitor['ServerId']!=ZM_SERVER_ID) ) {
+      ZM\Error('Calling daemonControl for Monitor assigned to different server. Our server id '.ZM_SERVER_ID.' != '.$monitor['ServerId']);
+      return;
+    }
+
+    $daemons = array();
+    if ( ! $daemon ) {
+      array_push($daemons, 'zmc');
+    } else {
+      array_push($daemons, $daemon);
+    }
+
+    $status_text = '';
+    foreach ( $daemons as $daemon ) {
+      $args = '';
+      if ( $daemon == 'zmc' and $monitor['Type'] == 'Local' ) {
+        $args = '-d ' . $monitor['Device'];
+      } else if ( $daemon == 'zmcontrol.pl' ) {
+        $args = '--id '.$monitor['Id'];
+      } else {
+        $args = '-m ' . $monitor['Id'];
+      }
+
+      $shellcmd = escapeshellcmd(ZM_PATH_BIN.'/zmdc.pl '.$command.' '.$daemon.' '.$args);
+      ZM\Debug("Command $shellcmd");
+      $status = exec($shellcmd);
+      $status_text .= $status.PHP_EOL;
+    } # end foreach daemon
+    return $status_text;
+  } # end function daemonControl
 }
diff --git a/web/api/app/Model/User.php b/web/api/app/Model/User.php
index 1548aaee3..4d5eed7ac 100644
--- a/web/api/app/Model/User.php
+++ b/web/api/app/Model/User.php
@@ -34,6 +34,12 @@ class User extends AppModel {
       return parent::beforeFind($query);
     }
 
+    public function beforeSave($options = array()) {
+      if (!empty($this->data['User']['Password'])) {
+        $this->data['User']['Password'] = password_hash($this->data['User']['Password'], PASSWORD_BCRYPT);
+      }
+      return true;
+    }  # end function beforeSave
 
 /**
  * Use table
diff --git a/web/api/app/View/Emails/html/default.ctp b/web/api/app/View/Emails/html/default.ctp
index e2bff19c0..a6e95fe6a 100644
--- a/web/api/app/View/Emails/html/default.ctp
+++ b/web/api/app/View/Emails/html/default.ctp
@@ -1,19 +1,17 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Emails.html
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 ?>
 <?php
@@ -22,4 +20,4 @@ $content = explode("\n", $content);
 foreach ($content as $line):
 	echo '<p> ' . $line . "</p>\n";
 endforeach;
-?>
\ No newline at end of file
+?>
diff --git a/web/api/app/View/Emails/text/default.ctp b/web/api/app/View/Emails/text/default.ctp
index 090b5c403..48ea5660a 100644
--- a/web/api/app/View/Emails/text/default.ctp
+++ b/web/api/app/View/Emails/text/default.ctp
@@ -1,19 +1,17 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Emails.text
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 ?>
-<?php echo $content; ?>
\ No newline at end of file
+<?php echo $content; ?>
diff --git a/web/api/app/View/Errors/error400.ctp b/web/api/app/View/Errors/error400.ctp
index 4c3850b28..311a53175 100644
--- a/web/api/app/View/Errors/error400.ctp
+++ b/web/api/app/View/Errors/error400.ctp
@@ -1,19 +1,17 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Errors
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 ?>
 <h2><?php echo $message; ?></h2>
diff --git a/web/api/app/View/Errors/error500.ctp b/web/api/app/View/Errors/error500.ctp
index 518b9ee77..8b6eb9724 100644
--- a/web/api/app/View/Errors/error500.ctp
+++ b/web/api/app/View/Errors/error500.ctp
@@ -1,19 +1,17 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Errors
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 ?>
 <h2><?php echo $message; ?></h2>
diff --git a/web/api/app/View/Helper/AppHelper.php b/web/api/app/View/Helper/AppHelper.php
index 9097d33f0..4851a5b41 100644
--- a/web/api/app/View/Helper/AppHelper.php
+++ b/web/api/app/View/Helper/AppHelper.php
@@ -5,18 +5,18 @@
  * This file is application-wide helper file. You can put all
  * application-wide helper-related methods here.
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Helper
  * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 App::uses('Helper', 'View');
diff --git a/web/api/app/View/Layouts/Emails/html/default.ctp b/web/api/app/View/Layouts/Emails/html/default.ctp
index da3851a09..747994a63 100644
--- a/web/api/app/View/Layouts/Emails/html/default.ctp
+++ b/web/api/app/View/Layouts/Emails/html/default.ctp
@@ -1,29 +1,27 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts.Email.html
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <html>
 <head>
-	<title><?php echo $title_for_layout; ?></title>
+	<title><?php echo $this->fetch('title'); ?></title>
 </head>
 <body>
 	<?php echo $this->fetch('content'); ?>
 
-	<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
+	<p>This email was sent using the <a href="https://cakephp.org">CakePHP Framework</a></p>
 </body>
 </html>
\ No newline at end of file
diff --git a/web/api/app/View/Layouts/Emails/text/default.ctp b/web/api/app/View/Layouts/Emails/text/default.ctp
index ee624de45..82a1e195b 100644
--- a/web/api/app/View/Layouts/Emails/text/default.ctp
+++ b/web/api/app/View/Layouts/Emails/text/default.ctp
@@ -1,21 +1,19 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts.Email.text
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 ?>
 <?php echo $this->fetch('content'); ?>
 
-This email was sent using the CakePHP Framework, http://cakephp.org.
+This email was sent using the CakePHP Framework, https://cakephp.org.
diff --git a/web/api/app/View/Layouts/ajax.ctp b/web/api/app/View/Layouts/ajax.ctp
index 0f9a4fb62..7e14112c1 100644
--- a/web/api/app/View/Layouts/ajax.ctp
+++ b/web/api/app/View/Layouts/ajax.ctp
@@ -1,19 +1,17 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 ?>
 <?php echo $this->fetch('content'); ?>
diff --git a/web/api/app/View/Layouts/default.ctp b/web/api/app/View/Layouts/default.ctp
index 38dececbc..2f8d3cb8e 100644
--- a/web/api/app/View/Layouts/default.ctp
+++ b/web/api/app/View/Layouts/default.ctp
@@ -1,19 +1,17 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
@@ -25,7 +23,7 @@ $cakeVersion = __d('cake_dev', 'CakePHP %s', Configure::version())
 	<?php echo $this->Html->charset(); ?>
 	<title>
 		<?php echo $cakeDescription ?>:
-		<?php echo $title_for_layout; ?>
+		<?php echo $this->fetch('title'); ?>
 	</title>
 	<?php
 		echo $this->Html->meta('icon');
@@ -40,18 +38,18 @@ $cakeVersion = __d('cake_dev', 'CakePHP %s', Configure::version())
 <body>
 	<div id="container">
 		<div id="header">
-			<h1><?php echo $this->Html->link($cakeDescription, 'http://cakephp.org'); ?></h1>
+			<h1><?php echo $this->Html->link($cakeDescription, 'https://cakephp.org'); ?></h1>
 		</div>
 		<div id="content">
 
-			<?php echo $this->Session->flash(); ?>
+			<?php echo $this->Flash->render(); ?>
 
 			<?php echo $this->fetch('content'); ?>
 		</div>
 		<div id="footer">
 			<?php echo $this->Html->link(
 					$this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
-					'http://www.cakephp.org/',
+					'https://cakephp.org/',
 					array('target' => '_blank', 'escape' => false, 'id' => 'cake-powered')
 				);
 			?>
diff --git a/web/api/app/View/Layouts/error.ctp b/web/api/app/View/Layouts/error.ctp
index e9d738178..9c5d9cff5 100644
--- a/web/api/app/View/Layouts/error.ctp
+++ b/web/api/app/View/Layouts/error.ctp
@@ -1,19 +1,17 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
@@ -24,7 +22,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
 	<?php echo $this->Html->charset(); ?>
 	<title>
 		<?php echo $cakeDescription ?>:
-		<?php echo $title_for_layout; ?>
+		<?php echo $this->fetch('title'); ?>
 	</title>
 	<?php
 		echo $this->Html->meta('icon');
@@ -39,7 +37,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
 <body>
 	<div id="container">
 		<div id="header">
-			<h1><?php echo $this->Html->link($cakeDescription, 'http://cakephp.org'); ?></h1>
+			<h1><?php echo $this->Html->link($cakeDescription, 'https://cakephp.org'); ?></h1>
 		</div>
 		<div id="content">
 
@@ -50,7 +48,7 @@ $cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework
 		<div id="footer">
 			<?php echo $this->Html->link(
 					$this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
-					'http://www.cakephp.org/',
+					'https://cakephp.org/',
 					array('target' => '_blank', 'escape' => false)
 				);
 			?>
diff --git a/web/api/app/View/Layouts/flash.ctp b/web/api/app/View/Layouts/flash.ctp
index cd79f5008..226d3c188 100644
--- a/web/api/app/View/Layouts/flash.ctp
+++ b/web/api/app/View/Layouts/flash.ctp
@@ -1,30 +1,30 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Layouts
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 ?>
 <!DOCTYPE html>
 <html>
 <head>
 <?php echo $this->Html->charset(); ?>
-<title><?php echo $page_title; ?></title>
+<title><?php echo $pageTitle; ?></title>
 
-<?php if (Configure::read('debug') == 0): ?>
-<meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
-<?php endif; ?>
+<?php
+if (Configure::read('debug') == 0):
+	echo sprintf('<meta http-equiv="Refresh" content="%s;url=%s" />', $pause, $url);
+endif;
+?>
 <style><!--
 P { text-align:center; font:bold 1.1em sans-serif }
 A { color:#444; text-decoration:none }
@@ -32,6 +32,8 @@ A:HOVER { text-decoration: underline; color:#44E }
 --></style>
 </head>
 <body>
-<p><a href="<?php echo $url; ?>"><?php echo $message; ?></a></p>
+<p>
+	<?php echo $this->Html->link($message, $url); ?>
+</p>
 </body>
 </html>
diff --git a/web/api/app/View/Layouts/rss/default.ctp b/web/api/app/View/Layouts/rss/default.ctp
index 26d875eda..60a53659f 100644
--- a/web/api/app/View/Layouts/rss/default.ctp
+++ b/web/api/app/View/Layouts/rss/default.ctp
@@ -3,7 +3,7 @@ if (!isset($channel)):
 	$channel = array();
 endif;
 if (!isset($channel['title'])):
-	$channel['title'] = $title_for_layout;
+	$channel['title'] = $this->fetch('title');
 endif;
 
 echo $this->Rss->document(
@@ -11,4 +11,3 @@ echo $this->Rss->document(
 		array(), $channel, $this->fetch('content')
 	)
 );
-?>
diff --git a/web/api/app/View/Pages/home.ctp b/web/api/app/View/Pages/home.ctp
index 082cc99b0..d0e20df8c 100644
--- a/web/api/app/View/Pages/home.ctp
+++ b/web/api/app/View/Pages/home.ctp
@@ -1,8 +1,6 @@
 <?php
 /**
- *
- *
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.View.Pages
  * @since         CakePHP(tm) v 0.10.0.1076
  */
@@ -15,79 +13,75 @@ App::uses('Debugger', 'Utility');
 ?>
 <h2><?php echo __d('cake_dev', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
 <p>
-	<a href="http://cakephp.org/changelogs/<?php echo Configure::version(); ?>"><?php echo __d('cake_dev', 'Read the changelog'); ?> </a>
+	<?php echo $this->Html->link(__d('cake_dev', 'Read the changelog'), 'https://cakephp.org/changelogs/' . Configure::version()); ?>
 </p>
 <?php
 if (Configure::read('debug') > 0):
 	Debugger::checkSecurityKeys();
 endif;
 ?>
-<?php
-if (file_exists(WWW_ROOT . 'css' . DS . 'cake.generic.css')):
-?>
-<p id="url-rewriting-warning" style="background-color:#e32; color:#fff;">
-	<?php echo __d('cake_dev', 'URL rewriting is not properly configured on your server.'); ?>
-	1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
-	2) <a target="_blank" href="http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
-</p>
-<?php
-endif;
-?>
+<?php if (file_exists(WWW_ROOT . 'css' . DS . 'cake.generic.css')): ?>
+	<p id="url-rewriting-warning" style="background-color:#e32; color:#fff;">
+		<?php echo __d('cake_dev', 'URL rewriting is not properly configured on your server.'); ?>
+		1) <a target="_blank" href="https://book.cakephp.org/2.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
+		2) <a target="_blank" href="https://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
+	</p>
+<?php endif; ?>
 <p>
 <?php
-	if (version_compare(PHP_VERSION, '5.2.8', '>=')):
+if (version_compare(PHP_VERSION, '5.2.8', '>=')):
+	echo '<span class="notice success">';
+		echo __d('cake_dev', 'Your version of PHP is 5.2.8 or higher.');
+	echo '</span>';
+else:
+	echo '<span class="notice">';
+		echo __d('cake_dev', 'Your version of PHP is too low. You need PHP 5.2.8 or higher to use CakePHP.');
+	echo '</span>';
+endif;
+?>
+</p>
+<p>
+	<?php
+	if (is_writable(TMP)):
 		echo '<span class="notice success">';
-			echo __d('cake_dev', 'Your version of PHP is 5.2.8 or higher.');
+			echo __d('cake_dev', 'Your tmp directory is writable.');
 		echo '</span>';
 	else:
 		echo '<span class="notice">';
-			echo __d('cake_dev', 'Your version of PHP is too low. You need PHP 5.2.8 or higher to use CakePHP.');
+			echo __d('cake_dev', 'Your tmp directory is NOT writable.');
 		echo '</span>';
 	endif;
-?>
-</p>
-<p>
-	<?php
-		if (is_writable(TMP)):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'Your tmp directory is writable.');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'Your tmp directory is NOT writable.');
-			echo '</span>';
-		endif;
 	?>
 </p>
 <p>
 	<?php
-		$settings = Cache::settings();
-		if (!empty($settings)):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit %s', '<em>'. $settings['engine'] . 'Engine</em>', 'APP/Config/core.php');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in %s', 'APP/Config/core.php');
-			echo '</span>';
-		endif;
+	$settings = Cache::settings();
+	if (!empty($settings)):
+		echo '<span class="notice success">';
+			echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit %s', '<em>' . $settings['engine'] . 'Engine</em>', CONFIG . 'core.php');
+		echo '</span>';
+	else:
+		echo '<span class="notice">';
+			echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in %s', CONFIG . 'core.php');
+		echo '</span>';
+	endif;
 	?>
 </p>
 <p>
 	<?php
-		$filePresent = null;
-		if (file_exists(APP . 'Config' . DS . 'database.php')):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'Your database configuration file is present.');
-				$filePresent = true;
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'Your database configuration file is NOT present.');
-				echo '<br/>';
-				echo __d('cake_dev', 'Rename %s to %s', 'APP/Config/database.php.default', 'APP/Config/database.php');
-			echo '</span>';
-		endif;
+	$filePresent = null;
+	if (file_exists(CONFIG . 'database.php')):
+		echo '<span class="notice success">';
+			echo __d('cake_dev', 'Your database configuration file is present.');
+			$filePresent = true;
+		echo '</span>';
+	else:
+		echo '<span class="notice">';
+			echo __d('cake_dev', 'Your database configuration file is NOT present.');
+			echo '<br/>';
+			echo __d('cake_dev', 'Rename %s to %s', CONFIG . 'database.php.default', CONFIG . 'database.php');
+		echo '</span>';
+	endif;
 	?>
 </p>
 <?php
@@ -100,52 +94,53 @@ if (isset($filePresent)):
 		$errorMsg = $connectionError->getMessage();
 		if (method_exists($connectionError, 'getAttributes')):
 			$attributes = $connectionError->getAttributes();
-			if (isset($errorMsg['message'])):
+			if (isset($attributes['message'])):
 				$errorMsg .= '<br />' . $attributes['message'];
 			endif;
 		endif;
 	}
-?>
-<p>
-	<?php
-		if ($connected && $connected->isConnected()):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'CakePHP is able to connect to the database.');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'CakePHP is NOT able to connect to the database.');
-				echo '<br /><br />';
-				echo $errorMsg;
-			echo '</span>';
-		endif;
 	?>
-</p>
-<?php endif; ?>
+	<p>
+		<?php
+			if ($connected && $connected->isConnected()):
+				echo '<span class="notice success">';
+					echo __d('cake_dev', 'CakePHP is able to connect to the database.');
+				echo '</span>';
+			else:
+				echo '<span class="notice">';
+					echo __d('cake_dev', 'CakePHP is NOT able to connect to the database.');
+					echo '<br /><br />';
+					echo $errorMsg;
+				echo '</span>';
+			endif;
+		?>
+	</p>
 <?php
-	App::uses('Validation', 'Utility');
-	if (!Validation::alphaNumeric('cakephp')):
-		echo '<p><span class="notice">';
-			echo __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
-			echo '<br/>';
-			echo __d('cake_dev', 'Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
-		echo '</span></p>';
-	endif;
+endif;
+
+App::uses('Validation', 'Utility');
+if (!Validation::alphaNumeric('cakephp')):
+	echo '<p><span class="notice">';
+		echo __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
+		echo '<br/>';
+		echo __d('cake_dev', 'Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
+	echo '</span></p>';
+endif;
 ?>
 
 <p>
 	<?php
-		if (CakePlugin::loaded('DebugKit')):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'DebugKit plugin is present');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'DebugKit is not installed. It will help you inspect and debug different aspects of your application.');
-				echo '<br/>';
-				echo __d('cake_dev', 'You can install it from %s', $this->Html->link('GitHub', 'https://github.com/cakephp/debug_kit'));
-			echo '</span>';
-		endif;
+	if (CakePlugin::loaded('DebugKit')):
+		echo '<span class="notice success">';
+			echo __d('cake_dev', 'DebugKit plugin is present');
+		echo '</span>';
+	else:
+		echo '<span class="notice">';
+			echo __d('cake_dev', 'DebugKit is not installed. It will help you inspect and debug different aspects of your application.');
+			echo '<br/>';
+			echo __d('cake_dev', 'You can install it from %s', $this->Html->link('GitHub', 'https://github.com/cakephp/debug_kit/tree/2.2'));
+		echo '</span>';
+	endif;
 	?>
 </p>
 
@@ -162,20 +157,20 @@ You can also add some CSS styles for your pages at: %s.',
 <h3><?php echo __d('cake_dev', 'Getting Started'); ?></h3>
 <p>
 	<?php
-		echo $this->Html->link(
-			sprintf('<strong>%s</strong> %s', __d('cake_dev', 'New'), __d('cake_dev', 'CakePHP 2.0 Docs')),
-			'http://book.cakephp.org/2.0/en/',
-			array('target' => '_blank', 'escape' => false)
-		);
+	echo $this->Html->link(
+		sprintf('<strong>%s</strong> %s', __d('cake_dev', 'New'), __d('cake_dev', 'CakePHP 2.0 Docs')),
+		'https://book.cakephp.org/2.0/en/',
+		array('target' => '_blank', 'escape' => false)
+	);
 	?>
 </p>
 <p>
 	<?php
-		echo $this->Html->link(
-			__d('cake_dev', 'The 15 min Blog Tutorial'),
-			'http://book.cakephp.org/2.0/en/tutorials-and-examples/blog/blog.html',
-			array('target' => '_blank', 'escape' => false)
-		);
+	echo $this->Html->link(
+		__d('cake_dev', 'The 15 min Blog Tutorial'),
+		'https://book.cakephp.org/2.0/en/tutorials-and-examples/blog/blog.html',
+		array('target' => '_blank', 'escape' => false)
+	);
 	?>
 </p>
 
@@ -183,7 +178,7 @@ You can also add some CSS styles for your pages at: %s.',
 <p>
 <ul>
 	<li>
-		<?php echo $this->Html->link('DebugKit', 'https://github.com/cakephp/debug_kit') ?>:
+		<?php echo $this->Html->link('DebugKit', 'https://github.com/cakephp/debug_kit/tree/2.2') ?>:
 		<?php echo __d('cake_dev', 'provides a debugging toolbar and enhanced debugging tools for CakePHP applications.'); ?>
 	</li>
 	<li>
@@ -202,20 +197,22 @@ You can also add some CSS styles for your pages at: %s.',
 </p>
 
 <ul>
-	<li><a href="http://cakephp.org">CakePHP</a>
+	<li><a href="https://cakephp.org">CakePHP</a>
 	<ul><li><?php echo __d('cake_dev', 'The Rapid Development Framework'); ?></li></ul></li>
-	<li><a href="http://book.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Documentation'); ?> </a>
+	<li><a href="https://book.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Documentation'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'Your Rapid Development Cookbook'); ?></li></ul></li>
-	<li><a href="http://api.cakephp.org"><?php echo __d('cake_dev', 'CakePHP API'); ?> </a>
+	<li><a href="https://api.cakephp.org"><?php echo __d('cake_dev', 'CakePHP API'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'Quick API Reference'); ?></li></ul></li>
-	<li><a href="http://bakery.cakephp.org"><?php echo __d('cake_dev', 'The Bakery'); ?> </a>
+	<li><a href="https://bakery.cakephp.org"><?php echo __d('cake_dev', 'The Bakery'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'Everything CakePHP'); ?></li></ul></li>
-	<li><a href="http://plugins.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Plugins'); ?> </a>
+	<li><a href="https://plugins.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Plugins'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'A comprehensive list of all CakePHP plugins created by the community'); ?></li></ul></li>
-	<li><a href="http://community.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Community Center'); ?> </a>
+	<li><a href="https://community.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Community Center'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'Everything related to the CakePHP community in one place'); ?></li></ul></li>
-	<li><a href="https://groups.google.com/group/cake-php"><?php echo __d('cake_dev', 'CakePHP Google Group'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'Community mailing list'); ?></li></ul></li>
+	<li><a href="http://discourse.cakephp.org/">CakePHP Official Forum </a>
+	<ul><li>CakePHP discussion forum</li></ul></li>
+	<li><a href="http://discourse.cakephp.org/"><?php echo __d('cake_dev', 'CakePHP Official Forum'); ?> </a>
+	<ul><li><?php echo __d('cake_dev', 'CakePHP discussion forum'); ?></li></ul></li>
 	<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
 	<ul><li><?php echo __d('cake_dev', 'Live chat about CakePHP'); ?></li></ul></li>
 	<li><a href="https://github.com/cakephp/"><?php echo __d('cake_dev', 'CakePHP Code'); ?> </a>
@@ -224,10 +221,10 @@ You can also add some CSS styles for your pages at: %s.',
 	<ul><li><?php echo __d('cake_dev', 'CakePHP Issues'); ?></li></ul></li>
 	<li><a href="https://github.com/cakephp/cakephp/wiki#roadmaps"><?php echo __d('cake_dev', 'CakePHP Roadmaps'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'CakePHP Roadmaps'); ?></li></ul></li>
-	<li><a href="http://training.cakephp.org"><?php echo __d('cake_dev', 'Training'); ?> </a>
+	<li><a href="https://training.cakephp.org"><?php echo __d('cake_dev', 'Training'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'Join a live session and get skilled with the framework'); ?></li></ul></li>
-	<li><a href="http://cakefest.org"><?php echo __d('cake_dev', 'CakeFest'); ?> </a>
+	<li><a href="https://cakefest.org"><?php echo __d('cake_dev', 'CakeFest'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'Don\'t miss our annual CakePHP conference'); ?></li></ul></li>
-	<li><a href="http://cakefoundation.org"><?php echo __d('cake_dev', 'Cake Software Foundation'); ?> </a>
+	<li><a href="https://cakefoundation.org"><?php echo __d('cake_dev', 'Cake Software Foundation'); ?> </a>
 	<ul><li><?php echo __d('cake_dev', 'Promoting development related to CakePHP'); ?></li></ul></li>
 </ul>
diff --git a/web/api/app/View/Users/add.ctp b/web/api/app/View/Users/add.ctp
deleted file mode 100644
index fc374d5ca..000000000
--- a/web/api/app/View/Users/add.ctp
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- app/View/Users/add.ctp -->
-<div class="users form">
-<?php echo $this->Form->create('User'); ?>
-    <fieldset>
-        <legend><?php echo __('Add User'); ?></legend>
-        <?php echo $this->Form->input('username');
-        echo $this->Form->input('password');
-        echo $this->Form->input('role', array(
-            'options' => array('admin' => 'Admin', 'author' => 'Author')
-        ));
-    ?>
-    </fieldset>
-<?php echo $this->Form->end(__('Submit')); ?>
-</div>
-
diff --git a/web/api/app/View/Users/json/add.ctp b/web/api/app/View/Users/json/add.ctp
new file mode 100644
index 000000000..ac802f9a9
--- /dev/null
+++ b/web/api/app/View/Users/json/add.ctp
@@ -0,0 +1,2 @@
+echo json_encode($message);
+echo json_encode($user);
diff --git a/web/api/app/View/View/Monitors/json/edit.ctp b/web/api/app/View/Users/json/edit.ctp
similarity index 50%
rename from web/api/app/View/View/Monitors/json/edit.ctp
rename to web/api/app/View/Users/json/edit.ctp
index 77d2dd08b..ac802f9a9 100644
--- a/web/api/app/View/View/Monitors/json/edit.ctp
+++ b/web/api/app/View/Users/json/edit.ctp
@@ -1,2 +1,2 @@
 echo json_encode($message);
-echo json_encode($monitor);
+echo json_encode($user);
diff --git a/web/api/app/View/Users/login.ctp b/web/api/app/View/Users/login.ctp
deleted file mode 100644
index 335ad3108..000000000
--- a/web/api/app/View/Users/login.ctp
+++ /dev/null
@@ -1,13 +0,0 @@
-<div class="users form">
-<?php echo $this->Session->flash('auth'); ?>
-<?php echo $this->Form->create('User'); ?>
-    <fieldset>
-        <legend>
-            <?php echo __('Please enter your username and password'); ?>
-        </legend>
-        <?php echo $this->Form->input('username');
-        echo $this->Form->input('password');
-    ?>
-    </fieldset>
-<?php echo $this->Form->end(__('Login')); ?>
-</div>
diff --git a/web/api/app/View/View/Monitors/xml/edit.ctp b/web/api/app/View/Users/xml/add.ctp
similarity index 100%
rename from web/api/app/View/View/Monitors/xml/edit.ctp
rename to web/api/app/View/Users/xml/add.ctp
diff --git a/web/api/app/View/Users/xml/edit.ctp b/web/api/app/View/Users/xml/edit.ctp
new file mode 100644
index 000000000..09fb8979a
--- /dev/null
+++ b/web/api/app/View/Users/xml/edit.ctp
@@ -0,0 +1,2 @@
+$xml = Xml::fromArray(array('response' => $message));
+echo $xml->asXML();
diff --git a/web/api/app/View/View/Configs/json/edit.ctp b/web/api/app/View/View/Configs/json/edit.ctp
deleted file mode 100644
index 75fa758bd..000000000
--- a/web/api/app/View/View/Configs/json/edit.ctp
+++ /dev/null
@@ -1 +0,0 @@
-echo json_encode($config);
diff --git a/web/api/app/View/View/Configs/json/index.ctp b/web/api/app/View/View/Configs/json/index.ctp
deleted file mode 100644
index 86edf870a..000000000
--- a/web/api/app/View/View/Configs/json/index.ctp
+++ /dev/null
@@ -1 +0,0 @@
-echo json_encode($configs);
diff --git a/web/api/app/View/View/Configs/json/view.ctp b/web/api/app/View/View/Configs/json/view.ctp
deleted file mode 100644
index 75fa758bd..000000000
--- a/web/api/app/View/View/Configs/json/view.ctp
+++ /dev/null
@@ -1 +0,0 @@
-echo json_encode($config);
diff --git a/web/api/app/View/View/Configs/xml/index.ctp b/web/api/app/View/View/Configs/xml/index.ctp
deleted file mode 100644
index b13a76093..000000000
--- a/web/api/app/View/View/Configs/xml/index.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-$xml = Xml::fromArray(array('response' => $configs));
-echo $xml->asXML();
diff --git a/web/api/app/View/View/Configs/xml/view.ctp b/web/api/app/View/View/Configs/xml/view.ctp
deleted file mode 100644
index 7987d32e7..000000000
--- a/web/api/app/View/View/Configs/xml/view.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-$xml = Xml::fromArray(array('response' => $config));
-echo $xml->asXML();
diff --git a/web/api/app/View/View/Emails/html/default.ctp b/web/api/app/View/View/Emails/html/default.ctp
deleted file mode 100644
index e2bff19c0..000000000
--- a/web/api/app/View/View/Emails/html/default.ctp
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Emails.html
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-?>
-<?php
-$content = explode("\n", $content);
-
-foreach ($content as $line):
-	echo '<p> ' . $line . "</p>\n";
-endforeach;
-?>
\ No newline at end of file
diff --git a/web/api/app/View/View/Emails/text/default.ctp b/web/api/app/View/View/Emails/text/default.ctp
deleted file mode 100644
index 090b5c403..000000000
--- a/web/api/app/View/View/Emails/text/default.ctp
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Emails.text
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-?>
-<?php echo $content; ?>
\ No newline at end of file
diff --git a/web/api/app/View/View/Errors/error400.ctp b/web/api/app/View/View/Errors/error400.ctp
deleted file mode 100644
index 4c3850b28..000000000
--- a/web/api/app/View/View/Errors/error400.ctp
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Errors
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-?>
-<h2><?php echo $message; ?></h2>
-<p class="error">
-	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
-	<?php printf(
-		__d('cake', 'The requested address %s was not found on this server.'),
-		"<strong>'{$url}'</strong>"
-	); ?>
-</p>
-<?php
-if (Configure::read('debug') > 0):
-	echo $this->element('exception_stack_trace');
-endif;
-?>
diff --git a/web/api/app/View/View/Errors/error500.ctp b/web/api/app/View/View/Errors/error500.ctp
deleted file mode 100644
index 518b9ee77..000000000
--- a/web/api/app/View/View/Errors/error500.ctp
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Errors
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-?>
-<h2><?php echo $message; ?></h2>
-<p class="error">
-	<strong><?php echo __d('cake', 'Error'); ?>: </strong>
-	<?php echo __d('cake', 'An Internal Error Has Occurred.'); ?>
-</p>
-<?php
-if (Configure::read('debug') > 0):
-	echo $this->element('exception_stack_trace');
-endif;
-?>
diff --git a/web/api/app/View/View/Events/json/index.ctp b/web/api/app/View/View/Events/json/index.ctp
deleted file mode 100644
index d54386749..000000000
--- a/web/api/app/View/View/Events/json/index.ctp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-	$array['events'] = $events;
-	$array['pagination'] = $this->Paginator->params();
-	echo json_encode($array);
-?>
diff --git a/web/api/app/View/View/Events/json/view.ctp b/web/api/app/View/View/Events/json/view.ctp
deleted file mode 100644
index b320feb4d..000000000
--- a/web/api/app/View/View/Events/json/view.ctp
+++ /dev/null
@@ -1 +0,0 @@
-echo json_encode($event);
diff --git a/web/api/app/View/View/Events/xml/index.ctp b/web/api/app/View/View/Events/xml/index.ctp
deleted file mode 100644
index af960238f..000000000
--- a/web/api/app/View/View/Events/xml/index.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-$xml = Xml::fromArray(array('response' => $events));
-echo $xml->asXML();
diff --git a/web/api/app/View/View/Events/xml/view.ctp b/web/api/app/View/View/Events/xml/view.ctp
deleted file mode 100644
index 7f64e422f..000000000
--- a/web/api/app/View/View/Events/xml/view.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-$xml = Xml::fromArray(array('response' => $event));
-echo $xml->asXML();
diff --git a/web/api/app/View/View/Helper/AppHelper.php b/web/api/app/View/View/Helper/AppHelper.php
deleted file mode 100644
index 9097d33f0..000000000
--- a/web/api/app/View/View/Helper/AppHelper.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Application level View Helper
- *
- * This file is application-wide helper file. You can put all
- * application-wide helper-related methods here.
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Helper
- * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-
-App::uses('Helper', 'View');
-
-/**
- * Application helper
- *
- * Add your application-wide methods in the class below, your helpers
- * will inherit them.
- *
- * @package       app.View.Helper
- */
-class AppHelper extends Helper {
-}
diff --git a/web/api/app/View/View/Layouts/Emails/html/default.ctp b/web/api/app/View/View/Layouts/Emails/html/default.ctp
deleted file mode 100644
index da3851a09..000000000
--- a/web/api/app/View/View/Layouts/Emails/html/default.ctp
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-/**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Layouts.Email.html
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN">
-<html>
-<head>
-	<title><?php echo $title_for_layout; ?></title>
-</head>
-<body>
-	<?php echo $this->fetch('content'); ?>
-
-	<p>This email was sent using the <a href="http://cakephp.org">CakePHP Framework</a></p>
-</body>
-</html>
\ No newline at end of file
diff --git a/web/api/app/View/View/Layouts/Emails/text/default.ctp b/web/api/app/View/View/Layouts/Emails/text/default.ctp
deleted file mode 100644
index ee624de45..000000000
--- a/web/api/app/View/View/Layouts/Emails/text/default.ctp
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Layouts.Email.text
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-?>
-<?php echo $this->fetch('content'); ?>
-
-This email was sent using the CakePHP Framework, http://cakephp.org.
diff --git a/web/api/app/View/View/Layouts/ajax.ctp b/web/api/app/View/View/Layouts/ajax.ctp
deleted file mode 100644
index 0f9a4fb62..000000000
--- a/web/api/app/View/View/Layouts/ajax.ctp
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-?>
-<?php echo $this->fetch('content'); ?>
diff --git a/web/api/app/View/View/Layouts/default.ctp b/web/api/app/View/View/Layouts/default.ctp
deleted file mode 100644
index 38dececbc..000000000
--- a/web/api/app/View/View/Layouts/default.ctp
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-
-$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
-$cakeVersion = __d('cake_dev', 'CakePHP %s', Configure::version())
-?>
-<!DOCTYPE html>
-<html>
-<head>
-	<?php echo $this->Html->charset(); ?>
-	<title>
-		<?php echo $cakeDescription ?>:
-		<?php echo $title_for_layout; ?>
-	</title>
-	<?php
-		echo $this->Html->meta('icon');
-
-		echo $this->Html->css('cake.generic');
-
-		echo $this->fetch('meta');
-		echo $this->fetch('css');
-		echo $this->fetch('script');
-	?>
-</head>
-<body>
-	<div id="container">
-		<div id="header">
-			<h1><?php echo $this->Html->link($cakeDescription, 'http://cakephp.org'); ?></h1>
-		</div>
-		<div id="content">
-
-			<?php echo $this->Session->flash(); ?>
-
-			<?php echo $this->fetch('content'); ?>
-		</div>
-		<div id="footer">
-			<?php echo $this->Html->link(
-					$this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
-					'http://www.cakephp.org/',
-					array('target' => '_blank', 'escape' => false, 'id' => 'cake-powered')
-				);
-			?>
-			<p>
-				<?php echo $cakeVersion; ?>
-			</p>
-		</div>
-	</div>
-	<?php echo $this->element('sql_dump'); ?>
-</body>
-</html>
diff --git a/web/api/app/View/View/Layouts/error.ctp b/web/api/app/View/View/Layouts/error.ctp
deleted file mode 100644
index e9d738178..000000000
--- a/web/api/app/View/View/Layouts/error.ctp
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-
-$cakeDescription = __d('cake_dev', 'CakePHP: the rapid development php framework');
-?>
-<!DOCTYPE html>
-<html>
-<head>
-	<?php echo $this->Html->charset(); ?>
-	<title>
-		<?php echo $cakeDescription ?>:
-		<?php echo $title_for_layout; ?>
-	</title>
-	<?php
-		echo $this->Html->meta('icon');
-
-		echo $this->Html->css('cake.generic');
-
-		echo $this->fetch('meta');
-		echo $this->fetch('css');
-		echo $this->fetch('script');
-	?>
-</head>
-<body>
-	<div id="container">
-		<div id="header">
-			<h1><?php echo $this->Html->link($cakeDescription, 'http://cakephp.org'); ?></h1>
-		</div>
-		<div id="content">
-
-			<?php echo $this->Session->flash(); ?>
-
-			<?php echo $this->fetch('content'); ?>
-		</div>
-		<div id="footer">
-			<?php echo $this->Html->link(
-					$this->Html->image('cake.power.gif', array('alt' => $cakeDescription, 'border' => '0')),
-					'http://www.cakephp.org/',
-					array('target' => '_blank', 'escape' => false)
-				);
-			?>
-		</div>
-	</div>
-	<?php echo $this->element('sql_dump'); ?>
-</body>
-</html>
diff --git a/web/api/app/View/View/Layouts/flash.ctp b/web/api/app/View/View/Layouts/flash.ctp
deleted file mode 100644
index cd79f5008..000000000
--- a/web/api/app/View/View/Layouts/flash.ctp
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- *
- * Licensed under The MIT License
- * For full copyright and license information, please see the LICENSE.txt
- * Redistributions of files must retain the above copyright notice.
- *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Layouts
- * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
- */
-?>
-<!DOCTYPE html>
-<html>
-<head>
-<?php echo $this->Html->charset(); ?>
-<title><?php echo $page_title; ?></title>
-
-<?php if (Configure::read('debug') == 0): ?>
-<meta http-equiv="Refresh" content="<?php echo $pause; ?>;url=<?php echo $url; ?>"/>
-<?php endif; ?>
-<style><!--
-P { text-align:center; font:bold 1.1em sans-serif }
-A { color:#444; text-decoration:none }
-A:HOVER { text-decoration: underline; color:#44E }
---></style>
-</head>
-<body>
-<p><a href="<?php echo $url; ?>"><?php echo $message; ?></a></p>
-</body>
-</html>
diff --git a/web/api/app/View/View/Layouts/js/default.ctp b/web/api/app/View/View/Layouts/js/default.ctp
deleted file mode 100644
index 7239b5dae..000000000
--- a/web/api/app/View/View/Layouts/js/default.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php echo $scripts_for_layout; ?>
-<script type="text/javascript"><?php echo $this->fetch('content'); ?></script>
diff --git a/web/api/app/View/View/Layouts/rss/default.ctp b/web/api/app/View/View/Layouts/rss/default.ctp
deleted file mode 100644
index 26d875eda..000000000
--- a/web/api/app/View/View/Layouts/rss/default.ctp
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-if (!isset($channel)):
-	$channel = array();
-endif;
-if (!isset($channel['title'])):
-	$channel['title'] = $title_for_layout;
-endif;
-
-echo $this->Rss->document(
-	$this->Rss->channel(
-		array(), $channel, $this->fetch('content')
-	)
-);
-?>
diff --git a/web/api/app/View/View/Layouts/xml/default.ctp b/web/api/app/View/View/Layouts/xml/default.ctp
deleted file mode 100644
index fbd5ee0c3..000000000
--- a/web/api/app/View/View/Layouts/xml/default.ctp
+++ /dev/null
@@ -1 +0,0 @@
-<?php echo $this->fetch('content'); ?>
diff --git a/web/api/app/View/View/Logs/json/index.ctp b/web/api/app/View/View/Logs/json/index.ctp
deleted file mode 100644
index 32cbd51f8..000000000
--- a/web/api/app/View/View/Logs/json/index.ctp
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-	$array['logs'] = $logs;
-	$array['pagination'] = $this->Paginator->params();
-	echo json_encode($array);
-?>
diff --git a/web/api/app/View/View/Monitors/json/index.ctp b/web/api/app/View/View/Monitors/json/index.ctp
deleted file mode 100644
index facf965d4..000000000
--- a/web/api/app/View/View/Monitors/json/index.ctp
+++ /dev/null
@@ -1 +0,0 @@
-echo json_encode($monitors);
diff --git a/web/api/app/View/View/Monitors/json/view.ctp b/web/api/app/View/View/Monitors/json/view.ctp
deleted file mode 100644
index acfced9d0..000000000
--- a/web/api/app/View/View/Monitors/json/view.ctp
+++ /dev/null
@@ -1 +0,0 @@
-echo json_encode($monitor);
diff --git a/web/api/app/View/View/Monitors/xml/index.ctp b/web/api/app/View/View/Monitors/xml/index.ctp
deleted file mode 100644
index 37afc918b..000000000
--- a/web/api/app/View/View/Monitors/xml/index.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-$xml = Xml::fromArray(array('response' => $monitors));
-echo $xml->asXML();
diff --git a/web/api/app/View/View/Monitors/xml/view.ctp b/web/api/app/View/View/Monitors/xml/view.ctp
deleted file mode 100644
index b33c6e79a..000000000
--- a/web/api/app/View/View/Monitors/xml/view.ctp
+++ /dev/null
@@ -1,2 +0,0 @@
-$xml = Xml::fromArray(array('response' => $monitor));
-echo $xml->asXML();
diff --git a/web/api/app/View/View/Pages/home.ctp b/web/api/app/View/View/Pages/home.ctp
deleted file mode 100644
index 082cc99b0..000000000
--- a/web/api/app/View/View/Pages/home.ctp
+++ /dev/null
@@ -1,233 +0,0 @@
-<?php
-/**
- *
- *
- * @link          http://cakephp.org CakePHP(tm) Project
- * @package       app.View.Pages
- * @since         CakePHP(tm) v 0.10.0.1076
- */
-
-if (!Configure::read('debug')):
-	throw new NotFoundException();
-endif;
-
-App::uses('Debugger', 'Utility');
-?>
-<h2><?php echo __d('cake_dev', 'Release Notes for CakePHP %s.', Configure::version()); ?></h2>
-<p>
-	<a href="http://cakephp.org/changelogs/<?php echo Configure::version(); ?>"><?php echo __d('cake_dev', 'Read the changelog'); ?> </a>
-</p>
-<?php
-if (Configure::read('debug') > 0):
-	Debugger::checkSecurityKeys();
-endif;
-?>
-<?php
-if (file_exists(WWW_ROOT . 'css' . DS . 'cake.generic.css')):
-?>
-<p id="url-rewriting-warning" style="background-color:#e32; color:#fff;">
-	<?php echo __d('cake_dev', 'URL rewriting is not properly configured on your server.'); ?>
-	1) <a target="_blank" href="http://book.cakephp.org/2.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
-	2) <a target="_blank" href="http://book.cakephp.org/2.0/en/development/configuration.html#cakephp-core-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
-</p>
-<?php
-endif;
-?>
-<p>
-<?php
-	if (version_compare(PHP_VERSION, '5.2.8', '>=')):
-		echo '<span class="notice success">';
-			echo __d('cake_dev', 'Your version of PHP is 5.2.8 or higher.');
-		echo '</span>';
-	else:
-		echo '<span class="notice">';
-			echo __d('cake_dev', 'Your version of PHP is too low. You need PHP 5.2.8 or higher to use CakePHP.');
-		echo '</span>';
-	endif;
-?>
-</p>
-<p>
-	<?php
-		if (is_writable(TMP)):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'Your tmp directory is writable.');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'Your tmp directory is NOT writable.');
-			echo '</span>';
-		endif;
-	?>
-</p>
-<p>
-	<?php
-		$settings = Cache::settings();
-		if (!empty($settings)):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'The %s is being used for core caching. To change the config edit %s', '<em>'. $settings['engine'] . 'Engine</em>', 'APP/Config/core.php');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'Your cache is NOT working. Please check the settings in %s', 'APP/Config/core.php');
-			echo '</span>';
-		endif;
-	?>
-</p>
-<p>
-	<?php
-		$filePresent = null;
-		if (file_exists(APP . 'Config' . DS . 'database.php')):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'Your database configuration file is present.');
-				$filePresent = true;
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'Your database configuration file is NOT present.');
-				echo '<br/>';
-				echo __d('cake_dev', 'Rename %s to %s', 'APP/Config/database.php.default', 'APP/Config/database.php');
-			echo '</span>';
-		endif;
-	?>
-</p>
-<?php
-if (isset($filePresent)):
-	App::uses('ConnectionManager', 'Model');
-	try {
-		$connected = ConnectionManager::getDataSource('default');
-	} catch (Exception $connectionError) {
-		$connected = false;
-		$errorMsg = $connectionError->getMessage();
-		if (method_exists($connectionError, 'getAttributes')):
-			$attributes = $connectionError->getAttributes();
-			if (isset($errorMsg['message'])):
-				$errorMsg .= '<br />' . $attributes['message'];
-			endif;
-		endif;
-	}
-?>
-<p>
-	<?php
-		if ($connected && $connected->isConnected()):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'CakePHP is able to connect to the database.');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'CakePHP is NOT able to connect to the database.');
-				echo '<br /><br />';
-				echo $errorMsg;
-			echo '</span>';
-		endif;
-	?>
-</p>
-<?php endif; ?>
-<?php
-	App::uses('Validation', 'Utility');
-	if (!Validation::alphaNumeric('cakephp')):
-		echo '<p><span class="notice">';
-			echo __d('cake_dev', 'PCRE has not been compiled with Unicode support.');
-			echo '<br/>';
-			echo __d('cake_dev', 'Recompile PCRE with Unicode support by adding <code>--enable-unicode-properties</code> when configuring');
-		echo '</span></p>';
-	endif;
-?>
-
-<p>
-	<?php
-		if (CakePlugin::loaded('DebugKit')):
-			echo '<span class="notice success">';
-				echo __d('cake_dev', 'DebugKit plugin is present');
-			echo '</span>';
-		else:
-			echo '<span class="notice">';
-				echo __d('cake_dev', 'DebugKit is not installed. It will help you inspect and debug different aspects of your application.');
-				echo '<br/>';
-				echo __d('cake_dev', 'You can install it from %s', $this->Html->link('GitHub', 'https://github.com/cakephp/debug_kit'));
-			echo '</span>';
-		endif;
-	?>
-</p>
-
-<h3><?php echo __d('cake_dev', 'Editing this Page'); ?></h3>
-<p>
-<?php
-echo __d('cake_dev', 'To change the content of this page, edit: %s.<br />
-To change its layout, edit: %s.<br />
-You can also add some CSS styles for your pages at: %s.',
-	'APP/View/Pages/home.ctp', 'APP/View/Layouts/default.ctp', 'APP/webroot/css');
-?>
-</p>
-
-<h3><?php echo __d('cake_dev', 'Getting Started'); ?></h3>
-<p>
-	<?php
-		echo $this->Html->link(
-			sprintf('<strong>%s</strong> %s', __d('cake_dev', 'New'), __d('cake_dev', 'CakePHP 2.0 Docs')),
-			'http://book.cakephp.org/2.0/en/',
-			array('target' => '_blank', 'escape' => false)
-		);
-	?>
-</p>
-<p>
-	<?php
-		echo $this->Html->link(
-			__d('cake_dev', 'The 15 min Blog Tutorial'),
-			'http://book.cakephp.org/2.0/en/tutorials-and-examples/blog/blog.html',
-			array('target' => '_blank', 'escape' => false)
-		);
-	?>
-</p>
-
-<h3><?php echo __d('cake_dev', 'Official Plugins'); ?></h3>
-<p>
-<ul>
-	<li>
-		<?php echo $this->Html->link('DebugKit', 'https://github.com/cakephp/debug_kit') ?>:
-		<?php echo __d('cake_dev', 'provides a debugging toolbar and enhanced debugging tools for CakePHP applications.'); ?>
-	</li>
-	<li>
-		<?php echo $this->Html->link('Localized', 'https://github.com/cakephp/localized') ?>:
-		<?php echo __d('cake_dev', 'contains various localized validation classes and translations for specific countries'); ?>
-	</li>
-</ul>
-</p>
-
-<h3><?php echo __d('cake_dev', 'More about CakePHP'); ?></h3>
-<p>
-<?php echo __d('cake_dev', 'CakePHP is a rapid development framework for PHP which uses commonly known design patterns like Active Record, Association Data Mapping, Front Controller and MVC.'); ?>
-</p>
-<p>
-<?php echo __d('cake_dev', 'Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.'); ?>
-</p>
-
-<ul>
-	<li><a href="http://cakephp.org">CakePHP</a>
-	<ul><li><?php echo __d('cake_dev', 'The Rapid Development Framework'); ?></li></ul></li>
-	<li><a href="http://book.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Documentation'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'Your Rapid Development Cookbook'); ?></li></ul></li>
-	<li><a href="http://api.cakephp.org"><?php echo __d('cake_dev', 'CakePHP API'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'Quick API Reference'); ?></li></ul></li>
-	<li><a href="http://bakery.cakephp.org"><?php echo __d('cake_dev', 'The Bakery'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'Everything CakePHP'); ?></li></ul></li>
-	<li><a href="http://plugins.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Plugins'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'A comprehensive list of all CakePHP plugins created by the community'); ?></li></ul></li>
-	<li><a href="http://community.cakephp.org"><?php echo __d('cake_dev', 'CakePHP Community Center'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'Everything related to the CakePHP community in one place'); ?></li></ul></li>
-	<li><a href="https://groups.google.com/group/cake-php"><?php echo __d('cake_dev', 'CakePHP Google Group'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'Community mailing list'); ?></li></ul></li>
-	<li><a href="irc://irc.freenode.net/cakephp">irc.freenode.net #cakephp</a>
-	<ul><li><?php echo __d('cake_dev', 'Live chat about CakePHP'); ?></li></ul></li>
-	<li><a href="https://github.com/cakephp/"><?php echo __d('cake_dev', 'CakePHP Code'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'Find the CakePHP code on GitHub and contribute to the framework'); ?></li></ul></li>
-	<li><a href="https://github.com/cakephp/cakephp/issues"><?php echo __d('cake_dev', 'CakePHP Issues'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'CakePHP Issues'); ?></li></ul></li>
-	<li><a href="https://github.com/cakephp/cakephp/wiki#roadmaps"><?php echo __d('cake_dev', 'CakePHP Roadmaps'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'CakePHP Roadmaps'); ?></li></ul></li>
-	<li><a href="http://training.cakephp.org"><?php echo __d('cake_dev', 'Training'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'Join a live session and get skilled with the framework'); ?></li></ul></li>
-	<li><a href="http://cakefest.org"><?php echo __d('cake_dev', 'CakeFest'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'Don\'t miss our annual CakePHP conference'); ?></li></ul></li>
-	<li><a href="http://cakefoundation.org"><?php echo __d('cake_dev', 'Cake Software Foundation'); ?> </a>
-	<ul><li><?php echo __d('cake_dev', 'Promoting development related to CakePHP'); ?></li></ul></li>
-</ul>
diff --git a/web/api/app/index.php b/web/api/app/index.php
index ae74f5261..2a3902ccf 100644
--- a/web/api/app/index.php
+++ b/web/api/app/index.php
@@ -1,19 +1,17 @@
 <?php
 /**
- *
- *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app
  * @since         CakePHP(tm) v 0.10.0.1076
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 require 'webroot' . DIRECTORY_SEPARATOR . 'index.php';
diff --git a/web/api/app/webroot/css/cake.generic.css b/web/api/app/webroot/css/cake.generic.css
index 39e0e7a54..45f7de270 100644
--- a/web/api/app/webroot/css/cake.generic.css
+++ b/web/api/app/webroot/css/cake.generic.css
@@ -1,19 +1,18 @@
 @charset "utf-8";
 /**
- *
  * Generic CSS for CakePHP
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.webroot.css
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 * {
@@ -84,7 +83,7 @@ p {
 	line-height:20px;
 	background: #003d4c url('../img/cake.icon.png') no-repeat left;
 	color: #fff;
-	padding: 0px 30px;
+	padding: 0 30px;
 }
 #header h1 a {
 	color: #fff;
@@ -174,7 +173,7 @@ td.actions {
 	white-space: nowrap;
 }
 table td.actions a {
-	margin: 0px 6px;
+	margin: 0 6px;
 	padding:2px 5px;
 }
 
@@ -336,7 +335,7 @@ option {
 input[type=checkbox] {
 	clear: left;
 	float: left;
-	margin: 0px 6px 7px 2px;
+	margin: 0 6px 7px 2px;
 	width: auto;
 }
 div.checkbox label {
@@ -365,7 +364,7 @@ form .submit input[type=submit] {
 	background-image: -moz-linear-gradient(top, #76BF6B, #3B8230);
 	border-color: #2d6324;
 	color: #fff;
-	text-shadow: rgba(0, 0, 0, 0.5) 0px -1px 0px;
+	text-shadow: rgba(0, 0, 0, 0.5) 0 -1px 0;
 	padding: 8px 10px;
 }
 form .submit input[type=submit]:hover {
@@ -527,11 +526,11 @@ input[type=submit],
 	-moz-border-radius: 4px;
 	border-radius: 4px;
 	text-decoration: none;
-	text-shadow: #fff 0px 1px 0px;
+	text-shadow: #fff 0 1px 0;
 	min-width: 0;
-	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
-	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
-	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0px 1px 1px rgba(0, 0, 0, 0.2);
+	-moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
+	-webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
+	box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.3), 0 1px 1px rgba(0, 0, 0, 0.2);
 	-webkit-user-select: none;
 	user-select: none;
 }
@@ -551,7 +550,7 @@ input[type=submit]:active,
 	background-image: -ms-linear-gradient(top, #dfdfdf, #eee);
 	background-image: -o-linear-gradient(top, #dfdfdf, #eee);
 	background-image: linear-gradient(top, #dfdfdf, #eee);
-	text-shadow: #eee 0px 1px 0px;
+	text-shadow: #eee 0 1px 0;
 	-moz-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
 	-webkit-box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
 	box-shadow: inset 0 1px 4px rgba(0, 0, 0, 0.3);
@@ -627,15 +626,15 @@ pre {
 	-moz-border-radius: 10px;
 	-webkit-border-radius: 10px;
 	border-radius: 10px;
-	margin: 0px 4px 10px 2px;
+	margin: 0 4px 10px 2px;
 	font-family: sans-serif;
 	font-size: 14px;
 	line-height: 14px;
 	display: inline-block;
 	text-decoration: none;
-	-moz-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3);
-	-webkit-box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3);
-	box-shadow: inset 0px 1px 0 rgba(0, 0, 0, 0.3);
+	-moz-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
+	-webkit-box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
+	box-shadow: inset 0 1px 0 rgba(0, 0, 0, 0.3);
 }
 .cake-code-dump pre {
 	position: relative;
@@ -647,13 +646,13 @@ pre {
 .cake-stack-trace pre {
 	color: #000;
 	background-color: #F0F0F0;
-	margin: 0px 0 10px 0;
+	margin: 0 0 10px 0;
 	padding: 1em;
 	overflow: auto;
 	text-shadow: none;
 }
 .cake-stack-trace li {
-	padding: 10px 5px 0px;
+	padding: 10px 5px 0;
 	margin: 0 0 4px 0;
 	font-family: monospace;
 	border: 1px solid #bbb;
@@ -709,7 +708,7 @@ pre {
 }
 .code-coverage-results div.start {
 	border:1px solid #aaa;
-	border-width:1px 1px 0px 1px;
+	border-width:1px 1px 0 1px;
 	margin-top:30px;
 	padding-top:5px;
 }
diff --git a/web/api/app/webroot/index.php b/web/api/app/webroot/index.php
index e29104388..18c098d8e 100644
--- a/web/api/app/webroot/index.php
+++ b/web/api/app/webroot/index.php
@@ -1,21 +1,19 @@
 <?php
 /**
- * Index
- *
  * The Front Controller for handling every request
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @package       app.webroot
  * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
@@ -26,14 +24,13 @@ if (!defined('DS')) {
 }
 
 /**
- * These defines should only be edited if you have cake installed in
+ * These defines should only be edited if you have CakePHP installed in
  * a directory layout other than the way it is distributed.
  * When using custom settings be sure to use the DS and do not add a trailing DS.
  */
 
 /**
  * The full path to the directory which holds "app", WITHOUT a trailing DS.
- *
  */
 if (!defined('ROOT')) {
 	define('ROOT', dirname(dirname(dirname(__FILE__))));
@@ -41,12 +38,18 @@ if (!defined('ROOT')) {
 
 /**
  * The actual directory name for the "app".
- *
  */
 if (!defined('APP_DIR')) {
 	define('APP_DIR', basename(dirname(dirname(__FILE__))));
 }
 
+/**
+ * Config Directory
+ */
+if (!defined('CONFIG')) {
+	define('CONFIG', ROOT . DS . APP_DIR . DS . 'Config' . DS);
+}
+
 /**
  * The absolute path to the "cake" directory, WITHOUT a trailing DS.
  *
@@ -63,10 +66,19 @@ if (!defined('APP_DIR')) {
  */
 //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
 
+/**
+ * This auto-detects CakePHP as a composer installed library.
+ * You may remove this if you are not planning to use composer (not recommended, though).
+ */
+$vendorPath = ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
+$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
+if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispatcher)) {
+	define('CAKE_CORE_INCLUDE_PATH', $vendorPath);
+}
+
 /**
  * Editing below this line should NOT be necessary.
  * Change at your own risk.
- *
  */
 if (!defined('WEBROOT_DIR')) {
 	define('WEBROOT_DIR', basename(dirname(__FILE__)));
@@ -75,9 +87,9 @@ if (!defined('WWW_ROOT')) {
 	define('WWW_ROOT', dirname(__FILE__) . DS);
 }
 
-// for built-in server
-if (php_sapi_name() === 'cli-server') {
-	if ($_SERVER['REQUEST_URI'] !== '/' && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
+// For the built-in server
+if (PHP_SAPI === 'cli-server') {
+	if ($_SERVER['PHP_SELF'] !== '/' . basename(__FILE__) && file_exists(WWW_ROOT . $_SERVER['PHP_SELF'])) {
 		return false;
 	}
 	$_SERVER['PHP_SELF'] = '/' . basename(__FILE__);
@@ -90,10 +102,8 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	if (!include 'Cake' . DS . 'bootstrap.php') {
 		$failed = true;
 	}
-} else {
-	if (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
-		$failed = true;
-	}
+} elseif (!include CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'bootstrap.php') {
+	$failed = true;
 }
 if (!empty($failed)) {
 	trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
diff --git a/web/api/app/webroot/test.php b/web/api/app/webroot/test.php
index 0949f3ce3..2f8f8d3c0 100644
--- a/web/api/app/webroot/test.php
+++ b/web/api/app/webroot/test.php
@@ -2,18 +2,18 @@
 /**
  * Web Access Frontend for TestSuite
  *
- * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html>
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) Tests <https://book.cakephp.org/2.0/en/development/testing.html>
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://book.cakephp.org/2.0/en/development/testing.html
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://book.cakephp.org/2.0/en/development/testing.html
  * @package       app.webroot
  * @since         CakePHP(tm) v 1.2.0.4433
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 set_time_limit(0);
@@ -27,14 +27,13 @@ if (!defined('DS')) {
 }
 
 /**
- * These defines should only be edited if you have cake installed in
+ * These defines should only be edited if you have CakePHP installed in
  * a directory layout other than the way it is distributed.
  * When using custom settings be sure to use the DS and do not add a trailing DS.
  */
 
 /**
  * The full path to the directory which holds "app", WITHOUT a trailing DS.
- *
  */
 if (!defined('ROOT')) {
 	define('ROOT', dirname(dirname(dirname(__FILE__))));
@@ -42,12 +41,18 @@ if (!defined('ROOT')) {
 
 /**
  * The actual directory name for the "app".
- *
  */
 if (!defined('APP_DIR')) {
 	define('APP_DIR', basename(dirname(dirname(__FILE__))));
 }
 
+/**
+ * Config Directory
+ */
+if (!defined('CONFIG')) {
+	define('CONFIG', ROOT . DS . APP_DIR . DS . 'Config' . DS);
+}
+
 /**
  * The absolute path to the "Cake" directory, WITHOUT a trailing DS.
  *
@@ -61,10 +66,19 @@ if (!defined('APP_DIR')) {
  */
 //define('CAKE_CORE_INCLUDE_PATH', ROOT . DS . 'lib');
 
+/**
+ * This auto-detects CakePHP as a composer installed library.
+ * You may remove this if you are not planning to use composer (not recommended, though).
+ */
+$vendorPath = ROOT . DS . APP_DIR . DS . 'Vendor' . DS . 'cakephp' . DS . 'cakephp' . DS . 'lib';
+$dispatcher = 'Cake' . DS . 'Console' . DS . 'ShellDispatcher.php';
+if (!defined('CAKE_CORE_INCLUDE_PATH') && file_exists($vendorPath . DS . $dispatcher)) {
+	define('CAKE_CORE_INCLUDE_PATH', $vendorPath);
+}
+
 /**
  * Editing below this line should not be necessary.
  * Change at your own risk.
- *
  */
 if (!defined('WEBROOT_DIR')) {
 	define('WEBROOT_DIR', basename(dirname(__FILE__)));
@@ -86,11 +100,11 @@ if (!defined('CAKE_CORE_INCLUDE_PATH')) {
 	}
 }
 if (!empty($failed)) {
-	trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/index.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
+	trigger_error("CakePHP core could not be found. Check the value of CAKE_CORE_INCLUDE_PATH in APP/webroot/test.php. It should point to the directory containing your " . DS . "cake core directory and your " . DS . "vendors root directory.", E_USER_ERROR);
 }
 
 if (Configure::read('debug') < 1) {
-	throw new NotFoundException(__d('cake_dev', 'Debug setting does not allow access to this url.'));
+	throw new NotFoundException(__d('cake_dev', 'Debug setting does not allow access to this URL.'));
 }
 
 require_once CAKE . 'TestSuite' . DS . 'CakeTestSuiteDispatcher.php';
diff --git a/web/api/build.properties b/web/api/build.properties
index 686a4226d..8ecda7cdd 100644
--- a/web/api/build.properties
+++ b/web/api/build.properties
@@ -9,4 +9,4 @@ build.dir = build
 dist.dir = dist
 
 # Server
-pirum.dir = /home/cakephp/www-live/pear.cakephp.org
+pirum.dir = /var/lib/dokku/data/storage/pear
diff --git a/web/api/build.xml b/web/api/build.xml
index 42ed084bd..db4fd444e 100644
--- a/web/api/build.xml
+++ b/web/api/build.xml
@@ -136,7 +136,6 @@
 			<dependencies>
 				<php minimum_version="5.2.8" />
 				<pear minimum_version="1.9.0" recommended_version="1.9.4" />
-				<package name="PHPUnit" channel="pear.phpunit.de" minimum_version="3.5.0" type="optional" />
 			</dependencies>
 			<dirroles key="bin">script</dirroles>
 			<dirroles key="Cake/Console/Templates/skel">php</dirroles>
@@ -214,10 +213,10 @@
 	-->
 	<target name="distribute" depends="prepare" description="Upload pear packages to pear.cakephp.org">
 		<echo msg="Uploading tgz file to cakephp.org" />
-		<exec command="scp ${dist.dir}/${pear.package}.tgz cakephp@cakephp.org:${pirum.dir}" dir="." checkreturn="true"  />
+		<exec command="scp ${dist.dir}/${pear.package}.tgz root@new.cakephp.org:${pirum.dir}" dir="." checkreturn="true" />
 
-		<echo msg="Adding new release to pirum" />
-		<exec command="ssh cakephp@cakephp.org pirum add ${pirum.dir} ${pirum.dir}/${pear.package}.tgz" checkreturn="true" />
+		<echo msg="Rebuilding pear.cakephp.org container" />
+		<exec command="ssh root@new.cakephp.org dokku ps:rebuild pear" checkreturn="true" />
 	</target>
 
 	<target name="codestyle" description="Check codestyle (human readable format)">
diff --git a/web/api/composer.json b/web/api/composer.json
index 59646d5e4..8b9168981 100644
--- a/web/api/composer.json
+++ b/web/api/composer.json
@@ -1,31 +1,46 @@
 {
-    "name": "cakephp/cakephp",
-    "description": "The CakePHP framework",
-    "type": "library",
-    "keywords": ["framework"],
-    "homepage": "http://cakephp.org",
-    "license": "MIT",
-    "authors": [
-        {
-            "name": "CakePHP Community",
-            "homepage": "https://github.com/cakephp/cakephp/graphs/contributors"
-        }
-    ],
-    "support": {
-        "issues": "https://github.com/cakephp/cakephp/issues",
-        "forum": "http://stackoverflow.com/tags/cakephp",
-        "irc": "irc://irc.freenode.org/cakephp",
-        "source": "https://github.com/cakephp/cakephp"
-    },
-    "require": {
-        "php": ">=5.2.8",
-        "ext-mcrypt": "*"
-    },
-    "require-dev": {
-        "phpunit/phpunit": "3.7.*",
-        "cakephp/debug_kit" : "2.2.*"
-    },
-    "bin": [
-        "lib/Cake/Console/cake"
-    ]
+	"name": "cakephp/cakephp",
+	"description": "The CakePHP framework",
+	"type": "library",
+	"keywords": ["framework"],
+	"homepage": "https://cakephp.org",
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "CakePHP Community",
+			"homepage": "https://github.com/cakephp/cakephp/graphs/contributors"
+		}
+	],
+	"support": {
+		"issues": "https://github.com/cakephp/cakephp/issues",
+		"forum": "https://stackoverflow.com/tags/cakephp",
+		"irc": "irc://irc.freenode.org/cakephp",
+		"source": "https://github.com/cakephp/cakephp"
+	},
+	"require": {
+		"php": ">=5.3.0,<8.0.0"
+	},
+	"suggest": {
+		"ext-openssl": "You need to install ext-openssl or ext-mcrypt to use AES-256 encryption",
+		"ext-mcrypt": "You need to install ext-openssl or ext-mcrypt to use AES-256 encryption"
+	},
+	"require-dev": {
+		"phpunit/phpunit": "^3.7",
+		"cakephp/cakephp-codesniffer": "^1.0.0"
+	},
+	"config": {
+		"vendor-dir": "vendors/",
+		"process-timeout": 0
+	},
+	"bin": [
+		"lib/Cake/Console/cake"
+	],
+	"scripts": {
+		"check": [
+			"@cs-check",
+			"@test"
+		],
+		"cs-check": "./vendors/bin/phpcs -p --extensions=php --standard=CakePHP ./lib/Cake",
+		"test": "./lib/Cake/Console/cake test core AllTests --stderr --verbose"
+	}
 }
diff --git a/web/api/index.php b/web/api/index.php
index 056201c08..f03a7d550 100644
--- a/web/api/index.php
+++ b/web/api/index.php
@@ -7,17 +7,17 @@
  *  - requires App.baseUrl to be uncommented in app/Config/core.php
  *	- app/webroot is not set as a document root.
  *
- * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
- * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
  *
  * Licensed under The MIT License
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
- * @link          http://cakephp.org CakePHP(tm) Project
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
  * @since         CakePHP(tm) v 0.2.9
- * @license       http://www.opensource.org/licenses/mit-license.php MIT License
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
 /**
diff --git a/web/api/lib/Cake/Cache/Engine/FileEngine.php b/web/api/lib/Cake/Cache/Engine/FileEngine.php
index 9b8eae0a7..7599d6188 100644
--- a/web/api/lib/Cake/Cache/Engine/FileEngine.php
+++ b/web/api/lib/Cake/Cache/Engine/FileEngine.php
@@ -352,7 +352,11 @@ class FileEngine extends CacheEngine {
 		if (!$createKey && !$path->isFile()) {
 			return false;
 		}
-		if (empty($this->_File) || $this->_File->getBaseName() !== $key) {
+		if (
+			empty($this->_File) ||
+			$this->_File->getBaseName() !== $key ||
+			$this->_File->valid() === false
+		) {
 			$exists = file_exists($path->getPathname());
 			try {
 				$this->_File = $path->openFile('c+');
diff --git a/web/api/lib/Cake/Cache/Engine/RedisEngine.php b/web/api/lib/Cake/Cache/Engine/RedisEngine.php
index 02d677b25..6dd659944 100644
--- a/web/api/lib/Cake/Cache/Engine/RedisEngine.php
+++ b/web/api/lib/Cake/Cache/Engine/RedisEngine.php
@@ -228,7 +228,7 @@ class RedisEngine extends CacheEngine {
  * Disconnects from the redis server
  */
 	public function __destruct() {
-		if (!$this->settings['persistent']) {
+		if (empty($this->settings['persistent']) && $this->_Redis !== null) {
 			$this->_Redis->close();
 		}
 	}
diff --git a/web/api/lib/Cake/Console/Command/CompletionShell.php b/web/api/lib/Cake/Console/Command/CompletionShell.php
index 3d6fa17e0..21ee0e761 100644
--- a/web/api/lib/Cake/Console/Command/CompletionShell.php
+++ b/web/api/lib/Cake/Console/Command/CompletionShell.php
@@ -149,7 +149,7 @@ class CompletionShell extends AppShell {
  */
 	protected function _output($options = array()) {
 		if ($options) {
-			return $this->out(implode($options, ' '));
+			return $this->out(implode(' ', $options));
 		}
 	}
 }
diff --git a/web/api/lib/Cake/Console/Command/SchemaShell.php b/web/api/lib/Cake/Console/Command/SchemaShell.php
index f23c2b70e..6a704bda8 100644
--- a/web/api/lib/Cake/Console/Command/SchemaShell.php
+++ b/web/api/lib/Cake/Console/Command/SchemaShell.php
@@ -53,7 +53,7 @@ class SchemaShell extends AppShell {
 		$this->out('Cake Schema Shell');
 		$this->hr();
 
-		Configure::write('Cache.disable', 1);
+		Configure::write('Cache.disable', true);
 
 		$name = $path = $connection = $plugin = null;
 		if (!empty($this->params['name'])) {
diff --git a/web/api/lib/Cake/Console/Command/Task/ModelTask.php b/web/api/lib/Cake/Console/Command/Task/ModelTask.php
index 4619655f9..f70cf656d 100644
--- a/web/api/lib/Cake/Console/Command/Task/ModelTask.php
+++ b/web/api/lib/Cake/Console/Command/Task/ModelTask.php
@@ -224,7 +224,7 @@ class ModelTask extends BakeTask {
 		if (!array_key_exists('id', $fields)) {
 			$primaryKey = $this->findPrimaryKey($fields);
 		}
-
+		$displayField = null;
 		if ($knownToExist) {
 			$displayField = $tempModel->hasField(array('name', 'title'));
 			if (!$displayField) {
@@ -388,7 +388,7 @@ class ModelTask extends BakeTask {
 		sort($options);
 		$default = 1;
 		foreach ($options as $option) {
-			if ($option{0} !== '_') {
+			if ($option[0] !== '_') {
 				$choices[$default] = $option;
 				$default++;
 			}
diff --git a/web/api/lib/Cake/Console/Command/TestShell.php b/web/api/lib/Cake/Console/Command/TestShell.php
index b12f6a078..c9520cbd5 100644
--- a/web/api/lib/Cake/Console/Command/TestShell.php
+++ b/web/api/lib/Cake/Console/Command/TestShell.php
@@ -291,8 +291,8 @@ class TestShell extends Shell {
 	public function available() {
 		$params = $this->_parseArgs();
 		$testCases = CakeTestLoader::generateTestList($params);
-		$app = $params['app'];
-		$plugin = $params['plugin'];
+		$app = isset($params['app']) ? $params['app'] : null;
+		$plugin = isset($params['plugin']) ? $params['plugin'] : null;
 
 		$title = "Core Test Cases:";
 		$category = 'core';
@@ -360,23 +360,19 @@ class TestShell extends Shell {
 		}
 
 		$testFile = $testCase = null;
-
+		$testCaseFolder = str_replace(APP, '', APP_TEST_CASES);
 		if (preg_match('@Test[\\\/]@', $file)) {
-
 			if (substr($file, -8) === 'Test.php') {
-
 				$testCase = substr($file, 0, -8);
 				$testCase = str_replace(DS, '/', $testCase);
-
-				if ($testCase = preg_replace('@.*Test\/Case\/@', '', $testCase)) {
-
+				$testCaseFolderEscaped = str_replace('/', '\/', $testCaseFolder);
+				$testCase = preg_replace('@.*' . $testCaseFolderEscaped . '\/@', '', $testCase);
+				if (!empty($testCase)) {
 					if ($category === 'core') {
 						$testCase = str_replace('lib/Cake', '', $testCase);
 					}
-
 					return $testCase;
 				}
-
 				throw new Exception(__d('cake_dev', 'Test case %s cannot be run via this shell', $testFile));
 			}
 		}
@@ -397,11 +393,11 @@ class TestShell extends Shell {
 		}
 
 		if ($category === 'app') {
-			$testFile = str_replace(APP, APP . 'Test/Case/', $file) . 'Test.php';
+			$testFile = str_replace(APP, APP_TEST_CASES . '/', $file) . 'Test.php';
 		} else {
 			$testFile = preg_replace(
 				"@((?:plugins|Plugin)[\\/]{$category}[\\/])(.*)$@",
-				'\1Test/Case/\2Test.php',
+				'\1' . $testCaseFolder . '/\2Test.php',
 				$file
 			);
 		}
@@ -412,8 +408,7 @@ class TestShell extends Shell {
 
 		$testCase = substr($testFile, 0, -8);
 		$testCase = str_replace(DS, '/', $testCase);
-		$testCase = preg_replace('@.*Test/Case/@', '', $testCase);
-
+		$testCase = preg_replace('@.*' . $testCaseFolder . '/@', '', $testCase);
 		return $testCase;
 	}
 
diff --git a/web/api/lib/Cake/Console/Command/UpgradeShell.php b/web/api/lib/Cake/Console/Command/UpgradeShell.php
index f9d1223af..c738f0e3d 100644
--- a/web/api/lib/Cake/Console/Command/UpgradeShell.php
+++ b/web/api/lib/Cake/Console/Command/UpgradeShell.php
@@ -237,7 +237,7 @@ class UpgradeShell extends AppShell {
 		foreach ($helpers as $helper) {
 			$helper = preg_replace('/Helper$/', '', $helper);
 			$oldHelper = $helper;
-			$oldHelper{0} = strtolower($oldHelper{0});
+			$oldHelper[0] = strtolower($oldHelper[0]);
 			$patterns[] = array(
 				"\${$oldHelper} to \$this->{$helper}",
 				"/\\\${$oldHelper}->/",
diff --git a/web/api/lib/Cake/Console/ConsoleOptionParser.php b/web/api/lib/Cake/Console/ConsoleOptionParser.php
index f90dbc4e1..f313c41c9 100644
--- a/web/api/lib/Cake/Console/ConsoleOptionParser.php
+++ b/web/api/lib/Cake/Console/ConsoleOptionParser.php
@@ -620,8 +620,8 @@ class ConsoleOptionParser {
 		if (substr($name, 0, 2) === '--') {
 			return isset($this->_options[substr($name, 2)]);
 		}
-		if ($name{0} === '-' && $name{1} !== '-') {
-			return isset($this->_shortOptions[$name{1}]);
+		if ($name[0] === '-' && $name[1] !== '-') {
+			return isset($this->_shortOptions[$name[1]]);
 		}
 		return false;
 	}
diff --git a/web/api/lib/Cake/Console/ConsoleOutput.php b/web/api/lib/Cake/Console/ConsoleOutput.php
index 4690a850b..1f52df01b 100644
--- a/web/api/lib/Cake/Console/ConsoleOutput.php
+++ b/web/api/lib/Cake/Console/ConsoleOutput.php
@@ -265,7 +265,7 @@ class ConsoleOutput {
 				$styleInfo[] = static::$_options[$option];
 			}
 		}
-		return "\033[" . implode($styleInfo, ';') . 'm' . $matches['text'] . "\033[0m";
+		return "\033[" . implode(';', $styleInfo) . 'm' . $matches['text'] . "\033[0m";
 	}
 
 /**
diff --git a/web/api/lib/Cake/Console/Shell.php b/web/api/lib/Cake/Console/Shell.php
index 90ee0eb38..c8033e695 100644
--- a/web/api/lib/Cake/Console/Shell.php
+++ b/web/api/lib/Cake/Console/Shell.php
@@ -764,8 +764,6 @@ class Shell extends CakeObject {
  * @link https://book.cakephp.org/2.0/en/console-and-shells.html#Shell::createFile
  */
 	public function createFile($path, $contents) {
-		$path = str_replace(DS . DS, DS, $path);
-
 		$this->out();
 
 		if (is_file($path) && empty($this->params['force']) && $this->interactive === true) {
@@ -808,12 +806,12 @@ class Shell extends CakeObject {
 			return $this->_helpers[$name];
 		}
 		list($plugin, $helperClassName) = pluginSplit($name, true);
-		$helperClassName = Inflector::camelize($name) . "ShellHelper";
-		App::uses($helperClassName, $plugin . "Console/Helper");
-		if (!class_exists($helperClassName)) {
+		$helperClassNameShellHelper = Inflector::camelize($helperClassName) . "ShellHelper";
+		App::uses($helperClassNameShellHelper, $plugin . "Console/Helper");
+		if (!class_exists($helperClassNameShellHelper)) {
 			throw new RuntimeException("Class " . $helperClassName . " not found");
 		}
-		$helper = new $helperClassName($this->stdout);
+		$helper = new $helperClassNameShellHelper($this->stdout);
 		$this->_helpers[$name] = $helper;
 		return $helper;
 	}
diff --git a/web/api/lib/Cake/Console/ShellDispatcher.php b/web/api/lib/Cake/Console/ShellDispatcher.php
index 9f21befb2..22a4e53f7 100644
--- a/web/api/lib/Cake/Console/ShellDispatcher.php
+++ b/web/api/lib/Cake/Console/ShellDispatcher.php
@@ -140,8 +140,11 @@ class ShellDispatcher {
 			define('TMP', CAKE_CORE_INCLUDE_PATH . DS . 'Cake' . DS . 'Console' . DS . 'Templates' . DS . 'skel' . DS . 'tmp' . DS);
 		}
 
+		if (!defined('CONFIG')) {
+			define('CONFIG', ROOT . DS . APP_DIR . DS . 'Config' . DS);
+		}
 		// $boot is used by Cake/bootstrap.php file
-		$boot = file_exists(ROOT . DS . APP_DIR . DS . 'Config' . DS . 'bootstrap.php');
+		$boot = file_exists(CONFIG . 'bootstrap.php');
 		require CORE_PATH . 'Cake' . DS . 'bootstrap.php';
 
 		if (!file_exists(CONFIG . 'core.php')) {
@@ -220,7 +223,7 @@ class ShellDispatcher {
 		}
 		$methods = array_diff(get_class_methods($Shell), get_class_methods('Shell'));
 		$added = in_array($command, $methods);
-		$private = $command[0] === '_' && method_exists($Shell, $command);
+		$private = substr($command, 0, 1) === '_' && method_exists($Shell, $command);
 
 		if (!$private) {
 			if ($added) {
diff --git a/web/api/lib/Cake/Console/Templates/default/actions/controller_actions.ctp b/web/api/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
index 8a943b9e7..0cde5c638 100644
--- a/web/api/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
+++ b/web/api/lib/Cake/Console/Templates/default/actions/controller_actions.ctp
@@ -131,12 +131,11 @@
  * @return void
  */
 	public function <?php echo $admin; ?>delete($id = null) {
-		$this-><?php echo $currentModelName; ?>->id = $id;
-		if (!$this-><?php echo $currentModelName; ?>->exists()) {
+		if (!$this-><?php echo $currentModelName; ?>->exists($id)) {
 			throw new NotFoundException(__('Invalid <?php echo strtolower($singularHumanName); ?>'));
 		}
 		$this->request->allowMethod('post', 'delete');
-		if ($this-><?php echo $currentModelName; ?>->delete()) {
+		if ($this-><?php echo $currentModelName; ?>->delete($id)) {
 <?php if ($wannaUseSession): ?>
 			$this->Flash->success(__('The <?php echo strtolower($singularHumanName); ?> has been deleted.'));
 		} else {
diff --git a/web/api/lib/Cake/Console/Templates/skel/.htaccess b/web/api/lib/Cake/Console/Templates/skel/.htaccess
new file mode 100644
index 000000000..128e7871b
--- /dev/null
+++ b/web/api/lib/Cake/Console/Templates/skel/.htaccess
@@ -0,0 +1,5 @@
+<IfModule mod_rewrite.c>
+	RewriteEngine on
+	RewriteRule ^$ webroot/ [L]
+	RewriteRule (.*) webroot/$1 [L]
+</IfModule>
\ No newline at end of file
diff --git a/web/api/lib/Cake/Console/Templates/skel/webroot/.htaccess b/web/api/lib/Cake/Console/Templates/skel/webroot/.htaccess
new file mode 100644
index 000000000..1d499ba73
--- /dev/null
+++ b/web/api/lib/Cake/Console/Templates/skel/webroot/.htaccess
@@ -0,0 +1,6 @@
+<IfModule mod_rewrite.c>
+	RewriteEngine On
+	RewriteCond %{REQUEST_FILENAME} !-d
+	RewriteCond %{REQUEST_FILENAME} !-f
+	RewriteRule ^ index.php [L]
+</IfModule>
diff --git a/web/api/lib/Cake/Controller/Component/CookieComponent.php b/web/api/lib/Cake/Controller/Component/CookieComponent.php
index 1d01e227d..7d07d8695 100644
--- a/web/api/lib/Cake/Controller/Component/CookieComponent.php
+++ b/web/api/lib/Cake/Controller/Component/CookieComponent.php
@@ -248,7 +248,7 @@ class CookieComponent extends Component {
  * $this->Cookie->read(Name.key);
  *
  * @param string $key Key of the value to be obtained. If none specified, obtain map key => values
- * @return string|null Value for specified key
+ * @return string|array|null Value for specified key
  * @link https://book.cakephp.org/2.0/en/core-libraries/components/cookie.html#CookieComponent::read
  */
 	public function read($key = null) {
diff --git a/web/api/lib/Cake/Controller/Component/RequestHandlerComponent.php b/web/api/lib/Cake/Controller/Component/RequestHandlerComponent.php
index 9471f4849..1915b981a 100644
--- a/web/api/lib/Cake/Controller/Component/RequestHandlerComponent.php
+++ b/web/api/lib/Cake/Controller/Component/RequestHandlerComponent.php
@@ -72,6 +72,13 @@ class RequestHandlerComponent extends Component {
  */
 	public $ext = null;
 
+/**
+ * Array of parameters parsed from the URL.
+ *
+ * @var array|null
+ */
+	public $params = null;
+
 /**
  * The template to use when rendering the given content type.
  *
@@ -132,7 +139,7 @@ class RequestHandlerComponent extends Component {
 		if (empty($this->ext) || $this->ext === 'html') {
 			$this->_setExtension();
 		}
-		$this->params = $controller->params;
+		$this->params = $controller->request->params;
 		if (!empty($this->settings['viewClassMap'])) {
 			$this->viewClassMap($this->settings['viewClassMap']);
 		}
@@ -213,7 +220,7 @@ class RequestHandlerComponent extends Component {
 
 		foreach ($this->_inputTypeMap as $type => $handler) {
 			if ($this->requestedWith($type)) {
-				$input = call_user_func_array(array($controller->request, 'input'), $handler);
+				$input = (array)call_user_func_array(array($controller->request, 'input'), $handler);
 				$controller->request->data = $input;
 			}
 		}
@@ -264,8 +271,10 @@ class RequestHandlerComponent extends Component {
 		}
 		if (!empty($status)) {
 			$statusCode = $this->response->httpCodes($status);
-			$code = key($statusCode);
-			$this->response->statusCode($code);
+			if (is_array($statusCode)) {
+				$code = key($statusCode);
+				$this->response->statusCode($code);
+			}
 		}
 		$this->response->body($this->requestAction($url, array('return', 'bare' => false)));
 		$this->response->send();
diff --git a/web/api/lib/Cake/Controller/Component/SessionComponent.php b/web/api/lib/Cake/Controller/Component/SessionComponent.php
index b298e420d..f09550957 100644
--- a/web/api/lib/Cake/Controller/Component/SessionComponent.php
+++ b/web/api/lib/Cake/Controller/Component/SessionComponent.php
@@ -45,9 +45,9 @@ class SessionComponent extends Component {
  *
  * In your controller: $this->Session->write('Controller.sessKey', 'session value');
  *
- * @param string $name The name of the key your are setting in the session.
+ * @param string|array $name The name of the key your are setting in the session.
  * 							This should be in a Controller.key format for better organizing
- * @param string $value The value you want to store in a session.
+ * @param mixed $value The value you want to store in a session.
  * @return bool Success
  * @link https://book.cakephp.org/2.0/en/core-libraries/components/sessions.html#SessionComponent::write
  */
diff --git a/web/api/lib/Cake/Controller/Controller.php b/web/api/lib/Cake/Controller/Controller.php
index e9d5c6657..19e54692d 100644
--- a/web/api/lib/Cake/Controller/Controller.php
+++ b/web/api/lib/Cake/Controller/Controller.php
@@ -48,11 +48,18 @@ App::uses('CakeEventManager', 'Event');
  * @property      AuthComponent $Auth
  * @property      CookieComponent $Cookie
  * @property      EmailComponent $Email
+ * @property      FlashComponent $Flash
  * @property      PaginatorComponent $Paginator
  * @property      RequestHandlerComponent $RequestHandler
  * @property      SecurityComponent $Security
  * @property      SessionComponent $Session
- * @property      FlashComponent $Flash
+ * @property      string $action  The action handling the current request. Deprecated, use CakeRequest::$action instead.
+ * @property      string $base    Base URL path. Deprecated, use CakeRequest::$base instead.
+ * @property      array $data     POST data. Deprecated, use CakeRequest::$data instead.
+ * @property      string $here    The full address to the current request. Deprecated, use CakeRequest::$here instead.
+ * @property      array $paginate Pagination settings.
+ * @property      array $params   Array of parameters parsed from the URL. Deprecated, use CakeRequest::$params instead.
+ * @property      string $webroot Webroot path segment for the request.
  * @link          https://book.cakephp.org/2.0/en/controllers.html
  */
 class Controller extends CakeObject implements CakeEventListener {
@@ -80,7 +87,7 @@ class Controller extends CakeObject implements CakeEventListener {
  *
  * The default value is `true`.
  *
- * @var mixed
+ * @var bool|array
  * @link https://book.cakephp.org/2.0/en/controllers.html#components-helpers-and-uses
  */
 	public $uses = true;
@@ -153,9 +160,9 @@ class Controller extends CakeObject implements CakeEventListener {
 /**
  * The name of the layout file to render the view inside of. The name specified
  * is the filename of the layout in /app/View/Layouts without the .ctp
- * extension.
+ * extension. If `false` then no layout is rendered.
  *
- * @var string
+ * @var string|bool
  */
 	public $layout = 'default';
 
@@ -287,8 +294,9 @@ class Controller extends CakeObject implements CakeEventListener {
 
 /**
  * Holds any validation errors produced by the last call of the validateErrors() method.
+ * Contains `false` if no validation errors happened.
  *
- * @var array
+ * @var array|bool
  */
 	public $validationErrors = null;
 
@@ -573,7 +581,7 @@ class Controller extends CakeObject implements CakeEventListener {
 		if ($this->uses === true) {
 			$this->uses = array($pluginDot . $this->modelClass);
 		}
-		if (isset($appVars['uses']) && $appVars['uses'] === $this->uses) {
+		if (is_array($this->uses) && isset($appVars['uses']) && $appVars['uses'] === $this->uses) {
 			array_unshift($this->uses, $pluginDot . $this->modelClass);
 		}
 		if ($pluginController) {
@@ -598,10 +606,7 @@ class Controller extends CakeObject implements CakeEventListener {
  * @return void
  */
 	protected function _mergeUses($merge) {
-		if (!isset($merge['uses'])) {
-			return;
-		}
-		if ($merge['uses'] === true) {
+		if (!isset($merge['uses']) || $merge['uses'] === true || !is_array($this->uses)) {
 			return;
 		}
 		$this->uses = array_merge(
@@ -707,7 +712,7 @@ class Controller extends CakeObject implements CakeEventListener {
  *            800 => 'Unexpected Minotaur'
  *        )); // sets these new values, and returns true
  *
- * @return array Associative array of the HTTP codes as keys, and the message
+ * @return array|null|true Associative array of the HTTP codes as keys, and the message
  *    strings as values, or null of the given $code does not exist.
  * @deprecated 3.0.0 Since 2.4. Will be removed in 3.0. Use CakeResponse::httpCodes().
  */
@@ -752,7 +757,7 @@ class Controller extends CakeObject implements CakeEventListener {
  *
  * @param string|array $url A string or array-based URL pointing to another location within the app,
  *     or an absolute URL
- * @param int|array|null $status HTTP status code (eg: 301). Defaults to 302 when null is passed.
+ * @param int|array|null|string $status HTTP status code (eg: 301). Defaults to 302 when null is passed.
  * @param bool $exit If true, exit() will be called after the redirect
  * @return CakeResponse|null
  * @triggers Controller.beforeRedirect $this, array($url, $status, $exit)
@@ -838,7 +843,7 @@ class Controller extends CakeObject implements CakeEventListener {
  * Saves a variable for use inside a view template.
  *
  * @param string|array $one A string or an array of data.
- * @param string|array $two Value in case $one is a string (which then works as the key).
+ * @param mixed $two Value in case $one is a string (which then works as the key).
  *   Unused if $one is an associative array, otherwise serves as the values to $one's keys.
  * @return void
  * @link https://book.cakephp.org/2.0/en/controllers.html#interacting-with-views
@@ -900,7 +905,7 @@ class Controller extends CakeObject implements CakeEventListener {
  *
  * `$errors = $this->validateErrors($this->Article, $this->User);`
  *
- * @return array Validation errors, or false if none
+ * @return array|false Validation errors, or false if none
  * @deprecated 3.0.0 This method will be removed in 3.0
  */
 	public function validateErrors() {
@@ -925,7 +930,7 @@ class Controller extends CakeObject implements CakeEventListener {
 /**
  * Instantiates the correct view class, hands it its data, and uses it to render the view output.
  *
- * @param string $view View to use for rendering
+ * @param bool|string $view View to use for rendering
  * @param string $layout Layout to use
  * @return CakeResponse A response object containing the rendered view.
  * @triggers Controller.beforeRender $this
@@ -1018,7 +1023,7 @@ class Controller extends CakeObject implements CakeEventListener {
 	}
 
 /**
- * Converts POST'ed form data to a model conditions array. 
+ * Converts POST'ed form data to a model conditions array.
  *
  * If combined with SecurityComponent these conditions could be suitable
  * for use in a Model::find() call. Without SecurityComponent this method
diff --git a/web/api/lib/Cake/Controller/RequestHandlerComponent.php b/web/api/lib/Cake/Controller/RequestHandlerComponent.php
new file mode 100644
index 000000000..1915b981a
--- /dev/null
+++ b/web/api/lib/Cake/Controller/RequestHandlerComponent.php
@@ -0,0 +1,796 @@
+<?php
+/**
+ * Request object for handling alternative HTTP requests
+ *
+ * Alternative HTTP requests can come from wireless units like mobile phones, palmtop computers,
+ * and the like. These units have no use for Ajax requests, and this Component can tell how Cake
+ * should respond to the different needs of a handheld computer and a desktop machine.
+ *
+ * CakePHP(tm) : Rapid Development Framework (https://cakephp.org)
+ * Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ *
+ * Licensed under The MIT License
+ * For full copyright and license information, please see the LICENSE.txt
+ * Redistributions of files must retain the above copyright notice.
+ *
+ * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link          https://cakephp.org CakePHP(tm) Project
+ * @package       Cake.Controller.Component
+ * @since         CakePHP(tm) v 0.10.4.1076
+ * @license       https://opensource.org/licenses/mit-license.php MIT License
+ */
+
+App::uses('Component', 'Controller');
+App::uses('Xml', 'Utility');
+
+/**
+ * Request object for handling alternative HTTP requests
+ *
+ * Alternative HTTP requests can come from wireless units like mobile phones, palmtop computers,
+ * and the like. These units have no use for Ajax requests, and this Component can tell how Cake
+ * should respond to the different needs of a handheld computer and a desktop machine.
+ *
+ * @package       Cake.Controller.Component
+ * @link https://book.cakephp.org/2.0/en/core-libraries/components/request-handling.html
+ */
+class RequestHandlerComponent extends Component {
+
+/**
+ * The layout that will be switched to for Ajax requests
+ *
+ * @var string
+ * @see RequestHandler::setAjax()
+ */
+	public $ajaxLayout = 'ajax';
+
+/**
+ * Determines whether or not callbacks will be fired on this component
+ *
+ * @var bool
+ */
+	public $enabled = true;
+
+/**
+ * Holds the reference to Controller::$request
+ *
+ * @var CakeRequest
+ */
+	public $request;
+
+/**
+ * Holds the reference to Controller::$response
+ *
+ * @var CakeResponse
+ */
+	public $response;
+
+/**
+ * Contains the file extension parsed out by the Router
+ *
+ * @var string
+ * @see Router::parseExtensions()
+ */
+	public $ext = null;
+
+/**
+ * Array of parameters parsed from the URL.
+ *
+ * @var array|null
+ */
+	public $params = null;
+
+/**
+ * The template to use when rendering the given content type.
+ *
+ * @var string
+ */
+	protected $_renderType = null;
+
+/**
+ * A mapping between extensions and deserializers for request bodies of that type.
+ * By default only JSON and XML are mapped, use RequestHandlerComponent::addInputType()
+ *
+ * @var array
+ */
+	protected $_inputTypeMap = array(
+		'json' => array('json_decode', true)
+	);
+
+/**
+ * A mapping between type and viewClass
+ * By default only JSON and XML are mapped, use RequestHandlerComponent::viewClassMap()
+ *
+ * @var array
+ */
+	protected $_viewClassMap = array(
+		'json' => 'Json',
+		'xml' => 'Xml'
+	);
+
+/**
+ * Constructor. Parses the accepted content types accepted by the client using HTTP_ACCEPT
+ *
+ * @param ComponentCollection $collection ComponentCollection object.
+ * @param array $settings Array of settings.
+ */
+	public function __construct(ComponentCollection $collection, $settings = array()) {
+		parent::__construct($collection, $settings + array('checkHttpCache' => true));
+		$this->addInputType('xml', array(array($this, 'convertXml')));
+
+		$Controller = $collection->getController();
+		$this->request = $Controller->request;
+		$this->response = $Controller->response;
+	}
+
+/**
+ * Checks to see if a file extension has been parsed by the Router, or if the
+ * HTTP_ACCEPT_TYPE has matches only one content type with the supported extensions.
+ * If there is only one matching type between the supported content types & extensions,
+ * and the requested mime-types, RequestHandler::$ext is set to that value.
+ *
+ * @param Controller $controller A reference to the controller
+ * @return void
+ * @see Router::parseExtensions()
+ */
+	public function initialize(Controller $controller) {
+		if (isset($this->request->params['ext'])) {
+			$this->ext = $this->request->params['ext'];
+		}
+		if (empty($this->ext) || $this->ext === 'html') {
+			$this->_setExtension();
+		}
+		$this->params = $controller->request->params;
+		if (!empty($this->settings['viewClassMap'])) {
+			$this->viewClassMap($this->settings['viewClassMap']);
+		}
+	}
+
+/**
+ * Set the extension based on the accept headers.
+ * Compares the accepted types and configured extensions.
+ * If there is one common type, that is assigned as the ext/content type
+ * for the response.
+ * Type with the highest weight will be set. If the highest weight has more
+ * then one type matching the extensions, the order in which extensions are specified
+ * determines which type will be set.
+ *
+ * If html is one of the preferred types, no content type will be set, this
+ * is to avoid issues with browsers that prefer html and several other content types.
+ *
+ * @return void
+ */
+	protected function _setExtension() {
+		$accept = $this->request->parseAccept();
+		if (empty($accept)) {
+			return;
+		}
+
+		$accepts = $this->response->mapType($accept);
+		$preferedTypes = current($accepts);
+		if (array_intersect($preferedTypes, array('html', 'xhtml'))) {
+			return;
+		}
+
+		$extensions = Router::extensions();
+		foreach ($accepts as $types) {
+			$ext = array_intersect($extensions, $types);
+			if ($ext) {
+				$this->ext = current($ext);
+				break;
+			}
+		}
+	}
+
+/**
+ * The startup method of the RequestHandler enables several automatic behaviors
+ * related to the detection of certain properties of the HTTP request, including:
+ *
+ * - Disabling layout rendering for Ajax requests (based on the HTTP_X_REQUESTED_WITH header)
+ * - If Router::parseExtensions() is enabled, the layout and template type are
+ *   switched based on the parsed extension or Accept-Type header. For example, if `controller/action.xml`
+ *   is requested, the view path becomes `app/View/Controller/xml/action.ctp`. Also if
+ *   `controller/action` is requested with `Accept-Type: application/xml` in the headers
+ *   the view path will become `app/View/Controller/xml/action.ctp`. Layout and template
+ *   types will only switch to mime-types recognized by CakeResponse. If you need to declare
+ *   additional mime-types, you can do so using CakeResponse::type() in your controllers beforeFilter()
+ *   method.
+ * - If a helper with the same name as the extension exists, it is added to the controller.
+ * - If the extension is of a type that RequestHandler understands, it will set that
+ *   Content-type in the response header.
+ * - If the XML data is POSTed, the data is parsed into an XML object, which is assigned
+ *   to the $data property of the controller, which can then be saved to a model object.
+ *
+ * @param Controller $controller A reference to the controller
+ * @return void
+ */
+	public function startup(Controller $controller) {
+		$controller->request->params['isAjax'] = $this->request->is('ajax');
+		$isRecognized = (
+			!in_array($this->ext, array('html', 'htm')) &&
+			$this->response->getMimeType($this->ext)
+		);
+
+		if (!empty($this->ext) && $isRecognized) {
+			$this->renderAs($controller, $this->ext);
+		} elseif ($this->request->is('ajax')) {
+			$this->renderAs($controller, 'ajax');
+		} elseif (empty($this->ext) || in_array($this->ext, array('html', 'htm'))) {
+			$this->respondAs('html', array('charset' => Configure::read('App.encoding')));
+		}
+
+		foreach ($this->_inputTypeMap as $type => $handler) {
+			if ($this->requestedWith($type)) {
+				$input = (array)call_user_func_array(array($controller->request, 'input'), $handler);
+				$controller->request->data = $input;
+			}
+		}
+	}
+
+/**
+ * Helper method to parse xml input data, due to lack of anonymous functions
+ * this lives here.
+ *
+ * @param string $xml XML string.
+ * @return array Xml array data
+ */
+	public function convertXml($xml) {
+		try {
+			$xml = Xml::build($xml, array('readFile' => false));
+			if (isset($xml->data)) {
+				return Xml::toArray($xml->data);
+			}
+			return Xml::toArray($xml);
+		} catch (XmlException $e) {
+			return array();
+		}
+	}
+
+/**
+ * Handles (fakes) redirects for Ajax requests using requestAction()
+ * Modifies the $_POST and $_SERVER['REQUEST_METHOD'] to simulate a new GET request.
+ *
+ * @param Controller $controller A reference to the controller
+ * @param string|array $url A string or array containing the redirect location
+ * @param int|array $status HTTP Status for redirect
+ * @param bool $exit Whether to exit script, defaults to `true`.
+ * @return void
+ */
+	public function beforeRedirect(Controller $controller, $url, $status = null, $exit = true) {
+		if (!$this->request->is('ajax')) {
+			return;
+		}
+		if (empty($url)) {
+			return;
+		}
+		$_SERVER['REQUEST_METHOD'] = 'GET';
+		foreach ($_POST as $key => $val) {
+			unset($_POST[$key]);
+		}
+		if (is_array($url)) {
+			$url = Router::url($url + array('base' => false));
+		}
+		if (!empty($status)) {
+			$statusCode = $this->response->httpCodes($status);
+			if (is_array($statusCode)) {
+				$code = key($statusCode);
+				$this->response->statusCode($code);
+			}
+		}
+		$this->response->body($this->requestAction($url, array('return', 'bare' => false)));
+		$this->response->send();
+		$this->_stop();
+	}
+
+/**
+ * Checks if the response can be considered different according to the request
+ * headers, and the caching response headers. If it was not modified, then the
+ * render process is skipped. And the client will get a blank response with a
+ * "304 Not Modified" header.
+ *
+ * @param Controller $controller Controller instance.
+ * @return bool False if the render process should be aborted.
+ */
+	public function beforeRender(Controller $controller) {
+		if ($this->settings['checkHttpCache'] && $this->response->checkNotModified($this->request)) {
+			return false;
+		}
+	}
+
+/**
+ * Returns true if the current HTTP request is Ajax, false otherwise
+ *
+ * @return bool True if call is Ajax
+ * @deprecated 3.0.0 Use `$this->request->is('ajax')` instead.
+ */
+	public function isAjax() {
+		return $this->request->is('ajax');
+	}
+
+/**
+ * Returns true if the current HTTP request is coming from a Flash-based client
+ *
+ * @return bool True if call is from Flash
+ * @deprecated 3.0.0 Use `$this->request->is('flash')` instead.
+ */
+	public function isFlash() {
+		return $this->request->is('flash');
+	}
+
+/**
+ * Returns true if the current request is over HTTPS, false otherwise.
+ *
+ * @return bool True if call is over HTTPS
+ * @deprecated 3.0.0 Use `$this->request->is('ssl')` instead.
+ */
+	public function isSSL() {
+		return $this->request->is('ssl');
+	}
+
+/**
+ * Returns true if the current call accepts an XML response, false otherwise
+ *
+ * @return bool True if client accepts an XML response
+ */
+	public function isXml() {
+		return $this->prefers('xml');
+	}
+
+/**
+ * Returns true if the current call accepts an RSS response, false otherwise
+ *
+ * @return bool True if client accepts an RSS response
+ */
+	public function isRss() {
+		return $this->prefers('rss');
+	}
+
+/**
+ * Returns true if the current call accepts an Atom response, false otherwise
+ *
+ * @return bool True if client accepts an RSS response
+ */
+	public function isAtom() {
+		return $this->prefers('atom');
+	}
+
+/**
+ * Returns true if user agent string matches a mobile web browser, or if the
+ * client accepts WAP content.
+ *
+ * @return bool True if user agent is a mobile web browser
+ */
+	public function isMobile() {
+		return $this->request->is('mobile') || $this->accepts('wap');
+	}
+
+/**
+ * Returns true if the client accepts WAP content
+ *
+ * @return bool
+ */
+	public function isWap() {
+		return $this->prefers('wap');
+	}
+
+/**
+ * Returns true if the current call a POST request
+ *
+ * @return bool True if call is a POST
+ * @deprecated 3.0.0 Use $this->request->is('post'); from your controller.
+ */
+	public function isPost() {
+		return $this->request->is('post');
+	}
+
+/**
+ * Returns true if the current call a PUT request
+ *
+ * @return bool True if call is a PUT
+ * @deprecated 3.0.0 Use $this->request->is('put'); from your controller.
+ */
+	public function isPut() {
+		return $this->request->is('put');
+	}
+
+/**
+ * Returns true if the current call a GET request
+ *
+ * @return bool True if call is a GET
+ * @deprecated 3.0.0 Use $this->request->is('get'); from your controller.
+ */
+	public function isGet() {
+		return $this->request->is('get');
+	}
+
+/**
+ * Returns true if the current call a DELETE request
+ *
+ * @return bool True if call is a DELETE
+ * @deprecated 3.0.0 Use $this->request->is('delete'); from your controller.
+ */
+	public function isDelete() {
+		return $this->request->is('delete');
+	}
+
+/**
+ * Gets Prototype version if call is Ajax, otherwise empty string.
+ * The Prototype library sets a special "Prototype version" HTTP header.
+ *
+ * @return string|bool When Ajax the prototype version of component making the call otherwise false
+ */
+	public function getAjaxVersion() {
+		$httpX = env('HTTP_X_PROTOTYPE_VERSION');
+		return ($httpX === null) ? false : $httpX;
+	}
+
+/**
+ * Adds/sets the Content-type(s) for the given name. This method allows
+ * content-types to be mapped to friendly aliases (or extensions), which allows
+ * RequestHandler to automatically respond to requests of that type in the
+ * startup method.
+ *
+ * @param string $name The name of the Content-type, i.e. "html", "xml", "css"
+ * @param string|array $type The Content-type or array of Content-types assigned to the name,
+ *    i.e. "text/html", or "application/xml"
+ * @return void
+ * @deprecated 3.0.0 Use `$this->response->type()` instead.
+ */
+	public function setContent($name, $type = null) {
+		$this->response->type(array($name => $type));
+	}
+
+/**
+ * Gets the server name from which this request was referred
+ *
+ * @return string Server address
+ * @deprecated 3.0.0 Use $this->request->referer() from your controller instead
+ */
+	public function getReferer() {
+		return $this->request->referer(false);
+	}
+
+/**
+ * Gets remote client IP
+ *
+ * @param bool $safe Use safe = false when you think the user might manipulate
+ *   their HTTP_CLIENT_IP header. Setting $safe = false will also look at HTTP_X_FORWARDED_FOR
+ * @return string Client IP address
+ * @deprecated 3.0.0 Use $this->request->clientIp() from your, controller instead.
+ */
+	public function getClientIP($safe = true) {
+		return $this->request->clientIp($safe);
+	}
+
+/**
+ * Determines which content types the client accepts. Acceptance is based on
+ * the file extension parsed by the Router (if present), and by the HTTP_ACCEPT
+ * header. Unlike CakeRequest::accepts() this method deals entirely with mapped content types.
+ *
+ * Usage:
+ *
+ * `$this->RequestHandler->accepts(array('xml', 'html', 'json'));`
+ *
+ * Returns true if the client accepts any of the supplied types.
+ *
+ * `$this->RequestHandler->accepts('xml');`
+ *
+ * Returns true if the client accepts xml.
+ *
+ * @param string|array $type Can be null (or no parameter), a string type name, or an
+ *   array of types
+ * @return mixed If null or no parameter is passed, returns an array of content
+ *   types the client accepts. If a string is passed, returns true
+ *   if the client accepts it. If an array is passed, returns true
+ *   if the client accepts one or more elements in the array.
+ * @see RequestHandlerComponent::setContent()
+ */
+	public function accepts($type = null) {
+		$accepted = $this->request->accepts();
+
+		if (!$type) {
+			return $this->mapType($accepted);
+		}
+		if (is_array($type)) {
+			foreach ($type as $t) {
+				$t = $this->mapAlias($t);
+				if (in_array($t, $accepted)) {
+					return true;
+				}
+			}
+			return false;
+		}
+		if (is_string($type)) {
+			return in_array($this->mapAlias($type), $accepted);
+		}
+		return false;
+	}
+
+/**
+ * Determines the content type of the data the client has sent (i.e. in a POST request)
+ *
+ * @param string|array $type Can be null (or no parameter), a string type name, or an array of types
+ * @return mixed If a single type is supplied a boolean will be returned. If no type is provided
+ *   The mapped value of CONTENT_TYPE will be returned. If an array is supplied the first type
+ *   in the request content type will be returned.
+ */
+	public function requestedWith($type = null) {
+		if (
+			!$this->request->is('patch') &&
+			!$this->request->is('post') &&
+			!$this->request->is('put') &&
+			!$this->request->is('delete')
+		) {
+			return null;
+		}
+		if (is_array($type)) {
+			foreach ($type as $t) {
+				if ($this->requestedWith($t)) {
+					return $t;
+				}
+			}
+			return false;
+		}
+
+		list($contentType) = explode(';', env('CONTENT_TYPE'));
+		if ($contentType === '') {
+			list($contentType) = explode(';', CakeRequest::header('CONTENT_TYPE'));
+		}
+		if (!$type) {
+			return $this->mapType($contentType);
+		}
+		if (is_string($type)) {
+			return ($type === $this->mapType($contentType));
+		}
+	}
+
+/**
+ * Determines which content-types the client prefers. If no parameters are given,
+ * the single content-type that the client most likely prefers is returned. If $type is
+ * an array, the first item in the array that the client accepts is returned.
+ * Preference is determined primarily by the file extension parsed by the Router
+ * if provided, and secondarily by the list of content-types provided in
+ * HTTP_ACCEPT.
+ *
+ * @param string|array $type An optional array of 'friendly' content-type names, i.e.
+ *   'html', 'xml', 'js', etc.
+ * @return mixed If $type is null or not provided, the first content-type in the
+ *    list, based on preference, is returned. If a single type is provided
+ *    a boolean will be returned if that type is preferred.
+ *    If an array of types are provided then the first preferred type is returned.
+ *    If no type is provided the first preferred type is returned.
+ * @see RequestHandlerComponent::setContent()
+ */
+	public function prefers($type = null) {
+		$acceptRaw = $this->request->parseAccept();
+
+		if (empty($acceptRaw)) {
+			return $this->ext;
+		}
+		$accepts = $this->mapType(array_shift($acceptRaw));
+
+		if (!$type) {
+			if (empty($this->ext) && !empty($accepts)) {
+				return $accepts[0];
+			}
+			return $this->ext;
+		}
+
+		$types = (array)$type;
+
+		if (count($types) === 1) {
+			if (!empty($this->ext)) {
+				return in_array($this->ext, $types);
+			}
+			return in_array($types[0], $accepts);
+		}
+
+		$intersect = array_values(array_intersect($accepts, $types));
+		if (empty($intersect)) {
+			return false;
+		}
+		return $intersect[0];
+	}
+
+/**
+ * Sets the layout and template paths for the content type defined by $type.
+ *
+ * ### Usage:
+ *
+ * Render the response as an 'ajax' response.
+ *
+ * `$this->RequestHandler->renderAs($this, 'ajax');`
+ *
+ * Render the response as an xml file and force the result as a file download.
+ *
+ * `$this->RequestHandler->renderAs($this, 'xml', array('attachment' => 'myfile.xml');`
+ *
+ * @param Controller $controller A reference to a controller object
+ * @param string $type Type of response to send (e.g: 'ajax')
+ * @param array $options Array of options to use
+ * @return void
+ * @see RequestHandlerComponent::setContent()
+ * @see RequestHandlerComponent::respondAs()
+ */
+	public function renderAs(Controller $controller, $type, $options = array()) {
+		$defaults = array('charset' => 'UTF-8');
+
+		if (Configure::read('App.encoding') !== null) {
+			$defaults['charset'] = Configure::read('App.encoding');
+		}
+		$options += $defaults;
+
+		if ($type === 'ajax') {
+			$controller->layout = $this->ajaxLayout;
+			return $this->respondAs('html', $options);
+		}
+
+		$pluginDot = null;
+		$viewClassMap = $this->viewClassMap();
+		if (array_key_exists($type, $viewClassMap)) {
+			list($pluginDot, $viewClass) = pluginSplit($viewClassMap[$type], true);
+		} else {
+			$viewClass = Inflector::classify($type);
+		}
+		$viewName = $viewClass . 'View';
+		if (!class_exists($viewName)) {
+			App::uses($viewName, $pluginDot . 'View');
+		}
+		if (class_exists($viewName)) {
+			$controller->viewClass = $viewClass;
+		} elseif (empty($this->_renderType)) {
+			$controller->viewPath .= DS . $type;
+		} else {
+			$controller->viewPath = preg_replace(
+				"/([\/\\\\]{$this->_renderType})$/",
+				DS . $type,
+				$controller->viewPath
+			);
+		}
+		$this->_renderType = $type;
+		$controller->layoutPath = $type;
+
+		if ($this->response->getMimeType($type)) {
+			$this->respondAs($type, $options);
+		}
+
+		$helper = ucfirst($type);
+
+		if (!in_array($helper, $controller->helpers) && empty($controller->helpers[$helper])) {
+			App::uses('AppHelper', 'View/Helper');
+			App::uses($helper . 'Helper', 'View/Helper');
+			if (class_exists($helper . 'Helper')) {
+				$controller->helpers[] = $helper;
+			}
+		}
+	}
+
+/**
+ * Sets the response header based on type map index name. This wraps several methods
+ * available on CakeResponse. It also allows you to use Content-Type aliases.
+ *
+ * @param string|array $type Friendly type name, i.e. 'html' or 'xml', or a full content-type,
+ *    like 'application/x-shockwave'.
+ * @param array $options If $type is a friendly type name that is associated with
+ *    more than one type of content, $index is used to select which content-type to use.
+ * @return bool Returns false if the friendly type name given in $type does
+ *    not exist in the type map, or if the Content-type header has
+ *    already been set by this method.
+ * @see RequestHandlerComponent::setContent()
+ */
+	public function respondAs($type, $options = array()) {
+		$defaults = array('index' => null, 'charset' => null, 'attachment' => false);
+		$options = $options + $defaults;
+
+		$cType = $type;
+		if (strpos($type, '/') === false) {
+			$cType = $this->response->getMimeType($type);
+		}
+		if (is_array($cType)) {
+			if (isset($cType[$options['index']])) {
+				$cType = $cType[$options['index']];
+			}
+
+			if ($this->prefers($cType)) {
+				$cType = $this->prefers($cType);
+			} else {
+				$cType = $cType[0];
+			}
+		}
+
+		if (!$type) {
+			return false;
+		}
+		if (empty($this->request->params['requested'])) {
+			$this->response->type($cType);
+		}
+		if (!empty($options['charset'])) {
+			$this->response->charset($options['charset']);
+		}
+		if (!empty($options['attachment'])) {
+			$this->response->download($options['attachment']);
+		}
+		return true;
+	}
+
+/**
+ * Returns the current response type (Content-type header), or null if not alias exists
+ *
+ * @return mixed A string content type alias, or raw content type if no alias map exists,
+ *	otherwise null
+ */
+	public function responseType() {
+		return $this->mapType($this->response->type());
+	}
+
+/**
+ * Maps a content-type back to an alias
+ *
+ * @param string|array $cType Either a string content type to map, or an array of types.
+ * @return string|array Aliases for the types provided.
+ * @deprecated 3.0.0 Use $this->response->mapType() in your controller instead.
+ */
+	public function mapType($cType) {
+		return $this->response->mapType($cType);
+	}
+
+/**
+ * Maps a content type alias back to its mime-type(s)
+ *
+ * @param string|array $alias String alias to convert back into a content type. Or an array of aliases to map.
+ * @return string|null Null on an undefined alias. String value of the mapped alias type. If an
+ *   alias maps to more than one content type, the first one will be returned.
+ */
+	public function mapAlias($alias) {
+		if (is_array($alias)) {
+			return array_map(array($this, 'mapAlias'), $alias);
+		}
+		$type = $this->response->getMimeType($alias);
+		if ($type) {
+			if (is_array($type)) {
+				return $type[0];
+			}
+			return $type;
+		}
+		return null;
+	}
+
+/**
+ * Add a new mapped input type. Mapped input types are automatically
+ * converted by RequestHandlerComponent during the startup() callback.
+ *
+ * @param string $type The type alias being converted, ie. json
+ * @param array $handler The handler array for the type. The first index should
+ *    be the handling callback, all other arguments should be additional parameters
+ *    for the handler.
+ * @return void
+ * @throws CakeException
+ */
+	public function addInputType($type, $handler) {
+		if (!is_array($handler) || !isset($handler[0]) || !is_callable($handler[0])) {
+			throw new CakeException(__d('cake_dev', 'You must give a handler callback.'));
+		}
+		$this->_inputTypeMap[$type] = $handler;
+	}
+
+/**
+ * Getter/setter for viewClassMap
+ *
+ * @param array|string $type The type string or array with format `array('type' => 'viewClass')` to map one or more
+ * @param array $viewClass The viewClass to be used for the type without `View` appended
+ * @return array|string Returns viewClass when only string $type is set, else array with viewClassMap
+ */
+	public function viewClassMap($type = null, $viewClass = null) {
+		if (!$viewClass && is_string($type) && isset($this->_viewClassMap[$type])) {
+			return $this->_viewClassMap[$type];
+		}
+		if (is_string($type)) {
+			$this->_viewClassMap[$type] = $viewClass;
+		} elseif (is_array($type)) {
+			foreach ($type as $key => $value) {
+				$this->viewClassMap($key, $value);
+			}
+		}
+		return $this->_viewClassMap;
+	}
+
+}
diff --git a/web/api/lib/Cake/Core/App.php b/web/api/lib/Cake/Core/App.php
index 8696a485a..5aeac3024 100644
--- a/web/api/lib/Cake/Core/App.php
+++ b/web/api/lib/Cake/Core/App.php
@@ -591,7 +591,7 @@ class App {
  *
  * @param string|array $type The type of Class if passed as a string, or all params can be passed as
  *   a single array to $type.
- * @param string $name Name of the Class or a unique name for the file
+ * @param string|array $name Name of the Class or a unique name for the file
  * @param bool|array $parent boolean true if Class Parent should be searched, accepts key => value
  *   array('parent' => $parent, 'file' => $file, 'search' => $search, 'ext' => '$ext');
  *   $ext allows setting the extension of the file name
@@ -891,7 +891,7 @@ class App {
 /**
  * Increases the PHP "memory_limit" ini setting by the specified amount
  * in kilobytes
- *  
+ *
  * @param string $additionalKb Number in kilobytes
  * @return void
  */
diff --git a/web/api/lib/Cake/Core/Configure.php b/web/api/lib/Cake/Core/Configure.php
index cba018c75..901606cd2 100644
--- a/web/api/lib/Cake/Core/Configure.php
+++ b/web/api/lib/Cake/Core/Configure.php
@@ -114,6 +114,9 @@ class Configure {
 				class_exists('Debugger');
 				class_exists('CakeText');
 			}
+			if (!defined('TESTS')) {
+				define('TESTS', APP . 'Test' . DS);
+			}
 		}
 	}
 
diff --git a/web/api/lib/Cake/Event/CakeEventManager.php b/web/api/lib/Cake/Event/CakeEventManager.php
index e2d9276e6..020304ccc 100644
--- a/web/api/lib/Cake/Event/CakeEventManager.php
+++ b/web/api/lib/Cake/Event/CakeEventManager.php
@@ -15,6 +15,7 @@
  */
 
 App::uses('CakeEventListener', 'Event');
+App::uses('CakeEvent', 'Event');
 
 /**
  * The event manager is responsible for keeping track of event listeners, passing the correct
@@ -80,7 +81,7 @@ class CakeEventManager {
 /**
  * Adds a new listener to an event. Listeners
  *
- * @param callback|CakeEventListener $callable PHP valid callback type or instance of CakeEventListener to be called
+ * @param callable|CakeEventListener $callable PHP valid callback type or instance of CakeEventListener to be called
  * when the event named with $eventKey is triggered. If a CakeEventListener instance is passed, then the `implementedEvents`
  * method will be called on the object to register the declared events individually as methods to be managed by this class.
  * It is possible to define multiple event handlers per event name.
@@ -145,7 +146,7 @@ class CakeEventManager {
  *
  * @param array $function the array taken from a handler definition for an event
  * @param CakeEventListener $object The handler object
- * @return callback
+ * @return callable
  */
 	protected function _extractCallable($function, $object) {
 		$method = $function['callable'];
@@ -160,7 +161,7 @@ class CakeEventManager {
 /**
  * Removes a listener from the active listeners.
  *
- * @param callback|CakeEventListener $callable any valid PHP callback type or an instance of CakeEventListener
+ * @param callable|CakeEventListener $callable any valid PHP callback type or an instance of CakeEventListener
  * @param string $eventKey The event unique identifier name with which the callback has been associated
  * @return void
  */
diff --git a/web/api/lib/Cake/I18n/L10n.php b/web/api/lib/Cake/I18n/L10n.php
index da2f012cb..b82c08d24 100644
--- a/web/api/lib/Cake/I18n/L10n.php
+++ b/web/api/lib/Cake/I18n/L10n.php
@@ -137,6 +137,7 @@ class L10n {
 		/* Latvian */ 'lav' => 'lv',
 		/* Limburgish */ 'lim' => 'li',
 		/* Lithuanian */ 'lit' => 'lt',
+		/* Luxembourgish */ 'ltz' => 'lb',
 		/* Macedonian */ 'mkd' => 'mk',
 		/* Macedonian - bibliographic */ 'mac' => 'mk',
 		/* Malaysian */ 'msa' => 'ms',
@@ -255,6 +256,7 @@ class L10n {
 		'fi' => array('language' => 'Finnish', 'locale' => 'fin', 'localeFallback' => 'fin', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'fi-fi' => array('language' => 'Finnish (Finland)', 'locale' => 'fi_fi', 'localeFallback' => 'fin', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'fo' => array('language' => 'Faeroese', 'locale' => 'fao', 'localeFallback' => 'fao', 'charset' => 'utf-8', 'direction' => 'ltr'),
+		'fo-fo' => array('language' => 'Faeroese (Faroe Island)', 'locale' => 'fo_fo', 'localeFallback' => 'fao', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'fr' => array('language' => 'French (Standard)', 'locale' => 'fra', 'localeFallback' => 'fra', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'fr-be' => array('language' => 'French (Belgium)', 'locale' => 'fr_be', 'localeFallback' => 'fra', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'fr-ca' => array('language' => 'French (Canadian)', 'locale' => 'fr_ca', 'localeFallback' => 'fra', 'charset' => 'utf-8', 'direction' => 'ltr'),
@@ -284,6 +286,7 @@ class L10n {
 		'ko-kp' => array('language' => 'Korea (North)', 'locale' => 'ko_kp', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'),
 		'ko-kr' => array('language' => 'Korea (South)', 'locale' => 'ko_kr', 'localeFallback' => 'kor', 'charset' => 'kr', 'direction' => 'ltr'),
 		'koi8-r' => array('language' => 'Russian', 'locale' => 'koi8_r', 'localeFallback' => 'rus', 'charset' => 'koi8-r', 'direction' => 'ltr'),
+		'lb' => array('language' => 'Luxembourgish', 'locale' => 'ltz', 'localeFallback' => 'ltz', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'li' => array('language' => 'Limburgish', 'locale' => 'lim', 'localeFallback' => 'nld', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'lt' => array('language' => 'Lithuanian', 'locale' => 'lit', 'localeFallback' => 'lit', 'charset' => 'utf-8', 'direction' => 'ltr'),
 		'lv' => array('language' => 'Latvian', 'locale' => 'lav', 'localeFallback' => 'lav', 'charset' => 'utf-8', 'direction' => 'ltr'),
diff --git a/web/api/lib/Cake/Log/CakeLog.php b/web/api/lib/Cake/Log/CakeLog.php
index 262292ddc..3b2cfb6cd 100644
--- a/web/api/lib/Cake/Log/CakeLog.php
+++ b/web/api/lib/Cake/Log/CakeLog.php
@@ -22,7 +22,7 @@ App::uses('LogEngineCollection', 'Log');
 
 /**
  * Logs messages to configured Log adapters.
- * 
+ *
  * One or more adapters
  * can be configured using CakeLogs's methods.
  *
@@ -84,7 +84,7 @@ class CakeLog {
 /**
  * Default log levels as detailed in RFC 5424
  * http://tools.ietf.org/html/rfc5424
- * 
+ *
  * Windows has fewer levels, thus notice, info and debug are the same.
  * https://bugs.php.net/bug.php?id=18090
  *
@@ -398,7 +398,7 @@ class CakeLog {
  *
  * @param int|string $type Type of message being written. When value is an integer
  *    or a string matching the recognized levels, then it will
- *    be treated log levels. Otherwise it's treated as scope.
+ *    be treated as a log level. Otherwise it's treated as a scope.
  * @param string $message Message content to log
  * @param string|array $scope The scope(s) a log message is being created in.
  *    See CakeLog::config() for more information on logging scopes.
diff --git a/web/api/lib/Cake/Model/Behavior/ContainableBehavior.php b/web/api/lib/Cake/Model/Behavior/ContainableBehavior.php
index a494dd7ca..57ae597da 100644
--- a/web/api/lib/Cake/Model/Behavior/ContainableBehavior.php
+++ b/web/api/lib/Cake/Model/Behavior/ContainableBehavior.php
@@ -306,7 +306,7 @@ class ContainableBehavior extends ModelBehavior {
 				if (!$optionKey && is_string($key) && preg_match('/^[a-z(]/', $key) && (!isset($Model->{$key}) || !is_object($Model->{$key}))) {
 					$option = 'fields';
 					$val = array($key);
-					if ($key{0} === '(') {
+					if ($key[0] === '(') {
 						$val = preg_split('/\s*,\s*/', substr($key, 1, -1));
 					} elseif (preg_match('/ASC|DESC$/', $key)) {
 						$option = 'order';
diff --git a/web/api/lib/Cake/Model/Behavior/TranslateBehavior.php b/web/api/lib/Cake/Model/Behavior/TranslateBehavior.php
index 1b9b51116..e4bb53734 100644
--- a/web/api/lib/Cake/Model/Behavior/TranslateBehavior.php
+++ b/web/api/lib/Cake/Model/Behavior/TranslateBehavior.php
@@ -344,7 +344,7 @@ class TranslateBehavior extends ModelBehavior {
 	public function afterFind(Model $Model, $results, $primary = false) {
 		$Model->virtualFields = $this->runtime[$Model->alias]['virtualFields'];
 
-		$this->runtime[$Model->alias]['virtualFields'] = $this->runtime[$Model->alias]['fields'] = array();
+		$this->runtime[$Model->alias]['virtualFields'] = array();
 		if (!empty($this->runtime[$Model->alias]['restoreFields'])) {
 			$this->runtime[$Model->alias]['fields'] = $this->runtime[$Model->alias]['restoreFields'];
 			unset($this->runtime[$Model->alias]['restoreFields']);
diff --git a/web/api/lib/Cake/Model/Behavior/TreeBehavior.php b/web/api/lib/Cake/Model/Behavior/TreeBehavior.php
index 9fc12e706..d944007be 100644
--- a/web/api/lib/Cake/Model/Behavior/TreeBehavior.php
+++ b/web/api/lib/Cake/Model/Behavior/TreeBehavior.php
@@ -225,7 +225,7 @@ class TreeBehavior extends ModelBehavior {
 		}
 		$parentIsSet = array_key_exists($parent, $Model->data[$Model->alias]);
 
-		if (!$Model->id || !$Model->exists()) {
+		if (!$Model->id || !$Model->exists($Model->getID())) {
 			if ($parentIsSet && $Model->data[$Model->alias][$parent]) {
 				$parentNode = $this->_getNode($Model, $Model->data[$Model->alias][$parent]);
 				if (!$parentNode) {
diff --git a/web/api/lib/Cake/Model/CakeSchema.php b/web/api/lib/Cake/Model/CakeSchema.php
index 3d11b3641..f2cb4e73d 100644
--- a/web/api/lib/Cake/Model/CakeSchema.php
+++ b/web/api/lib/Cake/Model/CakeSchema.php
@@ -420,6 +420,7 @@ class CakeSchema extends CakeObject {
 						$type = $value;
 						$value = array('type' => $type);
 					}
+					$value['type'] = addslashes($value['type']);
 					$col = "\t\t'{$field}' => array('type' => '" . $value['type'] . "', ";
 					unset($value['type']);
 					$col .= implode(', ', $this->_values($value));
@@ -624,17 +625,19 @@ class CakeSchema extends CakeObject {
 			if ($Obj->primaryKey === $name && !$hasPrimaryAlready && !isset($value['key'])) {
 				$value['key'] = 'primary';
 			}
-			if (!isset($db->columns[$value['type']])) {
-				trigger_error(__d('cake_dev', 'Schema generation error: invalid column type %s for %s.%s does not exist in DBO', $value['type'], $Obj->name, $name), E_USER_NOTICE);
-				continue;
-			} else {
-				$defaultCol = $db->columns[$value['type']];
-				if (isset($defaultCol['limit']) && $defaultCol['limit'] == $value['length']) {
-					unset($value['length']);
-				} elseif (isset($defaultCol['length']) && $defaultCol['length'] == $value['length']) {
-					unset($value['length']);
+			if (substr($value['type'], 0, 4) !== 'enum') {
+				if (!isset($db->columns[$value['type']])) {
+					trigger_error(__d('cake_dev', 'Schema generation error: invalid column type %s for %s.%s does not exist in DBO', $value['type'], $Obj->name, $name), E_USER_NOTICE);
+					continue;
+				} else {
+					$defaultCol = $db->columns[$value['type']];
+					if (isset($defaultCol['limit']) && $defaultCol['limit'] == $value['length']) {
+						unset($value['length']);
+					} elseif (isset($defaultCol['length']) && $defaultCol['length'] == $value['length']) {
+						unset($value['length']);
+					}
+					unset($value['limit']);
 				}
-				unset($value['limit']);
 			}
 
 			if (isset($value['default']) && ($value['default'] === '' || ($value['default'] === false && $value['type'] !== 'boolean'))) {
diff --git a/web/api/lib/Cake/Model/Datasource/CakeSession.php b/web/api/lib/Cake/Model/Datasource/CakeSession.php
index fec94fcf3..e67731429 100644
--- a/web/api/lib/Cake/Model/Datasource/CakeSession.php
+++ b/web/api/lib/Cake/Model/Datasource/CakeSession.php
@@ -432,7 +432,7 @@ class CakeSession {
  * Writes value to given session variable name.
  *
  * @param string|array $name Name of variable
- * @param string $value Value to write
+ * @param mixed $value Value to write
  * @return bool True if the write was successful, false if the write failed
  */
 	public static function write($name, $value = null) {
@@ -575,7 +575,7 @@ class CakeSession {
 			$sessionConfig['cacheLimiter'] = 'must-revalidate';
 		}
 
-		if (empty($_SESSION)) {
+		if (empty($_SESSION) && !headers_sent() && (!function_exists('session_status') || session_status() !== PHP_SESSION_ACTIVE)) {
 			if (!empty($sessionConfig['ini']) && is_array($sessionConfig['ini'])) {
 				foreach ($sessionConfig['ini'] as $setting => $value) {
 					if (ini_set($setting, $value) === false) {
@@ -587,16 +587,18 @@ class CakeSession {
 		if (!empty($sessionConfig['handler']) && !isset($sessionConfig['handler']['engine'])) {
 			call_user_func_array('session_set_save_handler', $sessionConfig['handler']);
 		}
-		if (!empty($sessionConfig['handler']['engine'])) {
+		if (!empty($sessionConfig['handler']['engine']) && !headers_sent()) {
 			$handler = static::_getHandler($sessionConfig['handler']['engine']);
-			session_set_save_handler(
-				array($handler, 'open'),
-				array($handler, 'close'),
-				array($handler, 'read'),
-				array($handler, 'write'),
-				array($handler, 'destroy'),
-				array($handler, 'gc')
-			);
+			if (!function_exists('session_status') || session_status() !== PHP_SESSION_ACTIVE) {
+				session_set_save_handler(
+					array($handler, 'open'),
+					array($handler, 'close'),
+					array($handler, 'read'),
+					array($handler, 'write'),
+					array($handler, 'destroy'),
+					array($handler, 'gc')
+				);
+			}
 		}
 		Configure::write('Session', $sessionConfig);
 		static::$sessionTime = static::$time;
diff --git a/web/api/lib/Cake/Model/Datasource/Database/Mysql.php b/web/api/lib/Cake/Model/Datasource/Database/Mysql.php
index 7a13c3108..682c742f1 100644
--- a/web/api/lib/Cake/Model/Datasource/Database/Mysql.php
+++ b/web/api/lib/Cake/Model/Datasource/Database/Mysql.php
@@ -120,6 +120,7 @@ class Mysql extends DboSource {
 		'primary_key' => array('name' => 'NOT NULL AUTO_INCREMENT'),
 		'string' => array('name' => 'varchar', 'limit' => '255'),
 		'text' => array('name' => 'text'),
+		'enum' => array('name' => 'enum'),
 		'biginteger' => array('name' => 'bigint', 'limit' => '20'),
 		'integer' => array('name' => 'int', 'limit' => '11', 'formatter' => 'intval'),
 		'smallinteger' => array('name' => 'smallint', 'limit' => '6', 'formatter' => 'intval'),
@@ -305,7 +306,7 @@ class Mysql extends DboSource {
  * Query charset by collation
  *
  * @param string $name Collation name
- * @return string Character set name
+ * @return string|false Character set name
  */
 	public function getCharsetName($name) {
 		if ((bool)version_compare($this->getVersion(), "5", "<")) {
@@ -391,7 +392,7 @@ class Mysql extends DboSource {
  * @param array $fields The fields to update.
  * @param array $values The values to set.
  * @param mixed $conditions The conditions to use.
- * @return array
+ * @return bool
  */
 	public function update(Model $model, $fields = array(), $values = null, $conditions = null) {
 		if (!$this->_useAlias) {
@@ -545,7 +546,7 @@ class Mysql extends DboSource {
  *
  * @param array $compare Result of a CakeSchema::compare()
  * @param string $table The table name.
- * @return array Array of alter statements to make.
+ * @return string|false String of alter statements to make.
  */
 	public function alterSchema($compare, $table = null) {
 		if (!is_array($compare)) {
diff --git a/web/api/lib/Cake/Model/Datasource/Database/Postgres.php b/web/api/lib/Cake/Model/Datasource/Database/Postgres.php
index 2bf200fee..f81bee5b3 100644
--- a/web/api/lib/Cake/Model/Datasource/Database/Postgres.php
+++ b/web/api/lib/Cake/Model/Datasource/Database/Postgres.php
@@ -251,7 +251,7 @@ class Postgres extends DboSource {
 					'default' => preg_replace(
 						"/^'(.*)'$/",
 						"$1",
-						preg_replace('/::.*/', '', $c->default)
+						preg_replace('/::[\w\s]+/', '', $c->default)
 					),
 					'length' => $length,
 				);
@@ -765,10 +765,10 @@ class Postgres extends DboSource {
 /**
  * resultSet method
  *
- * @param array &$results The results
+ * @param PDOStatement $results The results
  * @return void
  */
-	public function resultSet(&$results) {
+	public function resultSet($results) {
 		$this->map = array();
 		$numFields = $results->columnCount();
 		$index = 0;
diff --git a/web/api/lib/Cake/Model/Datasource/Database/Sqlite.php b/web/api/lib/Cake/Model/Datasource/Database/Sqlite.php
index 2cf39c356..487868be4 100644
--- a/web/api/lib/Cake/Model/Datasource/Database/Sqlite.php
+++ b/web/api/lib/Cake/Model/Datasource/Database/Sqlite.php
@@ -179,7 +179,6 @@ class Sqlite extends DboSource {
 		);
 
 		foreach ($result as $column) {
-			$column = (array)$column;
 			$default = ($column['dflt_value'] === 'NULL') ? null : trim($column['dflt_value'], "'");
 
 			$fields[$column['name']] = array(
@@ -299,7 +298,7 @@ class Sqlite extends DboSource {
 /**
  * Generate ResultSet
  *
- * @param mixed $results The results to modify.
+ * @param PDOStatement $results The results to modify.
  * @return void
  */
 	public function resultSet($results) {
diff --git a/web/api/lib/Cake/Model/Datasource/DboSource.php b/web/api/lib/Cake/Model/Datasource/DboSource.php
index 40f682b17..ebfab0a97 100644
--- a/web/api/lib/Cake/Model/Datasource/DboSource.php
+++ b/web/api/lib/Cake/Model/Datasource/DboSource.php
@@ -109,7 +109,7 @@ class DboSource extends DataSource {
 /**
  * Result
  *
- * @var array
+ * @var array|PDOStatement
  */
 	protected $_result = null;
 
@@ -247,6 +247,13 @@ class DboSource extends DataSource {
  */
 	protected $_methodCacheChange = false;
 
+/**
+ * Map of the columns contained in a result.
+ *
+ * @var array
+ */
+	public $map = array();
+
 /**
  * Constructor
  *
@@ -272,6 +279,16 @@ class DboSource extends DataSource {
 		}
 	}
 
+/**
+ * Connects to the database.
+ *
+ * @return bool
+ */
+	public function connect() {
+		// This method is implemented in subclasses
+		return $this->connected;
+	}
+
 /**
  * Reconnects to database server with optional new settings
  *
@@ -350,6 +367,18 @@ class DboSource extends DataSource {
 			$column = $this->introspectType($data);
 		}
 
+		$isStringEnum = false;
+		if (strpos($column, "enum") === 0) {
+			$firstValue = null;
+			if (preg_match("/(enum\()(.*)(\))/i", $column, $acceptingValues)) {
+				$values = explode(",", $acceptingValues[2]);
+				$firstValue = $values[0];
+			}
+			if (is_string($firstValue)) {
+				$isStringEnum = true;
+			}
+		}
+
 		switch ($column) {
 			case 'binary':
 				return $this->_connection->quote($data, PDO::PARAM_LOB);
@@ -365,11 +394,12 @@ class DboSource extends DataSource {
 				if (is_float($data)) {
 					return str_replace(',', '.', strval($data));
 				}
-				if ((is_int($data) || $data === '0') || (
+				if (((is_int($data) || $data === '0') || (
 					is_numeric($data) &&
 					strpos($data, ',') === false &&
 					$data[0] != '0' &&
 					strpos($data, 'e') === false)
+					) && !$isStringEnum
 				) {
 					return $data;
 				}
@@ -619,6 +649,16 @@ class DboSource extends DataSource {
 		}
 	}
 
+/**
+ * Builds a map of the columns contained in a result
+ *
+ * @param PDOStatement $results The results to format.
+ * @return void
+ */
+	public function resultSet($results) {
+		// This method is implemented in subclasses
+	}
+
 /**
  * Returns a row from current resultset as an array
  *
@@ -913,7 +953,7 @@ class DboSource extends DataSource {
 				)
 			);
 		}
-		if (preg_match('/^[\w-_\s]*[\w-_]+/', $data)) {
+		if (preg_match('/^[\w\-_\s]*[\w\-_]+/', $data)) {
 			return $this->cacheMethod(__FUNCTION__, $cacheKey, $this->startQuote . $data . $this->endQuote);
 		}
 		return $this->cacheMethod(__FUNCTION__, $cacheKey, $data);
@@ -1076,7 +1116,7 @@ class DboSource extends DataSource {
 
 		for ($i = 0; $i < $count; $i++) {
 			$schema = $Model->schema();
-			$valueInsert[] = $this->value($values[$i], $Model->getColumnType($fields[$i]), isset($schema[$fields[$i]]) ? $schema[$fields[$i]]['null'] : true);
+			$valueInsert[] = $this->value($values[$i], $Model->getColumnType($fields[$i]), isset($schema[$fields[$i]]['null']) ? $schema[$fields[$i]]['null'] : true);
 			$fieldInsert[] = $this->name($fields[$i]);
 			if ($fields[$i] === $Model->primaryKey) {
 				$id = $values[$i];
@@ -1566,23 +1606,25 @@ class DboSource extends DataSource {
 		// Make one pass through children and collect by parent key
 		// Make second pass through parents and associate children
 		$mergedByFK = array();
-		foreach ($assocResultSet as $data) {
-			$fk = $data[$association][$foreignKey];
-			if (! array_key_exists($fk, $mergedByFK)) {
-				$mergedByFK[$fk] = array();
-			}
-			if (count($data) > 1) {
-				$data = array_merge($data[$association], $data);
-				unset($data[$association]);
-				foreach ($data as $key => $name) {
-					if (is_numeric($key)) {
-						$data[$association][] = $name;
-						unset($data[$key]);
-					}
+		if (is_array($assocResultSet)) {
+			foreach ($assocResultSet as $data) {
+				$fk = $data[$association][$foreignKey];
+				if (! array_key_exists($fk, $mergedByFK)) {
+					$mergedByFK[$fk] = array();
+				}
+				if (count($data) > 1) {
+					$data = array_merge($data[$association], $data);
+					unset($data[$association]);
+					foreach ($data as $key => $name) {
+						if (is_numeric($key)) {
+							$data[$association][] = $name;
+							unset($data[$key]);
+						}
+					}
+					$mergedByFK[$fk][] = $data;
+				} else {
+					$mergedByFK[$fk][] = $data[$association];
 				}
-				$mergedByFK[$fk][] = $data;
-			} else {
-				$mergedByFK[$fk][] = $data[$association];
 			}
 		}
 
@@ -2175,7 +2217,7 @@ class DboSource extends DataSource {
 			$update = $quoted . ' = ';
 
 			if ($quoteValues) {
-				$update .= $this->value($value, $Model->getColumnType($field), isset($schema[$field]) ? $schema[$field]['null'] : true);
+				$update .= $this->value($value, $Model->getColumnType($field), isset($schema[$field]['null']) ? $schema[$field]['null'] : true);
 			} elseif ($Model->getColumnType($field) === 'boolean' && (is_int($value) || is_bool($value))) {
 				$update .= $this->boolean($value, true);
 			} elseif (!$alias) {
@@ -2518,7 +2560,7 @@ class DboSource extends DataSource {
 		if (!empty($conditions)) {
 			return $conditions;
 		}
-		$exists = $Model->exists();
+		$exists = $Model->exists($Model->getID());
 		if (!$exists && ($conditions !== null || !empty($Model->__safeUpdateMode))) {
 			return false;
 		} elseif (!$exists) {
@@ -2576,7 +2618,12 @@ class DboSource extends DataSource {
 		$virtual = array();
 		foreach ($fields as $field) {
 			$virtualField = $this->name($alias . $this->virtualFieldSeparator . $field);
-			$expression = $this->_quoteFields($Model->getVirtualField($field));
+			$virtualFieldExpression = $Model->getVirtualField($field);
+			if (is_object($virtualFieldExpression) && $virtualFieldExpression->type == 'expression') {
+				$expression = $virtualFieldExpression->value;
+			} else {
+				$expression = $this->_quoteFields($virtualFieldExpression);
+			}
 			$virtual[] = '(' . $expression . ") {$this->alias} {$virtualField}";
 		}
 		return $virtual;
@@ -2885,7 +2932,12 @@ class DboSource extends DataSource {
 
 		if ($Model !== null) {
 			if ($Model->isVirtualField($key)) {
-				$key = $this->_quoteFields($Model->getVirtualField($key));
+				$virtualField = $Model->getVirtualField($key);
+				if (is_object($virtualField) && $virtualField->type == 'expression') {
+					$key = $virtualField->value;
+				} else {
+					$key = $this->_quoteFields($virtualField);
+				}
 				$virtual = true;
 			}
 
@@ -3034,12 +3086,12 @@ class DboSource extends DataSource {
 		if (!is_array($keys)) {
 			$keys = array($keys);
 		}
-
 		$keys = array_filter($keys);
 
 		$result = array();
 		while (!empty($keys)) {
-			list($key, $dir) = each($keys);
+			$key = key($keys);
+			$dir = current($keys);
 			array_shift($keys);
 
 			if (is_numeric($key)) {
@@ -3230,18 +3282,7 @@ class DboSource extends DataSource {
 			return (int)$length;
 		}
 		if (in_array($type, array('enum', 'set'))) {
-			$values = array_map(function ($value) {
-				return trim(trim($value), '\'"');
-			}, explode(',', $length));
-
-			$maxLength = 0;
-			foreach ($values as $key => $enumValue) {
-				$tmpLength = strlen($enumValue);
-				if ($tmpLength > $maxLength) {
-					$maxLength = $tmpLength;
-				}
-			}
-			return $maxLength;
+			return null;
 		}
 		return (int)$length;
 	}
@@ -3459,25 +3500,28 @@ class DboSource extends DataSource {
 			return null;
 		}
 
-		if (!isset($this->columns[$type])) {
+		if (!isset($this->columns[$type]) && substr($type, 0, 4) !== 'enum') {
 			trigger_error(__d('cake_dev', 'Column type %s does not exist', $type), E_USER_WARNING);
 			return null;
 		}
 
-		$real = $this->columns[$type];
-		$out = $this->name($name) . ' ' . $real['name'];
-
-		if (isset($column['length'])) {
-			$length = $column['length'];
-		} elseif (isset($column['limit'])) {
-			$length = $column['limit'];
-		} elseif (isset($real['length'])) {
-			$length = $real['length'];
-		} elseif (isset($real['limit'])) {
-			$length = $real['limit'];
-		}
-		if (isset($length)) {
-			$out .= '(' . $length . ')';
+		if (substr($type, 0, 4) === 'enum') {
+			$out = $this->name($name) . ' ' . $type;
+		} else {
+			$real = $this->columns[$type];
+			$out = $this->name($name) . ' ' . $real['name'];
+			if (isset($column['length'])) {
+				$length = $column['length'];
+			} elseif (isset($column['limit'])) {
+				$length = $column['limit'];
+			} elseif (isset($real['length'])) {
+				$length = $real['length'];
+			} elseif (isset($real['limit'])) {
+				$length = $real['limit'];
+			}
+			if (isset($length)) {
+				$out .= '(' . $length . ')';
+			}
 		}
 
 		if (($column['type'] === 'integer' || $column['type'] === 'float') && isset($column['default']) && $column['default'] === '') {
@@ -3500,7 +3544,7 @@ class DboSource extends DataSource {
 		} elseif (isset($column['null']) && $column['null'] === false) {
 			$out .= ' NOT NULL';
 		}
-		if ($type === 'timestamp' && isset($column['default']) && strtolower($column['default']) === 'current_timestamp') {
+		if (in_array($type, array('timestamp', 'datetime')) && isset($column['default']) && strtolower($column['default']) === 'current_timestamp') {
 			$out = str_replace(array("'CURRENT_TIMESTAMP'", "'current_timestamp'"), 'CURRENT_TIMESTAMP', $out);
 		}
 		return $this->_buildFieldParameters($out, $column, 'afterDefault');
diff --git a/web/api/lib/Cake/Model/Model.php b/web/api/lib/Cake/Model/Model.php
index cb0b6ef83..860ad5bdf 100644
--- a/web/api/lib/Cake/Model/Model.php
+++ b/web/api/lib/Cake/Model/Model.php
@@ -58,7 +58,7 @@ class Model extends CakeObject implements CakeEventListener {
 /**
  * Custom database table name, or null/false if no table association is desired.
  *
- * @var string
+ * @var string|false
  * @link https://book.cakephp.org/2.0/en/models/model-attributes.html#usetable
  */
 	public $useTable = null;
@@ -68,7 +68,7 @@ class Model extends CakeObject implements CakeEventListener {
  *
  * This field is also used in `find('list')` when called with no extra parameters in the fields list
  *
- * @var string
+ * @var string|false
  * @link https://book.cakephp.org/2.0/en/models/model-attributes.html#displayfield
  */
 	public $displayField = null;
@@ -84,7 +84,7 @@ class Model extends CakeObject implements CakeEventListener {
 /**
  * Container for the data that this model gets from persistent storage (usually, a database).
  *
- * @var array
+ * @var array|false
  * @link https://book.cakephp.org/2.0/en/models/model-attributes.html#data
  */
 	public $data = array();
@@ -632,7 +632,7 @@ class Model extends CakeObject implements CakeEventListener {
 /**
  * The ID of the model record that was last inserted.
  *
- * @var int
+ * @var int|string
  */
 	protected $_insertID = null;
 
@@ -699,7 +699,7 @@ class Model extends CakeObject implements CakeEventListener {
  *
  * @param bool|int|string|array $id Set this ID for this model on startup,
  * can also be an array of options, see above.
- * @param string $table Name of database table to use.
+ * @param string|false $table Name of database table to use.
  * @param string $ds DataSource connection name.
  */
 	public function __construct($id = false, $table = null, $ds = null) {
@@ -1196,7 +1196,7 @@ class Model extends CakeObject implements CakeEventListener {
  * a one-item, two-dimensional array using $one for a key and $two as its value.)
  *
  * @param string|array|SimpleXmlElement|DomNode $one Array or string of data
- * @param string $two Value string for the alternative indata method
+ * @param string|false $two Value string for the alternative indata method
  * @return array|null Data with all of $one's keys and values, otherwise null.
  * @link https://book.cakephp.org/2.0/en/models/saving-your-data.html
  */
@@ -1358,7 +1358,7 @@ class Model extends CakeObject implements CakeEventListener {
 					}
 				}
 
-				if (!isset($data[$val]) || isset($data[$val]) && (empty($data[$val]) || $data[$val][0] === '-')) {
+				if (!isset($data[$val]) || isset($data[$val]) && (empty($data[$val]) || substr($data[$val], 0, 1) === '-')) {
 					return null;
 				}
 
@@ -1614,7 +1614,7 @@ class Model extends CakeObject implements CakeEventListener {
  *
  * @param string|array $fields String of single field name, or an array of field names.
  * @param int|string $id The ID of the record to read
- * @return array Array of database fields, or false if not found
+ * @return array|false Array of database fields, or false if not found
  * @link https://book.cakephp.org/2.0/en/models/retrieving-your-data.html#model-read
  */
 	public function read($fields = null, $id = null) {
@@ -1648,7 +1648,7 @@ class Model extends CakeObject implements CakeEventListener {
  *
  * @param string $name The name of the field to get.
  * @param array $conditions SQL conditions (defaults to NULL).
- * @param string $order SQL ORDER BY fragment.
+ * @param string|array $order SQL ORDER BY fragment.
  * @return string|false Field content, or false if not found.
  * @link https://book.cakephp.org/2.0/en/models/retrieving-your-data.html#model-field
  */
@@ -1824,7 +1824,7 @@ class Model extends CakeObject implements CakeEventListener {
 			}
 		}
 
-		$exists = $this->exists();
+		$exists = $this->exists($this->getID());
 		$dateFields = array('modified', 'updated');
 
 		if (!$exists) {
@@ -1991,7 +1991,7 @@ class Model extends CakeObject implements CakeEventListener {
  */
 	protected function _isUUIDField($field) {
 		$field = $this->schema($field);
-		return $field['length'] == 36 && in_array($field['type'], array('string', 'binary', 'uuid'));
+		return $field !== null && $field['length'] == 36 && in_array($field['type'], array('string', 'binary', 'uuid'));
 	}
 
 /**
@@ -2696,7 +2696,7 @@ class Model extends CakeObject implements CakeEventListener {
 			return false;
 		}
 
-		if (!$this->exists()) {
+		if (!$this->exists($this->getID())) {
 			return false;
 		}
 
@@ -2801,7 +2801,7 @@ class Model extends CakeObject implements CakeEventListener {
 			list(, $joinModel) = pluginSplit($data['with']);
 			$Model = $this->{$joinModel};
 			$records = $Model->find('all', array(
-				'conditions' => array($Model->escapeField($data['foreignKey']) => $id),
+				'conditions' => $this->_getConditionsForDeletingLinks($Model, $id, $data),
 				'fields' => $Model->primaryKey,
 				'recursive' => -1,
 				'callbacks' => false
@@ -2815,6 +2815,19 @@ class Model extends CakeObject implements CakeEventListener {
 		}
 	}
 
+/**
+ * Returns the conditions to be applied to Model::find() when determining which HABTM records should be deleted via
+ * Model::_deleteLinks()
+ *
+ * @param Model $Model HABTM join model instance
+ * @param mixed $id The ID of the primary model which is being deleted
+ * @param array $relationshipConfig The relationship config defined on the primary model
+ * @return array
+ */
+	protected function _getConditionsForDeletingLinks(Model $Model, $id, array $relationshipConfig) {
+		return array($Model->escapeField($relationshipConfig['foreignKey']) => $id);
+	}
+
 /**
  * Deletes multiple model records based on a set of conditions.
  *
@@ -2997,7 +3010,7 @@ class Model extends CakeObject implements CakeEventListener {
  *
  * @param string $type Type of find operation (all / first / count / neighbors / list / threaded)
  * @param array $query Option fields (conditions / fields / joins / limit / offset / order / page / group / callbacks)
- * @return array|null Array of records, or Null on failure.
+ * @return array|int|null Array of records, int if the type is count, or Null on failure.
  * @link https://book.cakephp.org/2.0/en/models/retrieving-your-data.html
  */
 	public function find($type = 'first', $query = array()) {
@@ -3151,7 +3164,7 @@ class Model extends CakeObject implements CakeEventListener {
  * @param string $state Either "before" or "after"
  * @param array $query Query.
  * @param array $results Results.
- * @return int The number of records found, or false
+ * @return int|false The number of records found, or false
  * @see Model::find()
  */
 	protected function _findCount($state, $query, $results = array()) {
@@ -3495,7 +3508,7 @@ class Model extends CakeObject implements CakeEventListener {
  * Additionally it populates the validationErrors property of the model with the same array.
  *
  * @param array|string $options An optional array of custom options to be made available in the beforeValidate callback
- * @return array Array of invalid fields and their error messages
+ * @return array|bool Array of invalid fields and their error messages
  * @see Model::validates()
  */
 	public function invalidFields($options = array()) {
diff --git a/web/api/lib/Cake/Model/ModelValidator.php b/web/api/lib/Cake/Model/ModelValidator.php
index f968e2cff..406c0816c 100644
--- a/web/api/lib/Cake/Model/ModelValidator.php
+++ b/web/api/lib/Cake/Model/ModelValidator.php
@@ -257,7 +257,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
 			}
 		}
 
-		$exists = $model->exists();
+		$exists = $model->exists($model->getID());
 		$methods = $this->getMethods();
 		$fields = $this->_validationList($fieldList);
 
@@ -280,7 +280,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
  * why the rule failed
  *
  * @param string $field The name of the field to invalidate
- * @param string $message Validation message explaining why the rule failed, defaults to true.
+ * @param string|bool $message Validation message explaining why the rule failed, defaults to true.
  * @return void
  */
 	public function invalidate($field, $message = true) {
@@ -594,7 +594,7 @@ class ModelValidator implements ArrayAccess, IteratorAggregate, Countable {
 		$this->_parseRules();
 		if ($rule === null) {
 			unset($this->_fields[$field]);
-		} else {
+		} elseif (array_key_exists($field, $this->_fields)) {
 			$this->_fields[$field]->removeRule($rule);
 		}
 		return $this;
diff --git a/web/api/lib/Cake/Model/Permission.php b/web/api/lib/Cake/Model/Permission.php
index 617f00465..dc3dcf526 100644
--- a/web/api/lib/Cake/Model/Permission.php
+++ b/web/api/lib/Cake/Model/Permission.php
@@ -146,7 +146,7 @@ class Permission extends AppModel {
 						case -1:
 							return false;
 						case 0:
-							continue;
+							break;
 						case 1:
 							return true;
 					}
@@ -190,7 +190,7 @@ class Permission extends AppModel {
 				$actions = array('_' . $actions);
 			}
 			foreach ($actions as $action) {
-				if ($action{0} !== '_') {
+				if ($action[0] !== '_') {
 					$action = '_' . $action;
 				}
 				if (!in_array($action, $permKeys, true)) {
diff --git a/web/api/lib/Cake/Network/CakeRequest.php b/web/api/lib/Cake/Network/CakeRequest.php
index 228e46e2e..adc0b99b6 100644
--- a/web/api/lib/Cake/Network/CakeRequest.php
+++ b/web/api/lib/Cake/Network/CakeRequest.php
@@ -25,6 +25,11 @@ App::uses('Hash', 'Utility');
  *
  * `$request['controller']` or `$request->controller`.
  *
+ * @property string $plugin     The plugin handling the request. Will be `null` when there is no plugin.
+ * @property string $controller The controller handling the current request.
+ * @property string $action     The action handling the current request.
+ * @property array $named       Array of named parameters parsed from the URL.
+ * @property array $pass        Array of passed arguments parsed from the URL.
  * @package       Cake.Network
  */
 class CakeRequest implements ArrayAccess {
@@ -241,6 +246,7 @@ class CakeRequest implements ArrayAccess {
  * @return string URI The CakePHP request path that is being accessed.
  */
 	protected function _url() {
+		$uri = '';
 		if (!empty($_SERVER['PATH_INFO'])) {
 			return $_SERVER['PATH_INFO'];
 		} elseif (isset($_SERVER['REQUEST_URI']) && strpos($_SERVER['REQUEST_URI'], '://') === false) {
@@ -250,7 +256,10 @@ class CakeRequest implements ArrayAccess {
 			if ($qPosition !== false && strpos($_SERVER['REQUEST_URI'], '://') > $qPosition) {
 				$uri = $_SERVER['REQUEST_URI'];
 			} else {
-				$uri = substr($_SERVER['REQUEST_URI'], strlen(Configure::read('App.fullBaseUrl')));
+				$baseUrl = Configure::read('App.fullBaseUrl');
+				if (substr($_SERVER['REQUEST_URI'], 0, strlen($baseUrl)) === $baseUrl) {
+					$uri = substr($_SERVER['REQUEST_URI'], strlen($baseUrl));
+				}
 			}
 		} elseif (isset($_SERVER['PHP_SELF']) && isset($_SERVER['SCRIPT_NAME'])) {
 			$uri = str_replace($_SERVER['SCRIPT_NAME'], '', $_SERVER['PHP_SELF']);
@@ -303,7 +312,7 @@ class CakeRequest implements ArrayAccess {
 			return $this->base = $base;
 		}
 
-		if (!$baseUrl) {
+		if (empty($baseUrl)) {
 			$base = dirname(env('PHP_SELF'));
 			// Clean up additional / which cause following code to fail..
 			$base = preg_replace('#/+#', '/', $base);
@@ -502,14 +511,18 @@ class CakeRequest implements ArrayAccess {
  * defined with CakeRequest::addDetector(). Any detector can be called
  * as `is($type)` or `is$Type()`.
  *
- * @param string|array $type The type of request you want to check. If an array
+ * @param string|string[] $type The type of request you want to check. If an array
  *   this method will return true if the request matches any type.
  * @return bool Whether or not the request is the type you are checking.
  */
 	public function is($type) {
 		if (is_array($type)) {
-			$result = array_map(array($this, 'is'), $type);
-			return count(array_filter($result)) > 0;
+			foreach ($type as $_type) {
+				if ($this->is($_type)) {
+					return true;
+				}
+			}
+			return false;
 		}
 		$type = strtolower($type);
 		if (!isset($this->_detectors[$type])) {
@@ -637,8 +650,12 @@ class CakeRequest implements ArrayAccess {
  * @see CakeRequest::is()
  */
 	public function isAll(array $types) {
-		$result = array_filter(array_map(array($this, 'is'), $types));
-		return count($result) === count($types);
+		foreach ($types as $type) {
+			if (!$this->is($type)) {
+				return false;
+			}
+		}
+		return true;
 	}
 
 /**
diff --git a/web/api/lib/Cake/Network/CakeResponse.php b/web/api/lib/Cake/Network/CakeResponse.php
index 982398e87..cd24b2aad 100644
--- a/web/api/lib/Cake/Network/CakeResponse.php
+++ b/web/api/lib/Cake/Network/CakeResponse.php
@@ -331,7 +331,7 @@ class CakeResponse {
  * Content type to send. This can be an 'extension' that will be transformed using the $_mimetypes array
  * or a complete mime-type
  *
- * @var int
+ * @var string
  */
 	protected $_contentType = 'text/html';
 
@@ -374,7 +374,7 @@ class CakeResponse {
  * Holds all the cache directives that will be converted
  * into headers when sending the request
  *
- * @var string
+ * @var array
  */
 	protected $_cacheDirectives = array();
 
@@ -672,8 +672,9 @@ class CakeResponse {
  *
  *        For more on HTTP status codes see: http://www.w3.org/Protocols/rfc2616/rfc2616-sec6.html#sec6.1
  *
- * @return mixed associative array of the HTTP codes as keys, and the message
- *    strings as values, or null of the given $code does not exist.
+ * @return array|null|true associative array of the HTTP codes as keys, and the message
+ *    strings as values, or null of the given $code does not exist. `true` if `$code` is
+ *    an array of valid codes.
  * @throws CakeException If an attempt is made to add an invalid status code
  */
 	public function httpCodes($code = null) {
@@ -717,8 +718,8 @@ class CakeResponse {
  *
  * e.g `type(array('jpg' => 'text/plain'));`
  *
- * @param string $contentType Content type key.
- * @return mixed current content type or false if supplied an invalid content type
+ * @param array|string|null $contentType Content type key.
+ * @return string|false current content type or false if supplied an invalid content type
  */
 	public function type($contentType = null) {
 		if ($contentType === null) {
@@ -854,7 +855,7 @@ class CakeResponse {
 		}
 
 		$this->maxAge($time);
-		if (!$time) {
+		if ((int)$time === 0) {
 			$this->_setCacheControl();
 		}
 		return (bool)$public;
@@ -1160,18 +1161,19 @@ class CakeResponse {
  * @return bool whether the response was marked as not modified or not.
  */
 	public function checkNotModified(CakeRequest $request) {
-		$etags = preg_split('/\s*,\s*/', $request->header('If-None-Match'), null, PREG_SPLIT_NO_EMPTY);
+		$ifNoneMatchHeader = $request->header('If-None-Match');
+		$etags = array();
+		if (is_string($ifNoneMatchHeader)) {
+			$etags = preg_split('/\s*,\s*/', $ifNoneMatchHeader, null, PREG_SPLIT_NO_EMPTY);
+		}
 		$modifiedSince = $request->header('If-Modified-Since');
+		$checks = array();
 		if ($responseTag = $this->etag()) {
-			$etagMatches = in_array('*', $etags) || in_array($responseTag, $etags);
+			$checks[] = in_array('*', $etags) || in_array($responseTag, $etags);
 		}
 		if ($modifiedSince) {
-			$timeMatches = strtotime($this->modified()) === strtotime($modifiedSince);
+			$checks[] = strtotime($this->modified()) === strtotime($modifiedSince);
 		}
-		if (!isset($etagMatches, $timeMatches)) {
-		return false;
-		}
-		$checks = compact('etagMatches', 'timeMatches');
 		if (empty($checks)) {
 			return false;
 		}
@@ -1227,7 +1229,7 @@ class CakeResponse {
  *
  * `$this->cookie((array) $options)`
  *
- * @param array $options Either null to get all cookies, string for a specific cookie
+ * @param array|string $options Either null to get all cookies, string for a specific cookie
  *  or array to set cookie.
  * @return mixed
  */
@@ -1315,11 +1317,7 @@ class CakeResponse {
 				$result[] = array('preg' => '@.@', 'original' => '*');
 				continue;
 			}
-
-			$original = $preg = $domain;
-			if (strpos($domain, '://') === false) {
-				$preg = ($requestIsSSL ? 'https://' : 'http://') . $domain;
-			}
+			$original = $domain;
 			$preg = '@' . str_replace('*', '.*', $domain) . '@';
 			$result[] = compact('original', 'preg');
 		}
@@ -1467,7 +1465,7 @@ class CakeResponse {
 		$file->open('rb');
 
 		$end = $start = false;
-		if ($range) {
+		if ($range && is_array($range)) {
 			list($start, $end) = $range;
 		}
 		if ($start !== false) {
diff --git a/web/api/lib/Cake/Network/CakeSocket.php b/web/api/lib/Cake/Network/CakeSocket.php
index a4c472fea..7b159ab0c 100644
--- a/web/api/lib/Cake/Network/CakeSocket.php
+++ b/web/api/lib/Cake/Network/CakeSocket.php
@@ -9,11 +9,11 @@
  * For full copyright and license information, please see the LICENSE.txt
  * Redistributions of files must retain the above copyright notice.
  *
- * @copyright     Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
- * @link          https://cakephp.org CakePHP(tm) Project
- * @package       Cake.Network
- * @since         CakePHP(tm) v 1.2.0
- * @license       https://opensource.org/licenses/mit-license.php MIT License
+ * @copyright	  Copyright (c) Cake Software Foundation, Inc. (https://cakefoundation.org)
+ * @link		  https://cakephp.org CakePHP(tm) Project
+ * @package		  Cake.Network
+ * @since		  CakePHP(tm) v 1.2.0
+ * @license		  https://opensource.org/licenses/mit-license.php MIT License
  */
 
 App::uses('Validation', 'Utility');
@@ -23,7 +23,7 @@ App::uses('Validation', 'Utility');
  *
  * Core base class for network communication.
  *
- * @package       Cake.Network
+ * @package		  Cake.Network
  */
 class CakeSocket {
 
@@ -139,7 +139,9 @@ class CakeSocket {
 			'tlsv1_1_client' => 'STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT',
 			'tlsv1_2_client' => 'STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT',
 			'tlsv1_1_server' => 'STREAM_CRYPTO_METHOD_TLSv1_1_SERVER',
-			'tlsv1_2_server' => 'STREAM_CRYPTO_METHOD_TLSv1_2_SERVER'
+			'tlsv1_2_server' => 'STREAM_CRYPTO_METHOD_TLSv1_2_SERVER',
+			'tlsv1_3_server' => 'STREAM_CRYPTO_METHOD_TLSv1_3_SERVER',
+			'tlsv1_3_client' => 'STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT'
 		);
 		foreach ($conditionalCrypto as $key => $const) {
 			if (defined($const)) {
@@ -154,6 +156,18 @@ class CakeSocket {
 		if (isset($this->_encryptMethods['tlsv1_2_server'])) {
 			$this->_encryptMethods['tls_server'] = STREAM_CRYPTO_METHOD_TLS_SERVER | STREAM_CRYPTO_METHOD_TLSv1_1_SERVER | STREAM_CRYPTO_METHOD_TLSv1_2_SERVER;
 		}
+		if (isset($this->_encryptMethods['tlsv1_3_client'])) {
+			$this->_encryptMethods['tls_client'] = STREAM_CRYPTO_METHOD_TLS_CLIENT |
+				STREAM_CRYPTO_METHOD_TLSv1_1_CLIENT |
+				STREAM_CRYPTO_METHOD_TLSv1_2_CLIENT |
+				STREAM_CRYPTO_METHOD_TLSv1_3_CLIENT;
+		}
+		if (isset($this->_encryptMethods['tlsv1_3_server'])) {
+			$this->_encryptMethods['tls_server'] = STREAM_CRYPTO_METHOD_TLS_SERVER |
+				STREAM_CRYPTO_METHOD_TLSv1_1_SERVER |
+				STREAM_CRYPTO_METHOD_TLSv1_2_SERVER |
+				STREAM_CRYPTO_METHOD_TLSv1_3_SERVER;
+		}
 		// @codingStandardsIgnoreEnd
 	}
 
diff --git a/web/api/lib/Cake/Network/Email/CakeEmail.php b/web/api/lib/Cake/Network/Email/CakeEmail.php
index bb4b47f65..ee4da73d9 100644
--- a/web/api/lib/Cake/Network/Email/CakeEmail.php
+++ b/web/api/lib/Cake/Network/Email/CakeEmail.php
@@ -589,7 +589,7 @@ class CakeEmail {
  */
 	protected function _setEmail($varName, $email, $name) {
 		if (!is_array($email)) {
-			$this->_validateEmail($email);
+			$this->_validateEmail($email, $varName);
 			if ($name === null) {
 				$name = $email;
 			}
@@ -601,7 +601,7 @@ class CakeEmail {
 			if (is_int($key)) {
 				$key = $value;
 			}
-			$this->_validateEmail($key);
+			$this->_validateEmail($key, $varName);
 			$list[$key] = $value;
 		}
 		$this->{$varName} = $list;
@@ -611,11 +611,12 @@ class CakeEmail {
 /**
  * Validate email address
  *
- * @param string $email Email
+ * @param string $email Email address to validate
+ * @param string $context Which property was set
  * @return void
  * @throws SocketException If email address does not validate
  */
-	protected function _validateEmail($email) {
+	protected function _validateEmail($email, $context) {
 		if ($this->_emailPattern === null) {
 			if (filter_var($email, FILTER_VALIDATE_EMAIL)) {
 				return;
@@ -623,7 +624,10 @@ class CakeEmail {
 		} elseif (preg_match($this->_emailPattern, $email)) {
 			return;
 		}
-		throw new SocketException(__d('cake_dev', 'Invalid email: "%s"', $email));
+		if ($email == '') {
+			throw new SocketException(__d('cake_dev', 'The email set for "%s" is empty.', $context));
+		}
+		throw new SocketException(__d('cake_dev', 'Invalid email set for "%s". You passed "%s".', $context, $email));
 	}
 
 /**
@@ -659,7 +663,7 @@ class CakeEmail {
  */
 	protected function _addEmail($varName, $email, $name) {
 		if (!is_array($email)) {
-			$this->_validateEmail($email);
+			$this->_validateEmail($email, $varName);
 			if ($name === null) {
 				$name = $email;
 			}
@@ -671,7 +675,7 @@ class CakeEmail {
 			if (is_int($key)) {
 				$key = $value;
 			}
-			$this->_validateEmail($key);
+			$this->_validateEmail($key, $varName);
 			$list[$key] = $value;
 		}
 		$this->{$varName} = array_merge($this->{$varName}, $list);
@@ -788,7 +792,7 @@ class CakeEmail {
 		}
 		if ($this->_messageId !== false) {
 			if ($this->_messageId === true) {
-				$headers['Message-ID'] = '<' . str_replace('-', '', CakeText::UUID()) . '@' . $this->_domain . '>';
+				$headers['Message-ID'] = '<' . str_replace('-', '', CakeText::uuid()) . '@' . $this->_domain . '>';
 			} else {
 				$headers['Message-ID'] = $this->_messageId;
 			}
diff --git a/web/api/lib/Cake/Network/Http/HttpSocket.php b/web/api/lib/Cake/Network/Http/HttpSocket.php
index 1643bcbfd..624b97a25 100644
--- a/web/api/lib/Cake/Network/Http/HttpSocket.php
+++ b/web/api/lib/Cake/Network/Http/HttpSocket.php
@@ -251,7 +251,7 @@ class HttpSocket extends CakeSocket {
  * method and provide a more granular interface.
  *
  * @param string|array $request Either an URI string, or an array defining host/uri
- * @return mixed false on error, HttpSocketResponse on success
+ * @return false|HttpSocketResponse false on error, HttpSocketResponse on success
  * @throws SocketException
  */
 	public function request($request = array()) {
@@ -449,18 +449,16 @@ class HttpSocket extends CakeSocket {
  * @param string|array $uri URI to request. Either a string uri, or a uri array, see HttpSocket::_parseUri()
  * @param array $query Querystring parameters to append to URI
  * @param array $request An indexed array with indexes such as 'method' or uri
- * @return mixed Result of request, either false on failure or the response to the request.
+ * @return false|HttpSocketResponse Result of request, either false on failure or the response to the request.
  */
 	public function get($uri = null, $query = array(), $request = array()) {
-		if (!empty($query)) {
-			$uri = $this->_parseUri($uri, $this->config['request']['uri']);
-			if (isset($uri['query'])) {
-				$uri['query'] = array_merge($uri['query'], $query);
-			} else {
-				$uri['query'] = $query;
-			}
-			$uri = $this->_buildUri($uri);
+		$uri = $this->_parseUri($uri, $this->config['request']['uri']);
+		if (isset($uri['query'])) {
+			$uri['query'] = array_merge($uri['query'], $query);
+		} else {
+			$uri['query'] = $query;
 		}
+		$uri = $this->_buildUri($uri);
 
 		$request = Hash::merge(array('method' => 'GET', 'uri' => $uri), $request);
 		return $this->request($request);
@@ -475,18 +473,16 @@ class HttpSocket extends CakeSocket {
  * @param string|array $uri URI to request. Either a string URI, or a URI array, see HttpSocket::_parseUri()
  * @param array $query Querystring parameters to append to URI
  * @param array $request An indexed array with indexes such as 'method' or uri
- * @return mixed Result of request, either false on failure or the response to the request.
+ * @return false|HttpSocketResponse Result of request, either false on failure or the response to the request.
  */
 	public function head($uri = null, $query = array(), $request = array()) {
-		if (!empty($query)) {
-			$uri = $this->_parseUri($uri, $this->config['request']['uri']);
-			if (isset($uri['query'])) {
-				$uri['query'] = array_merge($uri['query'], $query);
-			} else {
-				$uri['query'] = $query;
-			}
-			$uri = $this->_buildUri($uri);
+		$uri = $this->_parseUri($uri, $this->config['request']['uri']);
+		if (isset($uri['query'])) {
+			$uri['query'] = array_merge($uri['query'], $query);
+		} else {
+			$uri['query'] = $query;
 		}
+		$uri = $this->_buildUri($uri);
 
 		$request = Hash::merge(array('method' => 'HEAD', 'uri' => $uri), $request);
 		return $this->request($request);
@@ -507,7 +503,7 @@ class HttpSocket extends CakeSocket {
  * @param string|array $uri URI to request. See HttpSocket::_parseUri()
  * @param array $data Array of request body data keys and values.
  * @param array $request An indexed array with indexes such as 'method' or uri
- * @return mixed Result of request, either false on failure or the response to the request.
+ * @return false|HttpSocketResponse Result of request, either false on failure or the response to the request.
  */
 	public function post($uri = null, $data = array(), $request = array()) {
 		$request = Hash::merge(array('method' => 'POST', 'uri' => $uri, 'body' => $data), $request);
@@ -520,7 +516,7 @@ class HttpSocket extends CakeSocket {
  * @param string|array $uri URI to request, See HttpSocket::_parseUri()
  * @param array $data Array of request body data keys and values.
  * @param array $request An indexed array with indexes such as 'method' or uri
- * @return mixed Result of request
+ * @return false|HttpSocketResponse Result of request
  */
 	public function put($uri = null, $data = array(), $request = array()) {
 		$request = Hash::merge(array('method' => 'PUT', 'uri' => $uri, 'body' => $data), $request);
@@ -533,7 +529,7 @@ class HttpSocket extends CakeSocket {
  * @param string|array $uri URI to request, See HttpSocket::_parseUri()
  * @param array $data Array of request body data keys and values.
  * @param array $request An indexed array with indexes such as 'method' or uri
- * @return mixed Result of request
+ * @return false|HttpSocketResponse Result of request
  */
 	public function patch($uri = null, $data = array(), $request = array()) {
 		$request = Hash::merge(array('method' => 'PATCH', 'uri' => $uri, 'body' => $data), $request);
@@ -546,7 +542,7 @@ class HttpSocket extends CakeSocket {
  * @param string|array $uri URI to request (see {@link _parseUri()})
  * @param array $data Array of request body data keys and values.
  * @param array $request An indexed array with indexes such as 'method' or uri
- * @return mixed Result of request
+ * @return false|HttpSocketResponse Result of request
  */
 	public function delete($uri = null, $data = array(), $request = array()) {
 		$request = Hash::merge(array('method' => 'DELETE', 'uri' => $uri, 'body' => $data), $request);
@@ -593,7 +589,7 @@ class HttpSocket extends CakeSocket {
 			if (is_array($port)) {
 				$port = $port[0];
 			}
-			if ($url{0} === '/') {
+			if ($url[0] === '/') {
 				$url = $this->config['request']['uri']['host'] . ':' . $port . $url;
 			}
 			if (!preg_match('/^.+:\/\/|\*|^\//', $url)) {
diff --git a/web/api/lib/Cake/Routing/Router.php b/web/api/lib/Cake/Routing/Router.php
index 3d252b32e..368a2ceff 100644
--- a/web/api/lib/Cake/Routing/Router.php
+++ b/web/api/lib/Cake/Routing/Router.php
@@ -1055,7 +1055,7 @@ class Router {
  *    an array of arguments to convert into a query string.
  * @param array $extra Extra querystring parameters.
  * @param bool $escape Whether or not to use escaped &
- * @return array
+ * @return string|null
  */
 	public static function queryString($q, $extra = array(), $escape = false) {
 		if (empty($q) && empty($extra)) {
diff --git a/web/api/lib/Cake/Test/Case/AllControllerTest.php b/web/api/lib/Cake/Test/Case/AllControllerTest.php
index 8af92e8a5..e6f5644d7 100644
--- a/web/api/lib/Cake/Test/Case/AllControllerTest.php
+++ b/web/api/lib/Cake/Test/Case/AllControllerTest.php
@@ -38,6 +38,7 @@ class AllControllersTest extends PHPUnit_Framework_TestSuite {
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'PagesControllerTest.php');
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'ComponentTest.php');
 		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'ControllerMergeVarsTest.php');
+		$suite->addTestFile(CORE_TEST_CASES . DS . 'Controller' . DS . 'ApplicationControllerTest.php');
 		return $suite;
 	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Cache/CacheTest.php b/web/api/lib/Cake/Test/Case/Cache/CacheTest.php
index 5a36aeef7..0dfd60209 100644
--- a/web/api/lib/Cake/Test/Case/Cache/CacheTest.php
+++ b/web/api/lib/Cake/Test/Case/Cache/CacheTest.php
@@ -189,8 +189,12 @@ class CacheTest extends CakeTestCase {
 		$result = Cache::config('tests', array('engine' => 'File', 'path' => TMP . 'tests'));
 		$this->assertEquals(Cache::settings('tests'), $result['settings']);
 
-		Cache::config('sessions', $_cacheConfigSessions['settings']);
-		Cache::config('tests', $_cacheConfigTests['settings']);
+		if ($_cacheConfigSessions !== false) {
+			Cache::config('sessions', $_cacheConfigSessions['settings']);
+		}
+		if ($_cacheConfigTests !== false) {
+			Cache::config('tests', $_cacheConfigTests['settings']);
+		}
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php b/web/api/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
index 56eb15c65..050985ea2 100644
--- a/web/api/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
+++ b/web/api/lib/Cake/Test/Case/Console/Command/Task/ExtractTaskTest.php
@@ -380,25 +380,12 @@ class ExtractTaskTest extends CakeTestCase {
 
 		$this->Task->execute();
 		$result = file_get_contents($this->path . DS . 'default.pot');
-
-		$pattern = preg_quote('#Model/PersisterOne.php:validation for field title#', '\\');
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = preg_quote('#Model/PersisterOne.php:validation for field body#', '\\');
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#msgid "Post title is required"#';
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#msgid "You may enter up to %s chars \(minimum is %s chars\)"#';
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#msgid "Post body is required"#';
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#msgid "Post body is super required"#';
-		$this->assertRegExp($pattern, $result);
-
+		$this->assertContains('Model/PersisterOne.php:validation for field title', $result);
+		$this->assertContains('Model/PersisterOne.php:validation for field body', $result);
+		$this->assertContains('msgid "Post title is required"', $result);
+		$this->assertContains('msgid "You may enter up to %s chars (minimum is %s chars)"', $result);
+		$this->assertContains('msgid "Post body is required"', $result);
+		$this->assertContains('msgid "Post body is super required"', $result);
 		$this->assertContains('msgid "double \\"quoted\\" validation"', $result, 'Strings with quotes not handled correctly');
 		$this->assertContains("msgid \"single 'quoted' validation\"", $result, 'Strings with quotes not handled correctly');
 	}
@@ -429,21 +416,11 @@ class ExtractTaskTest extends CakeTestCase {
 
 		$this->Task->execute();
 		$result = file_get_contents($this->path . DS . 'test_plugin.pot');
-
-		$pattern = preg_quote('#Plugin/TestPlugin/Model/TestPluginPost.php:validation for field title#', '\\');
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = preg_quote('#Plugin/TestPlugin/Model/TestPluginPost.php:validation for field body#', '\\');
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#msgid "Post title is required"#';
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#msgid "Post body is required"#';
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#msgid "Post body is super required"#';
-		$this->assertRegExp($pattern, $result);
+		$this->assertContains('Plugin/TestPlugin/Model/TestPluginPost.php:validation for field title', $result);
+		$this->assertContains('Plugin/TestPlugin/Model/TestPluginPost.php:validation for field body', $result);
+		$this->assertContains('msgid "Post title is required"', $result);
+		$this->assertContains('msgid "Post body is required"', $result);
+		$this->assertContains('msgid "Post body is super required"', $result);
 	}
 
 /**
@@ -468,24 +445,12 @@ class ExtractTaskTest extends CakeTestCase {
 
 		$this->Task->execute();
 		$result = file_get_contents($this->path . DS . 'test_plugin.pot');
-
-		$pattern = preg_quote('#Model/TestPluginPost.php:validation for field title#', '\\');
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = preg_quote('#Model/TestPluginPost.php:validation for field body#', '\\');
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#msgid "Post title is required"#';
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#msgid "Post body is required"#';
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#msgid "Post body is super required"#';
-		$this->assertRegExp($pattern, $result);
-
-		$pattern = '#Plugin/TestPlugin/Model/TestPluginPost.php:validation for field title#';
-		$this->assertNotRegExp($pattern, $result);
+		$this->assertContains('Model/TestPluginPost.php:validation for field title', $result);
+		$this->assertContains('Model/TestPluginPost.php:validation for field body', $result);
+		$this->assertContains('msgid "Post title is required"', $result);
+		$this->assertContains('msgid "Post body is required"', $result);
+		$this->assertContains('msgid "Post body is super required"', $result);
+		$this->assertNotContains('Plugin/TestPlugin/Model/TestPluginPost.php:validation for field title', $result);
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Controller/ApplicationControllerTest.php b/web/api/lib/Cake/Test/Case/Controller/ApplicationControllerTest.php
new file mode 100644
index 000000000..2487aa4db
--- /dev/null
+++ b/web/api/lib/Cake/Test/Case/Controller/ApplicationControllerTest.php
@@ -0,0 +1,104 @@
+<?php
+App::uses('AppController', 'Controller');
+/**
+ * TransSessionIdController class for testing session.use_trans_sid=1.
+ *
+ * @package       Cake.Test.Case.Controller
+ */
+class TransSessionIdController extends AppController {
+
+/**
+ * Constructor.
+ *
+ * @param CakeRequest $request Request object for this controller.
+ * @param CakeResponse $response Response object for this controller.
+ */
+	public function __construct($request = null, $response = null) {
+		parent::__construct($request, $response);
+		$ini = Configure::read('Session.ini');
+		$ini['session.use_cookies'] = 0;
+		$ini['session.use_only_cookies'] = 0;
+		$ini['session.use_trans_sid'] = 1;
+		Configure::write('Session.ini', $ini);
+	}
+
+/**
+ * For testing redirect URL with session.use_trans_sid=1.
+ *
+ * @return CakeResponse|null
+ */
+	public function next() {
+		$sessionName = session_name();
+		$sessionId = $this->Session->id();
+		return $this->redirect(array(
+			'controller' => 'trans_session_id',
+			'action' => 'next_step',
+			'?' => array(
+				$sessionName => $sessionId,
+			),
+		));
+	}
+
+}
+
+/**
+ * ApplicationControllerTest class for testing controllers by using ControllerTestCase.
+ *
+ * ApplicationControllerTest extends ControllerTestCase in contrast
+ * with ControllerTest that extends CakeTestCase.
+ *
+ * @package       Cake.Test.Case.Controller
+ */
+class ApplicationControllerTest extends ControllerTestCase {
+
+/**
+ * setupDown method
+ *
+ * @return void
+ */
+	public function setUp() {
+		CakeSession::destroy();
+		parent::setUp();
+	}
+
+/**
+ * tearDown method
+ *
+ * @return void
+ */
+	public function tearDown() {
+		CakeSession::destroy();
+		parent::tearDown();
+	}
+
+/**
+ * Tests the redirect and session config with use_trans_sid=1.
+ *
+ * @return void
+ */
+	public function testRedirect() {
+		$sessionId = 'o7k64tlhil9pakp89j6d8ovlqk';
+		$this->testAction('/trans_session_id/next?CAKEPHP=' . $sessionId);
+		$this->assertContains('/trans_session_id/next_step?CAKEPHP=' . $sessionId, $this->headers['Location']);
+		$expectedConfig = array(
+			'cookie' => 'CAKEPHP',
+			'timeout' => 240,
+			'ini' => array(
+				'session.use_trans_sid' => 1,
+				'session.cookie_path' => '/',
+				'session.cookie_lifetime' => 14400,
+				'session.name' => 'CAKEPHP',
+				'session.gc_maxlifetime' => 14400,
+				'session.cookie_httponly' => 1,
+				'session.use_cookies' => 0,
+				'session.use_only_cookies' => 0,
+			),
+			'defaults' => 'php',
+			'cookieTimeout' => 240,
+			'cacheLimiter' => 'must-revalidate',
+		);
+		$actualConfig = Configure::read('Session');
+		$this->assertEquals($expectedConfig, $actualConfig);
+	}
+
+}
diff --git a/web/api/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php b/web/api/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
index 17b50cbea..bc0e49cf2 100644
--- a/web/api/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
+++ b/web/api/lib/Cake/Test/Case/Controller/Component/RequestHandlerComponentTest.php
@@ -399,6 +399,20 @@ class RequestHandlerComponentTest extends CakeTestCase {
 		$this->assertFalse(is_object($this->Controller->data));
 	}
 
+/**
+ * testStartupCallbackJson method
+ *
+ * @return void
+ */
+	public function testStartupCallbackJson() {
+		$_SERVER['REQUEST_METHOD'] = 'PUT';
+		$_SERVER['CONTENT_TYPE'] = 'application/json';
+		$this->Controller->request = $this->getMock('CakeRequest', array('_readInput'));
+		$this->RequestHandler->startup($this->Controller);
+		$this->assertTrue(is_array($this->Controller->data));
+		$this->assertFalse(is_object($this->Controller->data));
+	}
+
 /**
  * testStartupCallback with charset.
  *
diff --git a/web/api/lib/Cake/Test/Case/I18n/MultibyteTest.php b/web/api/lib/Cake/Test/Case/I18n/MultibyteTest.php
index 7859aa4f2..48a3fde68 100644
--- a/web/api/lib/Cake/Test/Case/I18n/MultibyteTest.php
+++ b/web/api/lib/Cake/Test/Case/I18n/MultibyteTest.php
@@ -7623,25 +7623,58 @@ class MultibyteTest extends CakeTestCase {
 		$expected = 'ԀԂԄԆԈԊԌԎԐԒ';
 		$this->assertEquals($expected, $result);
 
-		$string = 'աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆև';
-		$result = mb_strtoupper($string);
-		$expected = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՎՏՐՑՒՓՔՕՖև';
-		$this->assertEquals($expected, $result);
-
 		$string = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀჁჂჃჄჅ';
 		$result = mb_strtoupper($string);
 		$expected = 'ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀჁჂჃჄჅ';
 		$this->assertEquals($expected, $result);
 
-		$string = 'ḁḃḅḇḉḋḍḏḑḓḕḗḙḛḝḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿṁṃṅṇṉṋṍṏṑṓṕṗṙṛṝṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿẁẃẅẇẉẋẍẏẑẓẕẖẗẘẙẚạảấầẩẫậắằẳẵặẹẻẽếềểễệỉịọỏốồổỗộớờởỡợụủứừửữựỳỵỷỹ';
-		$result = mb_strtoupper($string);
-		$expected = 'ḀḂḄḆḈḊḌḎḐḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎṐṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎẐẒẔẖẗẘẙẚẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎỐỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸ';
-		$this->assertEquals($expected, $result);
-
 		$string = 'ωkå';
 		$result = mb_strtoupper($string);
 		$expected = 'ΩKÅ';
 		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testUsingMbStrtoupperArmenian method
+ *
+ * @return void
+ */
+	public function testUsingMbStrtoupperArmenian() {
+		if (extension_loaded('mbstring') && version_compare(PHP_VERSION, '7.3', '>=')) {
+			$this->markTestSkipped('PHP7.3+ built-in function mb_strtoupper() behaves slightly different from Multibyte::strtoupper()');
+		}
+
+		$string = 'աբգդեզէըթժիլխծկհձղճմյնշոչպջռսվտրցւփքօֆև';
+		$result = mb_strtoupper($string);
+		$expected = 'ԱԲԳԴԵԶԷԸԹԺԻԼԽԾԿՀՁՂՃՄՅՆՇՈՉՊՋՌՍՎՏՐՑՒՓՔՕՖև';
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testUsingMbStrtoupperDiacritic method
+ *
+ * @return void
+ */
+	public function testUsingMbStrtoupperDiacritic() {
+		if (extension_loaded('mbstring') && version_compare(PHP_VERSION, '7.3', '>=')) {
+			$this->markTestSkipped('PHP7.3+ built-in function mb_strtoupper() behaves slightly different from Multibyte::strtoupper()');
+		}
+
+		$string = 'ḁḃḅḇḉḋḍḏḑḓḕḗḙḛḝḟḡḣḥḧḩḫḭḯḱḳḵḷḹḻḽḿṁṃṅṇṉṋṍṏṑṓṕṗṙṛṝṟṡṣṥṧṩṫṭṯṱṳṵṷṹṻṽṿẁẃẅẇẉẋẍẏẑẓẕẖẗẘẙẚạảấầẩẫậắằẳẵặẹẻẽếềểễệỉịọỏốồổỗộớờởỡợụủứừửữựỳỵỷỹ';
+		$result = mb_strtoupper($string);
+		$expected = 'ḀḂḄḆḈḊḌḎḐḒḔḖḘḚḜḞḠḢḤḦḨḪḬḮḰḲḴḶḸḺḼḾṀṂṄṆṈṊṌṎṐṒṔṖṘṚṜṞṠṢṤṦṨṪṬṮṰṲṴṶṸṺṼṾẀẂẄẆẈẊẌẎẐẒẔẖẗẘẙẚẠẢẤẦẨẪẬẮẰẲẴẶẸẺẼẾỀỂỄỆỈỊỌỎỐỒỔỖỘỚỜỞỠỢỤỦỨỪỬỮỰỲỴỶỸ';
+		$this->assertEquals($expected, $result);
+	}
+
+/**
+ * testUsingMbStrtoupperLigatures method
+ *
+ * @return void
+ */
+	public function testUsingMbStrtoupperLigatures() {
+		if (extension_loaded('mbstring') && version_compare(PHP_VERSION, '7.3', '>=')) {
+			$this->markTestSkipped('PHP7.3+ built-in function mb_strtoupper() behaves slightly different from Multibyte::strtoupper()');
+		}
 
 		$string = 'fffiflffifflſtstﬓﬔﬕﬖﬗ';
 		$result = mb_strtoupper($string);
diff --git a/web/api/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php b/web/api/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
index 251e8a8bb..8bb584954 100644
--- a/web/api/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Behavior/TranslateBehaviorTest.php
@@ -1144,6 +1144,16 @@ class TranslateBehaviorTest extends CakeTestCase {
 		$TestModel->bindTranslation($translations);
 
 		$result = $TestModel->find('first');
+		$TestModel->find('first', array(
+			'fields' => array(
+				'TranslatedItem.title',
+			),
+		));
+		$TestModel->find('first', array(
+			'fields' => array(
+				'TranslatedItem.title',
+			),
+		));
 		$this->assertArrayHasKey('Title', $result);
 		$this->assertArrayHasKey('content', $result['Title'][0]);
 		$this->assertArrayNotHasKey('title', $result);
@@ -1445,6 +1455,8 @@ class TranslateBehaviorTest extends CakeTestCase {
 
 	public function testBeforeFindAllI18nConditions() {
 		$this->skipIf(!$this->db instanceof Mysql, 'This test is only compatible with Mysql.');
+		$dbName = $this->db->config['database'];
+
 		$this->loadFixtures('TranslateArticle', 'TranslatedArticle', 'User');
 		$TestModel = new TranslatedArticle();
 		$TestModel->cacheQueries = false;
@@ -1461,7 +1473,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName,
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(
@@ -1479,7 +1491,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName,
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(
@@ -1527,6 +1539,8 @@ class TranslateBehaviorTest extends CakeTestCase {
 
 	public function testBeforeFindCountI18nConditions() {
 		$this->skipIf(!$this->db instanceof Mysql, 'This test is only compatible with Mysql.');
+		$dbName = $this->db->config['database'];
+
 		$this->loadFixtures('TranslateArticle', 'TranslatedArticle', 'User');
 		$TestModel = new TranslatedArticle();
 		$TestModel->cacheQueries = false;
@@ -1543,7 +1557,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName,
 					),
 					'conditions' => array(
 						'`TranslatedArticle`.`id`' => (object)array(
@@ -1560,7 +1574,7 @@ class TranslateBehaviorTest extends CakeTestCase {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName,
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(
diff --git a/web/api/lib/Cake/Test/Case/Model/CakeSchemaTest.php b/web/api/lib/Cake/Test/Case/Model/CakeSchemaTest.php
index c7c8deab1..bdcaf2440 100644
--- a/web/api/lib/Cake/Test/Case/Model/CakeSchemaTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/CakeSchemaTest.php
@@ -64,6 +64,13 @@ class MyAppSchema extends CakeSchema {
 		'published' => array('type' => 'string', 'null' => true, 'default' => 'Y', 'length' => 1),
 		'created' => array('type' => 'datetime', 'null' => true, 'default' => null),
 		'updated' => array('type' => 'datetime', 'null' => true, 'default' => null),
+		'status' => array(
+			'type' => 'enum(\'active\',\'deleted\')',
+			'null' => false,
+			'default' => 'active',
+			'collate' => 'utf8_unicode_ci',
+			'charset' => 'utf8',
+		),
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => true)),
 	);
 
@@ -809,6 +816,14 @@ class CakeSchemaTest extends CakeTestCase {
 			'posts' => array(
 				'add' => array(
 					'summary' => array('type' => 'text', 'null' => true, 'after' => 'body'),
+					'status' => array(
+						'type' => 'enum(\'active\',\'deleted\')',
+						'null' => false,
+						'default' => 'active',
+						'collate' => 'utf8_unicode_ci',
+						'charset' => 'utf8',
+						'after' => 'updated',
+					),
 				),
 				'drop' => array(
 					'tableParameters' => array(),
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
index fe7f3e0db..f569d3627 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
@@ -356,41 +356,6 @@ class MysqlTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
-/**
- * testBuildColumn method
- *
- * @return void
- */
-	public function testBuildColumn() {
-		$restore = $this->Dbo->columns;
-		$this->Dbo->columns = array('varchar(255)' => 1);
-		$data = array(
-			'name' => 'testName',
-			'type' => 'varchar(255)',
-			'default',
-			'null' => true,
-			'key',
-			'comment' => 'test'
-		);
-		$result = $this->Dbo->buildColumn($data);
-		$expected = '`testName`  DEFAULT NULL COMMENT \'test\'';
-		$this->assertEquals($expected, $result);
-
-		$data = array(
-			'name' => 'testName',
-			'type' => 'varchar(255)',
-			'default',
-			'null' => true,
-			'key',
-			'charset' => 'utf8',
-			'collate' => 'utf8_unicode_ci'
-		);
-		$result = $this->Dbo->buildColumn($data);
-		$expected = '`testName`  CHARACTER SET utf8 COLLATE utf8_unicode_ci DEFAULT NULL';
-		$this->assertEquals($expected, $result);
-		$this->Dbo->columns = $restore;
-	}
-
 /**
  * MySQL 4.x returns index data in a different format,
  * Using a mock ensure that MySQL 4.x output is properly parsed.
@@ -3080,14 +3045,6 @@ SQL;
 		$expected = '5,2';
 		$this->assertSame($expected, $result);
 
-		$result = $this->Dbo->length("enum('test','me','now')");
-		$expected = 4;
-		$this->assertSame($expected, $result);
-
-		$result = $this->Dbo->length("set('a','b','cd')");
-		$expected = 2;
-		$this->assertSame($expected, $result);
-
 		$result = $this->Dbo->length(false);
 		$this->assertNull($result);
 
@@ -3100,6 +3057,26 @@ SQL;
 		$this->assertSame($expected, $result);
 	}
 
+/**
+ * Tests the length of enum column.
+ *
+ * @return void
+ */
+	public function testLengthEnum() {
+		$result = $this->Dbo->length("enum('test','me','now')");
+		$this->assertNull($result);
+	}
+
+/**
+ * Tests the length of set column.
+ *
+ * @return void
+ */
+	public function testLengthSet() {
+		$result = $this->Dbo->length("set('a','b','cd')");
+		$this->assertNull($result);
+	}
+
 /**
  * testBuildIndex method
  *
@@ -3154,7 +3131,7 @@ SQL;
  *
  * @return void
  */
-	public function testBuildColumn2() {
+	public function testBuildColumn() {
 		$data = array(
 			'name' => 'testName',
 			'type' => 'string',
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
index 00364eb67..701865c44 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
@@ -1218,4 +1218,24 @@ class PostgresTest extends CakeTestCase {
 
 		$this->assertEquals('"col1" uuid', $result);
 	}
+
+/**
+ * Test that postgres describes default columns with functions correctly.
+ *
+ * @return void
+ */
+	public function testDescribeFunctionDefault() {
+		$db = $this->Dbo;
+		$db->execute('CREATE TABLE test_function_default_describe (id integer PRIMARY KEY, year int default date_part(\'year\'::text, now()))');
+		$data = $db->describe('test_function_default_describe');
+
+		$expected = array(
+			'type' => 'integer',
+			'null' => true,
+			'default' => 'date_part(\'year\', now())',
+			'length' => null,
+		);
+		$this->assertSame($expected, $data['year']);
+		$db->execute('DROP TABLE test_function_default_describe');
+	}
 }
diff --git a/web/api/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/web/api/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
index 8daa5ba31..c8df92dc3 100644
--- a/web/api/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -1028,6 +1028,11 @@ class DboSourceTest extends CakeTestCase {
 			$this->markTestSkipped('This test can only run on MySQL');
 		}
 		$name = $this->db->fullTableName('enum_tests');
+
+		$query = "DROP TABLE IF EXISTS {$name};";
+		$result = $this->db->query($query);
+		$this->assertTrue($result);
+
 		$query = "CREATE TABLE {$name} (mood ENUM('','happy','sad','ok') NOT NULL);";
 		$result = $this->db->query($query);
 		$this->assertTrue($result);
@@ -1047,6 +1052,40 @@ class DboSourceTest extends CakeTestCase {
 		), $enumResult);
 	}
 
+/**
+ * Test for MySQL enum datatype for a list of Integer stored as String
+ *
+ * @return void
+ */
+	public function testIntValueAsStringOnEnum() {
+		if (!$this->db instanceof Mysql) {
+			$this->markTestSkipped('This test can only run on MySQL');
+		}
+		$name = $this->db->fullTableName('enum_faya_tests');
+
+		$query = "DROP TABLE IF EXISTS {$name};";
+		$result = $this->db->query($query);
+		$this->assertTrue($result);
+
+		$query = "CREATE TABLE {$name} (faya enum('10','20','30','40') NOT NULL);";
+		$result = $this->db->query($query);
+		$this->assertTrue($result);
+
+		$EnumFayaTest = ClassRegistry::init('EnumFayaTest');
+		$enumResult = $EnumFayaTest->save(array('faya' => '10'));
+
+		$query = "DROP TABLE {$name};";
+		$result = $this->db->query($query);
+		$this->assertTrue($result);
+
+		$this->assertEquals(array(
+			'EnumFayaTest' => array(
+				'faya' => '10',
+				'id' => '0'
+			)
+		), $enumResult);
+	}
+
 /**
  * test order to generate query order clause for virtual fields
  *
@@ -1650,6 +1689,42 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertEquals($expected, $result[0]);
 	}
 
+/**
+ * Test conditionKeysToString() with virtual field
+ *
+ * @return void
+ */
+	public function testConditionKeysToStringVirtualFieldExpression() {
+		$Article = ClassRegistry::init('Article');
+		$Article->virtualFields = array(
+			'extra' => $Article->getDataSource()->expression('something virtual')
+		);
+		$conn = $this->getMock('MockPDO', array('quote'));
+		$db = new DboTestSource();
+		$db->setConnection($conn);
+
+		$conn->expects($this->at(0))
+			->method('quote')
+			->will($this->returnValue('just text'));
+
+		$conditions = array('Article.extra' => 'just text');
+		$result = $db->conditionKeysToString($conditions, true, $Article);
+		$expected = "(" . $Article->virtualFields['extra']->value . ") = just text";
+		$this->assertEquals($expected, $result[0]);
+
+		$conn->expects($this->at(0))
+			->method('quote')
+			->will($this->returnValue('just text'));
+		$conn->expects($this->at(1))
+			->method('quote')
+			->will($this->returnValue('other text'));
+
+		$conditions = array('Article.extra' => array('just text', 'other text'));
+		$result = $db->conditionKeysToString($conditions, true, $Article);
+		$expected = "(" . $Article->virtualFields['extra']->value . ") IN (just text, other text)";
+		$this->assertEquals($expected, $result[0]);
+	}
+
 /**
  * Test conditionKeysToString() with virtual field
  *
@@ -2102,12 +2177,19 @@ class DboSourceTest extends CakeTestCase {
 
 		$result = $this->db->length('decimal(20,3)');
 		$this->assertEquals('20,3', $result);
+	}
 
+/**
+ * Test length parsing of enum column.
+ *
+ * @return void
+ */
+	public function testLengthEnum() {
 		$result = $this->db->length('enum("one", "longer")');
-		$this->assertEquals(6, $result);
+		$this->assertNull($result);
 
 		$result = $this->db->length("enum('One Value','ANOTHER ... VALUE ...')");
-		$this->assertEquals(21, $result);
+		$this->assertNull($result);
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Model/ModelReadTest.php b/web/api/lib/Cake/Test/Case/Model/ModelReadTest.php
index 851290547..05f27cb8a 100644
--- a/web/api/lib/Cake/Test/Case/Model/ModelReadTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/ModelReadTest.php
@@ -6486,6 +6486,8 @@ class ModelReadTest extends BaseModelTest {
 
 	public function testBuildQueryAllI18nConditions() {
 		$this->skipIf(!$this->db instanceof Mysql, 'This test is only compatible with Mysql.');
+		$dbName = $this->db->config['database'];
+
 		$this->loadFixtures('TranslateArticle', 'TranslatedArticle', 'User');
 		$TestModel = new TranslatedArticle();
 		$TestModel->cacheQueries = false;
@@ -6502,7 +6504,7 @@ class ModelReadTest extends BaseModelTest {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(
@@ -6520,7 +6522,7 @@ class ModelReadTest extends BaseModelTest {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(
@@ -6556,6 +6558,7 @@ class ModelReadTest extends BaseModelTest {
 
 	public function testBuildQueryCountI18nConditions() {
 		$this->skipIf(!$this->db instanceof Mysql, 'This test is only compatible with Mysql.');
+		$dbName = $this->db->config['database'];
 		$this->loadFixtures('TranslateArticle', 'TranslatedArticle', 'User');
 		$TestModel = new TranslatedArticle();
 		$TestModel->cacheQueries = false;
@@ -6572,7 +6575,7 @@ class ModelReadTest extends BaseModelTest {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName
 					),
 					'conditions' => array(
 						'`TranslatedArticle`.`id`' => (object)array(
@@ -6589,7 +6592,7 @@ class ModelReadTest extends BaseModelTest {
 					'table' => (object)array(
 						'tablePrefix' => '',
 						'table' => 'article_i18n',
-						'schemaName' => 'cakephp_test',
+						'schemaName' => $dbName
 					),
 					'conditions' => array(
 						'TranslatedArticle.id' => (object)array(
diff --git a/web/api/lib/Cake/Test/Case/Model/ModelValidationTest.php b/web/api/lib/Cake/Test/Case/Model/ModelValidationTest.php
index e1984b219..7886fdd75 100644
--- a/web/api/lib/Cake/Test/Case/Model/ModelValidationTest.php
+++ b/web/api/lib/Cake/Test/Case/Model/ModelValidationTest.php
@@ -2007,6 +2007,9 @@ class ModelValidationTest extends BaseModelTest {
 		$this->assertTrue(isset($Validator['other']));
 		$this->assertFalse(isset($Validator['other']['numeric']));
 		$this->assertTrue(isset($Validator['other']['between']));
+
+		$Validator->remove('other');
+		$Validator->remove('other', 'between');
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Network/CakeRequestTest.php b/web/api/lib/Cake/Test/Case/Network/CakeRequestTest.php
index abdb79be8..7cad7a43d 100644
--- a/web/api/lib/Cake/Test/Case/Network/CakeRequestTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/CakeRequestTest.php
@@ -215,9 +215,14 @@ class CakeRequestTest extends CakeTestCase {
 		$request = new CakeRequest();
 		$this->assertEquals('some/path', $request->url);
 
-		$_SERVER['REQUEST_URI'] = Configure::read('App.fullBaseUrl') . '/other/path?url=https://cakephp.org';
+		$base = Configure::read('App.fullBaseUrl');
+		$_SERVER['REQUEST_URI'] = $base . '/other/path?url=https://cakephp.org';
 		$request = new CakeRequest();
 		$this->assertEquals('other/path', $request->url);
+
+		$_SERVER['REQUEST_URI'] = str_repeat('x', strlen($base) - 4) . '://?/other/path';
+		$request = new CakeRequest();
+		$this->assertEquals('', $request->url);
 	}
 
 /**
diff --git a/web/api/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php b/web/api/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
index a0d15bec8..ca7ae2a38 100644
--- a/web/api/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/Email/CakeEmailTest.php
@@ -334,23 +334,34 @@ class CakeEmailTest extends CakeTestCase {
 /**
  * testBuildInvalidData
  *
- * @dataProvider invalidEmails
  * @expectedException SocketException
+ * @expectedExceptionMessage The email set for "_to" is empty.
  * @return void
  */
-	public function testInvalidEmail($value) {
-		$this->CakeEmail->to($value);
+	public function testInvalidEmail() {
+		$this->CakeEmail->to('');
 	}
 
 /**
  * testBuildInvalidData
  *
- * @dataProvider invalidEmails
  * @expectedException SocketException
+ * @expectedExceptionMessage Invalid email set for "_from". You passed "cake.@"
  * @return void
  */
-	public function testInvalidEmailAdd($value) {
-		$this->CakeEmail->addTo($value);
+	public function testInvalidFrom() {
+		$this->CakeEmail->from('cake.@');
+	}
+
+/**
+ * testBuildInvalidData
+ *
+ * @expectedException SocketException
+ * @expectedExceptionMessage Invalid email set for "_to". You passed "1"
+ * @return void
+ */
+	public function testInvalidEmailAdd() {
+		$this->CakeEmail->addTo('1');
 	}
 
 /**
@@ -423,7 +434,7 @@ class CakeEmailTest extends CakeTestCase {
  * @return void
  *
  * @expectedException SocketException
- * @expectedExceptionMessage Invalid email: "fail.@example.com"
+ * @expectedExceptionMessage Invalid email set for "_to". You passed "fail.@example.com"
  */
 	public function testUnsetEmailPattern() {
 		$email = new CakeEmail();
diff --git a/web/api/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php b/web/api/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
index 8332d82ab..3ac6682f9 100644
--- a/web/api/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
+++ b/web/api/lib/Cake/Test/Case/Network/Http/HttpSocketTest.php
@@ -701,7 +701,7 @@ class HttpSocketTest extends CakeTestCase {
 		);
 		$http = $this->getMock('TestHttpSocket', array('read', 'write', 'connect', 'request'), array($request));
 
-		$expected = array('method' => 'GET', 'uri' => '/_test');
+		$expected = array('method' => 'GET', 'uri' => 'http://localhost:5984/_test');
 		$http->expects($this->at(0))->method('request')->with($expected);
 		$http->get('/_test');
 
diff --git a/web/api/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php b/web/api/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
index fde9eae11..43b9391c1 100644
--- a/web/api/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
+++ b/web/api/lib/Cake/Test/Case/TestSuite/CakeTestCaseTest.php
@@ -445,7 +445,8 @@ class CakeTestCaseTest extends CakeTestCase {
 		), App::RESET);
 		CakePlugin::load('TestPlugin');
 		ConnectionManager::create('test_secondary', array(
-			'datasource' => 'Database/TestLocalDriver'
+			'datasource' => 'Database/TestLocalDriver',
+			'prefix' => ''
 		));
 		$post = $this->getMockForModel('SecondaryPost', array('save'));
 		$this->assertEquals('test_secondary', $post->useDbConfig);
diff --git a/web/api/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php b/web/api/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
index 597490d60..379d1a472 100644
--- a/web/api/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
+++ b/web/api/lib/Cake/Test/Case/TestSuite/CakeTestFixtureTest.php
@@ -231,7 +231,6 @@ class CakeTestFixtureTest extends CakeTestCase {
 	public function setUp() {
 		parent::setUp();
 		$methods = array_diff(get_class_methods('DboSource'), array('enabled'));
-		$methods[] = 'connect';
 
 		$this->criticDb = $this->getMock('DboSource', $methods);
 		$this->criticDb->fullDebug = true;
diff --git a/web/api/lib/Cake/Test/Case/Utility/CakeTimeTest.php b/web/api/lib/Cake/Test/Case/Utility/CakeTimeTest.php
index b358b1b48..4bc9f8a62 100644
--- a/web/api/lib/Cake/Test/Case/Utility/CakeTimeTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/CakeTimeTest.php
@@ -421,6 +421,18 @@ class CakeTimeTest extends CakeTestCase {
 		$this->_restoreSystemTimezone();
 	}
 
+	public function testNiceTimezoneConversion() {
+		date_default_timezone_set('Europe/Copenhagen'); // server timezone
+		$clientTimeZone = new DateTimeZone('Asia/Bangkok');
+		$clientDateTime = new DateTime('2019-01-31 10:00:00', $clientTimeZone);
+		// Convert to UTC.
+		$actual = CakeTime::nice($clientDateTime, 'UTC', '%Y-%m-%d %H:%M:%S');
+		$clientDateTime->setTimezone(new DateTimeZone('UTC'));
+		$expected = $clientDateTime->format('Y-m-d H:i:s');
+		$this->assertEquals($expected, $actual);
+		$this->_restoreSystemTimezone();
+	}
+
 /**
  * testNiceShort method
  *
@@ -966,23 +978,44 @@ class CakeTimeTest extends CakeTestCase {
  */
 	public function testFromStringWithDateTime() {
 		date_default_timezone_set('UTC');
-
 		$date = new DateTime('+1 hour', new DateTimeZone('America/New_York'));
 		$result = $this->Time->fromString($date, 'UTC');
 		$date->setTimezone(new DateTimeZone('UTC'));
 		$expected = $date->format('U') + $date->getOffset();
-
 		$this->assertWithinMargin($expected, $result, 1);
+		$this->_restoreSystemTimezone();
+	}
 
+	public function testFromStringWithDateTimeAsia() {
 		date_default_timezone_set('Australia/Melbourne');
-
 		$date = new DateTime('+1 hour', new DateTimeZone('America/New_York'));
 		$result = $this->Time->fromString($date, 'Asia/Kuwait');
-
 		$date->setTimezone(new DateTimeZone('Asia/Kuwait'));
 		$expected = $date->format('U') + $date->getOffset();
 		$this->assertWithinMargin($expected, $result, 1);
+		$this->_restoreSystemTimezone();
+	}
 
+	public function testFromStringTimezoneConversionToUTC() {
+		date_default_timezone_set('Europe/Copenhagen'); // server timezone
+		$clientTimeZone = new DateTimeZone('Asia/Bangkok');
+		$clientDateTime = new DateTime('2019-01-31 10:00:00', $clientTimeZone);
+		// Convert to UTC.
+		$actual = CakeTime::fromString($clientDateTime, 'UTC');
+		$clientDateTime->setTimezone(new DateTimeZone('UTC'));
+		$expected = $clientDateTime->getTimestamp() + $clientDateTime->getOffset(); // 1548903600
+		$this->assertEquals($expected, $actual);
+		$this->_restoreSystemTimezone();
+	}
+
+	public function testFromStringUTCtoCopenhagen() {
+		date_default_timezone_set('UTC'); // server timezone
+		$clientTimeZone = new DateTimeZone('UTC');
+		$clientDateTime = new DateTime('2012-01-01 10:00:00', $clientTimeZone);
+		$actual = CakeTime::fromString($clientDateTime, 'Europe/Copenhagen');
+		$clientDateTime->setTimezone(new DateTimeZone('Europe/Copenhagen'));
+		$expected = $clientDateTime->getTimestamp() + $clientDateTime->getOffset(); // 1325415600
+		$this->assertEquals($expected, $actual);
 		$this->_restoreSystemTimezone();
 	}
 
@@ -998,6 +1031,24 @@ class CakeTimeTest extends CakeTestCase {
 		$this->assertEquals($result, $date->format('U'));
 	}
 
+	public function testConvertToBangkok() {
+		$serverTimeZoneName = 'Europe/Copenhagen';
+		date_default_timezone_set($serverTimeZoneName);
+
+		$serverTimeZone = new DateTimeZone($serverTimeZoneName);
+		$DateTime = new DateTime('2019-01-31 04:00:00', $serverTimeZone);
+		$serverTimestamp = $DateTime->getTimestamp() + $DateTime->getOffset(); // 1548907200
+
+		$clientTimeZoneName = 'Asia/Bangkok';
+		$clientTimeZone = new DateTimeZone($clientTimeZoneName);
+		$DateTime->setTimezone($clientTimeZone);
+		$expected = $DateTime->getTimestamp() + $DateTime->getOffset(); // 1548928800
+
+		$actual = CakeTime::convert($serverTimestamp, $clientTimeZoneName);
+		$this->assertEquals($expected, $actual);
+		$this->_restoreSystemTimezone();
+	}
+
 /**
  * test converting time specifiers using a time definition localfe file
  *
@@ -1149,6 +1200,28 @@ class CakeTimeTest extends CakeTestCase {
 		$this->assertEquals($expected, $result);
 	}
 
+	public function testI18nFormatTimezoneConversionToUTC() {
+		date_default_timezone_set('Europe/Copenhagen'); // server timezone
+		$clientTimeZone = new DateTimeZone('Asia/Bangkok');
+		$clientDateTime = new DateTime('2019-01-31 10:00:00', $clientTimeZone);
+		// Convert to UTC.
+		$actual = CakeTime::i18nFormat($clientDateTime, '%Y-%m-%d %H:%M:%S', false, 'UTC');
+		$clientDateTime->setTimezone(new DateTimeZone('UTC'));
+		$expected = $clientDateTime->format('Y-m-d H:i:s');
+		$this->assertEquals($expected, $actual);
+		$this->_restoreSystemTimezone();
+	}
+
+	public function testI18nFormatUTCtoCopenhagen() {
+		date_default_timezone_set('UTC');
+		$clientTimeZone = new DateTimeZone('UTC');
+		$clientDateTime = new DateTime('2012-01-01 10:00:00', $clientTimeZone);
+		$actual = CakeTime::i18nFormat($clientDateTime, '%Y-%m-%d %H:%M', false, 'Europe/Copenhagen');
+		$clientDateTime->setTimezone(new DateTimeZone('Europe/Copenhagen'));
+		$expected = $clientDateTime->format('Y-m-d H:i');
+		$this->assertEquals($expected, $actual);
+	}
+
 /**
  * test new format() syntax which inverts first and second parameters
  *
@@ -1217,7 +1290,7 @@ class CakeTimeTest extends CakeTestCase {
  *
  * @return void
  */
-	public function testCorrectTimezoneConversion() {
+	public function testCorrectTimezoneConversionAsString() {
 		date_default_timezone_set('UTC');
 		$date = '2012-01-01 10:00:00';
 		$converted = CakeTime::format($date, '%Y-%m-%d %H:%M', '', 'Europe/Copenhagen');
@@ -1226,4 +1299,27 @@ class CakeTimeTest extends CakeTestCase {
 		$this->assertEquals($expected->format('Y-m-d H:i'), $converted);
 	}
 
+	public function testCorrectTimezoneConversionAsObject() {
+		date_default_timezone_set('UTC');
+		$clientTimeZone = new DateTimeZone('UTC');
+		$date = '2012-01-01 10:00:00';
+		$clientDateTime = new DateTime($date, $clientTimeZone);
+		$converted = CakeTime::format($clientDateTime, '%Y-%m-%d %H:%M', '', 'Europe/Copenhagen');
+		$clientDateTime->setTimezone(new DateTimeZone('Europe/Copenhagen'));
+		$expected = $clientDateTime->format('Y-m-d H:i');
+		$this->assertEquals($expected, $converted);
+	}
+
+	public function testFormatTimezoneConversionToUTC() {
+		date_default_timezone_set('Europe/Copenhagen'); // server timezone
+		$clientTimeZone = new DateTimeZone('Asia/Bangkok');
+		$clientDateTime = new DateTime('2019-01-31 10:00:00', $clientTimeZone);
+		// Convert to UTC.
+		$actual = CakeTime::format($clientDateTime, '%Y-%m-%d %H:%M:%S', false, 'UTC');
+		$clientDateTime->setTimezone(new DateTimeZone('UTC'));
+		$expected = $clientDateTime->format('Y-m-d H:i:s');
+		$this->assertEquals($expected, $actual);
+		$this->_restoreSystemTimezone();
+	}
+
 }
diff --git a/web/api/lib/Cake/Test/Case/Utility/SecurityTest.php b/web/api/lib/Cake/Test/Case/Utility/SecurityTest.php
index 2b1fe1ab7..8fc79e51c 100644
--- a/web/api/lib/Cake/Test/Case/Utility/SecurityTest.php
+++ b/web/api/lib/Cake/Test/Case/Utility/SecurityTest.php
@@ -358,7 +358,7 @@ class SecurityTest extends CakeTestCase {
 	}
 
 /**
- * Tests that encrypted strings are comatible between the mcrypt and openssl engine.
+ * Tests that encrypted strings are compatible between the mcrypt and openssl engine.
  *
  * @dataProvider plainTextProvider
  * @param string $txt Plain text to be encrypted.
diff --git a/web/api/lib/Cake/Test/Case/View/Helper/FormHelperTest.php b/web/api/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
index 40a147782..eab4b0bd5 100644
--- a/web/api/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
+++ b/web/api/lib/Cake/Test/Case/View/Helper/FormHelperTest.php
@@ -2084,6 +2084,62 @@ class FormHelperTest extends CakeTestCase {
 		$this->assertTags($result, $expected);
 	}
 
+/**
+ * Test validation errors with error options
+ *
+ * @return void
+ */
+	public function testPasswordValidationWithOptions() {
+		$Contact = ClassRegistry::getObject('Contact');
+		$Contact->validationErrors['password'] = array('Please provide a password');
+
+		$result = $this->Form->input('Contact.password', array(
+			'error' => array(
+				'attributes' => array('class' => 'special-error-class'),
+			)
+		));
+		$expected = array(
+			'div' => array('class' => 'input password error'),
+			'label' => array('for' => 'ContactPassword'),
+			'Password',
+			'/label',
+			'input' => array(
+				'type' => 'password', 'name' => 'data[Contact][password]',
+				'id' => 'ContactPassword', 'class' => 'form-error'
+			),
+			array('div' => array('class' => 'special-error-class')),
+			'Please provide a password',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+
+		$Contact->validationErrors['password'] = array('Please provide a password<br>otherwise you will not be able to login');
+		$result = $this->Form->input('Contact.password', array(
+			'error' => array(
+				'attributes' => array(
+					'class' => 'special-error-class',
+					'escape' => false,
+				)
+			)
+		));
+		$expected = array(
+			'div' => array('class' => 'input password error'),
+			'label' => array('for' => 'ContactPassword'),
+			'Password',
+			'/label',
+			'input' => array(
+				'type' => 'password', 'name' => 'data[Contact][password]',
+				'id' => 'ContactPassword', 'class' => 'form-error'
+			),
+			array('div' => array('class' => 'special-error-class')),
+			'Please provide a password<br>otherwise you will not be able to login',
+			'/div',
+			'/div'
+		);
+		$this->assertTags($result, $expected);
+	}
+
 /**
  * Test validation errors, when validation message is an empty string.
  *
@@ -7919,7 +7975,7 @@ class FormHelperTest extends CakeTestCase {
 		);
 		$this->assertTags($result, $expected);
 
-		$this->request->data['Contact']['published'] = '';
+		$this->Form->request->data['Contact']['published'] = '';
 		$result = $this->Form->year('Contact.published', 2006, 2007, array('class' => 'year'));
 		$expected = array(
 			array('select' => array('name' => 'data[Contact][published][year]', 'id' => 'ContactPublishedYear', 'class' => 'year')),
diff --git a/web/api/lib/Cake/Test/Case/View/Helper/RssHelperTest.php b/web/api/lib/Cake/Test/Case/View/Helper/RssHelperTest.php
index d6606a7e3..0deae0d90 100644
--- a/web/api/lib/Cake/Test/Case/View/Helper/RssHelperTest.php
+++ b/web/api/lib/Cake/Test/Case/View/Helper/RssHelperTest.php
@@ -245,7 +245,11 @@ class RssHelperTest extends CakeTestCase {
 			array('title' => 'title3', 'guid' => 'http://www.example.com/guid3', 'link' => 'http://www.example.com/link3', 'description' => 'description3')
 		);
 
-		$result = $this->Rss->items($items, create_function('$v', '$v[\'title\'] = $v[\'title\'] . \'-transformed\'; return $v;'));
+		$result = $this->Rss->items($items, function ($v) {
+			$v['title'] = $v['title'] . '-transformed';
+
+			return $v;
+		});
 		$expected = array(
 			'<item',
 				'<title', 'title1-transformed', '/title',
diff --git a/web/api/lib/Cake/Test/Case/View/ViewTest.php b/web/api/lib/Cake/Test/Case/View/ViewTest.php
index c36299f69..3ceccdd5a 100644
--- a/web/api/lib/Cake/Test/Case/View/ViewTest.php
+++ b/web/api/lib/Cake/Test/Case/View/ViewTest.php
@@ -1495,13 +1495,13 @@ class ViewTest extends CakeTestCase {
 /**
  * Test setting a block's content to an object without __toString magic method
  *
- * This should produce a "Object of class TestObjectWithoutToString could not be converted to string" error
- * which gets thrown as a PHPUnit_Framework_Error Exception by PHPUnit.
- *
- * @expectedException PHPUnit_Framework_Error
  * @return void
  */
 	public function testBlockSetObjectWithoutToString() {
+		$this->_checkException(
+			'Object of class TestObjectWithoutToString could not be converted to string'
+		);
+
 		$objectWithToString = new TestObjectWithoutToString();
 		$this->View->assign('testWithObjectWithoutToString', $objectWithToString);
 	}
@@ -1547,13 +1547,13 @@ class ViewTest extends CakeTestCase {
 /**
  * Test appending an object without __toString magic method to a block with append.
  *
- * This should produce a "Object of class TestObjectWithoutToString could not be converted to string" error
- * which gets thrown as a PHPUnit_Framework_Error Exception by PHPUnit.
- *
- * @expectedException PHPUnit_Framework_Error
  * @return void
  */
 	public function testBlockAppendObjectWithoutToString() {
+		$this->_checkException(
+			'Object of class TestObjectWithoutToString could not be converted to string'
+		);
+
 		$object = new TestObjectWithoutToString();
 		$this->View->assign('testBlock', 'Block ');
 		$this->View->append('testBlock', $object);
@@ -1576,13 +1576,13 @@ class ViewTest extends CakeTestCase {
 /**
  * Test prepending an object without __toString magic method to a block with prepend.
  *
- * This should produce a "Object of class TestObjectWithoutToString could not be converted to string" error
- * which gets thrown as a PHPUnit_Framework_Error Exception by PHPUnit.
- *
- * @expectedException PHPUnit_Framework_Error
  * @return void
  */
 	public function testBlockPrependObjectWithoutToString() {
+		$this->_checkException(
+			'Object of class TestObjectWithoutToString could not be converted to string'
+		);
+
 		$object = new TestObjectWithoutToString();
 		$this->View->assign('test', 'Block ');
 		$this->View->prepend('test', $object);
@@ -1839,4 +1839,12 @@ TEXT;
 		$result = $this->View->get('title', $default);
 		$this->assertEquals($expected, $result);
 	}
+
+	protected function _checkException($message) {
+		if (version_compare(PHP_VERSION, '7.4', '>=')) {
+			$this->setExpectedException('Error', $message);
+		} else {
+			$this->setExpectedException('PHPUnit_Framework_Error', $message);
+		}
+	}
 }
diff --git a/web/api/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp b/web/api/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp
index b4072d770..34e3fc23f 100644
--- a/web/api/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp
+++ b/web/api/lib/Cake/Test/bake_compare/Controller/ActionsUsingSessions.ctp
@@ -77,12 +77,11 @@
  * @return void
  */
 	public function delete($id = null) {
-		$this->BakeArticle->id = $id;
-		if (!$this->BakeArticle->exists()) {
+		if (!$this->BakeArticle->exists($id)) {
 			throw new NotFoundException(__('Invalid bake article'));
 		}
 		$this->request->allowMethod('post', 'delete');
-		if ($this->BakeArticle->delete()) {
+		if ($this->BakeArticle->delete($id)) {
 			$this->Flash->success(__('The bake article has been deleted.'));
 		} else {
 			$this->Flash->error(__('The bake article could not be deleted. Please, try again.'));
diff --git a/web/api/lib/Cake/Test/bake_compare/Controller/ActionsWithNoSessions.ctp b/web/api/lib/Cake/Test/bake_compare/Controller/ActionsWithNoSessions.ctp
index d3f5b19d5..cfdd24f7f 100644
--- a/web/api/lib/Cake/Test/bake_compare/Controller/ActionsWithNoSessions.ctp
+++ b/web/api/lib/Cake/Test/bake_compare/Controller/ActionsWithNoSessions.ctp
@@ -71,12 +71,11 @@
  * @return void
  */
 	public function delete($id = null) {
-		$this->BakeArticle->id = $id;
-		if (!$this->BakeArticle->exists()) {
+		if (!$this->BakeArticle->exists($id)) {
 			throw new NotFoundException(__('Invalid bake article'));
 		}
 		$this->request->allowMethod('post', 'delete');
-		if ($this->BakeArticle->delete()) {
+		if ($this->BakeArticle->delete($id)) {
 			return $this->flash(__('The bake article has been deleted.'), array('action' => 'index'));
 		} else {
 			return $this->flash(__('The bake article could not be deleted. Please, try again.'), array('action' => 'index'));
diff --git a/web/api/lib/Cake/TestSuite/CakeTestCase.php b/web/api/lib/Cake/TestSuite/CakeTestCase.php
index f0a4cc621..11e022052 100644
--- a/web/api/lib/Cake/TestSuite/CakeTestCase.php
+++ b/web/api/lib/Cake/TestSuite/CakeTestCase.php
@@ -84,6 +84,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 		$result = parent::run($result);
 		if (!empty($this->fixtureManager)) {
 			$this->fixtureManager->unload($this);
+			unset($this->fixtureManager, $this->db);
 		}
 
 		for ($i = ob_get_level(); $i < $level; ++$i) {
@@ -164,6 +165,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 		if (isset($_GET['debug']) && $_GET['debug']) {
 			ob_flush();
 		}
+		unset($this->_configure, $this->_pathRestore);
 	}
 
 /**
@@ -399,7 +401,7 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 				$tags = (string)$tags;
 			}
 			$i++;
-			if (is_string($tags) && $tags{0} === '<') {
+			if (is_string($tags) && $tags[0] === '<') {
 				$tags = array(substr($tags, 1) => array());
 			} elseif (is_string($tags)) {
 				$tagsTrimmed = preg_replace('/\s+/m', '', $tags);
@@ -866,7 +868,8 @@ abstract class CakeTestCase extends PHPUnit_Framework_TestCase {
 		$availableDs = array_keys(ConnectionManager::enumConnectionObjects());
 
 		if ($mock->useDbConfig !== 'test' && in_array('test_' . $mock->useDbConfig, $availableDs)) {
-			$mock->setDataSource('test_' . $mock->useDbConfig);
+			$mock->useDbConfig = 'test_' . $mock->useDbConfig;
+			$mock->setDataSource($mock->useDbConfig);
 		} else {
 			$mock->useDbConfig = 'test';
 			$mock->setDataSource('test');
diff --git a/web/api/lib/Cake/TestSuite/CakeTestRunner.php b/web/api/lib/Cake/TestSuite/CakeTestRunner.php
index dfd2321de..29c451b8e 100644
--- a/web/api/lib/Cake/TestSuite/CakeTestRunner.php
+++ b/web/api/lib/Cake/TestSuite/CakeTestRunner.php
@@ -18,6 +18,14 @@
 if (!class_exists('PHPUnit_TextUI_TestRunner')) {
 	require_once 'PHPUnit/TextUI/TestRunner.php';
 }
+if (class_exists('SebastianBergmann\CodeCoverage\CodeCoverage')) {
+	class_alias('SebastianBergmann\CodeCoverage\CodeCoverage', 'PHP_CodeCoverage');
+	class_alias('SebastianBergmann\CodeCoverage\Report\Text', 'PHP_CodeCoverage_Report_Text');
+	class_alias('SebastianBergmann\CodeCoverage\Report\PHP', 'PHP_CodeCoverage_Report_PHP');
+	class_alias('SebastianBergmann\CodeCoverage\Report\Clover', 'PHP_CodeCoverage_Report_Clover');
+	class_alias('SebastianBergmann\CodeCoverage\Report\Html\Facade', 'PHP_CodeCoverage_Report_HTML');
+	class_alias('SebastianBergmann\CodeCoverage\Exception', 'PHP_CodeCoverage_Exception');
+}
 
 App::uses('CakeFixtureManager', 'TestSuite/Fixture');
 
@@ -45,6 +53,7 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
  * @param PHPUnit_Framework_Test $suite The test suite to run
  * @param array $arguments The CLI arguments
  * @param bool $exit Exits by default or returns the results
+ * This argument is ignored if >PHPUnit5.2.0
  * @return void
  */
 	public function doRun(PHPUnit_Framework_Test $suite, array $arguments = array(), $exit = true) {
@@ -64,7 +73,7 @@ class CakeTestRunner extends PHPUnit_TextUI_TestRunner {
 			}
 		}
 
-		$return = parent::doRun($suite, $arguments);
+		$return = parent::doRun($suite, $arguments, $exit);
 		$fixture->shutdown();
 		return $return;
 	}
diff --git a/web/api/lib/Cake/TestSuite/CakeTestSuiteCommand.php b/web/api/lib/Cake/TestSuite/CakeTestSuiteCommand.php
index c760d5d59..9d83e8ff7 100644
--- a/web/api/lib/Cake/TestSuite/CakeTestSuiteCommand.php
+++ b/web/api/lib/Cake/TestSuite/CakeTestSuiteCommand.php
@@ -95,18 +95,21 @@ class CakeTestSuiteCommand extends PHPUnit_TextUI_Command {
 		unset($this->arguments['testFile']);
 
 		try {
-			$result = $runner->doRun($suite, $this->arguments);
+			$result = $runner->doRun($suite, $this->arguments, false);
 		} catch (PHPUnit_Framework_Exception $e) {
 			print $e->getMessage() . "\n";
 		}
 
 		if ($exit) {
-			if (isset($result) && $result->wasSuccessful()) {
-				exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
-			} elseif (!isset($result) || $result->errorCount() > 0) {
+			if (!isset($result) || $result->errorCount() > 0) {
 				exit(PHPUnit_TextUI_TestRunner::EXCEPTION_EXIT);
 			}
-			exit(PHPUnit_TextUI_TestRunner::FAILURE_EXIT);
+			if ($result->failureCount() > 0) {
+				exit(PHPUnit_TextUI_TestRunner::FAILURE_EXIT);
+			}
+
+			// Default to success even if there are warnings to match phpunit's behavior
+			exit(PHPUnit_TextUI_TestRunner::SUCCESS_EXIT);
 		}
 	}
 
diff --git a/web/api/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php b/web/api/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
index 66ca94cfd..4f997c078 100644
--- a/web/api/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
+++ b/web/api/lib/Cake/TestSuite/CakeTestSuiteDispatcher.php
@@ -16,8 +16,24 @@
  * @license       https://opensource.org/licenses/mit-license.php MIT License
  */
 
+/**
+ * Path to the tests directory of the app.
+ */
+if (!defined('TESTS')) {
+	define('TESTS', APP . 'Test' . DS);
+}
+
+/**
+ * Path to the test cases directory of CakePHP.
+ */
 define('CORE_TEST_CASES', CAKE . 'Test' . DS . 'Case');
-define('APP_TEST_CASES', TESTS . 'Case');
+
+/**
+ * Path to the test cases directory of the app.
+ */
+if (!defined('APP_TEST_CASES')) {
+	define('APP_TEST_CASES', TESTS . 'Case');
+}
 
 App::uses('CakeTestSuiteCommand', 'TestSuite');
 
@@ -154,7 +170,9 @@ class CakeTestSuiteDispatcher {
 			} elseif (is_file($vendor . DS . 'phpunit.phar')) {
 				$backup = $GLOBALS['_SERVER']['SCRIPT_NAME'];
 				$GLOBALS['_SERVER']['SCRIPT_NAME'] = '-';
+				ob_start();
 				$included = include_once $vendor . DS . 'phpunit.phar';
+				ob_end_clean();
 				$GLOBALS['_SERVER']['SCRIPT_NAME'] = $backup;
 				return $included;
 			}
diff --git a/web/api/lib/Cake/TestSuite/ControllerTestCase.php b/web/api/lib/Cake/TestSuite/ControllerTestCase.php
index ff4adfb58..b13ce7df3 100644
--- a/web/api/lib/Cake/TestSuite/ControllerTestCase.php
+++ b/web/api/lib/Cake/TestSuite/ControllerTestCase.php
@@ -265,7 +265,7 @@ abstract class ControllerTestCase extends CakeTestCase {
 				->will($this->returnValue($options['data']));
 		}
 
-		$Dispatch = new ControllerTestDispatcher();
+		$Dispatch = $this->_createDispatcher();
 		foreach (Router::$routes as $route) {
 			if ($route instanceof RedirectRoute) {
 				$route->response = $this->getMock('CakeResponse', array('send'));
@@ -315,6 +315,15 @@ abstract class ControllerTestCase extends CakeTestCase {
 		return $this->{$options['return']};
 	}
 
+/**
+ * Creates the test dispatcher class
+ *
+ * @return Dispatcher
+ */
+	protected function _createDispatcher() {
+		return new ControllerTestDispatcher();
+	}
+
 /**
  * Generates a mocked controller and mocks any classes passed to `$mocks`. By
  * default, `_stop()` is stubbed as is sending the response headers, so to not
@@ -418,4 +427,20 @@ abstract class ControllerTestCase extends CakeTestCase {
 		return $this->controller;
 	}
 
+/**
+ * Unsets some properties to free memory.
+ *
+ * @return void
+ */
+	public function tearDown() {
+		parent::tearDown();
+		unset(
+			$this->contents,
+			$this->controller,
+			$this->headers,
+			$this->result,
+			$this->view,
+			$this->vars
+		);
+	}
 }
diff --git a/web/api/lib/Cake/Utility/CakeText.php b/web/api/lib/Cake/Utility/CakeText.php
index 11242026e..9fc3a65e8 100644
--- a/web/api/lib/Cake/Utility/CakeText.php
+++ b/web/api/lib/Cake/Utility/CakeText.php
@@ -30,69 +30,24 @@ class CakeText {
  * @return string RFC 4122 UUID
  */
 	public static function uuid() {
-		$node = env('SERVER_ADDR');
-
-		if (strpos($node, ':') !== false) {
-			if (substr_count($node, '::')) {
-				$node = str_replace(
-					'::', str_repeat(':0000', 8 - substr_count($node, ':')) . ':', $node
-				);
-			}
-			$node = explode(':', $node);
-			$ipSix = '';
-
-			foreach ($node as $id) {
-				$ipSix .= str_pad(base_convert($id, 16, 2), 16, 0, STR_PAD_LEFT);
-			}
-			$node = base_convert($ipSix, 2, 10);
-
-			if (strlen($node) < 38) {
-				$node = null;
-			} else {
-				$node = crc32($node);
-			}
-		} elseif (empty($node)) {
-			$host = env('HOSTNAME');
-
-			if (empty($host)) {
-				$host = env('HOST');
-			}
-
-			if (!empty($host)) {
-				$ip = gethostbyname($host);
-
-				if ($ip === $host) {
-					$node = crc32($host);
-				} else {
-					$node = ip2long($ip);
-				}
-			}
-		} elseif ($node !== '127.0.0.1') {
-			$node = ip2long($node);
-		} else {
-			$node = null;
-		}
-
-		if (empty($node)) {
-			$node = crc32(Configure::read('Security.salt'));
-		}
-
-		if (function_exists('hphp_get_thread_id')) {
-			$pid = hphp_get_thread_id();
-		} elseif (function_exists('zend_thread_id')) {
-			$pid = zend_thread_id();
-		} else {
-			$pid = getmypid();
-		}
-
-		if (!$pid || $pid > 65535) {
-			$pid = mt_rand(0, 0xfff) | 0x4000;
-		}
-
-		list($timeMid, $timeLow) = explode(' ', microtime());
+		$random = function_exists('random_int') ? 'random_int' : 'mt_rand';
 		return sprintf(
-			"%08x-%04x-%04x-%02x%02x-%04x%08x", (int)$timeLow, (int)substr($timeMid, 2) & 0xffff,
-			mt_rand(0, 0xfff) | 0x4000, mt_rand(0, 0x3f) | 0x80, mt_rand(0, 0xff), $pid, $node
+			'%04x%04x-%04x-%04x-%04x-%04x%04x%04x',
+			// 32 bits for "time_low"
+			$random(0, 65535),
+			$random(0, 65535),
+			// 16 bits for "time_mid"
+			$random(0, 65535),
+			// 12 bits before the 0100 of (version) 4 for "time_hi_and_version"
+			$random(0, 4095) | 0x4000,
+			// 16 bits, 8 bits for "clk_seq_hi_res",
+			// 8 bits for "clk_seq_low",
+			// two most significant bits holds zero and one for variant DCE1.1
+			$random(0, 0x3fff) | 0x8000,
+			// 48 bits for "node"
+			$random(0, 65535),
+			$random(0, 65535),
+			$random(0, 65535)
 		);
 	}
 
diff --git a/web/api/lib/Cake/Utility/CakeTime.php b/web/api/lib/Cake/Utility/CakeTime.php
index 2a1de55f3..63911bfde 100644
--- a/web/api/lib/Cake/Utility/CakeTime.php
+++ b/web/api/lib/Cake/Utility/CakeTime.php
@@ -239,9 +239,9 @@ class CakeTime {
 /**
  * Converts given time (in server's time zone) to user's local time, given his/her timezone.
  *
- * @param string $serverTime UNIX timestamp
- * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object
- * @return int UNIX timestamp
+ * @param int $serverTime Server's timestamp.
+ * @param string|DateTimeZone $timezone User's timezone string or DateTimeZone object.
+ * @return int User's timezone timestamp.
  * @link https://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::convert
  */
 	public static function convert($serverTime, $timezone) {
@@ -303,11 +303,11 @@ class CakeTime {
 	}
 
 /**
- * Returns a UNIX timestamp, given either a UNIX timestamp or a valid strtotime() date string.
+ * Returns a timestamp, given either a UNIX timestamp or a valid strtotime() date string.
  *
  * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
- * @return string Parsed timestamp
+ * @return int|false Parsed given timezone timestamp.
  * @link https://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::fromString
  */
 	public static function fromString($dateString, $timezone = null) {
@@ -354,22 +354,22 @@ class CakeTime {
  * See http://php.net/manual/en/function.strftime.php for information on formatting
  * using locale strings.
  *
- * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @param string $format The format to use. If null, `CakeTime::$niceFormat` is used
  * @return string Formatted date string
  * @link https://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::nice
  */
-	public static function nice($dateString = null, $timezone = null, $format = null) {
-		if (!$dateString) {
-			$dateString = time();
+	public static function nice($date = null, $timezone = null, $format = null) {
+		if (!$date) {
+			$date = time();
 		}
-		$date = static::fromString($dateString, $timezone);
-
+		$timestamp = static::fromString($date, $timezone);
 		if (!$format) {
 			$format = static::$niceFormat;
 		}
-		return static::_strftime(static::convertSpecifiers($format, $date), $date);
+		$convertedFormat = static::convertSpecifiers($format, $timestamp);
+		return static::_strftimeWithTimezone($convertedFormat, $timestamp, $date, $timezone);
 	}
 
 /**
@@ -382,28 +382,31 @@ class CakeTime {
  * If $dateString's year is the current year, the returned string does not
  * include mention of the year.
  *
- * @param int|string|DateTime $dateString UNIX timestamp, strtotime() valid string or DateTime object
+ * @param int|string|DateTime $date UNIX timestamp, strtotime() valid string or DateTime object
  * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object
  * @return string Described, relative date string
  * @link https://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::niceShort
  */
-	public static function niceShort($dateString = null, $timezone = null) {
-		if (!$dateString) {
-			$dateString = time();
+	public static function niceShort($date = null, $timezone = null) {
+		if (!$date) {
+			$date = time();
 		}
-		$date = static::fromString($dateString, $timezone);
+		$timestamp = static::fromString($date, $timezone);
 
-		if (static::isToday($dateString, $timezone)) {
-			return __d('cake', 'Today, %s', static::_strftime("%H:%M", $date));
+		if (static::isToday($date, $timezone)) {
+			$formattedDate = static::_strftimeWithTimezone("%H:%M", $timestamp, $date, $timezone);
+			return __d('cake', 'Today, %s', $formattedDate);
 		}
-		if (static::wasYesterday($dateString, $timezone)) {
-			return __d('cake', 'Yesterday, %s', static::_strftime("%H:%M", $date));
+		if (static::wasYesterday($date, $timezone)) {
+			$formattedDate = static::_strftimeWithTimezone("%H:%M", $timestamp, $date, $timezone);
+			return __d('cake', 'Yesterday, %s', $formattedDate);
 		}
-		if (static::isTomorrow($dateString, $timezone)) {
-			return __d('cake', 'Tomorrow, %s', static::_strftime("%H:%M", $date));
+		if (static::isTomorrow($date, $timezone)) {
+			$formattedDate = static::_strftimeWithTimezone("%H:%M", $timestamp, $date, $timezone);
+			return __d('cake', 'Tomorrow, %s', $formattedDate);
 		}
 
-		$d = static::_strftime("%w", $date);
+		$d = static::_strftimeWithTimezone("%w", $timestamp, $date, $timezone);
 		$day = array(
 			__d('cake', 'Sunday'),
 			__d('cake', 'Monday'),
@@ -413,18 +416,21 @@ class CakeTime {
 			__d('cake', 'Friday'),
 			__d('cake', 'Saturday')
 		);
-		if (static::wasWithinLast('7 days', $dateString, $timezone)) {
-			return sprintf('%s %s', $day[$d], static::_strftime(static::$niceShortFormat, $date));
+		if (static::wasWithinLast('7 days', $date, $timezone)) {
+			$formattedDate = static::_strftimeWithTimezone(static::$niceShortFormat, $timestamp, $date, $timezone);
+			return sprintf('%s %s', $day[$d], $formattedDate);
 		}
-		if (static::isWithinNext('7 days', $dateString, $timezone)) {
-			return __d('cake', 'On %s %s', $day[$d], static::_strftime(static::$niceShortFormat, $date));
+		if (static::isWithinNext('7 days', $date, $timezone)) {
+			$formattedDate = static::_strftimeWithTimezone(static::$niceShortFormat, $timestamp, $date, $timezone);
+			return __d('cake', 'On %s %s', $day[$d], $formattedDate);
 		}
 
 		$y = '';
-		if (!static::isThisYear($date)) {
+		if (!static::isThisYear($timestamp)) {
 			$y = ' %Y';
 		}
-		return static::_strftime(static::convertSpecifiers("%b %eS{$y}, %H:%M", $date), $date);
+		$format = static::convertSpecifiers("%b %eS{$y}, %H:%M", $timestamp);
+		return static::_strftimeWithTimezone($format, $timestamp, $date, $timezone);
 	}
 
 /**
@@ -1055,17 +1061,18 @@ class CakeTime {
  * @link https://book.cakephp.org/2.0/en/core-libraries/helpers/time.html#TimeHelper::i18nFormat
  */
 	public static function i18nFormat($date, $format = null, $default = false, $timezone = null) {
-		$date = static::fromString($date, $timezone);
-		if ($date === false && $default !== false) {
+		$timestamp = static::fromString($date, $timezone);
+		if ($timestamp === false && $default !== false) {
 			return $default;
 		}
-		if ($date === false) {
+		if ($timestamp === false) {
 			return '';
 		}
 		if (empty($format)) {
 			$format = '%x';
 		}
-		return static::_strftime(static::convertSpecifiers($format, $date), $date);
+		$convertedFormat = static::convertSpecifiers($format, $timestamp);
+		return static::_strftimeWithTimezone($convertedFormat, $timestamp, $date, $timezone);
 	}
 
 /**
@@ -1156,13 +1163,12 @@ class CakeTime {
  * Handles utf8_encoding the result of strftime when necessary.
  *
  * @param string $format Format string.
- * @param int $date Timestamp to format.
+ * @param int $timestamp Timestamp to format.
  * @return string formatted string with correct encoding.
  */
-	protected static function _strftime($format, $date) {
-		$format = strftime($format, $date);
+	protected static function _strftime($format, $timestamp) {
+		$format = strftime($format, $timestamp);
 		$encoding = Configure::read('App.encoding');
-
 		if (!empty($encoding) && $encoding === 'UTF-8') {
 			if (function_exists('mb_check_encoding')) {
 				$valid = mb_check_encoding($format, $encoding);
@@ -1176,4 +1182,29 @@ class CakeTime {
 		return $format;
 	}
 
+/**
+ * Multibyte wrapper for strftime.
+ *
+ * Adjusts the timezone when necessary before formatting the time.
+ *
+ * @param string $format Format string.
+ * @param int $timestamp Timestamp to format.
+ * @param int|string|DateTime $date Timestamp, strtotime() valid string or DateTime object.
+ * @param string|DateTimeZone $timezone Timezone string or DateTimeZone object.
+ * @return string Formatted date string with correct encoding.
+ */
+	protected static function _strftimeWithTimezone($format, $timestamp, $date, $timezone) {
+		$serverTimeZone = date_default_timezone_get();
+		if (
+			!empty($timezone) &&
+			$date instanceof DateTime &&
+			$date->getTimezone()->getName() != $serverTimeZone
+		) {
+			date_default_timezone_set($timezone);
+		}
+		$result = static::_strftime($format, $timestamp);
+		date_default_timezone_set($serverTimeZone);
+		return $result;
+	}
+
 }
diff --git a/web/api/lib/Cake/Utility/ClassRegistry.php b/web/api/lib/Cake/Utility/ClassRegistry.php
index 6234bcf55..d7475a72b 100644
--- a/web/api/lib/Cake/Utility/ClassRegistry.php
+++ b/web/api/lib/Cake/Utility/ClassRegistry.php
@@ -91,7 +91,7 @@ class ClassRegistry {
  *  stored in the registry and returned.
  * @param bool $strict if set to true it will return false if the class was not found instead
  *	of trying to create an AppModel
- * @return $class instance of ClassName.
+ * @return bool|object $class instance of ClassName.
  * @throws CakeException when you try to construct an interface or abstract class.
  */
 	public static function init($class, $strict = false) {
@@ -300,7 +300,7 @@ class ClassRegistry {
  *
  * @param string $alias Alias to check.
  * @param string $class Class name.
- * @return bool
+ * @return bool|object Object stored in registry or `false` if the object does not exist.
  */
 	protected function &_duplicate($alias, $class) {
 		$duplicate = false;
diff --git a/web/api/lib/Cake/Utility/Debugger.php b/web/api/lib/Cake/Utility/Debugger.php
index 281453f5f..ef906659e 100644
--- a/web/api/lib/Cake/Utility/Debugger.php
+++ b/web/api/lib/Cake/Utility/Debugger.php
@@ -181,7 +181,9 @@ class Debugger {
  * as well as export the variable using exportVar. By default the log is written to the debug log.
  *
  * @param mixed $var Variable or content to log
- * @param int $level type of log to use. Defaults to LOG_DEBUG
+ * @param int|string $level Type of log to use. Defaults to LOG_DEBUG. When value is an integer
+ *    or a string matching the recognized levels, then it will
+ *    be treated as a log level. Otherwise it's treated as a scope.
  * @param int $depth The depth to output to. Defaults to 3.
  * @return void
  * @link https://book.cakephp.org/2.0/en/development/debugging.html#Debugger::log
@@ -250,7 +252,7 @@ class Debugger {
 		}
 
 		$data = compact(
-			'level', 'error', 'code', 'description', 'file', 'path', 'line', 'context'
+			'level', 'error', 'code', 'description', 'file', 'line', 'context'
 		);
 		echo $self->outputError($data);
 
diff --git a/web/api/lib/Cake/Utility/Folder.php b/web/api/lib/Cake/Utility/Folder.php
index 62fef677a..cf7e83e9a 100644
--- a/web/api/lib/Cake/Utility/Folder.php
+++ b/web/api/lib/Cake/Utility/Folder.php
@@ -122,7 +122,7 @@ class Folder {
  *
  * @param string $path Path to folder
  * @param bool $create Create folder if not found
- * @param string|bool $mode Mode (CHMOD) to apply to created folder, false to ignore
+ * @param int|bool $mode Mode (CHMOD) to apply to created folder, false to ignore
  * @link https://book.cakephp.org/2.0/en/core-utility-libraries/file-folder.html#Folder
  */
 	public function __construct($path = false, $create = false, $mode = false) {
@@ -520,7 +520,7 @@ class Folder {
 		foreach ($iterator as $itemPath => $fsIterator) {
 			if ($skipHidden) {
 				$subPathName = $fsIterator->getSubPathname();
-				if ($subPathName{0} === '.' || strpos($subPathName, DS . '.') !== false) {
+				if ($subPathName[0] === '.' || strpos($subPathName, DS . '.') !== false) {
 					continue;
 				}
 			}
diff --git a/web/api/lib/Cake/Utility/Hash.php b/web/api/lib/Cake/Utility/Hash.php
index 08dd2700a..84c706aee 100644
--- a/web/api/lib/Cake/Utility/Hash.php
+++ b/web/api/lib/Cake/Utility/Hash.php
@@ -384,8 +384,8 @@ class Hash {
  * following the path specified in `$groupPath`.
  *
  * @param array $data Array from where to extract keys and values
- * @param string $keyPath A dot-separated string.
- * @param string $valuePath A dot-separated string.
+ * @param array|string $keyPath A dot-separated string or array for formatting rules.
+ * @param array|string $valuePath A dot-separated string or array for formatting rules.
  * @param string $groupPath A dot-separated string.
  * @return array Combined array
  * @link https://book.cakephp.org/2.0/en/core-utility-libraries/hash.html#Hash::combine
diff --git a/web/api/lib/Cake/Utility/ObjectCollection.php b/web/api/lib/Cake/Utility/ObjectCollection.php
index 460ca86d0..322889892 100644
--- a/web/api/lib/Cake/Utility/ObjectCollection.php
+++ b/web/api/lib/Cake/Utility/ObjectCollection.php
@@ -95,6 +95,7 @@ abstract class ObjectCollection {
 		if (empty($this->_enabled)) {
 			return true;
 		}
+		$subject = null;
 		if ($callback instanceof CakeEvent) {
 			$event = $callback;
 			if (is_array($event->data)) {
@@ -125,7 +126,7 @@ abstract class ObjectCollection {
 		}
 		$result = null;
 		foreach ($list as $name) {
-			$result = call_user_func_array(array($this->_loaded[$name], $callback), compact('subject') + $params);
+			$result = call_user_func_array(array($this->_loaded[$name], $callback), array_values(array_filter(compact('subject')) + $params));
 			if ($options['collectReturn'] === true) {
 				$collected[] = $result;
 			}
diff --git a/web/api/lib/Cake/Utility/Sanitize.php b/web/api/lib/Cake/Utility/Sanitize.php
index 0f8b5e073..f05c2bb0f 100644
--- a/web/api/lib/Cake/Utility/Sanitize.php
+++ b/web/api/lib/Cake/Utility/Sanitize.php
@@ -72,7 +72,7 @@ class Sanitize {
 		$db = ConnectionManager::getDataSource($connection);
 		$string = $db->value($string, 'string');
 		$start = 1;
-		if ($string{0} === 'N') {
+		if ($string[0] === 'N') {
 			$start = 2;
 		}
 
diff --git a/web/api/lib/Cake/Utility/Set.php b/web/api/lib/Cake/Utility/Set.php
index 5958b9823..ac811da75 100644
--- a/web/api/lib/Cake/Utility/Set.php
+++ b/web/api/lib/Cake/Utility/Set.php
@@ -500,7 +500,7 @@ class Set {
 
 			$val = $data[$key];
 
-			if ($op === '=' && $expected && $expected{0} === '/') {
+			if ($op === '=' && $expected && $expected[0] === '/') {
 				return preg_match($expected, $val);
 			}
 			if ($op === '=' && $val != $expected) {
diff --git a/web/api/lib/Cake/VERSION.txt b/web/api/lib/Cake/VERSION.txt
index 42ae9cdb3..cef2c4856 100644
--- a/web/api/lib/Cake/VERSION.txt
+++ b/web/api/lib/Cake/VERSION.txt
@@ -17,4 +17,4 @@
 // @license       https://opensource.org/licenses/mit-license.php MIT License
 // +--------------------------------------------------------------------------------------------+ //
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-2.10.8
+2.10.24
diff --git a/web/api/lib/Cake/View/Helper/FormHelper.php b/web/api/lib/Cake/View/Helper/FormHelper.php
index 8a15e1d7a..0081b7754 100644
--- a/web/api/lib/Cake/View/Helper/FormHelper.php
+++ b/web/api/lib/Cake/View/Helper/FormHelper.php
@@ -609,8 +609,8 @@ class FormHelper extends AppHelper {
 		ksort($locked, SORT_STRING);
 		$fields += $locked;
 
-		$locked = implode(array_keys($locked), '|');
-		$unlocked = implode($unlockedFields, '|');
+		$locked = implode('|', array_keys($locked));
+		$unlocked = implode('|', $unlockedFields);
 		$hashParts = array(
 			$this->_lastAction,
 			serialize($fields),
@@ -1060,6 +1060,8 @@ class FormHelper extends AppHelper {
 		if ($options['type'] === 'radio' && isset($options['options'])) {
 			$radioOptions = (array)$options['options'];
 			unset($options['options']);
+		} else {
+			$radioOptions = array();
 		}
 
 		$label = $this->_getLabel($fieldName, $options);
@@ -1080,6 +1082,9 @@ class FormHelper extends AppHelper {
 			$dateFormat = $this->_extractOption('dateFormat', $options, 'MDY');
 			$timeFormat = $this->_extractOption('timeFormat', $options, 12);
 			unset($options['dateFormat'], $options['timeFormat']);
+		} else {
+			$dateFormat = 'MDY';
+			$timeFormat = 12;
 		}
 
 		$type = $options['type'];
@@ -2055,7 +2060,7 @@ class FormHelper extends AppHelper {
 			$tag = $this->Html->useTag('submitimage', $caption, $options);
 		} elseif ($isImage) {
 			unset($options['type']);
-			if ($caption{0} !== '/') {
+			if ($caption[0] !== '/') {
 				$url = $this->webroot(Configure::read('App.imageBaseUrl') . $caption);
 			} else {
 				$url = $this->webroot(trim($caption, '/'));
diff --git a/web/api/lib/Cake/View/Helper/HtmlHelper.php b/web/api/lib/Cake/View/Helper/HtmlHelper.php
index 5fc043534..bc7163e86 100644
--- a/web/api/lib/Cake/View/Helper/HtmlHelper.php
+++ b/web/api/lib/Cake/View/Helper/HtmlHelper.php
@@ -245,7 +245,7 @@ class HtmlHelper extends AppHelper {
  * - `block` Choose a custom block to append the meta tag to. Using this option
  *   will override the inline option.
  *
- * @param string $type The title of the external resource
+ * @param string|array $type The title of the external resource
  * @param string|array $url The address of the external resource or string for content attribute
  * @param array $options Other attributes for the generated tag. If the type attribute is html,
  *    rss, atom, or icon, the mime-type is returned.
@@ -341,7 +341,7 @@ class HtmlHelper extends AppHelper {
  * @param string $title The content to be wrapped by `<a>` tags.
  * @param string|array $url Cake-relative URL or array of URL parameters, or external URL (starts with http://)
  * @param array $options Array of options and HTML attributes.
- * @param string $confirmMessage JavaScript confirmation message. This
+ * @param string|bool $confirmMessage JavaScript confirmation message. This
  *   argument is deprecated as of 2.6. Use `confirm` key in $options instead.
  * @return string An `<a />` element.
  * @link https://book.cakephp.org/2.0/en/core-libraries/helpers/html.html#HtmlHelper::link
diff --git a/web/api/lib/Cake/View/Helper/JsBaseEngineHelper.php b/web/api/lib/Cake/View/Helper/JsBaseEngineHelper.php
index ca2d77621..3aa29b504 100644
--- a/web/api/lib/Cake/View/Helper/JsBaseEngineHelper.php
+++ b/web/api/lib/Cake/View/Helper/JsBaseEngineHelper.php
@@ -196,7 +196,7 @@ abstract class JsBaseEngineHelper extends AppHelper {
 		$length = strlen($string);
 		$return = '';
 		for ($i = 0; $i < $length; ++$i) {
-			$ord = ord($string{$i});
+			$ord = ord($string[$i]);
 			switch (true) {
 				case $ord == 0x08:
 					$return .= '\b';
@@ -216,10 +216,10 @@ abstract class JsBaseEngineHelper extends AppHelper {
 				case $ord == 0x22:
 				case $ord == 0x2F:
 				case $ord == 0x5C:
-					$return .= '\\' . $string{$i};
+					$return .= '\\' . $string[$i];
 					break;
 				case (($ord >= 0x20) && ($ord <= 0x7F)):
-					$return .= $string{$i};
+					$return .= $string[$i];
 					break;
 				case (($ord & 0xE0) == 0xC0):
 					if ($i + 1 >= $length) {
@@ -227,7 +227,7 @@ abstract class JsBaseEngineHelper extends AppHelper {
 						$return .= '?';
 						break;
 					}
-					$charbits = $string{$i} . $string{$i + 1};
+					$charbits = $string[$i] . $string[$i + 1];
 					$char = Multibyte::utf8($charbits);
 					$return .= sprintf('\u%04s', dechex($char[0]));
 					$i += 1;
@@ -238,7 +238,7 @@ abstract class JsBaseEngineHelper extends AppHelper {
 						$return .= '?';
 						break;
 					}
-					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2};
+					$charbits = $string[$i] . $string[$i + 1] . $string[$i + 2];
 					$char = Multibyte::utf8($charbits);
 					$return .= sprintf('\u%04s', dechex($char[0]));
 					$i += 2;
@@ -249,7 +249,7 @@ abstract class JsBaseEngineHelper extends AppHelper {
 						$return .= '?';
 						break;
 					}
-					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3};
+					$charbits = $string[$i] . $string[$i + 1] . $string[$i + 2] . $string[$i + 3];
 					$char = Multibyte::utf8($charbits);
 					$return .= sprintf('\u%04s', dechex($char[0]));
 					$i += 3;
@@ -260,7 +260,7 @@ abstract class JsBaseEngineHelper extends AppHelper {
 						$return .= '?';
 						break;
 					}
-					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3} . $string{$i + 4};
+					$charbits = $string[$i] . $string[$i + 1] . $string[$i + 2] . $string[$i + 3] . $string[$i + 4];
 					$char = Multibyte::utf8($charbits);
 					$return .= sprintf('\u%04s', dechex($char[0]));
 					$i += 4;
@@ -271,7 +271,7 @@ abstract class JsBaseEngineHelper extends AppHelper {
 						$return .= '?';
 						break;
 					}
-					$charbits = $string{$i} . $string{$i + 1} . $string{$i + 2} . $string{$i + 3} . $string{$i + 4} . $string{$i + 5};
+					$charbits = $string[$i] . $string[$i + 1] . $string[$i + 2] . $string[$i + 3] . $string[$i + 4] . $string[$i + 5];
 					$char = Multibyte::utf8($charbits);
 					$return .= sprintf('\u%04s', dechex($char[0]));
 					$i += 5;
diff --git a/web/api/lib/Cake/View/View.php b/web/api/lib/Cake/View/View.php
index 91776ad9a..085928d2e 100644
--- a/web/api/lib/Cake/View/View.php
+++ b/web/api/lib/Cake/View/View.php
@@ -120,9 +120,9 @@ class View extends CakeObject {
 	public $view = null;
 
 /**
- * Name of layout to use with this View.
+ * Name of layout to use with this View. If `false` then no layout is rendered.
  *
- * @var string
+ * @var string|bool
  */
 	public $layout = 'default';
 
@@ -455,7 +455,7 @@ class View extends CakeObject {
  * a plugin view/layout can be used instead of the app ones. If the chosen plugin is not found
  * the view will be located along the regular view path cascade.
  *
- * @param string $view Name of view file to use
+ * @param false|string $view Name of view file to use.
  * @param string $layout Layout to use.
  * @return string|null Rendered content or null if content already rendered and returned earlier.
  * @triggers View.beforeRender $this, array($viewFileName)
@@ -807,7 +807,7 @@ class View extends CakeObject {
  * a layout or other element. Analogous to Controller::set().
  *
  * @param string|array $one A string or an array of data.
- * @param string|array $two Value in case $one is a string (which then works as the key).
+ * @param mixed $two Value in case $one is a string (which then works as the key).
  *    Unused if $one is an associative array, otherwise serves as the values to $one's keys.
  * @return void
  */
diff --git a/web/api/lib/Cake/basics.php b/web/api/lib/Cake/basics.php
index 61ca6f047..10d965c1c 100644
--- a/web/api/lib/Cake/basics.php
+++ b/web/api/lib/Cake/basics.php
@@ -135,7 +135,7 @@ if (!function_exists('stackTrace')) {
  * - `start` - The stack frame to start generating a trace from. Defaults to 1
  *
  * @param array $options Format for outputting stack trace
- * @return mixed Formatted stack trace
+ * @return void Outputs formatted stack trace.
  * @see Debugger::trace()
  */
 	function stackTrace(array $options = array()) {
@@ -167,17 +167,16 @@ if (!function_exists('sortByKey')) {
 		if (!is_array($array)) {
 			return null;
 		}
-
+		$sa = array();
 		foreach ($array as $key => $val) {
 			$sa[$key] = $val[$sortBy];
 		}
-
 		if ($order === 'asc') {
 			asort($sa, $type);
 		} else {
 			arsort($sa, $type);
 		}
-
+		$out = array();
 		foreach ($sa as $key => $val) {
 			$out[] = $array[$key];
 		}
@@ -194,9 +193,9 @@ if (!function_exists('h')) {
  * @param string|array|object $text Text to wrap through htmlspecialchars. Also works with arrays, and objects.
  *    Arrays will be mapped and have all their elements escaped. Objects will be string cast if they
  *    implement a `__toString` method. Otherwise the class name will be used.
- * @param bool $double Encode existing html entities
+ * @param bool|string $double Boolean - encode existing html entities. String - character set to use when escaping.
  * @param string $charset Character set to use when escaping. Defaults to config value in 'App.encoding' or 'UTF-8'
- * @return string|array|object Wrapped text, Wrapped Array or Wrapped Object
+ * @return string|array|bool|object Wrapped text, Wrapped Array or Wrapped Object.
  * @link https://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#h
  */
 	function h($text, $double = true, $charset = null) {
@@ -227,6 +226,7 @@ if (!function_exists('h')) {
 		}
 		if (is_string($double)) {
 			$charset = $double;
+			$double = true;
 		}
 		return htmlspecialchars($text, ENT_QUOTES, ($charset) ? $charset : $defaultCharset, $double);
 	}
@@ -431,7 +431,7 @@ if (!function_exists('cache')) {
 		if (!is_numeric($expires)) {
 			$expires = strtotime($expires, $now);
 		}
-
+		$filename = '';
 		switch (strtolower($target)) {
 			case 'cache':
 				$filename = CACHE . $path;
@@ -484,7 +484,7 @@ if (!function_exists('clearCache')) {
  *   all files in app/tmp/cache/views will be deleted
  * @param string $type Directory in tmp/cache defaults to view directory
  * @param string $ext The file extension you are deleting
- * @return true if files found and deleted false otherwise
+ * @return bool `true` if files found and deleted, `false` otherwise.
  */
 	function clearCache($params = null, $type = 'views', $ext = '.php') {
 		if (is_string($params) || $params === null) {
@@ -551,8 +551,8 @@ if (!function_exists('stripslashes_deep')) {
 /**
  * Recursively strips slashes from all values in an array
  *
- * @param array $values Array of values to strip slashes
- * @return mixed What is returned from calling stripslashes
+ * @param array|string $values Array of values or a string to strip slashes.
+ * @return array|string What is returned from calling stripslashes.
  * @link https://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#stripslashes_deep
  */
 	function stripslashes_deep($values) {
@@ -1025,14 +1025,13 @@ if (!function_exists('fileExistsInPath')) {
  * Searches include path for files.
  *
  * @param string $file File to look for
- * @return string Full path to file if exists, otherwise false
+ * @return bool|string Full path to file if exists, otherwise `false`.
  * @link https://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#fileExistsInPath
  */
 	function fileExistsInPath($file) {
 		$paths = explode(PATH_SEPARATOR, ini_get('include_path'));
 		foreach ($paths as $path) {
 			$fullPath = $path . DS . $file;
-
 			if (file_exists($fullPath)) {
 				return $fullPath;
 			} elseif (file_exists($file)) {
diff --git a/web/css/bootstrap-table-page-jump-to.min.css b/web/css/bootstrap-table-page-jump-to.min.css
index 0c8e7d527..62c8ad8d3 100644
--- a/web/css/bootstrap-table-page-jump-to.min.css
+++ b/web/css/bootstrap-table-page-jump-to.min.css
@@ -1,7 +1,7 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.17.1
+  * @version v1.18.1
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
diff --git a/web/css/bootstrap-table.min.css b/web/css/bootstrap-table.min.css
index 00a219e7d..e8f36ff7e 100644
--- a/web/css/bootstrap-table.min.css
+++ b/web/css/bootstrap-table.min.css
@@ -1,10 +1,10 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.17.1
+  * @version v1.18.1
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
   */
 
-.bootstrap-table .fixed-table-toolbar::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-toolbar .bs-bars,.bootstrap-table .fixed-table-toolbar .columns,.bootstrap-table .fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group>.btn{border-radius:0}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .dropdown-menu{text-align:left;max-height:300px;overflow:auto;-ms-overflow-style:scrollbar;z-index:1001}.bootstrap-table .fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.bootstrap-table .fixed-table-toolbar .columns-left{margin-right:5px}.bootstrap-table .fixed-table-toolbar .columns-right{margin-left:5px}.bootstrap-table .fixed-table-toolbar .pull-right .dropdown-menu{right:0;left:auto}.bootstrap-table .fixed-table-container{position:relative;clear:both}.bootstrap-table .fixed-table-container .table{width:100%;margin-bottom:0!important}.bootstrap-table .fixed-table-container .table td,.bootstrap-table .fixed-table-container .table th{vertical-align:middle;box-sizing:border-box}.bootstrap-table .fixed-table-container .table thead th{vertical-align:bottom;padding:0;margin:0}.bootstrap-table .fixed-table-container .table thead th:focus{outline:0 solid transparent}.bootstrap-table .fixed-table-container .table thead th.detail{width:30px}.bootstrap-table .fixed-table-container .table thead th .th-inner{padding:.75rem;vertical-align:bottom;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.bootstrap-table .fixed-table-container .table thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px!important}.bootstrap-table .fixed-table-container .table thead th .both{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC")}.bootstrap-table .fixed-table-container .table thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.bootstrap-table .fixed-table-container .table thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.bootstrap-table .fixed-table-container .table tbody tr.selected td{background-color:rgba(0,0,0,.075)}.bootstrap-table .fixed-table-container .table tbody tr.no-records-found td{text-align:center}.bootstrap-table .fixed-table-container .table tbody tr .card-view{display:flex}.bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.bootstrap-table .fixed-table-container .table .bs-checkbox{text-align:center}.bootstrap-table .fixed-table-container .table .bs-checkbox label{margin-bottom:0}.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=checkbox],.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=radio]{margin:0 auto!important}.bootstrap-table .fixed-table-container .table.table-sm .th-inner{padding:.3rem}.bootstrap-table .fixed-table-container.fixed-height:not(.has-footer){border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height.has-card-view{border-top:1px solid #dee2e6;border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .fixed-table-border{border-left:1px solid #dee2e6;border-right:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table thead th{border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table-dark thead th{border-bottom:1px solid #32383e}.bootstrap-table .fixed-table-container .fixed-table-header{overflow:hidden}.bootstrap-table .fixed-table-container .fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading{align-items:center;background:#fff;display:none;justify-content:center;position:absolute;bottom:0;width:100%;z-index:1000}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap{align-items:baseline;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text{margin-right:6px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap{align-items:center;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::before{content:"";animation-duration:1.5s;animation-iteration-count:infinite;animation-name:LOADING;background:#212529;border-radius:50%;display:block;height:5px;margin:0 4px;opacity:0;width:5px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot{animation-delay:.3s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after{animation-delay:.6s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark{background:#212529}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::before{background:#fff}.bootstrap-table .fixed-table-container .fixed-table-footer{overflow:hidden}.bootstrap-table .fixed-table-pagination::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-pagination>.pagination,.bootstrap-table .fixed-table-pagination>.pagination-detail{margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-pagination>.pagination-detail .pagination-info{line-height:34px;margin-right:5px}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list{display:inline-block}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group{position:relative;display:inline-block;vertical-align:middle}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group .dropdown-menu{margin-bottom:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination{margin:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination a{padding:6px 12px;line-height:1.428571429}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a{color:#c8c8c8}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::before{content:'\2B05'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::after{content:'\27A1'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.disabled a{pointer-events:none;cursor:default}.bootstrap-table.fullscreen{position:fixed;top:0;left:0;z-index:1050;width:100%!important;background:#fff;height:calc(100vh);overflow-y:scroll}div.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}@keyframes LOADING{0%{opacity:0}50%{opacity:1}to{opacity:0}}
\ No newline at end of file
+.bootstrap-table .fixed-table-toolbar::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-toolbar .bs-bars,.bootstrap-table .fixed-table-toolbar .columns,.bootstrap-table .fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group>.btn{border-radius:0}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .dropdown-menu{text-align:left;max-height:300px;overflow:auto;-ms-overflow-style:scrollbar;z-index:1001}.bootstrap-table .fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.bootstrap-table .fixed-table-toolbar .columns-left{margin-right:5px}.bootstrap-table .fixed-table-toolbar .columns-right{margin-left:5px}.bootstrap-table .fixed-table-toolbar .pull-right .dropdown-menu{right:0;left:auto}.bootstrap-table .fixed-table-container{position:relative;clear:both}.bootstrap-table .fixed-table-container .table{width:100%;margin-bottom:0!important}.bootstrap-table .fixed-table-container .table td,.bootstrap-table .fixed-table-container .table th{vertical-align:middle;box-sizing:border-box}.bootstrap-table .fixed-table-container .table thead th{vertical-align:bottom;padding:0;margin:0}.bootstrap-table .fixed-table-container .table thead th:focus{outline:0 solid transparent}.bootstrap-table .fixed-table-container .table thead th.detail{width:30px}.bootstrap-table .fixed-table-container .table thead th .th-inner{padding:.75rem;vertical-align:bottom;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.bootstrap-table .fixed-table-container .table thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px!important}.bootstrap-table .fixed-table-container .table thead th .both{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC")}.bootstrap-table .fixed-table-container .table thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.bootstrap-table .fixed-table-container .table thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.bootstrap-table .fixed-table-container .table tbody tr.selected td{background-color:rgba(0,0,0,.075)}.bootstrap-table .fixed-table-container .table tbody tr.no-records-found td{text-align:center}.bootstrap-table .fixed-table-container .table tbody tr .card-view{display:flex}.bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-value{width:100%}.bootstrap-table .fixed-table-container .table .bs-checkbox{text-align:center}.bootstrap-table .fixed-table-container .table .bs-checkbox label{margin-bottom:0}.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=checkbox],.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=radio]{margin:0 auto!important}.bootstrap-table .fixed-table-container .table.table-sm .th-inner{padding:.3rem}.bootstrap-table .fixed-table-container.fixed-height:not(.has-footer){border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height.has-card-view{border-top:1px solid #dee2e6;border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .fixed-table-border{border-left:1px solid #dee2e6;border-right:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table thead th{border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table-dark thead th{border-bottom:1px solid #32383e}.bootstrap-table .fixed-table-container .fixed-table-header{overflow:hidden}.bootstrap-table .fixed-table-container .fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading{align-items:center;background:#fff;display:flex;justify-content:center;position:absolute;bottom:0;width:100%;z-index:1000;transition:visibility 0s,opacity .15s ease-in-out;opacity:0;visibility:hidden}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.open{visibility:visible;opacity:1}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap{align-items:baseline;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text{margin-right:6px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap{align-items:center;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::before{content:"";animation-duration:1.5s;animation-iteration-count:infinite;animation-name:LOADING;background:#212529;border-radius:50%;display:block;height:5px;margin:0 4px;opacity:0;width:5px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot{animation-delay:.3s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after{animation-delay:.6s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark{background:#212529}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::before{background:#fff}.bootstrap-table .fixed-table-container .fixed-table-footer{overflow:hidden}.bootstrap-table .fixed-table-pagination::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-pagination>.pagination,.bootstrap-table .fixed-table-pagination>.pagination-detail{margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-pagination>.pagination-detail .pagination-info{line-height:34px;margin-right:5px}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list{display:inline-block}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group{position:relative;display:inline-block;vertical-align:middle}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group .dropdown-menu{margin-bottom:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination{margin:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a{color:#c8c8c8}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::before{content:'\2B05'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::after{content:'\27A1'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.disabled a{pointer-events:none;cursor:default}.bootstrap-table.fullscreen{position:fixed;top:0;left:0;z-index:1050;width:100%!important;background:#fff;height:calc(100vh);overflow-y:scroll}.bootstrap-table.bootstrap4 .pagination-lg .page-link,.bootstrap-table.bootstrap5 .pagination-lg .page-link{padding:.5rem 1rem}div.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}@keyframes LOADING{0%{opacity:0}50%{opacity:1}to{opacity:0}}
\ No newline at end of file
diff --git a/web/css/overlay.css b/web/css/overlay.css
deleted file mode 100644
index 28714ebf5..000000000
--- a/web/css/overlay.css
+++ /dev/null
@@ -1,49 +0,0 @@
-.overlayMask {
-	position: absolute;
-	opacity: 0.6;
-	filter: alpha(opacity=60);
-	-ms-filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=60);
-	z-index: 999;
-	background: #aaaaaa;
-}
-
-.overlay {
-	display: none;
-    position: absolute;
-    background-color: #f0f0f0;
-    border: 2px solid #555555;
-    -moz-border-radius: 4px;
-    z-index: 1000;
-    overflow: hidden;
-}
-
-.overlayHeader {
-    float: left;
-    background-color: #853131;
-    width: 100%;
-    border-bottom: 1px solid #666666;
-    color: black;
-}
-
-.overlayTitle {
-    float: left;
-    padding: 10px 6px;
-    font-weight: bold;
-    width: auto;
-}
-
-.overlayToolbar {
-    float: right;
-    font-weight: bold;
-    padding: 6px 4px;
-    width: auto;
-}
-
-.overlayBody {
-    float: left;
-    width: 100%;
-}
-
-.overlayContent {
-    padding: 4px 4px 6px;
-}
diff --git a/web/includes/Event.php b/web/includes/Event.php
index 23f806354..7b0807728 100644
--- a/web/includes/Event.php
+++ b/web/includes/Event.php
@@ -14,8 +14,8 @@ class Event extends ZM_Object {
     'StorageId' => null,
     'SecondaryStorageId' => null,
     'Cause' => '',
-    'StartTime' => null,
-    'EndTime' => null,
+    'StartDateTime' => null,
+    'EndDateTime' => null,
     'Width' => null,
     'Height' => null,
     'Length' => null,
@@ -63,7 +63,7 @@ class Event extends ZM_Object {
         $this->{'Storage'} = Storage::find_one(array('Id'=>$this->{'StorageId'}));
       if ( ! ( property_exists($this, 'Storage') and $this->{'Storage'} ) ) {
         $this->{'Storage'} = new Storage(NULL);
-        $this->{'Storage'}->Scheme($this->{'Scheme'});
+        $this->{'Storage'}->Scheme($this->Scheme());
       }
     }
     return $this->{'Storage'};
@@ -93,7 +93,7 @@ class Event extends ZM_Object {
 
   public function Time() {
     if ( ! isset($this->{'Time'}) ) {
-      $this->{'Time'} = strtotime($this->{'StartTime'});
+      $this->{'Time'} = strtotime($this->{'StartDateTime'});
     }
     return $this->{'Time'};
   }
@@ -153,9 +153,9 @@ class Event extends ZM_Object {
       if ( $this->{'Scheme'} == 'Deep' ) {
 
         # Assumption: All events have a start time
-        $start_date = date_parse($this->{'StartTime'});
+        $start_date = date_parse($this->{'StartDateTime'});
         if ( ! $start_date ) {
-          throw new Exception('Unable to parse start time for event ' . $this->{'Id'} . ' not deleting files.');
+          throw new Exception('Unable to parse start date time for event ' . $this->{'Id'} . ' not deleting files.');
         }
         $start_date['year'] = $start_date['year'] % 100;
 
@@ -279,7 +279,7 @@ class Event extends ZM_Object {
     }
     if ( (!property_exists($this, 'DiskSpace')) or (null === $this->{'DiskSpace'}) ) {
       $this->{'DiskSpace'} = folder_size($this->Path());
-      if ( $this->{'EndTime'} ) {
+      if ( $this->{'EndDateTime'} ) {
         # Finished events shouldn't grow in size much so we can commit it to the db.
         dbQuery('UPDATE Events SET DiskSpace=? WHERE Id=?', array($this->{'DiskSpace'}, $this->{'Id'}));
       }
@@ -291,7 +291,7 @@ class Event extends ZM_Object {
 	# The idea here is that we don't really want to use the analysis jpeg as the thumbnail.  
 	# The snapshot image will be generated during capturing
     if ( file_exists($this->Path().'/snapshot.jpg') ) {
-      Logger::Debug("snapshot exists");
+      Debug("snapshot exists");
       $frame = null;
     } else {
       # Load the frame with the highest score to use as a thumbnail
@@ -396,14 +396,14 @@ class Event extends ZM_Object {
 
     if ( $frame and !is_array($frame) ) {
       # Must be an Id
-      Logger::Debug("Assuming that $frame is an Id");
+      Debug("Assuming that $frame is an Id");
       $frame = array('FrameId'=>$frame, 'Type'=>'', 'Delta'=>0);
     }
 
     if ( ( !$frame ) and file_exists($eventPath.'/snapshot.jpg') ) {
       # No frame specified, so look for a snapshot to use
       $captImage = 'snapshot.jpg';
-      Logger::Debug('Frame not specified, using snapshot');
+      Debug('Frame not specified, using snapshot');
       $frame = array('FrameId'=>'snapshot', 'Type'=>'', 'Delta'=>0);
     } else {
       $captImage = sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d-analyze.jpg', $frame['FrameId']);
@@ -421,11 +421,11 @@ class Event extends ZM_Object {
               
             #$command ='ffmpeg -v 0 -i '.$videoPath.' -vf "select=gte(n\\,'.$frame['FrameId'].'),setpts=PTS-STARTPTS" '.$eventPath.'/'.$captImage;
             $command ='ffmpeg -ss '. $frame['Delta'] .' -i '.$videoPath.' -frames:v 1 '.$eventPath.'/'.$captImage;
-            Logger::Debug('Running '.$command);
+            Debug('Running '.$command);
             $output = array();
             $retval = 0;
             exec($command, $output, $retval);
-            Logger::Debug("Retval: $retval, output: " . implode("\n", $output));
+            Debug("Retval: $retval, output: " . implode("\n", $output));
           } else {
             Error('Can\'t create frame images from video because there is no video file for event '.$Event->Id().' at ' .$Event->Path());
           }
@@ -529,7 +529,7 @@ class Event extends ZM_Object {
           return;
         }
       }
-      Logger::Debug("sending command to $url");
+      Debug("sending command to $url");
       // use key 'http' even if you send the request to https://...
       $options = array(
           'http' => array(
@@ -545,7 +545,7 @@ class Event extends ZM_Object {
           Error("Error restarting zmc using $url");
         }
         $event_data = json_decode($result,true);
-        Logger::Debug(print_r($event_data['event']['Event'],1));
+        Debug(print_r($event_data['event']['Event'],1));
         return $event_data['event']['Event']['fileExists'];
       } catch ( Exception $e ) {
         Error("Except $e thrown trying to get event data");
@@ -577,7 +577,7 @@ class Event extends ZM_Object {
           return;
         }
       }
-      Logger::Debug("sending command to $url");
+      Debug("sending command to $url");
       // use key 'http' even if you send the request to https://...
       $options = array(
           'http' => array(
@@ -593,7 +593,7 @@ class Event extends ZM_Object {
           Error("Error restarting zmc using $url");
         }
         $event_data = json_decode($result,true);
-        Logger::Debug(print_r($event_data['event']['Event'], 1));
+        Debug(print_r($event_data['event']['Event'], 1));
         return $event_data['event']['Event']['fileSize'];
       } catch ( Exception $e ) {
         Error("Except $e thrown trying to get event data");
@@ -606,7 +606,7 @@ class Event extends ZM_Object {
     if ( $this->Archived() ) {
       return false;
     }
-    if ( !$this->EndTime() ) {
+    if ( !$this->EndDateTime() ) {
       return false;
     }
     if ( !canEdit('Events') ) {
@@ -619,7 +619,7 @@ class Event extends ZM_Object {
   public function cant_delete_reason() {
     if ( $this->Archived() ) {
       return 'You cannot delete an archived event. Unarchive it first.';
-    } else if ( ! $this->EndTime() ) {
+    } else if ( ! $this->EndDateTime() ) {
       return 'You cannot delete an event while it is being recorded. Wait for it to finish.';
     } else if ( ! canEdit('Events') ) {
       return 'You do not have rights to edit Events.';
diff --git a/web/includes/Filter.php b/web/includes/Filter.php
index 089bdc996..3578a1d62 100644
--- a/web/includes/Filter.php
+++ b/web/includes/Filter.php
@@ -1,6 +1,7 @@
 <?php
 namespace ZM;
 require_once('Object.php');
+require_once('FilterTerm.php');
 
 class Filter extends ZM_Object {
   protected static $table = 'Filters';
@@ -16,6 +17,7 @@ class Filter extends ZM_Object {
 		'EmailBody'				=>	'',
     'AutoDelete'      =>  0,
     'AutoArchive'     =>  0,
+    'AutoUnarchive'   =>  0,
     'AutoVideo'       =>  0,
     'AutoUpload'      =>  0,
     'AutoMessage'     =>  0,
@@ -28,6 +30,7 @@ class Filter extends ZM_Object {
     'Background'      =>  0,
     'Concurrent'      =>  0,
     'Query_json'      =>  '',
+    'LockRows'        =>  0,
   );
 
   protected $_querystring;
@@ -39,6 +42,7 @@ class Filter extends ZM_Object {
 
   public function sql() {
     if ( ! isset($this->_sql) ) {
+      $this->_sql = '';
       foreach ( $this->FilterTerms() as $term ) {
         #if ( ! ($term->is_pre_sql() or $term->is_post_sql()) ) {
           $this->_sql .= $term->sql();
@@ -50,17 +54,22 @@ class Filter extends ZM_Object {
     return $this->_sql;
   }
 
-  public function querystring() {
-    if ( ! isset($this->_querystring) ) {
+  public function querystring($objectname='filter', $separator='&amp;') {
+    if ( (! isset($this->_querystring)) or ( $separator != '&amp;' ) or ($objectname != 'filter') ) {
+      $this->_querystring = '';
       foreach ( $this->FilterTerms() as $term ) {
-        $this->_querystring .= $term->querystring();
+        $this->_querystring .= $term->querystring($objectname, $separator);
       } # end foreach term
+      if ( $this->Id() ) {
+        $this->_querystring .= $separator.$objectname.urlencode('[Id]').'='.$this->Id();
+      }
     }
     return $this->_querystring;
   }
 
   public function hidden_fields() {
     if ( ! isset($this->_hidden_fields) ) {
+      $this->_hidden_fields = '';
       foreach ( $this->FilterTerms() as $term ) {
         $this->_hidden_fields .= $term->hidden_fields();
       } # end foreach term
@@ -137,6 +146,13 @@ class Filter extends ZM_Object {
     if ( func_num_args( ) ) {
       $this->{'Query'} = func_get_arg(0);
       $this->{'Query_json'} = jsonEncode($this->{'Query'});
+      # We have altered the query so need to reset all the calculated results.
+      unset($this->_querystring);
+      unset($this->_sql);
+      unset($this->_hidden_fields);
+      unset($this->_pre_sql_conditions);
+      unset($this->_post_sql_conditions);
+      unset($this->_Terms);
     }
     if ( !property_exists($this, 'Query') ) {
       if ( property_exists($this, 'Query_json') and $this->{'Query_json'} ) {
@@ -226,7 +242,7 @@ class Filter extends ZM_Object {
 
       if ( (!defined('ZM_SERVER_ID')) or (!$Server->Id()) or (ZM_SERVER_ID==$Server->Id()) ) {
         # Local
-        Logger::Debug("Controlling filter locally $command for server ".$Server->Id());
+        Debug("Controlling filter locally $command for server ".$Server->Id());
         daemonControl($command, 'zmfilter.pl', '--filter_id='.$this->{'Id'}.' --daemon');
       } else {
         # Remote case
@@ -243,7 +259,7 @@ class Filter extends ZM_Object {
           }
         }
         $url .= '&view=filter&object=filter&action=control&command='.$command.'&Id='.$this->Id().'&ServerId='.$Server->Id();
-        Logger::Debug("sending command to $url");
+        Debug("sending command to $url");
         $data = array();
         if ( defined('ZM_ENABLE_CSRF_MAGIC') ) {
           require_once( 'includes/csrf/csrf-magic.php' );
@@ -274,7 +290,7 @@ class Filter extends ZM_Object {
   public function execute() {
     $command = ZM_PATH_BIN.'/zmfilter.pl --filter_id='.escapeshellarg($this->Id());
     $result = exec($command, $output, $status);
-    Logger::Debug("$command status:$status output:".implode("\n", $output));
+    Debug("$command status:$status output:".implode("\n", $output));
     return $status;
   }
 
@@ -308,7 +324,344 @@ class Filter extends ZM_Object {
     return $failed;
   }
 
+  function tree() {
+    $terms = $this->terms();
+
+    if ( count($terms) <= 0 ) {
+      return false;
+    }
+
+    $StorageArea = NULL;
+
+    $postfixExpr = array();
+    $postfixStack = array();
+
+    $priorities = array(
+      '<' => 1,
+      '<=' => 1,
+      '>' => 1,
+      '>=' => 1,
+      '=' => 2,
+      '!=' => 2,
+      '=~' => 2,
+      '!~' => 2,
+      '=[]' => 2,
+      '![]' => 2,
+      'and' => 3,
+      'or' => 4,
+      'IS' => 2,
+      'IS NOT' => 2,
+    );
+
+    for ( $i = 0; $i < count($terms); $i++ ) {
+      $term = $terms[$i];
+      if ( !empty($term['cnj']) ) {
+        while ( true ) {
+          if ( !count($postfixStack) ) {
+            $postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
+            break;
+          } elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
+            $postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
+            break;
+          } elseif ( $priorities[$term['cnj']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
+            $postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
+            break;
+          } else {
+            $postfixExpr[] = array_pop($postfixStack);
+          }
+        }
+      } # end if ! empty cnj
+
+      if ( !empty($term['obr']) ) {
+        for ( $j = 0; $j < $term['obr']; $j++ ) {
+          $postfixStack[] = array('type'=>'obr', 'value'=>$term['obr']);
+        }
+      }
+      if ( !empty($term['attr']) ) {
+        $dtAttr = false;
+        switch ( $term['attr']) {
+        case 'MonitorName':
+          $sqlValue = 'M.'.preg_replace( '/^Monitor/', '', $term['attr']);
+          break;
+        case 'ServerId':
+          $sqlValue .= 'M.ServerId';
+          break;
+        case 'StorageServerId':
+          $sqlValue .= 'S.ServerId';
+          break;
+        case 'FilterServerId':
+          $sqlValue .= ZM_SERVER_ID;
+          break;
+        case 'DateTime':
+        case 'StartDateTime':
+          $sqlValue = 'E.StartDateTime';
+          $dtAttr = true;
+          break;
+        case 'Date':
+        case 'StartDate':
+          $sqlValue = 'to_days(E.StartDateTime)';
+          $dtAttr = true;
+          break;
+        case 'Time':
+        case 'StartTime':
+          $sqlValue = 'extract(hour_second from E.StartDateTime)';
+          break;
+        case 'Weekday':
+        case 'StartWeekday':
+          $sqlValue = 'weekday(E.StartDateTime)';
+          break;
+        case 'EndDateTime':
+          $sqlValue = 'E.EndDateTime';
+          $dtAttr = true;
+          break;
+        case 'EndDate':
+          $sqlValue = 'to_days(E.EndDateTime)';
+          $dtAttr = true;
+          break;
+        case 'EndTime':
+          $sqlValue = 'extract(hour_second from E.EndDateTime)';
+          break;
+        case 'EndWeekday':
+          $sqlValue = 'weekday(E.EndDateTime)';
+          break;
+        case 'Id':
+        case 'Name':
+        case 'MonitorId':
+        case 'StorageId':
+        case 'SecondaryStorageId':
+        case 'Length':
+        case 'Frames':
+        case 'AlarmFrames':
+        case 'TotScore':
+        case 'AvgScore':
+        case 'MaxScore':
+        case 'Cause':
+        case 'Notes':
+        case 'StateId':
+        case 'Archived':
+          $sqlValue = 'E.'.$term['attr'];
+          break;
+        case 'DiskPercent':
+          // Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
+          if ( ! $StorageArea ) {
+            for ( $j = 0; $j < count($terms); $j++ ) {
+              if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
+                $StorageArea = new Storage($terms[$j]['val']);
+                break;
+              }
+            } // end foreach remaining term
+            if ( ! $StorageArea ) $StorageArea = new Storage();
+          } // end no StorageArea found yet
+          $sqlValue = getDiskPercent($StorageArea);
+          break;
+        case 'DiskBlocks':
+          // Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
+          if ( ! $StorageArea ) {
+            for ( $j = 0; $j < count($terms); $j++ ) {
+              if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
+                $StorageArea = new Storage($terms[$j]['val']);
+                break;
+              }
+            } // end foreach remaining term
+            if ( ! $StorageArea ) $StorageArea = new Storage();
+          } // end no StorageArea found yet
+          $sqlValue = getDiskBlocks($StorageArea);
+          break;
+        default :
+          $sqlValue = $term['attr'];
+          break;
+        }
+        if ( $dtAttr ) {
+          $postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue, 'dtAttr'=>true);
+        } else {
+          $postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue);
+        }
+      } # end if attr
+
+      $sqlValue = '';
+      if ( isset($term['op']) ) {
+        if ( empty($term['op']) ) {
+          $term['op'] = '=';
+        }
+        switch ( $term['op']) {
+        case '=' :
+        case '!=' :
+        case '>=' :
+        case '>' :
+        case '<' :
+        case '<=' :
+        case 'LIKE' :
+        case 'NOT LIKE':
+          $sqlValue = $term['op'];
+          break;
+        case '=~' :
+          $sqlValue = 'regexp';
+          break;
+        case '!~' :
+          $sqlValue = 'not regexp';
+          break;
+        case '=[]' :
+        case 'IN' :
+          $sqlValue = 'in (';
+          break;
+        case '![]' :
+          $sqlValue = 'not in (';
+          break;
+        case 'IS' :
+        case 'IS NOT' :
+          if ( $term['val'] == 'Odd' )  {
+            $sqlValue = ' % 2 = 1';
+          } else if ( $term['val'] == 'Even' )  {
+            $sqlValue = ' % 2 = 0';
+          } else {
+            $sqlValue = ' '.$term['op'];
+          }
+          break;
+        default :
+          ZM\Error('Unknown operator in filter '.$term['op']);
+        }
+
+        while ( true ) {
+          if ( !count($postfixStack) ) {
+            $postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue);
+            break;
+          } else if ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
+            $postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue);
+            break;
+          } else if ( $priorities[$term['op']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
+            $postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue );
+            break;
+          } else {
+            $postfixExpr[] = array_pop($postfixStack);
+          }
+        } // end while
+      } // end if operator
+
+      if ( isset($term['val']) ) {
+        $valueList = array();
+        foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $term['val'])) as $value ) {
+          $value_upper = strtoupper($value);
+          switch ( $term['attr'] ) {
+          case 'MonitorName':
+          case 'Name':
+          case 'Cause':
+          case 'Notes':
+            if ( $term['op'] == 'LIKE' || $term['op'] == 'NOT LIKE' ) {
+              $value = '%'.$value.'%';
+            }
+            $value = dbEscape($value);
+            break;
+          case 'MonitorServerId':
+          case 'FilterServerId':
+          case 'StorageServerId':
+          case 'ServerId':
+            if ( $value_upper == 'ZM_SERVER_ID' ) {
+              $value = ZM_SERVER_ID;
+            } else if ( $value_upper == 'NULL' ) {
+
+            } else {
+              $value = dbEscape($value);
+            }
+            break;
+          case 'StorageId':
+            $StorageArea = new Storage($value);
+            if ( $value != 'NULL' )
+              $value = dbEscape($value);
+            break;
+          case 'DateTime':
+          case 'EndDateTime':
+          case 'StartDateTime':
+            if ( $value_upper != 'NULL' )
+              $value = "'".strftime(STRF_FMT_DATETIME_DB, strtotime($value))."'";
+            break;
+          case 'Date':
+          case 'EndDate':
+          case 'StartDate':
+            $value = 'to_days(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
+            break;
+          case 'Time':
+          case 'EndTime':
+          case 'StartTime':
+            $value = 'extract(hour_second from \''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
+            break;
+          default :
+            if ( $value_upper != 'NULL' )
+              $value = dbEscape($value);
+          } // end switch attribute
+          $valueList[] = $value;
+        } // end foreach value
+        $postfixExpr[] = array('type'=>'val', 'value'=>$term['val'], 'sqlValue'=>join(',', $valueList));
+      } // end if has val
+
+      if ( !empty($term['cbr']) ) {
+        for ( $j = 0; $j < $term['cbr']; $j++ ) {
+          while ( count($postfixStack) ) {
+            $element = array_pop($postfixStack);
+            if ( $element['type'] == 'obr' ) {
+              $postfixExpr[count($postfixExpr)-1]['bracket'] = true;
+              break;
+            }
+            $postfixExpr[] = $element;
+          }
+        }
+      } #end if cbr
+    } # end foreach term
+
+    while ( count($postfixStack) ) {
+      $postfixExpr[] = array_pop($postfixStack);
+    }
+
+    $exprStack = array();
+    foreach ( $postfixExpr as $element ) {
+      if ( $element['type'] == 'attr' || $element['type'] == 'val' ) {
+        $node = array('data'=>$element, 'count'=>0);
+        $exprStack[] = $node;
+      } elseif ( $element['type'] == 'op' || $element['type'] == 'cnj' ) {
+        $right = array_pop($exprStack);
+        $left = array_pop($exprStack);
+        $node = array('data'=>$element, 'count'=>2+$left['count']+$right['count'], 'right'=>$right, 'left'=>$left);
+        $exprStack[] = $node;
+      } else {
+        ZM\Fatal('Unexpected element type \''.$element['type'].'\', value \''.$element['value'].'\'');
+      }
+    }
+    if ( count($exprStack) != 1 ) {
+      ZM\Fatal('Expression stack has '.count($exprStack).' elements');
+    }
+    return array_pop($exprStack);
+  } # end function tree
+
+  function addTerm($term=false, $position=null) {
+
+    if ( !FilterTerm::is_valid_attr($term['attr']) ) {
+      Error('Unsupported filter attribute ' . $term['attr']);
+      //return $this;
+    }
+
+    $terms = $this->terms();
+
+    if ( (!isset($position)) or ($position > count($terms)) )
+      $position = count($terms);
+    else if ( $position < 0 )
+      $position = 0;
+
+    if ( $term && ($position == 0) ) {
+      # if only 1 term, don't need AND or OR
+      unset($term['cnj']);
+    }
+
+    array_splice($terms, $position, 0, array($term ? $term : array()));
+    $this->terms($terms);
+
+    return $this;
+  } # end function addTerm
+
+  function addTerms($terms, $options=null) {
+    foreach ( $terms as $term ) {
+      $this->addTerm($term);
+    }
+    return $this;
+  }
 
 } # end class Filter
-
 ?>
diff --git a/web/includes/FilterTerm.php b/web/includes/FilterTerm.php
index 02be63833..8a58e2f98 100644
--- a/web/includes/FilterTerm.php
+++ b/web/includes/FilterTerm.php
@@ -13,6 +13,7 @@ function getFilterQueryConjunctionTypes() {
   return $validConjunctionTypes;
 }
 
+
 class FilterTerm {
   public $filter;
   public $index;
@@ -35,11 +36,16 @@ class FilterTerm {
     $this->val = $term['val'];
     if ( isset($term['cnj']) ) {
       if ( array_key_exists($term['cnj'], $validConjunctionTypes) ) {
-      $this->cnj = $term['cnj'];
+        $this->cnj = $term['cnj'];
       } else {
         Warning('Invalid cnj ' . $term['cnj'].' in '.print_r($term, true));
       }
     }
+    if ( isset($term['tablename']) ) {
+      $this->tablename = $term['tablename'];
+    } else {
+      $this->tablename = 'E';
+    }
 
     if ( isset($term['obr']) ) {
       if ( (string)(int)$term['obr'] == $term['obr'] ) {
@@ -65,8 +71,9 @@ class FilterTerm {
       return $values;
     }
 
-    foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $this->val)) as $value ) {
-
+    $vals = is_array($this->val) ? $this->val : preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $this->val));
+    foreach ( $vals as $value ) {
+      $value_upper = strtoupper($value);
       switch ( $this->attr ) {
 
       case 'AlarmedZoneId':
@@ -75,7 +82,7 @@ class FilterTerm {
       case 'ExistsInFileSystem':
         $value = '';
         break;
-      case 'DiskSpace':
+      case 'DiskPercent':
         $value = '';
         break;
       case 'MonitorName':
@@ -83,7 +90,7 @@ class FilterTerm {
       case 'Name':
       case 'Cause':
       case 'Notes':
-        if ( $this->op == 'LIKE' || $this->op == 'NOT LIKE' ) {
+        if ( strstr($this->op, 'LIKE') and ! strstr($this->val, '%' ) ) {
           $value = '%'.$value.'%';
         }
         $value = dbEscape($value);
@@ -94,36 +101,36 @@ class FilterTerm {
       case 'ServerId':
         if ( $value == 'ZM_SERVER_ID' ) {
           $value = ZM_SERVER_ID;
-        } else if ( $value == 'NULL' ) {
+        } else if ( $value_upper == 'NULL' ) {
 
         } else {
           $value = dbEscape($value);
         }
         break;
       case 'StorageId':
-        if ( $value != 'NULL' ) {
+        if ( $value_upper != 'NULL' ) {
           $value = dbEscape($value);
         }
         break;
       case 'DateTime':
       case 'StartDateTime':
       case 'EndDateTime':
-        if ( $value != 'NULL' )
+        if ( $value_upper != 'NULL' )
           $value = '\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\'';
         break;
       case 'Date':
       case 'StartDate':
       case 'EndDate':
-        if ( $value == 'CURDATE()' or $value == 'NOW()' ) {
+        if ( $value_upper == 'CURDATE()' or $value_upper == 'NOW()' ) {
           $value = 'to_days('.$value.')';
-        } else if ( $value != 'NULL' ) {
+        } else if ( $value_upper != 'NULL' ) {
           $value = 'to_days(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
         }
         break;
       case 'Time':
       case 'StartTime':
       case 'EndTime':
-        if ( $value != 'NULL' )
+        if ( $value_upper != 'NULL' )
           $value = 'extract(hour_second from \''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
         break;
       default :
@@ -131,7 +138,7 @@ class FilterTerm {
           $value = 1;
         } else if ( $value == 'Even' ) {
           $value = 0;
-        } else if ( $value != 'NULL' )
+        } else if ( $value_upper != 'NULL' )
           $value = dbEscape($value);
         break;
       }
@@ -141,15 +148,14 @@ class FilterTerm {
   } # end function sql_values
 
   public function sql_operator() {
-    switch ( $this->attr ) {
-    case 'AlarmZoneId':
+    switch ($this->attr) {
+    case 'AlarmedZoneId':
       return ' EXISTS ';
     case 'ExistsInFileSystem':
-    case 'DiskSpace':
+    case 'DiskPercent':
       return '';
     }
 
-
     switch ( $this->op ) {
     case '=' :
     case '!=' :
@@ -185,7 +191,7 @@ class FilterTerm {
       }
       return ' IS NOT ';
     default:
-      ZM\Warning('Invalid operator in filter: ' . print_r($this->op, true));
+      Warning('Invalid operator in filter: ' . print_r($this->op, true));
     } // end switch op
   } # end public function sql_operator
 
@@ -194,15 +200,19 @@ class FilterTerm {
 
     $sql = '';
     if ( isset($this->cnj) ) {
-      $sql .= ' '.$this->cnj.' ';
+      $sql .= ' '.$this->cnj;
     }
     if ( isset($this->obr) ) {
-      $sql .= ' '.str_repeat('(', $this->obr).' ';
+      $sql .= ' '.str_repeat('(', $this->obr);
     }
+    $sql .= ' ';
 
     switch ( $this->attr ) {
+    case 'AlarmedZoneId':
+      $sql .= '/* AlarmedZoneId */ ';
+      break;
     case 'ExistsInFileSystem':
-    case 'DiskSpace':
+    case 'DiskPercent':
       $sql .= 'TRUE /*'.$this->attr.'*/';
       break;
     case 'MonitorName':
@@ -220,49 +230,59 @@ class FilterTerm {
       break;
       # Unspecified start or end, so assume start, this is to support legacy filters
     case 'DateTime':
-      $sql .= 'E.StartTime';
+      $sql .= 'E.StartDateTime';
       break;
     case 'Date':
-      $sql .= 'to_days(E.StartTime)';
+      $sql .= 'to_days(E.StartDateTime)';
       break;
     case 'Time':
-      $sql .= 'extract(hour_second FROM E.StartTime)';
+      $sql .= 'extract(hour_second FROM E.StartDateTime)';
       break;
     case 'Weekday':
-      $sql .= 'weekday(E.StartTime)';
+      $sql .= 'weekday(E.StartDateTime)';
       break;
       # Starting Time
     case 'StartDateTime':
-      $sql .= 'E.StartTime';
+      $sql .= 'E.StartDateTime';
+      break;
+    case 'FrameId':
+      $sql .= 'Id';
+      break;
+    case 'Type':
+    case 'TimeStamp':
+    case 'Delta':
+    case 'Score':
+      $sql .= $this->attr;
       break;
     case 'FramesEventId':
       $sql .= 'F.EventId';
       break;
     case 'StartDate':
-      $sql .= 'to_days(E.StartTime)';
+      $sql .= 'to_days(E.StartDateTime)';
       break;
     case 'StartTime':
-      $sql .= 'extract(hour_second FROM E.StartTime)';
+      $sql .= 'extract(hour_second FROM E.StartDateTime)';
       break;
     case 'StartWeekday':
-      $sql .= 'weekday(E.StartTime)';
+      $sql .= 'weekday(E.StartDateTime)';
       break;
       # Ending Time
     case 'EndDateTime':
-      $sql .= 'E.EndTime';
+      $sql .= 'E.EndDateTime';
       break;
     case 'EndDate':
-      $sql .= 'to_days(E.EndTime)';
+      $sql .= 'to_days(E.EndDateTime)';
       break;
     case 'EndTime':
-      $sql .= 'extract(hour_second FROM E.EndTime)';
+      $sql .= 'extract(hour_second FROM E.EndDateTime)';
       break;
     case 'EndWeekday':
-      $sql .= 'weekday(E.EndTime)';
+      $sql .= 'weekday(E.EndDateTime)';
       break;
+    case 'Emailed':
     case 'Id':
     case 'Name':
-    case 'EventDiskSpace':
+    case 'DiskSpace':
     case 'MonitorId':
     case 'StorageId':
     case 'SecondaryStorageId':
@@ -276,7 +296,10 @@ class FilterTerm {
     case 'Notes':
     case 'StateId':
     case 'Archived':
-      $sql .= 'E.'.$this->attr;
+      $sql .= $this->tablename.'.'.$this->attr;
+      break;
+    default :
+      $sql .= $this->tablename.'.'.$this->attr;
     }
     $sql .= $this->sql_operator();
     $values = $this->sql_values();
@@ -287,24 +310,25 @@ class FilterTerm {
     }
 
     if ( isset($this->cbr) ) {
-      $sql .= ' '.str_repeat(')', $this->cbr).' ';
+      $sql .= ' '.str_repeat(')', $this->cbr);
     }
+    $sql .= PHP_EOL;
     return $sql;
   } # end public function sql
 
-  public function querystring($querySep='&amp;') {
+  public function querystring($objectname='filter', $querySep='&amp;') {
     # We don't validate the term parameters here
     $query = '';
     if ( $this->cnj ) 
-      $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][cnj]').'='.$this->cnj;
+      $query .= $querySep.urlencode($objectname.'[Query][terms]['.$this->index.'][cnj]').'='.$this->cnj;
     if ( $this->obr )
-      $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][obr]').'='.$this->obr;
+      $query .= $querySep.urlencode($objectname.'[Query][terms]['.$this->index.'][obr]').'='.$this->obr;
 
-    $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][attr]').'='.urlencode($this->attr);
-    $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][op]').'='.urlencode($this->op);
-    $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][val]').'='.urlencode($this->val);
+    $query .= $querySep.urlencode($objectname.'[Query][terms]['.$this->index.'][attr]').'='.urlencode($this->attr);
+    $query .= $querySep.urlencode($objectname.'[Query][terms]['.$this->index.'][op]').'='.urlencode($this->op);
+    $query .= $querySep.urlencode($objectname.'[Query][terms]['.$this->index.'][val]').'='.urlencode($this->val);
     if ( $this->cbr )
-      $query .= $querySep.urlencode('filter[Query][terms]['.$this->index.'][cbr]').'='.$this->cbr;
+      $query .= $querySep.urlencode($objectname.'[Query][terms]['.$this->index.'][cbr]').'='.$this->cbr;
     return $query;
   } # end public function querystring
 
@@ -329,14 +353,14 @@ class FilterTerm {
   public function test($event=null) {
     if ( !isset($event) ) {
       # Is a Pre Condition
-      Logger::Debug("Testing " . $this->attr);
+      Debug("Testing " . $this->attr);
       if ( $this->attr == 'DiskPercent' ) {
         # The logic on this is really ugly.  We are going to treat it as an OR
         foreach ( $this->filter->get_StorageAreas() as $storage ) {
           $string_to_eval = 'return $storage->disk_usage_percent() '.$this->op.' '.$this->val.';';
           try {
             $ret = eval($string_to_eval);
-            Logger::Debug("Evalled $string_to_eval = $ret");
+            Debug("Evalled $string_to_eval = $ret");
             if ( $ret )
               return true;
           } catch ( Throwable $t ) {
@@ -348,7 +372,7 @@ class FilterTerm {
         $string_to_eval = 'return getLoad() '.$this->op.' '.$this->val.';';
         try {
           $ret = eval($string_to_eval);
-          Logger::Debug("Evaled $string_to_eval = $ret");
+          Debug("Evaled $string_to_eval = $ret");
           if ( $ret )
             return true;
         } catch ( Throwable $t ) {
@@ -374,7 +398,7 @@ class FilterTerm {
         $string_to_eval = 'return $event->Storage()->disk_usage_percent() '.$this->op.' '.$this->val.';';
         try {
           $ret = eval($string_to_eval);
-          Logger::Debug("Evalled $string_to_eval = $ret");
+          Debug("Evalled $string_to_eval = $ret");
           if ( $ret )
             return true;
         } catch ( Throwable $t ) {
@@ -385,7 +409,7 @@ class FilterTerm {
         $string_to_eval = 'return $event->Storage()->disk_usage_blocks() '.$this->op.' '.$this->val.';';
         try {
           $ret = eval($string_to_eval);
-          Logger::Debug("Evalled $string_to_eval = $ret");
+          Debug("Evalled $string_to_eval = $ret");
           if ( $ret )
             return true;
         } catch ( Throwable $t ) {
@@ -400,21 +424,70 @@ class FilterTerm {
   }
   
   public function is_pre_sql() {
-    if ( $this->attr == 'DiskPercent' ) {
+    if ( $this->attr == 'DiskPercent' )
+        return true;
+    if ( $this->attr == 'DiskBlocks' )
         return true;
-    }
     return false;
   }
 
   public function is_post_sql() {
     if ( $this->attr == 'ExistsInFileSystem' ) {
         return true;
-    } else if ( $this->attr == 'DiskPercent' ) {
-        return true;
     }
     return false;
   }
 
+  public static function is_valid_attr($attr) {
+    $attrs = array(
+      'Score',
+      'Delta',
+      'TimeStamp',
+      'Type',
+      'FrameId',
+      'EventId',
+      'ExistsInFileSystem',
+      'Emailed',
+      'DiskSpace',
+      'DiskPercent',
+      'DiskBlocks',
+      'MonitorName',
+      'ServerId',
+      'MonitorServerId',
+      'StorageServerId',
+      'FilterServerId',
+      'DateTime',
+      'Date',
+      'Time',
+      'Weekday',
+      'StartDateTime',
+      'FramesId',
+      'FramesEventId',
+      'StartDate',
+      'StartTime',
+      'StartWeekday',
+      'EndDateTime',
+      'EndDate',
+      'EndTime',
+      'EndWeekday',
+      'Id',
+      'Name',
+      'MonitorId',
+      'StorageId',
+      'SecondaryStorageId',
+      'Length',
+      'Frames',
+      'AlarmFrames',
+      'TotScore',
+      'AvgScore',
+      'MaxScore',
+      'Cause',
+      'Notes',
+      'StateId',
+      'Archived'
+    );
+    return in_array($attr, $attrs);
+  }
 } # end class FilterTerm
 
 ?>
diff --git a/web/includes/Group.php b/web/includes/Group.php
index f5a78f875..026d1f7f4 100644
--- a/web/includes/Group.php
+++ b/web/includes/Group.php
@@ -77,7 +77,7 @@ class Group extends ZM_Object {
   public static function get_dropdown_options() {
     $Groups = array();
     foreach ( Group::find(array(), array('order'=>'lower(Name)')) as $Group ) {
-      $Groups[$Group->Id()] = $Group;
+			if ($Group->canView()) $Groups[$Group->Id()] = $Group;
     }
 
 # This  array is indexed by parent_id
@@ -146,33 +146,58 @@ class Group extends ZM_Object {
 	  }
 	  $monitors_dropdown = array(''=>'All');
 
-	foreach ( dbFetchAll($sql) as $monitor ) {
-    if ( !visibleMonitor($monitor['Id']) ) {
-      continue;
-    }
-    $monitors_dropdown[$monitor['Id']] = $monitor['Name'];
-  }
+		foreach ( dbFetchAll($sql) as $monitor ) {
+			if ( !visibleMonitor($monitor['Id']) ) {
+				continue;
+			}
+			$monitors_dropdown[$monitor['Id']] = $monitor['Name'];
+		}
 
-  echo htmlSelect('monitor_id', $monitors_dropdown, $monitor_id, array('data-on-change-this'=>'changeMonitor'));
-  return $monitor_id;
-}
+		echo htmlSelect('monitor_id', $monitors_dropdown, $monitor_id, array('data-on-change-this'=>'changeMonitor'));
+		return $monitor_id;
+	}
 
-public function Parent( ) {
-  if ( $this->{'ParentId'} ) {
-    return Group::find_one(array('Id'=>$this->{'ParentId'}));
-  }
-  return null;
-}
+	public function Parent( ) {
+		if ( $this->{'ParentId'} ) {
+			return Group::find_one(array('Id'=>$this->{'ParentId'}));
+		}
+		return null;
+	}
 
-public function Parents() {
-  $Parents = array();
-  $Parent = $this->Parent();
-  while( $Parent ) {
-    array_unshift($Parents, $Parent);
-    $Parent = $Parent->Parent();
-  }
-  return $Parents;
-}
+	public function Parents() {
+		$Parents = array();
+		$Parent = $this->Parent();
+		while( $Parent ) {
+			array_unshift($Parents, $Parent);
+			$Parent = $Parent->Parent();
+		}
+		return $Parents;
+	}
+	public function Children() {
+		if (!property_exists($this, 'Children')) {
+			$this->{'Children'} = Group::find(array('ParentId'=>$this->Id()));
+		}
+		return $this->{'Children'};
+	}
+	public function Monitors() {
+    if (!property_exists($this, 'Monitors') ) {
+			$this->{'Monitors'} = Monitor::find(array('Id'=>$this->MonitorIds()));
+		}
+		return $this->{'Monitors'};
+	}
 
+	public function canView($u=null) {
+		global $user;
+		if (!$u) $u = $user;
+		# Can view if we can view any of the monitors in it.
+		foreach ($this->Monitors() as $monitor) {
+			if ($monitor->canView($u)) return true;
+		}
+		foreach ($this->Children() as $child) {
+			if ($child->canView($u)) return true;
+		}
+
+		return false;
+	}
 } # end class Group
 ?>
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index c1962141a..ad3e95a0d 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -28,13 +28,14 @@ class Monitor extends ZM_Object {
 
   protected $defaults = array(
     'Id' => null,
-    'Name' => array('type'=>'text','filter_regexp'=>'/[^\w\-\.\(\)\:\/ ]/'),
+    'Name' => array('type'=>'text','filter_regexp'=>'/[^\w\-\.\(\)\:\/ ]/', 'default'=>'Monitor'),
     'Notes' => '',
     'ServerId' => 0,
     'StorageId' => 0,
     'Type'      => 'Ffmpeg',
     'Function'  => 'Mocord',
     'Enabled'   => array('type'=>'boolean','default'=>1),
+    'DecodingEnabled'   => array('type'=>'boolean','default'=>1),
     'LinkedMonitors' => array('type'=>'set', 'default'=>null),
     'Triggers'  =>  array('type'=>'set','default'=>''),
     'ONVIF_URL' =>  '',
@@ -52,6 +53,7 @@ class Monitor extends ZM_Object {
     'Port'  =>  '',
     'SubPath' =>  '',
     'Path'  =>  null,
+    'SecondPath'  =>  null,
     'Options' =>  null,
     'User'  =>  null,
     'Pass'  =>  null,
@@ -67,8 +69,9 @@ class Monitor extends ZM_Object {
     'SaveJPEGs' =>  3,
     'VideoWriter' =>  '0',
     'OutputCodec' =>  null,
+    'Encoder'     =>  'auto',
     'OutputContainer' => null,
-    'EncoderParameters' => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n",
+    'EncoderParameters' => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\ncrf=23\n",
     'RecordAudio' =>  array('type'=>'boolean', 'default'=>0),
     'RTSPDescribe'  =>  array('type'=>'boolean','default'=>0),
     'Brightness'  =>  -1,
@@ -80,7 +83,8 @@ class Monitor extends ZM_Object {
     'LabelX'      =>  0,
     'LabelY'      =>  0,
     'LabelSize'   =>  1,
-    'ImageBufferCount'  =>  20,
+    'ImageBufferCount'  =>  3,
+    'MaxImageBufferCount'  =>  0,
     'WarmupCount' =>  0,
     'PreEventCount' =>  5,
     'PostEventCount'  =>  5,
@@ -106,13 +110,30 @@ class Monitor extends ZM_Object {
     'TrackDelay'      =>  null,
     'ReturnLocation'  =>  -1,
     'ReturnDelay'     =>  null,
+    'ModectDuringPTZ' =>  array('type'=>'boolean','default'=>0),
     'DefaultRate' =>  100,
-    'DefaultScale'  =>  100,
+    'DefaultScale'  =>  0,
     'SignalCheckPoints' =>  0,
     'SignalCheckColour' =>  '#0000BE',
     'WebColour'   =>  '#ff0000',
-    'Exif'    =>  array('type'=>'boolean','default'=>0),
+    'Exif'    =>  array('type'=>'boolean', 'default'=>0),
     'Sequence'  =>  null,
+    'ZoneCount' =>  0,
+    'Refresh' => null,
+    'DefaultCodec'  => 'auto',
+    'GroupIds'    => array('default'=>array(), 'do_not_update'=>1),
+    'Latitude'  =>  null,
+    'Longitude' =>  null,
+    'RTSPServer' => array('type'=>'boolean', 'default'=>0),
+    'RTSPStreamName'  => '',
+  );
+  private $status_fields = array(
+    'Status'  =>  null,
+    'AnalysisFPS' => null,
+    'CaptureFPS' => null,
+    'CaptureBandwidth' => null,
+  );
+  private $summary_fields = array(
     'TotalEvents' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
     'TotalEventDiskSpace' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
     'HourEvents' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
@@ -125,16 +146,6 @@ class Monitor extends ZM_Object {
     'MonthEventDiskSpace' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
     'ArchivedEvents' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
     'ArchivedEventDiskSpace' =>  array('type'=>'integer', 'default'=>null, 'do_not_update'=>1),
-    'ZoneCount' =>  0,
-    'Refresh' => null,
-    'DefaultCodec'  => 'auto',
-    'GroupIds'    => array('default'=>array(), 'do_not_update'=>1),
-  );
-  private $status_fields = array(
-    'Status'  =>  null,
-    'AnalysisFPS' => null,
-    'CaptureFPS' => null,
-    'CaptureBandwidth' => null,
   );
 
   public function Control() {
@@ -162,7 +173,7 @@ class Monitor extends ZM_Object {
   public function __call($fn, array $args){
     if ( count($args) ) {
       if ( is_array($this->defaults[$fn]) and $this->defaults[$fn]['type'] == 'set' ) {
-        $this->{$fn} = is_array($args[0]) ? implode(',',$args[0]) : $args[0];
+        $this->{$fn} = is_array($args[0]) ? implode(',', $args[0]) : $args[0];
       } else {
         $this->{$fn} = $args[0];
       }
@@ -175,14 +186,23 @@ class Monitor extends ZM_Object {
       }
       return $this->defaults[$fn];
     } else if ( array_key_exists($fn, $this->status_fields) ) {
-      $sql = 'SELECT `Status`,`CaptureFPS`,`AnalysisFPS`,`CaptureBandwidth`
-        FROM `Monitor_Status` WHERE `MonitorId`=?';
+      $sql = 'SELECT * FROM `Monitor_Status` WHERE `MonitorId`=?';
       $row = dbFetchOne($sql, NULL, array($this->{'Id'}));
       if ( !$row ) {
-        Error('Unable to load Monitor record for Id='.$this->{'Id'});
-        foreach ( $this->status_fields as $k => $v ) {
+        Warning('Unable to load Monitor status record for Id='.$this->{'Id'}.' using '.$sql);
+        return null;
+      } else {
+        foreach ($row as $k => $v) {
           $this->{$k} = $v;
         }
+      }
+      return $this->{$fn};
+    } else if ( array_key_exists($fn, $this->summary_fields) ) {
+      $sql = 'SELECT * FROM `Event_Summaries` WHERE `MonitorId`=?';
+      $row = dbFetchOne($sql, NULL, array($this->{'Id'}));
+      if ( !$row ) {
+        Warning('Unable to load Event Summary record for Id='.$this->{'Id'}.' using '.$sql);
+        return null;
       } else {
         foreach ($row as $k => $v) {
           $this->{$k} = $v;
@@ -291,7 +311,7 @@ class Monitor extends ZM_Object {
   }
 
   function zmcControl( $mode=false ) {
-    if ( ! $this->{'Id'} ) {
+    if ( !(property_exists($this,'Id') and $this->{'Id'}) ) {
       Warning('Attempt to control a monitor with no Id');
       return;
     }
@@ -327,7 +347,7 @@ class Monitor extends ZM_Object {
           return;
         }
       }
-      Logger::Debug('sending command to '.$url);
+      Debug('sending command to '.$url);
 
       $context  = stream_context_create();
       try {
@@ -343,66 +363,6 @@ class Monitor extends ZM_Object {
     }
   } // end function zmcControl
 
-  function zmaControl($mode=false) {
-    if ( !$this->{'Id'} ) {
-      Warning('Attempt to control a monitor with no Id');
-      return;
-    }
-
-    if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) {
-      if ( $this->{'Function'} == 'None' || $this->{'Function'} == 'Monitor' || $mode == 'stop' ) {
-        if ( ZM_OPT_CONTROL && $this->Controllable() && $this->TrackMotion() &&
-          ( $this->{'Function'} == 'Modect' || $this->{'Function'} == 'Mocord' ) ) {
-          daemonControl('stop', 'zmtrack.pl', '-m '.$this->{'Id'});
-        }
-        daemonControl('stop', 'zma', '-m '.$this->{'Id'});
-      } else {
-        if ( $mode == 'restart' ) {
-          if ( ZM_OPT_CONTROL ) {
-            daemonControl('stop', 'zmtrack.pl', '-m '.$this->{'Id'});
-          }
-          daemonControl('stop', 'zma', '-m '.$this->{'Id'});
-        }
-        daemonControl('start', 'zma', '-m '.$this->{'Id'});
-        if ( ZM_OPT_CONTROL && $this->Controllable() && $this->TrackMotion() &&
-          ( $this->{'Function'} == 'Modect' || $this->{'Function'} == 'Mocord' ) ) {
-          daemonControl('start', 'zmtrack.pl', '-m '.$this->{'Id'});
-        }
-        if ( $mode == 'reload' ) {
-          daemonControl('reload', 'zma', '-m '.$this->{'Id'});
-        }
-      }
-    } else if ( $this->ServerId() ) {
-      $Server = $this->Server();
-
-      $url = $Server->UrlToApi().'/monitors/daemonControl/'.$this->{'Id'}.'/'.$mode.'/zma.json';
-      if ( ZM_OPT_USE_AUTH ) {
-        if ( ZM_AUTH_RELAY == 'hashed' ) {
-          $url .= '?auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
-        } else if ( ZM_AUTH_RELAY == 'plain' ) {
-          $url .= '?user='.$_SESSION['username'];
-          $url .= '?pass='.$_SESSION['password'];
-        } else {
-          Error('Multi-Server requires AUTH_RELAY be either HASH or PLAIN');
-          return;
-        }
-      }
-      Logger::Debug("sending command to $url");
-
-      $context = stream_context_create();
-      try {
-        $result = file_get_contents($url, false, $context);
-        if ( $result === FALSE ) { /* Handle error */
-          Error("Error restarting zma using $url");
-        }
-      } catch ( Exception $e ) {
-        Error("Except $e thrown trying to restart zma");
-      }
-    } else {
-      Error('Server not assigned to Monitor in a multi-server setup. Please assign a server to the Monitor.');
-    } // end if we are on the recording server
-  } // end public function zmaControl
-
   public function GroupIds( $new='' ) {
     if ( $new != '' ) {
       if ( !is_array($new) ) {
@@ -429,7 +389,6 @@ class Monitor extends ZM_Object {
       Warning("Attempt to delete a monitor without id.");
       return;
     }
-    $this->zmaControl('stop');
     $this->zmcControl('stop');
 
     // If fast deletes are on, then zmaudit will clean everything else up later
@@ -455,6 +414,8 @@ class Monitor extends ZM_Object {
     dbQuery('DELETE FROM Zones WHERE MonitorId = ?', array($this->{'Id'}));
     if ( ZM_OPT_X10 )
       dbQuery('DELETE FROM TriggersX10 WHERE MonitorId=?', array($this->{'Id'}));
+    dbQuery('DELETE FROM Monitor_Status WHERE MonitorId = ?', array($this->{'Id'}));
+    dbQuery('DELETE FROM Event_Summaries WHERE MonitorId = ?', array($this->{'Id'}));
     dbQuery('DELETE FROM Monitors WHERE Id = ?', array($this->{'Id'}));
   } // end function delete
 
@@ -536,7 +497,7 @@ class Monitor extends ZM_Object {
       if ( $command == 'quit' or $command == 'start' or $command == 'stop' ) {
         # These are special as we now run zmcontrol as a daemon through zmdc.
         $status = daemonStatus('zmcontrol.pl', array('--id', $this->{'Id'}));
-        Logger::Debug("Current status $status");
+        Debug("Current status $status");
         if ( $status or ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) ) {
           daemonControl($command, 'zmcontrol.pl', '--id '.$this->{'Id'});
           return;
@@ -550,10 +511,10 @@ class Monitor extends ZM_Object {
 
     if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) {
       # Local
-      Logger::Debug('Trying to send options ' . print_r($options, true));
+      Debug('Trying to send options ' . print_r($options, true));
 
       $optionString = jsonEncode($options);
-      Logger::Debug("Trying to send options $optionString");
+      Debug("Trying to send options $optionString");
       // Either connects to running zmcontrol.pl or runs zmcontrol.pl to send the command.
       $socket = socket_create(AF_UNIX, SOCK_STREAM, 0);
       if ( $socket < 0 ) {
@@ -567,7 +528,7 @@ class Monitor extends ZM_Object {
           return false;
         }
       } else if ( $command != 'quit' ) {
-        $command = ZM_PATH_BIN.'/zmcontrol.pl '.$command.' --id='.$this->{'Id'};
+        $command = ZM_PATH_BIN.'/zmcontrol.pl '.$command.' --id '.$this->{'Id'};
 
         // Can't connect so use script
         $ctrlOutput = exec(escapeshellcmd($command));
@@ -587,7 +548,7 @@ class Monitor extends ZM_Object {
           $url .= '?user='.$_SESSION['username'];
         }
       }
-      Logger::Debug("sending command to $url");
+      Debug("sending command to $url");
 
       $context = stream_context_create();
       try {
@@ -632,5 +593,70 @@ class Monitor extends ZM_Object {
     global $user;
     return ( $user && ($user['Monitors'] == 'Edit') && ( !$this->{'Id'} || visibleMonitor($this->{'Id'}) ));
   }
+
+  function canView() {
+    global $user;
+    return ( $user && ($user['Monitors'] != 'None') && ( !$this->{'Id'} || visibleMonitor($this->{'Id'}) ));
+  }
+
+  function AlarmCommand($cmd) {
+    if ( (!defined('ZM_SERVER_ID')) or ( property_exists($this, 'ServerId') and (ZM_SERVER_ID==$this->{'ServerId'}) ) ) {
+      switch ($cmd) {
+      case 'on' : $cmd = ' -a'; break;
+      case 'off': $cmd = ' -c'; break;
+      case 'disable': $cmd = ' -n'; break;
+      case 'status': $cmd = ' -s'; break;
+      default:
+        Warning("Invalid command $cmd in AlarmCommand");
+        return false;
+      }
+
+      $cmd = getZmuCommand($cmd.' -m '.$this->{'Id'});
+      $output = shell_exec($cmd);
+      Debug("Running $cmd output: $output");
+      return $output;
+    }
+    
+    if ( $this->ServerId() ) {
+      $Server = $this->Server();
+
+      $url = $Server->UrlToApi().'/monitors/alarm/id:'.$this->{'Id'}.'/command:'.$cmd.'.json';
+      $auth_relay = get_auth_relay();
+      if ($auth_relay) $url .= '?'.$auth_relay;
+
+      Debug('sending command to '.$url);
+
+      $context = stream_context_create();
+      try {
+        $result = file_get_contents($url, false, $context);
+        if ( $result === FALSE ) { /* Handle error */
+          Error('Error sending command using '.$url);
+          return false;
+        }
+        Debug("Result $result");
+        $json = json_decode($result, true);
+        return $json['status'];
+
+      } catch ( Exception $e ) {
+        Error("Exception $e thrown trying to send command to $url");
+        return false;
+      }
+    } // end if we are on the recording server
+    Error('Server not assigned to Monitor in a multi-server setup. Please assign a server to the Monitor.');
+    return false;
+  }
+  function TriggerOn() {
+    $output = $this->AlarmCommand('on');
+    if ( $output and preg_match('/Alarmed event id: (\d+)$/', $output, $matches) ) {
+      return $matches[1];
+    }
+    Warning("No event returned from TriggerOn");
+  }
+  function TriggerOff() {
+    $output = $this->AlarmCommand('off');
+  }
+  function DisableAlarms() {
+    $output = $this->AlarmCommand('disable');
+  }
 } // end class Monitor
 ?>
diff --git a/web/includes/Object.php b/web/includes/Object.php
index e8fff930b..f7b93e3b5 100644
--- a/web/includes/Object.php
+++ b/web/includes/Object.php
@@ -5,32 +5,33 @@ require_once('database.php');
 $object_cache = array();
 
 class ZM_Object {
+  protected $_last_error;
 
   public function __construct($IdOrRow = NULL) {
     $class = get_class($this);
 
     $row = NULL;
     if ( $IdOrRow ) {
+
       if ( is_integer($IdOrRow) or ctype_digit($IdOrRow) ) {
         $table = $class::$table;
         $row = dbFetchOne("SELECT * FROM `$table` WHERE `Id`=?", NULL, array($IdOrRow));
         if ( !$row ) {
           Error("Unable to load $class record for Id=$IdOrRow");
         }
-      } elseif ( is_array($IdOrRow) ) {
+      } else if ( is_array($IdOrRow) ) {
         $row = $IdOrRow;
       }
 
       if ( $row ) {
+        foreach ($row as $k => $v) {
+          $this->{$k} = $v;
+        }
         global $object_cache;
         if ( ! isset($object_cache[$class]) ) {
           $object_cache[$class] = array();
         }
         $cache = &$object_cache[$class];
-
-        foreach ($row as $k => $v) {
-          $this->{$k} = $v;
-        }
         $cache[$row['Id']] = $this;
       }
     } # end if isset($IdOrRow)
@@ -38,6 +39,7 @@ class ZM_Object {
 
   public function __call($fn, array $args){
     $type = (array_key_exists($fn, $this->defaults) && is_array($this->defaults[$fn])) ? $this->defaults[$fn]['type'] : 'scalar';
+
     if ( count($args) ) {
       if ( $type == 'set' and is_array($args[0]) ) {
         $this->{$fn} = implode(',', $args[0]);
@@ -50,7 +52,15 @@ class ZM_Object {
           $this->{$fn} = preg_replace($this->defaults[$fn]['filter_regexp'], '', $args[0]);
         }
       } else {
-        $this->{$fn} = $args[0];
+        if ( $args[0] == '' and array_key_exists($fn, $this->defaults) ) {
+          if ( is_array($this->defaults[$fn]) ) {
+            $this->{$fn} = $this->defaults[$fn]['default'];
+          } else {
+            $this->{$fn} = $this->defaults[$fn];
+          }
+        } else {
+          $this->{$fn} = $args[0];
+        }
       }
     }
 
@@ -174,19 +184,33 @@ class ZM_Object {
         $this->$field($value);
       } else {
         if ( is_array($value) ) {
-# perhaps should turn into a comma-separated string
+          # perhaps should turn into a comma-separated string
           $this->{$field} = implode(',', $value);
-        } else if ( is_string($value) ) {
-          if ( array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp']) ) {
-            if ( is_array($this->defaults[$field]['filter_regexp']) ) {
-              foreach ( $this->defaults[$field]['filter_regexp'] as $regexp ) {
-                $this->{$field} = preg_replace($regexp, '', trim($value));
-              }
-            } else {
-              $this->{$field} = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value));
-            }
+        } else if (is_string($value)) {
+          if (array_key_exists($field, $this->defaults)) {
+						# Need filtering
+						if (is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp'])) {
+							if (is_array($this->defaults[$field]['filter_regexp'])) {
+								foreach ($this->defaults[$field]['filter_regexp'] as $regexp) {
+									$this->{$field} = preg_replace($regexp, '', trim($value));
+								}
+							} else {
+								$this->{$field} = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value));
+							}
+						} else if ($value == '') {
+							if (is_array($this->defaults[$field])) {
+								$this->{$field} = $this->defaults[$field]['default'];
+							} else if (is_string($this->defaults[$field])) {
+# if the default is a string, don't set it. Having a default for empty string is to set null for numbers.
+								$this->{$field} = $value;
+							} else {
+								$this->{$field} = $this->defaults[$field];
+							}
+						} else {
+							$this->{$field} = $value;
+						}  # need a default
           } else {
-            $this->{$field} = trim($value);
+            $this->{$field} = $value;
           }
         } else if ( is_integer($value) ) {
           $this->{$field} = $value;
@@ -207,15 +231,12 @@ class ZM_Object {
   public function changes($new_values, $defaults=null) {
     $changes = array();
 
-    if ( $defaults ) {
-      foreach ( $defaults as $field => $type ) {
-        if ( isset($new_values[$field]) ) {
-          # Will have already been handled above
-          continue;
-        }
+    if ($defaults) {
+      foreach ($defaults as $field => $type) {
+        if (isset($new_values[$field])) continue;
 
-        if ( isset($this->defaults[$field]) ) {
-          if ( is_array($this->defaults[$field]) ) {
+        if (isset($this->defaults[$field])) {
+          if (is_array($this->defaults[$field])) {
             $new_values[$field] = $this->defaults[$field]['default'];
           } else {
             $new_values[$field] = $this->defaults[$field];
@@ -224,13 +245,11 @@ class ZM_Object {
       } # end foreach default
     } # end if defaults
 
-    foreach ( $new_values as $field => $value ) {
-
-      if ( method_exists($this, $field) ) {
-
-        if ( array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp']) ) {
-          if ( is_array($this->defaults[$field]['filter_regexp']) ) {
-            foreach ( $this->defaults[$field]['filter_regexp'] as $regexp ) {
+    foreach ($new_values as $field => $value) {
+      if (method_exists($this, $field)) {
+        if (array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp'])) {
+          if (is_array($this->defaults[$field]['filter_regexp'])) {
+            foreach ($this->defaults[$field]['filter_regexp'] as $regexp) {
               $value = preg_replace($regexp, '', trim($value));
             }
           } else {
@@ -239,7 +258,7 @@ class ZM_Object {
         }
 
         $old_value = $this->$field();
-        if ( is_array($old_value) ) {
+        if (is_array($old_value)) {
           $diff = array_recursive_diff($old_value, $value);
           if ( count($diff) ) {
             $changes[$field] = $value;
@@ -247,47 +266,40 @@ class ZM_Object {
         } else if ( $this->$field() != $value ) {
           $changes[$field] = $value;
         }
-      } else if ( property_exists($this, $field) ) {
+      } else if (property_exists($this, $field)) {
         $type = (array_key_exists($field, $this->defaults) && is_array($this->defaults[$field])) ? $this->defaults[$field]['type'] : 'scalar';
-        if ( $type == 'set' ) {
-          $old_value = is_array($this->$field) ? $this->$field : explode(',', $this->$field);
-          $new_value = is_array($value) ? $value : explode(',', $value);
+        if ($type == 'set') {
+          $old_value = is_array($this->$field) ? $this->$field : ($this->$field ? explode(',', $this->$field) : array());
+          $new_value = is_array($value) ? $value : ($value ? explode(',', $value) : array());
 
           $diff = array_recursive_diff($old_value, $new_value);
-          if ( count($diff) ) {
-            $changes[$field] = $new_value;
-          }
+          if (count($diff)) $changes[$field] = $new_value;
 
           # Input might be a command separated string, or an array
 
         } else {
-          if ( array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp']) ) {
-            if ( is_array($this->defaults[$field]['filter_regexp']) ) {
-              foreach ( $this->defaults[$field]['filter_regexp'] as $regexp ) {
+          if (array_key_exists($field, $this->defaults) && is_array($this->defaults[$field]) && isset($this->defaults[$field]['filter_regexp'])) {
+            if (is_array($this->defaults[$field]['filter_regexp'])) {
+              foreach ($this->defaults[$field]['filter_regexp'] as $regexp) {
                 $value = preg_replace($regexp, '', trim($value));
               }
             } else {
               $value = preg_replace($this->defaults[$field]['filter_regexp'], '', trim($value));
             }
           }
-          if ( $this->{$field} != $value ) {
-            $changes[$field] = $value;
-          }
+          if ($this->{$field} != $value) $changes[$field] = $value;
         }
-      } else if ( array_key_exists($field, $this->defaults) ) {
-        if ( is_array($this->defaults[$field]) and isset($this->defaults[$field]['default']) ) {
+      } else if (array_key_exists($field, $this->defaults)) {
+        if (is_array($this->defaults[$field]) and isset($this->defaults[$field]['default'])) {
           $default = $this->defaults[$field]['default'];
         } else {
           $default = $this->defaults[$field];
         }
 
-        if ( $default != $value ) {
-          $changes[$field] = $value;
-        }
+        if ($default != $value) $changes[$field] = $value;
       }
     } # end foreach newvalue
 
-
     return $changes;
   } # end public function changes
 
@@ -299,6 +311,72 @@ class ZM_Object {
       $this->set($new_values);
     }
 
+    # Set defaults.  Note that we only replace "" with null, not other values
+    # because for example if we want to clear TimestampFormat, we clear it, but the default is a string value
+    foreach ( $this->defaults as $field => $default ) {
+      if (!property_exists($this, $field)) {
+        if (is_array($default)) {
+          $this->{$field} = $default['default'];
+        } else {
+          $this->{$field} = $default;
+        }
+      } else if ($this->{$field} === '') {
+        if (is_array($default)) {
+          $this->{$field} = $default['default'];
+        } else if ($default == null) {
+          $this->{$field} = $default;
+        }
+      }
+    } # end foreach default
+
+    $fields = array_filter(
+      $this->defaults,
+      function($v) {
+        return !( 
+          is_array($v)
+          and
+          isset($v['do_not_update'])
+          and
+          $v['do_not_update']
+        );
+      }
+    );
+    $fields = array_keys($fields);
+
+    if ( $this->Id() ) {
+      $sql = 'UPDATE `'.$table.'` SET '.implode(', ', array_map(function($field) {return '`'.$field.'`=?';}, $fields)).' WHERE Id=?';
+      $values = array_map(function($field){ return $this->{$field};}, $fields);
+      $values[] = $this->{'Id'};
+      if (dbQuery($sql, $values)) return true;
+    } else {
+      unset($fields['Id']);
+
+      $sql = 'INSERT INTO `'.$table.
+        '` ('.implode(', ', array_map(function($field) {return '`'.$field.'`';}, $fields)).
+          ') VALUES ('.
+          implode(', ', array_map(function($field){return (($this->$field() === 'NOW()') ? 'NOW()' : '?');}, $fields)).')';
+
+      # For some reason comparing 0 to 'NOW()' returns false; So we do this.
+      $filtered = array_filter($fields, function($field){ return ( (!$this->$field()) or ($this->$field() != 'NOW()'));});
+      $mapped = array_map(function($field){return $this->$field();}, $filtered);
+      $values = array_values($mapped);
+      if (dbQuery($sql, $values)) {
+        $this->{'Id'} = dbInsertId();
+        return true;
+      }
+    }
+    $this->_last_error = dbError($sql);
+    return false;
+  } // end function save
+
+  public function insert($new_values = null) {
+    $class = get_class($this);
+    $table = $class::$table;
+
+    if ( $new_values ) {
+      $this->set($new_values);
+    }
+
     # Set defaults.  Note that we only replace "" with null, not other values
     # because for example if we want to clear TimestampFormat, we clear it, but the default is a string value
     foreach ( $this->defaults as $field => $default ) {
@@ -314,7 +392,7 @@ class ZM_Object {
     $fields = array_filter(
       $this->defaults,
       function($v) {
-        return !( 
+        return !(
           is_array($v)
           and
           isset($v['do_not_update'])
@@ -325,28 +403,22 @@ class ZM_Object {
     );
     $fields = array_keys($fields);
 
-    if ( $this->Id() ) {
-      $sql = 'UPDATE `'.$table.'` SET '.implode(', ', array_map(function($field) {return '`'.$field.'`=?';}, $fields)).' WHERE Id=?';
-      $values = array_map(function($field){ return $this->{$field};}, $fields);
-      $values[] = $this->{'Id'};
-      if ( dbQuery($sql, $values) )
-        return true;
-    } else {
+    if ( ! $this->Id() )
       unset($fields['Id']);
 
-      $sql = 'INSERT INTO `'.$table.
-        '` ('.implode(', ', array_map(function($field) {return '`'.$field.'`';}, $fields)).
-          ') VALUES ('.
-          implode(', ', array_map(function($field){return '?';}, $fields)).')';
+    $sql = 'INSERT INTO `'.$table.
+      '` ('.implode(', ', array_map(function($field) {return '`'.$field.'`';}, $fields)).
+        ') VALUES ('.
+        implode(', ', array_map(function($field){return '?';}, $fields)).')';
 
-      $values = array_map(function($field){return $this->$field();}, $fields);
-      if ( dbQuery($sql, $values) ) {
+    $values = array_map(function($field){return $this->$field();}, $fields);
+    if ( dbQuery($sql, $values) ) {
+      if ( ! $this->{'Id'} )
         $this->{'Id'} = dbInsertId();
-        return true;
-      }
+      return true;
     }
     return false;
-  } // end function save
+  } // end function insert
 
   public function delete() {
     $class = get_class($this);
@@ -364,5 +436,11 @@ class ZM_Object {
       Error("Unable to lock $class record for Id=".$this->Id());
     }
   }
+  public function remove_from_cache() {
+    return ZM_Object::_remove_from_cache(get_class(), $this);
+  }
+  public function get_last_error() {
+    return $this->_last_error;
+  }
 } # end class Object
 ?>
diff --git a/web/includes/Snapshot.php b/web/includes/Snapshot.php
new file mode 100644
index 000000000..2c36306f5
--- /dev/null
+++ b/web/includes/Snapshot.php
@@ -0,0 +1,65 @@
+<?php
+namespace ZM;
+require_once('database.php');
+require_once('Object.php');
+require_once('Event.php');
+
+class Snapshot extends ZM_Object {
+  protected static $table = 'Snapshots';
+  protected $defaults = array(
+    'Id' => null,
+    'CreatedBy' => null,
+    'CreatedOn' => 'NOW()',
+    'Name' => '',
+    'Description' => '',
+  );
+
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
+
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
+
+  public function Event() {
+    return new Event( $this->{'EventId'} );
+  }
+
+  public function delete() {
+    if ( property_exists($this, 'Id') ) {
+      dbQuery('DELETE FROM `Snapshot_Events` WHERE `SnapshotId`=?', array($this->{'Id'}));
+    }
+  }
+
+  public function EventIds( ) {
+    if ( ! property_exists($this, 'EventIds') ) {
+      $this->{'EventIds'} = dbFetchAll('SELECT `EventId` FROM `Snapshot_Events` WHERE `SnapshotId`=?', 'EventId', array($this->{'Id'}));
+    }
+    return $this->{'EventIds'};
+  }
+  public function Events() {
+    if ( ! property_exists($this, 'Events') ) {
+      $this->{'Events'} = Event::find(array('Id'=>$this->EventIds()));
+    }
+    return $this->{'Events'};
+  }
+
+} # end class Snapshot
+
+class Snapshot_Event extends ZM_Object {
+  protected static $table = 'Snapshot_Events';
+  protected $defaults = array(
+    'Id' => null,
+    'EventId' => 0,
+    'SnapshotId' => 0,
+  );
+  public static function find( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find(get_class(), $parameters, $options);
+  }
+
+  public static function find_one( $parameters = array(), $options = array() ) {
+    return ZM_Object::_find_one(get_class(), $parameters, $options);
+  }
+} # end class Snapshot_Event
+?>
diff --git a/web/includes/Storage.php b/web/includes/Storage.php
index 2c243d913..11519b0e1 100644
--- a/web/includes/Storage.php
+++ b/web/includes/Storage.php
@@ -94,7 +94,7 @@ class Storage extends ZM_Object {
     }
     $used = $this->disk_used_space();
     $usage = round(($used / $total) * 100);
-    //Logger::Debug("Used $usage = round( ( $used / $total ) * 100 )");
+    //Debug("Used $usage = round( ( $used / $total ) * 100 )");
     return $usage;
   }
 
@@ -132,19 +132,7 @@ class Storage extends ZM_Object {
   public function event_disk_space() {
     # This isn't a function like this in php, so we have to add up the space used in each event.
     if ( (! property_exists($this, 'DiskSpace')) or (!isset($this->{'DiskSpace'})) ) {
-      $used = dbFetchOne('SELECT SUM(DiskSpace) AS DiskSpace FROM Events WHERE StorageId=? AND DiskSpace IS NOT NULL', 'DiskSpace', array($this->Id()));
-
-      do {
-        # Do in batches of 1000 so as to not useup all ram, Event will do caching though...
-        $events = Event::find(array('StorageId'=>$this->Id(), 'DiskSpace'=>null), array('limit'=>1000));
-        foreach ( $events as $Event ) {
-          $Event->Storage($this); // Prevent further db hit
-          # DiskSpace will update the event
-          $used += $Event->DiskSpace();
-        } #end foreach
-        Event::clear_cache();
-      } while ( count($events) == 1000 );
-      $this->{'DiskSpace'} = $used;
+      $this->{'DiskSpace'} = dbFetchOne('SELECT SUM(DiskSpace) AS DiskSpace FROM Events WHERE StorageId=? AND DiskSpace IS NOT NULL', 'DiskSpace', array($this->Id()));
     }
     return $this->{'DiskSpace'};
   } // end function event_disk_space
diff --git a/web/includes/User.php b/web/includes/User.php
index a80e8ed00..7489f9d19 100644
--- a/web/includes/User.php
+++ b/web/includes/User.php
@@ -8,22 +8,24 @@ class User extends ZM_Object {
   protected static $table = 'Users';
 
 	protected $defaults = array(
-			'Id'                   => null,
-      'Username'  => '',
-      'Password' => '',
-      'Language' => '',
-      'Enabled' => 1,
-      'Stream'  => 'None',
-      'Events' => 'None',
-      'Control' => 'None',
-      'Monitors' => 'None',
-      'Groups' => 'None',
-      'Devices' => 'None',
-      'System'=> 'None',
-      'MaxBandwidth'    =>'',
-      'MonitorIds'      =>'',
+			'Id'              => null,
+      'Username'        => '',
+      'Password'        => '',
+      'Language'        => '',
+      'Enabled'         => 1,
+      'Stream'          => 'None',
+      'Events'          => 'None',
+      'Control'         => 'None',
+      'Monitors'        => 'None',
+      'Groups'          => 'None',
+      'Devices'         => 'None',
+      'Snapshots'       => 'None',
+      'System'          => 'None',
+      'MaxBandwidth'    => '',
+      'MonitorIds'      => '',
       'TokenMinExpiry'  => 0,
-      'APIEnabled'=> 1,
+      'APIEnabled'      => 1,
+      'HomeView'        =>  '',
 			);
 
   public static function find( $parameters = array(), $options = array() ) {
diff --git a/web/includes/actions/control.php b/web/includes/actions/control.php
index 5c996e636..bf6db7967 100644
--- a/web/includes/actions/control.php
+++ b/web/includes/actions/control.php
@@ -36,6 +36,6 @@ if ( $action == 'control' ) {
 
   $ctrlCommand = buildControlCommand($monitor);
   $monitor->sendControlCommand($ctrlCommand);
-  $view = 'none';
+  $redirect = $_SERVER['HTTP_REFERER'];
 }
 ?>
diff --git a/web/includes/actions/controlcap.php b/web/includes/actions/controlcap.php
index ad4985f11..01f80254c 100644
--- a/web/includes/actions/controlcap.php
+++ b/web/includes/actions/controlcap.php
@@ -24,7 +24,7 @@ if ( !canEdit('Control') ) {
   return;
 } // end if !canEdit Controls
 
-if ( $action == 'controlcap' ) {
+if ( $action == 'Save' ) {
   require_once('includes/Control.php');
   $Control = new ZM\Control( !empty($_REQUEST['cid']) ? $_REQUEST['cid'] : null );
 
@@ -82,14 +82,13 @@ if ( $action == 'controlcap' ) {
   # Checkboxes don't return an element in the POST data, so won't be present in newControl.
   # So force a value for these fields
   foreach ( $field_defaults as $field => $value ) {
-    if ( ! (isset($_REQUEST['newControl'][$field]) and $_REQUEST['newControl'][$field]) ) {
-      $_REQUEST['newControl'][$field] = $value;
+    if ( ! (isset($_REQUEST['Control'][$field]) and $_REQUEST['Control'][$field]) ) {
+      $_REQUEST['Control'][$field] = $value;
     }
   } # end foreach type
 
   //$changes = getFormChanges( $control, $_REQUEST['newControl'], $types, $columns );
-  $Control->save($_REQUEST['newControl']);
-  $refreshParent = true;
-  $view = 'none';
+  $Control->save($_REQUEST['Control']);
+  $redirect = '?view=controlcaps';
 } // end if action
 ?>
diff --git a/web/includes/actions/device.php b/web/includes/actions/device.php
index c1a882d89..43d970400 100644
--- a/web/includes/actions/device.php
+++ b/web/includes/actions/device.php
@@ -28,15 +28,15 @@ if ( $action == 'device' ) {
   if ( !empty($_REQUEST['command']) ) {
     setDeviceStatusX10($_REQUEST['key'], $_REQUEST['command']);
   } else if ( isset($_REQUEST['newDevice']) ) {
-    if ( isset($_REQUEST['did']) ) {
+    if ( isset($_REQUEST['did']) && $_REQUEST['did'] ) {
       dbQuery('UPDATE Devices SET Name=?, KeyString=? WHERE Id=?',
         array($_REQUEST['newDevice']['Name'], $_REQUEST['newDevice']['KeyString'], $_REQUEST['did']) );
     } else {
+
       dbQuery('INSERT INTO Devices SET Name=?, KeyString=?',
         array($_REQUEST['newDevice']['Name'], $_REQUEST['newDevice']['KeyString']) );
     }
-    $refreshParent = true;
-    $view = 'none';
+    $redirect = '?view=devices';
   }
 } else {
   ZM\Error('Unknown action in device');
diff --git a/web/includes/actions/donate.php b/web/includes/actions/donate.php
index b8659b269..c85f4509e 100644
--- a/web/includes/actions/donate.php
+++ b/web/includes/actions/donate.php
@@ -49,6 +49,6 @@ if ( $action == 'donate' && isset($_REQUEST['option']) ) {
       Warning("Unknown value for option in donate: $option");
       break;
   } // end switch option
-  $view = 'none';
+  $redirect = '?view=console';
 }
 ?>
diff --git a/web/includes/actions/events.php b/web/includes/actions/events.php
index 41a693ccc..37e747037 100644
--- a/web/includes/actions/events.php
+++ b/web/includes/actions/events.php
@@ -32,7 +32,7 @@ if ( !canEdit('Events') ) {
 if ( $action == 'archive' ) {
   $dbConn->beginTransaction();
   $eids = getAffectedIds('eids');
-  ZM\Logger::Debug("E IDS" . print_r($eids, true));
+  ZM\Debug("E IDS" . print_r($eids, true));
   foreach ( $eids as $markEid ) {
     dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(1, $markEid));
   }
@@ -41,7 +41,7 @@ if ( $action == 'archive' ) {
 } else if ( $action == 'unarchive' ) {
   $dbConn->beginTransaction();
   $eids = getAffectedIds('eids');
-  ZM\Logger::Debug("E IDS" . print_r($eids, true));
+  ZM\Debug("E IDS" . print_r($eids, true));
   foreach ( $eids as $markEid ) {
     dbQuery('UPDATE Events SET Archived=? WHERE Id=?', array(0, $markEid));
   }
diff --git a/web/includes/actions/filter.php b/web/includes/actions/filter.php
index 2725c70fc..08eb8c020 100644
--- a/web/includes/actions/filter.php
+++ b/web/includes/actions/filter.php
@@ -18,9 +18,11 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
+global $error_message;
 // Event scope actions, view permissions only required
 if ( !canView('Events') ) {
-  ZM\Warning('You do not have permission to view Events.');
+	$error_message = 'You do not have permission to view Events.';
+	ZM\Warning($error_message);
   return;
 }
 
@@ -46,7 +48,6 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
       }
     } else if ( ( $action == 'Save' ) or ( $action == 'SaveAs' ) or ( $action == 'execute' ) ) {
 
-      $sql = '';
       $_REQUEST['filter']['Query']['sort_field'] = validStr($_REQUEST['filter']['Query']['sort_field']);
       $_REQUEST['filter']['Query']['sort_asc'] = validStr($_REQUEST['filter']['Query']['sort_asc']);
       $_REQUEST['filter']['Query']['limit'] = validInt($_REQUEST['filter']['Query']['limit']);
@@ -64,14 +65,15 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
       $_REQUEST['filter']['Background'] = empty($_REQUEST['filter']['Background']) ? 0 : 1;
       $_REQUEST['filter']['Concurrent'] = empty($_REQUEST['filter']['Concurrent']) ? 0 : 1;
       $changes = $filter->changes($_REQUEST['filter']);
-      ZM\Logger::Debug('Changes: ' . print_r($changes,true));
+      ZM\Debug('Changes: ' . print_r($changes,true));
 
-      if ( $_REQUEST['Id'] and ( $action == 'Save' ) ) {
-        if ( $filter->Background() )
-          $filter->control('stop');
-        $filter->save($changes);
+      if ($filter->Id() and ($action == 'Save')) {
+				if ($filter->Background()) $filter->control('stop');
+				if (!$filter->save($changes)) {
+					$error_message = $filter->get_last_error();
+					return;
+				}
       } else {
-
         if ( $action == 'execute' ) {
           if ( count($changes) ) {
             $filter->Name('_TempFilter'.time());
@@ -80,7 +82,10 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
         } else if ( $action == 'SaveAs' ) {
 					$filter->Id(null);
 				}
-        $filter->save($changes);
+				if (!$filter->save($changes)) {
+					$error_message = $filter->get_last_error();
+					return;
+				}
 
 				// We update the request id so that the newly saved filter is auto-selected
 				$_REQUEST['Id'] = $filter->Id();
@@ -95,7 +100,7 @@ if ( isset($_REQUEST['object']) and ( $_REQUEST['object'] == 'filter' ) ) {
       } else if ( $filter->Background() ) {
         $filter->control('start');
       }
-      $redirect = '?view=filter&Id='.$filter->Id();
+      $redirect = '?view=filter'.$filter->querystring('filter', '&');
 
     } else if ( $action == 'control' ) {
       if ( $_REQUEST['command'] == 'start'
diff --git a/web/includes/actions/function.php b/web/includes/actions/function.php
index adf85de38..fc7f7703b 100644
--- a/web/includes/actions/function.php
+++ b/web/includes/actions/function.php
@@ -32,7 +32,7 @@ if ( !canEdit('Monitors', $mid) ) {
 
 if ( $action == 'function' ) {
   $monitor = new ZM\Monitor($mid);
-  if ( !$monitor ) {
+  if ( !$monitor->Id() ) {
     ZM\Error("Monitor not found with Id=$mid");
     return;
   }
@@ -40,22 +40,19 @@ if ( $action == 'function' ) {
   $newFunction = validStr($_REQUEST['newFunction']);
   # Because we use a checkbox, it won't get passed in the request. So not being in _REQUEST means 0
   $newEnabled = ( !isset($_REQUEST['newEnabled']) or $_REQUEST['newEnabled'] != '1' ) ? '0' : '1';
+  $newDecodingEnabled = ( !isset($_REQUEST['newDecodingEnabled']) or $_REQUEST['newDecodingEnabled'] != '1' ) ? '0' : '1';
   $oldFunction = $monitor->Function();
   $oldEnabled = $monitor->Enabled();
-  if ( $newFunction != $oldFunction || $newEnabled != $oldEnabled ) {
-    $monitor->save(array('Function'=>$newFunction, 'Enabled'=>$newEnabled));
+  $oldDecodingEnabled = $monitor->DecodingEnabled();
+  if ( $newFunction != $oldFunction || $newEnabled != $oldEnabled || $newDecodingEnabled != $oldDecodingEnabled ) {
+    $monitor->save(array('Function'=>$newFunction, 'Enabled'=>$newEnabled, 'DecodingEnabled'=>$newDecodingEnabled));
 
     if ( daemonCheck() && ($monitor->Type() != 'WebSite') ) {
-      zmaControl($monitor, 'stop');
-      zmcControl($monitor, ($newFunction != 'None') ? 'restart' : 'stop');
-			if ( $newFunction != 'None' && $newFunction != 'NoDect' )
-        zmaControl($monitor, 'start');
+      $monitor->zmcControl(($newFunction != 'None') ? 'restart' : 'stop');
     }
-    $refreshParent = true;
   } else {
-    ZM\Logger::Debug('No change to function, not doing anything.');
+    ZM\Debug('No change to function, not doing anything.');
   }
 } // end if action 
-$view = 'none';
-$closePopup = true;
+$redirect = '?view=console';
 ?>
diff --git a/web/includes/actions/group.php b/web/includes/actions/group.php
index b23659d18..ec7a1dc87 100644
--- a/web/includes/actions/group.php
+++ b/web/includes/actions/group.php
@@ -26,26 +26,24 @@ if ( !canEdit('Groups') ) {
   return;
 }
 
-if ( $action == 'Save' ) {
+if ( $action == 'save' ) {
   $group_id = null;
-  if ( !empty($_POST['gid']) )
-    $group_id = $_POST['gid'];
+  if ( !empty($_REQUEST['gid']) )
+    $group_id = $_REQUEST['gid'];
   $group = new ZM\Group($group_id);
   $group->save(
       array(
-      'Name'=>  $_POST['newGroup']['Name'],
-      'ParentId'=>( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
+      'Name'=>  $_REQUEST['newGroup']['Name'],
+      'ParentId'=>( $_REQUEST['newGroup']['ParentId'] == '' ? null : $_REQUEST['newGroup']['ParentId'] ),
       )
     );
   dbQuery('DELETE FROM `Groups_Monitors` WHERE `GroupId`=?', array($group_id));
   $group_id = $group->Id();
   if ( $group_id ) {
-    foreach ( $_POST['newGroup']['MonitorIds'] as $mid ) {
+    foreach ( $_REQUEST['newGroup']['MonitorIds'] as $mid ) {
       dbQuery('INSERT INTO `Groups_Monitors` (`GroupId`,`MonitorId`) VALUES (?,?)', array($group_id, $mid));
     }
   }
-  $view = 'none';
-  $refreshParent = true;
-  $closePopup = true;
+  $redirect = '?view=groups';
 }
 ?>
diff --git a/web/includes/actions/logout.php b/web/includes/actions/logout.php
index 999d7d772..116ae278c 100644
--- a/web/includes/actions/logout.php
+++ b/web/includes/actions/logout.php
@@ -22,9 +22,8 @@
 if ( $action == 'logout' ) {
   userLogout();
   $view = 'login';
-  ZM\Logger::Debug("User: " . print_r($user,true));
 } elseif ( $action == 'config' ) {
-  $redirect = '?view=user&uid='.$user['Id'];
+  $redirect = '?view=user&prev=console&uid='.$user['Id'];
 }
 
 ?>
diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index fe8581f54..1c6e1f72f 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -19,32 +19,31 @@
 //
 
 // Monitor edit actions, monitor id derived, require edit permissions for that monitor
-if ( ! canEdit('Monitors') ) {
+if ( !canEdit('Monitors') ) {
   ZM\Warning('Monitor actions require Monitors Permissions');
   return;
 }
 
-if ( $action == 'monitor' ) {
+if ( $action == 'save' ) {
   $mid = 0;
   if ( !empty($_REQUEST['mid']) ) {
     $mid = validInt($_REQUEST['mid']);
-    if ( ZM_OPT_X10 ) {
-      $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId=?', NULL, array($mid));
-      if ( !$x10Monitor )
-        $x10Monitor = array();
-    }
     if ( !canEdit('Monitors', $mid) ) {
       ZM\Warning('You do not have permission to edit this monitor');
       return;
     }
-  } else {
     if ( ZM_OPT_X10 ) {
-      $x10Monitor = array();
+      $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId=?', NULL, array($mid));
+      if ( !$x10Monitor ) $x10Monitor = array();
     }
+  } else {
     if ( $user['MonitorIds'] ) {
       ZM\Warning('You are restricted to certain monitors so cannot add a new one.');
       return;
     }
+    if ( ZM_OPT_X10 ) {
+      $x10Monitor = array();
+    }
   }
 
   $monitor = new ZM\Monitor($mid);
@@ -54,14 +53,17 @@ if ( $action == 'monitor' ) {
       'Triggers' => array(),
       'Controllable' => 0,
       'TrackMotion' => 0,
+      'ModectDuringPTZ' =>  0,
       'Enabled' => 0,
+      'DecodingEnabled' => 0,
       'Exif' => 0,
       'RTSPDescribe' => 0,
       'V4LMultiBuffer'  => '',
       'RecordAudio' => 0,
       'Method' => 'raw',
       'GroupIds'  =>  array(),
-      'LinkedMonitors'  => array() 
+      'LinkedMonitors'  => array(),
+      'RTSPServer' => 0
       );
 
   # Checkboxes don't return an element in the POST data, so won't be present in newMonitor.
@@ -75,22 +77,22 @@ if ( $action == 'monitor' ) {
   if ( $_REQUEST['newMonitor']['ServerId'] == 'auto' ) {
     $_REQUEST['newMonitor']['ServerId'] = dbFetchOne(
       'SELECT Id FROM Servers WHERE Status=\'Running\' ORDER BY FreeMem DESC, CpuLoad ASC LIMIT 1', 'Id');
-    ZM\Logger::Debug('Auto selecting server: Got ' . $_REQUEST['newMonitor']['ServerId']);
+    ZM\Debug('Auto selecting server: Got ' . $_REQUEST['newMonitor']['ServerId']);
     if ( ( !$_REQUEST['newMonitor'] ) and defined('ZM_SERVER_ID') ) {
       $_REQUEST['newMonitor']['ServerId'] = ZM_SERVER_ID;
-      ZM\Logger::Debug('Auto selecting server to ' . ZM_SERVER_ID);
+      ZM\Debug('Auto selecting server to ' . ZM_SERVER_ID);
     }
   }
 
-  $changes = $monitor->changes($_REQUEST['newMonitor'], $types);
+  $changes = $monitor->changes($_REQUEST['newMonitor']);
   $restart = false;
 
   if ( count($changes) ) {
+    // monitor->Id() has a value when the db record exists
     if ( $monitor->Id() ) {
 
       # If we change anything that changes the shared mem size, zma can complain.  So let's stop first.
       if ( $monitor->Type() != 'WebSite' ) {
-        $monitor->zmaControl('stop');
         $monitor->zmcControl('stop');
         if ( $monitor->Controllable() ) {
           $monitor->sendControlCommand('stop');
@@ -121,7 +123,8 @@ if ( $action == 'monitor' ) {
           }
           $saferNewName = basename($_REQUEST['newMonitor']['Name']);
           $link_path = $NewStorage->Path().'/'.$saferNewName;
-          if ( !symlink($NewStorage->Path().'/'.$mid, $link_path) ) {
+          // Use a relative path for the target so the link continues to work from backups or directory changes.
+          if ( !symlink($mid, $link_path) ) {
             if ( ! ( file_exists($link_path) and is_link($link_path) ) ) {
               ZM\Warning('Unable to symlink ' . $NewStorage->Path().'/'.$mid . ' to ' . $NewStorage->Path().'/'.$saferNewName);
             }
@@ -200,6 +203,9 @@ if ( $action == 'monitor' ) {
             } // end foreach zone
           } // end if rotation or just size change
         } // end if changes in width or height
+      } else {
+        global $error_message;
+        $error_message = dbError();
       } // end if successful save
       $restart = true;
     } else { // new monitor
@@ -207,8 +213,9 @@ if ( $action == 'monitor' ) {
 # FIXME This is actually a race condition. Should lock the table.
       $maxSeq = dbFetchOne('SELECT MAX(Sequence) AS MaxSequence FROM Monitors', 'MaxSequence');
       $changes['Sequence'] = $maxSeq+1;
+      if ( $mid ) $changes['Id'] = $mid; # mid specified in request, doesn't exist in db, will re-use slot
 
-      if ( $monitor->save($changes) ) {
+      if ( $monitor->insert($changes) ) {
         $mid = $monitor->Id();
         $zoneArea = $_REQUEST['newMonitor']['Width'] * $_REQUEST['newMonitor']['Height'];
         dbQuery("INSERT INTO Zones SET MonitorId = ?, Name = 'All', Type = 'Active', Units = 'Percent', NumCoords = 4, Coords = ?, Area=?, AlarmRGB = 0xff0000, CheckMethod = 'Blobs', MinPixelThreshold = 25, MinAlarmPixels=?, MaxAlarmPixels=?, FilterX = 3, FilterY = 3, MinFilterPixels=?, MaxFilterPixels=?, MinBlobPixels=?, MinBlobs = 1", array( $mid, sprintf( "%d,%d %d,%d %d,%d %d,%d", 0, 0, $_REQUEST['newMonitor']['Width']-1, 0, $_REQUEST['newMonitor']['Width']-1, $_REQUEST['newMonitor']['Height']-1, 0, $_REQUEST['newMonitor']['Height']-1 ), $zoneArea, intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*3)/100), intval(($zoneArea*75)/100), intval(($zoneArea*2)/100)  ) );
@@ -235,7 +242,7 @@ if ( $action == 'monitor' ) {
 
     $restart = true;
   } else {
-    ZM\Logger::Debug('No action due to no changes to Monitor');
+    ZM\Debug('No action due to no changes to Monitor');
   } # end if count(changes)
 
   if ( !$mid ) {
@@ -263,8 +270,6 @@ if ( $action == 'monitor' ) {
   if ( $restart ) {
     if ( $monitor->Function() != 'None' and $monitor->Type() != 'WebSite' ) {
       $monitor->zmcControl('start');
-      if ( ($monitor->Function() == 'Modect' or $monitor->Function() == 'Mocord') and $monitor->Enabled() )
-        $monitor->zmaControl('start');
 
       if ( $monitor->Controllable() ) {
         $monitor->sendControlCommand('start');
@@ -273,7 +278,7 @@ if ( $action == 'monitor' ) {
     // really should thump zmwatch and maybe zmtrigger too.
     //daemonControl( 'restart', 'zmwatch.pl' );
   } // end if restart
-  $view = 'console';
+  $redirect = '?view=console';
 } else {
   ZM\Warning("Unknown action $action in Monitor");
 } // end if action == Delete
diff --git a/web/includes/actions/monitors.php b/web/includes/actions/monitors.php
index 8f56b0e3d..118af1533 100644
--- a/web/includes/actions/monitors.php
+++ b/web/includes/actions/monitors.php
@@ -33,19 +33,14 @@ if ( $action == 'save' ) {
     }
     $Monitor = new ZM\Monitor($mid);
     if ( $Monitor->Type() != 'WebSite' ) {
-      $Monitor->zmaControl('stop');
       $Monitor->zmcControl('stop');
     }
     $Monitor->save($_REQUEST['newMonitor']);
     if ( $Monitor->Function() != 'None' && $Monitor->Type() != 'WebSite' ) {
       $Monitor->zmcControl('start');
-      if ( $Monitor->Enabled() ) {
-        $Monitor->zmaControl('start');
-      }
     }
   } // end foreach mid
-  $refreshParent = true;
-  $view = 'none';
+  $view = 'console';
 } else {
   ZM\Warning("Unknown action $action in Monitor");
 } // end if action == Delete
diff --git a/web/includes/actions/options.php b/web/includes/actions/options.php
index 9f1655632..07b71c001 100644
--- a/web/includes/actions/options.php
+++ b/web/includes/actions/options.php
@@ -56,9 +56,9 @@ if ( $action == 'delete' ) {
   }
 
   $changed = false;
-  while( $config = dbFetchNext($result) ) {
+  while ($config = dbFetchNext($result)) {
     unset($newValue);
-    if ( $config['Type'] == 'boolean' && empty($_REQUEST['newConfig'][$config['Name']]) ) {
+    if ( ($config['Type'] == 'boolean') and empty($_REQUEST['newConfig'][$config['Name']]) ) {
       $newValue = 0;
     } else if ( isset($_REQUEST['newConfig'][$config['Name']]) ) {
       $newValue = preg_replace("/\r\n/", "\n", stripslashes($_REQUEST['newConfig'][$config['Name']]));
@@ -98,5 +98,4 @@ if ( $action == 'delete' ) {
   }
   return;
 } // end if object vs action
-
 ?>
diff --git a/web/includes/actions/settings.php b/web/includes/actions/settings.php
index c33f3a54c..a4aa1b489 100644
--- a/web/includes/actions/settings.php
+++ b/web/includes/actions/settings.php
@@ -29,7 +29,7 @@ if ( ! canView('Control', $_REQUEST['mid']) ) {
   return;
 }
 
-require_once('Monitor.php');
+require_once('includes/Monitor.php');
 $mid = validInt($_REQUEST['mid']);
 if ( $action == 'settings' ) {
   $args = ' -m ' . escapeshellarg($mid);
diff --git a/web/includes/actions/shutdown.php b/web/includes/actions/shutdown.php
deleted file mode 100644
index 4d7a4ee78..000000000
--- a/web/includes/actions/shutdown.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-//
-// ZoneMinder web action file
-// Copyright (C) 2019 ZoneMinder LLC
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canEdit('System') ) {
-  ZM\Warning('Need System permissions to shutdown server');
-  return;
-}
-if ( $action ) {
-  $when = isset($_POST['when']) and $_POST['when'] == 'now' ? 'now' : '+1';
-  if ( $action == 'shutdown' ) {
-    $output = array();
-    $rc = 0;
-    exec('sudo -n '.ZM_PATH_SHUTDOWN." -P $when 2>&1", $output, $rc);
-    #exec('sudo -n /bin/systemctl poweroff -i 2>&1', $output, $rc);
-    ZM\Logger::Debug("Shutdown output $rc " . implode("\n",$output));
-    #ZM\Logger::Debug("Shutdown output " . shell_exec('/bin/systemctl poweroff -i 2>&1'));
-  } else if ( $action == 'restart' ) {
-    $output = array();
-    exec('sudo -n '.ZM_PATH_SHUTDOWN." -r $when 2>&1", $output);
-    #exec('sudo -n /bin/systemctl reboot -i 2>&1', $output);
-    ZM\Logger::Debug("Shutdown output " . implode("\n",$output));
-  } else if ( $action == 'cancel' ) {
-    $output = array();
-    exec('sudo '.ZM_PATH_SHUTDOWN.' -c 2>&1', $output);
-  }
-} # end if action
-?>
diff --git a/web/includes/actions/snapshot.php b/web/includes/actions/snapshot.php
new file mode 100644
index 000000000..1f5677453
--- /dev/null
+++ b/web/includes/actions/snapshot.php
@@ -0,0 +1,76 @@
+<?php
+//
+// ZoneMinder web action
+// Copyright (C) 2019 ZoneMinder LLC
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+require_once('includes/Snapshot.php');
+require_once('includes/Monitor.php');
+
+
+if ( $action == 'create' ) {
+  if ( ! (isset($_REQUEST['monitor_ids']) and count($_REQUEST['monitor_ids']) > 0 ) ) {
+    ZM\Error('No monitor ids given in snapshot creation request');
+    return;
+  }
+  $snapshot = new ZM\Snapshot();
+  $snapshot->save(array('CreatedBy'=>$user['Id']));
+
+  foreach ( $_REQUEST['monitor_ids'] as $monitor_id ) {
+    $snapshot_event = new ZM\Snapshot_Event();
+
+    $monitor = new ZM\Monitor($monitor_id);
+    $event_id = $monitor->TriggerOn();
+    ZM\Debug("Have event $event_id for monitor $monitor_id");
+    if ( $event_id ) {
+      $snapshot_event->save(array(
+        'SnapshotId'=>$snapshot->Id(),
+        'EventId'=>$event_id
+      ));
+    }
+  }  # end foreach monitor
+  foreach ( $_REQUEST['monitor_ids'] as $monitor_id ) {
+    $monitor = new ZM\Monitor($monitor_id);
+    $monitor->TriggerOff();
+  }
+  foreach ( $snapshot->Events() as $event ) {
+    $event->save(array('Archived'=>1));
+  }
+  $redirect = '?view=snapshot&id='.$snapshot->Id();
+  return;
+}
+
+// Event scope actions, view permissions only required
+if ( isset($_REQUEST['id']) ) {
+  $snapshot = new ZM\Snapshot($_REQUEST['id']);
+  if ( ($action == 'save') ) {
+    if ( canEdit('Events') or $snapshot->CreatedBy() == $user['Id'] ) {
+
+      $changes = $snapshot->changes($_REQUEST['snapshot']);
+      if ( count($changes) ) {
+        $snapshot->save($changes);
+      }
+      $redirect = '?view=snapshots';
+    }
+  } else if ( $action == 'delete' ) {
+    if ( canEdit('Events') ) {
+      $snapshot->delete();
+      $redirect = '?view=snapshots';
+    }
+  }
+}  // end if canEdit(Events)
+?>
diff --git a/web/includes/actions/user.php b/web/includes/actions/user.php
index acbcdab7e..b13471231 100644
--- a/web/includes/actions/user.php
+++ b/web/includes/actions/user.php
@@ -18,80 +18,72 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( $action == 'Save' ) {
-  if ( canEdit('System') ) {
-    if ( !empty($_REQUEST['uid']) ) {
-      $dbUser = dbFetchOne('SELECT * FROM Users WHERE Id=?', NULL, array($_REQUEST['uid']));
-    } else {
-      $dbUser = array();
-    }
+global $error_message;
 
-    $types = array();
-    if ( isset($_REQUEST['newUser']['MonitorIds']) and is_array($_REQUEST['newUser']['MonitorIds']) )
+if ($action == 'Save') {
+  require_once('includes/User.php');
+  $uid = isset($_REQUEST['uid']) ? validInt($_REQUEST['uid']) : 0;
+  $dbUser = new ZM\User($uid);
+
+  if (canEdit('System')) {
+    # Need to check for uniqueness of Username
+    $user_with_my_username = ZM\User::find_one(array('Username'=>$_REQUEST['newUser']['Username']));
+    if ($user_with_my_username and 
+      ( ( $uid and ($user_with_my_username->Id() != $uid) ) or !$uid)
+    ) {
+      $error_message = 'There already exists a user with this Username<br/>';
+      unset($_REQUEST['redirect']);
+      return;
+    }
+    # What other tests should we do?
+
+    if (isset($_REQUEST['newUser']['MonitorIds']) and is_array($_REQUEST['newUser']['MonitorIds']))
       $_REQUEST['newUser']['MonitorIds'] = implode(',', $_REQUEST['newUser']['MonitorIds']);
-    if ( !$_REQUEST['newUser']['Password'] )
+    if (!empty($_REQUEST['newUser']['Password'])) {
+      $_REQUEST['newUser']['Password'] = password_hash($_REQUEST['newUser']['Password'], PASSWORD_BCRYPT);
+    } else {
       unset($_REQUEST['newUser']['Password']);
-
-    $changes = getFormChanges($dbUser, $_REQUEST['newUser'], $types);
-
-    
-    if ( isset($_REQUEST['newUser']['Password']) ) {
-      if ( function_exists('password_hash') ) {
-        $pass_hash = '"'.password_hash($_REQUEST['newUser']['Password'], PASSWORD_BCRYPT).'"';
-      } else {
-        $pass_hash = ' PASSWORD('.dbEscape($_REQUEST['newUser']['Password']).') ';
-        ZM\Info('Cannot use bcrypt as you are using PHP < 5.3');
-      }
-
-      if ( $_REQUEST['newUser']['Password'] ) {
-        $changes['Password'] = 'Password = '.$pass_hash;
-      } else {
-        unset($changes['Password']);
-      }
     }
+    $changes = $dbUser->changes($_REQUEST['newUser']);
+    ZM\Debug("Changes: " . print_r($changes, true));
 
-    if ( count($changes) ) {
-      if ( !empty($_REQUEST['uid']) ) {
-        dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id = ?', array($_REQUEST['uid']));
-        # If we are updating the logged in user, then update our session user data.
-        if ( $user and ( $dbUser['Username'] == $user['Username'] ) ) {
+    if (count($changes)) {
+      if (!$dbUser->save($changes)) {
+        $error_message = $dbUser->get_last_error();
+        unset($_REQUEST['redirect']);
+        return;
+      }
+
+      if ($uid) {
+        if ($user and ($dbUser->Username() == $user['Username'])) {
           # We are the logged in user, need to update the $user object and generate a new auth_hash
           $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Id=?';
-          $user = dbFetchOne($sql, NULL, array($_REQUEST['uid']));
+          $user = dbFetchOne($sql, NULL, array($uid));
 
           # Have to update auth hash in session
           zm_session_start();
           generateAuthHash(ZM_AUTH_HASH_IPS, true);
           session_write_close();
         }
-      } else {
-        dbQuery('INSERT INTO Users SET '.implode(', ', $changes));
       }
-      $refreshParent = true;
-    }
-    $view = 'none';
-  } else if ( ZM_USER_SELF_EDIT and ( $_REQUEST['uid'] == $user['Id'] ) ) {
-    $uid = $user['Id'];
-
-    $dbUser = dbFetchOne('SELECT Id, Password, Language FROM Users WHERE Id = ?', NULL, array($uid));
-
-    $types = array();
-    $changes = getFormChanges($dbUser, $_REQUEST['newUser'], $types);
-
-    if ( function_exists('password_hash') ) {
-      $pass_hash = '"'.password_hash($_REQUEST['newUser']['Password'], PASSWORD_BCRYPT).'"';
+    } # end if changes
+  } else if (ZM_USER_SELF_EDIT and ($uid == $user['Id'])) {
+    if (!empty($_REQUEST['newUser']['Password'])) {
+      $_REQUEST['newUser']['Password'] = password_hash($_REQUEST['newUser']['Password'], PASSWORD_BCRYPT);
     } else {
-      $pass_hash = ' PASSWORD('.dbEscape($_REQUEST['newUser']['Password']).') ';
-      ZM\Info ('Cannot use bcrypt as you are using PHP < 5.3');
+      unset($_REQUEST['newUser']['Password']);
     }
+    $fields = array('Password'=>'', 'Language'=>'', 'HomeView'=>'');
+    ZM\Debug("changes: ".print_r(array_intersect_key($_REQUEST['newUser'], $fields),true));
+    $changes = $dbUser->changes(array_intersect_key($_REQUEST['newUser'], $fields));
+    ZM\Debug("changes: ".print_r($changes, true));
 
-    if ( !empty($_REQUEST['newUser']['Password']) ) {
-      $changes['Password'] = 'Password = '.$pass_hash;
-    } else {
-      unset($changes['Password']);
-    }
-    if ( count($changes) ) {
-      dbQuery('UPDATE Users SET '.implode(', ', $changes).' WHERE Id=?', array($uid));
+    if (count($changes)) {
+      if (!$dbUser->save($changes)) {
+        $error_message = $dbUser->get_last_error();
+        unset($_REQUEST['redirect']);
+        return;
+      }
 
       # We are the logged in user, need to update the $user object and generate a new auth_hash
       $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Id=?';
@@ -100,9 +92,7 @@ if ( $action == 'Save' ) {
       zm_session_start();
       generateAuthHash(ZM_AUTH_HASH_IPS, true);
       session_write_close();
-      $refreshParent = true;
     }
-    $view = 'none';
   }
 } // end if $action == user
 ?>
diff --git a/web/includes/actions/zone.php b/web/includes/actions/zone.php
index c0e4eabbb..0d651103d 100644
--- a/web/includes/actions/zone.php
+++ b/web/includes/actions/zone.php
@@ -59,20 +59,15 @@ if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
         dbQuery('INSERT INTO Zones SET MonitorId=?, '.implode(', ', $changes), array($mid));
       }
       if ( daemonCheck() && ($monitor->Type() != 'WebSite') ) {
-        if ( $_REQUEST['newZone']['Type'] == 'Privacy' ) {
-          $monitor->zmaControl('stop');
-          $monitor->zmcControl('restart');
-          $monitor->zmaControl('start');
-        } else {
-          $monitor->zmaControl('restart');
-        }
+        $monitor->zmcControl('restart');
       }
       if ( ($_REQUEST['newZone']['Type'] == 'Privacy') && $monitor->Controllable() ) {
         $monitor->sendControlCommand('quit');
       }
-      $refreshParent = true;
     } // end if changes
-    $view = 'none';
+    # HTTP_REFERER will typically be ?view=zone so no good.
+    # if a referer is passed in $_REQUEST then use it otherwise go to ?view=zones
+    $redirect = isset($_REQUEST['REFERER']) ? $_REQUEST['REFERER'] : '?view=zones';
   } // end if action 
 } // end if $mid and canEdit($mid)
 ?>
diff --git a/web/includes/actions/zones.php b/web/includes/actions/zones.php
index 48f5a6091..502ee2541 100644
--- a/web/includes/actions/zones.php
+++ b/web/includes/actions/zones.php
@@ -42,10 +42,7 @@ if ( $action == 'delete' ) {
 
     foreach ( $monitors_to_restart as $mid => $monitor ) {
       if ( daemonCheck() and ($monitor->Type() != 'WebSite') ) {
-        zmaControl($mid, 'stop');
-        if ( $monitor->Type() == 'Privacy' )
-          zmcControl($mid, 'restart');
-        zmaControl($mid, 'start');
+        zmcControl($mid, 'restart');
       } // end if daemonCheck()
     }
     $refreshParent = true;
diff --git a/web/includes/auth.php b/web/includes/auth.php
index e49f5876b..224f88abf 100644
--- a/web/includes/auth.php
+++ b/web/includes/auth.php
@@ -58,26 +58,24 @@ function migrateHash($user, $pass) {
 
 // core function used to load a User record by username and password
 function validateUser($username='', $password='') {
-
   $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
   // local user, shouldn't affect the global user
   $user = dbFetchOne($sql, NULL, array($username));
-
-  if ( ! $user ) {
+  if (!$user) {
     return array(false, "Could not retrieve user $username details");
   }
 
-  switch ( password_type($user['Password']) ) {
+  switch (password_type($user['Password'])) {
   case 'mysql' : 
     // We assume we don't need to support mysql < 4.1
     // Starting MY SQL 4.1, mysql concats a '*' in front of its password hash
     // https://blog.pythian.com/hashing-algorithm-in-mysql-password-2/
-    ZM\Logger::Debug('Saved password is using MYSQL password function');
+    ZM\Debug('Saved password is using MYSQL password function');
     $input_password_hash = '*'.strtoupper(sha1(sha1($password, true)));
     $password_correct = ($user['Password'] == $input_password_hash);
     break;
   case 'bcrypt' :
-    ZM\Logger::Debug('bcrypt signature found, assumed bcrypt password');
+    ZM\Debug('bcrypt signature found, assumed bcrypt password');
     $password_correct = password_verify($password, $user['Password']);
     break;
   case 'mysql+bcrypt' : 
@@ -85,10 +83,10 @@ function validateUser($username='', $password='') {
     // this is done so that we don't spend cycles doing two bcrypt password_verify calls
     // for every wrong password entered. This will only be invoked for passwords zmupdate.pl has
     // overlay hashed
-    ZM\Logger::Debug("Detected bcrypt overlay hashing for $username");
+    ZM\Debug("Detected bcrypt overlay hashing for $username");
     $bcrypt_hash = substr($user['Password'], 4);
     $mysql_encoded_password = '*'.strtoupper(sha1(sha1($password, true)));
-    ZM\Logger::Debug("Comparing password $mysql_encoded_password to bcrypt hash: $bcrypt_hash");
+    ZM\Debug("Comparing password $mysql_encoded_password to bcrypt hash: $bcrypt_hash");
     $password_correct = password_verify($mysql_encoded_password, $bcrypt_hash);
     break;
   default:
@@ -97,7 +95,7 @@ function validateUser($username='', $password='') {
     $password_correct = ($user['Password'] == $password);
   } // switch password_type
 
-  if ( $password_correct ) {
+  if ($password_correct) {
     return array($user, 'OK');
   }
   return array(false, "Login denied for user \"$username\"");
@@ -105,7 +103,7 @@ function validateUser($username='', $password='') {
 
 function userLogout() {
   global $user;
-  ZM\Info('User "'.$user['Username'].'" logged out');
+  ZM\Info('User "'.($user?$user['Username']:'no one').'" logged out');
   $user = null;// unset only clears the local variable
   zm_session_clear();
 }
@@ -130,18 +128,18 @@ function validateToken($token, $allowed_token_type='access') {
       return array(false, 'Incorrect token type');
     }
   } else {
-    ZM\Logger::Debug('Not comparing token types as [any] was passed');
+    ZM\Debug('Not comparing token types as [any] was passed');
   }
   
   $username = $jwt_payload['user'];
   $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
   $saved_user_details = dbFetchOne($sql, NULL, array($username));
 
-  if ( $saved_user_details ) {
+  if ($saved_user_details) {
     $issuedAt =  $jwt_payload['iat'];
     $minIssuedAt = $saved_user_details['TokenMinExpiry'];
 
-    if ( $issuedAt < $minIssuedAt ) {
+    if ($issuedAt < $minIssuedAt) {
       ZM\Error("Token revoked for $username. Please generate a new token");
       $user = null;// unset only clears the local variable
       return array(false, 'Token revoked. Please re-generate');
@@ -155,9 +153,9 @@ function validateToken($token, $allowed_token_type='access') {
 } // end function validateToken($token, $allowed_token_type='access')
 
 function getAuthUser($auth) {
-  if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') && !empty($auth) ) {
+  if (ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') && !empty($auth)) {
     $remoteAddr = '';
-    if ( ZM_AUTH_HASH_IPS ) {
+    if (ZM_AUTH_HASH_IPS) {
       $remoteAddr = $_SERVER['REMOTE_ADDR'];
       if ( !$remoteAddr ) {
         ZM\Error("Can't determine remote address for authentication, using empty string");
@@ -165,52 +163,70 @@ function getAuthUser($auth) {
       }
     }
 
+    $sql = 'SELECT * FROM Users WHERE Enabled = 1';
     $values = array();
-    if ( isset($_SESSION['username']) ) {
+    if (isset($_SESSION['username'])) {
       # Most of the time we will be logged in already and the session will have our username, so we can significantly speed up our hash testing by only looking at our user.
       # Only really important if you have a lot of users.
-      $sql = 'SELECT * FROM Users WHERE Enabled = 1 AND Username=?';
+      $sql .= ' AND Username=?';
       array_push($values, $_SESSION['username']);
-    } else {
-      $sql = 'SELECT * FROM Users WHERE Enabled = 1';
     }
 
-    foreach ( dbFetchAll($sql, NULL, $values) as $user ) {
+    foreach (dbFetchAll($sql, NULL, $values) as $user) {
       $now = time();
-      for ( $i = 0; $i < ZM_AUTH_HASH_TTL; $i++, $now -= 3600 ) { // Try for last TTL hours
+      for ($i = 0; $i < ZM_AUTH_HASH_TTL; $i++, $now -= 3600) { // Try for last TTL hours
         $time = localtime($now);
         $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$remoteAddr.$time[2].$time[3].$time[4].$time[5];
         $authHash = md5($authKey);
 
-        if ( $auth == $authHash ) {
+        if ($auth == $authHash) {
           return $user;
         } // end if $auth == $authHash
       } // end foreach hour
     } // end foreach user
+
+    if (isset($_SESSION['username'])) {
+			# In a multi-server case, we might be logged in as another user and so the auth hash didn't work
+			$sql = 'SELECT * FROM Users WHERE Enabled = 1 AND Username != ?';
+
+			foreach (dbFetchAll($sql, NULL, $values) as $user) {
+				$now = time();
+				for ($i = 0; $i < ZM_AUTH_HASH_TTL; $i++, $now -= 3600) { // Try for last TTL hours
+					$time = localtime($now);
+					$authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$remoteAddr.$time[2].$time[3].$time[4].$time[5];
+					$authHash = md5($authKey);
+
+					if ($auth == $authHash) {
+						return $user;
+					} // end if $auth == $authHash
+				} // end foreach hour
+			} // end foreach user
+    } // end if 
   } // end if using auth hash
+
   ZM\Error("Unable to authenticate user from auth hash '$auth'");
   return null;
 } // end getAuthUser($auth)
 
 function generateAuthHash($useRemoteAddr, $force=false) {
   global $user;
-  if ( ZM_OPT_USE_AUTH and (ZM_AUTH_RELAY == 'hashed') and isset($user['Username']) and isset($user['Password']) ) {
+  if (ZM_OPT_USE_AUTH and (ZM_AUTH_RELAY == 'hashed') and isset($user['Username']) and isset($user['Password']) and isset($_SESSION)) {
     $time = time();
 
     # We use 1800 so that we regenerate the hash at half the TTL
-    $mintime = $time - ( ZM_AUTH_HASH_TTL * 1800 );
+    $mintime = $time - (ZM_AUTH_HASH_TTL * 1800);
 
     # Appending the remoteAddr prevents us from using an auth hash generated for a different ip
-    if ( $force or ( !isset($_SESSION['AuthHash'.$_SESSION['remoteAddr']]) ) or ( $_SESSION['AuthHashGeneratedAt'] < $mintime ) ) {
+    if ($force or ( !isset($_SESSION['AuthHash'.$_SESSION['remoteAddr']]) ) or ( $_SESSION['AuthHashGeneratedAt'] < $mintime )) {
       # Don't both regenerating Auth Hash if an hour hasn't gone by yet
       $local_time = localtime();
       $authKey = '';
-      if ( $useRemoteAddr ) {
+      if ($useRemoteAddr) {
         $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$_SESSION['remoteAddr'].$local_time[2].$local_time[3].$local_time[4].$local_time[5];
       } else {
         $authKey = ZM_AUTH_HASH_SECRET.$user['Username'].$user['Password'].$local_time[2].$local_time[3].$local_time[4].$local_time[5];
       }
-      #ZM\Logger::Debug("Generated using hour:".$local_time[2] . ' mday:' . $local_time[3] . ' month:'.$local_time[4] . ' year: ' . $local_time[5] );
+      #ZM\Debug("Generated using hour:".$local_time[2] . ' mday:' . $local_time[3] . ' month:'.$local_time[4] . ' year: ' . $local_time[5] );
       $auth = md5($authKey);
       $_SESSION['AuthHash'.$_SESSION['remoteAddr']] = $auth;
       $_SESSION['AuthHashGeneratedAt'] = $time;
@@ -241,33 +257,31 @@ function canEdit($area, $mid=false) {
 
 function userFromSession() {
   $user = null; // Not global
-  if ( isset($_SESSION['username']) ) {
-    if ( ZM_AUTH_HASH_LOGINS and (ZM_AUTH_RELAY == 'hashed') ) {
+  if (isset($_SESSION['username'])) {
+    if (ZM_AUTH_HASH_LOGINS and (ZM_AUTH_RELAY == 'hashed')) {
       # Extra validation, if logged in, then the auth hash will be set in the session, so we can validate it.
       # This prevent session modification to switch users
-      if ( isset($_SESSION['AuthHash'.$_SESSION['remoteAddr']]) )
+      if (isset($_SESSION['AuthHash'.$_SESSION['remoteAddr']]))
         $user = getAuthUser($_SESSION['AuthHash'.$_SESSION['remoteAddr']]);
       else
-        ZM\Logger::Debug("No auth hash in session, there should have been");
+        ZM\Debug('No auth hash in session, there should have been');
     } else {
       # Need to refresh permissions and validate that the user still exists
       $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
       $user = dbFetchOne($sql, NULL, array($_SESSION['username']));
     }
-  } else {
-    ZM\Logger::Debug('No username in session');
   }
   return $user;
 }
 
 function get_auth_relay() {
-  if ( ZM_OPT_USE_AUTH ) {
-    if ( ZM_AUTH_RELAY == 'hashed' ) {
+  if (ZM_OPT_USE_AUTH) {
+    if (ZM_AUTH_RELAY == 'hashed') {
       return 'auth='.generateAuthHash(ZM_AUTH_HASH_IPS);
-    } else if ( ZM_AUTH_RELAY == 'plain' ) {
+    } else if (ZM_AUTH_RELAY == 'plain') {
       // password probably needs to be escaped
       return 'username='.$_SESSION['username'].'&password='.urlencode($_SESSION['password']);
-    } else if ( ZM_AUTH_RELAY == 'none' ) {
+    } else if (ZM_AUTH_RELAY == 'none') {
       return 'username='.$_SESSION['username'];
     } else {
       ZM\Error('Unknown value for ZM_AUTH_RELAY ' . ZM_AUTH_RELAY);
@@ -276,8 +290,8 @@ function get_auth_relay() {
   return '';
 } // end function get_auth_relay
 
-if ( ZM_OPT_USE_AUTH ) {
-  if ( !empty($_REQUEST['token']) ) {
+if (ZM_OPT_USE_AUTH) {
+  if (!empty($_REQUEST['token'])) {
     // we only need to get the username here
     // don't know the token type. That will
     // be checked later 
@@ -286,7 +300,7 @@ if ( ZM_OPT_USE_AUTH ) {
   } else {
     // Non token based auth
 
-    if ( ZM_AUTH_HASH_LOGINS && empty($user) && !empty($_REQUEST['auth']) ) {
+    if (ZM_AUTH_HASH_LOGINS && empty($user) && !empty($_REQUEST['auth'])) {
       $user = getAuthUser($_REQUEST['auth']);
     } else if (
       ! (
@@ -295,13 +309,13 @@ if ( ZM_OPT_USE_AUTH ) {
       (defined('ZM_OPT_USE_GOOG_RECAPTCHA') && ZM_OPT_USE_GOOG_RECAPTCHA)
     ) ) {
       $ret = validateUser($_REQUEST['username'], $_REQUEST['password']);
-      if ( !$ret[0] ) {
+      if (!$ret[0]) {
         ZM\Error($ret[1]);
         unset($user); // unset should be ok here because we aren't in a function
         return;
       }
       $user = $ret[0];
-    } else if ( (ZM_AUTH_TYPE == 'remote') and !empty($_SERVER['REMOTE_USER']) ) {
+    } else if ((ZM_AUTH_TYPE == 'remote') and !empty($_SERVER['REMOTE_USER'])) {
       $sql = 'SELECT * FROM Users WHERE Enabled=1 AND Username=?';
       // local user, shouldn't affect the global user
       $user = dbFetchOne($sql, NULL, array($_SERVER['REMOTE_USER']));
@@ -309,7 +323,7 @@ if ( ZM_OPT_USE_AUTH ) {
       $user = userFromSession();
     }
 
-    if ( !empty($user) ) {
+    if (!empty($user)) {
       // generate it once here, while session is open.  Value will be cached in session and return when called later on
       generateAuthHash(ZM_AUTH_HASH_IPS);
     }
diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index 65dbcdbd9..12c54906a 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -151,6 +151,7 @@ $GLOBALS['defaultUser'] = array(
   'Monitors'  => 'Edit',
   'Groups'    => 'Edit',
   'Devices'   => 'Edit',
+  'Snapshots' => 'Edit',
   'System'    => 'Edit',
   'MaxBandwidth' => '',
   'MonitorIds'   => false
diff --git a/web/includes/csrf/csrf-magic.php b/web/includes/csrf/csrf-magic.php
index edb04002a..b102c565a 100644
--- a/web/includes/csrf/csrf-magic.php
+++ b/web/includes/csrf/csrf-magic.php
@@ -193,21 +193,21 @@ function csrf_check($fatal = true) {
     $tokens = '';
     do {
         if (!isset($_POST[$name])) {
-#Logger::Debug("POST[$name] is not set");
+#Debug("POST[$name] is not set");
 break;
 #} else {
-#Logger::Debug("POST[$name] is set as " . $_POST[$name] );
+#Debug("POST[$name] is set as " . $_POST[$name] );
 
 }
         // we don't regenerate a token and check it because some token creation
         // schemes are volatile.
         $tokens = $_POST[$name];
         if (!csrf_check_tokens($tokens)) {
-#Logger::Debug("Failed checking tokens");
+#Debug("Failed checking tokens");
 break;
 
 #} else {
-#Logger::Debug("Token passed");
+#Debug("Token passed");
 }
         $ok = true;
     } while (false);
@@ -296,7 +296,7 @@ function csrf_callback($tokens) {
       // Don't make it too easy for users to inflict a CSRF attack on themselves.
       echo "<p><strong>Only try again if you weren't sent to this page by someone as this is potentially a sign of an attack.</strong></p>";
       echo "<form method='post' action=''>$data<input type='submit' value='Try again' /></form>";
-      ZM\Logger::Debug("Failed csrf check");
+      ZM\Debug("Failed csrf check");
     }
     echo "<p>Debug: $tokens</p></body></html>
 ";
@@ -318,27 +318,27 @@ function csrf_check_tokens($tokens) {
  * Checks if a token is valid.
  */
 function csrf_check_token($token) {
-#Logger::Debug("Checking CSRF token $token");
+#Debug("Checking CSRF token $token");
     if (strpos($token, ':') === false) { 
-#Logger::Debug("Checking CSRF token $token bad because no :");
+#Debug("Checking CSRF token $token bad because no :");
       return false;
     }
     list($type, $value) = explode(':', $token, 2);
     if (strpos($value, ',') === false) {
-#Logger::Debug("Checking CSRF token $token bad because no ,");
+#Debug("Checking CSRF token $token bad because no ,");
       return false;
     }
     list($x, $time) = explode(',', $token, 2);
     if ($GLOBALS['csrf']['expires']) {
         if (time() > $time + $GLOBALS['csrf']['expires']) {
-#Logger::Debug("Checking CSRF token $token bad because expired");
+#Debug("Checking CSRF token $token bad because expired");
 return false;
         }
     }
     switch ($type) {
         case 'sid':
             {
- #Logger::Debug("Checking sid: $value === " . csrf_hash(session_id(), $time) );
+ #Debug("Checking sid: $value === " . csrf_hash(session_id(), $time) );
             return $value === csrf_hash(session_id(), $time);
             }
         case 'cookie':
@@ -348,10 +348,10 @@ return false;
             return $value === csrf_hash($_COOKIE[$n], $time);
         case 'key':
             if (!$GLOBALS['csrf']['key']) {
-		    Logger::Debug("Checking key: no key set"  );
+		    Debug("Checking key: no key set"  );
 		    return false;
 	    }
- #Logger::Debug("Checking sid: $value === " . csrf_hash($GLOBALS['csrf']['key'], $time) );
+ #Debug("Checking sid: $value === " . csrf_hash($GLOBALS['csrf']['key'], $time) );
 	    return $value === csrf_hash($GLOBALS['csrf']['key'], $time);
         // We could disable these 'weaker' checks if 'key' was set, but
         // that doesn't make me feel good then about the cookie-based
diff --git a/web/includes/database.php b/web/includes/database.php
index 4298b4ce8..34ea384fa 100644
--- a/web/includes/database.php
+++ b/web/includes/database.php
@@ -64,7 +64,8 @@ function dbConnect() {
     $dbConn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
     $dbConn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
   } catch(PDOException $ex) {
-    echo "Unable to connect to ZM db using dsn $dsn host".ZM_DB_HOST.' user: ('.ZM_DB_USER.') password ('.ZM_DB_PASS.': '.$ex->getMessage();
+    global $error_message;
+    $error_message = "Unable to connect to ZM db using dsn $dsn<br/><br/>".$ex->getMessage();
     error_log('Unable to connect to ZM DB ' . $ex->getMessage());
     $dbConn = null;
   }
@@ -72,7 +73,8 @@ function dbConnect() {
 }  // end function dbConnect
 
 if ( !dbConnect() ) {
-  ZM\Fatal('Failed db connection');
+  include('views/no_database_connection.php');
+  exit();
 }
 
 function dbDisconnect() {
@@ -103,17 +105,17 @@ function dbLog($sql, $update=false) {
   global $dbLogLevel;
   $noExecute = $update && ($dbLogLevel >= DB_LOG_DEBUG);
   if ( $dbLogLevel > DB_LOG_OFF )
-    ZM\Logger::Debug( "SQL-LOG: $sql".($noExecute?' (not executed)':'') );
+    ZM\Debug( "SQL-LOG: $sql".($noExecute?' (not executed)':'') );
   return( $noExecute );
 }
 
 function dbError($sql) {
   global $dbConn;
   $error = $dbConn->errorInfo();
-  if ( ! $error[0] )
+  if ( !$error[0] )
     return '';
 
-  $message = "SQL-ERR '".implode("\n",$dbConn->errorInfo())."', statement was '".$sql."'";
+  $message = "SQL-ERR '".implode("\n", $dbConn->errorInfo())."', statement was '".$sql."'";
   ZM\Error($message);
   return $message;
 }
@@ -126,7 +128,7 @@ function dbEscape( $string ) {
     return $dbConn->quote($string);
 }
 
-function dbQuery($sql, $params=NULL) {
+function dbQuery($sql, $params=NULL, $debug = false) {
   global $dbConn;
   if ( dbLog($sql, true) )
     return;
@@ -143,8 +145,8 @@ function dbQuery($sql, $params=NULL) {
         return NULL;
       }
     } else {
-      if ( defined('ZM_DB_DEBUG') ) {
-				ZM\Logger::Debug("SQL: $sql values:" . ($params?implode(',',$params):''));
+      if ( defined('ZM_DB_DEBUG') or $debug ) {
+				ZM\Debug("SQL: $sql values:" . ($params?implode(',',$params):''));
       }
       $result = $dbConn->query($sql);
       if ( ! $result ) {
@@ -152,8 +154,8 @@ function dbQuery($sql, $params=NULL) {
         return NULL;
       }
     }
-    if ( defined('ZM_DB_DEBUG') ) {
-      ZM\Logger::Debug('SQL: '.$sql.' '.($params?implode(',',$params):'').' rows: '.$result->rowCount());
+    if ( defined('ZM_DB_DEBUG') or $debug ) {
+      ZM\Debug('SQL: '.$sql.' '.($params?implode(',',$params):'').' rows: '.$result->rowCount());
     }
   } catch(PDOException $e) {
     ZM\Error("SQL-ERR '".$e->getMessage()."', statement was '".$sql."' params:" . ($params?implode(',',$params):''));
@@ -187,13 +189,13 @@ function dbFetchOne($sql, $col=false, $params=NULL) {
 }
 
 function dbFetchAll($sql, $col=false, $params=NULL) {
+  $dbRows = array();
   $result = dbQuery($sql, $params);
   if ( ! $result ) {
     ZM\Error("SQL-ERR dbFetchAll no result, statement was '".$sql."'".($params ? 'params: '.join(',', $params) : ''));
-    return false;
+    return $dbRows;
   }
 
-  $dbRows = array();
   while ( $dbRow = $result->fetch(PDO::FETCH_ASSOC) )
     $dbRows[] = $col ? $dbRow[$col] : $dbRow;
   return $dbRows;
diff --git a/web/includes/functions.php b/web/includes/functions.php
index bc57fce50..60fb99571 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -104,7 +104,7 @@ function CORSHeaders() {
 # Only need CORSHeaders in the event that there are multiple servers in use.
       # ICON: Might not be true. multi-port?
       if ( ZM_MIN_STREAMING_PORT ) {
-        ZM\Logger::Debug('Setting default Access-Control-Allow-Origin from ' . $_SERVER['HTTP_ORIGIN']);
+        ZM\Debug('Setting default Access-Control-Allow-Origin from ' . $_SERVER['HTTP_ORIGIN']);
         header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
         header('Access-Control-Allow-Headers: x-requested-with,x-request');
       }
@@ -117,7 +117,7 @@ function CORSHeaders() {
         preg_match('/^(https?:\/\/)?'.preg_quote($Server->Name(),'/').'/i', $_SERVER['HTTP_ORIGIN'])
       ) {
         $valid = true;
-        ZM\Logger::Debug('Setting Access-Control-Allow-Origin from '.$_SERVER['HTTP_ORIGIN']);
+        ZM\Debug('Setting Access-Control-Allow-Origin from '.$_SERVER['HTTP_ORIGIN']);
         header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
         header('Access-Control-Allow-Headers: x-requested-with,x-request');
         break;
@@ -392,7 +392,7 @@ function getEventDefaultVideoPath($event) {
 }
 
 function deletePath( $path ) {
-  ZM\Logger::Debug('Deleting '.$path);
+  ZM\Debug('Deleting '.$path);
   if ( is_dir($path) ) {
     system(escapeshellcmd('rm -rf '.$path));
   } else if ( file_exists($path) ) {
@@ -424,6 +424,9 @@ function deleteEvent($event) {
   } # CAN EDIT
 }
 
+/**
+ * $label must be already escaped. It can't be done here since it sometimes contains HTML tags.
+ */
 function makeLink($url, $label, $condition=1, $options='') {
   $string = '';
   if ( $condition ) {
@@ -443,47 +446,13 @@ function makeHelpLink($ohndx) {
   return $string;
 }
 
-/**
- * $label must be already escaped. It can't be done here since it sometimes contains HTML tags.
- */
-function makePopupLink($url, $winName, $winSize, $label, $condition=1, $options='') {
-  // Avoid double-encoding since some consumers incorrectly pass a pre-escaped URL.
-  $string = '<a';
-  if ( $condition ) {
-    $string .= ' class="popup-link" href="' . htmlspecialchars($url, ENT_COMPAT | ENT_HTML401, ini_get('default_charset'), false) . '"';
-    $string .= ' data-window-name="' . htmlspecialchars($winName) . '"';
-    if ( is_array( $winSize ) ) {
-      $string .= ' data-window-tag="' . htmlspecialchars($winSize[0]) . '"';
-      $string .= ' data-window-width="' . htmlspecialchars($winSize[1]) . '"';
-      $string .= ' data-window-height="' . htmlspecialchars($winSize[2]) . '"';
-    } else {
-      $string .= ' data-window-tag="' . htmlspecialchars($winSize) . '"';
-    }
-
-    $string .= ($options ? (' ' . $options ) : '') . '>';
-  } else {
-    $string .= '>';
-  }
-  $string .= $label;
-  $string .= '</a>';
-  return $string;
-}
-
-function makePopupButton($url, $winName, $winSize, $buttonValue, $condition=1, $options='') {
-  $string = '<input type="button" class="popup-link" value="' . htmlspecialchars($buttonValue) . '"';
-  $string .= ' data-url="' . htmlspecialchars($url, ENT_COMPAT | ENT_HTML401, ini_get("default_charset"), false) . '"';
-  $string .= ' data-window-name="' . htmlspecialchars($winName) . '"';
-  if ( is_array($winSize) ) {
-    $string .= ' data-window-tag="' . htmlspecialchars($winSize[0]) . '"';
-    $string .= ' data-window-width="' . htmlspecialchars($winSize[1]) . '"';
-    $string .= ' data-window-height="' . htmlspecialchars($winSize[2]) . '"';
-  } else {
-    $string .= ' data-window-tag="' . htmlspecialchars($winSize) . '"';
-  }
+function makeButton($url, $buttonValue, $condition=1, $options='') {
+  $string = '<button type="button" data-on-click-this="'.$buttonValue.'"';
+  $string .= ' data-url="' .$url. '"';
   if (!$condition) {
     $string .= ' disabled="disabled"';
   }
-  $string .= ($options ? (' ' . $options) : '') . '/>';
+  $string .= ($options ? (' ' . $options) : '') . '/>'.translate($buttonValue).'</button>'.PHP_EOL;
   return $string;
 }
 
@@ -499,7 +468,7 @@ function htmlSelect($name, $contents, $values, $behaviours=false) {
     }
   }
 
-  return '<select name="'.$name.'" '.$behaviourText.'>'.htmlOptions($contents, $values).'</select>';
+  return '<select name="'.$name.'" '.$behaviourText.'>'.PHP_EOL.htmlOptions($contents, $values).'</select>';
 }
 
 function htmlOptions($options, $values) {
@@ -530,11 +499,10 @@ function htmlOptions($options, $values) {
     $options_html .= '<option value="'.htmlspecialchars($value, ENT_COMPAT | ENT_HTML401, ini_get('default_charset'), false).'"'.
       ($selected?' selected="selected"':'').
       ($disabled?' disabled="disabled"':'').
-      '>'.htmlspecialchars($text, ENT_COMPAT | ENT_HTML401, ini_get('default_charset'), false).'</option>
-';
+      '>'.htmlspecialchars($text, ENT_COMPAT | ENT_HTML401, ini_get('default_charset'), false).'</option>'.PHP_EOL;
   } # end foreach options
-  if ( $values and ! $has_selected ) {
-    ZM\Warning('Specified value '.$values.' not in contents: '.print_r($options, true));
+  if ( $values and ((!is_array($values)) or count($values) ) and ! $has_selected ) {
+    ZM\Warning('Specified value '.print_r($values, true).' not in contents: '.print_r($options, true));
   }
   return $options_html;
 } # end function htmlOptions
@@ -572,7 +540,7 @@ function buildSelect($name, $contents, $behaviours=false) {
         $behaviourText .= ' '.$event.'="'.$action.'"';
       }
     } else {
-      $behaviourText = ' onchange="'.$behaviours.'"';
+      $behaviourText = ' data-on-change-this="'.$behaviours.'"';
     }
   }
   ?>
@@ -822,7 +790,7 @@ function daemonControl($command, $daemon=false, $args=false) {
   }
   $string = escapeshellcmd($string);
   #$string .= ' 2>/dev/null >&- <&- >/dev/null';
-  ZM\Logger::Debug('daemonControl '.$string);
+  ZM\Debug('daemonControl '.$string);
   exec($string);
 }
 
@@ -831,11 +799,6 @@ function zmcControl($monitor, $mode=false) {
   return $Monitor->zmcControl($mode);
 }
 
-function zmaControl($monitor, $mode=false) {
-  $Monitor = new ZM\Monitor($monitor);
-  return $Monitor->zmaControl($mode);
-}
-
 function initDaemonStatus() {
   global $daemon_status;
 
@@ -874,13 +837,6 @@ function zmcStatus($monitor) {
   return daemonStatus('zmc', $zmcArgs);
 }
 
-function zmaStatus($monitor) {
-  if ( is_array($monitor) ) {
-    $monitor = $monitor['Id'];
-  }
-  return daemonStatus('zma', '-m '.$monitor);
-}
-
 function daemonCheck($daemon=false, $args=false) {
   $string = ZM_PATH_BIN.'/zmdc.pl check';
   if ( $daemon ) {
@@ -902,13 +858,6 @@ function zmcCheck($monitor) {
   return daemonCheck('zmc', $zmcArgs);
 }
 
-function zmaCheck($monitor) {
-  if ( is_array($monitor) ) {
-    $monitor = $monitor['Id'];
-  }
-  return daemonCheck('zma', '-m '.$monitor);
-}
-
 function getImageSrc($event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false) {
   $Event = new ZM\Event($event);
   return $Event->getImageSrc($frame, $scale, $captureOnly, $overwrite);
@@ -963,7 +912,7 @@ function createVideo($event, $format, $rate, $scale, $overwrite=false) {
     $command .= ' -o';
   $command = escapeshellcmd($command);
   $result = exec($command, $output, $status);
-  ZM\Logger::Debug("generating Video $command: result($result outptu:(".implode("\n", $output )." status($status");
+  ZM\Debug("generating Video $command: result($result outptu:(".implode("\n", $output )." status($status");
   return $status ? '' : rtrim($result);
 }
 
@@ -1028,23 +977,27 @@ function parseSort($saveToSession=false, $querySep='&amp;') {
       $sortColumn = 'E.Cause';
       break;
     case 'DateTime' :
-      $sortColumn = 'E.StartTime';
-      $_REQUEST['sort_field'] = 'StartTime';
+      $sortColumn = 'E.StartDateTime';
+      $_REQUEST['sort_field'] = 'StartDateTime';
       break;
     case 'DiskSpace' :
       $sortColumn = 'E.DiskSpace';
       break;
     case 'StartTime' :
-      $sortColumn = 'E.StartTime';
+      # legacy
+      $_REQUEST['sort_field'] = 'StartDateTime';
+      $sortColumn = 'E.StartDateTime';
       break;
     case 'StartDateTime' :
-      $sortColumn = 'E.StartTime';
+      $sortColumn = 'E.StartDateTime';
       break;
     case 'EndTime' :
-      $sortColumn = 'E.EndTime';
+      #legacy
+      $_REQUEST['sort_field'] = 'EndDateTime';
+      $sortColumn = 'E.EndDateTime';
       break;
     case 'EndDateTime' :
-      $sortColumn = 'E.EndTime';
+      $sortColumn = 'E.EndDateTime';
       break;
     case 'Length' :
       $sortColumn = 'E.Length';
@@ -1080,7 +1033,7 @@ function parseSort($saveToSession=false, $querySep='&amp;') {
       $sortColumn = 'F.Score';
       break;
     default:
-      $sortColumn = 'E.StartTime';
+      $sortColumn = 'E.StartDateTime';
       break;
   }
   if ( !isset($_REQUEST['sort_asc']) )
@@ -1109,7 +1062,7 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
   $Filter = ZM\Filter::parse($filter, $querySep);
 
   $filter['sql'] = $Filter->sql();
-  $filter['querystring'] = $Filter->querystring();
+  $filter['querystring'] = $Filter->querystring('filter', $querySep);
   $filter['hidden_fields'] = $Filter->hidden_fields();
   $filter['pre_sql_conditions'] = $Filter->pre_sql_conditions();
   $filter['post_sql_conditions'] = $Filter->post_sql_conditions();
@@ -1228,8 +1181,8 @@ function sortHeader($field, $querySep='&amp;') {
     '?view='.$view,
     'page=1'.(isset($_REQUEST['filter'])?$_REQUEST['filter']['query']:''),
     'sort_field='.$field,
-    'sort_asc='.($_REQUEST['sort_field'] == $field ? !$_REQUEST['sort_asc'] : 0),
-    'limit='.validInt($_REQUEST['limit']),
+    'sort_asc='.( ( isset($_REQUEST['sort_field']) and ( $_REQUEST['sort_field'] == $field ) ) ? !$_REQUEST['sort_asc'] : 0),
+    'limit='.(isset($_REQUEST['limit']) ? validInt($_REQUEST['limit']) : ''),
     (isset($_REQUEST['eid']) ? 'eid='.$_REQUEST['eid'] : '' ),
   ));
 }
@@ -1666,17 +1619,17 @@ function coordsToPoints($coords) {
 function limitPoints(&$points, $min_x, $min_y, $max_x, $max_y) {
   foreach ( $points as &$point ) {
     if ( $point['x'] < $min_x ) {
-      ZM\Logger::Debug('Limiting point x'.$point['x'].' to min_x '.$min_x);
+      ZM\Debug('Limiting point x'.$point['x'].' to min_x '.$min_x);
       $point['x'] = $min_x;
     } else if ( $point['x'] > $max_x ) {
-      ZM\Logger::Debug('Limiting point x'.$point['x'].' to max_x '.$max_x);
+      ZM\Debug('Limiting point x'.$point['x'].' to max_x '.$max_x);
       $point['x'] = $max_x;
     }
     if ( $point['y'] < $min_y ) {
-      ZM\Logger::Debug('Limiting point y'.$point['y'].' to min_y '.$min_y);
+      ZM\Debug('Limiting point y'.$point['y'].' to min_y '.$min_y);
       $point['y'] = $min_y;
     } else if ( $point['y'] > $max_y ) {
-      ZM\Logger::Debug('Limiting point y'.$point['y'].' to max_y '.$max_y);
+      ZM\Debug('Limiting point y'.$point['y'].' to max_y '.$max_y);
       $point['y'] = $max_y;
     }
   } // end foreach point
@@ -2101,13 +2054,18 @@ function getStreamHTML($monitor, $options = array()) {
         if ( $scale < $options['scale'] )
           $options['scale'] = $scale;
       } else {
-        Warning('Invalid value for width: '.$options['width']);
+        ZM\Warning('Invalid value for width: '.$options['width']);
       }
     }
   }
   if ( ! isset($options['mode'] ) ) {
     $options['mode'] = 'stream';
   }
+  if ( ! isset($options['width'] ) )
+    $options['width'] = 0;
+  if ( ! isset($options['height'] ) )
+    $options['height'] = 0;
+
   $options['maxfps'] = ZM_WEB_VIDEO_MAXFPS;
   if ( $monitor->StreamReplayBuffer() )
     $options['buffer'] = $monitor->StreamReplayBuffer();
@@ -2177,14 +2135,15 @@ function folder_size($dir) {
 } // end function folder_size
 
 function human_filesize($size, $precision = 2) {
-  $units = array('B','kB','MB','GB','TB','PB','EB','ZB','YB');
+  $units = array('B ','kB','MB','GB','TB','PB','EB','ZB','YB');
   $step = 1024;
   $i = 0;
   while (($size / $step) > 0.9) {
     $size = $size / $step;
     $i++;
   }
-  return round($size, $precision).$units[$i];
+  # The idea is that we can right align this and have the digits columns line up nicely.
+  return sprintf('%.'.$precision.'f', round($size, $precision)).$units[$i];
 }
 
 function csrf_startup() {
@@ -2201,7 +2160,7 @@ function check_timezone() {
     'TIME_FORMAT(TIMEDIFF(NOW(), UTC_TIMESTAMP),\'%H%i\')'
   ));
 
-  #Logger::Debug("System timezone offset determine to be: $sys_tzoffset,\x20
+  #Debug("System timezone offset determine to be: $sys_tzoffset,\x20
                  #PHP timezone offset determine to be: $php_tzoffset,\x20
                  #Mysql timezone offset determine to be: $mysql_tzoffset
                #");
@@ -2440,4 +2399,11 @@ function zm_random_bytes($length = 32) {
   }
   ZM\Error('No random_bytes function found.');
 }
+
+function i18n() {
+  $string = explode('_', ZM_LANG_DEFAULT, 2);
+  $string[1] = strtoupper($string[1]);
+
+  return implode('-', $string);
+}
 ?>
diff --git a/web/includes/logger.php b/web/includes/logger.php
index b616f7458..02da47a15 100644
--- a/web/includes/logger.php
+++ b/web/includes/logger.php
@@ -158,7 +158,7 @@ class Logger {
 
     $this->initialised = true;
 
-    //Logger::Debug( "LogOpts: level=".self::$codes[$this->level]."/".self::$codes[$this->effectiveLevel].", screen=".self::$codes[$this->termLevel].", database=".self::$codes[$this->databaseLevel].", logfile=".self::$codes[$this->fileLevel]."->".$this->logFile.", weblog=".self::$codes[$this->weblogLevel].", syslog=".self::$codes[$this->syslogLevel] );
+    //Debug( "LogOpts: level=".self::$codes[$this->level]."/".self::$codes[$this->effectiveLevel].", screen=".self::$codes[$this->termLevel].", database=".self::$codes[$this->databaseLevel].", logfile=".self::$codes[$this->fileLevel]."->".$this->logFile.", weblog=".self::$codes[$this->weblogLevel].", syslog=".self::$codes[$this->syslogLevel] );
   }
 
   private function terminate() {
@@ -199,9 +199,6 @@ class Logger {
     return self::$instance;
   }
 
-  public static function Debug( $string ) {
-    Logger::fetch()->logPrint( Logger::DEBUG, $string );
-  }
 
   public function id( $id=NULL ) {
     if ( isset($id) && $this->id != $id ) {
@@ -400,7 +397,8 @@ class Logger {
         if ( !error_log($message."\n", 3, $this->logFile) ) {
           if ( strnatcmp(phpversion(), '5.2.0') >= 0 ) {
             $error = error_get_last();
-            trigger_error("Can't write to log file '".$this->logFile."': ".$error['message'].' @ '.$error['file'].'/'.$error['line'], E_USER_ERROR);
+            $this->fileLevel = self::NOLOG;
+            Error("Can't write to log file '".$this->logFile."': ".$error['message'].' @ '.$error['file'].'/'.$error['line'], E_USER_ERROR);
           }
         }
       } else if ( $this->logFd ) {
@@ -411,11 +409,14 @@ class Logger {
       }
     }
 
-    $message = $code.' ['.$string.']';
     if ( $level <= $this->syslogLevel )
-      syslog( self::$syslogPriorities[$level], $message );
+      syslog(self::$syslogPriorities[$level], $message);
 
+    $message = $code.' ['.$string.']';
     if ( $level <= $this->databaseLevel ) {
+      if ( strlen($file) > 255 )
+        $file = substr($file, 0, 255);
+
       try {
         global $dbConn;
         $sql = 'INSERT INTO `Logs` ( `TimeKey`, `Component`, `ServerId`, `Pid`, `Level`, `Code`, `Message`, `File`, `Line` ) VALUES ( ?, ?, ?, ?, ?, ?, ?, ?, ? )';
@@ -459,6 +460,10 @@ function Dump( &$var, $label='VAR' ) {
   Logger::fetch()->logPrint( Logger::DEBUG, ob_get_clean() );
 }
 
+function Debug( $string ) {
+  Logger::fetch()->logPrint( Logger::DEBUG, $string );
+}
+
 function Info( $string ) {
   Logger::fetch()->logPrint( Logger::INFO, $string );
 }
diff --git a/web/includes/session.php b/web/includes/session.php
index 47f85d877..0190f9897 100644
--- a/web/includes/session.php
+++ b/web/includes/session.php
@@ -25,7 +25,7 @@ function zm_session_start() {
     }
 
     ini_set('session.name', 'ZMSESSID');
-    ZM\Logger::Debug('Setting cookie parameters to '.print_r($currentCookieParams, true));
+    ZM\Debug('Setting cookie parameters to '.print_r($currentCookieParams, true));
   }
   session_start();
   $_SESSION['remoteAddr'] = $_SERVER['REMOTE_ADDR']; // To help prevent session hijacking
@@ -37,7 +37,7 @@ function zm_session_start() {
     session_start();
   } else if ( !empty($_SESSION['generated_at']) ) {
     if ( $_SESSION['generated_at']<($now-(ZM_COOKIE_LIFETIME/2)) ) {
-      ZM\Logger::Debug('Regenerating session because generated_at ' . $_SESSION['generated_at'] . ' < ' . $now . '-'.ZM_COOKIE_LIFETIME.'/2 = '.($now-ZM_COOKIE_LIFETIME/2));
+      ZM\Debug('Regenerating session because generated_at ' . $_SESSION['generated_at'] . ' < ' . $now . '-'.ZM_COOKIE_LIFETIME.'/2 = '.($now-ZM_COOKIE_LIFETIME/2));
       zm_session_regenerate_id();
     }
   }
@@ -87,4 +87,71 @@ function zm_session_clear() {
   session_write_close();
   session_start();
 } // function zm_session_clear()
+
+
+class Session {
+  private $db;
+  public function __construct() {
+    global $dbConn;
+    $this->db = $dbConn;
+
+    // Set handler to overide SESSION
+    session_set_save_handler(
+      array($this, '_open'),
+      array($this, '_close'),
+      array($this, '_read'),
+      array($this, '_write'),
+      array($this, '_destroy'),
+      array($this, '_gc')
+    );
+
+    // Start the session
+    //zm_session_start();
+  }
+  public function _open() {
+    return $this->db ? true : false;
+  }
+  public function _close(){
+    // The example code closed the db connection.. I don't think we care to.
+    return true;
+  }
+  public function _read($id){
+    $sth = $this->db->prepare('SELECT data FROM Sessions WHERE id = :id');
+    $sth->bindParam(':id', $id, PDO::PARAM_STR, 32);
+
+    if ( $sth->execute() and ( $row = $sth->fetch(PDO::FETCH_ASSOC) ) ) {
+      return $row['data'];
+    }
+    // Return an empty string
+    return '';
+  }
+  public function _write($id, $data){
+    // Create time stamp
+    $access = time();
+
+    $sth = $this->db->prepare('REPLACE INTO Sessions VALUES (:id, :access, :data)');
+
+    $sth->bindParam(':id', $id, PDO::PARAM_STR, 32);
+    $sth->bindParam(':access', $access, PDO::PARAM_INT);
+    $sth->bindParam(':data', $data);
+
+    return $sth->execute() ? true : false;
+  }
+  public function _destroy($id) {
+    $sth = $this->db->prepare('DELETE FROM Sessions WHERE Id = :id');
+    $sth->bindParam(':id', $id, PDO::PARAM_STR, 32);
+    return $sth->execute() ? true : false;
+  }
+  public function _gc($max) {
+    // Calculate what is to be deemed old
+    $now = time();
+    $old = $now - $max;
+    ZM\Debug('doing session gc ' . $now . '-' . $max. '='.$old);
+    $sth = $this->db->prepare('DELETE FROM Sessions WHERE access < :old');
+    $sth->bindParam(':old', $old, PDO::PARAM_INT);
+    return $sth->execute() ? true : false;
+  }
+} # end class Session
+
+$session = new Session;
 ?>
diff --git a/web/index.php b/web/index.php
index 3d6f24fc7..5026bb016 100644
--- a/web/index.php
+++ b/web/index.php
@@ -47,16 +47,12 @@ require_once('includes/config.php');
 require_once('includes/session.php');
 require_once('includes/logger.php');
 require_once('includes/Server.php');
-require_once('includes/Storage.php');
-require_once('includes/Event.php');
-require_once('includes/Group.php');
-require_once('includes/Monitor.php');
 
 // Useful debugging lines for mobile devices
 if ( 0 and ZM\Logger::fetch()->debugOn() ) {
   ob_start();
   phpinfo(INFO_VARIABLES);
-  ZM\Logger::Debug(ob_get_contents());
+  ZM\Debug(ob_get_contents());
   ob_end_clean();
 }
 
@@ -82,7 +78,7 @@ define('ZM_BASE_URL', '');
 
 require_once('includes/functions.php');
 if ( $_SERVER['REQUEST_METHOD'] == 'OPTIONS' ) {
-  ZM\Logger::Debug('OPTIONS Method, only doing CORS');
+  ZM\Debug('OPTIONS Method, only doing CORS');
   # Add Cross domain access headers
   CORSHeaders();
   return;
@@ -98,7 +94,7 @@ if ( isset($_GET['skin']) ) {
   $skin = 'classic';
 }
 
-if ( ! is_dir("skins/$skin") ) {
+if (!is_dir('skins/'.$skin) ) {
   $skins = array_map('basename', glob('skins/*', GLOB_ONLYDIR));
 
   if ( !in_array($skin, $skins) ) {
@@ -117,10 +113,10 @@ if ( isset($_GET['css']) ) {
   $css = 'classic';
 }
 
-if ( !is_dir("skins/$skin/css/$css") ) {
+if (!is_dir("skins/$skin/css/$css")) {
   $css_skins = array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR));
-  if ( count($css_skins) ) {
-    if ( !in_array($css, $css_skins) ) {
+  if (count($css_skins)) {
+    if (!in_array($css, $css_skins)) {
       ZM\Error("Invalid skin css '$css' setting to " . $css_skins[0]);
       $css = $css_skins[0];
     } else {
@@ -137,7 +133,7 @@ define('ZM_SKIN_PATH', "skins/$skin");
 define('ZM_SKIN_NAME', $skin);
 
 $skinBase = array(); // To allow for inheritance of skins
-if ( !file_exists(ZM_SKIN_PATH) )
+if (!file_exists(ZM_SKIN_PATH))
   ZM\Fatal("Invalid skin '$skin'");
 $skinBase[] = $skin;
 
@@ -196,6 +192,11 @@ require_once('includes/auth.php');
 # Any file/page that sets session variables must re-open it.
 session_write_close();
 
+require_once('includes/Storage.php');
+require_once('includes/Event.php');
+require_once('includes/Group.php');
+require_once('includes/Monitor.php');
+
 // lang references $user[Language] so must come after auth
 require_once('includes/lang.php');
 
@@ -218,7 +219,7 @@ if ( (!$view and !$request) or ($view == 'console') ) {
   check_timezone();
 }
 
-ZM\Logger::Debug("View: $view Request: $request Action: $action User: " . ( isset($user) ? $user['Username'] : 'none' ));
+ZM\Debug("View: $view Request: $request Action: $action User: " . ( isset($user) ? $user['Username'] : 'none' ));
 if (
   ZM_ENABLE_CSRF_MAGIC &&
   ( $action != 'login' ) &&
@@ -227,16 +228,17 @@ if (
   ( $request != 'control' ) && 
   //( $view != 'frames' ) &&  // big html can overflow ob
   ( $view != 'archive' ) // returns data
+  && ( (!isset($_SERVER['CONTENT_TYPE']) or ($_SERVER['CONTENT_TYPE'] != 'application/csp-report')) )
 ) {
   require_once('includes/csrf/csrf-magic.php');
-  #ZM\Logger::Debug("Calling csrf_check with the following values: \$request = \"$request\", \$view = \"$view\", \$action = \"$action\"");
+  #ZM\Debug("Calling csrf_check with the following values: \$request = \"$request\", \$view = \"$view\", \$action = \"$action\"");
   csrf_check();
 }
 
 # Need to include actions because it does auth
 if ( $action and !$request ) {
   if ( file_exists('includes/actions/'.$view.'.php') ) {
-    ZM\Logger::Debug("Including includes/actions/$view.php");
+    ZM\Debug("Including includes/actions/$view.php");
     require_once('includes/actions/'.$view.'.php');
   } else {
     ZM\Warning("No includes/actions/$view.php for action $action");
@@ -245,30 +247,27 @@ if ( $action and !$request ) {
 
 # If I put this here, it protects all views and popups, but it has to go after actions.php because actions.php does the actual logging in.
 if ( ZM_OPT_USE_AUTH and (!isset($user)) and ($view != 'login') and ($view != 'none') ) {
-  /* AJAX check  */
-  if ( !empty($_SERVER['HTTP_X_REQUESTED_WITH'])
-    && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest' ) {
+  if ($request) {
+    # requests only return json
     header('HTTP/1.1 401 Unauthorized');
     exit;
   }
-  ZM\Logger::Debug('Redirecting to login');
   $view = 'none';
   $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=login';
-  if ( ! $request ) {
-    zm_session_start();
-    $_SESSION['postLoginQuery'] = $_SERVER['QUERY_STRING'];
-    session_write_close();
-  }
-  $request = null;
+  zm_session_start();
+  $_SESSION['postLoginQuery'] = $_SERVER['QUERY_STRING'];
+  session_write_close();
 } else if ( ZM_SHOW_PRIVACY && ($view != 'privacy') && ($view != 'options') && (!$request) && canEdit('System') ) {
   $view = 'none';
   $redirect = ZM_BASE_URL.$_SERVER['PHP_SELF'].'?view=privacy';
   $request = null;
 }
 
+if ( isset($_REQUEST['redirect']) )
+  $redirect = '?view='.detaintPath($_REQUEST['redirect']);
 
 if ( $redirect ) {
-  ZM\Logger::Debug("Redirecting to $redirect");
+  ZM\Debug("Redirecting to $redirect");
   header('Location: '.$redirect);
   return;
 }
diff --git a/web/js/MonitorStream.js b/web/js/MonitorStream.js
index 24996344a..a10d90008 100644
--- a/web/js/MonitorStream.js
+++ b/web/js/MonitorStream.js
@@ -8,22 +8,31 @@ function MonitorStream(monitorData) {
   this.status = null;
   this.alarmState = STATE_IDLE;
   this.lastAlarmState = STATE_IDLE;
-  this.streamCmdParms = 'view=request&request=stream&connkey='+this.connKey;
-  if ( auth_hash ) {
-    this.streamCmdParms += '&auth='+auth_hash;
-  } else if ( auth_relay ) {
-    this.streamCmdParms += '&'+auth_relay;
-  }
-  this.streamCmdTimer = null;
+  this.streamCmdParms = {
+    view: 'request',
+    request: 'stream',
+    connkey: this.connKey
+  };
   this.type = monitorData.type;
   this.refresh = monitorData.refresh;
   this.start = function(delay) {
     // Step 1 make sure we are streaming instead of a static image
-    var stream = $j('#liveStream'+this.id)[0];
-    if ( ! stream ) {
+    var stream = $j('#liveStream'+this.id);
+    if (!stream.length) {
       console.log('No live stream');
       return;
     }
+    stream = stream[0];
+    if ( !stream ) {
+      console.log('No live stream');
+      return;
+    }
+    if ( !stream.src ) {
+      // Website Monitors won't have an img tag
+      console.log('No src for #liveStream'+this.id);
+      console.log(stream);
+      return;
+    }
     src = stream.src.replace(/mode=single/i, 'mode=jpeg');
     if ( -1 == src.search('connkey') ) {
       src += '&connkey='+this.connKey;
@@ -33,15 +42,7 @@ function MonitorStream(monitorData) {
       stream.src = '';
       stream.src = src;
     }
-
-    if ( this.streamCmdQuery ) {
-      this.streamCmdTimer = this.streamCmdQuery.delay(delay, this);
-    } else {
-      console.log("No streamCmdQuery");
-    }
-
-    console.log("queueing for " + this.id + " " + this.connKey + " timeout is: " + AJAX_TIMEOUT);
-    requestQueue.addRequest("cmdReq"+this.id, this.streamCmdReq);
+    setTimeout(this.streamCmdQuery.bind(this), delay);
   };
   this.stop = function() {
     if ( 0 ) {
@@ -57,13 +58,16 @@ function MonitorStream(monitorData) {
         stream.src = src;
       }
     }
-    this.streamCmdReq.send(this.streamCmdParms+"&command="+CMD_STOP);
+    this.streamCmdParms.command = CMD_STOP;
+    this.streamCmdReq(this.streamCmdParms);
   };
   this.pause = function() {
-    this.streamCmdReq.send(this.streamCmdParms+"&command="+CMD_PAUSE);
+    this.streamCmdParms.command = CMD_PAUSE;
+    this.streamCmdReq(this.streamCmdParms);
   };
   this.play = function() {
-    this.streamCmdReq.send(this.streamCmdParms+"&command="+CMD_PLAY);
+    this.streamCmdParms.command = CMD_PLAY;
+    this.streamCmdReq(this.streamCmdParms);
   };
 
   this.eventHandler = function(event) {
@@ -72,14 +76,10 @@ function MonitorStream(monitorData) {
 
   this.onclick = function(evt) {
     var el = evt.currentTarget;
-    var tag = 'watch';
     var id = el.getAttribute("data-monitor-id");
-    var width = el.getAttribute("data-width");
-    var height = el.getAttribute("data-height");
     var url = '?view=watch&mid='+id;
-    var name = 'zmWatch'+id;
     evt.preventDefault();
-    createPopup(url, name, tag, width, height);
+    window.location.assign(url);
   };
 
   this.setup_onclick = function() {
@@ -90,55 +90,27 @@ function MonitorStream(monitorData) {
     document.getElementById('imageFeed'+this.id).removeEventListener('click', this.onclick );
   };
 
-  this.setStateClass = function(element, stateClass) {
-    if ( !element ) {
+  this.setStateClass = function(jobj, stateClass) {
+    if ( !jobj ) {
       return;
     }
-    if ( !element.hasClass( stateClass ) ) {
-      if ( stateClass != 'alarm' ) {
-        element.removeClass('alarm');
-      }
-      if ( stateClass != 'alert' ) {
-        element.removeClass('alert');
-      }
-      if ( stateClass != 'idle' ) {
-        element.removeClass('idle');
-      }
-      element.addClass(stateClass);
+    if ( !jobj.hasClass( stateClass ) ) {
+      if ( stateClass != 'alarm' ) jobj.removeClass('alarm');
+      if ( stateClass != 'alert' ) jobj.removeClass('alert');
+      if ( stateClass != 'idle' ) jobj.removeClass('idle');
+
+      jobj.addClass(stateClass);
     }
   };
 
-  this.onError = function(text, error) {
-    console.log('onerror: ' + text + ' error:'+error);
-    // Requeue, but want to wait a while.
-    var streamCmdTimeout = 10*statusRefreshTimeout;
-    this.streamCmdTimer = this.streamCmdQuery.delay(streamCmdTimeout, this);
-  };
-  this.onFailure = function(xhr) {
-    console.log('onFailure: ' + this.connKey);
-    console.log(xhr);
-    if ( ! requestQueue.hasNext('cmdReq'+this.id) ) {
-      console.log('Not requeuing because there is one already');
-      requestQueue.addRequest('cmdReq'+this.id, this.streamCmdReq);
-    }
-    if ( 0 ) {
-    // Requeue, but want to wait a while.
-      if ( this.streamCmdTimer ) {
-        this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
-      }
-      var streamCmdTimeout = 1000*statusRefreshTimeout;
-      this.streamCmdTimer = this.streamCmdQuery.delay(streamCmdTimeout, this, true);
-      requestQueue.resume();
-    }
-    console.log('done failure');
+  this.onFailure = function(jqxhr, textStatus, error) {
+    setTimeout(this.streamCmdQuery.bind(this), 1000*statusRefreshTimeout);
+    logAjaxFail(jqxhr, textStatus, error);
   };
 
   this.getStreamCmdResponse = function(respObj, respText) {
-    if ( this.streamCmdTimer ) {
-      this.streamCmdTimer = clearTimeout(this.streamCmdTimer);
-    }
-
     var stream = $j('#liveStream'+this.id)[0];
+
     if ( ! stream ) {
       console.log('No live stream');
       return;
@@ -163,22 +135,16 @@ function MonitorStream(monitorData) {
           !COMPACT_MONTAGE) &&
           (this.type != 'WebSite')
         ) {
-          fpsValue = $('fpsValue'+this.id);
-          if ( fpsValue ) {
-            fpsValue.set('text', this.status.fps);
-          }
-          stateValue = $('stateValue'+this.id);
-          if ( stateValue ) {
-            stateValue.set('text', stateStrings[this.alarmState]);
-          }
+          var fpsValue = $j('#fpsValue'+this.id);
+          var stateValue = $j('#stateValue'+this.id);
+          var monitorState = $j('#monitorState'+this.id);
 
-          monitorState = $('monitorState'+this.id);
-          if ( monitorState ) {
-            this.setStateClass(monitorState, stateClass);
-          }
+          if ( fpsValue.length ) fpsValue.text(this.status.fps);
+          if ( stateValue.length ) stateValue.text(stateStrings[this.alarmState]);
+          if ( monitorState.length ) this.setStateClass(monitorState, stateClass);
         }
 
-        this.setStateClass($('monitor'+this.id), stateClass);
+        this.setStateClass($j('#monitor'+this.id), stateClass);
 
         /*Stream could be an applet so can't use moo tools*/
         //stream.parentNode().className = stateClass;
@@ -192,7 +158,7 @@ function MonitorStream(monitorData) {
         if ( newAlarm ) {
           if ( false && SOUND_ON_ALARM ) {
             // Enable the alarm sound
-            $('alarmSound').removeClass('hidden');
+            $j('#alarmSound').removeClass('hidden');
           }
           if ( (typeof POPUP_ON_ALARM !== 'undefined') && POPUP_ON_ALARM ) {
             windowToFront();
@@ -201,7 +167,7 @@ function MonitorStream(monitorData) {
         if ( false && SOUND_ON_ALARM ) {
           if ( oldAlarm ) {
             // Disable alarm sound
-            $('alarmSound').addClass('hidden');
+            $j('#alarmSound').addClass('hidden');
           }
         }
         if ( this.status.auth ) {
@@ -234,38 +200,29 @@ function MonitorStream(monitorData) {
       }
     } // end if Ok or not
 
-    var streamCmdTimeout = statusRefreshTimeout;
-    // The idea here is if we are alarmed, do updates faster.
-    // However, there is a timeout in the php side which isn't getting modified,
-    // so this may cause a problem. Also the server may only be able to update so fast.
-    //if ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT ) {
-    //streamCmdTimeout = streamCmdTimeout/5;
-    //}
-    this.streamCmdTimer = this.streamCmdQuery.delay(streamCmdTimeout, this);
     this.lastAlarmState = this.alarmState;
+    setTimeout(this.streamCmdQuery.bind(this), statusRefreshTimeout);
   };
 
   this.streamCmdQuery = function(resent) {
-    if ( resent ) {
-      console.log(this.connKey+': timeout: Resending');
-      this.streamCmdReq.cancel();
-    }
     //console.log("Starting CmdQuery for " + this.connKey );
     if ( this.type != 'WebSite' ) {
-      this.streamCmdReq.send(this.streamCmdParms+'&command='+CMD_QUERY);
+      this.streamCmdParms.command = CMD_QUERY;
+      this.streamCmdReq(this.streamCmdParms);
     }
   };
 
   if ( this.type != 'WebSite' ) {
-    this.streamCmdReq = new Request.JSON( {
-      url: this.url,
-      method: 'get',
-      timeout: AJAX_TIMEOUT,
-      onSuccess: this.getStreamCmdResponse.bind(this),
-      onTimeout: this.streamCmdQuery.bind(this, true),
-      onError: this.onError.bind(this),
-      onFailure: this.onFailure.bind(this),
-      link: 'cancel'
-    } );
+    this.streamCmdReq = function(streamCmdParms) {
+      if ( auth_hash ) {
+        this.streamCmdParms.auth = auth_hash;
+      } else if ( auth_relay ) {
+        this.streamCmdParms.auth_relay = '';
+      }
+      $j.ajaxSetup({timeout: AJAX_TIMEOUT});
+      $j.getJSON(this.url, streamCmdParms)
+          .done(this.getStreamCmdResponse.bind(this))
+          .fail(this.onFailure.bind(this));
+    };
   }
 } // end function MonitorStream
diff --git a/web/js/logger.js b/web/js/logger.js
index 20e52b726..050b2cecb 100644
--- a/web/js/logger.js
+++ b/web/js/logger.js
@@ -16,6 +16,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
+$j.ajaxSetup({timeout: AJAX_TIMEOUT});
+var reportLogs = true;
 
 if ( !window.console ) {
   window.console =
@@ -28,55 +30,51 @@ if ( !window.console ) {
       error: function() {}
     };
 }
+
 if ( !console.debug ) {
   // IE8 has console but doesn't have console.debug so lets alias it.
   console.debug = console.log;
 }
 
-var reportLogs = true;
+window.onerror = function(message, url, line) {
+  logReport("ERR", message, url, line);
+};
 
-var debugParms;
-var debugReq;
+window.addEventListener("securitypolicyviolation", function logCSP(evt) {
+  var level = evt.disposition == "enforce" ? "ERR" : "DBG";
+  var message = evt.blockedURI + " violated CSP " + evt.violatedDirective;
+
+  if ( evt.sample ) message += " (Sample: " + evt.sample + ")";
+  logReport(level, message, evt.sourceFile, evt.lineNumber);
+});
 
 function logReport( level, message, file, line ) {
-  if ( !reportLogs ) {
-    return;
-  }
+  if ( !reportLogs ) return;
 
-  if ( typeof(MooTools) == "undefined" ) {
-    return;
-  }
   /* eslint-disable no-caller */
   if ( arguments && arguments.callee && arguments.callee.caller && arguments.callee.caller.caller && arguments.callee.caller.caller.name ) {
     message += ' - '+arguments.callee.caller.caller.name+'()';
-    //console.log("arguments");
-  } else {
-    //message += new Error().stack;
-    //console.log("stack");
   }
-  /* eslint-enable no-caller */
 
-  if ( !debugReq ) {
-    debugParms = "view=request&request=log&task=create";
-    if ( Browser ) {
-      debugParms += "&browser[name]="+Browser.name+"&browser[version]="+Browser.version+"&browser[platform]="+(Browser.Platform?Browser.Platform.name:'unknown');
-    } else {
-      debugParms += "&browser[name]=unknown&browser[version]=unknown&browser[platform]=unknown";
-    }
-    debugReq = new Request.JSON({url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'chain'});
-  }
-  var requestParms = debugParms;
-  requestParms += "&level="+level+"&message="+encodeURIComponent(message);
+  var data = {
+    view: 'request',
+    request: 'log',
+    task: 'create',
+    level: level,
+    message: encodeURIComponent(message),
+    browser: browserInfo()
+  };
+
   if ( file ) {
-    requestParms += "&file="+file;
+    data.file = file;
   } else if ( location.search ) {
     //location.search is the querystring part, so ?blah=blah but there is almost never any value to this
-    requestParms += "&file="+location.search;
+    data.file = location.search;
   }
-  if ( line ) {
-    requestParms += "&line="+line;
-  }
-  debugReq.send(requestParms);
+
+  if ( line ) data.line = line;
+
+  $j.post(thisUrl, data, null, 'json');
 }
 
 function Panic(message) {
@@ -112,22 +110,93 @@ function Debug(message) {
 }
 
 function Dump(value, label) {
-  if ( label ) {
-    console.debug(label+" => ");
-  }
+  if ( label ) console.debug(label+" => ");
   console.debug(value);
 }
 
-window.onerror =
-    function( message, url, line ) {
-      logReport("ERR", message, url, line);
-    };
+/*
+JQuery has deprecated its browser object. This function implements our own
+browser object. It strikes a compromise between importing a full browser
+detection js library and using the js navigator object in its umodified form.
 
-window.addEventListener("securitypolicyviolation", function logCSP(evt) {
-  var level = evt.disposition == "enforce" ? "ERR" : "DBG";
-  var message = evt.blockedURI + " violated CSP " + evt.violatedDirective;
-  if ( evt.sample ) {
-    message += " (Sample: " + evt.sample + ")";
+This function derived from the following sample on stackoverflow:
+https://stackoverflow.com/a/11219680
+*/
+
+function browserInfo() {
+  var browser = {};
+  var nAgt = navigator.userAgent;
+  var browserName = navigator.appName;
+  var fullVersion = ''+parseFloat(navigator.appVersion);
+  var majorVersion = parseInt(navigator.appVersion, 10);
+  var nameOffset;
+  var verOffset;
+  var ix;
+
+  // In Opera, the true version is after "Opera" or after "Version"
+  if ((verOffset=nAgt.indexOf("Opera")) != -1) {
+    browserName = "Opera";
+    fullVersion = nAgt.substring(verOffset+6);
+    if ((verOffset=nAgt.indexOf("Version")) != -1) {
+      fullVersion = nAgt.substring(verOffset+8);
+    }
+  // In MSIE, the true version is after "MSIE" in userAgent
+  } else if ((verOffset=nAgt.indexOf("MSIE")) != -1) {
+    browserName = "Microsoft Internet Explorer";
+    fullVersion = nAgt.substring(verOffset+5);
+  // In Chrome, the true version is after "Chrome"
+  } else if ((verOffset=nAgt.indexOf("Chrome")) != -1) {
+    browserName = "Chrome";
+    fullVersion = nAgt.substring(verOffset+7);
+  // In Safari, the true version is after "Safari" or after "Version"
+  } else if ((verOffset=nAgt.indexOf("Safari")) != -1) {
+    browserName = "Safari";
+    fullVersion = nAgt.substring(verOffset+7);
+    if ((verOffset=nAgt.indexOf("Version")) != -1) {
+      fullVersion = nAgt.substring(verOffset+8);
+    }
+  // In Firefox, the true version is after "Firefox"
+  } else if ((verOffset=nAgt.indexOf("Firefox")) != -1) {
+    browserName = "Firefox";
+    fullVersion = nAgt.substring(verOffset+8);
+  // In most other browsers, "name/version" is at the end of userAgent
+  } else if ( (nameOffset=nAgt.lastIndexOf(' ')+1) < (verOffset=nAgt.lastIndexOf('/')) ) {
+    browserName = nAgt.substring(nameOffset, verOffset);
+    fullVersion = nAgt.substring(verOffset+1);
+    if (browserName.toLowerCase()==browserName.toUpperCase()) {
+      browserName = navigator.appName;
+    }
   }
-  logReport(level, message, evt.sourceFile, evt.lineNumber);
-});
+
+  // trim the fullVersion string at semicolon/space if present
+  if ((ix=fullVersion.indexOf(";")) != -1) {
+    fullVersion=fullVersion.substring(0, ix);
+  }
+  if ((ix=fullVersion.indexOf(" ")) != -1) {
+    fullVersion=fullVersion.substring(0, ix);
+  }
+
+  var majorVersion = parseInt(''+fullVersion, 10);
+  if (isNaN(majorVersion)) {
+    fullVersion = ''+parseFloat(navigator.appVersion);
+    majorVersion = parseInt(navigator.appVersion, 10);
+  }
+
+  // OSName variable is set as follows:
+  // "Windows"    for all versions of Windows
+  // "MacOS"      for all versions of Macintosh OS
+  // "Linux"      for all versions of Linux
+  // "UNIX"       for all other UNIX flavors
+  // "Unknown OS" indicates failure to detect the OS
+  var OSName="Unknown OS";
+  if (navigator.appVersion.indexOf("Win") != -1) OSName="Windows";
+  if (navigator.appVersion.indexOf("Mac") != -1) OSName="MacOS";
+  if (navigator.appVersion.indexOf("X11") != -1) OSName="UNIX";
+  if (navigator.appVersion.indexOf("Linux") != -1) OSName="Linux";
+
+  browser.name = browserName;
+  browser.version = fullVersion;
+  browser.platform = OSName;
+
+  return browser;
+}
diff --git a/web/js/mootools.ext.js b/web/js/mootools.ext.js
deleted file mode 100644
index 76c55fb38..000000000
--- a/web/js/mootools.ext.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * MooTools Extension script to support custom extensions to mootools
- */
-var zmMooToolsVersion = '1.3.2';
-
-/*
- * Firstly, lets check that mootools has been included and thus is present
- */
-if ( typeof(MooTools) == "undefined" ) {
-  alert( "MooTools not found! Please check that it was installed correctly in ZoneMinder web root." );
-} else {
-  /* Version check */
-  if ( MooTools.version < zmMooToolsVersion ) {
-    alert( "MooTools version "+MooTools.version+" found.\nVersion "+zmMooToolsVersion+" required, please check that it was installed correctly in ZoneMinder web root." );
-  }
-}
diff --git a/web/js/overlay.js b/web/js/overlay.js
deleted file mode 100644
index 84547c53f..000000000
--- a/web/js/overlay.js
+++ /dev/null
@@ -1,118 +0,0 @@
-var Overlay = new Class({
-  Implements: [Options, Events],
-  initialize: function( id, options ) {
-    this.setOptions( options );
-
-    this.mask = new Mask( document.body, {'maskMargins': false, 'class': 'overlayMask'} );
-
-    this.id = id?id:'overlay';
-    if ( typeOf(this.id) == 'string' ) {
-      if ( $(this.id) ) {
-        this.element = $(this.id);
-      }
-    } else {
-      this.element = this.id;
-      this.id = this.element.get('id');
-    }
-    if ( !this.element ) {
-      this.element = new Element( 'div', {'id': this.id, 'class': 'overlay', 'styles': {'display': 'none'}} );
-      if ( this.options.title || this.options.buttons ) {
-        var overlayHeader = new Element( 'div', {'class': 'overlayHeader'} );
-        if ( this.options.title ) {
-          var overlayTitle = new Element( 'div', {'class': 'overlayTitle', 'text': this.options.title} );
-          overlayHeader.grab( overlayTitle );
-        }
-        if ( this.options.buttons ) {
-          var overlayToolbar = new Element( 'div', {'class': 'overlayToolbar'} );
-          this.options.buttons.each(
-              function( button ) {
-                var overlayButton = new Element( 'button', {'text': button.text} );
-                if ( button.id ) {
-                  overlayButton.setProperty( 'id', button.id );
-                }
-                if ( button.events ) {
-                  overlayButton.set( 'events', events );
-                }
-                overlayToolbar.grab( overlayButton );
-              }
-          );
-          overlayHeader.grab( overlayTitle );
-        }
-        this.element.grab( overlayHeader );
-        var overlayBody = new Element( 'div', {'class': 'overlayBody'} );
-        var overlayContent = new Element( 'div', {'class': 'overlayContent'} );
-        overlayContent.grab( this.options.content );
-        overlayBody.grab( overlayContent );
-        this.element.grab( overlayBody );
-      }
-      this.target = document.id(this.options.target) || document.id(document.body);
-      this.element.inject( this.target );
-    }
-  },
-  show: function() {
-    this.mask.show();
-    window.addEventListener( 'resize', this.update.bind(this), {passive: true} );
-    window.addEventListener( 'scroll', this.update.bind(this), {passive: true} );
-    this.element.tween( 'opacity', [0, 1.0] );
-    this.element.show();
-    this.element.position();
-    this.mask.position();
-  },
-  hideComplete: function() {
-    this.element.hide();
-    this.mask.hide();
-  },
-  hide: function() {
-    new Fx.Tween( this.element, {duration: 400, transition: Fx.Transitions.Sine, onComplete: this.hideComplete.bind(this)} ).start( 'opacity', 1.0, 0 );
-  },
-  update: function() {
-    this.element.position();
-    this.mask.position();
-  },
-  showAnimation: function() {
-    showOverlay();
-
-    //console.log( "Showing overlay loading" );
-    if ( !this.loading ) {
-      this.loading = new Element( 'div', {'id': 'loading'+this.key, 'styles': {'display': 'none'}} );
-      this.loading.grab( this.loadingImage );
-      document.body.grab( this.loading );
-    }
-    updateOverlayLoading();
-    this.loading.setStyle( 'display', 'block' );
-    window.addEventListener( 'resize', this.update.bind(this), {passive: true} );
-    window.addEventListener( 'scroll', this.update.bind(this), {passive: true} );
-  },
-  hideAnimation: function() {
-    if ( this.loading ) {
-      this.loading.setStyle( 'display', 'none' );
-    }
-  }
-});
-
-function setupOverlays() {
-  try {
-    $$('.overlay').each(
-        function( overlay ) {
-          overlay.element = new Overlay( overlay.get('id') );
-          overlay.getElements('.overlayCloser').each(
-              function( closer ) {
-                closer.addEvent( 'click', function() {
-                  overlay.element.hide();
-                } );
-              }
-          );
-          overlay.overlayShow = function() {
-            overlay.element.show();
-          };
-          overlay.overlayHide = function() {
-            overlay.element.hide();
-          };
-        }
-    );
-  } catch ( e ) {
-    alert( e );
-  }
-}
-
-window.addEventListener( 'DOMContentLoaded', setupOverlays );
diff --git a/web/lang/ba_ba.php b/web/lang/ba_ba.php
index 96a3ca4d1..7793018f7 100644
--- a/web/lang/ba_ba.php
+++ b/web/lang/ba_ba.php
@@ -161,7 +161,7 @@ $SLANG = array(
     'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'             => 'Height must be set to a valid value',
     'BadHost'               => 'Host must be set to a valid ip address or hostname, do not include http://',
-    'BadImageBufferCount'   => 'Image buffer size must be an integer of 10 or more',
+    'BadImageBufferCount'   => 'Image buffer size must be an integer of 2 or more',
     'BadLabelX'             => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'             => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'             => 'Maximum FPS must be a positive integer or floating point value',
@@ -989,7 +989,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php
index 922140698..7fee69910 100644
--- a/web/lang/big5_big5.php
+++ b/web/lang/big5_big5.php
@@ -155,7 +155,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
-    'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
+    'BadImageBufferCount'  => 'Image buffer size must be an integer of 2 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
@@ -951,7 +951,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php
index c6340ae76..4a3a1b65c 100644
--- a/web/lang/cs_cz.php
+++ b/web/lang/cs_cz.php
@@ -151,7 +151,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
-    'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
+    'BadImageBufferCount'  => 'Image buffer size must be an integer of 2 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
@@ -947,7 +947,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/de_de.php b/web/lang/de_de.php
index e8bb8218a..4836ae550 100644
--- a/web/lang/de_de.php
+++ b/web/lang/de_de.php
@@ -153,7 +153,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Der Auslasszähler für Frames muss ganzzahlig 0 oder größer sein',
     'BadHeight'            => 'Die Höhe muss auf einen gültigen Wert eingestellt sein',
     'BadHost'              => 'Der Host muss auf eine gültige IP-Adresse oder einen Hostnamen (ohne http://) eingestellt sein',
-    'BadImageBufferCount'  => 'Die Größe des Bildpuffers muss ganzzahlig 10 oder größer sein',
+    'BadImageBufferCount'  => 'Die Größe des Bildpuffers muss ganzzahlig 2 oder größer sein',
     'BadLabelX'            => 'Die x-Koordinate der Bezeichnung muss ganzzahlig 0 oder größer sein',
     'BadLabelY'            => 'Die y-Koordinate der Bezeichnung muss ganzzahlig 0 oder größer sein',
     'BadMaxFPS'            => 'Maximum-FPS muss eine positive Ganzzahl oder eine Gleitkommazahl sein',
@@ -949,7 +949,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php
index 045b5345e..b53a08dac 100644
--- a/web/lang/dk_dk.php
+++ b/web/lang/dk_dk.php
@@ -152,7 +152,7 @@ $SLANG = array(
     'BadFrameSkip'          => 'Antal Frame skip skal være et heltal på 0 eller mere',
     'BadHeight'             => 'Højde skal sættes til en gyldig værdi',
     'BadHost'               => 'Host skal vare en gyldig IP adresse eller hostname, inkludér ikke http://',
-    'BadImageBufferCount'   => 'Billed buffer størrelse skal være et heltal på 10 eller mere',
+    'BadImageBufferCount'   => 'Billed buffer størrelse skal være et heltal på 2 eller mere',
     'BadLabelX'             => 'Mærkat X co-ordinaten skal sættes til et heltal på 0 eller mere',
     'BadLabelY'             => 'Mærkat Y co-ordinaten skal sættes til et heltal på 0 eller mere',
     'BadMaxFPS'             => 'Maximum FPS skal være et positivt heltal eller flydende tal',
@@ -973,7 +973,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 671bcbaff..8427d5bc6 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -162,20 +162,23 @@ $SLANG = array(
     'BadAnalysisUpdateDelay'=> 'Analysis update delay must be set to an integer of zero or more',
     'BadChannel'            => 'Channel must be set to an integer of zero or more',
     'BadDevice'             => 'Device must be set to a valid value',
+    'BadEncoderParameters'  => 'Encoder does not work well without at least a value for crf. Please see the help.',
     'BadFormat'             => 'Format must be set to a valid value',
     'BadFPSReportInterval'  => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFrameSkip'          => 'Frame skip count must be an integer of zero or more',
     'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
     'BadHeight'             => 'Height must be set to a valid value',
     'BadHost'               => 'Host must be set to a valid ip address or hostname, do not include http://',
-    'BadImageBufferCount'   => 'Image buffer size must be an integer of 10 or more',
+    'BadImageBufferCount'   => 'Image buffer size must be an integer of 2 or more',
     'BadLabelX'             => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'             => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'             => 'Maximum FPS must be a positive integer or floating point value',
     'BadNameChars'          => 'Names may only contain alphanumeric characters plus spaces, hyphen and underscore',
     'BadPalette'            => 'Palette must be set to a valid value',
     'BadColours'            => 'Target colour must be set to a valid value',
+    'BadPassthrough'        => 'Passthrough only works with ffmpeg type monitors.',
     'BadPath'               => 'Path must be set to a valid value',
+    'BadPathNotEncoded'     => 'Path must be set to a valid value. We have detected invalid characters !*\'()$ ,#[] that may need to be url percent encoded.',
     'BadPort'               => 'Port must be set to a valid number',
     'BadPostEventCount'     => 'Post event image count must be an integer of zero or more',
     'BadPreEventCount'      => 'Pre event image count must be at least zero, and less than image buffer size',
@@ -261,7 +264,10 @@ $SLANG = array(
     'ConfigType'            => 'Config Type',
     'ConfiguredFor'         => 'Configured for',
     'ConfigURL'             => 'Config Base URL',
+    'ConfirmDeleteControl'  => 'Warning, deleting a control will reset all monitors that use it to be uncontrollable.<br><br>Are you sure you wish to delete?',
+    'ConfirmDeleteDevices'  => 'Are you sure you wish to delete the selected devices?',
     'ConfirmDeleteEvents'   => 'Are you sure you wish to delete the selected events?',
+    'ConfirmDeleteTitle'    => 'Delete Confirmation',
     'ConfirmPassword'       => 'Confirm Password',
     'ConjAnd'               => 'and',
     'ConjOr'                => 'or',
@@ -318,8 +324,10 @@ $SLANG = array(
     'DoNativeMotionDetection'=> 'Do Native Motion Detection',
     'Download'              => 'Download',
     'DuplicateMonitorName'  => 'Duplicate Monitor Name',
+    'DuplicateRTSPStreamName' =>  'Duplicate RTSP Stream Name',
     'Duration'              => 'Duration',
     'Edit'                  => 'Edit',
+    'EditControl'           => 'Edit Control',
     'EditLayout'            => 'Edit Layout',
     'Email'                 => 'Email',
     'EnableAlarms'          => 'Enable Alarms',
@@ -363,9 +371,11 @@ $SLANG = array(
     'Ffmpeg'                => 'Ffmpeg',
     'File'                  => 'File',
     'FilterArchiveEvents'   => 'Archive all matches',
+    'FilterUnarchiveEvents' => 'Unarchive all matches',
     'FilterUpdateDiskSpace' => 'Update used disk space',
     'FilterDeleteEvents'    => 'Delete all matches',
     'FilterCopyEvents'      => 'Copy all matches',
+    'FilterLockRows'        => 'Lock Rows',
     'FilterMoveEvents'      => 'Move all matches',
     'FilterEmailEvents'     => 'Email details of all matches',
     'FilterEmailTo'    			=> 'Email To',
@@ -409,6 +419,7 @@ $SLANG = array(
     'General'               => 'General',
     'GenerateVideo'         => 'Generate Video',
     'GeneratingVideo'       => 'Generating Video',
+    'GetCurrentLocation'    => 'Get Current Location',
     'GoToZoneMinder'        => 'Go to ZoneMinder.com',
     'Grey'                  => 'Grey',
     'Group'                 => 'Group',
@@ -434,6 +445,7 @@ $SLANG = array(
     'Idle'                  => 'Idle',
     'Ignore'                => 'Ignore',
     'ImageBufferSize'       => 'Image Buffer Size (frames)',
+    'MaxImageBufferCount'   => 'Maximum Image Buffer Size (frames)',
     'Image'                 => 'Image',
     'Images'                => 'Images',
     'Include'               => 'Include',
@@ -519,6 +531,7 @@ $SLANG = array(
     'MinPanStep'            => 'Min Pan Step',
     'MinPixelThresLtMax'    => 'Minimum pixel threshold should be less than maximum',
     'MinPixelThresUnset'    => 'You must specify a minimum pixel threshold',
+    'MinSectionlength'      => 'Minimum section length',
     'MinTiltRange'          => 'Min Tilt Range',
     'MinTiltSpeed'          => 'Min Tilt Speed',
     'MinTiltStep'           => 'Min Tilt Step',
@@ -530,6 +543,7 @@ $SLANG = array(
     'MinZoomStep'           => 'Min Zoom Step',
     'Misc'                  => 'Misc',
     'Mode'                  => 'Mode',
+    'ModectDuringPTZ'       => 'Do motion detection during PTZ motion',
     'MonitorIds'            => 'Monitor&nbsp;Ids',
     'Monitor'               => 'Monitor',
     'MonitorPresetIntro'    => 'Select an appropriate preset from the list below.<br/><br/>Please note that this may overwrite any values you already have configured for the current monitor.<br/><br/>',
@@ -990,9 +1004,8 @@ $OLANG = array(
     'Help' => '
       Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~
       Examples (do not enter quotes)~~~~
-      "allowed_media_types=video" Set datatype to request fromcam (audio, video, data)~~~~
-      "reorder_queue_size=nnn" Set number of packets to buffer for handling of reordered packets~~~~
-      "loglevel=debug" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)
+      "allowed_media_types=video" Set datatype to request from cam (audio, video, data)~~~~
+      "reorder_queue_size=nnn" Set number of packets to buffer for handling of reordered packets
     '
 	),
   'OPTIONS_ENCODER_PARAMETERS' => array(
@@ -1067,10 +1080,87 @@ $OLANG = array(
       certainly not what you want! To unlink monitors you can ctrl-click.
       '
 	),
+  'FUNCTION_NONE' => array(
+    'Help' => '
+      In None mode no processes are started.  No capturing will occur.
+      '
+  ),
+  'FUNCTION_MONITOR' => array(
+    'Help' => '
+      In Monitor mode the capture process (zmc) will connect to the camera and stream data.
+      It will be decoded if necessary and live viewing will be possible.
+      No motion detection will be performed.  This monitor type cannot save video.
+      '
+  ),
+  'FUNCTION_MODECT' => array(
+    'Help' => '
+      In Modect mode the capture process (zmc) will connect to the camera and stream data.
+      It will be decoded if necessary and live viewing will be possible.
+      In addition the video will be analysed for motion.  
+      When motion is detected, events will be created and video will be stored.
+      Motion data will be stored in the database for each event.
+      Events may also be triggered externally (zmtrigger) or by linked monitors.
+      '
+  ),
+  'FUNCTION_RECORD' => array(
+    'Help' => '
+      In Record mode the capture process (zmc) will connect to the camera and stream data.
+      It will be decoded if necessary and live viewing will be possible.
+      Motion detection will not be performed.
+      Events will be created at fixed intervals and video will be stored.
+      '
+  ),
+  'FUNCTION_MOCORD' => array(
+    'Help' => '
+      In Mocord mode the capture process (zmc) will connect to the camera and stream data.
+      It will be decoded if necessary and live viewing will be possible.
+      In addition the video will be analysed for motion.  
+      Events will be created at fixed intervals or at start and stop of motion.
+      Video will always be stored to disk and events will have the motion data stored in the database.
+      Events may also be triggered externally (zmtrigger) or by linked monitors.
+      '
+  ),
+  'FUNCTION_NODECT' => array(
+    'Help' => '
+      In Nodect mode the capture process (zmc) will connect to the camera and stream data.
+      It will be decoded if necessary and live viewing will be possible.
+      In addition any linked cameras will be checked for their alarm status. 
+      When linked cameras or an external trigger (zmtrigger) are alarmed, events will be created
+      and video will be stored.  No other motion detection will occur.
+      '
+  ),
+  'FUNCTION_ANALYSIS_ENABLED' => array(
+    'Help' => '
+      When in Modect, Mocord, Nodect or RECORD mode the analysis process can be turned on/off.
+      This setting sets the default state when the process starts up.
+      It can then be turned on/off through external triggers zmtrigger zmu or the web ui.
+      When not enabled no motion detection or linked monitor checking will be performed and 
+      no events will be created.
+      '
+  ),
+  'FUNCTION_DECODING_ENABLED' => array(
+    'Help' => '
+      When in Record or Nodect mode and using H264Passthrough with no jpegs being saved, we can
+      optionally choose to not decode the H264/H265 packets.  This will drastically reduce cpu use
+      but will make live view unavailable for this monitor.'
+  ),
+  'ImageBufferCount' => array(
+    'Help' => '
+    Number of raw images available in /dev/shm. Currently should be set in the 3-5 range.  Used for live viewing.'
+  ),
+  'MaxImageBufferCount' => array(
+    'Help' => '
+    Maximum number of video packets that will be held in the packet queue.
+    The packetqueue will normally manage itself, keeping Pre Event Count frames or all since last keyframe if using 
+    passthrough mode. You can set a maximum to prevent the monitor from consuming too much ram, but your events might
+    not have all the frames they should if your keyframe interval is larger than this value.
+    You will get errors in your logs about this. So make sure your keyframe interval is low or you have enough ram.
+  '
+  ),
 
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php
index a8da807be..f473cbbb6 100644
--- a/web/lang/es_ar.php
+++ b/web/lang/es_ar.php
@@ -102,7 +102,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
-    'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
+    'BadImageBufferCount'  => 'Image buffer size must be an integer of 2 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
diff --git a/web/lang/es_es.php b/web/lang/es_es.php
index f97ea0ff1..7f492052d 100644
--- a/web/lang/es_es.php
+++ b/web/lang/es_es.php
@@ -151,7 +151,7 @@ $SLANG = array(
     'BadFrameSkip'          => 'El número de omisión de marcos debe ser un entero de cero o más',
     'BadHeight'             => 'La altura debe tener un valor válido',
     'BadHost'               => 'El host debe tener una dirección ip o nombre de host válidos, no incluir http://',
-    'BadImageBufferCount'   => 'El tamaño de búfer de imagen debe serun entero de 10 o más',
+    'BadImageBufferCount'   => 'El tamaño de búfer de imagen debe serun entero de 2 o más',
     'BadLabelX'             => 'La coordenada de la etiqueta X debe ser un entero de cero o más',
     'BadLabelY'             => 'La coordenada de la etiqueta Y debe ser un entero de cero o más',
     'BadMaxFPS'             => 'MPS máximos debe tener un valor entero positivo o de punto flotante',
diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php
index 99a277144..cbfa9a4d0 100644
--- a/web/lang/et_ee.php
+++ b/web/lang/et_ee.php
@@ -158,7 +158,7 @@ $SLANG = array(
     'BadFrameSkip'          => 'Kaadri vahelejätmise hulk peab olema integer, null või rohkem',
     'BadHeight'             => 'Kõrguseks peab olema valitud õige väärtus',
     'BadHost'               => 'Host ipeab olema õige. Ip aadress või hostinimi, ei tohi sisaldada http://',
-    'BadImageBufferCount'   => 'Pildi puhvri suurus peab olema integer, 10 või rohkem',
+    'BadImageBufferCount'   => 'Pildi puhvri suurus peab olema integer, 2 või rohkem',
     'BadLabelX'             => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'             => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'             => 'Maximum FPS must be a positive integer or floating point value',
@@ -953,7 +953,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php
index f379b04cd..b244145b5 100644
--- a/web/lang/fr_fr.php
+++ b/web/lang/fr_fr.php
@@ -157,7 +157,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Le nombre d\'images à sauter doit être un entier supérieur ou égal à 0',
     'BadHeight'            => 'La valeur de la hauteur est invalide',
     'BadHost'              => 'Le nom d\'hôte doit être une adresse ip ou un nom dns valide sans le préfixe http://',
-    'BadImageBufferCount'  => 'La taille du tampon d \'images doit être un entier supérieur ou égal à 10',
+    'BadImageBufferCount'  => 'La taille du tampon d \'images doit être un entier supérieur ou égal à 2',
     'BadLabelX'            => 'La coordonnée X pour l\'horodatage doit être un entier supérieur ou égal à 0',
     'BadLabelY'            => 'La coordonnée Y pour l\'horodatage doit être un entier supérieur ou égal à 0',
     'BadMaxFPS'            => 'Le nombre maximum d\'i/s doit être un entier ou un nombre à virgule flottante supérieur à 0',
diff --git a/web/lang/he_il.php b/web/lang/he_il.php
index ff4440053..c532379db 100644
--- a/web/lang/he_il.php
+++ b/web/lang/he_il.php
@@ -151,7 +151,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
-    'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
+    'BadImageBufferCount'  => 'Image buffer size must be an integer of 2 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
@@ -946,7 +946,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php
index 7ef51dab3..96e927a55 100644
--- a/web/lang/hu_hu.php
+++ b/web/lang/hu_hu.php
@@ -194,7 +194,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Az eldobott képkockák száma legyen legalább 0',
     'BadHeight'            => 'A képmagasság legyen érvényes érték képpontban megadva',
     'BadHost'              => 'A hoszt legyen valós IP cím vagy hosztnév http:// nélkül',
-    'BadImageBufferCount'  => 'A képkockák száma a pufferben legyen legalább 10',
+    'BadImageBufferCount'  => 'A képkockák száma a pufferben legyen legalább 2',
     'BadLabelX'            => 'A cimke X koordinátája legyen legalább 0',
     'BadLabelY'            => 'A cimke Y koordinátája legyen legalább 0',
     'BadMaxFPS'            => 'Maximális FPS nyugalmi állapotban legyen megadva',
@@ -990,7 +990,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index 05aa524b0..62e881d45 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -156,7 +156,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Il numero di Frame da scartare deve essere un intero uguale a 0 o superiore',
     'BadHeight'            => 'L\'altezza deve essere impostata con un valore valido',
     'BadHost'              => 'L\'host deve essere impostato con un indirizzo ip valido o con un hostname, non includendo http://',
-    'BadImageBufferCount'  => 'La dimensione del buffer dell\'immagine deve essere impostata con un numero intero pari a 10 o maggiore',
+    'BadImageBufferCount'  => 'La dimensione del buffer dell\'immagine deve essere impostata con un numero intero pari a 2 o maggiore',
     'BadLabelX'            => 'L\'etichetta della coordinata X deve essere un numero intero pari a 0 o maggiore',
     'BadLabelY'            => 'L\'etichetta della coordinata Y deve essere un numero intero pari a 0 o maggiore',
     'BadMaxFPS'            => 'I frame per secondo (FPS) massimi devono essere un numero intero positivo o un valore in virgola mobile',
@@ -953,7 +953,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php
index 55b13ae0a..101b9c3e6 100644
--- a/web/lang/ja_jp.php
+++ b/web/lang/ja_jp.php
@@ -152,7 +152,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
-    'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
+    'BadImageBufferCount'  => 'Image buffer size must be an integer of 2 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
@@ -948,7 +948,7 @@ $OLANG = array(
 
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php
index be741a6ac..e63acb58e 100644
--- a/web/lang/nl_nl.php
+++ b/web/lang/nl_nl.php
@@ -152,7 +152,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Frame skip aantal moet een getal van nul of groter zijn',
     'BadHeight'            => 'Hoogte moet een geldige waarde zijn',
     'BadHost'              => 'Host moet een juist adres of hostname zijn, laat http:// weg',
-    'BadImageBufferCount'  => 'Buffergrootte moet een getal van 10 of groter zijn',
+    'BadImageBufferCount'  => 'Buffergrootte moet een getal van 2 of groter zijn',
     'BadLabelX'            => 'Label X-coördinaat moet een getal van nul of groter zijn',
     'BadLabelY'            => 'Label Y-coördinaat moet een getal van nul of groter zijn',
     'BadMaxFPS'            => 'Maximum FPS moet een positieve waarde zijn',
@@ -948,7 +948,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php
index a1e8bd27a..9acd8b7e4 100644
--- a/web/lang/pl_pl.php
+++ b/web/lang/pl_pl.php
@@ -167,7 +167,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Liczba pomijanych ramek musi być liczbą całkowitą równą zero lub więcej',
     'BadHeight'            => 'Wysokość musi być ustawiona na prawidłową wartość',
     'BadHost'              => 'Host musi być ustawiony na prawidłowy adres IP lub nazwę hosta, nie dołączaj http://',
-    'BadImageBufferCount'  => 'Rozmiar bufora obrazu musi być liczbą całkowitą 10 lub większą',
+    'BadImageBufferCount'  => 'Rozmiar bufora obrazu musi być liczbą całkowitą 2 lub większą',
     'BadLabelX'            => 'Współrzędna X etykiety musi być ustawiona na liczbę całkowitą równą zero lub więceje',
     'BadLabelY'            => 'Współrzędna Y etykiety musi być ustawiona na liczbę całkowitą równą zero lub więcej',
     'BadMaxFPS'            => 'Maksymalna liczba klatek na sekundę musi być dodatnią liczbą całkowitą lub zmiennoprzecinkową',
@@ -942,7 +942,7 @@ $OLANG = array(
 
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php
index 80ded9e3d..324c4d306 100644
--- a/web/lang/pt_br.php
+++ b/web/lang/pt_br.php
@@ -91,7 +91,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
-    'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
+    'BadImageBufferCount'  => 'Image buffer size must be an integer of 2 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
@@ -887,7 +887,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php
index eca21478d..d9f9efefe 100644
--- a/web/lang/ro_ro.php
+++ b/web/lang/ro_ro.php
@@ -122,7 +122,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',
     'BadHost'              => 'Host must be set to a valid ip address or hostname, do not include http://',
-    'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
+    'BadImageBufferCount'  => 'Image buffer size must be an integer of 2 or more',
     'BadLabelX'            => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index 6664e4d97..62e46c620 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -153,7 +153,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Количество пропускаемых кадров должно быть целочисленным и большим либо равным нулю',
     'BadHeight'            => 'Неправильная высота',
     'BadHost'              => 'Неправильный IP или имя хоста; указывается без http://',
-    'BadImageBufferCount'  => 'Image buffer size must be an integer of 10 or more',
+    'BadImageBufferCount'  => 'Image buffer size must be an integer of 2 or more',
     'BadLabelX'            => 'X координата ярлыка должна быть целочисленной и большей либо равной нулю',
     'BadLabelY'            => 'Y координата ярлыка должна быть целочисленной и большей либо равной нулю',
     'BadMaxFPS'            => 'Ограничение скорости записи должно быть положительным',
@@ -957,7 +957,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/lang/se_se.php b/web/lang/se_se.php
index 53dd25178..bd6072574 100644
--- a/web/lang/se_se.php
+++ b/web/lang/se_se.php
@@ -152,7 +152,7 @@ $SLANG = array(
     'BadFrameSkip'         => 'Värdet för ramöverhopp måste vara ett heltal på 0 eller högre',
     'BadHeight'            => 'Höjden måste sättas till ett giltigt värde',
     'BadHost'              => 'Detta fält ska innehålla en giltig ip-adress eller värdnamn, inkludera inte http://',
-    'BadImageBufferCount'  => 'Bufferstorleken för avbilden måste vara ett heltal på minst 10 eller högre',
+    'BadImageBufferCount'  => 'Bufferstorleken för avbilden måste vara ett heltal på minst 2 eller högre',
     'BadLabelX'            => 'Etiketten för X koordinaten måste sättas till ett heltal, 0 eller högre',
     'BadLabelY'            => 'Etiketten för Y koordinaten måste sättas till ett heltal, 0 eller högre',
     'BadMaxFPS'            => 'Max. ramar/s måste vara ett positivt heltal eller ett flyttal',
diff --git a/web/lang/cn_zh.php b/web/lang/zh_cn.php
similarity index 99%
rename from web/lang/cn_zh.php
rename to web/lang/zh_cn.php
index 9cdd9c4f1..45a54f8ab 100644
--- a/web/lang/cn_zh.php
+++ b/web/lang/zh_cn.php
@@ -65,9 +65,9 @@
 //
 // Examples
 // setlocale( 'LC_ALL', 'en_GB' ); All locale settings pre-4.3.0
- setlocale( LC_ALL, 'cn_ZH' ); //All locale settings 4.3.0 and after
- setlocale( LC_CTYPE, 'cn_ZH' ); //Character class settings 4.3.0 and after
- setlocale( LC_TIME, 'cn_ZH' ); //Date and time formatting 4.3.0 and after
+ setlocale( LC_ALL, 'zh_CN' ); //All locale settings 4.3.0 and after
+ setlocale( LC_CTYPE, 'zh_CN' ); //Character class settings 4.3.0 and after
+ setlocale( LC_TIME, 'zh_CN' ); //Date and time formatting 4.3.0 and after
 
 // Simple String Replacements
 $SLANG = array(
@@ -155,7 +155,7 @@ $SLANG = array(
     'BadFrameSkip'          => '跳帧数必须设为大于零的整数',
     'BadHeight'             => '高度必须设为有效值',
     'BadHost'               => '主机必须设为有效IP地址或主机名，不要包含 http://',
-    'BadImageBufferCount'   => '图像缓冲器大小必须设为大于10的整数',
+    'BadImageBufferCount'   => '图像缓冲器大小必须设为大于2的整数',
     'BadLabelX'             => '标签 X 坐标必须设为大于零的整数',
     'BadLabelY'             => '标签 Y 坐标必须设为大于零的整数',
     'BadMaxFPS'             => '最大帧数FPS必须设为正整数或着浮点数',
@@ -989,7 +989,7 @@ $OLANG = array(
 	
 //    'LANG_DEFAULT' => array(
 //        'Prompt' => "This is a new prompt for this option",
-//        'Help' => "This is some new help for this option which will be displayed in the popup window when the ? is clicked"
+//        'Help' => "This is some new help for this option which will be displayed in the window when the ? is clicked"
 //    ),
 );
 
diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css
index baff90992..0920ac2c3 100644
--- a/web/skins/classic/css/base/skin.css
+++ b/web/skins/classic/css/base/skin.css
@@ -123,7 +123,7 @@ table th:last-child{
 
 
 a:link {
-    color: #3498db;
+    color: #0fbcf9;
     text-decoration: none;
 }
 
@@ -153,12 +153,8 @@ input,textarea,select,button,.btn-primary {
     background-color: #f8f8f8;
     text-align: left;
     border-radius:4px;
+    margin: 1px 0;
 }
-/*
-input[type=text], input[type=password], input[type="url"], textarea, select {
-    padding: 1px;
-}
-*/
 
 input.noborder {
     border: 0;
@@ -168,6 +164,9 @@ input[disabled] {
     color: #888888;
 }
 
+.modal img {
+    max-width: 100%;
+}
 img {
   display: inline-block;
 }
@@ -326,24 +325,10 @@ ul.tabList li.active a {
     color: #dc143c;
 }
 
-fieldset {
-    border: 1px solid black;
-    padding: 4px;
-    margin-bottom: 8px;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-}
-
-fieldset > legend {
-    padding: 0 2px;
-}
-
 /*
  * Behavior classes
  */
 
-
 .ok, .infoText {
     color: #0fb9b1;
 }
@@ -522,6 +507,7 @@ th.table-th-sort-rev span.table-th-sort-span {
     margin: 0 auto 8px auto;
     line-height: 130%;
     text-align: center;
+    clear: both;
 }
 
 #content p {
@@ -578,7 +564,7 @@ input[type=submit],
     border-color: #3498db;
     text-transform: uppercase;
     font-weight: 200;
-    padding: 5px 10px;
+    padding: 7px 10px 5px 10px;
     cursor: pointer;
     text-decoration: none;
     display: inline-block;
@@ -612,18 +598,6 @@ input[type=submit]:disabled,
 
 }
 
-#options {
-  font-size:90%;
-}
-
-#options .help-block {
-  margin-top: 0;
-}
-
-#options .form-group {
-  margin-bottom: 20px;
-  border-bottom: 1px solid #e7e7e7;
-}
 
 .navbar{
 	margin-bottom: 0 !important;
@@ -741,23 +715,11 @@ li.search-choice {
 }
 
 .zoom {
-  padding: 50px;
-  transition: transform .2s; /* Animation */
-  margin: 0 auto;
-}
-
-.zoom:hover {
   transform-origin: 70% 50%;
   transform: scale(5); /* (arbitray zoom value - Note if the zoom is too large, it will go outside of the viewport) */
 }
 
-.zoom-right {
-  padding: 0px;
-  transition: transform .2s; /* Animation */
-  margin: 0 auto;
-}
-
-.zoom-right:hover {
+.zoom-console {
   transform-origin: 0% 50%;
   transform: scale(5); /* (arbitray zoom value - Note if the zoom is too large, it will go outside of the viewport) */
 }
@@ -766,3 +728,11 @@ a.flip {
   float: right;
   margin-right: -20px;
 }
+
+#content table.major .colDiskSpace {
+  text-align: right;
+}
+
+#objdetectModal .modal-content {
+    width: fit-content;
+}
diff --git a/web/skins/classic/css/base/views/console.css b/web/skins/classic/css/base/views/console.css
index 1b0e77b4f..a0f8960b9 100644
--- a/web/skins/classic/css/base/views/console.css
+++ b/web/skins/classic/css/base/views/console.css
@@ -74,7 +74,7 @@
 }
 
 .consoleTable .colMark {
-    width: 52px;
+    width: 32px;
     text-align: left;
 }
 
@@ -99,3 +99,18 @@
 .StatusFilter select {
   min-width: 130px;
 }
+#FunctionFunction {
+  margin-bottom: 2rem;
+}
+
+.MonitorNameFilter,
+.FunctionFilter,
+.StatusFilter,
+.SourceFilter,
+.MonitorFilter {
+  display: inline-block;
+}
+.MonitorNameFilter input,
+.SourceFilter input {
+  padding: 3px 5px 4px 5px;
+}
diff --git a/web/skins/classic/css/base/views/control.css b/web/skins/classic/css/base/views/control.css
index 473802a90..915694109 100644
--- a/web/skins/classic/css/base/views/control.css
+++ b/web/skins/classic/css/base/views/control.css
@@ -17,6 +17,7 @@
 }
 .ptzControls .pantiltPanel button {
   border: none;
+  margin: 0;
 }
 
 .ptzControls .controlsPanel {
diff --git a/web/skins/classic/css/base/views/cycle.css b/web/skins/classic/css/base/views/cycle.css
new file mode 100644
index 000000000..9d89bc4b3
--- /dev/null
+++ b/web/skins/classic/css/base/views/cycle.css
@@ -0,0 +1,3 @@
+#imageFeed {
+  margin: 0 auto;
+}
diff --git a/web/skins/classic/css/base/views/events.css b/web/skins/classic/css/base/views/events.css
index a446743b8..2a29ee056 100644
--- a/web/skins/classic/css/base/views/events.css
+++ b/web/skins/classic/css/base/views/events.css
@@ -37,3 +37,8 @@
 #header #pagination {
     align-items: center;
 }
+
+/* Dirty hack to fix up/down buttons on pagination number input */
+input[type="number"].form-control {
+  padding: 5px;
+}
diff --git a/web/skins/classic/css/base/views/filter.css b/web/skins/classic/css/base/views/filter.css
index 88854988e..bc85b91b7 100644
--- a/web/skins/classic/css/base/views/filter.css
+++ b/web/skins/classic/css/base/views/filter.css
@@ -48,12 +48,16 @@ select {
 #actionsTable input[type=text] {
     margin-left: 4px;
 }
-
-#actionsTable p {
+#actionsTable, #optionsTable {
+  float: left;
+  width: 50%;
+  min-width: 300px;
+}
+#actionsTable p, #optionsTable p {
   text-align: left;
 }
-#actionsTable label {
-  width: 300px;
+#actionsTable label, #optionsTable label {
+  width: 320px;
   text-align: right;
 }
 input[name="filter[EmailSubject]"],
diff --git a/web/skins/classic/css/base/views/log.css b/web/skins/classic/css/base/views/log.css
index de6e5eecd..73933a027 100644
--- a/web/skins/classic/css/base/views/log.css
+++ b/web/skins/classic/css/base/views/log.css
@@ -1,19 +1,3 @@
-#logSummary {
-   font-size:10px;
-}
-
-#logSummary tr {
-    margin: 0;
-    padding: 0;
-}
-
-#logSummary td {
-    border: 1px solid #7f7fb2;
-    padding: 0 6px;
-    font-size: 10px;
-    line-height: 15px;
-}
-
 tr.log-fat td {
     background-color:#ffcccc;
     font-weight: bold;
@@ -32,20 +16,15 @@ tr.log-dbg td {
     font-style: italic;
 }
 
-#exportLog label {
-    vertical-align: middle;
+th[data-field="DateTime"],
+th[data-field="Component"],
+th[data-field="Code"],
+th[data-field="Message"],
+th[data-field="File"],
+th[data-field="Server"],
+th[data-field="Line"] {
+  text-align: left;
 }
-
-#exportLog input[type=radio] {
-    margin-right: 4px;
-    vertical-align: middle;
-}
-
-#exportError {
-    display: none;
-    color: #dc143c;
-    margin-bottom: 8px;
-}
-
-#exportErrorText {
+th[data-field="DateTime"] {
+  min-width: 135px;
 }
diff --git a/web/skins/classic/css/base/views/monitor.css b/web/skins/classic/css/base/views/monitor.css
index 2cdc0c400..7fca80aac 100644
--- a/web/skins/classic/css/base/views/monitor.css
+++ b/web/skins/classic/css/base/views/monitor.css
@@ -11,22 +11,28 @@
 
 textarea,
 input[name="newMonitor[Name]"],
+input[name="newMonitor[Path]"],
+input[name="newMonitor[SecondPath]"],
 input[name="newMonitor[LabelFormat]"],
 input[name="newMonitor[ControlDevice]"],
 input[name="newMonitor[ControlAddress]"] {
   width: 100%;
 }
+input[name="newMonitor[LabelFormat]"]{
+	min-width: 240px;
+}
 input[name="newMonitor[AnalysisFPSLimit]"],
 input[name="newMonitor[MaxFPS]"],
 input[name="newMonitor[AlarmMaxFPS]"],
 input[name="newMonitor[V4LCapturesPerFrame]"]{
-    width: 60px;
+    width: 75px;
 }
 input[name="newMonitor[Port]"],
 input[name="newMonitor[Refresh]"],
 input[name="newMonitor[LabelX]"],
 input[name="newMonitor[LabelY]"],
 input[name="newMonitor[ImageBufferCount]"],
+input[name="newMonitor[MaxImageBufferCount]"],
 input[name="newMonitor[WarmupCount]"],
 input[name="newMonitor[PreEventCount]"],
 input[name="newMonitor[PostEventCount]"],
@@ -42,3 +48,9 @@ input[name="newMonitor[Height]"] {
 select.chosen {
   width: 100%;
 }
+tr td:first-child {
+  min-width: 300px;
+}
+.OutputContainer {
+  display: none;
+}
diff --git a/web/skins/classic/css/base/views/options.css b/web/skins/classic/css/base/views/options.css
index e13409b35..1e0bb01d8 100644
--- a/web/skins/classic/css/base/views/options.css
+++ b/web/skins/classic/css/base/views/options.css
@@ -26,10 +26,43 @@ input.large {
 }
 
 input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SITEKEY]"],
-input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SECRETKEY]"] {
-  width: 100%;
+input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SECRETKEY]"],
+input[name="newConfig[ZM_OPT_GEOLOCATION_TILE_PROVIDER]"],
+input[name="newConfig[ZM_OPT_GEOLOCATION_ACCESS_TOKEN]"],
+input[name="newConfig[ZM_AUTH_HASH_SECRET]"],
+input[name="newConfig[ZM_UPDATE_CHECK_PROXY]"],
+input[name="newConfig[ZM_WEB_TITLE]"],
+input[name="newConfig[ZM_WEB_TITLE_PREFIX]"],
+input[name="newConfig[ZM_HOME_URL]"],
+input[name="newConfig[ZM_HOME_CONTENT]"],
+input[name="newConfig[ZM_WEB_CONSOLE_BANNER]"],
+input[name="newConfig[ZM_LOG_DEBUG_TARGET]"],
+input[name="newConfig[ZM_LOG_DEBUG_FILE]"],
+input[name="newConfig[ZM_MESSAGE_ADDRESS]"],
+input[name="newConfig[ZM_MESSAGE_SUBJECT]"],
+input[name="newConfig[ZM_FROM_EMAIL]"],
+input[name="newConfig[ZM_URL]"],
+input[name="newConfig[ZM_SSMTP_PATH]"],
+input[name="newConfig[ZM_CSP_REPORT_URI]"],
+input[name="newStorage[Name]"],
+input[name="newStorage[Path]"],
+input[name="newStorage[Url]"] {
+  width: 90%;
 }
 
 #options label {
   font-weight: bold;
 }
+#options {
+  font-size:90%;
+}
+
+#options .help-block {
+  margin-top: 0;
+}
+
+#options .form-group {
+  margin-bottom: 20px;
+  margin-right: 5px;
+  border-bottom: 1px solid #e7e7e7;
+}
diff --git a/web/skins/classic/css/base/views/settings.css b/web/skins/classic/css/base/views/settings.css
new file mode 100644
index 000000000..622976b2a
--- /dev/null
+++ b/web/skins/classic/css/base/views/settings.css
@@ -0,0 +1,3 @@
+input[type="number"] {
+    width: 50px;
+}
diff --git a/web/skins/classic/css/base/views/snapshot.css b/web/skins/classic/css/base/views/snapshot.css
new file mode 100644
index 000000000..b54036859
--- /dev/null
+++ b/web/skins/classic/css/base/views/snapshot.css
@@ -0,0 +1,17 @@
+#content {
+    margin: 0 15px;
+}
+
+.Name {
+  width: 600px;
+}
+.Name input {
+  width: 100%;
+}
+
+.Description {
+  width: 600px;
+}
+.Description textarea {
+  width: 100%;
+}
diff --git a/web/skins/classic/css/base/views/snapshots.css b/web/skins/classic/css/base/views/snapshots.css
new file mode 100644
index 000000000..c264a5e9c
--- /dev/null
+++ b/web/skins/classic/css/base/views/snapshots.css
@@ -0,0 +1,6 @@
+th[data-field="Id"],
+th[data-field="Description"],
+th[data-field="CreatedOn"],
+th[data-field="Name"] {
+  text-align: left;
+}
diff --git a/web/skins/classic/css/base/views/timeline.css b/web/skins/classic/css/base/views/timeline.css
index c2efed713..815492bb6 100644
--- a/web/skins/classic/css/base/views/timeline.css
+++ b/web/skins/classic/css/base/views/timeline.css
@@ -227,7 +227,7 @@ div.majLabelY {
     font-weight: normal;
 }
 
-div.zoom {
+div.tlzoom {
     position: absolute;
     z-index: 2;
     bottom: 0px;
diff --git a/web/skins/classic/css/base/views/user.css b/web/skins/classic/css/base/views/user.css
new file mode 100644
index 000000000..a46d41a29
--- /dev/null
+++ b/web/skins/classic/css/base/views/user.css
@@ -0,0 +1,4 @@
+.BasicInformation, .Permissions {
+  width: 50%;
+  float: left;
+}
diff --git a/web/skins/classic/css/base/views/zone.css b/web/skins/classic/css/base/views/zone.css
index 626600eb2..f615d84d7 100644
--- a/web/skins/classic/css/base/views/zone.css
+++ b/web/skins/classic/css/base/views/zone.css
@@ -27,10 +27,17 @@
 }
 
 #definitionPanel {
-    float: left;
     margin: 2px;
     text-align: center;
 }
+#definitionPanel:after {
+  content: ".";
+  display: block;
+  height: 0;
+    font-size: 0;
+  clear: both;
+  visibility: hidden;
+}
 
 #definitionPanel input[type=submit],
 #definitionPanel input[type=submit] {
diff --git a/web/skins/classic/css/dark/skin.css b/web/skins/classic/css/dark/skin.css
index b1a1506b3..bf41e6f8c 100644
--- a/web/skins/classic/css/dark/skin.css
+++ b/web/skins/classic/css/dark/skin.css
@@ -22,139 +22,47 @@
  */
 
 body {
-    font-family: "Open Sans", Verdana, Arial, Helvetica, sans-serif;
-    font-size: 13px;
     color: #dddddd;
     background-color: #222222;
-    font-weight: normal;
-    text-align: center;
 }
 
 h1 {
-    font-family: inherit;
-    font-size: 120%;
     color: #10a4e8;
-    font-weight: bold;
-    text-align: center;
 }
 
 h2 {
-    font-family: inherit;
-    font-size: 110%;
     color: #10a4e8;
-    font-weight: bold;
 }
 
 h3 {
-    font-family: inherit;
-    font-size: 100%;
     color: #117AAd;
-    font-weight: bold;
 }
 
 h4 {
-    font-family: inherit;
-    font-size: 100%;
     color: #117AAd;
 }
 
 p {
-    font-family: inherit;
-    font-size: 100%;
     color: #dddddd;
-    font-weight: normal;
 }
 
 th {
-    font-weight: bold;
     color: #117AAd;
 }
 
-a:link {
-    color: #8f8fc2;
-    text-decoration: none;
-}
-
-a:visited {
-    color: #8f8fc2;
-    text-decoration: none;
-}
-
-a:hover {
-    color: #7777aa;
-    text-decoration: underline;
-}
-
-label {
-    margin-right: 4px;
-}
-
-input,textarea,select,button,.btn-primary {
-    border: 1px #8f8fc2 solid !important;
-    padding: 10px;
-    border-radius: 2px;
-    font-family: inherit;
-    font-weight: 400;
-    font-size: 100%;
-    color: #eeeeee !important;
-    background-color: #444444 !important;
-}
-
-input[type=text], input[type=password], input[type="url"], textarea, select {
-    padding: 1px;
-}
-
-input.noborder {
-    border: 0;
-}
-
-
-img {
-  display: inline-block;
-}
-
 img.normal {
     border: #cccccc solid 1px;
 }
 
-img.alarm {
-    border: red solid 1px;
-}
-
 hr {
-    height: 1px;
-    width: 100%;
-    border: 0;
     color: #8f8fc2;
     background-color: #8f8fc2;
 }
 
-/*
- * Tabbed headings
- */
-ul.tabList {
-    float: left;
-    list-style: none;
-    padding: 0;
-    margin: 0 0 -4px 0;
-    white-space: nowrap;
-    text-align: left;
-}
-
 ul.tabList li {
-    float: left;
-    border: 1px solid;
     color: #8f8fc2;
     border: #8f8fc2 solid 1px;
-    border-bottom-width: 0;
-    margin: 0 2px 0 0;
     background: #444444;
-    text-align: center;
-    padding: 5px 10px;
-}
-
-ul.tabList li a {
-    text-decoration: none;
 }
 
 ul.tabList li:hover {
@@ -166,87 +74,17 @@ ul.tabList li.active {
     border-bottom: #8f8fc2 dotted 1px;
 }
 
-ul.tabList li.active a {
-    font-weight: bold;
-}
-
 /*
  * Major league table for multiple inputs or presentation
  */
 
-#content table.major {
-    margin: 4px auto;
-    width: 100%;
-    border-collapse: collapse;
-}
-
 #content table.major tr.highlight {
     color: #eeeeee;
     background-color: #000000;
 }
 
-#content table.major thead tr th {
-    padding-top: 6px;
-    padding-bottom: 6px;
-    vertical-align: middle;
-}
-
-#content table.major tfoot td {
-    padding-top: 6px;
-    padding-bottom: 6px;
-    vertical-align: middle;
-}
-
 #content table.major th, #content table.major td {
     border-bottom: 2px solid #8f8fc2;
-    padding: 5px 10px;
-    text-align: left;
-}
-
-#content table.major th {
-    vertical-align: bottom;
-}
-
-#content table.major td {
-    vertical-align: middle;
-}
-
-#content table.major th[scope=row] {
-    padding: 4px 3px 3px;
-    vertical-align: top;
-}
-
-#content table.major .colMark, #content table.major .colSelect {
-    text-align: center;
-}
-/*
- * Lesser table for very simple forms
- */
-
-#content table.minor {
-    width: 280px;
-    margin: 0 auto;
-}
-
-#content table.minor td {
-    padding: 4px;
-}
-
-#content table.minor .colLeft {
-    width: 50%;
-    text-align: right;
-}
-
-#content table.minor .colRight {
-    width: 50%;
-    text-align: left;
-}
-
-#content table.minor input[type=submit]
-{
-    margin-top: 8px;
-    padding: 0 2px;
-    font-size: 120%;
 }
 
 #content table > tbody > tr:hover
@@ -255,7 +93,6 @@ ul.tabList li.active a {
 }
 
 .overlay {
-    font-size: 11px;
     background-color: #222222;
 }
 
@@ -275,15 +112,6 @@ ul.tabList li.active a {
 
 fieldset {
     border: 1px solid #dddddd;
-    padding: 4px;
-    margin-bottom: 8px;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-}
-
-fieldset > legend {
-    padding: 0 2px;
 }
 
 /*
@@ -311,178 +139,18 @@ fieldset > legend {
     text-decoration: none;
 }
 
-/*
- * Generic useful classes, especially with mootools
- */
-
-.hidden {
-    display: none;
-}
-
-.invisible {
-    visibility: hidden;
-}
-
-.nowrap {
-    white-space: nowrap;
-}
-
-div.clear {
-    clear: both;
-}
-
-/*
-.table-th-sort {
-    font-style:italic;
-}
-
-td.table-td-sort {
-    font-style:italic;
-}
-*/
-
-th.table-th-sort {
-    margin-right: 12px;
-}
-
-th.table-th-sort span.table-th-sort-span {
-    float: right;
-    width: 12px;
-    height: 12px;
-    background: url("/skins/classic/graphics/arrow-s-u.png") no-repeat 0 0;
-}
-
-th.table-th-sort-rev span.table-th-sort-span {
-    float: right;
-    width: 12px;
-    height: 12px;
-    background: url("/skins/classic/graphics/arrow-s-d.png") no-repeat 0 0;
-}
-
 .table-tr-odd {
     background-color: #070707;
 }
 
-/*
- * Primary layout styles
- */
-
-#page {
-    width: 100%;
-}
-
 #header {
-    width: 100%;
-    line-height: 1;
-    text-align: left;
-    padding: 5px 20px;
-    margin: 0 auto 4px auto;
-    font-weight: 300;
     border-bottom: 1px solid #000000;
 }
 
-#header h2 {
-    left: 0;
+input {
+  background-color: rgb(68,68,68);
+  color: #999;
 }
-
-#header h2.floating {
-    float: left;
-}
-
-#headerControl {
-    text-align: center;
-    margin: 0 auto;
-}
-
-#headerButtons {
-    float: right;
-}
-
-#headerButtons a {
-    margin-left: 8px;
-}
-
-#headerButtons input {
-    margin-left: 4px;
-}
-
-#content {
-    width: 96%;
-    margin: 0 auto 8px auto;
-    line-height: 130%;
-    text-align: center;
-}
-
-#content p {
-    margin-top: 4px;
-}
-
-#content p.textblock {
-    text-align: justify;
-    padding: 4px;
-}
-
-#content p.textblock br {
-    margin-bottom: 8px;
-}
-
-/*
-#contentDiv {
-    margin: 0 auto 8px;
-    line-height: 140%;
-    text-align: center;
-}
-*/
-
-#content > input[type=submit], #content > input[type=button], #content > button {
-    margin-top: 8px;
-}
-
-#content table input[type=submit], #content table input[type=button], #content table button {
-    margin-top: 1px;
-}
-
-#contentButtons {
-    margin-top: 8px;
-    float: right;
-}
-
-#contentButtons button,
-#contentButtons input {
-    margin-left: 8px;
-    margin-bottom: 4px;
-}
-
-#footer {
-    width: 96%;
-    margin: 8px auto;
-}
-
-button,
-input[type=button],
-input[type=submit],
-.btn-primary,
-.btn-primary:link {
-  background-color: #444444;
-  color: #eeeeee;
-  border-color: #444444;
-  text-transform: uppercase;
-  font-weight: 200;
-  padding: 5px 10px;
-  cursor: pointer;
-  text-decoration: none;
-  display: inline-block;
-}
-
-button:hover,
-input[type=button]:hover,
-input[type=submit]:hover,
-.btn-primary:hover {
-  background-color: #555555;
-  border-color: #444444;
-}
-
-
 /* PP - make it easy to identify disabled buttons */
 
 button:disabled,
@@ -495,37 +163,15 @@ input[type=submit]:disabled,
   border-color: #666666;
 }
 
-.navbar{
+.navbar {
   margin-bottom: 0 !important;
   border-radius: 0;
   color: #03A9F4 !important;
 }
 
-.navbar-brand {
-  font-weight: bold;
-  font-size: 20px;
-}
-
-.container-fluid {
-  position: relative;
-}
-
 .sidebar {
-  position: absolute;
-  top: 0;
-  left: 0;
-  z-index: 1000;
-  display: block;
-  padding: 0;
-  overflow-x: hidden;
-  overflow-y: auto;
   border-right: 1px solid #eeeeee;
-}
-
-.sidebar ul {
-  margin-right: 0;
-  margin-bottom: 20px;
-  margin-left: 0;
+  background-color: #222222;
 }
 
 .table {
@@ -543,7 +189,7 @@ input[type=submit]:disabled,
 }
 
 .nav-pills>li.active>a, .nav-pills>li.active>a:focus, .nav-pills>li.active>a:hover {
-  color: #8f8fc2;
+  color: #ffa801;
   background-color: #333333;
 }
 
@@ -565,9 +211,11 @@ li.search-choice {
     background: linear-gradient(#555 20%,#464646 50%,#444 52%,#545454 100%) !important;
     background-color: #444444 !important;
     color: #eee !important;
-    border-color: #8f8fc2 !important;
     -webkit-box-shadow: none !important;
     background-image: none !important;
 }
 /* end chosen override */
 
+modal-content {
+  background-color: #222222;
+}
diff --git a/web/skins/classic/includes/config.php b/web/skins/classic/includes/config.php
index 091b72c85..663fa7fb6 100644
--- a/web/skins/classic/includes/config.php
+++ b/web/skins/classic/includes/config.php
@@ -19,15 +19,23 @@
 //
 
 $rates = array(
-    '10000' => '100x',
-    '5000' => '50x',
-    '2500' => '25x',
-    '1000' => '10x',
-    '400' => '4x',
-    '200' => '2x',
-    '100' => translate('Real'),
-    '50' => '1/2x',
-    '25' => '1/4x',
+  -5000 => '-50x',
+  -2500 => '-25x',
+  -1000 => '-10x',
+  -500  => '-5x',
+  -200  => '-2x',
+  -100  => '-1x',
+  -50   => '-1/2x',
+  -25   => '-1/4x',
+  0     => translate('Stop'),
+  25    => '1/4x',
+  50    => '1/2x',
+  100   => '1x',
+  200   => '2x',
+  500   => '5x',
+  1000  => '10x',
+  2500  => '25x',
+  5000  => '50x'
 );
 
 $scales = array(
diff --git a/web/skins/classic/includes/control_functions.php b/web/skins/classic/includes/control_functions.php
index 61138612f..a05ff5d40 100644
--- a/web/skins/classic/includes/control_functions.php
+++ b/web/skins/classic/includes/control_functions.php
@@ -21,13 +21,14 @@
 
 function controlFocus($monitor, $cmds) {
   $control = $monitor->Control();
+  $cmd = $control->CanFocusCon() ? 'data-on-mousedown="controlCmd" data-on-mouseup="controlCmd"' : 'data-on-click="controlCmd"';
   ob_start();
 ?>
 <div class="arrowControl focusControls">
   <div class="arrowLabel"><?php echo translate('Near') ?></div>
-  <button type="button" class="longArrowBtn upBtn" value="<?php echo $cmds['FocusNear'] ?>" data-on-click="controlCmd" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="longArrowBtn upBtn" value="<?php echo $cmds['FocusNear'] ?>" <?php echo $cmd ?> data-xtell="0" data-ytell="-1"></button>
   <button type="button" class="arrowCenter"<?php if ( $control->CanFocusCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['FocusStop'] ?>"<?php } ?>><?php echo translate('Focus') ?></button>
-  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['FocusFar'] ?>" data-xtell="0" data-ytell="1"></button>
+  <button type="button" class="longArrowBtn downBtn" value="<?php echo $cmds['FocusFar'] ?>" <?php echo $cmd ?> data-xtell="0" data-ytell="1"></button>
   <div class="arrowLabel"><?php echo translate('Far') ?></div>
 <?php
   if ( $control->CanAutoFocus() ) {
@@ -44,13 +45,14 @@ function controlFocus($monitor, $cmds) {
 
 function controlZoom($monitor, $cmds) {
   $control = $monitor->Control();
+  $cmd = $control->CanZoomCon() ? 'data-on-mousedown="controlCmd" data-on-mouseup="controlCmd"' : 'data-on-click="controlCmd"';
   ob_start();
 ?>
 <div class="arrowControl zoomControls">
   <div class="arrowLabel"><?php echo translate('Tele') ?></div>
-  <button type="button" class="longArrowBtn upBtn" data-on-click="controlCmd" value="<?php echo $cmds['ZoomTele'] ?>" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="longArrowBtn upBtn" <?php echo $cmd ?> value="<?php echo $cmds['ZoomTele'] ?>" data-xtell="0" data-ytell="-1"></button>
   <button type="button" class="arrowCenter"<?php if ( $control->CanZoomCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['ZoomStop'] ?>"<?php } ?>><?php echo translate('Zoom') ?></button>
-  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['ZoomWide'] ?>" data-xtell="0" data-ytell="1"></button>
+  <button type="button" class="longArrowBtn downBtn" <?php echo $cmd ?> value="<?php echo $cmds['ZoomWide'] ?>" data-xtell="0" data-ytell="1"></button>
   <div class="arrowLabel"><?php echo translate('Wide') ?></div>
 <?php
   if ( $control->CanAutoZoom() ) {
@@ -66,13 +68,14 @@ function controlZoom($monitor, $cmds) {
 
 function controlIris($monitor, $cmds) {
   $control = $monitor->Control();
+  $cmd = $control->CanIrisCon() ? 'data-on-mousedown="controlCmd" data-on-mouseup="controlCmd"' : 'data-on-click="controlCmd"';
   ob_start();
 ?>
 <div class="arrowControl irisControls">
   <div class="arrowLabel"><?php echo translate('Open') ?></div>
-  <button type="button" class="longArrowBtn upBtn" data-on-click="controlCmd" value="<?php echo $cmds['IrisOpen'] ?>" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="longArrowBtn upBtn" value="<?php echo $cmds['IrisOpen'] ?>" <?php echo $cmd ?> data-xtell="0" data-ytell="-1"></button>
   <button type="button" class="arrowCenter"<?php if ( $control->CanIrisCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['IrisStop'] ?>"<?php } ?>><?php echo translate('Iris') ?></button>
-  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['IrisClose'] ?>" data-xtell="0" data-ytell="1"></button>
+  <button type="button" class="longArrowBtn downBtn" value="<?php echo $cmds['IrisClose'] ?>" <?php echo $cmd ?> data-xtell="0" data-ytell="1"></button>
   <div class="arrowLabel"><?php echo translate('Close') ?></div>
 <?php
   if ( $control->CanAutoIris() ) {
@@ -89,13 +92,14 @@ function controlIris($monitor, $cmds) {
 
 function controlWhite($monitor, $cmds) {
   $control = $monitor->Control();
+  $cmd = $control->CanWhiteCon() ? 'data-on-mousedown="controlCmd" data-on-mouseup="controlCmd"' : 'data-on-click="controlCmd"';
   ob_start();
 ?>
 <div class="arrowControl whiteControls">
   <div class="arrowLabel"><?php echo translate('In') ?></div>
-  <button type="button" class="longArrowBtn upBtn" data-on-click="controlCmd" value="<?php echo $cmds['WhiteIn'] ?>" data-xtell="0" data-ytell="-1"></button>
+  <button type="button" class="longArrowBtn upBtn" value="<?php echo $cmds['WhiteIn'] ?>" <?php echo $cmd ?> data-xtell="0" data-ytell="-1"></button>
   <button type="button" class="arrowCenter"<?php if ( $control->CanWhiteCon() ) { ?> data-on-click="controlCmd" value="<?php echo $cmds['WhiteStop'] ?>"<?php } ?>><?php echo translate('White') ?></button>
-  <button type="button" class="longArrowBtn downBtn" data-on-click="controlCmd" value="<?php echo $cmds['WhiteOut'] ?>" data-xtell="0" data-ytell="1)"></button>
+  <button type="button" class="longArrowBtn downBtn" value="<?php echo $cmds['WhiteOut'] ?>" <?php echo $cmd ?> data-xtell="0" data-ytell="1)"></button>
   <div class="arrowLabel"><?php echo translate('Out') ?></div>
 <?php
   if ( $control->CanAutoWhite() ) {
@@ -121,20 +125,21 @@ function controlPanTilt($monitor, $cmds) {
   $hasPan = $control->CanPan();
   $hasTilt = $control->CanTilt();
   $hasDiag = $hasPan && $hasTilt && $control->CanMoveDiag();
+  $cmd = $control->CanMoveCon() ? 'data-on-mousedown="controlCmd" data-on-mouseup="controlCmd" ' : 'data-on-click="controlCmd" ';
 ?>
-    <button type="button" class="arrowBtn upLeftBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveUpLeft'] ?>" data-xtell="-1" data-ytell="-1"></button>
-    <button type="button" class="arrowBtn upBtn<?php echo $hasTilt?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveUp'] ?>" data-xtell="0" data-ytell="-1"></button>
-    <button type="button" class="arrowBtn upRightBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveUpRight'] ?>" data-xtell="1" data-ytell="-1"></button>
-    <button type="button" class="arrowBtn leftBtn<?php echo $hasPan?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveLeft'] ?>" data-xtell="-1" data-ytell="0"></button>
+    <button type="button" class="arrowBtn upLeftBtn<?php echo $hasDiag?'':' invisible' ?>" <?php echo $cmd ?> value="<?php echo $cmds['MoveUpLeft'] ?>" data-xtell="-1" data-ytell="-1"></button>
+    <button type="button" class="arrowBtn upBtn<?php echo $hasTilt?'':' invisible' ?>" <?php echo $cmd ?> value="<?php echo $cmds['MoveUp'] ?>" data-xtell="0" data-ytell="-1"></button>
+    <button type="button" class="arrowBtn upRightBtn<?php echo $hasDiag?'':' invisible' ?>" <?php echo $cmd ?> value="<?php echo $cmds['MoveUpRight'] ?>" data-xtell="1" data-ytell="-1"></button>
+    <button type="button" class="arrowBtn leftBtn<?php echo $hasPan?'':' invisible' ?>" <?php echo $cmd ?> value="<?php echo $cmds['MoveLeft'] ?>" data-xtell="-1" data-ytell="0"></button>
 <?php if ( isset($cmds['Center']) ) { ?>
-    <button type="button" class="arrowBtn centerBtn" data-on-click="controlCmd" value="<?php echo $cmds['Center'] ?>"></button>
+    <button type="button" class="arrowBtn centerBtn" <?php echo $cmd ?> value="<?php echo $cmds['Center'] ?>"></button>
 <?php } else { ?>
     <button type="button" class="arrowBtn NocenterBtn"></button>
 <?php } ?>
-    <button type="button" class="arrowBtn rightBtn<?php echo $hasPan?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveRight'] ?>" data-xtell="1" data-ytell="0"></button>
-    <button type="button" class="arrowBtn downLeftBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveDownLeft'] ?>" data-xtell="-1" data-ytell="1"></button>
-    <button type="button" class="arrowBtn downBtn<?php echo $hasTilt?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveDown'] ?>" data-xtell="0" data-ytell="1"></button>
-    <button type="button" class="arrowBtn downRightBtn<?php echo $hasDiag?'':' invisible' ?>" data-on-click="controlCmd" value="<?php echo $cmds['MoveDownRight'] ?>" data-xtell="1" data-ytell="1"></button>
+    <button type="button" class="arrowBtn rightBtn<?php echo $hasPan?'':' invisible' ?>" <?php echo $cmd ?> value="<?php echo $cmds['MoveRight'] ?>" data-xtell="1" data-ytell="0"></button>
+    <button type="button" class="arrowBtn downLeftBtn<?php echo $hasDiag?'':' invisible' ?>" <?php echo $cmd ?> value="<?php echo $cmds['MoveDownLeft'] ?>" data-xtell="-1" data-ytell="1"></button>
+    <button type="button" class="arrowBtn downBtn<?php echo $hasTilt?'':' invisible' ?>" <?php echo $cmd ?> value="<?php echo $cmds['MoveDown'] ?>" data-xtell="0" data-ytell="1"></button>
+    <button type="button" class="arrowBtn downRightBtn<?php echo $hasDiag?'':' invisible' ?>" <?php echo $cmd ?> value="<?php echo $cmds['MoveDownRight'] ?>" data-xtell="1" data-ytell="1"></button>
   </div>
 </div>
 <?php
@@ -176,7 +181,7 @@ function controlPresets($monitor, $cmds) {
   }
   if ( canEdit('Monitors') && $control->CanSetPresets() ) {
 ?>
-    <button type="button" class="ptzTextBtn popup-link" value="Set" data-url="?view=controlpreset&amp;mid=<?php echo $monitor->Id() ?>" data-window-name="zmPreset" data-window-tag="preset"><?php echo translate('Set') ?></button>
+    <button type="button" class="ptzTextBtn" value="Set" data-toggle="modal" data-target="#ctrlPresetModal"><?php echo translate('Set') ?></button>
 <?php
   }
 ?>
diff --git a/web/skins/classic/includes/export_functions.php b/web/skins/classic/includes/export_functions.php
index 052277434..ee48708d5 100644
--- a/web/skins/classic/includes/export_functions.php
+++ b/web/skins/classic/includes/export_functions.php
@@ -83,7 +83,7 @@ function exportEventDetail($event, $exportFrames, $exportImages) {
         <tr><th scope="row"><?php echo translate('Monitor') ?></th><td><?php echo validHtmlStr($event->Monitor()->Name()) ?> (<?php echo $event->MonitorId() ?>)</td></tr>
         <tr><th scope="row"><?php echo translate('Cause') ?></th><td><?php echo validHtmlStr($event->Cause()) ?></td></tr>
         <tr><th scope="row"><?php echo translate('Notes') ?></th><td><?php echo validHtmlStr($event->Notes()) ?></td></tr>
-        <tr><th scope="row"><?php echo translate('Time') ?></th><td><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime())) ?></td></tr>
+        <tr><th scope="row"><?php echo translate('Time') ?></th><td><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartDateTime())) ?></td></tr>
         <tr><th scope="row"><?php echo translate('Duration') ?></th><td><?php echo $event->Length() ?></td></tr>
         <tr><th scope="row"><?php echo translate('Frames') ?></th><td><?php echo $event->Frames() ?></td></tr>
         <tr><th scope="row"><?php echo translate('AttrAlarmFrames') ?></th><td><?php echo $event->AlarmFrames() ?></td></tr>
@@ -897,7 +897,7 @@ function exportEvents(
     ZM\Error("Can't create exports dir at '$export_dir'");
     return false;
   }
-  ZM\Logger::Debug("Successfully created dir '$export_dir'");
+  ZM\Debug("Successfully created dir '$export_dir'");
   chmod($export_dir, 0700);
   if ( !chdir($export_dir) ) {
     ZM\Error("Can't chdir to $export_dir");
@@ -925,7 +925,7 @@ function exportEvents(
         #continue;
       $cmd = 'cp -as '.$event->Path().'/'.$file.' '.$export_dir.'/'.$event->Id().'/'.$file. ' 2>&1';
       exec($cmd, $output, $return);
-      ZM\Logger::Debug($cmd.' return code: '.$return.' output: '.print_r($output,true));
+      ZM\Debug($cmd.' return code: '.$return.' output: '.print_r($output,true));
     } # end foreach event_exportFile
   } # end foreach event
 
@@ -999,5 +999,5 @@ function exportEvents(
     unlink($monitorPath.'/'.$html_eventMaster);
   }
 
-  return '?view=archive%26type='.$exportFormat.'%26connkey='.$connkey;
+  return '?view=archive&type='.$exportFormat.'&connkey='.$connkey;
 } // end function exportEvents
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index d61c6aaee..1064729cc 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -39,12 +39,37 @@ function xhtmlHeaders($file, $title) {
   $baseViewCssPhpFile = getSkinFile('/css/base/views/'.$basename.'.css.php');
   $viewCssPhpFile = getSkinFile('/css/'.$css.'/views/'.$basename.'.css.php');
 
-  function output_link_if_exists($files) {
+  function output_link_if_exists($files, $cache_bust=true) {
     global $skin;
     $html = array();
     foreach ( $files as $file ) {
       if ( getSkinFile($file) ) {
+        if ( $cache_bust ) {
         $html[] = '<link rel="stylesheet" href="'.cache_bust('skins/'.$skin.'/'.$file).'" type="text/css"/>';
+        } else  {
+        $html[] = '<link rel="stylesheet" href="skins/'.$skin.'/'.$file.'" type="text/css"/>';
+        }
+      }
+    }
+    $html[] = ''; // So we ge a trailing \n
+    return implode(PHP_EOL, $html);
+  }
+  function output_script_if_exists($files, $cache_bust=true) {
+    global $skin;
+    $html = array();
+    foreach ( $files as $file ) {
+      if ( file_exists('skins/'.$skin.'/'.$file) ) {
+        if ( $cache_bust ) {
+          $html[] = '<script src="'.cache_bust('skins/'.$skin.'/'.$file).'"></script>';
+        } else {
+          $html[] = '<script src="skins/'.$skin.'/'.$file.'"></script>';
+        }
+      } else if ( file_exists($file) ) {
+        if ( $cache_bust ) {
+          $html[] = '<script src="'.cache_bust($file).'"></script>';
+        } else {
+          $html[] = '<script src="'.$file.'"></script>';
+        }
       }
     }
     $html[] = ''; // So we ge a trailing \n
@@ -56,6 +81,9 @@ function xhtmlHeaders($file, $title) {
     foreach ( $files as $file ) {
         $html[] = '<link rel="stylesheet" href="'.cache_bust($file).'" type="text/css"/>';
     }
+    if ( ! count($html) ) {
+      ZM\Warning("No files found for $files");
+    }
     $html[] = ''; // So we ge a trailing \n
     return implode(PHP_EOL, $html);
   }
@@ -81,7 +109,6 @@ if ( file_exists("skins/$skin/css/$css/graphics/favicon.ico") ) {
 }
 echo output_cache_busted_stylesheet_links(array(
   'css/reset.css',
-  'css/overlay.css',
   'css/font-awesome.min.css',
   'css/bootstrap.min.css',
   'css/bootstrap-table.min.css',
@@ -109,6 +136,8 @@ if ( $css != 'base' )
     echo output_link_if_exists(array('/css/base/views/control.css'));
     if ( $css != 'base' )
       echo output_link_if_exists(array('/css/'.$css.'/views/control.css'));
+  } else if ( $basename == 'monitor' ) {
+      echo output_link_if_exists(array('js/leaflet/leaflet.css'), false);
   }
 ?>
   <style>
@@ -204,12 +233,13 @@ function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin)
           echo getCycleHTML($view);
           echo getMontageHTML($view);
           echo getMontageReviewHTML($view);
+          echo getSnapshotsHTML($view);
           echo getRprtEvntAuditHTML($view);
           echo getHeaderFlipHTML();
         echo '</ul>';
 
         echo '<ul class="nav navbar-nav justify-content-end align-self-start flex-grow-1">';
-          echo getAcctCircleHTML($skin, $user);
+          echo getAccountCircleHTML($skin, $user);
           echo getStatusBtnHTML($status);
         echo '</ul>';
   }
@@ -236,7 +266,7 @@ function getNormalNavBarHTML($running, $user, $bandwidth_options, $view, $skin)
           echo getDbConHTML();
           echo getStorageHTML();
           echo getShmHTML();
-          echo getLogIconHTML();
+          #echo getLogIconHTML();
           ?>
         </ul>
 
@@ -266,50 +296,49 @@ function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $ski
 
   ?>
   <div class="fixed-top container-fluid p-0">
-  <nav class="navbar navbar-dark bg-dark px-1 flex-nowrap">
+    <nav class="navbar navbar-dark bg-dark px-1 flex-nowrap">
 
-    <div class="navbar-brand align-self-start px-0">
-      <?php echo getNavBrandHTML() ?>
-    </div>
+      <div class="navbar-brand align-self-start px-0">
+        <?php echo getNavBrandHTML() ?>
+      </div>
 
-    <nav class="navbar navbar-expand-md align-self-start px-0">
-    <ul class="nav navbar-nav list-group px-0">
-    <?php
+      <nav class="navbar navbar-expand-md align-self-start px-0">
+<?php
 
   // *** Build the statistics shown on the navigation bar ***
   if ( (!ZM_OPT_USE_AUTH) or $user ) {
-    ?>
-    <div id="reload" class="collapse navbar-collapse px-0">
+?>
+        <div id="reload" class="collapse navbar-collapse px-0">
 
-      <ul id="Version" class="pr-2">
-        <?php echo getZMVersionHTML() ?>
-      </ul>
+          <ul id="Version" class="pr-2 navbar-nav">
+            <?php echo getZMVersionHTML() ?>
+          </ul>
 
-      <ul id="Bandwidth" class="px-2">
-        <?php echo getBandwidthHTML($bandwidth_options, $user) ?>
-      </ul>
+          <ul id="Bandwidth" class="px-2 navbar-nav">
+            <?php echo getBandwidthHTML($bandwidth_options, $user) ?>
+          </ul>
 
-        <?php
-        echo getSysLoadHTML();
-        echo getDbConHTML();
-        echo getStorageHTML();
-        echo getShmHTML();
-        echo getLogIconHTML();
-        ?>
-
-    </div>
+          <ul class="nav navbar-nav list-group px-0">
+            <?php
+            echo getSysLoadHTML();
+            echo getDbConHTML();
+            echo getStorageHTML();
+            echo getShmHTML();
+            echo getLogIconHTML();
+            ?>
+          </ul>
 
+        </div>
 <?php 
   } // end if (!ZM_OPT_USE_AUTH) or $user )
 ?> 
-    </nav>
+      </nav>
 
-        <ul class="list-group list-group-horizontal ml-auto">
+      <ul class="list-group list-group-horizontal ml-auto">
         <?php
-        echo getAcctCircleHTML($skin, $user);
+        echo getAccountCircleHTML($skin, $user);
         echo getStatusBtnHTML($status);
         ?>
-        </ul>
       </ul>
 
     <!-- the Navigation Bar Hamburger Button   -->
@@ -320,30 +349,31 @@ function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $ski
       </button>
     <?php } ?>
 
-  <div style="background-color:#485460" class="dropdown-menu dropdown-menu-right px-3" id="main-header-nav">
-    <?php
-    if ( $user and $user['Username'] ) {
-        echo '<ul class="navbar-nav">';
-          echo getConsoleHTML();
-          echo getOptionsHTML();
-          echo getLogHTML();
-          echo getDevicesHTML();
-          echo getGroupsHTML($view);
-          echo getFilterHTML($view);
-          echo getCycleHTML($view);
-          echo getMontageHTML($view);
-          echo getMontageReviewHTML($view);
-          echo getRprtEvntAuditHTML($view);
-        echo '</ul>';
-    }
-    ?>
-  </div>
+      <div style="background-color:#485460" class="dropdown-menu dropdown-menu-right px-3" id="main-header-nav">
+      <?php
+      if ( $user and $user['Username'] ) {
+          echo '<ul class="navbar-nav">';
+            echo getConsoleHTML();
+            echo getOptionsHTML();
+            echo getLogHTML();
+            echo getDevicesHTML();
+            echo getGroupsHTML($view);
+            echo getFilterHTML($view);
+            echo getCycleHTML($view);
+            echo getMontageHTML($view);
+            echo getMontageReviewHTML($view);
+            echo getSnapshotsHTML($view);
+            echo getRprtEvntAuditHTML($view);
+          echo '</ul>';
+      }
+      ?>
+      </div>
 
-  </nav><!-- End First Navbar -->
+    </nav><!-- End First Navbar -->
 
-  <nav class="navbar navbar-expand-md bg-dark justify-content-center p-0">
-    <?php echo getConsoleBannerHTML() ?>
-  </nav><!-- End Second Navbar -->
+    <nav class="navbar navbar-expand-md bg-dark justify-content-center p-0">
+      <?php echo getConsoleBannerHTML() ?>
+    </nav><!-- End Second Navbar -->
   </div>
   
   <?php
@@ -352,6 +382,7 @@ function getCollapsedNavBarHTML($running, $user, $bandwidth_options, $view, $ski
 // Returns the html representing the current unix style system load
 function getSysLoadHTML() {
   $result = '';
+  if ( !canView('System') ) return $result;
 
   $result .= '<li id="getSysLoadHTML" class="Load nav-item mx-2">'.PHP_EOL;
   $result .= '<i class="material-icons md-18">trending_up</i>'.PHP_EOL;
@@ -364,7 +395,7 @@ function getSysLoadHTML() {
 // Returns the html representing the current number of connections made to the database
 function getDbConHTML() {
   $result = '';
-  
+  if ( !canView('System') ) return $result;
   $connections = dbFetchOne('SHOW status WHERE variable_name=\'threads_connected\'', 'Value');
   $max_connections = dbFetchOne('SHOW variables WHERE variable_name=\'max_connections\'', 'Value');
   $percent_used = $max_connections ? 100 * $connections / $max_connections : 100;
@@ -381,6 +412,7 @@ function getDbConHTML() {
 // Returns an html dropdown showing capacity of all storage areas
 function getStorageHTML() {
   $result = '';
+  if ( !canView('System') ) return $result;
 
   $func = function($S) {
     $class = '';
@@ -427,6 +459,7 @@ function getStorageHTML() {
 // Returns the html representing the current capacity of mapped memory filesystem (usually /dev/shm)
 function getShmHTML() {
   $result = '';
+  if ( !canView('System') ) return $result;
   
   $shm_percent = getDiskPercent(ZM_PATH_MAP);
   $shm_total_space = disk_total_space(ZM_PATH_MAP);
@@ -472,11 +505,11 @@ function getBandwidthHTML($bandwidth_options, $user) {
   $result .= '<div class="dropdown-menu" aria-labelledby="dropdown_bandwidth">'.PHP_EOL;  
   if ( count($bandwidth_options) > 1 ) {
     if ( isset($bandwidth_options['high']) )
-      $result .= '<a data-pdsa-dropdown-val="high" class="dropdown-item" href="#">' .translate('High'). '</a>'.PHP_EOL;
+      $result .= '<a data-pdsa-dropdown-val="high" class="dropdown-item bwselect" href="#">' .translate('High'). '</a>'.PHP_EOL;
     if ( isset($bandwidth_options['medium']) )
-      $result .= '<a data-pdsa-dropdown-val="medium" class="dropdown-item" href="#">' .translate('Medium'). '</a>'.PHP_EOL;
+      $result .= '<a data-pdsa-dropdown-val="medium" class="dropdown-item bwselect" href="#">' .translate('Medium'). '</a>'.PHP_EOL;
     # low is theoretically always available
-    $result .= '<a data-pdsa-dropdown-val="low" class="dropdown-item" href="#">' .translate('Low'). '</a>'.PHP_EOL;    
+    $result .= '<a data-pdsa-dropdown-val="low" class="dropdown-item bwselect" href="#">' .translate('Low'). '</a>'.PHP_EOL;    
   }
   $result .= '</div>'.PHP_EOL;
 
@@ -488,13 +521,14 @@ function getBandwidthHTML($bandwidth_options, $user) {
 // Returns the html representing the version of ZoneMinder
 function getZMVersionHTML() {
   $result = '';
+  if ( !canView('System') ) return $result;
   $content = '';
   
   if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) ) {  // Must upgrade before proceeding
     $class = 'text-danger';
     $tt_text = translate('RunLocalUpdate');
     $content = 'v'.ZM_VERSION.PHP_EOL;
-  } else if ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) ) { // No update needed
+  } else if ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) || !ZM_CHECK_FOR_UPDATES || ZM_DYN_NEXT_REMINDER > time() ) { // No update needed
     $class = ''; // Don't change the text color under normal conditions
     $tt_text = translate('UpdateNotNecessary');
     $content = 'v'.ZM_VERSION.PHP_EOL;
@@ -572,7 +606,7 @@ function getLogHTML() {
     if ( ZM\logToDatabase() > ZM\Logger::NOLOG ) { 
       $logstate = logState();
       $class = ($logstate == 'ok') ? 'text-success' : ($logstate == 'alert' ? 'text-warning' : (($logstate == 'alarm' ? 'text-danger' : '')));
-      $result .= '<li id="getLogHTML" class="nav-item dropdown mx-2">'.makePopupLink('?view=log', 'zmLog', 'log', '<span class="nav-link '.$class.'">'.translate('Log').'</span>').'</li>'.PHP_EOL;
+      $result .= '<li id="getLogHTML" class="nav-item dropdown mx-2">'.makeLink('?view=log', '<span class="nav-link '.$class.'">'.translate('Log').'</span>').'</li>'.PHP_EOL;
     }
   }
   
@@ -588,7 +622,7 @@ function getLogIconHTML() {
       $logstate = logState();
       $class = ( $logstate == 'alert' ) ? 'text-warning' : (( $logstate == 'alarm' ) ? 'text-danger' : '');
       $result .= '<li id="getLogIconHTML" class="nav-item dropdown">'.
-        makePopupLink('?view=log', 'zmLog', 'log', '<span class="mx-1 ' .$class. '"><i class="material-icons md-18">report</i>'.translate('Log').'</span>').
+        makeLink('?view=log', '<span class="mx-1 ' .$class. '"><i class="material-icons md-18">report</i>'.translate('Log').'</span>').
         '</li>'.PHP_EOL;
     }
   }
@@ -610,7 +644,8 @@ function getDevicesHTML() {
 // Returns the html representing the Groups menu item
 function getGroupsHTML($view) {
   $result = '';
-  
+  if ( !canView('Groups') ) return $result;
+
   $class = $view == 'groups' ? ' selected' : '';
   $result .= '<li id="getGroupsHTML" class="nav-item dropdown"><a class="nav-link'.$class.'" href="?view=groups">'. translate('Groups') .'</a></li>'.PHP_EOL;
   
@@ -620,6 +655,7 @@ function getGroupsHTML($view) {
 // Returns the html representing the Filter menu item
 function getFilterHTML($view) {
   $result = '';
+  if ( !canView('Events') ) return $result;
   
   $class = $view == 'filter' ? ' selected' : '';
   $result .= '<li id="getFilterHTML" class="nav-item dropdown"><a class="nav-link'.$class.'" href="?view=filter">'.translate('Filters').'</a></li>'.PHP_EOL;
@@ -644,7 +680,7 @@ function getMontageHTML($view) {
   $result = '';
   
   if ( canView('Stream') ) {
-    $class = $view == 'cycle' ? ' selected' : '';
+    $class = $view == 'montage' ? ' selected' : '';
     $result .= '<li id="getMontageHTML" class="nav-item dropdown"><a class="nav-link'.$class.'" href="?view=montage">' .translate('Montage'). '</a></li>'.PHP_EOL;
   }
   
@@ -678,6 +714,18 @@ function getMontageReviewHTML($view) {
   return $result;
 }
 
+// Returns the html representing the Montage menu item
+function getSnapshotsHTML($view) {
+  $result = '';
+  
+  if (defined('ZM_FEATURES_SNAPSHOTS') and ZM_FEATURES_SNAPSHOTS and canView('Snapshots')) {
+    $class = $view == 'snapshots' ? ' selected' : '';
+    $result .= '<li id="getSnapshotsHTML" class="nav-item dropdown"><a class="nav-link'.$class.'" href="?view=snapshots">' .translate('Snapshots'). '</a></li>'.PHP_EOL;
+  }
+  
+  return $result;
+}
+
 // Returns the html representing the Audit Events Report menu item
 function getRprtEvntAuditHTML($view) {
   $result = '';
@@ -701,16 +749,14 @@ function getHeaderFlipHTML() {
 }
 
 // Returns the html representing the logged in user name and avatar
-function getAcctCircleHTML($skin, $user=null) {
-  // Include Logout modal
-  include("skins/$skin/views/logout.php");
+function getAccountCircleHTML($skin, $user=null) {
   $result = '';
   
   if ( ZM_OPT_USE_AUTH and $user ) {
-    $result .= '<p id="getAcctCircleHTML" class="navbar-text mr-2">'.PHP_EOL;
+    $result .= '<li id="getAccountCircleHTML" class="navbar-text navbar-nav mr-2">'.PHP_EOL;
     $result .= makeLink('#', '<i class="material-icons">account_circle</i> '.  $user['Username'],
-      (ZM_AUTH_TYPE == 'builtin'), 'data-toggle="modal" data-target="#modalLogout" data-backdrop="false"' ).PHP_EOL;
-    $result .= '</p>'.PHP_EOL;
+      (ZM_AUTH_TYPE == 'builtin'), 'id="logoutButton" data-toggle="modal" data-target="#modalLogout" data-backdrop="false"' ).PHP_EOL;
+    $result .= '</li>'.PHP_EOL;
   }
   
   return $result;
@@ -722,21 +768,21 @@ function getStatusBtnHTML($status) {
   
   if ( canEdit('System') ) {
     //$result .= '<li class="nav-item dropdown">'.PHP_EOL;
-    $result .= '<form id="getStatusBtnHTML" class="form-inline">'.PHP_EOL;
-    $result .= '<button type="button" class="btn btn-default navbar-btn" data-toggle="modal" data-target="#modalState">' .$status. '</button>'.PHP_EOL;
-    $result .= '</form>'.PHP_EOL;
+    $result .= '<li id="getStatusBtnHTML">'.PHP_EOL;
+    $result .= '<button type="button" class="btn btn-default navbar-btn" id="stateModalBtn">' .$status. '</button>'.PHP_EOL;
+    $result .= '</li>'.PHP_EOL;
     //$result .= '</li>'.PHP_EOL;
 
     if ( ZM_SYSTEM_SHUTDOWN ) {
-      $result .= '<p class="navbar-text">'.PHP_EOL;
-      $result .= makePopupLink('?view=shutdown', 'zmShutdown', 'shutdown', '<i class="material-icons md-18">power_settings_new</i>' ).PHP_EOL;
-      $result .= '</p>'.PHP_EOL;
+      $result .= '<li class="navbar-text pr-2 align-self-center">'.PHP_EOL;
+      $result .= '<button class="btn btn-outline" data-on-click="getShutdownModal" data-toggle="tooltip" data-placement="top" title="' .translate("Shutdown"). '" ><i class="material-icons md-18">power_settings_new</i></button>'.PHP_EOL;
+      $result .= '</li>'.PHP_EOL;
      } 
 
   } else if ( canView('System') ) {
-    $result .= '<p id="getStatusBtnHTML" class="navbar-text">'.PHP_EOL;
+    $result .= '<li id="getStatusBtnHTML" class="navbar-text">'.PHP_EOL;
     $result .= $status.PHP_EOL;
-    $result .= '</p>'.PHP_EOL;
+    $result .= '</li>'.PHP_EOL;
   }
   
   return $result;
@@ -762,6 +808,7 @@ function getStatsTableHTML($eid, $fid, $row='') {
   $stats = dbFetchAll( $sql, NULL, array( $eid, $fid ) );
   
   $result .= '<table id="contentStatsTable' .$row. '"'.PHP_EOL;
+    $result .= 'data-locale="' .i18n(). '"'.PHP_EOL;
     $result .= 'data-toggle="table"'.PHP_EOL;
     $result .= 'data-toolbar="#toolbar"'.PHP_EOL;
     $result .= 'class="table-sm table-borderless contentStatsTable"'.PHP_EOL;
@@ -832,33 +879,28 @@ function xhtmlFooter() {
   global $view;
   global $skin;
   global $basename;
-  if ( canEdit('System') ) {
-    include("skins/$skin/views/state.php");
-  }
   $skinJsPhpFile = getSkinFile('js/skin.js.php');
-  $cssJsFile = getSkinFile('js/'.$css.'.js');
   $viewJsFile = getSkinFile('views/js/'.$basename.'.js');
   $viewJsPhpFile = getSkinFile('views/js/'.$basename.'.js.php');
 ?>
-<?php if ( $basename != 'login' and $basename != 'postlogin' ) { ?>
-  <script src="tools/mootools/mootools-core.js"></script>
-  <script src="tools/mootools/mootools-more.js"></script>
-  <script src="js/mootools.ext.js"></script>
-<?php } ?>
-  <script src="skins/<?php echo $skin; ?>/js/jquery.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/jquery-ui-1.12.1/jquery-ui.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/bootstrap.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/tableExport.min.js"></script> 
-  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-export.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-page-jump-to.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-cookie.min.js"></script> 
-  <script src="skins/<?php echo $skin; ?>/js/chosen/chosen.jquery.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/dateTimePicker/jquery-ui-timepicker-addon.js"></script>
-
-  <script src="<?php echo cache_bust('js/Server.js'); ?>"></script>
+  <script src="<?php echo cache_bust('skins/'.$skin.'/js/jquery.min.js'); ?>"></script>
+  <script src="skins/<?php echo $skin; ?>/js/jquery-ui-1.12.1/jquery-ui.min.js"></script>
+  <script src="<?php echo cache_bust('skins/'.$skin.'/js/bootstrap.min.js'); ?>"></script>
+<?php echo output_script_if_exists(array(
+  'js/tableExport.min.js',
+  'js/bootstrap-table.min.js',
+  'js/bootstrap-table-locale-all.min.js',
+  'js/bootstrap-table-export.min.js',
+  'js/bootstrap-table-page-jump-to.min.js',
+  'js/bootstrap-table-cookie.min.js',
+  'js/bootstrap-table-toolbar.min.js',
+  'js/bootstrap-table-auto-refresh.min.js',
+  'js/chosen/chosen.jquery.min.js',
+  'js/dateTimePicker/jquery-ui-timepicker-addon.js',
+  'js/Server.js',
+), true );
+?>
   <script nonce="<?php echo $cspNonce; ?>">var $j = jQuery.noConflict();</script>
-  <script src="<?php echo cache_bust('skins/'.$skin.'/views/js/state.js') ?>"></script>
 <?php
   if ( $view == 'event' ) {
 ?>
@@ -883,15 +925,6 @@ function xhtmlFooter() {
 ?>
   </script>
 <?php
-	if ( $cssJsFile ) {
-?>
-  <script src="<?php echo cache_bust($cssJsFile) ?>"></script>
-<?php
-  } else {
-?>
-  <script src="<?php echo cache_bust('skins/classic/js/base.js') ?>"></script>
-<?php
-  }
   if ( $viewJsFile ) {
 ?>
   <script src="<?php echo cache_bust($viewJsFile) ?>"></script>
@@ -901,12 +934,10 @@ function xhtmlFooter() {
 ?>
   <script src="<?php echo cache_bust($skinJsFile) ?>"></script>
   <script src="<?php echo cache_bust('js/logger.js')?>"></script>
-<?php 
-  if ($basename == 'watch' or $basename == 'log' ) {
-  // This is used in the log popup for the export function. Not sure if it's used anywhere else
-?>
-    <script src="<?php echo cache_bust('js/overlay.js') ?>"></script>
-<?php } ?>
+<?php
+  if ( $basename == 'monitor' ) {
+    echo output_script_if_exists(array('js/leaflet/leaflet.js'), false);
+  } ?>
   <script nonce="<?php echo $cspNonce; ?>">$j('.chosen').chosen();</script>
   </body>
 </html>
diff --git a/web/skins/classic/includes/timeline_functions.php b/web/skins/classic/includes/timeline_functions.php
index 1c0995df4..c81f150d2 100644
--- a/web/skins/classic/includes/timeline_functions.php
+++ b/web/skins/classic/includes/timeline_functions.php
@@ -43,316 +43,6 @@ function getSlotFrame($slot) {
 	return $slotFrame;
 }
 
-function parseFilterToTree($filter) {
-	if ( count($filter['terms']) <= 0 ) {
-		return false;
-	}
-	$terms = $filter['terms'];
-
-	$StorageArea = NULL;
-
-	$postfixExpr = array();
-	$postfixStack = array();
-
-	$priorities = array(
-			'<' => 1,
-			'<=' => 1,
-			'>' => 1,
-			'>=' => 1,
-			'=' => 2,
-			'!=' => 2,
-			'=~' => 2,
-			'!~' => 2,
-			'=[]' => 2,
-			'![]' => 2,
-			'and' => 3,
-			'or' => 4,
-			);
-
-	for ( $i = 0; $i < count($terms); $i++ ) {
-    $term = $terms[$i];
-		if ( !empty($term['cnj']) ) {
-			while( true ) {
-				if ( !count($postfixStack) ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
-					break;
-				} elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
-					break;
-				} elseif ( $priorities[$term['cnj']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
-					break;
-				} else {
-					$postfixExpr[] = array_pop($postfixStack);
-				}
-			}
-		} # end if ! empty cnj
-
-		if ( !empty($term['obr']) ) {
-			for ( $j = 0; $j < $term['obr']; $j++ ) {
-				$postfixStack[] = array('type'=>'obr', 'value'=>$term['obr']);
-			}
-		}
-		if ( !empty($term['attr']) ) {
-			$dtAttr = false;
-			switch ( $term['attr']) {
-				case 'MonitorName':
-					$sqlValue = 'M.'.preg_replace( '/^Monitor/', '', $term['attr']);
-					break;
-				case 'ServerId':
-					$sqlValue .= 'M.ServerId';
-          break;
-        case 'StorageServerId':
-          $sqlValue .= 'S.ServerId';
-          break;
-        case 'FilterServerId':
-          $sqlValue .= ZM_SERVER_ID;
-          break;
-				case 'DateTime':
-				case 'StartDateTime':
-					$sqlValue = 'E.StartTime';
-					$dtAttr = true;
-					break;
-				case 'Date':
-				case 'StartDate':
-					$sqlValue = 'to_days(E.StartTime)';
-					$dtAttr = true;
-					break;
-				case 'Time':
-				case 'StartTime':
-					$sqlValue = 'extract(hour_second from E.StartTime)';
-					break;
-				case 'Weekday':
-				case 'StartWeekday':
-					$sqlValue = 'weekday(E.StartTime)';
-					break;
-				case 'EndDateTime':
-					$sqlValue = 'E.EndTime';
-					$dtAttr = true;
-					break;
-				case 'EndDate':
-					$sqlValue = 'to_days(E.EndTime)';
-					$dtAttr = true;
-					break;
-				case 'EndTime':
-					$sqlValue = 'extract(hour_second from E.EndTime)';
-					break;
-				case 'EndWeekday':
-					$sqlValue = 'weekday(E.EndTime)';
-					break;
-				case 'Id':
-				case 'Name':
-				case 'MonitorId':
-				case 'StorageId':
-        case 'SecondaryStorageId':
-				case 'Length':
-				case 'Frames':
-				case 'AlarmFrames':
-				case 'TotScore':
-				case 'AvgScore':
-				case 'MaxScore':
-				case 'Cause':
-				case 'Notes':
-				case 'StateId':
-				case 'Archived':
-					$sqlValue = 'E.'.$term['attr'];
-					break;
-				case 'DiskPercent':
-					// Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
-					if ( ! $StorageArea ) {
-						for ( $j = 0; $j < count($terms); $j++ ) {
-							if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
-								$StorageArea = new Storage($terms[$j]['val']);
-								break;
-							}
-						} // end foreach remaining term
-						if ( ! $StorageArea ) $StorageArea = new Storage();
-					} // end no StorageArea found yet
-					$sqlValue = getDiskPercent($StorageArea);
-					break;
-				case 'DiskBlocks':
-					// Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
-					if ( ! $StorageArea ) {
-						for ( $j = 0; $j < count($terms); $j++ ) {
-							if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
-								$StorageArea = new Storage($terms[$j]['val']);
-								break;
-							}
-						} // end foreach remaining term
-						if ( ! $StorageArea ) $StorageArea = new Storage();
-					} // end no StorageArea found yet
-					$sqlValue = getDiskBlocks($StorageArea);
-					break;
-				default :
-					$sqlValue = $term['attr'];
-					break;
-			}
-			if ( $dtAttr ) {
-				$postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue, 'dtAttr'=>true);
-			} else {
-				$postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue);
-			}
-		} # end if attr
-
-		if ( isset($term['op']) ) {
-			if ( empty($term['op']) ) {
-				$term['op'] = '=';
-			}
-			switch ( $term['op']) {
-				case '=' :
-				case '!=' :
-				case '>=' :
-				case '>' :
-				case '<' :
-				case '<=' :
-        case 'LIKE' :
-        case 'NOT LIKE':
-					$sqlValue = $term['op'];
-					break;
-        case '=~' :
-					$sqlValue = 'regexp';
-					break;
-				case '!~' :
-					$sqlValue = 'not regexp';
-					break;
-				case '=[]' :
-				case 'IN' :
-					$sqlValue = 'in (';
-					break;
-				case '![]' :
-					$sqlValue = 'not in (';
-					break;
-        case 'IS' :
-        case 'IS NOT' :
-          if ( $term['val'] == 'Odd' )  {
-            $sqlValue .= ' % 2 = 1';
-          } else if ( $term['val'] == 'Even' )  {
-            $sqlValue .= ' % 2 = 0';
-          } else {
-            $sqlValue .= ' '.$term['op'];
-          }
-          break;
-				default :
-					ZM\Error('Unknown operator in filter '.$term['op']);
-			}
-			while( true ) {
-				if ( !count($postfixStack) ) {
-					$postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue);
-					break;
-				} elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
-					$postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue);
-					break;
-				} elseif ( $priorities[$term['op']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
-					$postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue );
-					break;
-				} else {
-					$postfixExpr[] = array_pop($postfixStack);
-				}
-			} // end while
-		} // end if operator
-
-		if ( isset($term['val']) ) {
-			$valueList = array();
-			foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $term['val'])) as $value ) {
-				switch ( $term['attr'] ) {
-					case 'MonitorName':
-					case 'Name':
-					case 'Cause':
-					case 'Notes':
-            if ( $term['op'] == 'LIKE' || $term['op'] == 'NOT LIKE' ) {
-              $value = '%'.$value.'%';
-            }
-            $value = dbEscape($value);
-            break;
-          case 'MonitorServerId':
-          case 'FilterServerId':
-          case 'StorageServerId':
-          case 'ServerId':
-						if ( $value == 'ZM_SERVER_ID' ) {
-							$value = ZM_SERVER_ID;
-						} else if ( $value == 'NULL' ) {
-
-						} else {
-							$value = dbEscape($value);
-						}
-						break;
-					case 'StorageId':
-						$StorageArea = new Storage($value);
-						if ( $value != 'NULL' )
-							$value = dbEscape($value);
-						break;
-					case 'DateTime':
-					case 'EndDateTime':
-					case 'StartDateTime':
-						$value = "'".strftime(STRF_FMT_DATETIME_DB, strtotime($value))."'";
-						break;
-					case 'Date':
-					case 'EndDate':
-					case 'StartDate':
-						$value = 'to_days(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
-						break;
-					case 'Time':
-					case 'EndTime':
-					case 'StartTime':
-						$value = 'extract(hour_second from \''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
-						break;
-					case 'Weekday':
-					case 'EndWeekday':
-					case 'StartWeekday':
-						$value = 'weekday(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
-						break;
-					default :
-						if ( $value != 'NULL' )
-							$value = dbEscape($value);
-				} // end switch attribute
-				$valueList[] = $value;
-			} // end foreach value
-			$postfixExpr[] = array('type'=>'val', 'value'=>$term['val'], 'sqlValue'=>join(',', $valueList));
-		} // end if has val
-
-		if ( !empty($term['cbr']) ) {
-			for ( $j = 0; $j < $term['cbr']; $j++ ) {
-				while ( count($postfixStack) ) {
-					$element = array_pop($postfixStack);
-					if ( $element['type'] == 'obr' ) {
-						$postfixExpr[count($postfixExpr)-1]['bracket'] = true;
-						break;
-					}
-					$postfixExpr[] = $element;
-				}
-			}
-		} #end if cbr
-  } # end foreach term
-
-	while ( count($postfixStack) ) {
-		$postfixExpr[] = array_pop($postfixStack);
-	}
-
-	$exprStack = array();
-	//foreach ( $postfixExpr as $element )
-	//{
-	//echo $element['value'].' '; 
-	//}
-	//echo "<br>";
-	foreach ( $postfixExpr as $element ) {
-		if ( $element['type'] == 'attr' || $element['type'] == 'val' ) {
-			$node = array('data'=>$element, 'count'=>0);
-			$exprStack[] = $node;
-		} elseif ( $element['type'] == 'op' || $element['type'] == 'cnj' ) {
-			$right = array_pop($exprStack);
-			$left = array_pop($exprStack);
-			$node = array('data'=>$element, 'count'=>2+$left['count']+$right['count'], 'right'=>$right, 'left'=>$left);
-			$exprStack[] = $node;
-		} else {
-			ZM\Fatal('Unexpected element type \''.$element['type'].'\', value \''.$element['value'].'\'');
-		}
-	}
-	if ( count($exprStack) != 1 ) {
-		ZM\Fatal('Expression stack has '.count($exprStack).' elements');
-	}
-	return array_pop($exprStack);
-}
-
 function _parseTreeToInfix($node) {
 	$expression = '';
 	if ( isset($node) ) {
@@ -443,7 +133,7 @@ function parseTreeToFilter($tree) {
 function parseTreeToQuery($tree) {
 	$filter = parseTreeToFilter($tree);
 	parseFilter($filter, false, '&');
-	return $filter['query'];
+	return $filter['querystring'];
 }
 
 function _drawTree($node, $level) {
diff --git a/web/skins/classic/js/base.js b/web/skins/classic/js/base.js
deleted file mode 100644
index a3a99f773..000000000
--- a/web/skins/classic/js/base.js
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// ZoneMinder base static javascript file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-//
-// This file should only contain static JavaScript and no php.
-// Use skin.js.php for JavaScript that need pre-processing
-//
-
-// Javascript window sizes
-/* eslint-disable key-spacing */
-var popupSizes = {
-  'bandwidth':    {'width': 300, 'height': 200},
-  'console':      {'width': 750, 'height': 312},
-  'control':      {'width': 480, 'height': 480},
-  'controlcaps':  {'width': 780, 'height': 320},
-  'controlcap':   {'width': 600, 'height': 500},
-  'cycle':        {'addWidth': 32, 'minWidth': 384, 'addHeight': 62},
-  'device':       {'width': 260, 'height': 150},
-  'devices':      {'width': 400, 'height': 240},
-  'donate':       {'width': 500, 'height': 480},
-  'download':     {'width': 350, 'height': 315},
-  'event':        {'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540},
-  'eventdetail':  {'width': 600, 'height': 420},
-  'events':       {'width': 1220, 'height': 780},
-  'export':       {'width': 500, 'height': 640},
-  'filter':       {'width': 900, 'height': 700},
-  'frame':        {'addWidth': 32, 'minWidth': 384, 'addHeight': 200},
-  'frames':       {'addWidth': 800, 'addHeight': 600},
-  'function':     {'width': 350, 'height': 260},
-  'group':        {'width': 760, 'height': 600},
-  'groups':       {'width': 540, 'height': 420},
-  'image':        {'addWidth': 48, 'addHeight': 80},
-  'log':          {'width': 1180, 'height': 720},
-  'login':        {'width': 720, 'height': 480},
-  'logout':       {'width': 260, 'height': 150},
-  'monitor':      {'width': 800, 'height': 780},
-  'monitorpreset':{'width': 440, 'height': 210},
-  'monitorprobe': {'width': 500, 'height': 275},
-  'monitorselect':{'width': 160, 'height': 200},
-  'montage':      {'width': -1, 'height': -1},
-  'onvifprobe':   {'width': 700, 'height': 550},
-  'optionhelp':   {'width': 400, 'height': 400},
-  'options':      {'width': 1000, 'height': 660},
-  'preset':       {'width': 300, 'height': 220},
-  'server':       {'width': 600, 'height': 405},
-  'settings':     {'width': 250, 'height': 335},
-  'shutdown':     {'width': 400, 'height': 400},
-  'state':        {'width': 400, 'height': 170},
-  'stats':        {'width': 840, 'height': 200},
-  'storage':      {'width': 600, 'height': 425},
-  'timeline':     {'width': 760, 'height': 540},
-  'user':         {'width': 460, 'height': 720},
-  'version':      {'width': 360, 'height': 210},
-  'video':        {'width': 420, 'height': 360},
-  'videoview':    {'addWidth': 48, 'addHeight': 80},
-  'watch':        {'addWidth': 96, 'minWidth': 420, 'addHeight': 384},
-  'zone':         {'addWidth': 520, 'addHeight': 260, 'minHeight': 600},
-  'zones':        {'addWidth': 72, 'addHeight': 232}
-};
-/* eslint-enable key-spacing */
diff --git a/web/skins/classic/js/bootstrap-table-auto-refresh.min.js b/web/skins/classic/js/bootstrap-table-auto-refresh.min.js
new file mode 100644
index 000000000..62d74ac7a
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table-auto-refresh.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.1
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).jQuery)}(this,(function(t){"use strict";function e(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=e(t),r="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function o(t,e){return t(e={exports:{}},e.exports),e.exports}var i=function(t){return t&&t.Math==Math&&t},u=i("object"==typeof globalThis&&globalThis)||i("object"==typeof window&&window)||i("object"==typeof self&&self)||i("object"==typeof r&&r)||Function("return this")(),c=function(t){try{return!!t()}catch(t){return!0}},f=!c((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]})),a={}.propertyIsEnumerable,s=Object.getOwnPropertyDescriptor,l={f:s&&!a.call({1:2},1)?function(t){var e=s(this,t);return!!e&&e.enumerable}:a},p=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},h={}.toString,y=function(t){return h.call(t).slice(8,-1)},b="".split,d=c((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==y(t)?b.call(t,""):Object(t)}:Object,v=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},g=function(t){return d(v(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},O=function(t,e){if(!m(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!m(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!m(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!m(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},w={}.hasOwnProperty,j=function(t,e){return w.call(t,e)},S=u.document,R=m(S)&&m(S.createElement),T=function(t){return R?S.createElement(t):{}},P=!f&&!c((function(){return 7!=Object.defineProperty(T("div"),"a",{get:function(){return 7}}).a})),A=Object.getOwnPropertyDescriptor,E={f:f?A:function(t,e){if(t=g(t),e=O(e,!0),P)try{return A(t,e)}catch(t){}if(j(t,e))return p(!l.f.call(t,e),t[e])}},x=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},_=Object.defineProperty,I={f:f?_:function(t,e,n){if(x(t),e=O(e,!0),x(n),P)try{return _(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},k=f?function(t,e,n){return I.f(t,e,p(1,n))}:function(t,e,n){return t[e]=n,t},C=function(t,e){try{k(u,t,e)}catch(n){u[t]=e}return e},F="__core-js_shared__",M=u[F]||C(F,{}),D=Function.toString;"function"!=typeof M.inspectSource&&(M.inspectSource=function(t){return D.call(t)});var q,B,L,N=M.inspectSource,z=u.WeakMap,W="function"==typeof z&&/native code/.test(N(z)),G=o((function(t){(t.exports=function(t,e){return M[t]||(M[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.5",mode:"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})})),$=0,K=Math.random(),Q=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++$+K).toString(36)},V=G("keys"),X=function(t){return V[t]||(V[t]=Q(t))},Y={},H=u.WeakMap;if(W){var J=new H,U=J.get,Z=J.has,tt=J.set;q=function(t,e){return tt.call(J,t,e),e},B=function(t){return U.call(J,t)||{}},L=function(t){return Z.call(J,t)}}else{var et=X("state");Y[et]=!0,q=function(t,e){return k(t,et,e),e},B=function(t){return j(t,et)?t[et]:{}},L=function(t){return j(t,et)}}var nt,rt,ot={set:q,get:B,has:L,enforce:function(t){return L(t)?B(t):q(t,{})},getterFor:function(t){return function(e){var n;if(!m(e)||(n=B(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},it=o((function(t){var e=ot.get,n=ot.enforce,r=String(String).split("String");(t.exports=function(t,e,o,i){var c=!!i&&!!i.unsafe,f=!!i&&!!i.enumerable,a=!!i&&!!i.noTargetGet;"function"==typeof o&&("string"!=typeof e||j(o,"name")||k(o,"name",e),n(o).source=r.join("string"==typeof e?e:"")),t!==u?(c?!a&&t[e]&&(f=!0):delete t[e],f?t[e]=o:k(t,e,o)):f?t[e]=o:C(e,o)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||N(this)}))})),ut=u,ct=function(t){return"function"==typeof t?t:void 0},ft=function(t,e){return arguments.length<2?ct(ut[t])||ct(u[t]):ut[t]&&ut[t][e]||u[t]&&u[t][e]},at=Math.ceil,st=Math.floor,lt=function(t){return isNaN(t=+t)?0:(t>0?st:at)(t)},pt=Math.min,ht=function(t){return t>0?pt(lt(t),9007199254740991):0},yt=Math.max,bt=Math.min,dt=function(t){return function(e,n,r){var o,i=g(e),u=ht(i.length),c=function(t,e){var n=lt(t);return n<0?yt(n+e,0):bt(n,e)}(r,u);if(t&&n!=n){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===n)return t||c||0;return!t&&-1}},vt={includes:dt(!0),indexOf:dt(!1)}.indexOf,gt=function(t,e){var n,r=g(t),o=0,i=[];for(n in r)!j(Y,n)&&j(r,n)&&i.push(n);for(;e.length>o;)j(r,n=e[o++])&&(~vt(i,n)||i.push(n));return i},mt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],Ot=mt.concat("length","prototype"),wt={f:Object.getOwnPropertyNames||function(t){return gt(t,Ot)}},jt={f:Object.getOwnPropertySymbols},St=ft("Reflect","ownKeys")||function(t){var e=wt.f(x(t)),n=jt.f;return n?e.concat(n(t)):e},Rt=function(t,e){for(var n=St(e),r=I.f,o=E.f,i=0;i<n.length;i++){var u=n[i];j(t,u)||r(t,u,o(e,u))}},Tt=/#|\.prototype\./,Pt=function(t,e){var n=Et[At(t)];return n==_t||n!=xt&&("function"==typeof e?c(e):!!e)},At=Pt.normalize=function(t){return String(t).replace(Tt,".").toLowerCase()},Et=Pt.data={},xt=Pt.NATIVE="N",_t=Pt.POLYFILL="P",It=Pt,kt=E.f,Ct=function(t,e){var n,r,o,i,c,f=t.target,a=t.global,s=t.stat;if(n=a?u:s?u[f]||C(f,{}):(u[f]||{}).prototype)for(r in e){if(i=e[r],o=t.noTargetGet?(c=kt(n,r))&&c.value:n[r],!It(a?r:f+(s?".":"#")+r,t.forced)&&void 0!==o){if(typeof i==typeof o)continue;Rt(i,o)}(t.sham||o&&o.sham)&&k(i,"sham",!0),it(n,r,i,t)}},Ft=Array.isArray||function(t){return"Array"==y(t)},Mt=function(t){return Object(v(t))},Dt=function(t,e,n){var r=O(e);r in t?I.f(t,r,p(0,n)):t[r]=n},qt=!!Object.getOwnPropertySymbols&&!c((function(){return!String(Symbol())})),Bt=qt&&!Symbol.sham&&"symbol"==typeof Symbol.iterator,Lt=G("wks"),Nt=u.Symbol,zt=Bt?Nt:Nt&&Nt.withoutSetter||Q,Wt=function(t){return j(Lt,t)||(qt&&j(Nt,t)?Lt[t]=Nt[t]:Lt[t]=zt("Symbol."+t)),Lt[t]},Gt=Wt("species"),$t=function(t,e){var n;return Ft(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!Ft(n.prototype)?m(n)&&null===(n=n[Gt])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)},Kt=ft("navigator","userAgent")||"",Qt=u.process,Vt=Qt&&Qt.versions,Xt=Vt&&Vt.v8;Xt?rt=(nt=Xt.split("."))[0]+nt[1]:Kt&&(!(nt=Kt.match(/Edge\/(\d+)/))||nt[1]>=74)&&(nt=Kt.match(/Chrome\/(\d+)/))&&(rt=nt[1]);var Yt,Ht=rt&&+rt,Jt=Wt("species"),Ut=Wt("isConcatSpreadable"),Zt=9007199254740991,te="Maximum allowed index exceeded",ee=Ht>=51||!c((function(){var t=[];return t[Ut]=!1,t.concat()[0]!==t})),ne=(Yt="concat",Ht>=51||!c((function(){var t=[];return(t.constructor={})[Jt]=function(){return{foo:1}},1!==t[Yt](Boolean).foo}))),re=function(t){if(!m(t))return!1;var e=t[Ut];return void 0!==e?!!e:Ft(t)};Ct({target:"Array",proto:!0,forced:!ee||!ne},{concat:function(t){var e,n,r,o,i,u=Mt(this),c=$t(u,0),f=0;for(e=-1,r=arguments.length;e<r;e++)if(re(i=-1===e?u:arguments[e])){if(f+(o=ht(i.length))>Zt)throw TypeError(te);for(n=0;n<o;n++,f++)n in i&&Dt(c,f,i[n])}else{if(f>=Zt)throw TypeError(te);Dt(c,f++,i)}return c.length=f,c}});var oe,ie=function(t,e,n){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}},ue=[].push,ce=function(t){var e=1==t,n=2==t,r=3==t,o=4==t,i=6==t,u=5==t||i;return function(c,f,a,s){for(var l,p,h=Mt(c),y=d(h),b=ie(f,a,3),v=ht(y.length),g=0,m=s||$t,O=e?m(c,v):n?m(c,0):void 0;v>g;g++)if((u||g in y)&&(p=b(l=y[g],g,h),t))if(e)O[g]=p;else if(p)switch(t){case 3:return!0;case 5:return l;case 6:return g;case 2:ue.call(O,l)}else if(o)return!1;return i?-1:r||o?o:O}},fe={forEach:ce(0),map:ce(1),filter:ce(2),some:ce(3),every:ce(4),find:ce(5),findIndex:ce(6)},ae=Object.keys||function(t){return gt(t,mt)},se=f?Object.defineProperties:function(t,e){x(t);for(var n,r=ae(e),o=r.length,i=0;o>i;)I.f(t,n=r[i++],e[n]);return t},le=ft("document","documentElement"),pe=X("IE_PROTO"),he=function(){},ye=function(t){return"<script>"+t+"</"+"script>"},be=function(){try{oe=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;be=oe?function(t){t.write(ye("")),t.close();var e=t.parentWindow.Object;return t=null,e}(oe):((e=T("iframe")).style.display="none",le.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(ye("document.F=Object")),t.close(),t.F);for(var n=mt.length;n--;)delete be.prototype[mt[n]];return be()};Y[pe]=!0;var de=Object.create||function(t,e){var n;return null!==t?(he.prototype=x(t),n=new he,he.prototype=null,n[pe]=t):n=be(),void 0===e?n:se(n,e)},ve=Wt("unscopables"),ge=Array.prototype;null==ge[ve]&&I.f(ge,ve,{configurable:!0,value:de(null)});var me,Oe=Object.defineProperty,we={},je=function(t){throw t},Se=fe.find,Re="find",Te=!0,Pe=function(t,e){if(j(we,t))return we[t];e||(e={});var n=[][t],r=!!j(e,"ACCESSORS")&&e.ACCESSORS,o=j(e,0)?e[0]:je,i=j(e,1)?e[1]:void 0;return we[t]=!!n&&!c((function(){if(r&&!f)return!0;var t={length:-1};r?Oe(t,1,{enumerable:!0,get:je}):t[1]=1,n.call(t,o,i)}))}(Re);Re in[]&&Array(1).find((function(){Te=!1})),Ct({target:"Array",proto:!0,forced:Te||!Pe},{find:function(t){return Se(this,t,arguments.length>1?arguments[1]:void 0)}}),me=Re,ge[ve][me]=!0;var Ae=Object.assign,Ee=Object.defineProperty,xe=!Ae||c((function(){if(f&&1!==Ae({b:1},Ae(Ee({},"a",{enumerable:!0,get:function(){Ee(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},n=Symbol(),r="abcdefghijklmnopqrst";return t[n]=7,r.split("").forEach((function(t){e[t]=t})),7!=Ae({},t)[n]||ae(Ae({},e)).join("")!=r}))?function(t,e){for(var n=Mt(t),r=arguments.length,o=1,i=jt.f,u=l.f;r>o;)for(var c,a=d(arguments[o++]),s=i?ae(a).concat(i(a)):ae(a),p=s.length,h=0;p>h;)c=s[h++],f&&!u.call(a,c)||(n[c]=a[c]);return n}:Ae;function _e(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ie(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function ke(t){return(ke=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Ce(t,e){return(Ce=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Fe(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Me(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=ke(t);if(e){var o=ke(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return Fe(this,n)}}function De(t,e,n){return(De="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=ke(t)););return t}(t,e);if(r){var o=Object.getOwnPropertyDescriptor(r,e);return o.get?o.get.call(n):o.value}})(t,e,n||t)}Ct({target:"Object",stat:!0,forced:Object.assign!==xe},{assign:xe});var qe=n.default.fn.bootstrapTable.utils;n.default.extend(n.default.fn.bootstrapTable.defaults,{autoRefresh:!1,autoRefreshInterval:60,autoRefreshSilent:!0,autoRefreshStatus:!0,autoRefreshFunction:null}),n.default.extend(n.default.fn.bootstrapTable.defaults.icons,{autoRefresh:{bootstrap3:"glyphicon-time icon-time",materialize:"access_time","bootstrap-table":"icon-clock"}[n.default.fn.bootstrapTable.theme]||"fa-clock"}),n.default.extend(n.default.fn.bootstrapTable.locales,{formatAutoRefresh:function(){return"Auto Refresh"}}),n.default.extend(n.default.fn.bootstrapTable.defaults,n.default.fn.bootstrapTable.locales),n.default.BootstrapTable=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ce(t,e)}(i,t);var e,n,r,o=Me(i);function i(){return _e(this,i),o.apply(this,arguments)}return e=i,(n=[{key:"init",value:function(){for(var t,e=this,n=arguments.length,r=new Array(n),o=0;o<n;o++)r[o]=arguments[o];(t=De(ke(i.prototype),"init",this)).call.apply(t,[this].concat(r)),this.options.autoRefresh&&this.options.autoRefreshStatus&&(this.options.autoRefreshFunction=setInterval((function(){e.refresh({silent:e.options.autoRefreshSilent})}),1e3*this.options.autoRefreshInterval))}},{key:"initToolbar",value:function(){var t;this.options.autoRefresh&&(this.buttons=Object.assign(this.buttons,{autoRefresh:{html:'\n            <button class="auto-refresh '.concat(this.constants.buttonsClass,"\n              ").concat(this.options.autoRefreshStatus?" ".concat(this.constants.classes.buttonActive):"",'"\n              type="button" name="autoRefresh" title="').concat(this.options.formatAutoRefresh(),'">\n              ').concat(this.options.showButtonIcons?qe.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.autoRefresh):"","\n              ").concat(this.options.showButtonText?this.options.formatAutoRefresh():"","\n            </button>\n           "),event:this.toggleAutoRefresh}}));for(var e=arguments.length,n=new Array(e),r=0;r<e;r++)n[r]=arguments[r];(t=De(ke(i.prototype),"initToolbar",this)).call.apply(t,[this].concat(n))}},{key:"toggleAutoRefresh",value:function(){var t=this;this.options.autoRefresh&&(this.options.autoRefreshStatus?(clearInterval(this.options.autoRefreshFunction),this.$toolbar.find(">.columns .auto-refresh").removeClass(this.constants.classes.buttonActive)):(this.options.autoRefreshFunction=setInterval((function(){t.refresh({silent:t.options.autoRefreshSilent})}),1e3*this.options.autoRefreshInterval),this.$toolbar.find(">.columns .auto-refresh").addClass(this.constants.classes.buttonActive)),this.options.autoRefreshStatus=!this.options.autoRefreshStatus)}}])&&Ie(e.prototype,n),r&&Ie(e,r),i}(n.default.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-cookie.min.js b/web/skins/classic/js/bootstrap-table-cookie.min.js
index 11df359ee..d382ab764 100644
--- a/web/skins/classic/js/bootstrap-table-cookie.min.js
+++ b/web/skins/classic/js/bootstrap-table-cookie.min.js
@@ -1,8 +1,10 @@
 /**
- * @author: Dennis Hernández
- * @webSite: http://djhvscf.github.io/Blog
- * @update zhixin wen <wenzhixin2010@gmail.com>
- * git a84b084
- */
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.1
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
 
-const Utils=$.fn.bootstrapTable.utils,UtilsCookie={cookieIds:{sortOrder:"bs.table.sortOrder",sortName:"bs.table.sortName",pageNumber:"bs.table.pageNumber",pageList:"bs.table.pageList",columns:"bs.table.columns",searchText:"bs.table.searchText",reorderColumns:"bs.table.reorderColumns",filterControl:"bs.table.filterControl",filterBy:"bs.table.filterBy"},getCurrentHeader(o){let e=o.$header;return o.options.height&&(e=o.$tableHeader),e},getCurrentSearchControls(o){let e="select, input";return o.options.height&&(e="table select, table input"),e},cookieEnabled:()=>!!navigator.cookieEnabled,inArrayCookiesEnabled(o,e){let t=-1;for(let i=0;i<e.length;i++)if(o.toLowerCase()===e[i].toLowerCase()){t=i;break}return t},setCookie(o,e,t){if(o.options.cookie&&UtilsCookie.cookieEnabled()&&""!==o.options.cookieIdTable&&-1!==UtilsCookie.inArrayCookiesEnabled(e,o.options.cookiesEnabled)){switch(e=`${o.options.cookieIdTable}.${e}`,o.options.cookieStorage){case"cookieStorage":document.cookie=[e,"=",encodeURIComponent(t),`; expires=${UtilsCookie.calculateExpiration(o.options.cookieExpire)}`,o.options.cookiePath?`; path=${o.options.cookiePath}`:"",o.options.cookieDomain?`; domain=${o.options.cookieDomain}`:"",o.options.cookieSecure?"; secure":""].join("");break;case"localStorage":localStorage.setItem(e,t);break;case"sessionStorage":sessionStorage.setItem(e,t);break;case"customStorage":if(!o.options.cookieCustomStorageSet||!o.options.cookieCustomStorageGet||!o.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");Utils.calculateObjectValue(o.options,o.options.cookieCustomStorageSet,[e,t],"");break;default:return!1}return!0}},getCookie(o,e,t){if(!t)return null;if(-1===UtilsCookie.inArrayCookiesEnabled(t,o.options.cookiesEnabled))return null;switch(t=`${e}.${t}`,o.options.cookieStorage){case"cookieStorage":const i=`; ${document.cookie}`.split(`; ${t}=`);return 2===i.length?decodeURIComponent(i.pop().split(";").shift()):null;case"localStorage":return localStorage.getItem(t);case"sessionStorage":return sessionStorage.getItem(t);case"customStorage":if(!o.options.cookieCustomStorageSet||!o.options.cookieCustomStorageGet||!o.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");return Utils.calculateObjectValue(o.options,o.options.cookieCustomStorageGet,[t],"");default:return null}},deleteCookie(o,e,t){switch(t=`${e}.${t}`,o.options.cookieStorage){case"cookieStorage":document.cookie=[encodeURIComponent(t),"=","; expires=Thu, 01 Jan 1970 00:00:00 GMT",o.options.cookiePath?`; path=${o.options.cookiePath}`:"",o.options.cookieDomain?`; domain=${o.options.cookieDomain}`:""].join("");break;case"localStorage":localStorage.removeItem(t);break;case"sessionStorage":sessionStorage.removeItem(t);break;case"customStorage":if(!o.options.cookieCustomStorageSet||!o.options.cookieCustomStorageGet||!o.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");Utils.calculateObjectValue(o.options,o.options.cookieCustomStorageDelete,[t],"");break;default:return!1}return!0},calculateExpiration(o){const e=o.replace(/[0-9]*/,"");switch(o=o.replace(/[A-Za-z]{1,2}/,""),e.toLowerCase()){case"s":o=+o;break;case"mi":o*=60;break;case"h":o=60*o*60;break;case"d":o=24*o*60*60;break;case"m":o=30*o*24*60*60;break;case"y":o=365*o*24*60*60;break;default:o=void 0}if(!o)return"";const t=new Date;return t.setTime(t.getTime()+1e3*o),t.toGMTString()},initCookieFilters(o){setTimeout(()=>{const e=JSON.parse(UtilsCookie.getCookie(o,o.options.cookieIdTable,UtilsCookie.cookieIds.filterControl));if(!o.options.filterControlValuesLoaded&&e){const t={},i=UtilsCookie.getCurrentHeader(o),s=UtilsCookie.getCurrentSearchControls(o),r=(e,i)=>{i.forEach(i=>{if(""!==i.text&&("radio"!==e.type||e.value.toString()===i.text.toString()))if("INPUT"===e.tagName&&"radio"===e.type&&e.value.toString()===i.text.toString())e.checked=!0,t[i.field]=i.text;else if("INPUT"===e.tagName)e.value=i.text,t[i.field]=i.text;else if("SELECT"===e.tagName&&o.options.filterControlContainer)e.value=i.text,t[i.field]=i.text;else if(""!==i.text&&"SELECT"===e.tagName){for(let o=0;o<e.length;o++){const t=e[o];if(t.value===i.text)return void(t.selected=!0)}const o=document.createElement("option");o.value=i.text,o.text=i.text,e.add(o,e[1]),e.selectedIndex=1,t[i.field]=i.text}})};let l=i;o.options.filterControlContainer&&(l=$(`${o.options.filterControlContainer}`)),l.find(s).each(function(){const o=$(this).closest("[data-field]").data("field"),t=e.filter(e=>e.field===o);r(this,t)}),o.initColumnSearch(t),o.options.filterControlValuesLoaded=!0,o.initServer()}},250)}};$.extend($.fn.bootstrapTable.defaults,{cookie:!1,cookieExpire:"2h",cookiePath:null,cookieDomain:null,cookieSecure:null,cookieIdTable:"",cookiesEnabled:["bs.table.sortOrder","bs.table.sortName","bs.table.pageNumber","bs.table.pageList","bs.table.columns","bs.table.searchText","bs.table.filterControl","bs.table.filterBy","bs.table.reorderColumns"],cookieStorage:"cookieStorage",cookieCustomStorageGet:null,cookieCustomStorageSet:null,cookieCustomStorageDelete:null,filterControls:[],filterControlValuesLoaded:!1}),$.fn.bootstrapTable.methods.push("getCookies"),$.fn.bootstrapTable.methods.push("deleteCookie"),$.extend($.fn.bootstrapTable.utils,{setCookie:UtilsCookie.setCookie,getCookie:UtilsCookie.getCookie}),$.BootstrapTable=class extends $.BootstrapTable{init(){if(this.options.cookie){const o=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.filterBy);if("boolean"==typeof o&&!o)throw new Error("The cookie value of filterBy must be a json!");let e={};try{e=JSON.parse(o)}catch(o){throw new Error("Could not parse the json of the filterBy cookie!")}if(this.filterColumns=e||{},this.options.filterControls=[],this.options.filterControlValuesLoaded=!1,this.options.cookiesEnabled="string"==typeof this.options.cookiesEnabled?this.options.cookiesEnabled.replace("[","").replace("]","").replace(/'/g,"").replace(/ /g,"").toLowerCase().split(","):this.options.cookiesEnabled,this.options.filterControl){const o=this;this.$el.on("column-search.bs.table",(e,t,i)=>{let s=!0;for(let e=0;e<o.options.filterControls.length;e++)if(o.options.filterControls[e].field===t){o.options.filterControls[e].text=i,s=!1;break}s&&o.options.filterControls.push({field:t,text:i}),UtilsCookie.setCookie(o,UtilsCookie.cookieIds.filterControl,JSON.stringify(o.options.filterControls))}).on("created-controls.bs.table",UtilsCookie.initCookieFilters(o))}}super.init()}initServer(...o){if(this.options.cookie&&this.options.filterControl&&!this.options.filterControlValuesLoaded){if(JSON.parse(UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.filterControl)))return}super.initServer(...o)}initTable(...o){super.initTable(...o),this.initCookie()}onSort(...o){super.onSort(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.sortOrder,this.options.sortOrder),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.sortName,this.options.sortName)}onPageNumber(...o){super.onPageNumber(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,this.options.pageNumber)}onPageListChange(...o){super.onPageListChange(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageList,this.options.pageSize),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,this.options.pageNumber)}onPagePre(...o){super.onPagePre(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,this.options.pageNumber)}onPageNext(...o){super.onPageNext(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,this.options.pageNumber)}_toggleColumn(...o){super._toggleColumn(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.columns,JSON.stringify(this.getVisibleColumns().map(o=>o.field)))}_toggleAllColumns(...o){super._toggleAllColumns(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.columns,JSON.stringify(this.getVisibleColumns().map(o=>o.field)))}selectPage(o){super.selectPage(o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,o)}onSearch(o){super.onSearch(o),this.options.search&&UtilsCookie.setCookie(this,UtilsCookie.cookieIds.searchText,this.searchText),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,this.options.pageNumber)}initHeader(...o){this.options.reorderableColumns&&(this.columnsSortOrder=JSON.parse(UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.reorderColumns))),super.initHeader(...o)}persistReorderColumnsState(o){UtilsCookie.setCookie(o,UtilsCookie.cookieIds.reorderColumns,JSON.stringify(o.columnsSortOrder))}filterBy(...o){super.filterBy(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.filterBy,JSON.stringify(this.filterColumns))}initCookie(){if(!this.options.cookie)return;if(""===this.options.cookieIdTable||""===this.options.cookieExpire||!UtilsCookie.cookieEnabled())return console.error("Configuration error. Please review the cookieIdTable and the cookieExpire property. If the properties are correct, then this browser does not support cookies."),void(this.options.cookie=!1);const o=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.sortOrder),e=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.sortName),t=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.pageNumber),i=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.pageList),s=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.searchText),r=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.columns);if("boolean"==typeof r&&!r)throw new Error("The cookie value of filterBy must be a json!");let l={};try{l=JSON.parse(r)}catch(o){throw new Error("Could not parse the json of the columns cookie!",r)}if(this.options.sortOrder=o||this.options.sortOrder,this.options.sortName=e||this.options.sortName,this.options.pageNumber=t?+t:this.options.pageNumber,this.options.pageSize=i?i===this.options.formatAllRows()?i:+i:this.options.pageSize,this.options.searchText=s||"",l)for(const o of this.columns)o.visible=l.filter(e=>!!this.isSelectionColumn(o)||(e instanceof Object?e.field===o.field:e===o.field)).length>0||!o.switchable}getCookies(){const o=this,e={};return $.each(UtilsCookie.cookieIds,(t,i)=>{e[t]=UtilsCookie.getCookie(o,o.options.cookieIdTable,i),"columns"===t&&(e[t]=JSON.parse(e[t]))}),e}deleteCookie(o){""!==o&&UtilsCookie.cookieEnabled()&&UtilsCookie.deleteCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds[o])}};
+!function(e,t){"object"==typeof exports&&"undefined"!=typeof module?t(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],t):t((e="undefined"!=typeof globalThis?globalThis:e||self).jQuery)}(this,(function(e){"use strict";function t(e){return e&&"object"==typeof e&&"default"in e?e:{default:e}}var o=t(e),r="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function n(e,t){return e(t={exports:{}},t.exports),t.exports}var i=function(e){return e&&e.Math==Math&&e},a=i("object"==typeof globalThis&&globalThis)||i("object"==typeof window&&window)||i("object"==typeof self&&self)||i("object"==typeof r&&r)||Function("return this")(),c=function(e){try{return!!e()}catch(e){return!0}},l=!c((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]})),s={}.propertyIsEnumerable,u=Object.getOwnPropertyDescriptor,f={f:u&&!s.call({1:2},1)?function(e){var t=u(this,e);return!!t&&t.enumerable}:s},p=function(e,t){return{enumerable:!(1&e),configurable:!(2&e),writable:!(4&e),value:t}},h={}.toString,d=function(e){return h.call(e).slice(8,-1)},g="".split,v=c((function(){return!Object("z").propertyIsEnumerable(0)}))?function(e){return"String"==d(e)?g.call(e,""):Object(e)}:Object,y=function(e){if(null==e)throw TypeError("Can't call method on "+e);return e},b=function(e){return v(y(e))},m=function(e){return"object"==typeof e?null!==e:"function"==typeof e},k=function(e,t){if(!m(e))return e;var o,r;if(t&&"function"==typeof(o=e.toString)&&!m(r=o.call(e)))return r;if("function"==typeof(o=e.valueOf)&&!m(r=o.call(e)))return r;if(!t&&"function"==typeof(o=e.toString)&&!m(r=o.call(e)))return r;throw TypeError("Can't convert object to primitive value")},S={}.hasOwnProperty,C=function(e,t){return S.call(e,t)},x=a.document,E=m(x)&&m(x.createElement),w=function(e){return E?x.createElement(e):{}},I=!l&&!c((function(){return 7!=Object.defineProperty(w("div"),"a",{get:function(){return 7}}).a})),T=Object.getOwnPropertyDescriptor,O={f:l?T:function(e,t){if(e=b(e),t=k(t,!0),I)try{return T(e,t)}catch(e){}if(C(e,t))return p(!f.f.call(e,t),e[t])}},j=function(e){if(!m(e))throw TypeError(String(e)+" is not an object");return e},A=Object.defineProperty,N={f:l?A:function(e,t,o){if(j(e),t=k(t,!0),j(o),I)try{return A(e,t,o)}catch(e){}if("get"in o||"set"in o)throw TypeError("Accessors not supported");return"value"in o&&(e[t]=o.value),e}},P=l?function(e,t,o){return N.f(e,t,p(1,o))}:function(e,t,o){return e[t]=o,e},L=function(e,t){try{P(a,e,t)}catch(o){a[e]=t}return t},R="__core-js_shared__",_=a[R]||L(R,{}),D=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(e){return D.call(e)});var M,G,U,$=_.inspectSource,B=a.WeakMap,V="function"==typeof B&&/native code/.test($(B)),F=n((function(e){(e.exports=function(e,t){return _[e]||(_[e]=void 0!==t?t:{})})("versions",[]).push({version:"3.6.5",mode:"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})})),J=0,z=Math.random(),H=function(e){return"Symbol("+String(void 0===e?"":e)+")_"+(++J+z).toString(36)},q=F("keys"),K=function(e){return q[e]||(q[e]=H(e))},W={},X=a.WeakMap;if(V){var Y=new X,Q=Y.get,Z=Y.has,ee=Y.set;M=function(e,t){return ee.call(Y,e,t),t},G=function(e){return Q.call(Y,e)||{}},U=function(e){return Z.call(Y,e)}}else{var te=K("state");W[te]=!0,M=function(e,t){return P(e,te,t),t},G=function(e){return C(e,te)?e[te]:{}},U=function(e){return C(e,te)}}var oe,re,ne={set:M,get:G,has:U,enforce:function(e){return U(e)?G(e):M(e,{})},getterFor:function(e){return function(t){var o;if(!m(t)||(o=G(t)).type!==e)throw TypeError("Incompatible receiver, "+e+" required");return o}}},ie=n((function(e){var t=ne.get,o=ne.enforce,r=String(String).split("String");(e.exports=function(e,t,n,i){var c=!!i&&!!i.unsafe,l=!!i&&!!i.enumerable,s=!!i&&!!i.noTargetGet;"function"==typeof n&&("string"!=typeof t||C(n,"name")||P(n,"name",t),o(n).source=r.join("string"==typeof t?t:"")),e!==a?(c?!s&&e[t]&&(l=!0):delete e[t],l?e[t]=n:P(e,t,n)):l?e[t]=n:L(t,n)})(Function.prototype,"toString",(function(){return"function"==typeof this&&t(this).source||$(this)}))})),ae=a,ce=function(e){return"function"==typeof e?e:void 0},le=function(e,t){return arguments.length<2?ce(ae[e])||ce(a[e]):ae[e]&&ae[e][t]||a[e]&&a[e][t]},se=Math.ceil,ue=Math.floor,fe=function(e){return isNaN(e=+e)?0:(e>0?ue:se)(e)},pe=Math.min,he=function(e){return e>0?pe(fe(e),9007199254740991):0},de=Math.max,ge=Math.min,ve=function(e){return function(t,o,r){var n,i=b(t),a=he(i.length),c=function(e,t){var o=fe(e);return o<0?de(o+t,0):ge(o,t)}(r,a);if(e&&o!=o){for(;a>c;)if((n=i[c++])!=n)return!0}else for(;a>c;c++)if((e||c in i)&&i[c]===o)return e||c||0;return!e&&-1}},ye={includes:ve(!0),indexOf:ve(!1)}.indexOf,be=function(e,t){var o,r=b(e),n=0,i=[];for(o in r)!C(W,o)&&C(r,o)&&i.push(o);for(;t.length>n;)C(r,o=t[n++])&&(~ye(i,o)||i.push(o));return i},me=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],ke=me.concat("length","prototype"),Se={f:Object.getOwnPropertyNames||function(e){return be(e,ke)}},Ce={f:Object.getOwnPropertySymbols},xe=le("Reflect","ownKeys")||function(e){var t=Se.f(j(e)),o=Ce.f;return o?t.concat(o(e)):t},Ee=function(e,t){for(var o=xe(t),r=N.f,n=O.f,i=0;i<o.length;i++){var a=o[i];C(e,a)||r(e,a,n(t,a))}},we=/#|\.prototype\./,Ie=function(e,t){var o=Oe[Te(e)];return o==Ae||o!=je&&("function"==typeof t?c(t):!!t)},Te=Ie.normalize=function(e){return String(e).replace(we,".").toLowerCase()},Oe=Ie.data={},je=Ie.NATIVE="N",Ae=Ie.POLYFILL="P",Ne=Ie,Pe=O.f,Le=function(e,t){var o,r,n,i,c,l=e.target,s=e.global,u=e.stat;if(o=s?a:u?a[l]||L(l,{}):(a[l]||{}).prototype)for(r in t){if(i=t[r],n=e.noTargetGet?(c=Pe(o,r))&&c.value:o[r],!Ne(s?r:l+(u?".":"#")+r,e.forced)&&void 0!==n){if(typeof i==typeof n)continue;Ee(i,n)}(e.sham||n&&n.sham)&&P(i,"sham",!0),ie(o,r,i,e)}},Re=Array.isArray||function(e){return"Array"==d(e)},_e=function(e){return Object(y(e))},De=function(e,t,o){var r=k(t);r in e?N.f(e,r,p(0,o)):e[r]=o},Me=!!Object.getOwnPropertySymbols&&!c((function(){return!String(Symbol())})),Ge=Me&&!Symbol.sham&&"symbol"==typeof Symbol.iterator,Ue=F("wks"),$e=a.Symbol,Be=Ge?$e:$e&&$e.withoutSetter||H,Ve=function(e){return C(Ue,e)||(Me&&C($e,e)?Ue[e]=$e[e]:Ue[e]=Be("Symbol."+e)),Ue[e]},Fe=Ve("species"),Je=function(e,t){var o;return Re(e)&&("function"!=typeof(o=e.constructor)||o!==Array&&!Re(o.prototype)?m(o)&&null===(o=o[Fe])&&(o=void 0):o=void 0),new(void 0===o?Array:o)(0===t?0:t)},ze=le("navigator","userAgent")||"",He=a.process,qe=He&&He.versions,Ke=qe&&qe.v8;Ke?re=(oe=Ke.split("."))[0]+oe[1]:ze&&(!(oe=ze.match(/Edge\/(\d+)/))||oe[1]>=74)&&(oe=ze.match(/Chrome\/(\d+)/))&&(re=oe[1]);var We=re&&+re,Xe=Ve("species"),Ye=function(e){return We>=51||!c((function(){var t=[];return(t.constructor={})[Xe]=function(){return{foo:1}},1!==t[e](Boolean).foo}))},Qe=Ve("isConcatSpreadable"),Ze=9007199254740991,et="Maximum allowed index exceeded",tt=We>=51||!c((function(){var e=[];return e[Qe]=!1,e.concat()[0]!==e})),ot=Ye("concat"),rt=function(e){if(!m(e))return!1;var t=e[Qe];return void 0!==t?!!t:Re(e)};Le({target:"Array",proto:!0,forced:!tt||!ot},{concat:function(e){var t,o,r,n,i,a=_e(this),c=Je(a,0),l=0;for(t=-1,r=arguments.length;t<r;t++)if(rt(i=-1===t?a:arguments[t])){if(l+(n=he(i.length))>Ze)throw TypeError(et);for(o=0;o<n;o++,l++)o in i&&De(c,l,i[o])}else{if(l>=Ze)throw TypeError(et);De(c,l++,i)}return c.length=l,c}});var nt=function(e){if("function"!=typeof e)throw TypeError(String(e)+" is not a function");return e},it=[].push,at=function(e){var t=1==e,o=2==e,r=3==e,n=4==e,i=6==e,a=5==e||i;return function(c,l,s,u){for(var f,p,h=_e(c),d=v(h),g=function(e,t,o){if(nt(e),void 0===t)return e;switch(o){case 0:return function(){return e.call(t)};case 1:return function(o){return e.call(t,o)};case 2:return function(o,r){return e.call(t,o,r)};case 3:return function(o,r,n){return e.call(t,o,r,n)}}return function(){return e.apply(t,arguments)}}(l,s,3),y=he(d.length),b=0,m=u||Je,k=t?m(c,y):o?m(c,0):void 0;y>b;b++)if((a||b in d)&&(p=g(f=d[b],b,h),e))if(t)k[b]=p;else if(p)switch(e){case 3:return!0;case 5:return f;case 6:return b;case 2:it.call(k,f)}else if(n)return!1;return i?-1:r||n?n:k}},ct={forEach:at(0),map:at(1),filter:at(2),some:at(3),every:at(4),find:at(5),findIndex:at(6)},lt=Object.defineProperty,st={},ut=function(e){throw e},ft=function(e,t){if(C(st,e))return st[e];t||(t={});var o=[][e],r=!!C(t,"ACCESSORS")&&t.ACCESSORS,n=C(t,0)?t[0]:ut,i=C(t,1)?t[1]:void 0;return st[e]=!!o&&!c((function(){if(r&&!l)return!0;var e={length:-1};r?lt(e,1,{enumerable:!0,get:ut}):e[1]=1,o.call(e,n,i)}))},pt=ct.filter,ht=Ye("filter"),dt=ft("filter");Le({target:"Array",proto:!0,forced:!ht||!dt},{filter:function(e){return pt(this,e,arguments.length>1?arguments[1]:void 0)}});var gt,vt=Object.keys||function(e){return be(e,me)},yt=l?Object.defineProperties:function(e,t){j(e);for(var o,r=vt(t),n=r.length,i=0;n>i;)N.f(e,o=r[i++],t[o]);return e},bt=le("document","documentElement"),mt=K("IE_PROTO"),kt=function(){},St=function(e){return"<script>"+e+"</"+"script>"},Ct=function(){try{gt=document.domain&&new ActiveXObject("htmlfile")}catch(e){}var e,t;Ct=gt?function(e){e.write(St("")),e.close();var t=e.parentWindow.Object;return e=null,t}(gt):((t=w("iframe")).style.display="none",bt.appendChild(t),t.src=String("javascript:"),(e=t.contentWindow.document).open(),e.write(St("document.F=Object")),e.close(),e.F);for(var o=me.length;o--;)delete Ct.prototype[me[o]];return Ct()};W[mt]=!0;var xt=Object.create||function(e,t){var o;return null!==e?(kt.prototype=j(e),o=new kt,kt.prototype=null,o[mt]=e):o=Ct(),void 0===t?o:yt(o,t)},Et=Ve("unscopables"),wt=Array.prototype;null==wt[Et]&&N.f(wt,Et,{configurable:!0,value:xt(null)});var It,Tt=ct.find,Ot="find",jt=!0,At=ft(Ot);Ot in[]&&Array(1).find((function(){jt=!1})),Le({target:"Array",proto:!0,forced:jt||!At},{find:function(e){return Tt(this,e,arguments.length>1?arguments[1]:void 0)}}),It=Ot,wt[Et][It]=!0;var Nt=function(e,t){var o=[][e];return!!o&&c((function(){o.call(null,t||function(){throw 1},1)}))},Pt=ct.forEach,Lt=Nt("forEach"),Rt=ft("forEach"),_t=Lt&&Rt?[].forEach:function(e){return Pt(this,e,arguments.length>1?arguments[1]:void 0)};Le({target:"Array",proto:!0,forced:[].forEach!=_t},{forEach:_t});var Dt=[].join,Mt=v!=Object,Gt=Nt("join",",");Le({target:"Array",proto:!0,forced:Mt||!Gt},{join:function(e){return Dt.call(b(this),void 0===e?",":e)}});var Ut=ct.map,$t=Ye("map"),Bt=ft("map");Le({target:"Array",proto:!0,forced:!$t||!Bt},{map:function(e){return Ut(this,e,arguments.length>1?arguments[1]:void 0)}});var Vt={};Vt[Ve("toStringTag")]="z";var Ft="[object z]"===String(Vt),Jt=Ve("toStringTag"),zt="Arguments"==d(function(){return arguments}()),Ht=Ft?d:function(e){var t,o,r;return void 0===e?"Undefined":null===e?"Null":"string"==typeof(o=function(e,t){try{return e[t]}catch(e){}}(t=Object(e),Jt))?o:zt?d(t):"Object"==(r=d(t))&&"function"==typeof t.callee?"Arguments":r},qt=Ft?{}.toString:function(){return"[object "+Ht(this)+"]"};Ft||ie(Object.prototype,"toString",qt,{unsafe:!0});var Kt=function(){var e=j(this),t="";return e.global&&(t+="g"),e.ignoreCase&&(t+="i"),e.multiline&&(t+="m"),e.dotAll&&(t+="s"),e.unicode&&(t+="u"),e.sticky&&(t+="y"),t};function Wt(e,t){return RegExp(e,t)}var Xt,Yt,Qt={UNSUPPORTED_Y:c((function(){var e=Wt("a","y");return e.lastIndex=2,null!=e.exec("abcd")})),BROKEN_CARET:c((function(){var e=Wt("^r","gy");return e.lastIndex=2,null!=e.exec("str")}))},Zt=RegExp.prototype.exec,eo=String.prototype.replace,to=Zt,oo=(Xt=/a/,Yt=/b*/g,Zt.call(Xt,"a"),Zt.call(Yt,"a"),0!==Xt.lastIndex||0!==Yt.lastIndex),ro=Qt.UNSUPPORTED_Y||Qt.BROKEN_CARET,no=void 0!==/()??/.exec("")[1];(oo||no||ro)&&(to=function(e){var t,o,r,n,i=this,a=ro&&i.sticky,c=Kt.call(i),l=i.source,s=0,u=e;return a&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),u=String(e).slice(i.lastIndex),i.lastIndex>0&&(!i.multiline||i.multiline&&"\n"!==e[i.lastIndex-1])&&(l="(?: "+l+")",u=" "+u,s++),o=new RegExp("^(?:"+l+")",c)),no&&(o=new RegExp("^"+l+"$(?!\\s)",c)),oo&&(t=i.lastIndex),r=Zt.call(a?o:i,u),a?r?(r.input=r.input.slice(s),r[0]=r[0].slice(s),r.index=i.lastIndex,i.lastIndex+=r[0].length):i.lastIndex=0:oo&&r&&(i.lastIndex=i.global?r.index+r[0].length:t),no&&r&&r.length>1&&eo.call(r[0],o,(function(){for(n=1;n<arguments.length-2;n++)void 0===arguments[n]&&(r[n]=void 0)})),r});var io=to;Le({target:"RegExp",proto:!0,forced:/./.exec!==io},{exec:io});var ao="toString",co=RegExp.prototype,lo=co.toString,so=c((function(){return"/a/b"!=lo.call({source:"a",flags:"b"})})),uo=lo.name!=ao;(so||uo)&&ie(RegExp.prototype,ao,(function(){var e=j(this),t=String(e.source),o=e.flags;return"/"+t+"/"+String(void 0===o&&e instanceof RegExp&&!("flags"in co)?Kt.call(e):o)}),{unsafe:!0});var fo=Ve("species"),po=!c((function(){var e=/./;return e.exec=function(){var e=[];return e.groups={a:"7"},e},"7"!=="".replace(e,"$<a>")})),ho="$0"==="a".replace(/./,"$0"),go=Ve("replace"),vo=!!/./[go]&&""===/./[go]("a","$0"),yo=!c((function(){var e=/(?:)/,t=e.exec;e.exec=function(){return t.apply(this,arguments)};var o="ab".split(e);return 2!==o.length||"a"!==o[0]||"b"!==o[1]})),bo=function(e,t,o,r){var n=Ve(e),i=!c((function(){var t={};return t[n]=function(){return 7},7!=""[e](t)})),a=i&&!c((function(){var t=!1,o=/a/;return"split"===e&&((o={}).constructor={},o.constructor[fo]=function(){return o},o.flags="",o[n]=/./[n]),o.exec=function(){return t=!0,null},o[n](""),!t}));if(!i||!a||"replace"===e&&(!po||!ho||vo)||"split"===e&&!yo){var l=/./[n],s=o(n,""[e],(function(e,t,o,r,n){return t.exec===io?i&&!n?{done:!0,value:l.call(t,o,r)}:{done:!0,value:e.call(o,t,r)}:{done:!1}}),{REPLACE_KEEPS_$0:ho,REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE:vo}),u=s[0],f=s[1];ie(String.prototype,e,u),ie(RegExp.prototype,n,2==t?function(e,t){return f.call(e,this,t)}:function(e){return f.call(e,this)})}r&&P(RegExp.prototype[n],"sham",!0)},mo=function(e){return function(t,o){var r,n,i=String(y(t)),a=fe(o),c=i.length;return a<0||a>=c?e?"":void 0:(r=i.charCodeAt(a))<55296||r>56319||a+1===c||(n=i.charCodeAt(a+1))<56320||n>57343?e?i.charAt(a):r:e?i.slice(a,a+2):n-56320+(r-55296<<10)+65536}},ko={codeAt:mo(!1),charAt:mo(!0)}.charAt,So=function(e,t,o){return t+(o?ko(e,t).length:1)},Co=function(e,t){var o=e.exec;if("function"==typeof o){var r=o.call(e,t);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==d(e))throw TypeError("RegExp#exec called on incompatible receiver");return io.call(e,t)},xo=Math.max,Eo=Math.min,wo=Math.floor,Io=/\$([$&'`]|\d\d?|<[^>]*>)/g,To=/\$([$&'`]|\d\d?)/g;bo("replace",2,(function(e,t,o,r){var n=r.REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE,i=r.REPLACE_KEEPS_$0,a=n?"$":"$0";return[function(o,r){var n=y(this),i=null==o?void 0:o[e];return void 0!==i?i.call(o,n,r):t.call(String(n),o,r)},function(e,r){if(!n&&i||"string"==typeof r&&-1===r.indexOf(a)){var l=o(t,e,this,r);if(l.done)return l.value}var s=j(e),u=String(this),f="function"==typeof r;f||(r=String(r));var p=s.global;if(p){var h=s.unicode;s.lastIndex=0}for(var d=[];;){var g=Co(s,u);if(null===g)break;if(d.push(g),!p)break;""===String(g[0])&&(s.lastIndex=So(u,he(s.lastIndex),h))}for(var v,y="",b=0,m=0;m<d.length;m++){g=d[m];for(var k=String(g[0]),S=xo(Eo(fe(g.index),u.length),0),C=[],x=1;x<g.length;x++)C.push(void 0===(v=g[x])?v:String(v));var E=g.groups;if(f){var w=[k].concat(C,S,u);void 0!==E&&w.push(E);var I=String(r.apply(void 0,w))}else I=c(k,u,S,C,E,r);S>=b&&(y+=u.slice(b,S)+I,b=S+k.length)}return y+u.slice(b)}];function c(e,o,r,n,i,a){var c=r+e.length,l=n.length,s=To;return void 0!==i&&(i=_e(i),s=Io),t.call(a,s,(function(t,a){var s;switch(a.charAt(0)){case"$":return"$";case"&":return e;case"`":return o.slice(0,r);case"'":return o.slice(c);case"<":s=i[a.slice(1,-1)];break;default:var u=+a;if(0===u)return t;if(u>l){var f=wo(u/10);return 0===f?t:f<=l?void 0===n[f-1]?a.charAt(1):n[f-1]+a.charAt(1):t}s=n[u-1]}return void 0===s?"":s}))}}));var Oo=Object.is||function(e,t){return e===t?0!==e||1/e==1/t:e!=e&&t!=t};bo("search",1,(function(e,t,o){return[function(t){var o=y(this),r=null==t?void 0:t[e];return void 0!==r?r.call(t,o):new RegExp(t)[e](String(o))},function(e){var r=o(t,e,this);if(r.done)return r.value;var n=j(e),i=String(this),a=n.lastIndex;Oo(a,0)||(n.lastIndex=0);var c=Co(n,i);return Oo(n.lastIndex,a)||(n.lastIndex=a),null===c?-1:c.index}]}));var jo=Ve("match"),Ao=Ve("species"),No=[].push,Po=Math.min,Lo=4294967295,Ro=!c((function(){return!RegExp(Lo,"y")}));bo("split",2,(function(e,t,o){var r;return r="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(e,o){var r,n,i=String(y(this)),a=void 0===o?Lo:o>>>0;if(0===a)return[];if(void 0===e)return[i];if(!m(r=e)||!(void 0!==(n=r[jo])?n:"RegExp"==d(r)))return t.call(i,e,a);for(var c,l,s,u=[],f=(e.ignoreCase?"i":"")+(e.multiline?"m":"")+(e.unicode?"u":"")+(e.sticky?"y":""),p=0,h=new RegExp(e.source,f+"g");(c=io.call(h,i))&&!((l=h.lastIndex)>p&&(u.push(i.slice(p,c.index)),c.length>1&&c.index<i.length&&No.apply(u,c.slice(1)),s=c[0].length,p=l,u.length>=a));)h.lastIndex===c.index&&h.lastIndex++;return p===i.length?!s&&h.test("")||u.push(""):u.push(i.slice(p)),u.length>a?u.slice(0,a):u}:"0".split(void 0,0).length?function(e,o){return void 0===e&&0===o?[]:t.call(this,e,o)}:t,[function(t,o){var n=y(this),i=null==t?void 0:t[e];return void 0!==i?i.call(t,n,o):r.call(String(n),t,o)},function(e,n){var i=o(r,e,this,n,r!==t);if(i.done)return i.value;var a=j(e),c=String(this),l=function(e,t){var o,r=j(e).constructor;return void 0===r||null==(o=j(r)[Ao])?t:nt(o)}(a,RegExp),s=a.unicode,u=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(Ro?"y":"g"),f=new l(Ro?a:"^(?:"+a.source+")",u),p=void 0===n?Lo:n>>>0;if(0===p)return[];if(0===c.length)return null===Co(f,c)?[c]:[];for(var h=0,d=0,g=[];d<c.length;){f.lastIndex=Ro?d:0;var v,y=Co(f,Ro?c:c.slice(d));if(null===y||(v=Po(he(f.lastIndex+(Ro?0:d)),c.length))===h)d=So(c,d,s);else{if(g.push(c.slice(h,d)),g.length===p)return g;for(var b=1;b<=y.length-1;b++)if(g.push(y[b]),g.length===p)return g;d=h=v}}return g.push(c.slice(h)),g}]}),!Ro);for(var _o in{CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0}){var Do=a[_o],Mo=Do&&Do.prototype;if(Mo&&Mo.forEach!==_t)try{P(Mo,"forEach",_t)}catch(e){Mo.forEach=_t}}function Go(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function Uo(e,t){for(var o=0;o<t.length;o++){var r=t[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(e,r.key,r)}}function $o(e){return($o=Object.setPrototypeOf?Object.getPrototypeOf:function(e){return e.__proto__||Object.getPrototypeOf(e)})(e)}function Bo(e,t){return(Bo=Object.setPrototypeOf||function(e,t){return e.__proto__=t,e})(e,t)}function Vo(e,t){return!t||"object"!=typeof t&&"function"!=typeof t?function(e){if(void 0===e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return e}(e):t}function Fo(e){var t=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(e){return!1}}();return function(){var o,r=$o(e);if(t){var n=$o(this).constructor;o=Reflect.construct(r,arguments,n)}else o=r.apply(this,arguments);return Vo(this,o)}}function Jo(e,t,o){return(Jo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(e,t,o){var r=function(e,t){for(;!Object.prototype.hasOwnProperty.call(e,t)&&null!==(e=$o(e)););return e}(e,t);if(r){var n=Object.getOwnPropertyDescriptor(r,t);return n.get?n.get.call(o):n.value}})(e,t,o||e)}function zo(e,t){(null==t||t>e.length)&&(t=e.length);for(var o=0,r=new Array(t);o<t;o++)r[o]=e[o];return r}function Ho(e,t){var o;if("undefined"==typeof Symbol||null==e[Symbol.iterator]){if(Array.isArray(e)||(o=function(e,t){if(e){if("string"==typeof e)return zo(e,t);var o=Object.prototype.toString.call(e).slice(8,-1);return"Object"===o&&e.constructor&&(o=e.constructor.name),"Map"===o||"Set"===o?Array.from(e):"Arguments"===o||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(o)?zo(e,t):void 0}}(e))||t&&e&&"number"==typeof e.length){o&&(e=o);var r=0,n=function(){};return{s:n,n:function(){return r>=e.length?{done:!0}:{done:!1,value:e[r++]}},e:function(e){throw e},f:n}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var i,a=!0,c=!1;return{s:function(){o=e[Symbol.iterator]()},n:function(){var e=o.next();return a=e.done,e},e:function(e){c=!0,i=e},f:function(){try{a||null==o.return||o.return()}finally{if(c)throw i}}}}var qo=o.default.fn.bootstrapTable.utils,Ko={cookieIds:{sortOrder:"bs.table.sortOrder",sortName:"bs.table.sortName",pageNumber:"bs.table.pageNumber",pageList:"bs.table.pageList",columns:"bs.table.columns",searchText:"bs.table.searchText",reorderColumns:"bs.table.reorderColumns",filterControl:"bs.table.filterControl",filterBy:"bs.table.filterBy"},getCurrentHeader:function(e){var t=e.$header;return e.options.height&&(t=e.$tableHeader),t},getCurrentSearchControls:function(e){var t="select, input";return e.options.height&&(t="table select, table input"),t},cookieEnabled:function(){return!!navigator.cookieEnabled},inArrayCookiesEnabled:function(e,t){for(var o=-1,r=0;r<t.length;r++)if(e.toLowerCase()===t[r].toLowerCase()){o=r;break}return o},setCookie:function(e,t,o){if(e.options.cookie&&Ko.cookieEnabled()&&""!==e.options.cookieIdTable&&-1!==Ko.inArrayCookiesEnabled(t,e.options.cookiesEnabled)){switch(t="".concat(e.options.cookieIdTable,".").concat(t),e.options.cookieStorage){case"cookieStorage":document.cookie=[t,"=",encodeURIComponent(o),"; expires=".concat(Ko.calculateExpiration(e.options.cookieExpire)),e.options.cookiePath?"; path=".concat(e.options.cookiePath):"",e.options.cookieDomain?"; domain=".concat(e.options.cookieDomain):"",e.options.cookieSecure?"; secure":"",";SameSite=".concat(e.options.cookieSameSite)].join("");break;case"localStorage":localStorage.setItem(t,o);break;case"sessionStorage":sessionStorage.setItem(t,o);break;case"customStorage":if(!e.options.cookieCustomStorageSet||!e.options.cookieCustomStorageGet||!e.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");qo.calculateObjectValue(e.options,e.options.cookieCustomStorageSet,[t,o],"");break;default:return!1}return!0}},getCookie:function(e,t,o){if(!o)return null;if(-1===Ko.inArrayCookiesEnabled(o,e.options.cookiesEnabled))return null;switch(o="".concat(t,".").concat(o),e.options.cookieStorage){case"cookieStorage":var r="; ".concat(document.cookie).split("; ".concat(o,"="));return 2===r.length?decodeURIComponent(r.pop().split(";").shift()):null;case"localStorage":return localStorage.getItem(o);case"sessionStorage":return sessionStorage.getItem(o);case"customStorage":if(!e.options.cookieCustomStorageSet||!e.options.cookieCustomStorageGet||!e.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");return qo.calculateObjectValue(e.options,e.options.cookieCustomStorageGet,[o],"");default:return null}},deleteCookie:function(e,t,o){switch(o="".concat(t,".").concat(o),e.options.cookieStorage){case"cookieStorage":document.cookie=[encodeURIComponent(o),"=","; expires=Thu, 01 Jan 1970 00:00:00 GMT",e.options.cookiePath?"; path=".concat(e.options.cookiePath):"",e.options.cookieDomain?"; domain=".concat(e.options.cookieDomain):""].join("");break;case"localStorage":localStorage.removeItem(o);break;case"sessionStorage":sessionStorage.removeItem(o);break;case"customStorage":if(!e.options.cookieCustomStorageSet||!e.options.cookieCustomStorageGet||!e.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");qo.calculateObjectValue(e.options,e.options.cookieCustomStorageDelete,[o],"");break;default:return!1}return!0},calculateExpiration:function(e){var t=e.replace(/[0-9]*/,"");switch(e=e.replace(/[A-Za-z]{1,2}/,""),t.toLowerCase()){case"s":e=+e;break;case"mi":e*=60;break;case"h":e=60*e*60;break;case"d":e=24*e*60*60;break;case"m":e=30*e*24*60*60;break;case"y":e=365*e*24*60*60;break;default:e=void 0}if(!e)return"";var o=new Date;return o.setTime(o.getTime()+1e3*e),o.toGMTString()},initCookieFilters:function(e){setTimeout((function(){var t=JSON.parse(Ko.getCookie(e,e.options.cookieIdTable,Ko.cookieIds.filterControl));if(!e.options.filterControlValuesLoaded&&t){var r={},n=Ko.getCurrentHeader(e),i=Ko.getCurrentSearchControls(e),a=n;e.options.filterControlContainer&&(a=o.default("".concat(e.options.filterControlContainer))),a.find(i).each((function(){var n=o.default(this).closest("[data-field]").data("field");!function(t,o){o.forEach((function(o){if(""!==o.text&&("radio"!==t.type||t.value.toString()===o.text.toString()))if("INPUT"===t.tagName&&"radio"===t.type&&t.value.toString()===o.text.toString())t.checked=!0,r[o.field]=o.text;else if("INPUT"===t.tagName)t.value=o.text,r[o.field]=o.text;else if("SELECT"===t.tagName&&e.options.filterControlContainer)t.value=o.text,r[o.field]=o.text;else if(""!==o.text&&"SELECT"===t.tagName){for(var n=0;n<t.length;n++){var i=t[n];if(i.value===o.text)return void(i.selected=!0)}var a=document.createElement("option");a.value=o.text,a.text=o.text,t.add(a,t[1]),t.selectedIndex=1,r[o.field]=o.text}}))}(this,t.filter((function(e){return e.field===n})))})),e.initColumnSearch(r),e.options.filterControlValuesLoaded=!0,e.initServer()}}),250)}};o.default.extend(o.default.fn.bootstrapTable.defaults,{cookie:!1,cookieExpire:"2h",cookiePath:null,cookieDomain:null,cookieSecure:null,cookieSameSite:"Lax",cookieIdTable:"",cookiesEnabled:["bs.table.sortOrder","bs.table.sortName","bs.table.pageNumber","bs.table.pageList","bs.table.columns","bs.table.searchText","bs.table.filterControl","bs.table.filterBy","bs.table.reorderColumns"],cookieStorage:"cookieStorage",cookieCustomStorageGet:null,cookieCustomStorageSet:null,cookieCustomStorageDelete:null,filterControls:[],filterControlValuesLoaded:!1}),o.default.fn.bootstrapTable.methods.push("getCookies"),o.default.fn.bootstrapTable.methods.push("deleteCookie"),o.default.extend(o.default.fn.bootstrapTable.utils,{setCookie:Ko.setCookie,getCookie:Ko.getCookie}),o.default.BootstrapTable=function(e){!function(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function");e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,writable:!0,configurable:!0}}),t&&Bo(e,t)}(a,e);var t,r,n,i=Fo(a);function a(){return Go(this,a),i.apply(this,arguments)}return t=a,(r=[{key:"init",value:function(){if(this.options.cookie){var e=Ko.getCookie(this,this.options.cookieIdTable,Ko.cookieIds.filterBy);if("boolean"==typeof e&&!e)throw new Error("The cookie value of filterBy must be a json!");var t={};try{t=JSON.parse(e)}catch(e){throw new Error("Could not parse the json of the filterBy cookie!")}if(this.filterColumns=t||{},this.options.filterControls=[],this.options.filterControlValuesLoaded=!1,this.options.cookiesEnabled="string"==typeof this.options.cookiesEnabled?this.options.cookiesEnabled.replace("[","").replace("]","").replace(/'/g,"").replace(/ /g,"").toLowerCase().split(","):this.options.cookiesEnabled,this.options.filterControl){var o=this;this.$el.on("column-search.bs.table",(function(e,t,r){for(var n=!0,i=0;i<o.options.filterControls.length;i++)if(o.options.filterControls[i].field===t){o.options.filterControls[i].text=r,n=!1;break}n&&o.options.filterControls.push({field:t,text:r}),Ko.setCookie(o,Ko.cookieIds.filterControl,JSON.stringify(o.options.filterControls))})).on("created-controls.bs.table",Ko.initCookieFilters(o))}}Jo($o(a.prototype),"init",this).call(this)}},{key:"initServer",value:function(){var e;if(this.options.cookie&&this.options.filterControl&&!this.options.filterControlValuesLoaded){var t=JSON.parse(Ko.getCookie(this,this.options.cookieIdTable,Ko.cookieIds.filterControl));if(t)return}for(var o=arguments.length,r=new Array(o),n=0;n<o;n++)r[n]=arguments[n];(e=Jo($o(a.prototype),"initServer",this)).call.apply(e,[this].concat(r))}},{key:"initTable",value:function(){for(var e,t=arguments.length,o=new Array(t),r=0;r<t;r++)o[r]=arguments[r];(e=Jo($o(a.prototype),"initTable",this)).call.apply(e,[this].concat(o)),this.initCookie()}},{key:"onSort",value:function(){for(var e,t=arguments.length,o=new Array(t),r=0;r<t;r++)o[r]=arguments[r];(e=Jo($o(a.prototype),"onSort",this)).call.apply(e,[this].concat(o)),Ko.setCookie(this,Ko.cookieIds.sortOrder,this.options.sortOrder),Ko.setCookie(this,Ko.cookieIds.sortName,this.options.sortName)}},{key:"onPageNumber",value:function(){for(var e,t=arguments.length,o=new Array(t),r=0;r<t;r++)o[r]=arguments[r];(e=Jo($o(a.prototype),"onPageNumber",this)).call.apply(e,[this].concat(o)),Ko.setCookie(this,Ko.cookieIds.pageNumber,this.options.pageNumber)}},{key:"onPageListChange",value:function(){for(var e,t=arguments.length,o=new Array(t),r=0;r<t;r++)o[r]=arguments[r];(e=Jo($o(a.prototype),"onPageListChange",this)).call.apply(e,[this].concat(o)),Ko.setCookie(this,Ko.cookieIds.pageList,this.options.pageSize),Ko.setCookie(this,Ko.cookieIds.pageNumber,this.options.pageNumber)}},{key:"onPagePre",value:function(){for(var e,t=arguments.length,o=new Array(t),r=0;r<t;r++)o[r]=arguments[r];(e=Jo($o(a.prototype),"onPagePre",this)).call.apply(e,[this].concat(o)),Ko.setCookie(this,Ko.cookieIds.pageNumber,this.options.pageNumber)}},{key:"onPageNext",value:function(){for(var e,t=arguments.length,o=new Array(t),r=0;r<t;r++)o[r]=arguments[r];(e=Jo($o(a.prototype),"onPageNext",this)).call.apply(e,[this].concat(o)),Ko.setCookie(this,Ko.cookieIds.pageNumber,this.options.pageNumber)}},{key:"_toggleColumn",value:function(){for(var e,t=arguments.length,o=new Array(t),r=0;r<t;r++)o[r]=arguments[r];(e=Jo($o(a.prototype),"_toggleColumn",this)).call.apply(e,[this].concat(o)),Ko.setCookie(this,Ko.cookieIds.columns,JSON.stringify(this.getVisibleColumns().map((function(e){return e.field}))))}},{key:"_toggleAllColumns",value:function(){for(var e,t=arguments.length,o=new Array(t),r=0;r<t;r++)o[r]=arguments[r];(e=Jo($o(a.prototype),"_toggleAllColumns",this)).call.apply(e,[this].concat(o)),Ko.setCookie(this,Ko.cookieIds.columns,JSON.stringify(this.getVisibleColumns().map((function(e){return e.field}))))}},{key:"selectPage",value:function(e){Jo($o(a.prototype),"selectPage",this).call(this,e),Ko.setCookie(this,Ko.cookieIds.pageNumber,e)}},{key:"onSearch",value:function(e){Jo($o(a.prototype),"onSearch",this).call(this,e),this.options.search&&Ko.setCookie(this,Ko.cookieIds.searchText,this.searchText),Ko.setCookie(this,Ko.cookieIds.pageNumber,this.options.pageNumber)}},{key:"initHeader",value:function(){var e;this.options.reorderableColumns&&(this.columnsSortOrder=JSON.parse(Ko.getCookie(this,this.options.cookieIdTable,Ko.cookieIds.reorderColumns)));for(var t=arguments.length,o=new Array(t),r=0;r<t;r++)o[r]=arguments[r];(e=Jo($o(a.prototype),"initHeader",this)).call.apply(e,[this].concat(o))}},{key:"persistReorderColumnsState",value:function(e){Ko.setCookie(e,Ko.cookieIds.reorderColumns,JSON.stringify(e.columnsSortOrder))}},{key:"filterBy",value:function(){for(var e,t=arguments.length,o=new Array(t),r=0;r<t;r++)o[r]=arguments[r];(e=Jo($o(a.prototype),"filterBy",this)).call.apply(e,[this].concat(o)),Ko.setCookie(this,Ko.cookieIds.filterBy,JSON.stringify(this.filterColumns))}},{key:"initCookie",value:function(){var e=this;if(this.options.cookie){if(""===this.options.cookieIdTable||""===this.options.cookieExpire||!Ko.cookieEnabled())return console.error("Configuration error. Please review the cookieIdTable and the cookieExpire property. If the properties are correct, then this browser does not support cookies."),void(this.options.cookie=!1);var t=Ko.getCookie(this,this.options.cookieIdTable,Ko.cookieIds.sortOrder),o=Ko.getCookie(this,this.options.cookieIdTable,Ko.cookieIds.sortName),r=Ko.getCookie(this,this.options.cookieIdTable,Ko.cookieIds.pageNumber),n=Ko.getCookie(this,this.options.cookieIdTable,Ko.cookieIds.pageList),i=Ko.getCookie(this,this.options.cookieIdTable,Ko.cookieIds.searchText),a=Ko.getCookie(this,this.options.cookieIdTable,Ko.cookieIds.columns);if("boolean"==typeof a&&!a)throw new Error("The cookie value of filterBy must be a json!");var c={};try{c=JSON.parse(a)}catch(e){throw new Error("Could not parse the json of the columns cookie!",a)}if(this.options.sortOrder=t||this.options.sortOrder,this.options.sortName=o||this.options.sortName,this.options.pageNumber=r?+r:this.options.pageNumber,this.options.pageSize=n?n===this.options.formatAllRows()?n:+n:this.options.pageSize,this.options.searchText=i||"",c){var l,s=Ho(this.columns);try{var u=function(){var t=l.value;t.visible=c.filter((function(o){return!!e.isSelectionColumn(t)||(o instanceof Object?o.field===t.field:o===t.field)})).length>0||!t.switchable};for(s.s();!(l=s.n()).done;)u()}catch(e){s.e(e)}finally{s.f()}}}}},{key:"getCookies",value:function(){var e=this,t={};return o.default.each(Ko.cookieIds,(function(o,r){t[o]=Ko.getCookie(e,e.options.cookieIdTable,r),"columns"===o&&(t[o]=JSON.parse(t[o]))})),t}},{key:"deleteCookie",value:function(e){""!==e&&Ko.cookieEnabled()&&Ko.deleteCookie(this,this.options.cookieIdTable,Ko.cookieIds[e])}}])&&Uo(t.prototype,r),n&&Uo(t,n),a}(o.default.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-export.min.js b/web/skins/classic/js/bootstrap-table-export.min.js
index 44d05ba4c..a38e7176f 100644
--- a/web/skins/classic/js/bootstrap-table-export.min.js
+++ b/web/skins/classic/js/bootstrap-table-export.min.js
@@ -1,10 +1,10 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.17.1
+  * @version v1.18.1
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
   */
 
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function n(t,e){return t(e={exports:{}},e.exports),e.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof e&&e)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},a=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,u=Object.getOwnPropertyDescriptor,l={f:u&&!c.call({1:2},1)?function(t){var e=u(this,t);return!!e&&e.enumerable}:c},s=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},f={}.toString,p=function(t){return f.call(t).slice(8,-1)},d="".split,h=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?d.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},y=function(t){return h(g(t))},v=function(t){return"object"==typeof t?null!==t:"function"==typeof t},b=function(t,e){if(!v(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!v(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!v(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!v(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},x={}.hasOwnProperty,m=function(t,e){return x.call(t,e)},S=o.document,w=v(S)&&v(S.createElement),O=function(t){return w?S.createElement(t):{}},E=!a&&!i((function(){return 7!=Object.defineProperty(O("div"),"a",{get:function(){return 7}}).a})),T=Object.getOwnPropertyDescriptor,j={f:a?T:function(t,e){if(t=y(t),e=b(e,!0),E)try{return T(t,e)}catch(t){}if(m(t,e))return s(!l.f.call(t,e),t[e])}},P=function(t){if(!v(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,I={f:a?A:function(t,e,n){if(P(t),e=b(e,!0),P(n),E)try{return A(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},_=a?function(t,e,n){return I.f(t,e,s(1,n))}:function(t,e,n){return t[e]=n,t},R=function(t,e){try{_(o,t,e)}catch(n){o[t]=e}return e},C=o["__core-js_shared__"]||R("__core-js_shared__",{}),L=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return L.call(t)});var k,M,$,D=C.inspectSource,N=o.WeakMap,F="function"==typeof N&&/native code/.test(D(N)),B=n((function(t){(t.exports=function(t,e){return C[t]||(C[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,V=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+V).toString(36)},q=B("keys"),z=function(t){return q[t]||(q[t]=H(t))},U={},W=o.WeakMap;if(F){var K=new W,Y=K.get,X=K.has,J=K.set;k=function(t,e){return J.call(K,t,e),e},M=function(t){return Y.call(K,t)||{}},$=function(t){return X.call(K,t)}}else{var Q=z("state");U[Q]=!0,k=function(t,e){return _(t,Q,e),e},M=function(t){return m(t,Q)?t[Q]:{}},$=function(t){return m(t,Q)}}var Z,tt={set:k,get:M,has:$,enforce:function(t){return $(t)?M(t):k(t,{})},getterFor:function(t){return function(e){var n;if(!v(e)||(n=M(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},et=n((function(t){var e=tt.get,n=tt.enforce,r=String(String).split("String");(t.exports=function(t,e,i,a){var c=!!a&&!!a.unsafe,u=!!a&&!!a.enumerable,l=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof e||m(i,"name")||_(i,"name",e),n(i).source=r.join("string"==typeof e?e:"")),t!==o?(c?!l&&t[e]&&(u=!0):delete t[e],u?t[e]=i:_(t,e,i)):u?t[e]=i:R(e,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||D(this)}))})),nt=o,rt=function(t){return"function"==typeof t?t:void 0},ot=function(t,e){return arguments.length<2?rt(nt[t])||rt(o[t]):nt[t]&&nt[t][e]||o[t]&&o[t][e]},it=Math.ceil,at=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?at:it)(t)},ut=Math.min,lt=function(t){return t>0?ut(ct(t),9007199254740991):0},st=Math.max,ft=Math.min,pt=function(t,e){var n=ct(t);return n<0?st(n+e,0):ft(n,e)},dt=function(t){return function(e,n,r){var o,i=y(e),a=lt(i.length),c=pt(r,a);if(t&&n!=n){for(;a>c;)if((o=i[c++])!=o)return!0}else for(;a>c;c++)if((t||c in i)&&i[c]===n)return t||c||0;return!t&&-1}},ht={includes:dt(!0),indexOf:dt(!1)}.indexOf,gt=function(t,e){var n,r=y(t),o=0,i=[];for(n in r)!m(U,n)&&m(r,n)&&i.push(n);for(;e.length>o;)m(r,n=e[o++])&&(~ht(i,n)||i.push(n));return i},yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],vt=yt.concat("length","prototype"),bt={f:Object.getOwnPropertyNames||function(t){return gt(t,vt)}},xt={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var e=bt.f(P(t)),n=xt.f;return n?e.concat(n(t)):e},St=function(t,e){for(var n=mt(e),r=I.f,o=j.f,i=0;i<n.length;i++){var a=n[i];m(t,a)||r(t,a,o(e,a))}},wt=/#|\.prototype\./,Ot=function(t,e){var n=Tt[Et(t)];return n==Pt||n!=jt&&("function"==typeof e?i(e):!!e)},Et=Ot.normalize=function(t){return String(t).replace(wt,".").toLowerCase()},Tt=Ot.data={},jt=Ot.NATIVE="N",Pt=Ot.POLYFILL="P",At=Ot,It=j.f,_t=function(t,e){var n,r,i,a,c,u=t.target,l=t.global,s=t.stat;if(n=l?o:s?o[u]||R(u,{}):(o[u]||{}).prototype)for(r in e){if(a=e[r],i=t.noTargetGet?(c=It(n,r))&&c.value:n[r],!At(l?r:u+(s?".":"#")+r,t.forced)&&void 0!==i){if(typeof a==typeof i)continue;St(a,i)}(t.sham||i&&i.sham)&&_(a,"sham",!0),et(n,r,a,t)}},Rt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),Lt=Array.isArray||function(t){return"Array"==p(t)},kt=function(t){return Object(g(t))},Mt=Object.keys||function(t){return gt(t,yt)},$t=a?Object.defineProperties:function(t,e){P(t);for(var n,r=Mt(e),o=r.length,i=0;o>i;)I.f(t,n=r[i++],e[n]);return t},Dt=ot("document","documentElement"),Nt=z("IE_PROTO"),Ft=function(){},Bt=function(t){return"<script>"+t+"<\/script>"},Gt=function(){try{Z=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Gt=Z?function(t){t.write(Bt("")),t.close();var e=t.parentWindow.Object;return t=null,e}(Z):((e=O("iframe")).style.display="none",Dt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Bt("document.F=Object")),t.close(),t.F);for(var n=yt.length;n--;)delete Gt.prototype[yt[n]];return Gt()};U[Nt]=!0;var Vt=Object.create||function(t,e){var n;return null!==t?(Ft.prototype=P(t),n=new Ft,Ft.prototype=null,n[Nt]=t):n=Gt(),void 0===e?n:$t(n,e)},Ht=bt.f,qt={}.toString,zt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Ut={f:function(t){return zt&&"[object Window]"==qt.call(t)?function(t){try{return Ht(t)}catch(t){return zt.slice()}}(t):Ht(y(t))}},Wt=B("wks"),Kt=o.Symbol,Yt=Ct?Kt:H,Xt=function(t){return m(Wt,t)||(Rt&&m(Kt,t)?Wt[t]=Kt[t]:Wt[t]=Yt("Symbol."+t)),Wt[t]},Jt={f:Xt},Qt=I.f,Zt=function(t){var e=nt.Symbol||(nt.Symbol={});m(e,t)||Qt(e,t,{value:Jt.f(t)})},te=I.f,ee=Xt("toStringTag"),ne=function(t,e,n){t&&!m(t=n?t:t.prototype,ee)&&te(t,ee,{configurable:!0,value:e})},re=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},oe=Xt("species"),ie=function(t,e){var n;return Lt(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!Lt(n.prototype)?v(n)&&null===(n=n[oe])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)},ae=[].push,ce=function(t){var e=1==t,n=2==t,r=3==t,o=4==t,i=6==t,a=5==t||i;return function(c,u,l,s){for(var f,p,d=kt(c),g=h(d),y=function(t,e,n){if(re(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}}(u,l,3),v=lt(g.length),b=0,x=s||ie,m=e?x(c,v):n?x(c,0):void 0;v>b;b++)if((a||b in g)&&(p=y(f=g[b],b,d),t))if(e)m[b]=p;else if(p)switch(t){case 3:return!0;case 5:return f;case 6:return b;case 2:ae.call(m,f)}else if(o)return!1;return i?-1:r||o?o:m}},ue={forEach:ce(0),map:ce(1),filter:ce(2),some:ce(3),every:ce(4),find:ce(5),findIndex:ce(6)},le=ue.forEach,se=z("hidden"),fe=Xt("toPrimitive"),pe=tt.set,de=tt.getterFor("Symbol"),he=Object.prototype,ge=o.Symbol,ye=ot("JSON","stringify"),ve=j.f,be=I.f,xe=Ut.f,me=l.f,Se=B("symbols"),we=B("op-symbols"),Oe=B("string-to-symbol-registry"),Ee=B("symbol-to-string-registry"),Te=B("wks"),je=o.QObject,Pe=!je||!je.prototype||!je.prototype.findChild,Ae=a&&i((function(){return 7!=Vt(be({},"a",{get:function(){return be(this,"a",{value:7}).a}})).a}))?function(t,e,n){var r=ve(he,e);r&&delete he[e],be(t,e,n),r&&t!==he&&be(he,e,r)}:be,Ie=function(t,e){var n=Se[t]=Vt(ge.prototype);return pe(n,{type:"Symbol",tag:t,description:e}),a||(n.description=e),n},_e=Rt&&"symbol"==typeof ge.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ge},Re=function(t,e,n){t===he&&Re(we,e,n),P(t);var r=b(e,!0);return P(n),m(Se,r)?(n.enumerable?(m(t,se)&&t[se][r]&&(t[se][r]=!1),n=Vt(n,{enumerable:s(0,!1)})):(m(t,se)||be(t,se,s(1,{})),t[se][r]=!0),Ae(t,r,n)):be(t,r,n)},Ce=function(t,e){P(t);var n=y(e),r=Mt(n).concat($e(n));return le(r,(function(e){a&&!Le.call(n,e)||Re(t,e,n[e])})),t},Le=function(t){var e=b(t,!0),n=me.call(this,e);return!(this===he&&m(Se,e)&&!m(we,e))&&(!(n||!m(this,e)||!m(Se,e)||m(this,se)&&this[se][e])||n)},ke=function(t,e){var n=y(t),r=b(e,!0);if(n!==he||!m(Se,r)||m(we,r)){var o=ve(n,r);return!o||!m(Se,r)||m(n,se)&&n[se][r]||(o.enumerable=!0),o}},Me=function(t){var e=xe(y(t)),n=[];return le(e,(function(t){m(Se,t)||m(U,t)||n.push(t)})),n},$e=function(t){var e=t===he,n=xe(e?we:y(t)),r=[];return le(n,(function(t){!m(Se,t)||e&&!m(he,t)||r.push(Se[t])})),r};if(Rt||(et((ge=function(){if(this instanceof ge)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=H(t),n=function(t){this===he&&n.call(we,t),m(this,se)&&m(this[se],e)&&(this[se][e]=!1),Ae(this,e,s(1,t))};return a&&Pe&&Ae(he,e,{configurable:!0,set:n}),Ie(e,t)}).prototype,"toString",(function(){return de(this).tag})),l.f=Le,I.f=Re,j.f=ke,bt.f=Ut.f=Me,xt.f=$e,a&&(be(ge.prototype,"description",{configurable:!0,get:function(){return de(this).description}}),et(he,"propertyIsEnumerable",Le,{unsafe:!0}))),Ct||(Jt.f=function(t){return Ie(Xt(t),t)}),_t({global:!0,wrap:!0,forced:!Rt,sham:!Rt},{Symbol:ge}),le(Mt(Te),(function(t){Zt(t)})),_t({target:"Symbol",stat:!0,forced:!Rt},{for:function(t){var e=String(t);if(m(Oe,e))return Oe[e];var n=ge(e);return Oe[e]=n,Ee[n]=e,n},keyFor:function(t){if(!_e(t))throw TypeError(t+" is not a symbol");if(m(Ee,t))return Ee[t]},useSetter:function(){Pe=!0},useSimple:function(){Pe=!1}}),_t({target:"Object",stat:!0,forced:!Rt,sham:!a},{create:function(t,e){return void 0===e?Vt(t):Ce(Vt(t),e)},defineProperty:Re,defineProperties:Ce,getOwnPropertyDescriptor:ke}),_t({target:"Object",stat:!0,forced:!Rt},{getOwnPropertyNames:Me,getOwnPropertySymbols:$e}),_t({target:"Object",stat:!0,forced:i((function(){xt.f(1)}))},{getOwnPropertySymbols:function(t){return xt.f(kt(t))}}),ye){var De=!Rt||i((function(){var t=ge();return"[null]"!=ye([t])||"{}"!=ye({a:t})||"{}"!=ye(Object(t))}));_t({target:"JSON",stat:!0,forced:De},{stringify:function(t,e,n){for(var r,o=[t],i=1;arguments.length>i;)o.push(arguments[i++]);if(r=e,(v(e)||void 0!==t)&&!_e(t))return Lt(e)||(e=function(t,e){if("function"==typeof r&&(e=r.call(this,t,e)),!_e(e))return e}),o[1]=e,ye.apply(null,o)}})}ge.prototype[fe]||_(ge.prototype,fe,ge.prototype.valueOf),ne(ge,"Symbol"),U[se]=!0;var Ne=I.f,Fe=o.Symbol;if(a&&"function"==typeof Fe&&(!("description"in Fe.prototype)||void 0!==Fe().description)){var Be={},Ge=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof Ge?new Fe(t):void 0===t?Fe():Fe(t);return""===t&&(Be[e]=!0),e};St(Ge,Fe);var Ve=Ge.prototype=Fe.prototype;Ve.constructor=Ge;var He=Ve.toString,qe="Symbol(test)"==String(Fe("test")),ze=/^Symbol\((.*)\)[^)]+$/;Ne(Ve,"description",{configurable:!0,get:function(){var t=v(this)?this.valueOf():this,e=He.call(t);if(m(Be,t))return"";var n=qe?e.slice(7,-1):e.replace(ze,"$1");return""===n?void 0:n}}),_t({global:!0,forced:!0},{Symbol:Ge})}Zt("iterator");var Ue,We,Ke=function(t,e,n){var r=b(e);r in t?I.f(t,r,s(0,n)):t[r]=n},Ye=ot("navigator","userAgent")||"",Xe=o.process,Je=Xe&&Xe.versions,Qe=Je&&Je.v8;Qe?We=(Ue=Qe.split("."))[0]+Ue[1]:Ye&&(!(Ue=Ye.match(/Edge\/(\d+)/))||Ue[1]>=74)&&(Ue=Ye.match(/Chrome\/(\d+)/))&&(We=Ue[1]);var Ze=We&&+We,tn=Xt("species"),en=function(t){return Ze>=51||!i((function(){var e=[];return(e.constructor={})[tn]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},nn=Xt("isConcatSpreadable"),rn=Ze>=51||!i((function(){var t=[];return t[nn]=!1,t.concat()[0]!==t})),on=en("concat"),an=function(t){if(!v(t))return!1;var e=t[nn];return void 0!==e?!!e:Lt(t)};_t({target:"Array",proto:!0,forced:!rn||!on},{concat:function(t){var e,n,r,o,i,a=kt(this),c=ie(a,0),u=0;for(e=-1,r=arguments.length;e<r;e++)if(an(i=-1===e?a:arguments[e])){if(u+(o=lt(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(n=0;n<o;n++,u++)n in i&&Ke(c,u,i[n])}else{if(u>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Ke(c,u++,i)}return c.length=u,c}});var cn=Xt("unscopables"),un=Array.prototype;null==un[cn]&&I.f(un,cn,{configurable:!0,value:Vt(null)});var ln=function(t){un[cn][t]=!0},sn=ue.find,fn=!0;"find"in[]&&Array(1).find((function(){fn=!1})),_t({target:"Array",proto:!0,forced:fn},{find:function(t){return sn(this,t,arguments.length>1?arguments[1]:void 0)}}),ln("find");var pn,dn,hn,gn=!i((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),yn=z("IE_PROTO"),vn=Object.prototype,bn=gn?Object.getPrototypeOf:function(t){return t=kt(t),m(t,yn)?t[yn]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?vn:null},xn=Xt("iterator"),mn=!1;[].keys&&("next"in(hn=[].keys())?(dn=bn(bn(hn)))!==Object.prototype&&(pn=dn):mn=!0),null==pn&&(pn={}),m(pn,xn)||_(pn,xn,(function(){return this}));var Sn={IteratorPrototype:pn,BUGGY_SAFARI_ITERATORS:mn},wn=Sn.IteratorPrototype,On=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,n={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(n,[]),e=n instanceof Array}catch(t){}return function(n,r){return P(n),function(t){if(!v(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(r),e?t.call(n,r):n.__proto__=r,n}}():void 0),En=Sn.IteratorPrototype,Tn=Sn.BUGGY_SAFARI_ITERATORS,jn=Xt("iterator"),Pn=function(){return this},An=function(t,e,n,r,o,i,a){!function(t,e,n){var r=e+" Iterator";t.prototype=Vt(wn,{next:s(1,n)}),ne(t,r,!1)}(n,e,r);var c,u,l,f=function(t){if(t===o&&y)return y;if(!Tn&&t in h)return h[t];switch(t){case"keys":case"values":case"entries":return function(){return new n(this,t)}}return function(){return new n(this)}},p=e+" Iterator",d=!1,h=t.prototype,g=h[jn]||h["@@iterator"]||o&&h[o],y=!Tn&&g||f(o),v="Array"==e&&h.entries||g;if(v&&(c=bn(v.call(new t)),En!==Object.prototype&&c.next&&(bn(c)!==En&&(On?On(c,En):"function"!=typeof c[jn]&&_(c,jn,Pn)),ne(c,p,!0))),"values"==o&&g&&"values"!==g.name&&(d=!0,y=function(){return g.call(this)}),h[jn]!==y&&_(h,jn,y),o)if(u={values:f("values"),keys:i?y:f("keys"),entries:f("entries")},a)for(l in u)(Tn||d||!(l in h))&&et(h,l,u[l]);else _t({target:e,proto:!0,forced:Tn||d},u);return u},In=tt.set,_n=tt.getterFor("Array Iterator"),Rn=An(Array,"Array",(function(t,e){In(this,{type:"Array Iterator",target:y(t),index:0,kind:e})}),(function(){var t=_n(this),e=t.target,n=t.kind,r=t.index++;return!e||r>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==n?{value:r,done:!1}:"values"==n?{value:e[r],done:!1}:{value:[r,e[r]],done:!1}}),"values");ln("keys"),ln("values"),ln("entries");var Cn=function(t,e){var n=[][t];return!n||!i((function(){n.call(null,e||function(){throw 1},1)}))},Ln=[].join,kn=h!=Object,Mn=Cn("join",",");_t({target:"Array",proto:!0,forced:kn||Mn},{join:function(t){return Ln.call(y(this),void 0===t?",":t)}});var $n=ue.map,Dn=en("map"),Nn=Dn&&!i((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));_t({target:"Array",proto:!0,forced:!Dn||!Nn},{map:function(t){return $n(this,t,arguments.length>1?arguments[1]:void 0)}});var Fn=Xt("species"),Bn=[].slice,Gn=Math.max;_t({target:"Array",proto:!0,forced:!en("slice")},{slice:function(t,e){var n,r,o,i=y(this),a=lt(i.length),c=pt(t,a),u=pt(void 0===e?a:e,a);if(Lt(i)&&("function"!=typeof(n=i.constructor)||n!==Array&&!Lt(n.prototype)?v(n)&&null===(n=n[Fn])&&(n=void 0):n=void 0,n===Array||void 0===n))return Bn.call(i,c,u);for(r=new(void 0===n?Array:n)(Gn(u-c,0)),o=0;c<u;c++,o++)c in i&&Ke(r,o,i[c]);return r.length=o,r}});var Vn={};Vn[Xt("toStringTag")]="z";var Hn="[object z]"===String(Vn),qn=Xt("toStringTag"),zn="Arguments"==p(function(){return arguments}()),Un=Hn?p:function(t){var e,n,r;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),qn))?n:zn?p(e):"Object"==(r=p(e))&&"function"==typeof e.callee?"Arguments":r},Wn=Hn?{}.toString:function(){return"[object "+Un(this)+"]"};Hn||et(Object.prototype,"toString",Wn,{unsafe:!0});var Kn=function(){var t=P(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function Yn(t,e){return RegExp(t,e)}var Xn,Jn,Qn={UNSUPPORTED_Y:i((function(){var t=Yn("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:i((function(){var t=Yn("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},Zn=RegExp.prototype.exec,tr=String.prototype.replace,er=Zn,nr=(Xn=/a/,Jn=/b*/g,Zn.call(Xn,"a"),Zn.call(Jn,"a"),0!==Xn.lastIndex||0!==Jn.lastIndex),rr=Qn.UNSUPPORTED_Y||Qn.BROKEN_CARET,or=void 0!==/()??/.exec("")[1];(nr||or||rr)&&(er=function(t){var e,n,r,o,i=this,a=rr&&i.sticky,c=Kn.call(i),u=i.source,l=0,s=t;return a&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),s=String(t).slice(i.lastIndex),i.lastIndex>0&&(!i.multiline||i.multiline&&"\n"!==t[i.lastIndex-1])&&(u="(?: "+u+")",s=" "+s,l++),n=new RegExp("^(?:"+u+")",c)),or&&(n=new RegExp("^"+u+"$(?!\\s)",c)),nr&&(e=i.lastIndex),r=Zn.call(a?n:i,s),a?r?(r.input=r.input.slice(l),r[0]=r[0].slice(l),r.index=i.lastIndex,i.lastIndex+=r[0].length):i.lastIndex=0:nr&&r&&(i.lastIndex=i.global?r.index+r[0].length:e),or&&r&&r.length>1&&tr.call(r[0],n,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(r[o]=void 0)})),r});var ir=er;_t({target:"RegExp",proto:!0,forced:/./.exec!==ir},{exec:ir});var ar=function(t){return function(e,n){var r,o,i=String(g(e)),a=ct(n),c=i.length;return a<0||a>=c?t?"":void 0:(r=i.charCodeAt(a))<55296||r>56319||a+1===c||(o=i.charCodeAt(a+1))<56320||o>57343?t?i.charAt(a):r:t?i.slice(a,a+2):o-56320+(r-55296<<10)+65536}},cr={codeAt:ar(!1),charAt:ar(!0)},ur=cr.charAt,lr=tt.set,sr=tt.getterFor("String Iterator");An(String,"String",(function(t){lr(this,{type:"String Iterator",string:String(t),index:0})}),(function(){var t,e=sr(this),n=e.string,r=e.index;return r>=n.length?{value:void 0,done:!0}:(t=ur(n,r),e.index+=t.length,{value:t,done:!1})}));var fr=Xt("species"),pr=!i((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),dr="$0"==="a".replace(/./,"$0"),hr=!i((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var n="ab".split(t);return 2!==n.length||"a"!==n[0]||"b"!==n[1]})),gr=function(t,e,n,r){var o=Xt(t),a=!i((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),c=a&&!i((function(){var e=!1,n=/a/;return"split"===t&&((n={}).constructor={},n.constructor[fr]=function(){return n},n.flags="",n[o]=/./[o]),n.exec=function(){return e=!0,null},n[o](""),!e}));if(!a||!c||"replace"===t&&(!pr||!dr)||"split"===t&&!hr){var u=/./[o],l=n(o,""[t],(function(t,e,n,r,o){return e.exec===ir?a&&!o?{done:!0,value:u.call(e,n,r)}:{done:!0,value:t.call(n,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:dr}),s=l[0],f=l[1];et(String.prototype,t,s),et(RegExp.prototype,o,2==e?function(t,e){return f.call(t,this,e)}:function(t){return f.call(t,this)})}r&&_(RegExp.prototype[o],"sham",!0)},yr=cr.charAt,vr=function(t,e,n){return e+(n?yr(t,e).length:1)},br=function(t,e){var n=t.exec;if("function"==typeof n){var r=n.call(t,e);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==p(t))throw TypeError("RegExp#exec called on incompatible receiver");return ir.call(t,e)},xr=Math.max,mr=Math.min,Sr=Math.floor,wr=/\$([$&'`]|\d\d?|<[^>]*>)/g,Or=/\$([$&'`]|\d\d?)/g;gr("replace",2,(function(t,e,n,r){return[function(n,r){var o=g(this),i=null==n?void 0:n[t];return void 0!==i?i.call(n,o,r):e.call(String(o),n,r)},function(t,i){if(r.REPLACE_KEEPS_$0||"string"==typeof i&&-1===i.indexOf("$0")){var a=n(e,t,this,i);if(a.done)return a.value}var c=P(t),u=String(this),l="function"==typeof i;l||(i=String(i));var s=c.global;if(s){var f=c.unicode;c.lastIndex=0}for(var p=[];;){var d=br(c,u);if(null===d)break;if(p.push(d),!s)break;""===String(d[0])&&(c.lastIndex=vr(u,lt(c.lastIndex),f))}for(var h,g="",y=0,v=0;v<p.length;v++){d=p[v];for(var b=String(d[0]),x=xr(mr(ct(d.index),u.length),0),m=[],S=1;S<d.length;S++)m.push(void 0===(h=d[S])?h:String(h));var w=d.groups;if(l){var O=[b].concat(m,x,u);void 0!==w&&O.push(w);var E=String(i.apply(void 0,O))}else E=o(b,u,x,m,w,i);x>=y&&(g+=u.slice(y,x)+E,y=x+b.length)}return g+u.slice(y)}];function o(t,n,r,o,i,a){var c=r+t.length,u=o.length,l=Or;return void 0!==i&&(i=kt(i),l=wr),e.call(a,l,(function(e,a){var l;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return n.slice(0,r);case"'":return n.slice(c);case"<":l=i[a.slice(1,-1)];break;default:var s=+a;if(0===s)return e;if(s>u){var f=Sr(s/10);return 0===f?e:f<=u?void 0===o[f-1]?a.charAt(1):o[f-1]+a.charAt(1):e}l=o[s-1]}return void 0===l?"":l}))}}));var Er=Xt("match"),Tr=Xt("species"),jr=[].push,Pr=Math.min,Ar=!i((function(){return!RegExp(4294967295,"y")}));gr("split",2,(function(t,e,n){var r;return r="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,n){var r,o,i=String(g(this)),a=void 0===n?4294967295:n>>>0;if(0===a)return[];if(void 0===t)return[i];if(!v(r=t)||!(void 0!==(o=r[Er])?o:"RegExp"==p(r)))return e.call(i,t,a);for(var c,u,l,s=[],f=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),d=0,h=new RegExp(t.source,f+"g");(c=ir.call(h,i))&&!((u=h.lastIndex)>d&&(s.push(i.slice(d,c.index)),c.length>1&&c.index<i.length&&jr.apply(s,c.slice(1)),l=c[0].length,d=u,s.length>=a));)h.lastIndex===c.index&&h.lastIndex++;return d===i.length?!l&&h.test("")||s.push(""):s.push(i.slice(d)),s.length>a?s.slice(0,a):s}:"0".split(void 0,0).length?function(t,n){return void 0===t&&0===n?[]:e.call(this,t,n)}:e,[function(e,n){var o=g(this),i=null==e?void 0:e[t];return void 0!==i?i.call(e,o,n):r.call(String(o),e,n)},function(t,o){var i=n(r,t,this,o,r!==e);if(i.done)return i.value;var a=P(t),c=String(this),u=function(t,e){var n,r=P(t).constructor;return void 0===r||null==(n=P(r)[Tr])?e:re(n)}(a,RegExp),l=a.unicode,s=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(Ar?"y":"g"),f=new u(Ar?a:"^(?:"+a.source+")",s),p=void 0===o?4294967295:o>>>0;if(0===p)return[];if(0===c.length)return null===br(f,c)?[c]:[];for(var d=0,h=0,g=[];h<c.length;){f.lastIndex=Ar?h:0;var y,v=br(f,Ar?c:c.slice(h));if(null===v||(y=Pr(lt(f.lastIndex+(Ar?0:h)),c.length))===d)h=vr(c,h,l);else{if(g.push(c.slice(d,h)),g.length===p)return g;for(var b=1;b<=v.length-1;b++)if(g.push(v[b]),g.length===p)return g;h=d=y}}return g.push(c.slice(d)),g}]}),!Ar);var Ir={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},_r=ue.forEach,Rr=Cn("forEach")?function(t){return _r(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var Cr in Ir){var Lr=o[Cr],kr=Lr&&Lr.prototype;if(kr&&kr.forEach!==Rr)try{_(kr,"forEach",Rr)}catch(t){kr.forEach=Rr}}var Mr=Xt("iterator"),$r=Xt("toStringTag"),Dr=Rn.values;for(var Nr in Ir){var Fr=o[Nr],Br=Fr&&Fr.prototype;if(Br){if(Br[Mr]!==Dr)try{_(Br,Mr,Dr)}catch(t){Br[Mr]=Dr}if(Br[$r]||_(Br,$r,Nr),Ir[Nr])for(var Gr in Rn)if(Br[Gr]!==Rn[Gr])try{_(Br,Gr,Rn[Gr])}catch(t){Br[Gr]=Rn[Gr]}}}function Vr(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Hr(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function qr(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function zr(t){return(zr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Ur(t,e){return(Ur=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Wr(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Kr(t,e,n){return(Kr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=zr(t)););return t}(t,e);if(r){var o=Object.getOwnPropertyDescriptor(r,e);return o.get?o.get.call(n):o.value}})(t,e,n||t)}var Yr=t.fn.bootstrapTable.utils,Xr={json:"JSON",xml:"XML",png:"PNG",csv:"CSV",txt:"TXT",sql:"SQL",doc:"MS-Word",excel:"MS-Excel",xlsx:"MS-Excel (OpenXML)",powerpoint:"MS-Powerpoint",pdf:"PDF"};t.extend(t.fn.bootstrapTable.defaults,{showExport:!1,exportDataType:"basic",exportTypes:["json","xml","csv","txt","sql","excel"],exportOptions:{onCellHtmlData:function(t,e,n,r){return t.is("th")?t.find(".th-inner").text():r}},exportFooter:!1}),t.extend(t.fn.bootstrapTable.columnDefaults,{forceExport:!1,forceHide:!1}),t.extend(t.fn.bootstrapTable.defaults.icons,{export:{bootstrap3:"glyphicon-export icon-share",materialize:"file_download","bootstrap-table":"icon-download"}[t.fn.bootstrapTable.theme]||"fa-download"}),t.extend(t.fn.bootstrapTable.locales,{formatExport:function(){return"Export data"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.fn.bootstrapTable.methods.push("exportTable"),t.extend(t.fn.bootstrapTable.defaults,{onExportSaved:function(t){return!1}}),t.extend(t.fn.bootstrapTable.Constructor.EVENTS,{"export-saved.bs.table":"onExportSaved"}),t.BootstrapTable=function(e){function n(){return Vr(this,n),Wr(this,zr(n).apply(this,arguments))}var r,o,i;return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ur(t,e)}(n,e),r=n,(o=[{key:"initToolbar",value:function(){var e,r=this,o=this.options;this.showToolbar=this.showToolbar||o.showExport;for(var i=arguments.length,a=new Array(i),c=0;c<i;c++)a[c]=arguments[c];if((e=Kr(zr(n.prototype),"initToolbar",this)).call.apply(e,[this].concat(a)),this.options.showExport){var u=this.$toolbar.find(">.columns");if(this.$export=u.find("div.export"),this.$export.length)this.updateExportButton();else{var l=t(this.constants.html.toolbarDropdown.join("")),s=o.exportTypes;if("string"==typeof s){var f=s.slice(1,-1).replace(/ /g,"").split(",");s=f.map((function(t){return t.slice(1,-1)}))}this.$export=t(1===s.length?'\n      <div class="export '.concat(this.constants.classes.buttonsDropdown,'"\n      data-type="').concat(s[0],'">\n      <button class="').concat(this.constants.buttonsClass,'"\n      aria-label="Export"\n      type="button"\n      title="').concat(o.formatExport(),'">\n      ').concat(o.showButtonIcons?Yr.sprintf(this.constants.html.icon,o.iconsPrefix,o.icons.export):"","\n      ").concat(o.showButtonText?o.formatExport():"","\n      </button>\n      </div>\n    "):'\n      <div class="export '.concat(this.constants.classes.buttonsDropdown,'">\n      <button class="').concat(this.constants.buttonsClass,' dropdown-toggle"\n      aria-label="Export"\n      data-toggle="dropdown"\n      type="button"\n      title="').concat(o.formatExport(),'">\n      ').concat(o.showButtonIcons?Yr.sprintf(this.constants.html.icon,o.iconsPrefix,o.icons.export):"","\n      ").concat(o.showButtonText?o.formatExport():"","\n      ").concat(this.constants.html.dropdownCaret,"\n      </button>\n      </div>\n    ")).appendTo(u);var p=this.$export;if(s.length>1){this.$export.append(l),l.children().length&&(l=l.children().eq(0));var d=!0,h=!1,g=void 0;try{for(var y,v=s[Symbol.iterator]();!(d=(y=v.next()).done);d=!0){var b=y.value;if(Xr.hasOwnProperty(b)){var x=t(Yr.sprintf(this.constants.html.pageDropdownItem,"",Xr[b]));x.attr("data-type",b),l.append(x)}}}catch(t){h=!0,g=t}finally{try{d||null==v.return||v.return()}finally{if(h)throw g}}p=l.children()}this.updateExportButton(),p.click((function(e){e.preventDefault();var n={type:t(e.currentTarget).data("type"),escape:!1};r.exportTable(n)})),this.handleToolbar()}}}},{key:"handleToolbar",value:function(){this.$export&&("foundation"===t.fn.bootstrapTable.theme?this.$export.find(".dropdown-pane").attr("id","toolbar-export-id"):"materialize"===t.fn.bootstrapTable.theme&&this.$export.find(".dropdown-content").attr("id","toolbar-export-id"),Kr(zr(n.prototype),"handleToolbar",this)&&Kr(zr(n.prototype),"handleToolbar",this).call(this))}},{key:"exportTable",value:function(e){var n=this,r=this.options,o=this.header.stateField,i=r.cardView,a=function(a){o&&n.hideColumn(o),i&&n.toggleView(),n.columns.forEach((function(t){t.forceHide&&n.hideColumn(t.field)}));var c=n.getData();if(r.exportFooter){var u=n.$tableFooter.find("tr").first(),l={},s=[];t.each(u.children(),(function(e,r){var o=t(r).children(".th-inner").first().html();l[n.columns[e].field]="&nbsp;"===o?null:o,s.push(o)})),n.$body.append(n.$body.children().last()[0].outerHTML);var f=n.$body.children().last();t.each(f.children(),(function(e,n){t(n).html(s[e])}))}var p=n.getHiddenColumns();p.forEach((function(t){t.forceExport&&n.showColumn(t.field)})),"function"==typeof r.exportOptions.fileName&&(e.fileName=r.exportOptions.fileName()),n.$el.tableExport(t.extend({onAfterSaveToFile:function(){r.exportFooter&&n.load(c),o&&n.showColumn(o),i&&n.toggleView(),p.forEach((function(t){t.forceExport&&n.hideColumn(t.field)})),n.columns.forEach((function(t){t.forceHide&&n.showColumn(t.field)})),a&&a()}},r.exportOptions,e))};if("all"===r.exportDataType&&r.pagination){var c="server"===r.sidePagination?"post-body.bs.table":"page-change.bs.table",u=this.options.virtualScroll;this.$el.one(c,(function(){a((function(){n.options.virtualScroll=u,n.togglePagination()}))})),this.options.virtualScroll=!1,this.togglePagination(),this.trigger("export-saved",this.getData())}else if("selected"===r.exportDataType){var l=this.getData(),s=this.getSelections(),f=r.pagination;if(!s.length)return;"server"===r.sidePagination&&(l=qr({total:r.totalRows},this.options.dataField,l),s=qr({total:s.length},this.options.dataField,s)),this.load(s),f&&this.togglePagination(),a((function(){f&&n.togglePagination(),n.load(l)})),this.trigger("export-saved",s)}else a(),this.trigger("export-saved",this.getData(!0))}},{key:"updateSelected",value:function(){Kr(zr(n.prototype),"updateSelected",this).call(this),this.updateExportButton()}},{key:"updateExportButton",value:function(){"selected"===this.options.exportDataType&&this.$export.find("> button").prop("disabled",!this.getSelections().length)}}])&&Hr(r.prototype,o),i&&Hr(r,i),n}(t.BootstrapTable)}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).jQuery)}(this,(function(t){"use strict";function e(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=e(t),r="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function o(t,e){return t(e={exports:{}},e.exports),e.exports}var i=function(t){return t&&t.Math==Math&&t},a=i("object"==typeof globalThis&&globalThis)||i("object"==typeof window&&window)||i("object"==typeof self&&self)||i("object"==typeof r&&r)||Function("return this")(),c=function(t){try{return!!t()}catch(t){return!0}},l=!c((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]})),u={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,s={f:f&&!u.call({1:2},1)?function(t){var e=f(this,t);return!!e&&e.enumerable}:u},p=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},d={}.toString,h=function(t){return d.call(t).slice(8,-1)},g="".split,v=c((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==h(t)?g.call(t,""):Object(t)}:Object,y=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},b=function(t){return v(y(t))},x=function(t){return"object"==typeof t?null!==t:"function"==typeof t},m=function(t,e){if(!x(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!x(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!x(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!x(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},E={}.hasOwnProperty,S=function(t,e){return E.call(t,e)},w=a.document,T=x(w)&&x(w.createElement),O=function(t){return T?w.createElement(t):{}},j=!l&&!c((function(){return 7!=Object.defineProperty(O("div"),"a",{get:function(){return 7}}).a})),P=Object.getOwnPropertyDescriptor,A={f:l?P:function(t,e){if(t=b(t),e=m(e,!0),j)try{return P(t,e)}catch(t){}if(S(t,e))return p(!s.f.call(t,e),t[e])}},C=function(t){if(!x(t))throw TypeError(String(t)+" is not an object");return t},R=Object.defineProperty,L={f:l?R:function(t,e,n){if(C(t),e=m(e,!0),C(n),j)try{return R(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},I=l?function(t,e,n){return L.f(t,e,p(1,n))}:function(t,e,n){return t[e]=n,t},M=function(t,e){try{I(a,t,e)}catch(n){a[t]=e}return e},D="__core-js_shared__",_=a[D]||M(D,{}),$=Function.toString;"function"!=typeof _.inspectSource&&(_.inspectSource=function(t){return $.call(t)});var k,N,F,B=_.inspectSource,U=a.WeakMap,V="function"==typeof U&&/native code/.test(B(U)),G=o((function(t){(t.exports=function(t,e){return _[t]||(_[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.5",mode:"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})})),H=0,q=Math.random(),X=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++H+q).toString(36)},K=G("keys"),W=function(t){return K[t]||(K[t]=X(t))},z={},Y=a.WeakMap;if(V){var Q=new Y,J=Q.get,Z=Q.has,tt=Q.set;k=function(t,e){return tt.call(Q,t,e),e},N=function(t){return J.call(Q,t)||{}},F=function(t){return Z.call(Q,t)}}else{var et=W("state");z[et]=!0,k=function(t,e){return I(t,et,e),e},N=function(t){return S(t,et)?t[et]:{}},F=function(t){return S(t,et)}}var nt,rt,ot={set:k,get:N,has:F,enforce:function(t){return F(t)?N(t):k(t,{})},getterFor:function(t){return function(e){var n;if(!x(e)||(n=N(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},it=o((function(t){var e=ot.get,n=ot.enforce,r=String(String).split("String");(t.exports=function(t,e,o,i){var c=!!i&&!!i.unsafe,l=!!i&&!!i.enumerable,u=!!i&&!!i.noTargetGet;"function"==typeof o&&("string"!=typeof e||S(o,"name")||I(o,"name",e),n(o).source=r.join("string"==typeof e?e:"")),t!==a?(c?!u&&t[e]&&(l=!0):delete t[e],l?t[e]=o:I(t,e,o)):l?t[e]=o:M(e,o)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||B(this)}))})),at=a,ct=function(t){return"function"==typeof t?t:void 0},lt=function(t,e){return arguments.length<2?ct(at[t])||ct(a[t]):at[t]&&at[t][e]||a[t]&&a[t][e]},ut=Math.ceil,ft=Math.floor,st=function(t){return isNaN(t=+t)?0:(t>0?ft:ut)(t)},pt=Math.min,dt=function(t){return t>0?pt(st(t),9007199254740991):0},ht=Math.max,gt=Math.min,vt=function(t,e){var n=st(t);return n<0?ht(n+e,0):gt(n,e)},yt=function(t){return function(e,n,r){var o,i=b(e),a=dt(i.length),c=vt(r,a);if(t&&n!=n){for(;a>c;)if((o=i[c++])!=o)return!0}else for(;a>c;c++)if((t||c in i)&&i[c]===n)return t||c||0;return!t&&-1}},bt={includes:yt(!0),indexOf:yt(!1)}.indexOf,xt=function(t,e){var n,r=b(t),o=0,i=[];for(n in r)!S(z,n)&&S(r,n)&&i.push(n);for(;e.length>o;)S(r,n=e[o++])&&(~bt(i,n)||i.push(n));return i},mt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],Et=mt.concat("length","prototype"),St={f:Object.getOwnPropertyNames||function(t){return xt(t,Et)}},wt={f:Object.getOwnPropertySymbols},Tt=lt("Reflect","ownKeys")||function(t){var e=St.f(C(t)),n=wt.f;return n?e.concat(n(t)):e},Ot=function(t,e){for(var n=Tt(e),r=L.f,o=A.f,i=0;i<n.length;i++){var a=n[i];S(t,a)||r(t,a,o(e,a))}},jt=/#|\.prototype\./,Pt=function(t,e){var n=Ct[At(t)];return n==Lt||n!=Rt&&("function"==typeof e?c(e):!!e)},At=Pt.normalize=function(t){return String(t).replace(jt,".").toLowerCase()},Ct=Pt.data={},Rt=Pt.NATIVE="N",Lt=Pt.POLYFILL="P",It=Pt,Mt=A.f,Dt=function(t,e){var n,r,o,i,c,l=t.target,u=t.global,f=t.stat;if(n=u?a:f?a[l]||M(l,{}):(a[l]||{}).prototype)for(r in e){if(i=e[r],o=t.noTargetGet?(c=Mt(n,r))&&c.value:n[r],!It(u?r:l+(f?".":"#")+r,t.forced)&&void 0!==o){if(typeof i==typeof o)continue;Ot(i,o)}(t.sham||o&&o.sham)&&I(i,"sham",!0),it(n,r,i,t)}},_t=Array.isArray||function(t){return"Array"==h(t)},$t=function(t){return Object(y(t))},kt=function(t,e,n){var r=m(e);r in t?L.f(t,r,p(0,n)):t[r]=n},Nt=!!Object.getOwnPropertySymbols&&!c((function(){return!String(Symbol())})),Ft=Nt&&!Symbol.sham&&"symbol"==typeof Symbol.iterator,Bt=G("wks"),Ut=a.Symbol,Vt=Ft?Ut:Ut&&Ut.withoutSetter||X,Gt=function(t){return S(Bt,t)||(Nt&&S(Ut,t)?Bt[t]=Ut[t]:Bt[t]=Vt("Symbol."+t)),Bt[t]},Ht=Gt("species"),qt=function(t,e){var n;return _t(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!_t(n.prototype)?x(n)&&null===(n=n[Ht])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)},Xt=lt("navigator","userAgent")||"",Kt=a.process,Wt=Kt&&Kt.versions,zt=Wt&&Wt.v8;zt?rt=(nt=zt.split("."))[0]+nt[1]:Xt&&(!(nt=Xt.match(/Edge\/(\d+)/))||nt[1]>=74)&&(nt=Xt.match(/Chrome\/(\d+)/))&&(rt=nt[1]);var Yt=rt&&+rt,Qt=Gt("species"),Jt=function(t){return Yt>=51||!c((function(){var e=[];return(e.constructor={})[Qt]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},Zt=Gt("isConcatSpreadable"),te=9007199254740991,ee="Maximum allowed index exceeded",ne=Yt>=51||!c((function(){var t=[];return t[Zt]=!1,t.concat()[0]!==t})),re=Jt("concat"),oe=function(t){if(!x(t))return!1;var e=t[Zt];return void 0!==e?!!e:_t(t)};Dt({target:"Array",proto:!0,forced:!ne||!re},{concat:function(t){var e,n,r,o,i,a=$t(this),c=qt(a,0),l=0;for(e=-1,r=arguments.length;e<r;e++)if(oe(i=-1===e?a:arguments[e])){if(l+(o=dt(i.length))>te)throw TypeError(ee);for(n=0;n<o;n++,l++)n in i&&kt(c,l,i[n])}else{if(l>=te)throw TypeError(ee);kt(c,l++,i)}return c.length=l,c}});var ie,ae=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},ce=[].push,le=function(t){var e=1==t,n=2==t,r=3==t,o=4==t,i=6==t,a=5==t||i;return function(c,l,u,f){for(var s,p,d=$t(c),h=v(d),g=function(t,e,n){if(ae(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}}(l,u,3),y=dt(h.length),b=0,x=f||qt,m=e?x(c,y):n?x(c,0):void 0;y>b;b++)if((a||b in h)&&(p=g(s=h[b],b,d),t))if(e)m[b]=p;else if(p)switch(t){case 3:return!0;case 5:return s;case 6:return b;case 2:ce.call(m,s)}else if(o)return!1;return i?-1:r||o?o:m}},ue={forEach:le(0),map:le(1),filter:le(2),some:le(3),every:le(4),find:le(5),findIndex:le(6)},fe=Object.keys||function(t){return xt(t,mt)},se=l?Object.defineProperties:function(t,e){C(t);for(var n,r=fe(e),o=r.length,i=0;o>i;)L.f(t,n=r[i++],e[n]);return t},pe=lt("document","documentElement"),de=W("IE_PROTO"),he=function(){},ge=function(t){return"<script>"+t+"</"+"script>"},ve=function(){try{ie=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;ve=ie?function(t){t.write(ge("")),t.close();var e=t.parentWindow.Object;return t=null,e}(ie):((e=O("iframe")).style.display="none",pe.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(ge("document.F=Object")),t.close(),t.F);for(var n=mt.length;n--;)delete ve.prototype[mt[n]];return ve()};z[de]=!0;var ye=Object.create||function(t,e){var n;return null!==t?(he.prototype=C(t),n=new he,he.prototype=null,n[de]=t):n=ve(),void 0===e?n:se(n,e)},be=Gt("unscopables"),xe=Array.prototype;null==xe[be]&&L.f(xe,be,{configurable:!0,value:ye(null)});var me,Ee=Object.defineProperty,Se={},we=function(t){throw t},Te=function(t,e){if(S(Se,t))return Se[t];e||(e={});var n=[][t],r=!!S(e,"ACCESSORS")&&e.ACCESSORS,o=S(e,0)?e[0]:we,i=S(e,1)?e[1]:void 0;return Se[t]=!!n&&!c((function(){if(r&&!l)return!0;var t={length:-1};r?Ee(t,1,{enumerable:!0,get:we}):t[1]=1,n.call(t,o,i)}))},Oe=ue.find,je="find",Pe=!0,Ae=Te(je);je in[]&&Array(1).find((function(){Pe=!1})),Dt({target:"Array",proto:!0,forced:Pe||!Ae},{find:function(t){return Oe(this,t,arguments.length>1?arguments[1]:void 0)}}),me=je,xe[be][me]=!0;var Ce=function(t,e){var n=[][t];return!!n&&c((function(){n.call(null,e||function(){throw 1},1)}))},Re=ue.forEach,Le=Ce("forEach"),Ie=Te("forEach"),Me=Le&&Ie?[].forEach:function(t){return Re(this,t,arguments.length>1?arguments[1]:void 0)};Dt({target:"Array",proto:!0,forced:[].forEach!=Me},{forEach:Me});var De=[].join,_e=v!=Object,$e=Ce("join",",");Dt({target:"Array",proto:!0,forced:_e||!$e},{join:function(t){return De.call(b(this),void 0===t?",":t)}});var ke=ue.map,Ne=Jt("map"),Fe=Te("map");Dt({target:"Array",proto:!0,forced:!Ne||!Fe},{map:function(t){return ke(this,t,arguments.length>1?arguments[1]:void 0)}});var Be=Jt("slice"),Ue=Te("slice",{ACCESSORS:!0,0:0,1:2}),Ve=Gt("species"),Ge=[].slice,He=Math.max;Dt({target:"Array",proto:!0,forced:!Be||!Ue},{slice:function(t,e){var n,r,o,i=b(this),a=dt(i.length),c=vt(t,a),l=vt(void 0===e?a:e,a);if(_t(i)&&("function"!=typeof(n=i.constructor)||n!==Array&&!_t(n.prototype)?x(n)&&null===(n=n[Ve])&&(n=void 0):n=void 0,n===Array||void 0===n))return Ge.call(i,c,l);for(r=new(void 0===n?Array:n)(He(l-c,0)),o=0;c<l;c++,o++)c in i&&kt(r,o,i[c]);return r.length=o,r}});var qe=Object.assign,Xe=Object.defineProperty,Ke=!qe||c((function(){if(l&&1!==qe({b:1},qe(Xe({},"a",{enumerable:!0,get:function(){Xe(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},n=Symbol(),r="abcdefghijklmnopqrst";return t[n]=7,r.split("").forEach((function(t){e[t]=t})),7!=qe({},t)[n]||fe(qe({},e)).join("")!=r}))?function(t,e){for(var n=$t(t),r=arguments.length,o=1,i=wt.f,a=s.f;r>o;)for(var c,u=v(arguments[o++]),f=i?fe(u).concat(i(u)):fe(u),p=f.length,d=0;p>d;)c=f[d++],l&&!a.call(u,c)||(n[c]=u[c]);return n}:qe;Dt({target:"Object",stat:!0,forced:Object.assign!==Ke},{assign:Ke});var We=function(){var t=C(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function ze(t,e){return RegExp(t,e)}var Ye,Qe,Je={UNSUPPORTED_Y:c((function(){var t=ze("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:c((function(){var t=ze("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},Ze=RegExp.prototype.exec,tn=String.prototype.replace,en=Ze,nn=(Ye=/a/,Qe=/b*/g,Ze.call(Ye,"a"),Ze.call(Qe,"a"),0!==Ye.lastIndex||0!==Qe.lastIndex),rn=Je.UNSUPPORTED_Y||Je.BROKEN_CARET,on=void 0!==/()??/.exec("")[1];(nn||on||rn)&&(en=function(t){var e,n,r,o,i=this,a=rn&&i.sticky,c=We.call(i),l=i.source,u=0,f=t;return a&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),f=String(t).slice(i.lastIndex),i.lastIndex>0&&(!i.multiline||i.multiline&&"\n"!==t[i.lastIndex-1])&&(l="(?: "+l+")",f=" "+f,u++),n=new RegExp("^(?:"+l+")",c)),on&&(n=new RegExp("^"+l+"$(?!\\s)",c)),nn&&(e=i.lastIndex),r=Ze.call(a?n:i,f),a?r?(r.input=r.input.slice(u),r[0]=r[0].slice(u),r.index=i.lastIndex,i.lastIndex+=r[0].length):i.lastIndex=0:nn&&r&&(i.lastIndex=i.global?r.index+r[0].length:e),on&&r&&r.length>1&&tn.call(r[0],n,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(r[o]=void 0)})),r});var an=en;Dt({target:"RegExp",proto:!0,forced:/./.exec!==an},{exec:an});var cn=Gt("species"),ln=!c((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),un="$0"==="a".replace(/./,"$0"),fn=Gt("replace"),sn=!!/./[fn]&&""===/./[fn]("a","$0"),pn=!c((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var n="ab".split(t);return 2!==n.length||"a"!==n[0]||"b"!==n[1]})),dn=function(t,e,n,r){var o=Gt(t),i=!c((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),a=i&&!c((function(){var e=!1,n=/a/;return"split"===t&&((n={}).constructor={},n.constructor[cn]=function(){return n},n.flags="",n[o]=/./[o]),n.exec=function(){return e=!0,null},n[o](""),!e}));if(!i||!a||"replace"===t&&(!ln||!un||sn)||"split"===t&&!pn){var l=/./[o],u=n(o,""[t],(function(t,e,n,r,o){return e.exec===an?i&&!o?{done:!0,value:l.call(e,n,r)}:{done:!0,value:t.call(n,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:un,REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE:sn}),f=u[0],s=u[1];it(String.prototype,t,f),it(RegExp.prototype,o,2==e?function(t,e){return s.call(t,this,e)}:function(t){return s.call(t,this)})}r&&I(RegExp.prototype[o],"sham",!0)},hn=function(t){return function(e,n){var r,o,i=String(y(e)),a=st(n),c=i.length;return a<0||a>=c?t?"":void 0:(r=i.charCodeAt(a))<55296||r>56319||a+1===c||(o=i.charCodeAt(a+1))<56320||o>57343?t?i.charAt(a):r:t?i.slice(a,a+2):o-56320+(r-55296<<10)+65536}},gn={codeAt:hn(!1),charAt:hn(!0)}.charAt,vn=function(t,e,n){return e+(n?gn(t,e).length:1)},yn=function(t,e){var n=t.exec;if("function"==typeof n){var r=n.call(t,e);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==h(t))throw TypeError("RegExp#exec called on incompatible receiver");return an.call(t,e)},bn=Math.max,xn=Math.min,mn=Math.floor,En=/\$([$&'`]|\d\d?|<[^>]*>)/g,Sn=/\$([$&'`]|\d\d?)/g;dn("replace",2,(function(t,e,n,r){var o=r.REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE,i=r.REPLACE_KEEPS_$0,a=o?"$":"$0";return[function(n,r){var o=y(this),i=null==n?void 0:n[t];return void 0!==i?i.call(n,o,r):e.call(String(o),n,r)},function(t,r){if(!o&&i||"string"==typeof r&&-1===r.indexOf(a)){var l=n(e,t,this,r);if(l.done)return l.value}var u=C(t),f=String(this),s="function"==typeof r;s||(r=String(r));var p=u.global;if(p){var d=u.unicode;u.lastIndex=0}for(var h=[];;){var g=yn(u,f);if(null===g)break;if(h.push(g),!p)break;""===String(g[0])&&(u.lastIndex=vn(f,dt(u.lastIndex),d))}for(var v,y="",b=0,x=0;x<h.length;x++){g=h[x];for(var m=String(g[0]),E=bn(xn(st(g.index),f.length),0),S=[],w=1;w<g.length;w++)S.push(void 0===(v=g[w])?v:String(v));var T=g.groups;if(s){var O=[m].concat(S,E,f);void 0!==T&&O.push(T);var j=String(r.apply(void 0,O))}else j=c(m,f,E,S,T,r);E>=b&&(y+=f.slice(b,E)+j,b=E+m.length)}return y+f.slice(b)}];function c(t,n,r,o,i,a){var c=r+t.length,l=o.length,u=Sn;return void 0!==i&&(i=$t(i),u=En),e.call(a,u,(function(e,a){var u;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return n.slice(0,r);case"'":return n.slice(c);case"<":u=i[a.slice(1,-1)];break;default:var f=+a;if(0===f)return e;if(f>l){var s=mn(f/10);return 0===s?e:s<=l?void 0===o[s-1]?a.charAt(1):o[s-1]+a.charAt(1):e}u=o[f-1]}return void 0===u?"":u}))}}));var wn=Gt("match"),Tn=Gt("species"),On=[].push,jn=Math.min,Pn=4294967295,An=!c((function(){return!RegExp(Pn,"y")}));dn("split",2,(function(t,e,n){var r;return r="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,n){var r,o,i=String(y(this)),a=void 0===n?Pn:n>>>0;if(0===a)return[];if(void 0===t)return[i];if(!x(r=t)||!(void 0!==(o=r[wn])?o:"RegExp"==h(r)))return e.call(i,t,a);for(var c,l,u,f=[],s=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),p=0,d=new RegExp(t.source,s+"g");(c=an.call(d,i))&&!((l=d.lastIndex)>p&&(f.push(i.slice(p,c.index)),c.length>1&&c.index<i.length&&On.apply(f,c.slice(1)),u=c[0].length,p=l,f.length>=a));)d.lastIndex===c.index&&d.lastIndex++;return p===i.length?!u&&d.test("")||f.push(""):f.push(i.slice(p)),f.length>a?f.slice(0,a):f}:"0".split(void 0,0).length?function(t,n){return void 0===t&&0===n?[]:e.call(this,t,n)}:e,[function(e,n){var o=y(this),i=null==e?void 0:e[t];return void 0!==i?i.call(e,o,n):r.call(String(o),e,n)},function(t,o){var i=n(r,t,this,o,r!==e);if(i.done)return i.value;var a=C(t),c=String(this),l=function(t,e){var n,r=C(t).constructor;return void 0===r||null==(n=C(r)[Tn])?e:ae(n)}(a,RegExp),u=a.unicode,f=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(An?"y":"g"),s=new l(An?a:"^(?:"+a.source+")",f),p=void 0===o?Pn:o>>>0;if(0===p)return[];if(0===c.length)return null===yn(s,c)?[c]:[];for(var d=0,h=0,g=[];h<c.length;){s.lastIndex=An?h:0;var v,y=yn(s,An?c:c.slice(h));if(null===y||(v=jn(dt(s.lastIndex+(An?0:h)),c.length))===d)h=vn(c,h,u);else{if(g.push(c.slice(d,h)),g.length===p)return g;for(var b=1;b<=y.length-1;b++)if(g.push(y[b]),g.length===p)return g;h=d=v}}return g.push(c.slice(d)),g}]}),!An);for(var Cn in{CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0}){var Rn=a[Cn],Ln=Rn&&Rn.prototype;if(Ln&&Ln.forEach!==Me)try{I(Ln,"forEach",Me)}catch(t){Ln.forEach=Me}}function In(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Mn(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Dn(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function _n(t){return(_n=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function $n(t,e){return($n=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function kn(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Nn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=_n(t);if(e){var o=_n(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return kn(this,n)}}function Fn(t,e,n){return(Fn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=_n(t)););return t}(t,e);if(r){var o=Object.getOwnPropertyDescriptor(r,e);return o.get?o.get.call(n):o.value}})(t,e,n||t)}function Bn(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}function Un(t,e){var n;if("undefined"==typeof Symbol||null==t[Symbol.iterator]){if(Array.isArray(t)||(n=function(t,e){if(t){if("string"==typeof t)return Bn(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Object"===n&&t.constructor&&(n=t.constructor.name),"Map"===n||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?Bn(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){n&&(t=n);var r=0,o=function(){};return{s:o,n:function(){return r>=t.length?{done:!0}:{done:!1,value:t[r++]}},e:function(t){throw t},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var i,a=!0,c=!1;return{s:function(){n=t[Symbol.iterator]()},n:function(){var t=n.next();return a=t.done,t},e:function(t){c=!0,i=t},f:function(){try{a||null==n.return||n.return()}finally{if(c)throw i}}}}var Vn=n.default.fn.bootstrapTable.utils,Gn={json:"JSON",xml:"XML",png:"PNG",csv:"CSV",txt:"TXT",sql:"SQL",doc:"MS-Word",excel:"MS-Excel",xlsx:"MS-Excel (OpenXML)",powerpoint:"MS-Powerpoint",pdf:"PDF"};n.default.extend(n.default.fn.bootstrapTable.defaults,{showExport:!1,exportDataType:"basic",exportTypes:["json","xml","csv","txt","sql","excel"],exportOptions:{onCellHtmlData:function(t,e,n,r){return t.is("th")?t.find(".th-inner").text():r}},exportFooter:!1}),n.default.extend(n.default.fn.bootstrapTable.columnDefaults,{forceExport:!1,forceHide:!1}),n.default.extend(n.default.fn.bootstrapTable.defaults.icons,{export:{bootstrap3:"glyphicon-export icon-share",materialize:"file_download","bootstrap-table":"icon-download"}[n.default.fn.bootstrapTable.theme]||"fa-download"}),n.default.extend(n.default.fn.bootstrapTable.locales,{formatExport:function(){return"Export data"}}),n.default.extend(n.default.fn.bootstrapTable.defaults,n.default.fn.bootstrapTable.locales),n.default.fn.bootstrapTable.methods.push("exportTable"),n.default.extend(n.default.fn.bootstrapTable.defaults,{onExportSaved:function(t){return!1}}),n.default.extend(n.default.fn.bootstrapTable.Constructor.EVENTS,{"export-saved.bs.table":"onExportSaved"}),n.default.BootstrapTable=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&$n(t,e)}(a,t);var e,r,o,i=Nn(a);function a(){return In(this,a),i.apply(this,arguments)}return e=a,(r=[{key:"initToolbar",value:function(){var t,e=this,r=this.options,o=r.exportTypes;if(this.showToolbar=this.showToolbar||r.showExport,this.options.showExport){if("string"==typeof o){var i=o.slice(1,-1).replace(/ /g,"").split(",");o=i.map((function(t){return t.slice(1,-1)}))}if(this.$export=this.$toolbar.find(">.columns div.export"),this.$export.length)return void this.updateExportButton();this.buttons=Object.assign(this.buttons,{export:{html:1===o.length?'\n            <div class="export '.concat(this.constants.classes.buttonsDropdown,'"\n            data-type="').concat(o[0],'">\n            <button class="').concat(this.constants.buttonsClass,'"\n            aria-label="Export"\n            type="button"\n            title="').concat(r.formatExport(),'">\n            ').concat(r.showButtonIcons?Vn.sprintf(this.constants.html.icon,r.iconsPrefix,r.icons.export):"","\n            ").concat(r.showButtonText?r.formatExport():"","\n            </button>\n            </div>\n          "):'\n            <div class="export '.concat(this.constants.classes.buttonsDropdown,'">\n            <button class="').concat(this.constants.buttonsClass,' dropdown-toggle"\n            aria-label="Export"\n            data-toggle="dropdown"\n            type="button"\n            title="').concat(r.formatExport(),'">\n            ').concat(r.showButtonIcons?Vn.sprintf(this.constants.html.icon,r.iconsPrefix,r.icons.export):"","\n            ").concat(r.showButtonText?r.formatExport():"","\n            ").concat(this.constants.html.dropdownCaret,"\n            </button>\n            </div>\n          ")}})}for(var c=arguments.length,l=new Array(c),u=0;u<c;u++)l[u]=arguments[u];if((t=Fn(_n(a.prototype),"initToolbar",this)).call.apply(t,[this].concat(l)),this.$export=this.$toolbar.find(">.columns div.export"),this.options.showExport){var f=n.default(this.constants.html.toolbarDropdown.join("")),s=this.$export;if(o.length>1){this.$export.append(f),f.children().length&&(f=f.children().eq(0));var p,d=Un(o);try{for(d.s();!(p=d.n()).done;){var h=p.value;if(Gn.hasOwnProperty(h)){var g=n.default(Vn.sprintf(this.constants.html.pageDropdownItem,"",Gn[h]));g.attr("data-type",h),f.append(g)}}}catch(t){d.e(t)}finally{d.f()}s=f.children()}this.updateExportButton(),s.click((function(t){t.preventDefault();var r={type:n.default(t.currentTarget).data("type"),escape:!1};e.exportTable(r)})),this.handleToolbar()}}},{key:"handleToolbar",value:function(){this.$export&&Fn(_n(a.prototype),"handleToolbar",this)&&Fn(_n(a.prototype),"handleToolbar",this).call(this)}},{key:"exportTable",value:function(t){var e=this,r=this.options,o=this.header.stateField,i=r.cardView,a=function(a){o&&e.hideColumn(o),i&&e.toggleView(),e.columns.forEach((function(t){t.forceHide&&e.hideColumn(t.field)}));var c=e.getData();if(r.exportFooter){var l=e.$tableFooter.find("tr").first(),u={},f=[];n.default.each(l.children(),(function(t,r){var o=n.default(r).children(".th-inner").first().html();u[e.columns[t].field]="&nbsp;"===o?null:o,f.push(o)})),e.$body.append(e.$body.children().last()[0].outerHTML);var s=e.$body.children().last();n.default.each(s.children(),(function(t,e){n.default(e).html(f[t])}))}var p=e.getHiddenColumns();p.forEach((function(t){t.forceExport&&e.showColumn(t.field)})),"function"==typeof r.exportOptions.fileName&&(t.fileName=r.exportOptions.fileName()),e.$el.tableExport(n.default.extend({onAfterSaveToFile:function(){r.exportFooter&&e.load(c),o&&e.showColumn(o),i&&e.toggleView(),p.forEach((function(t){t.forceExport&&e.hideColumn(t.field)})),e.columns.forEach((function(t){t.forceHide&&e.showColumn(t.field)})),a&&a()}},r.exportOptions,t))};if("all"===r.exportDataType&&r.pagination){var c="server"===r.sidePagination?"post-body.bs.table":"page-change.bs.table",l=this.options.virtualScroll;this.$el.one(c,(function(){setTimeout((function(){a((function(){e.options.virtualScroll=l,e.togglePagination()}))}),0)})),this.options.virtualScroll=!1,this.togglePagination(),this.trigger("export-saved",this.getData())}else if("selected"===r.exportDataType){var u=this.getData(),f=this.getSelections(),s=r.pagination;if(!f.length)return;"server"===r.sidePagination&&(u=Dn({total:r.totalRows},this.options.dataField,u),f=Dn({total:f.length},this.options.dataField,f)),this.load(f),s&&this.togglePagination(),a((function(){s&&e.togglePagination(),e.load(u)})),this.trigger("export-saved",f)}else a(),this.trigger("export-saved",this.getData(!0))}},{key:"updateSelected",value:function(){Fn(_n(a.prototype),"updateSelected",this).call(this),this.updateExportButton()}},{key:"updateExportButton",value:function(){"selected"===this.options.exportDataType&&this.$export.find("> button").prop("disabled",!this.getSelections().length)}}])&&Mn(e.prototype,r),o&&Mn(e,o),a}(n.default.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-locale-all.min.js b/web/skins/classic/js/bootstrap-table-locale-all.min.js
new file mode 100644
index 000000000..297bb5ad4
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table-locale-all.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.1
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t="undefined"!=typeof globalThis?globalThis:t||self).jQuery)}(this,(function(t){"use strict";function n(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var o=n(t),r="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(t,n){return t(n={exports:{}},n.exports),n.exports}var a=function(t){return t&&t.Math==Math&&t},i=a("object"==typeof globalThis&&globalThis)||a("object"==typeof window&&window)||a("object"==typeof self&&self)||a("object"==typeof r&&r)||Function("return this")(),u=function(t){try{return!!t()}catch(t){return!0}},c=!u((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]})),f={}.propertyIsEnumerable,l=Object.getOwnPropertyDescriptor,s={f:l&&!f.call({1:2},1)?function(t){var n=l(this,t);return!!n&&n.enumerable}:f},m=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},g={}.toString,d=function(t){return g.call(t).slice(8,-1)},h="".split,w=u((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==d(t)?h.call(t,""):Object(t)}:Object,p=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},S=function(t){return w(p(t))},P=function(t){return"object"==typeof t?null!==t:"function"==typeof t},T=function(t,n){if(!P(t))return t;var o,r;if(n&&"function"==typeof(o=t.toString)&&!P(r=o.call(t)))return r;if("function"==typeof(o=t.valueOf)&&!P(r=o.call(t)))return r;if(!n&&"function"==typeof(o=t.toString)&&!P(r=o.call(t)))return r;throw TypeError("Can't convert object to primitive value")},R={}.hasOwnProperty,C=function(t,n){return R.call(t,n)},b=i.document,v=P(b)&&P(b.createElement),A=!c&&!u((function(){return 7!=Object.defineProperty((t="div",v?b.createElement(t):{}),"a",{get:function(){return 7}}).a;var t})),x=Object.getOwnPropertyDescriptor,F={f:c?x:function(t,n){if(t=S(t),n=T(n,!0),A)try{return x(t,n)}catch(t){}if(C(t,n))return m(!s.f.call(t,n),t[n])}},y=function(t){if(!P(t))throw TypeError(String(t)+" is not an object");return t},k=Object.defineProperty,H={f:c?k:function(t,n,o){if(y(t),n=T(n,!0),y(o),A)try{return k(t,n,o)}catch(t){}if("get"in o||"set"in o)throw TypeError("Accessors not supported");return"value"in o&&(t[n]=o.value),t}},O=c?function(t,n,o){return H.f(t,n,m(1,o))}:function(t,n,o){return t[n]=o,t},M=function(t,n){try{O(i,t,n)}catch(o){i[t]=n}return n},E="__core-js_shared__",N=i[E]||M(E,{}),D=Function.toString;"function"!=typeof N.inspectSource&&(N.inspectSource=function(t){return D.call(t)});var z,L,j,B,U=N.inspectSource,J=i.WeakMap,G="function"==typeof J&&/native code/.test(U(J)),V=e((function(t){(t.exports=function(t,n){return N[t]||(N[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.5",mode:"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})})),Z=0,I=Math.random(),q=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++Z+I).toString(36)},K=V("keys"),W={},Y=i.WeakMap;if(G){var _=new Y,Q=_.get,X=_.has,$=_.set;z=function(t,n){return $.call(_,t,n),n},L=function(t){return Q.call(_,t)||{}},j=function(t){return X.call(_,t)}}else{var tt=K[B="state"]||(K[B]=q(B));W[tt]=!0,z=function(t,n){return O(t,tt,n),n},L=function(t){return C(t,tt)?t[tt]:{}},j=function(t){return C(t,tt)}}var nt,ot,rt={set:z,get:L,has:j,enforce:function(t){return j(t)?L(t):z(t,{})},getterFor:function(t){return function(n){var o;if(!P(n)||(o=L(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return o}}},et=e((function(t){var n=rt.get,o=rt.enforce,r=String(String).split("String");(t.exports=function(t,n,e,a){var u=!!a&&!!a.unsafe,c=!!a&&!!a.enumerable,f=!!a&&!!a.noTargetGet;"function"==typeof e&&("string"!=typeof n||C(e,"name")||O(e,"name",n),o(e).source=r.join("string"==typeof n?n:"")),t!==i?(u?!f&&t[n]&&(c=!0):delete t[n],c?t[n]=e:O(t,n,e)):c?t[n]=e:M(n,e)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||U(this)}))})),at=i,it=function(t){return"function"==typeof t?t:void 0},ut=function(t,n){return arguments.length<2?it(at[t])||it(i[t]):at[t]&&at[t][n]||i[t]&&i[t][n]},ct=Math.ceil,ft=Math.floor,lt=function(t){return isNaN(t=+t)?0:(t>0?ft:ct)(t)},st=Math.min,mt=function(t){return t>0?st(lt(t),9007199254740991):0},gt=Math.max,dt=Math.min,ht=function(t){return function(n,o,r){var e,a=S(n),i=mt(a.length),u=function(t,n){var o=lt(t);return o<0?gt(o+n,0):dt(o,n)}(r,i);if(t&&o!=o){for(;i>u;)if((e=a[u++])!=e)return!0}else for(;i>u;u++)if((t||u in a)&&a[u]===o)return t||u||0;return!t&&-1}},wt={includes:ht(!0),indexOf:ht(!1)}.indexOf,pt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"].concat("length","prototype"),St={f:Object.getOwnPropertyNames||function(t){return function(t,n){var o,r=S(t),e=0,a=[];for(o in r)!C(W,o)&&C(r,o)&&a.push(o);for(;n.length>e;)C(r,o=n[e++])&&(~wt(a,o)||a.push(o));return a}(t,pt)}},Pt={f:Object.getOwnPropertySymbols},Tt=ut("Reflect","ownKeys")||function(t){var n=St.f(y(t)),o=Pt.f;return o?n.concat(o(t)):n},Rt=function(t,n){for(var o=Tt(n),r=H.f,e=F.f,a=0;a<o.length;a++){var i=o[a];C(t,i)||r(t,i,e(n,i))}},Ct=/#|\.prototype\./,bt=function(t,n){var o=At[vt(t)];return o==Ft||o!=xt&&("function"==typeof n?u(n):!!n)},vt=bt.normalize=function(t){return String(t).replace(Ct,".").toLowerCase()},At=bt.data={},xt=bt.NATIVE="N",Ft=bt.POLYFILL="P",yt=bt,kt=F.f,Ht=Array.isArray||function(t){return"Array"==d(t)},Ot=function(t){return Object(p(t))},Mt=function(t,n,o){var r=T(n);r in t?H.f(t,r,m(0,o)):t[r]=o},Et=!!Object.getOwnPropertySymbols&&!u((function(){return!String(Symbol())})),Nt=Et&&!Symbol.sham&&"symbol"==typeof Symbol.iterator,Dt=V("wks"),zt=i.Symbol,Lt=Nt?zt:zt&&zt.withoutSetter||q,jt=function(t){return C(Dt,t)||(Et&&C(zt,t)?Dt[t]=zt[t]:Dt[t]=Lt("Symbol."+t)),Dt[t]},Bt=jt("species"),Ut=function(t,n){var o;return Ht(t)&&("function"!=typeof(o=t.constructor)||o!==Array&&!Ht(o.prototype)?P(o)&&null===(o=o[Bt])&&(o=void 0):o=void 0),new(void 0===o?Array:o)(0===n?0:n)},Jt=ut("navigator","userAgent")||"",Gt=i.process,Vt=Gt&&Gt.versions,Zt=Vt&&Vt.v8;Zt?ot=(nt=Zt.split("."))[0]+nt[1]:Jt&&(!(nt=Jt.match(/Edge\/(\d+)/))||nt[1]>=74)&&(nt=Jt.match(/Chrome\/(\d+)/))&&(ot=nt[1]);var It,qt=ot&&+ot,Kt=jt("species"),Wt=jt("isConcatSpreadable"),Yt=9007199254740991,_t="Maximum allowed index exceeded",Qt=qt>=51||!u((function(){var t=[];return t[Wt]=!1,t.concat()[0]!==t})),Xt=(It="concat",qt>=51||!u((function(){var t=[];return(t.constructor={})[Kt]=function(){return{foo:1}},1!==t[It](Boolean).foo}))),$t=function(t){if(!P(t))return!1;var n=t[Wt];return void 0!==n?!!n:Ht(t)};!function(t,n){var o,r,e,a,u,c=t.target,f=t.global,l=t.stat;if(o=f?i:l?i[c]||M(c,{}):(i[c]||{}).prototype)for(r in n){if(a=n[r],e=t.noTargetGet?(u=kt(o,r))&&u.value:o[r],!yt(f?r:c+(l?".":"#")+r,t.forced)&&void 0!==e){if(typeof a==typeof e)continue;Rt(a,e)}(t.sham||e&&e.sham)&&O(a,"sham",!0),et(o,r,a,t)}}({target:"Array",proto:!0,forced:!Qt||!Xt},{concat:function(t){var n,o,r,e,a,i=Ot(this),u=Ut(i,0),c=0;for(n=-1,r=arguments.length;n<r;n++)if($t(a=-1===n?i:arguments[n])){if(c+(e=mt(a.length))>Yt)throw TypeError(_t);for(o=0;o<e;o++,c++)o in a&&Mt(u,c,a[o])}else{if(c>=Yt)throw TypeError(_t);Mt(u,c++,a)}return u.length=c,u}}),o.default.fn.bootstrapTable.locales["af-ZA"]=o.default.fn.bootstrapTable.locales.af={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Besig om te laai, wag asseblief"},formatRecordsPerPage:function(t){return"".concat(t," rekords per bladsy")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Resultate ".concat(t," tot ").concat(n," van ").concat(o," rye (filtered from ").concat(r," total rows)"):"Resultate ".concat(t," tot ").concat(n," van ").concat(o," rye")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Soek"},formatNoMatches:function(){return"Geen rekords gevind nie"},formatPaginationSwitch:function(){return"Wys/verberg bladsy nummering"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Herlaai"},formatToggle:function(){return"Wissel"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolomme"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["af-ZA"]),o.default.fn.bootstrapTable.locales["ar-SA"]=o.default.fn.bootstrapTable.locales.ar={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"جاري التحميل, يرجى الإنتظار"},formatRecordsPerPage:function(t){return"".concat(t," سجل لكل صفحة")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"الظاهر ".concat(t," إلى ").concat(n," من ").concat(o," سجل ").concat(r," total rows)"):"الظاهر ".concat(t," إلى ").concat(n," من ").concat(o," سجل")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"بحث"},formatNoMatches:function(){return"لا توجد نتائج مطابقة للبحث"},formatPaginationSwitch:function(){return"إخفاءإظهار ترقيم الصفحات"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"تحديث"},formatToggle:function(){return"تغيير"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"أعمدة"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["ar-SA"]),o.default.fn.bootstrapTable.locales["bg-BG"]=o.default.fn.bootstrapTable.locales.bg={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Зареждане, моля изчакайте"},formatRecordsPerPage:function(t){return"".concat(t," реда на страница")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Показани редове от ".concat(t," до ").concat(n," от ").concat(o," реда (филтрирани от общо ").concat(r," реда)"):"Показани редове от ".concat(t," до ").concat(n," от общо ").concat(o," реда")},formatSRPaginationPreText:function(){return"предишна страница"},formatSRPaginationPageText:function(t){return"до страница ".concat(t)},formatSRPaginationNextText:function(){return"следваща страница"},formatDetailPagination:function(t){return"Показани ".concat(t," реда")},formatClearSearch:function(){return"Изчистване на търсенето"},formatSearch:function(){return"Търсене"},formatNoMatches:function(){return"Не са намерени съвпадащи записи"},formatPaginationSwitch:function(){return"Скриване/Показване на странициране"},formatPaginationSwitchDown:function(){return"Показване на странициране"},formatPaginationSwitchUp:function(){return"Скриване на странициране"},formatRefresh:function(){return"Обновяване"},formatToggle:function(){return"Превключване"},formatToggleOn:function(){return"Показване на изглед карта"},formatToggleOff:function(){return"Скриване на изглед карта"},formatColumns:function(){return"Колони"},formatColumnsToggleAll:function(){return"Превключване на всички"},formatFullscreen:function(){return"Цял екран"},formatAllRows:function(){return"Всички"},formatAutoRefresh:function(){return"Автоматично обновяване"},formatExport:function(){return"Експорт на данни"},formatJumpTo:function(){return"ОТИДИ"},formatAdvancedSearch:function(){return"Разширено търсене"},formatAdvancedCloseButton:function(){return"Затваряне"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["bg-BG"]),o.default.fn.bootstrapTable.locales["ca-ES"]=o.default.fn.bootstrapTable.locales.ca={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Espereu, si us plau"},formatRecordsPerPage:function(t){return"".concat(t," resultats per pàgina")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Mostrant de ".concat(t," fins ").concat(n," - total ").concat(o," resultats (filtered from ").concat(r," total rows)"):"Mostrant de ".concat(t," fins ").concat(n," - total ").concat(o," resultats")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Cerca"},formatNoMatches:function(){return"No s'han trobat resultats"},formatPaginationSwitch:function(){return"Amaga/Mostra paginació"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresca"},formatToggle:function(){return"Alterna formatació"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnes"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Tots"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["ca-ES"]),o.default.fn.bootstrapTable.locales["cs-CZ"]=o.default.fn.bootstrapTable.locales.cs={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Čekejte, prosím"},formatRecordsPerPage:function(t){return"".concat(t," položek na stránku")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Zobrazena ".concat(t,". - ").concat(n," . položka z celkových ").concat(o," (filtered from ").concat(r," total rows)"):"Zobrazena ".concat(t,". - ").concat(n," . položka z celkových ").concat(o)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Vyhledávání"},formatNoMatches:function(){return"Nenalezena žádná vyhovující položka"},formatPaginationSwitch:function(){return"Skrýt/Zobrazit stránkování"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Aktualizovat"},formatToggle:function(){return"Přepni"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Sloupce"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Vše"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["cs-CZ"]),o.default.fn.bootstrapTable.locales["da-DK"]=o.default.fn.bootstrapTable.locales.da={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Indlæser, vent venligst"},formatRecordsPerPage:function(t){return"".concat(t," poster pr side")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Viser ".concat(t," til ").concat(n," af ").concat(o," række").concat(o>1?"r":""," (filtered from ").concat(r," total rows)"):"Viser ".concat(t," til ").concat(n," af ").concat(o," række").concat(o>1?"r":"")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Viser ".concat(t," række").concat(t>1?"r":"")},formatClearSearch:function(){return"Ryd filtre"},formatSearch:function(){return"Søg"},formatNoMatches:function(){return"Ingen poster fundet"},formatPaginationSwitch:function(){return"Skjul/vis nummerering"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Opdater"},formatToggle:function(){return"Skift"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolonner"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Eksporter"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["da-DK"]),o.default.fn.bootstrapTable.locales["de-DE"]=o.default.fn.bootstrapTable.locales.de={formatCopyRows:function(){return"Zeilen kopieren"},formatPrint:function(){return"Drucken"},formatLoadingMessage:function(){return"Lade, bitte warten"},formatRecordsPerPage:function(t){return"".concat(t," Zeilen pro Seite.")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Zeige Zeile ".concat(t," bis ").concat(n," von ").concat(o," Zeile").concat(o>1?"n":""," (Gefiltert von ").concat(r," Zeile").concat(r>1?"n":"",")"):"Zeige Zeile ".concat(t," bis ").concat(n," von ").concat(o," Zeile").concat(o>1?"n":"",".")},formatSRPaginationPreText:function(){return"Vorherige Seite"},formatSRPaginationPageText:function(t){return"Zu Seite ".concat(t)},formatSRPaginationNextText:function(){return"Nächste Seite"},formatDetailPagination:function(t){return"Zeige ".concat(t," Zeile").concat(t>1?"n":"",".")},formatClearSearch:function(){return"Lösche Filter"},formatSearch:function(){return"Suchen"},formatNoMatches:function(){return"Keine passenden Ergebnisse gefunden"},formatPaginationSwitch:function(){return"Verstecke/Zeige Nummerierung"},formatPaginationSwitchDown:function(){return"Zeige Nummerierung"},formatPaginationSwitchUp:function(){return"Verstecke Nummerierung"},formatRefresh:function(){return"Neu laden"},formatToggle:function(){return"Umschalten"},formatToggleOn:function(){return"Normale Ansicht"},formatToggleOff:function(){return"Kartenansicht"},formatColumns:function(){return"Spalten"},formatColumnsToggleAll:function(){return"Alle umschalten"},formatFullscreen:function(){return"Vollbild"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Automatisches Neuladen"},formatExport:function(){return"Datenexport"},formatJumpTo:function(){return"Springen"},formatAdvancedSearch:function(){return"Erweiterte Suche"},formatAdvancedCloseButton:function(){return"Schließen"},formatFilterControlSwitch:function(){return"Verstecke/Zeige Filter"},formatFilterControlSwitchHide:function(){return"Verstecke Filter"},formatFilterControlSwitchShow:function(){return"Zeige Filter"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["de-DE"]),o.default.fn.bootstrapTable.locales["el-GR"]=o.default.fn.bootstrapTable.locales.el={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Φορτώνει, παρακαλώ περιμένετε"},formatRecordsPerPage:function(t){return"".concat(t," αποτελέσματα ανά σελίδα")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Εμφανίζονται από την ".concat(t," ως την ").concat(n," από σύνολο ").concat(o," σειρών (filtered from ").concat(r," total rows)"):"Εμφανίζονται από την ".concat(t," ως την ").concat(n," από σύνολο ").concat(o," σειρών")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Αναζητήστε"},formatNoMatches:function(){return"Δεν βρέθηκαν αποτελέσματα"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["el-GR"]),o.default.fn.bootstrapTable.locales["en-US"]=o.default.fn.bootstrapTable.locales.en={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Loading, please wait"},formatRecordsPerPage:function(t){return"".concat(t," rows per page")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Showing ".concat(t," to ").concat(n," of ").concat(o," rows (filtered from ").concat(r," total rows)"):"Showing ".concat(t," to ").concat(n," of ").concat(o," rows")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["en-US"]),o.default.fn.bootstrapTable.locales["es-AR"]={formatCopyRows:function(){return"Copiar Filas"},formatPrint:function(){return"Imprimir"},formatLoadingMessage:function(){return"Cargando, espere por favor"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Mostrando desde ".concat(t," a ").concat(n," de ").concat(o," filas (filtrado de ").concat(r," columnas totales)"):"Mostrando desde ".concat(t," a ").concat(n," de ").concat(o," filas")},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"a la página ".concat(t)},formatSRPaginationNextText:function(){return"siguiente página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," columnas")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatPaginationSwitchDown:function(){return"Mostrar paginación"},formatPaginationSwitchUp:function(){return"Ocultar paginación"},formatRefresh:function(){return"Recargar"},formatToggle:function(){return"Cambiar"},formatToggleOn:function(){return"Mostrar vista de carta"},formatToggleOff:function(){return"Ocultar vista de carta"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Cambiar todo"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Recargar"},formatExport:function(){return"Exportar datos"},formatJumpTo:function(){return"Ir"},formatAdvancedSearch:function(){return"Búsqueda avanzada"},formatAdvancedCloseButton:function(){return"Cerrar"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["es-AR"]),o.default.fn.bootstrapTable.locales["es-CL"]={formatCopyRows:function(){return"Copiar Filas"},formatPrint:function(){return"Imprimir"},formatLoadingMessage:function(){return"Cargando, espere por favor"},formatRecordsPerPage:function(t){return"".concat(t," filas por página")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Mostrando ".concat(t," a ").concat(n," de ").concat(o," filas (filtrado de ").concat(r," filas totales)"):"Mostrando ".concat(t," a ").concat(n," de ").concat(o," filas")},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"a la página ".concat(t)},formatSRPaginationNextText:function(){return"siguiente página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," filas")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatPaginationSwitchDown:function(){return"Mostrar paginación"},formatPaginationSwitchUp:function(){return"Ocultar paginación"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Cambiar"},formatToggleOn:function(){return"Mostrar vista de carta"},formatToggleOff:function(){return"Ocultar vista de carta"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Cambiar todo"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Recargar"},formatExport:function(){return"Exportar datos"},formatJumpTo:function(){return"IR"},formatAdvancedSearch:function(){return"Búsqueda avanzada"},formatAdvancedCloseButton:function(){return"Cerrar"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["es-CL"]),o.default.fn.bootstrapTable.locales["es-CR"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Cargando, por favor espere"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Mostrando de ".concat(t," a ").concat(n," registros de ").concat(o," registros en total (filtered from ").concat(r," total rows)"):"Mostrando de ".concat(t," a ").concat(n," registros de ").concat(o," registros en total")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Alternar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["es-CR"]),o.default.fn.bootstrapTable.locales["es-ES"]=o.default.fn.bootstrapTable.locales.es={formatCopyRows:function(){return"Copiar filas"},formatPrint:function(){return"Imprimir"},formatLoadingMessage:function(){return"Por favor espere"},formatRecordsPerPage:function(t){return"".concat(t," resultados por página")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Mostrando desde ".concat(t," hasta ").concat(n," - En total ").concat(o," resultados (filtrado de ").concat(r," filas totales)"):"Mostrando desde ".concat(t," hasta ").concat(n," - En total ").concat(o," resultados")},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"a la página ".concat(t)},formatSRPaginationNextText:function(){return"siguiente página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," filas")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron resultados"},formatPaginationSwitch:function(){return"Ocultar/Mostrar paginación"},formatPaginationSwitchDown:function(){return"Mostrar paginación"},formatPaginationSwitchUp:function(){return"Ocultar paginación"},formatRefresh:function(){return"Recargar"},formatToggle:function(){return"Ocultar/Mostrar"},formatToggleOn:function(){return"Mostrar vista de carta"},formatToggleOff:function(){return"Ocultar vista de carta"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Cambiar todo"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todos"},formatAutoRefresh:function(){return"Auto Recargar"},formatExport:function(){return"Exportar los datos"},formatJumpTo:function(){return"IR"},formatAdvancedSearch:function(){return"Búsqueda avanzada"},formatAdvancedCloseButton:function(){return"Cerrar"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["es-ES"]),o.default.fn.bootstrapTable.locales["es-MX"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Cargando, espere por favor"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Mostrando ".concat(t," a ").concat(n," de ").concat(o," filas (filtered from ").concat(r," total rows)"):"Mostrando ".concat(t," a ").concat(n," de ").concat(o," filas")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Mostrando ".concat(t," filas")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros que coincidan"},formatPaginationSwitch:function(){return"Mostrar/ocultar paginación"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Actualizar"},formatToggle:function(){return"Cambiar vista"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Pantalla completa"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["es-MX"]),o.default.fn.bootstrapTable.locales["es-NI"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Cargando, por favor espere"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Mostrando de ".concat(t," a ").concat(n," registros de ").concat(o," registros en total (filtered from ").concat(r," total rows)"):"Mostrando de ".concat(t," a ").concat(n," registros de ").concat(o," registros en total")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se encontraron registros"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refrescar"},formatToggle:function(){return"Alternar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["es-NI"]),o.default.fn.bootstrapTable.locales["es-SP"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Cargando, por favor espera"},formatRecordsPerPage:function(t){return"".concat(t," registros por p&#225;gina.")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"".concat(t," - ").concat(n," de ").concat(o," registros (filtered from ").concat(r," total rows)"):"".concat(t," - ").concat(n," de ").concat(o," registros.")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Limpiar búsqueda"},formatSearch:function(){return"Buscar"},formatNoMatches:function(){return"No se han encontrado registros."},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Actualizar"},formatToggle:function(){return"Alternar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columnas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Todo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Ocultar/Mostrar controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Mostrar controles"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["es-SP"]),o.default.fn.bootstrapTable.locales["et-EE"]=o.default.fn.bootstrapTable.locales.et={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Päring käib, palun oota"},formatRecordsPerPage:function(t){return"".concat(t," rida lehe kohta")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Näitan tulemusi ".concat(t," kuni ").concat(n," - kokku ").concat(o," tulemust (filtered from ").concat(r," total rows)"):"Näitan tulemusi ".concat(t," kuni ").concat(n," - kokku ").concat(o," tulemust")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Otsi"},formatNoMatches:function(){return"Päringu tingimustele ei vastanud ühtegi tulemust"},formatPaginationSwitch:function(){return"Näita/Peida lehtedeks jagamine"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Värskenda"},formatToggle:function(){return"Lülita"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Veerud"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Kõik"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["et-EE"]),o.default.fn.bootstrapTable.locales["eu-EU"]=o.default.fn.bootstrapTable.locales.eu={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Itxaron mesedez"},formatRecordsPerPage:function(t){return"".concat(t," emaitza orriko.")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"".concat(o," erregistroetatik ").concat(t,"etik ").concat(n,"erakoak erakusten (filtered from ").concat(r," total rows)"):"".concat(o," erregistroetatik ").concat(t,"etik ").concat(n,"erakoak erakusten.")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Bilatu"},formatNoMatches:function(){return"Ez da emaitzarik aurkitu"},formatPaginationSwitch:function(){return"Ezkutatu/Erakutsi orrikatzea"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Eguneratu"},formatToggle:function(){return"Ezkutatu/Erakutsi"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Zutabeak"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Guztiak"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["eu-EU"]),o.default.fn.bootstrapTable.locales["fa-IR"]=o.default.fn.bootstrapTable.locales.fa={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"در حال بارگذاری, لطفا صبر کنید"},formatRecordsPerPage:function(t){return"".concat(t," رکورد در صفحه")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"نمایش ".concat(t," تا ").concat(n," از ").concat(o," ردیف (filtered from ").concat(r," total rows)"):"نمایش ".concat(t," تا ").concat(n," از ").concat(o," ردیف")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"جستجو"},formatNoMatches:function(){return"رکوردی یافت نشد."},formatPaginationSwitch:function(){return"نمایش/مخفی صفحه بندی"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"به روز رسانی"},formatToggle:function(){return"تغییر نمایش"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"سطر ها"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"همه"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["fa-IR"]),o.default.fn.bootstrapTable.locales["fi-FI"]=o.default.fn.bootstrapTable.locales.fi={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Ladataan, ole hyvä ja odota"},formatRecordsPerPage:function(t){return"".concat(t," riviä sivulla")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Näytetään rivit ".concat(t," - ").concat(n," / ").concat(o," (filtered from ").concat(r," total rows)"):"Näytetään rivit ".concat(t," - ").concat(n," / ").concat(o)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Poista suodattimet"},formatSearch:function(){return"Hae"},formatNoMatches:function(){return"Hakuehtoja vastaavia tuloksia ei löytynyt"},formatPaginationSwitch:function(){return"Näytä/Piilota sivutus"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Päivitä"},formatToggle:function(){return"Valitse"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Sarakkeet"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Kaikki"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Vie tiedot"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["fi-FI"]),o.default.fn.bootstrapTable.locales["fr-BE"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Affiche de ".concat(t," à ").concat(n," sur ").concat(o," lignes (filtrés à partir de ").concat(r," lignes)"):"Affiche de ".concat(t," à ").concat(n," sur ").concat(o," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affiche ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de lignes trouvés"},formatPaginationSwitch:function(){return"Cacher/Afficher pagination"},formatPaginationSwitchDown:function(){return"Afficher pagination"},formatPaginationSwitchUp:function(){return"Cacher pagination"},formatRefresh:function(){return"Rafraichir"},formatToggle:function(){return"Basculer"},formatToggleOn:function(){return"Afficher vue carte"},formatToggleOff:function(){return"Cacher vue carte"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout basculer"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Rafraîchissement automatique"},formatExport:function(){return"Exporter les données"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"},formatFilterControlSwitch:function(){return"Cacher/Afficher controls"},formatFilterControlSwitchHide:function(){return"Cacher controls"},formatFilterControlSwitchShow:function(){return"Afficher controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["fr-BE"]),o.default.fn.bootstrapTable.locales["fr-CH"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Affiche de ".concat(t," à ").concat(n," sur ").concat(o," lignes (filtrés à partir de ").concat(r," lignes)"):"Affiche de ".concat(t," à ").concat(n," sur ").concat(o," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affiche ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de lignes trouvés"},formatPaginationSwitch:function(){return"Cacher/Afficher pagination"},formatPaginationSwitchDown:function(){return"Afficher pagination"},formatPaginationSwitchUp:function(){return"Cacher pagination"},formatRefresh:function(){return"Rafraichir"},formatToggle:function(){return"Basculer"},formatToggleOn:function(){return"Afficher vue carte"},formatToggleOff:function(){return"Cacher vue carte"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout basculer"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Rafraîchissement automatique"},formatExport:function(){return"Exporter les données"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"},formatFilterControlSwitch:function(){return"Cacher/Afficher controls"},formatFilterControlSwitchHide:function(){return"Cacher controls"},formatFilterControlSwitchShow:function(){return"Afficher controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["fr-CH"]),o.default.fn.bootstrapTable.locales["fr-FR"]=o.default.fn.bootstrapTable.locales.fr={formatCopyRows:function(){return"Copier les lignes"},formatPrint:function(){return"Imprimer"},formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Affiche de ".concat(t," à ").concat(n," sur ").concat(o," lignes (filtrés à partir de ").concat(r," lignes)"):"Affiche de ".concat(t," à ").concat(n," sur ").concat(o," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affiche ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Aucun résultat"},formatPaginationSwitch:function(){return"Masquer/Afficher la pagination"},formatPaginationSwitchDown:function(){return"Afficher la pagination"},formatPaginationSwitchUp:function(){return"Masquer la pagination"},formatRefresh:function(){return"Actualiser"},formatToggle:function(){return"Basculer"},formatToggleOn:function(){return"Afficher la vue carte"},formatToggleOff:function(){return"Masquer la vue carte"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout basculer"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Actualisation automatique"},formatExport:function(){return"Exporter les données"},formatJumpTo:function(){return"ALLER"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"},formatFilterControlSwitch:function(){return"Masquer/Afficher les contrôles"},formatFilterControlSwitchHide:function(){return"Masquer les contrôles"},formatFilterControlSwitchShow:function(){return"Afficher les contrôles"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["fr-FR"]),o.default.fn.bootstrapTable.locales["fr-LU"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Chargement en cours"},formatRecordsPerPage:function(t){return"".concat(t," lignes par page")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Affiche de ".concat(t," à ").concat(n," sur ").concat(o," lignes (filtrés à partir de ").concat(r," lignes)"):"Affiche de ".concat(t," à ").concat(n," sur ").concat(o," lignes")},formatSRPaginationPreText:function(){return"page précédente"},formatSRPaginationPageText:function(t){return"vers la page ".concat(t)},formatSRPaginationNextText:function(){return"page suivante"},formatDetailPagination:function(t){return"Affiche ".concat(t," lignes")},formatClearSearch:function(){return"Effacer la recherche"},formatSearch:function(){return"Recherche"},formatNoMatches:function(){return"Pas de lignes trouvés"},formatPaginationSwitch:function(){return"Cacher/Afficher pagination"},formatPaginationSwitchDown:function(){return"Afficher pagination"},formatPaginationSwitchUp:function(){return"Cacher pagination"},formatRefresh:function(){return"Rafraichir"},formatToggle:function(){return"Basculer"},formatToggleOn:function(){return"Afficher vue carte"},formatToggleOff:function(){return"Cacher vue carte"},formatColumns:function(){return"Colonnes"},formatColumnsToggleAll:function(){return"Tout basculer"},formatFullscreen:function(){return"Plein écran"},formatAllRows:function(){return"Tout"},formatAutoRefresh:function(){return"Rafraîchissement automatique"},formatExport:function(){return"Exporter les données"},formatJumpTo:function(){return"Aller à"},formatAdvancedSearch:function(){return"Recherche avancée"},formatAdvancedCloseButton:function(){return"Fermer"},formatFilterControlSwitch:function(){return"Cacher/Afficher controls"},formatFilterControlSwitchHide:function(){return"Cacher controls"},formatFilterControlSwitchShow:function(){return"Afficher controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["fr-LU"]),o.default.fn.bootstrapTable.locales["he-IL"]=o.default.fn.bootstrapTable.locales.he={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"טוען, נא להמתין"},formatRecordsPerPage:function(t){return"".concat(t," שורות בעמוד")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"מציג ".concat(t," עד ").concat(n," מ-").concat(o,"שורות").concat(r," total rows)"):"מציג ".concat(t," עד ").concat(n," מ-").concat(o," שורות")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"חיפוש"},formatNoMatches:function(){return"לא נמצאו רשומות תואמות"},formatPaginationSwitch:function(){return"הסתר/הצג מספור דפים"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"רענן"},formatToggle:function(){return"החלף תצוגה"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"עמודות"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"הכל"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["he-IL"]),o.default.fn.bootstrapTable.locales["hr-HR"]=o.default.fn.bootstrapTable.locales.hr={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Molimo pričekajte"},formatRecordsPerPage:function(t){return"".concat(t," broj zapisa po stranici")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Prikazujem ".concat(t,". - ").concat(n,". od ukupnog broja zapisa ").concat(o," (filtered from ").concat(r," total rows)"):"Prikazujem ".concat(t,". - ").concat(n,". od ukupnog broja zapisa ").concat(o)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Pretraži"},formatNoMatches:function(){return"Nije pronađen niti jedan zapis"},formatPaginationSwitch:function(){return"Prikaži/sakrij stranice"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Osvježi"},formatToggle:function(){return"Promijeni prikaz"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolone"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Sve"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["hr-HR"]),o.default.fn.bootstrapTable.locales["hu-HU"]=o.default.fn.bootstrapTable.locales.hu={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Betöltés, kérem várjon"},formatRecordsPerPage:function(t){return"".concat(t," rekord per oldal")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Megjelenítve ".concat(t," - ").concat(n," / ").concat(o," összesen (filtered from ").concat(r," total rows)"):"Megjelenítve ".concat(t," - ").concat(n," / ").concat(o," összesen")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Keresés"},formatNoMatches:function(){return"Nincs találat"},formatPaginationSwitch:function(){return"Lapozó elrejtése/megjelenítése"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Frissítés"},formatToggle:function(){return"Összecsuk/Kinyit"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Oszlopok"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Összes"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["hu-HU"]),o.default.fn.bootstrapTable.locales["id-ID"]=o.default.fn.bootstrapTable.locales.id={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Memuat, mohon tunggu"},formatRecordsPerPage:function(t){return"".concat(t," baris per halaman")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Menampilkan ".concat(t," sampai ").concat(n," dari ").concat(o," baris (filtered from ").concat(r," total rows)"):"Menampilkan ".concat(t," sampai ").concat(n," dari ").concat(o," baris")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Bersihkan filter"},formatSearch:function(){return"Pencarian"},formatNoMatches:function(){return"Tidak ditemukan data yang cocok"},formatPaginationSwitch:function(){return"Sembunyikan/Tampilkan halaman"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Muat ulang"},formatToggle:function(){return"Beralih"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"kolom"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Semua"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Ekspor data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["id-ID"]),o.default.fn.bootstrapTable.locales["it-IT"]=o.default.fn.bootstrapTable.locales.it={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Caricamento in corso"},formatRecordsPerPage:function(t){return"".concat(t," elementi per pagina")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Visualizzazione da ".concat(t," a ").concat(n," di ").concat(o," elementi (filtrati da ").concat(r," elementi totali)"):"Visualizzazione da ".concat(t," a ").concat(n," di ").concat(o," elementi")},formatSRPaginationPreText:function(){return"pagina precedente"},formatSRPaginationPageText:function(t){return"alla pagina ".concat(t)},formatSRPaginationNextText:function(){return"pagina successiva"},formatDetailPagination:function(t){return"Mostrando ".concat(t," elementi")},formatClearSearch:function(){return"Pulisci filtri"},formatSearch:function(){return"Cerca"},formatNoMatches:function(){return"Nessun elemento trovato"},formatPaginationSwitch:function(){return"Nascondi/Mostra paginazione"},formatPaginationSwitchDown:function(){return"Mostra paginazione"},formatPaginationSwitchUp:function(){return"Nascondi paginazione"},formatRefresh:function(){return"Aggiorna"},formatToggle:function(){return"Attiva/Disattiva"},formatToggleOn:function(){return"Mostra visuale a scheda"},formatToggleOff:function(){return"Nascondi visuale a scheda"},formatColumns:function(){return"Colonne"},formatColumnsToggleAll:function(){return"Mostra tutte"},formatFullscreen:function(){return"Schermo intero"},formatAllRows:function(){return"Tutto"},formatAutoRefresh:function(){return"Auto Aggiornamento"},formatExport:function(){return"Esporta dati"},formatJumpTo:function(){return"VAI"},formatAdvancedSearch:function(){return"Filtri avanzati"},formatAdvancedCloseButton:function(){return"Chiudi"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["it-IT"]),o.default.fn.bootstrapTable.locales["ja-JP"]=o.default.fn.bootstrapTable.locales.ja={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"読み込み中です。少々お待ちください。"},formatRecordsPerPage:function(t){return"ページ当たり最大".concat(t,"件")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"全".concat(o,"件から、").concat(t,"から").concat(n,"件目まで表示しています (filtered from ").concat(r," total rows)"):"全".concat(o,"件から、").concat(t,"から").concat(n,"件目まで表示しています")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"検索"},formatNoMatches:function(){return"該当するレコードが見つかりません"},formatPaginationSwitch:function(){return"ページ数を表示・非表示"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"更新"},formatToggle:function(){return"トグル"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"列"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"すべて"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["ja-JP"]),o.default.fn.bootstrapTable.locales["ka-GE"]=o.default.fn.bootstrapTable.locales.ka={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"იტვირთება, გთხოვთ მოიცადოთ"},formatRecordsPerPage:function(t){return"".concat(t," ჩანაწერი თითო გვერდზე")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"ნაჩვენებია ".concat(t,"-დან ").concat(n,"-მდე ჩანაწერი ჯამური ").concat(o,"-დან (filtered from ").concat(r," total rows)"):"ნაჩვენებია ".concat(t,"-დან ").concat(n,"-მდე ჩანაწერი ჯამური ").concat(o,"-დან")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"ძებნა"},formatNoMatches:function(){return"მონაცემები არ არის"},formatPaginationSwitch:function(){return"გვერდების გადამრთველის დამალვა/გამოჩენა"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"განახლება"},formatToggle:function(){return"ჩართვა/გამორთვა"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"სვეტები"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["ka-GE"]),o.default.fn.bootstrapTable.locales["ko-KR"]=o.default.fn.bootstrapTable.locales.ko={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"데이터를 불러오는 중입니다"},formatRecordsPerPage:function(t){return"페이지 당 ".concat(t,"개 데이터 출력")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"전체 ".concat(o,"개 중 ").concat(t,"~").concat(n,"번째 데이터 출력, (filtered from ").concat(r," total rows)"):"전체 ".concat(o,"개 중 ").concat(t,"~").concat(n,"번째 데이터 출력,")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"검색"},formatNoMatches:function(){return"조회된 데이터가 없습니다."},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"새로 고침"},formatToggle:function(){return"전환"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"컬럼 필터링"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["ko-KR"]),o.default.fn.bootstrapTable.locales["ms-MY"]=o.default.fn.bootstrapTable.locales.ms={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Permintaan sedang dimuatkan. Sila tunggu sebentar"},formatRecordsPerPage:function(t){return"".concat(t," rekod setiap muka surat")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Sedang memaparkan rekod ".concat(t," hingga ").concat(n," daripada jumlah ").concat(o," rekod (filtered from ").concat(r," total rows)"):"Sedang memaparkan rekod ".concat(t," hingga ").concat(n," daripada jumlah ").concat(o," rekod")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Cari"},formatNoMatches:function(){return"Tiada rekod yang menyamai permintaan"},formatPaginationSwitch:function(){return"Tunjuk/sembunyi muka surat"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Muatsemula"},formatToggle:function(){return"Tukar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Lajur"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Semua"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["ms-MY"]),o.default.fn.bootstrapTable.locales["nb-NO"]=o.default.fn.bootstrapTable.locales.nb={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Oppdaterer, vennligst vent"},formatRecordsPerPage:function(t){return"".concat(t," poster pr side")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Viser ".concat(t," til ").concat(n," av ").concat(o," rekker (filtered from ").concat(r," total rows)"):"Viser ".concat(t," til ").concat(n," av ").concat(o," rekker")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Søk"},formatNoMatches:function(){return"Ingen poster funnet"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Oppdater"},formatToggle:function(){return"Endre"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Kolonner"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["nb-NO"]),o.default.fn.bootstrapTable.locales["nl-BE"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Laden, even geduld"},formatRecordsPerPage:function(t){return"".concat(t," records per pagina")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Toon ".concat(t," tot ").concat(n," van ").concat(o," record").concat(o>1?"s":""," (gefilterd van ").concat(r," records in totaal)"):"Toon ".concat(t," tot ").concat(n," van ").concat(o," record").concat(o>1?"s":"")},formatSRPaginationPreText:function(){return"vorige pagina"},formatSRPaginationPageText:function(t){return"tot pagina ".concat(t)},formatSRPaginationNextText:function(){return"volgende pagina"},formatDetailPagination:function(t){return"Toon ".concat(t," record").concat(t>1?"s":"")},formatClearSearch:function(){return"Verwijder filters"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"},formatPaginationSwitch:function(){return"Verberg/Toon paginering"},formatPaginationSwitchDown:function(){return"Toon paginering"},formatPaginationSwitchUp:function(){return"Verberg paginering"},formatRefresh:function(){return"Vernieuwen"},formatToggle:function(){return"Omschakelen"},formatToggleOn:function(){return"Toon kaartweergave"},formatToggleOff:function(){return"Verberg kaartweergave"},formatColumns:function(){return"Kolommen"},formatColumnsToggleAll:function(){return"Allen omschakelen"},formatFullscreen:function(){return"Volledig scherm"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Automatisch vernieuwen"},formatExport:function(){return"Exporteer gegevens"},formatJumpTo:function(){return"GA"},formatAdvancedSearch:function(){return"Geavanceerd zoeken"},formatAdvancedCloseButton:function(){return"Sluiten"},formatFilterControlSwitch:function(){return"Verberg/Toon controls"},formatFilterControlSwitchHide:function(){return"Verberg controls"},formatFilterControlSwitchShow:function(){return"Toon controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["nl-BE"]),o.default.fn.bootstrapTable.locales["nl-NL"]=o.default.fn.bootstrapTable.locales.nl={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Laden, even geduld"},formatRecordsPerPage:function(t){return"".concat(t," records per pagina")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Toon ".concat(t," tot ").concat(n," van ").concat(o," record").concat(o>1?"s":""," (gefilterd van ").concat(r," records in totaal)"):"Toon ".concat(t," tot ").concat(n," van ").concat(o," record").concat(o>1?"s":"")},formatSRPaginationPreText:function(){return"vorige pagina"},formatSRPaginationPageText:function(t){return"tot pagina ".concat(t)},formatSRPaginationNextText:function(){return"volgende pagina"},formatDetailPagination:function(t){return"Toon ".concat(t," record").concat(t>1?"s":"")},formatClearSearch:function(){return"Verwijder filters"},formatSearch:function(){return"Zoeken"},formatNoMatches:function(){return"Geen resultaten gevonden"},formatPaginationSwitch:function(){return"Verberg/Toon paginering"},formatPaginationSwitchDown:function(){return"Toon paginering"},formatPaginationSwitchUp:function(){return"Verberg paginering"},formatRefresh:function(){return"Vernieuwen"},formatToggle:function(){return"Omschakelen"},formatToggleOn:function(){return"Toon kaartweergave"},formatToggleOff:function(){return"Verberg kaartweergave"},formatColumns:function(){return"Kolommen"},formatColumnsToggleAll:function(){return"Allen omschakelen"},formatFullscreen:function(){return"Volledig scherm"},formatAllRows:function(){return"Alle"},formatAutoRefresh:function(){return"Automatisch vernieuwen"},formatExport:function(){return"Exporteer gegevens"},formatJumpTo:function(){return"GA"},formatAdvancedSearch:function(){return"Geavanceerd zoeken"},formatAdvancedCloseButton:function(){return"Sluiten"},formatFilterControlSwitch:function(){return"Verberg/Toon controls"},formatFilterControlSwitchHide:function(){return"Verberg controls"},formatFilterControlSwitchShow:function(){return"Toon controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["nl-NL"]),o.default.fn.bootstrapTable.locales["pl-PL"]=o.default.fn.bootstrapTable.locales.pl={formatCopyRows:function(){return"Kopiuj wiersze"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Ładowanie, proszę czekać"},formatRecordsPerPage:function(t){return"".concat(t," rekordów na stronę")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Wyświetlanie rekordów od ".concat(t," do ").concat(n," z ").concat(o," (filtered from ").concat(r," total rows)"):"Wyświetlanie rekordów od ".concat(t," do ").concat(n," z ").concat(o)},formatSRPaginationPreText:function(){return"poprzednia strona"},formatSRPaginationPageText:function(t){return"z ".concat(t)},formatSRPaginationNextText:function(){return"następna strona"},formatDetailPagination:function(t){return"Wyświetla ".concat(t," wierszy")},formatClearSearch:function(){return"Wyczyść wyszukiwanie"},formatSearch:function(){return"Szukaj"},formatNoMatches:function(){return"Niestety, nic nie znaleziono"},formatPaginationSwitch:function(){return"Pokaż/ukryj stronicowanie"},formatPaginationSwitchDown:function(){return"Pokaż stronicowanie"},formatPaginationSwitchUp:function(){return"Ukryj stronicowanie"},formatRefresh:function(){return"Odśwież"},formatToggle:function(){return"Przełącz"},formatToggleOn:function(){return"Pokaż układ karty"},formatToggleOff:function(){return"Ukryj układ karty"},formatColumns:function(){return"Kolumny"},formatColumnsToggleAll:function(){return"Zaznacz wszystko"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Wszystkie"},formatAutoRefresh:function(){return"Auto odświeżanie"},formatExport:function(){return"Eksport danych"},formatJumpTo:function(){return"Przejdź"},formatAdvancedSearch:function(){return"Wyszukiwanie zaawansowane"},formatAdvancedCloseButton:function(){return"Zamknij"},formatFilterControlSwitch:function(){return"Pokaż/Ukryj"},formatFilterControlSwitchHide:function(){return"Pokaż"},formatFilterControlSwitchShow:function(){return"Ukryj"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["pl-PL"]),o.default.fn.bootstrapTable.locales["pt-BR"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Carregando, aguarde"},formatRecordsPerPage:function(t){return"".concat(t," registros por página")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Exibindo ".concat(t," até ").concat(n," de ").concat(o," linhas (filtradas de um total de ").concat(r," linhas)"):"Exibindo ".concat(t," até ").concat(n," de ").concat(o," linhas")},formatSRPaginationPreText:function(){return"página anterior"},formatSRPaginationPageText:function(t){return"Para a página ".concat(t)},formatSRPaginationNextText:function(){return"próxima página"},formatDetailPagination:function(t){return"Mostrando ".concat(t," linhas")},formatClearSearch:function(){return"Limpar Pesquisa"},formatSearch:function(){return"Pesquisar"},formatNoMatches:function(){return"Nenhum registro encontrado"},formatPaginationSwitch:function(){return"Ocultar/Exibir paginação"},formatPaginationSwitchDown:function(){return"Mostrar Paginação"},formatPaginationSwitchUp:function(){return"Esconder Paginação"},formatRefresh:function(){return"Recarregar"},formatToggle:function(){return"Alternar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Colunas"},formatColumnsToggleAll:function(){return"Alternar tudo"},formatFullscreen:function(){return"Tela cheia"},formatAllRows:function(){return"Tudo"},formatAutoRefresh:function(){return"Atualização Automática"},formatExport:function(){return"Exportar dados"},formatJumpTo:function(){return"IR"},formatAdvancedSearch:function(){return"Pesquisa Avançada"},formatAdvancedCloseButton:function(){return"Fechar"},formatFilterControlSwitch:function(){return"Ocultar/Exibir controles"},formatFilterControlSwitchHide:function(){return"Ocultar controles"},formatFilterControlSwitchShow:function(){return"Exibir controles"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["pt-BR"]),o.default.fn.bootstrapTable.locales["pt-PT"]=o.default.fn.bootstrapTable.locales.pt={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"A carregar, por favor aguarde"},formatRecordsPerPage:function(t){return"".concat(t," registos por p&aacute;gina")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"A mostrar ".concat(t," at&eacute; ").concat(n," de ").concat(o," linhas (filtered from ").concat(r," total rows)"):"A mostrar ".concat(t," at&eacute; ").concat(n," de ").concat(o," linhas")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Pesquisa"},formatNoMatches:function(){return"Nenhum registo encontrado"},formatPaginationSwitch:function(){return"Esconder/Mostrar pagina&ccedil&atilde;o"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Atualizar"},formatToggle:function(){return"Alternar"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Colunas"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Tudo"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["pt-PT"]),o.default.fn.bootstrapTable.locales["ro-RO"]=o.default.fn.bootstrapTable.locales.ro={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Se incarca, va rugam asteptati"},formatRecordsPerPage:function(t){return"".concat(t," inregistrari pe pagina")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Arata de la ".concat(t," pana la ").concat(n," din ").concat(o," randuri (filtered from ").concat(r," total rows)"):"Arata de la ".concat(t," pana la ").concat(n," din ").concat(o," randuri")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Cauta"},formatNoMatches:function(){return"Nu au fost gasite inregistrari"},formatPaginationSwitch:function(){return"Ascunde/Arata paginatia"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Reincarca"},formatToggle:function(){return"Comuta"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Coloane"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Toate"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["ro-RO"]),o.default.fn.bootstrapTable.locales["ru-RU"]=o.default.fn.bootstrapTable.locales.ru={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Пожалуйста, подождите, идёт загрузка"},formatRecordsPerPage:function(t){return"".concat(t," записей на страницу")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Записи с ".concat(t," по ").concat(n," из ").concat(o," (filtered from ").concat(r," total rows)"):"Записи с ".concat(t," по ").concat(n," из ").concat(o)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Очистить фильтры"},formatSearch:function(){return"Поиск"},formatNoMatches:function(){return"Ничего не найдено"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Обновить"},formatToggle:function(){return"Переключить"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Колонки"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["ru-RU"]),o.default.fn.bootstrapTable.locales["sk-SK"]=o.default.fn.bootstrapTable.locales.sk={formatCopyRows:function(){return"Skopírovať riadky"},formatPrint:function(){return"Vytlačiť"},formatLoadingMessage:function(){return"Prosím čakajte"},formatRecordsPerPage:function(t){return"".concat(t," záznamov na stranu")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Zobrazená ".concat(t,". - ").concat(n,". položka z celkových ").concat(o," (filtered from ").concat(r," total rows)"):"Zobrazená ".concat(t,". - ").concat(n,". položka z celkových ").concat(o)},formatSRPaginationPreText:function(){return"Predchádzajúca strana"},formatSRPaginationPageText:function(t){return"na stranu ".concat(t)},formatSRPaginationNextText:function(){return"Nasledujúca strana"},formatDetailPagination:function(t){return"Zobrazuje sa ".concat(t," riadkov")},formatClearSearch:function(){return"Odstráň filtre"},formatSearch:function(){return"Vyhľadávanie"},formatNoMatches:function(){return"Nenájdená žiadna vyhovujúca položka"},formatPaginationSwitch:function(){return"Skry/Zobraz stránkovanie"},formatPaginationSwitchDown:function(){return"Zobraziť stránkovanie"},formatPaginationSwitchUp:function(){return"Skryť stránkovanie"},formatRefresh:function(){return"Obnoviť"},formatToggle:function(){return"Prepni"},formatToggleOn:function(){return"Zobraziť kartové zobrazenie"},formatToggleOff:function(){return"skryť kartové zobrazenie"},formatColumns:function(){return"Stĺpce"},formatColumnsToggleAll:function(){return"Prepnúť všetky"},formatFullscreen:function(){return"Celá obrazovka"},formatAllRows:function(){return"Všetky"},formatAutoRefresh:function(){return"Automatické obnovenie"},formatExport:function(){return"Exportuj dáta"},formatJumpTo:function(){return"Ísť"},formatAdvancedSearch:function(){return"Pokročilé vyhľadávanie"},formatAdvancedCloseButton:function(){return"Zatvoriť"},formatFilterControlSwitch:function(){return"Zobraziť/Skryť tlačidlá"},formatFilterControlSwitchHide:function(){return"Skryť tlačidlá"},formatFilterControlSwitchShow:function(){return"Zobraziť tlačidlá"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["sk-SK"]),o.default.fn.bootstrapTable.locales["sr-Cyrl-RS"]=o.default.fn.bootstrapTable.locales.sr={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Молим сачекај"},formatRecordsPerPage:function(t){return"".concat(t," редова по страни")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Приказано ".concat(t,". - ").concat(n,". од укупног броја редова ").concat(o," (филтрирано од ").concat(r,")"):"Приказано ".concat(t,". - ").concat(n,". од укупног броја редова ").concat(o)},formatSRPaginationPreText:function(){return"претходна страна"},formatSRPaginationPageText:function(t){return"на страну ".concat(t)},formatSRPaginationNextText:function(){return"следећа страна"},formatDetailPagination:function(t){return"Приказано ".concat(t," редова")},formatClearSearch:function(){return"Обриши претрагу"},formatSearch:function(){return"Пронађи"},formatNoMatches:function(){return"Није пронађен ни један податак"},formatPaginationSwitch:function(){return"Прикажи/сакриј пагинацију"},formatPaginationSwitchDown:function(){return"Прикажи пагинацију"},formatPaginationSwitchUp:function(){return"Сакриј пагинацију"},formatRefresh:function(){return"Освежи"},formatToggle:function(){return"Промени приказ"},formatToggleOn:function(){return"Прикажи картице"},formatToggleOff:function(){return"Сакриј картице"},formatColumns:function(){return"Колоне"},formatColumnsToggleAll:function(){return"Прикажи/сакриј све"},formatFullscreen:function(){return"Цео екран"},formatAllRows:function(){return"Све"},formatAutoRefresh:function(){return"Аутоматско освежавање"},formatExport:function(){return"Извези податке"},formatJumpTo:function(){return"Иди"},formatAdvancedSearch:function(){return"Напредна претрага"},formatAdvancedCloseButton:function(){return"Затвори"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["sr-Cyrl-RS"]),o.default.fn.bootstrapTable.locales["sr-Latn-RS"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Molim sačekaj"},formatRecordsPerPage:function(t){return"".concat(t," redova po strani")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Prikazano ".concat(t,". - ").concat(n,". od ukupnog broja redova ").concat(o," (filtrirano od ").concat(r,")"):"Prikazano ".concat(t,". - ").concat(n,". od ukupnog broja redova ").concat(o)},formatSRPaginationPreText:function(){return"prethodna strana"},formatSRPaginationPageText:function(t){return"na stranu ".concat(t)},formatSRPaginationNextText:function(){return"sledeća strana"},formatDetailPagination:function(t){return"Prikazano ".concat(t," redova")},formatClearSearch:function(){return"Obriši pretragu"},formatSearch:function(){return"Pronađi"},formatNoMatches:function(){return"Nije pronađen ni jedan podatak"},formatPaginationSwitch:function(){return"Prikaži/sakrij paginaciju"},formatPaginationSwitchDown:function(){return"Prikaži paginaciju"},formatPaginationSwitchUp:function(){return"Sakrij paginaciju"},formatRefresh:function(){return"Osveži"},formatToggle:function(){return"Promeni prikaz"},formatToggleOn:function(){return"Prikaži kartice"},formatToggleOff:function(){return"Sakrij kartice"},formatColumns:function(){return"Kolone"},formatColumnsToggleAll:function(){return"Prikaži/sakrij sve"},formatFullscreen:function(){return"Ceo ekran"},formatAllRows:function(){return"Sve"},formatAutoRefresh:function(){return"Automatsko osvežavanje"},formatExport:function(){return"Izvezi podatke"},formatJumpTo:function(){return"Idi"},formatAdvancedSearch:function(){return"Napredna pretraga"},formatAdvancedCloseButton:function(){return"Zatvori"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["sr-Latn-RS"]),o.default.fn.bootstrapTable.locales["sv-SE"]=o.default.fn.bootstrapTable.locales.sv={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Laddar, vänligen vänta"},formatRecordsPerPage:function(t){return"".concat(t," rader per sida")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Visa ".concat(t," till ").concat(n," av ").concat(o," rader (filtered from ").concat(r," total rows)"):"Visa ".concat(t," till ").concat(n," av ").concat(o," rader")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Sök"},formatNoMatches:function(){return"Inga matchande resultat funna."},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Uppdatera"},formatToggle:function(){return"Skifta"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"kolumn"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["sv-SE"]),o.default.fn.bootstrapTable.locales["th-TH"]=o.default.fn.bootstrapTable.locales.th={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"กำลังโหลดข้อมูล, กรุณารอสักครู่"},formatRecordsPerPage:function(t){return"".concat(t," รายการต่อหน้า")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"รายการที่ ".concat(t," ถึง ").concat(n," จากทั้งหมด ").concat(o," รายการ (filtered from ").concat(r," total rows)"):"รายการที่ ".concat(t," ถึง ").concat(n," จากทั้งหมด ").concat(o," รายการ")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"ค้นหา"},formatNoMatches:function(){return"ไม่พบรายการที่ค้นหา !"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"รีเฟรส"},formatToggle:function(){return"สลับมุมมอง"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"คอลัมน์"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["th-TH"]),o.default.fn.bootstrapTable.locales["tr-TR"]=o.default.fn.bootstrapTable.locales.tr={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Yükleniyor, lütfen bekleyin"},formatRecordsPerPage:function(t){return"Sayfa başına ".concat(t," kayıt.")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"".concat(o," kayıttan ").concat(t,"-").concat(n," arası gösteriliyor (filtered from ").concat(r," total rows)."):"".concat(o," kayıttan ").concat(t,"-").concat(n," arası gösteriliyor.")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Ara"},formatNoMatches:function(){return"Eşleşen kayıt bulunamadı."},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Yenile"},formatToggle:function(){return"Değiştir"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Sütunlar"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Tüm Satırlar"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["tr-TR"]),o.default.fn.bootstrapTable.locales["uk-UA"]=o.default.fn.bootstrapTable.locales.uk={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Завантаження, будь ласка, зачекайте"},formatRecordsPerPage:function(t){return"".concat(t," записів на сторінку")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Показано з ".concat(t," по ").concat(n,". Всього: ").concat(o," (filtered from ").concat(r," total rows)"):"Показано з ".concat(t," по ").concat(n,". Всього: ").concat(o)},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Очистити фільтри"},formatSearch:function(){return"Пошук"},formatNoMatches:function(){return"Не знайдено жодного запису"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Оновити"},formatToggle:function(){return"Змінити"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Стовпці"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["uk-UA"]),o.default.fn.bootstrapTable.locales["ur-PK"]=o.default.fn.bootstrapTable.locales.ur={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"براۓ مہربانی انتظار کیجئے"},formatRecordsPerPage:function(t){return"".concat(t," ریکارڈز فی صفہ ")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"دیکھیں ".concat(t," سے ").concat(n," کے ").concat(o,"ریکارڈز (filtered from ").concat(r," total rows)"):"دیکھیں ".concat(t," سے ").concat(n," کے ").concat(o,"ریکارڈز")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"تلاش"},formatNoMatches:function(){return"کوئی ریکارڈ نہیں ملا"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"تازہ کریں"},formatToggle:function(){return"تبدیل کریں"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"کالم"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["ur-PK"]),o.default.fn.bootstrapTable.locales["uz-Latn-UZ"]=o.default.fn.bootstrapTable.locales.uz={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Yuklanyapti, iltimos kuting"},formatRecordsPerPage:function(t){return"".concat(t," qator har sahifada")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Ko'rsatypati ".concat(t," dan ").concat(n," gacha ").concat(o," qatorlarni (filtered from ").concat(r," total rows)"):"Ko'rsatypati ".concat(t," dan ").concat(n," gacha ").concat(o," qatorlarni")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Filtrlarni tozalash"},formatSearch:function(){return"Qidirish"},formatNoMatches:function(){return"Hech narsa topilmadi"},formatPaginationSwitch:function(){return"Sahifalashni yashirish/ko'rsatish"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Yangilash"},formatToggle:function(){return"Ko'rinish"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Ustunlar"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"Hammasi"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Eksport"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["uz-Latn-UZ"]),o.default.fn.bootstrapTable.locales["vi-VN"]=o.default.fn.bootstrapTable.locales.vi={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"Đang tải"},formatRecordsPerPage:function(t){return"".concat(t," bản ghi mỗi trang")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"Hiển thị từ trang ".concat(t," đến ").concat(n," của ").concat(o," bảng ghi (filtered from ").concat(r," total rows)"):"Hiển thị từ trang ".concat(t," đến ").concat(n," của ").concat(o," bảng ghi")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatClearSearch:function(){return"Clear Search"},formatSearch:function(){return"Tìm kiếm"},formatNoMatches:function(){return"Không có dữ liệu"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"},formatAutoRefresh:function(){return"Auto Refresh"},formatExport:function(){return"Export data"},formatJumpTo:function(){return"GO"},formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"},formatFilterControlSwitch:function(){return"Hide/Show controls"},formatFilterControlSwitchHide:function(){return"Hide controls"},formatFilterControlSwitchShow:function(){return"Show controls"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["vi-VN"]),o.default.fn.bootstrapTable.locales["zh-CN"]=o.default.fn.bootstrapTable.locales.zh={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"正在努力地加载数据中，请稍候"},formatRecordsPerPage:function(t){return"每页显示 ".concat(t," 条记录")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"显示第 ".concat(t," 到第 ").concat(n," 条记录，总共 ").concat(o," 条记录（从 ").concat(r," 总记录中过滤）"):"显示第 ".concat(t," 到第 ").concat(n," 条记录，总共 ").concat(o," 条记录")},formatSRPaginationPreText:function(){return"上一页"},formatSRPaginationPageText:function(t){return"第".concat(t,"页")},formatSRPaginationNextText:function(){return"下一页"},formatDetailPagination:function(t){return"总共 ".concat(t," 条记录")},formatClearSearch:function(){return"清空过滤"},formatSearch:function(){return"搜索"},formatNoMatches:function(){return"没有找到匹配的记录"},formatPaginationSwitch:function(){return"隐藏/显示分页"},formatPaginationSwitchDown:function(){return"显示分页"},formatPaginationSwitchUp:function(){return"隐藏分页"},formatRefresh:function(){return"刷新"},formatToggle:function(){return"切换"},formatToggleOn:function(){return"显示卡片视图"},formatToggleOff:function(){return"隐藏卡片视图"},formatColumns:function(){return"列"},formatColumnsToggleAll:function(){return"切换所有"},formatFullscreen:function(){return"全屏"},formatAllRows:function(){return"所有"},formatAutoRefresh:function(){return"自动刷新"},formatExport:function(){return"导出数据"},formatJumpTo:function(){return"跳转"},formatAdvancedSearch:function(){return"高级搜索"},formatAdvancedCloseButton:function(){return"关闭"},formatFilterControlSwitch:function(){return"隐藏/显示过滤控制"},formatFilterControlSwitchHide:function(){return"隐藏过滤控制"},formatFilterControlSwitchShow:function(){return"显示过滤控制"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["zh-CN"]),o.default.fn.bootstrapTable.locales["zh-TW"]={formatCopyRows:function(){return"Copy Rows"},formatPrint:function(){return"Print"},formatLoadingMessage:function(){return"正在努力地載入資料，請稍候"},formatRecordsPerPage:function(t){return"每頁顯示 ".concat(t," 項記錄")},formatShowingRows:function(t,n,o,r){return void 0!==r&&r>0&&r>o?"顯示第 ".concat(t," 到第 ").concat(n," 項記錄，總共 ").concat(o," 項記錄（從 ").concat(r," 總記錄中過濾）"):"顯示第 ".concat(t," 到第 ").concat(n," 項記錄，總共 ").concat(o," 項記錄")},formatSRPaginationPreText:function(){return"上一頁"},formatSRPaginationPageText:function(t){return"第".concat(t,"頁")},formatSRPaginationNextText:function(){return"下一頁"},formatDetailPagination:function(t){return"總共 ".concat(t," 項記錄")},formatClearSearch:function(){return"清空過濾"},formatSearch:function(){return"搜尋"},formatNoMatches:function(){return"沒有找到符合的結果"},formatPaginationSwitch:function(){return"隱藏/顯示分頁"},formatPaginationSwitchDown:function(){return"顯示分頁"},formatPaginationSwitchUp:function(){return"隱藏分頁"},formatRefresh:function(){return"重新整理"},formatToggle:function(){return"切換"},formatToggleOn:function(){return"顯示卡片視圖"},formatToggleOff:function(){return"隱藏卡片視圖"},formatColumns:function(){return"列"},formatColumnsToggleAll:function(){return"切換所有"},formatFullscreen:function(){return"全屏"},formatAllRows:function(){return"所有"},formatAutoRefresh:function(){return"自動刷新"},formatExport:function(){return"導出數據"},formatJumpTo:function(){return"跳轉"},formatAdvancedSearch:function(){return"高級搜尋"},formatAdvancedCloseButton:function(){return"關閉"},formatFilterControlSwitch:function(){return"隱藏/顯示過濾控制"},formatFilterControlSwitchHide:function(){return"隱藏過濾控制"},formatFilterControlSwitchShow:function(){return"顯示過濾控制"}},o.default.extend(o.default.fn.bootstrapTable.defaults,o.default.fn.bootstrapTable.locales["zh-TW"])}));
diff --git a/web/skins/classic/js/bootstrap-table-page-jump-to.min.js b/web/skins/classic/js/bootstrap-table-page-jump-to.min.js
index f4bb237ad..9a5d09a55 100644
--- a/web/skins/classic/js/bootstrap-table-page-jump-to.min.js
+++ b/web/skins/classic/js/bootstrap-table-page-jump-to.min.js
@@ -1,10 +1,10 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.17.1
+  * @version v1.18.1
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
   */
 
-!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(t,n){return t(n={exports:{}},n.exports),n.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},y="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?y.call(t,""):Object(t)}:Object,h=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},b=function(t){return d(h(t))},v=function(t){return"object"==typeof t?null!==t:"function"==typeof t},g=function(t,n){if(!v(t))return t;var e,r;if(n&&"function"==typeof(e=t.toString)&&!v(r=e.call(t)))return r;if("function"==typeof(e=t.valueOf)&&!v(r=e.call(t)))return r;if(!n&&"function"==typeof(e=t.toString)&&!v(r=e.call(t)))return r;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,w=function(t,n){return m.call(t,n)},O=o.document,j=v(O)&&v(O.createElement),S=function(t){return j?O.createElement(t):{}},T=!u&&!i((function(){return 7!=Object.defineProperty(S("div"),"a",{get:function(){return 7}}).a})),P=Object.getOwnPropertyDescriptor,E={f:u?P:function(t,n){if(t=b(t),n=g(n,!0),T)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!v(t))throw TypeError(String(t)+" is not an object");return t},_=Object.defineProperty,A={f:u?_:function(t,n,e){if(x(t),n=g(n,!0),x(e),T)try{return _(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(t[n]=e.value),t}},M=u?function(t,n,e){return A.f(t,n,l(1,e))}:function(t,n,e){return t[n]=e,t},k=function(t,n){try{M(o,t,n)}catch(e){o[t]=n}return n},C=o["__core-js_shared__"]||k("__core-js_shared__",{}),I=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return I.call(t)});var F,N,R,L=C.inspectSource,q=o.WeakMap,z="function"==typeof q&&/native code/.test(L(q)),D=e((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,J=Math.random(),W=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+J).toString(36)},B=D("keys"),K=function(t){return B[t]||(B[t]=W(t))},Q={},V=o.WeakMap;if(z){var X=new V,Y=X.get,$=X.has,H=X.set;F=function(t,n){return H.call(X,t,n),n},N=function(t){return Y.call(X,t)||{}},R=function(t){return $.call(X,t)}}else{var U=K("state");Q[U]=!0,F=function(t,n){return M(t,U,n),n},N=function(t){return w(t,U)?t[U]:{}},R=function(t){return w(t,U)}}var Z,tt,nt={set:F,get:N,has:R,enforce:function(t){return R(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var e;if(!v(n)||(e=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return e}}},et=e((function(t){var n=nt.get,e=nt.enforce,r=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),e(i).source=r.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:k(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,ot=function(t){return"function"==typeof t?t:void 0},it=function(t,n){return arguments.length<2?ot(rt[t])||ot(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},ut=Math.ceil,ct=Math.floor,ft=function(t){return isNaN(t=+t)?0:(t>0?ct:ut)(t)},at=Math.min,lt=function(t){return t>0?at(ft(t),9007199254740991):0},st=Math.max,pt=Math.min,yt=function(t){return function(n,e,r){var o,i=b(n),u=lt(i.length),c=function(t,n){var e=ft(t);return e<0?st(e+n,0):pt(e,n)}(r,u);if(t&&e!=e){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===e)return t||c||0;return!t&&-1}},dt={includes:yt(!0),indexOf:yt(!1)}.indexOf,ht=function(t,n){var e,r=b(t),o=0,i=[];for(e in r)!w(Q,e)&&w(r,e)&&i.push(e);for(;n.length>o;)w(r,e=n[o++])&&(~dt(i,e)||i.push(e));return i},bt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],vt=bt.concat("length","prototype"),gt={f:Object.getOwnPropertyNames||function(t){return ht(t,vt)}},mt={f:Object.getOwnPropertySymbols},wt=it("Reflect","ownKeys")||function(t){var n=gt.f(x(t)),e=mt.f;return e?n.concat(e(t)):n},Ot=function(t,n){for(var e=wt(n),r=A.f,o=E.f,i=0;i<e.length;i++){var u=e[i];w(t,u)||r(t,u,o(n,u))}},jt=/#|\.prototype\./,St=function(t,n){var e=Pt[Tt(t)];return e==xt||e!=Et&&("function"==typeof n?i(n):!!n)},Tt=St.normalize=function(t){return String(t).replace(jt,".").toLowerCase()},Pt=St.data={},Et=St.NATIVE="N",xt=St.POLYFILL="P",_t=St,At=E.f,Mt=function(t,n){var e,r,i,u,c,f=t.target,a=t.global,l=t.stat;if(e=a?o:l?o[f]||k(f,{}):(o[f]||{}).prototype)for(r in n){if(u=n[r],i=t.noTargetGet?(c=At(e,r))&&c.value:e[r],!_t(a?r:f+(l?".":"#")+r,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;Ot(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),et(e,r,u,t)}},kt=Array.isArray||function(t){return"Array"==p(t)},Ct=function(t){return Object(h(t))},It=function(t,n,e){var r=g(n);r in t?A.f(t,r,l(0,e)):t[r]=e},Ft=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Nt=Ft&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=D("wks"),Lt=o.Symbol,qt=Nt?Lt:W,zt=function(t){return w(Rt,t)||(Ft&&w(Lt,t)?Rt[t]=Lt[t]:Rt[t]=qt("Symbol."+t)),Rt[t]},Dt=zt("species"),Gt=function(t,n){var e;return kt(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!kt(e.prototype)?v(e)&&null===(e=e[Dt])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===n?0:n)},Jt=it("navigator","userAgent")||"",Wt=o.process,Bt=Wt&&Wt.versions,Kt=Bt&&Bt.v8;Kt?tt=(Z=Kt.split("."))[0]+Z[1]:Jt&&(!(Z=Jt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Jt.match(/Chrome\/(\d+)/))&&(tt=Z[1]);var Qt,Vt=tt&&+tt,Xt=zt("species"),Yt=zt("isConcatSpreadable"),$t=Vt>=51||!i((function(){var t=[];return t[Yt]=!1,t.concat()[0]!==t})),Ht=(Qt="concat",Vt>=51||!i((function(){var t=[];return(t.constructor={})[Xt]=function(){return{foo:1}},1!==t[Qt](Boolean).foo}))),Ut=function(t){if(!v(t))return!1;var n=t[Yt];return void 0!==n?!!n:kt(t)};Mt({target:"Array",proto:!0,forced:!$t||!Ht},{concat:function(t){var n,e,r,o,i,u=Ct(this),c=Gt(u,0),f=0;for(n=-1,r=arguments.length;n<r;n++)if(Ut(i=-1===n?u:arguments[n])){if(f+(o=lt(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(e=0;e<o;e++,f++)e in i&&It(c,f,i[e])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");It(c,f++,i)}return c.length=f,c}});var Zt,tn=function(t,n,e){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===n)return t;switch(e){case 0:return function(){return t.call(n)};case 1:return function(e){return t.call(n,e)};case 2:return function(e,r){return t.call(n,e,r)};case 3:return function(e,r,o){return t.call(n,e,r,o)}}return function(){return t.apply(n,arguments)}},nn=[].push,en=function(t){var n=1==t,e=2==t,r=3==t,o=4==t,i=6==t,u=5==t||i;return function(c,f,a,l){for(var s,p,y=Ct(c),h=d(y),b=tn(f,a,3),v=lt(h.length),g=0,m=l||Gt,w=n?m(c,v):e?m(c,0):void 0;v>g;g++)if((u||g in h)&&(p=b(s=h[g],g,y),t))if(n)w[g]=p;else if(p)switch(t){case 3:return!0;case 5:return s;case 6:return g;case 2:nn.call(w,s)}else if(o)return!1;return i?-1:r||o?o:w}},rn={forEach:en(0),map:en(1),filter:en(2),some:en(3),every:en(4),find:en(5),findIndex:en(6)},on=Object.keys||function(t){return ht(t,bt)},un=u?Object.defineProperties:function(t,n){x(t);for(var e,r=on(n),o=r.length,i=0;o>i;)A.f(t,e=r[i++],n[e]);return t},cn=it("document","documentElement"),fn=K("IE_PROTO"),an=function(){},ln=function(t){return"<script>"+t+"<\/script>"},sn=function(){try{Zt=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,n;sn=Zt?function(t){t.write(ln("")),t.close();var n=t.parentWindow.Object;return t=null,n}(Zt):((n=S("iframe")).style.display="none",cn.appendChild(n),n.src=String("javascript:"),(t=n.contentWindow.document).open(),t.write(ln("document.F=Object")),t.close(),t.F);for(var e=bt.length;e--;)delete sn.prototype[bt[e]];return sn()};Q[fn]=!0;var pn=Object.create||function(t,n){var e;return null!==t?(an.prototype=x(t),e=new an,an.prototype=null,e[fn]=t):e=sn(),void 0===n?e:un(e,n)},yn=zt("unscopables"),dn=Array.prototype;null==dn[yn]&&A.f(dn,yn,{configurable:!0,value:pn(null)});var hn,bn=rn.find,vn=!0;function gn(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}function mn(t,n){for(var e=0;e<n.length;e++){var r=n[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function wn(t){return(wn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function On(t,n){return(On=Object.setPrototypeOf||function(t,n){return t.__proto__=n,t})(t,n)}function jn(t,n){return!n||"object"!=typeof n&&"function"!=typeof n?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):n}function Sn(t,n,e){return(Sn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,n,e){var r=function(t,n){for(;!Object.prototype.hasOwnProperty.call(t,n)&&null!==(t=wn(t)););return t}(t,n);if(r){var o=Object.getOwnPropertyDescriptor(r,n);return o.get?o.get.call(e):o.value}})(t,n,e||t)}"find"in[]&&Array(1).find((function(){vn=!1})),Mt({target:"Array",proto:!0,forced:vn},{find:function(t){return bn(this,t,arguments.length>1?arguments[1]:void 0)}}),hn="find",dn[yn][hn]=!0;var Tn=t.fn.bootstrapTable.utils;t.extend(t.fn.bootstrapTable.defaults,{showJumpTo:!1}),t.extend(t.fn.bootstrapTable.locales,{formatJumpTo:function(){return"GO"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.BootstrapTable=function(n){function e(){return gn(this,e),jn(this,wn(e).apply(this,arguments))}var r,o,i;return function(t,n){if("function"!=typeof n&&null!==n)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(n&&n.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),n&&On(t,n)}(e,n),r=e,(o=[{key:"initPagination",value:function(){for(var n,r=this,o=arguments.length,i=new Array(o),u=0;u<o;u++)i[u]=arguments[u];if((n=Sn(wn(e.prototype),"initPagination",this)).call.apply(n,[this].concat(i)),this.options.showJumpTo){var c=this.$pagination.find("> .pagination"),f=c.find(".page-jump-to");f.length||(f=t('\n          <div class="page-jump-to '.concat(this.constants.classes.inputGroup,'">\n          <input type="number" class="').concat(this.constants.classes.input).concat(Tn.sprintf(" input-%s",this.options.iconSize),'" value="').concat(this.options.pageNumber,'">\n          <button class="').concat(this.constants.buttonsClass,'"  type="button">\n          ').concat(this.options.formatJumpTo(),"\n          </button>\n          </div>\n        ")).appendTo(c)).on("click","button",(function(n){r.selectPage(+t(n.target).parent(".page-jump-to").find("input").val())}))}}}])&&mn(r.prototype,o),i&&mn(r,i),e}(t.BootstrapTable)}));
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t="undefined"!=typeof globalThis?globalThis:t||self).jQuery)}(this,(function(t){"use strict";function n(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var e=n(t),r="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function o(t,n){return t(n={exports:{}},n.exports),n.exports}var i=function(t){return t&&t.Math==Math&&t},u=i("object"==typeof globalThis&&globalThis)||i("object"==typeof window&&window)||i("object"==typeof self&&self)||i("object"==typeof r&&r)||Function("return this")(),c=function(t){try{return!!t()}catch(t){return!0}},f=!c((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]})),a={}.propertyIsEnumerable,l=Object.getOwnPropertyDescriptor,s={f:l&&!a.call({1:2},1)?function(t){var n=l(this,t);return!!n&&n.enumerable}:a},p=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},y={}.toString,d=function(t){return y.call(t).slice(8,-1)},h="".split,v=c((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==d(t)?h.call(t,""):Object(t)}:Object,b=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},g=function(t){return v(b(t))},m=function(t){return"object"==typeof t?null!==t:"function"==typeof t},w=function(t,n){if(!m(t))return t;var e,r;if(n&&"function"==typeof(e=t.toString)&&!m(r=e.call(t)))return r;if("function"==typeof(e=t.valueOf)&&!m(r=e.call(t)))return r;if(!n&&"function"==typeof(e=t.toString)&&!m(r=e.call(t)))return r;throw TypeError("Can't convert object to primitive value")},O={}.hasOwnProperty,j=function(t,n){return O.call(t,n)},S=u.document,T=m(S)&&m(S.createElement),P=function(t){return T?S.createElement(t):{}},E=!f&&!c((function(){return 7!=Object.defineProperty(P("div"),"a",{get:function(){return 7}}).a})),x=Object.getOwnPropertyDescriptor,A={f:f?x:function(t,n){if(t=g(t),n=w(n,!0),E)try{return x(t,n)}catch(t){}if(j(t,n))return p(!s.f.call(t,n),t[n])}},_=function(t){if(!m(t))throw TypeError(String(t)+" is not an object");return t},C=Object.defineProperty,R={f:f?C:function(t,n,e){if(_(t),n=w(n,!0),_(e),E)try{return C(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(t[n]=e.value),t}},k=f?function(t,n,e){return R.f(t,n,p(1,e))}:function(t,n,e){return t[n]=e,t},M=function(t,n){try{k(u,t,n)}catch(e){u[t]=n}return n},I="__core-js_shared__",F=u[I]||M(I,{}),N=Function.toString;"function"!=typeof F.inspectSource&&(F.inspectSource=function(t){return N.call(t)});var D,L,q,z=F.inspectSource,G=u.WeakMap,J="function"==typeof G&&/native code/.test(z(G)),W=o((function(t){(t.exports=function(t,n){return F[t]||(F[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.5",mode:"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})})),B=0,K=Math.random(),Q=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++B+K).toString(36)},V=W("keys"),X=function(t){return V[t]||(V[t]=Q(t))},Y={},$=u.WeakMap;if(J){var H=new $,U=H.get,Z=H.has,tt=H.set;D=function(t,n){return tt.call(H,t,n),n},L=function(t){return U.call(H,t)||{}},q=function(t){return Z.call(H,t)}}else{var nt=X("state");Y[nt]=!0,D=function(t,n){return k(t,nt,n),n},L=function(t){return j(t,nt)?t[nt]:{}},q=function(t){return j(t,nt)}}var et,rt,ot={set:D,get:L,has:q,enforce:function(t){return q(t)?L(t):D(t,{})},getterFor:function(t){return function(n){var e;if(!m(n)||(e=L(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return e}}},it=o((function(t){var n=ot.get,e=ot.enforce,r=String(String).split("String");(t.exports=function(t,n,o,i){var c=!!i&&!!i.unsafe,f=!!i&&!!i.enumerable,a=!!i&&!!i.noTargetGet;"function"==typeof o&&("string"!=typeof n||j(o,"name")||k(o,"name",n),e(o).source=r.join("string"==typeof n?n:"")),t!==u?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=o:k(t,n,o)):f?t[n]=o:M(n,o)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||z(this)}))})),ut=u,ct=function(t){return"function"==typeof t?t:void 0},ft=function(t,n){return arguments.length<2?ct(ut[t])||ct(u[t]):ut[t]&&ut[t][n]||u[t]&&u[t][n]},at=Math.ceil,lt=Math.floor,st=function(t){return isNaN(t=+t)?0:(t>0?lt:at)(t)},pt=Math.min,yt=function(t){return t>0?pt(st(t),9007199254740991):0},dt=Math.max,ht=Math.min,vt=function(t){return function(n,e,r){var o,i=g(n),u=yt(i.length),c=function(t,n){var e=st(t);return e<0?dt(e+n,0):ht(e,n)}(r,u);if(t&&e!=e){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===e)return t||c||0;return!t&&-1}},bt={includes:vt(!0),indexOf:vt(!1)}.indexOf,gt=function(t,n){var e,r=g(t),o=0,i=[];for(e in r)!j(Y,e)&&j(r,e)&&i.push(e);for(;n.length>o;)j(r,e=n[o++])&&(~bt(i,e)||i.push(e));return i},mt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],wt=mt.concat("length","prototype"),Ot={f:Object.getOwnPropertyNames||function(t){return gt(t,wt)}},jt={f:Object.getOwnPropertySymbols},St=ft("Reflect","ownKeys")||function(t){var n=Ot.f(_(t)),e=jt.f;return e?n.concat(e(t)):n},Tt=function(t,n){for(var e=St(n),r=R.f,o=A.f,i=0;i<e.length;i++){var u=e[i];j(t,u)||r(t,u,o(n,u))}},Pt=/#|\.prototype\./,Et=function(t,n){var e=At[xt(t)];return e==Ct||e!=_t&&("function"==typeof n?c(n):!!n)},xt=Et.normalize=function(t){return String(t).replace(Pt,".").toLowerCase()},At=Et.data={},_t=Et.NATIVE="N",Ct=Et.POLYFILL="P",Rt=Et,kt=A.f,Mt=function(t,n){var e,r,o,i,c,f=t.target,a=t.global,l=t.stat;if(e=a?u:l?u[f]||M(f,{}):(u[f]||{}).prototype)for(r in n){if(i=n[r],o=t.noTargetGet?(c=kt(e,r))&&c.value:e[r],!Rt(a?r:f+(l?".":"#")+r,t.forced)&&void 0!==o){if(typeof i==typeof o)continue;Tt(i,o)}(t.sham||o&&o.sham)&&k(i,"sham",!0),it(e,r,i,t)}},It=Array.isArray||function(t){return"Array"==d(t)},Ft=function(t){return Object(b(t))},Nt=function(t,n,e){var r=w(n);r in t?R.f(t,r,p(0,e)):t[r]=e},Dt=!!Object.getOwnPropertySymbols&&!c((function(){return!String(Symbol())})),Lt=Dt&&!Symbol.sham&&"symbol"==typeof Symbol.iterator,qt=W("wks"),zt=u.Symbol,Gt=Lt?zt:zt&&zt.withoutSetter||Q,Jt=function(t){return j(qt,t)||(Dt&&j(zt,t)?qt[t]=zt[t]:qt[t]=Gt("Symbol."+t)),qt[t]},Wt=Jt("species"),Bt=function(t,n){var e;return It(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!It(e.prototype)?m(e)&&null===(e=e[Wt])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===n?0:n)},Kt=ft("navigator","userAgent")||"",Qt=u.process,Vt=Qt&&Qt.versions,Xt=Vt&&Vt.v8;Xt?rt=(et=Xt.split("."))[0]+et[1]:Kt&&(!(et=Kt.match(/Edge\/(\d+)/))||et[1]>=74)&&(et=Kt.match(/Chrome\/(\d+)/))&&(rt=et[1]);var Yt,$t=rt&&+rt,Ht=Jt("species"),Ut=Jt("isConcatSpreadable"),Zt=9007199254740991,tn="Maximum allowed index exceeded",nn=$t>=51||!c((function(){var t=[];return t[Ut]=!1,t.concat()[0]!==t})),en=(Yt="concat",$t>=51||!c((function(){var t=[];return(t.constructor={})[Ht]=function(){return{foo:1}},1!==t[Yt](Boolean).foo}))),rn=function(t){if(!m(t))return!1;var n=t[Ut];return void 0!==n?!!n:It(t)};Mt({target:"Array",proto:!0,forced:!nn||!en},{concat:function(t){var n,e,r,o,i,u=Ft(this),c=Bt(u,0),f=0;for(n=-1,r=arguments.length;n<r;n++)if(rn(i=-1===n?u:arguments[n])){if(f+(o=yt(i.length))>Zt)throw TypeError(tn);for(e=0;e<o;e++,f++)e in i&&Nt(c,f,i[e])}else{if(f>=Zt)throw TypeError(tn);Nt(c,f++,i)}return c.length=f,c}});var on,un=function(t,n,e){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===n)return t;switch(e){case 0:return function(){return t.call(n)};case 1:return function(e){return t.call(n,e)};case 2:return function(e,r){return t.call(n,e,r)};case 3:return function(e,r,o){return t.call(n,e,r,o)}}return function(){return t.apply(n,arguments)}},cn=[].push,fn=function(t){var n=1==t,e=2==t,r=3==t,o=4==t,i=6==t,u=5==t||i;return function(c,f,a,l){for(var s,p,y=Ft(c),d=v(y),h=un(f,a,3),b=yt(d.length),g=0,m=l||Bt,w=n?m(c,b):e?m(c,0):void 0;b>g;g++)if((u||g in d)&&(p=h(s=d[g],g,y),t))if(n)w[g]=p;else if(p)switch(t){case 3:return!0;case 5:return s;case 6:return g;case 2:cn.call(w,s)}else if(o)return!1;return i?-1:r||o?o:w}},an={forEach:fn(0),map:fn(1),filter:fn(2),some:fn(3),every:fn(4),find:fn(5),findIndex:fn(6)},ln=Object.keys||function(t){return gt(t,mt)},sn=f?Object.defineProperties:function(t,n){_(t);for(var e,r=ln(n),o=r.length,i=0;o>i;)R.f(t,e=r[i++],n[e]);return t},pn=ft("document","documentElement"),yn=X("IE_PROTO"),dn=function(){},hn=function(t){return"<script>"+t+"</"+"script>"},vn=function(){try{on=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,n;vn=on?function(t){t.write(hn("")),t.close();var n=t.parentWindow.Object;return t=null,n}(on):((n=P("iframe")).style.display="none",pn.appendChild(n),n.src=String("javascript:"),(t=n.contentWindow.document).open(),t.write(hn("document.F=Object")),t.close(),t.F);for(var e=mt.length;e--;)delete vn.prototype[mt[e]];return vn()};Y[yn]=!0;var bn=Object.create||function(t,n){var e;return null!==t?(dn.prototype=_(t),e=new dn,dn.prototype=null,e[yn]=t):e=vn(),void 0===n?e:sn(e,n)},gn=Jt("unscopables"),mn=Array.prototype;null==mn[gn]&&R.f(mn,gn,{configurable:!0,value:bn(null)});var wn,On=Object.defineProperty,jn={},Sn=function(t){throw t},Tn=an.find,Pn="find",En=!0,xn=function(t,n){if(j(jn,t))return jn[t];n||(n={});var e=[][t],r=!!j(n,"ACCESSORS")&&n.ACCESSORS,o=j(n,0)?n[0]:Sn,i=j(n,1)?n[1]:void 0;return jn[t]=!!e&&!c((function(){if(r&&!f)return!0;var t={length:-1};r?On(t,1,{enumerable:!0,get:Sn}):t[1]=1,e.call(t,o,i)}))}(Pn);function An(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}function _n(t,n){for(var e=0;e<n.length;e++){var r=n[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Cn(t){return(Cn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Rn(t,n){return(Rn=Object.setPrototypeOf||function(t,n){return t.__proto__=n,t})(t,n)}function kn(t,n){return!n||"object"!=typeof n&&"function"!=typeof n?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):n}function Mn(t){var n=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var e,r=Cn(t);if(n){var o=Cn(this).constructor;e=Reflect.construct(r,arguments,o)}else e=r.apply(this,arguments);return kn(this,e)}}function In(t,n,e){return(In="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,n,e){var r=function(t,n){for(;!Object.prototype.hasOwnProperty.call(t,n)&&null!==(t=Cn(t)););return t}(t,n);if(r){var o=Object.getOwnPropertyDescriptor(r,n);return o.get?o.get.call(e):o.value}})(t,n,e||t)}Pn in[]&&Array(1).find((function(){En=!1})),Mt({target:"Array",proto:!0,forced:En||!xn},{find:function(t){return Tn(this,t,arguments.length>1?arguments[1]:void 0)}}),wn=Pn,mn[gn][wn]=!0;var Fn=e.default.fn.bootstrapTable.utils;e.default.extend(e.default.fn.bootstrapTable.defaults,{showJumpTo:!1}),e.default.extend(e.default.fn.bootstrapTable.locales,{formatJumpTo:function(){return"GO"}}),e.default.extend(e.default.fn.bootstrapTable.defaults,e.default.fn.bootstrapTable.locales),e.default.BootstrapTable=function(t){!function(t,n){if("function"!=typeof n&&null!==n)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(n&&n.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),n&&Rn(t,n)}(u,t);var n,r,o,i=Mn(u);function u(){return An(this,u),i.apply(this,arguments)}return n=u,(r=[{key:"initPagination",value:function(){for(var t,n=this,r=arguments.length,o=new Array(r),i=0;i<r;i++)o[i]=arguments[i];if((t=In(Cn(u.prototype),"initPagination",this)).call.apply(t,[this].concat(o)),this.options.showJumpTo){var c=this.$pagination.find("> .pagination"),f=c.find(".page-jump-to");if(!f.length){var a=(f=e.default(Fn.sprintf(this.constants.html.inputGroup,'<input type="number"\n            class="'.concat(this.constants.classes.input).concat(Fn.sprintf(" %s%s",this.constants.classes.inputPrefix,this.options.iconSize),'"\n            value="').concat(this.options.pageNumber,'"\n            min="1"\n            max="').concat(this.totalPages,'">'),'<button class="'.concat(this.constants.buttonsClass,'"  type="button">\n          ').concat(this.options.formatJumpTo(),"\n          </button>"))).addClass("page-jump-to").appendTo(c)).find("input");f.find("button").click((function(){n.selectPage(+a.val())})),a.keyup((function(t){""!==a.val()&&(13!==t.keyCode?+a.val()<+a.attr("min")?a.val(a.attr("min")):+a.val()>+a.attr("max")&&a.val(a.attr("max")):n.selectPage(+a.val()))})),a.blur((function(){""===a.val()&&a.val(n.options.pageNumber)}))}}}}])&&_n(n.prototype,r),o&&_n(n,o),u}(e.default.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-toolbar.min.js b/web/skins/classic/js/bootstrap-table-toolbar.min.js
new file mode 100644
index 000000000..61b746009
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table-toolbar.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.1
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).jQuery)}(this,(function(t){"use strict";function e(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var n=e(t),r="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function o(t,e){return t(e={exports:{}},e.exports),e.exports}var a=function(t){return t&&t.Math==Math&&t},i=a("object"==typeof globalThis&&globalThis)||a("object"==typeof window&&window)||a("object"==typeof self&&self)||a("object"==typeof r&&r)||Function("return this")(),l=function(t){try{return!!t()}catch(t){return!0}},c=!l((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]})),u={}.propertyIsEnumerable,s=Object.getOwnPropertyDescriptor,d={f:s&&!u.call({1:2},1)?function(t){var e=s(this,t);return!!e&&e.enumerable}:u},f=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},h={}.toString,p=function(t){return h.call(t).slice(8,-1)},v="".split,b=l((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?v.call(t,""):Object(t)}:Object,m=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},y=function(t){return b(m(t))},g=function(t){return"object"==typeof t?null!==t:"function"==typeof t},S=function(t,e){if(!g(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!g(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!g(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!g(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},x={}.hasOwnProperty,w=function(t,e){return x.call(t,e)},O=i.document,T=g(O)&&g(O.createElement),j=function(t){return T?O.createElement(t):{}},E=!c&&!l((function(){return 7!=Object.defineProperty(j("div"),"a",{get:function(){return 7}}).a})),A=Object.getOwnPropertyDescriptor,C={f:c?A:function(t,e){if(t=y(t),e=S(e,!0),E)try{return A(t,e)}catch(t){}if(w(t,e))return f(!d.f.call(t,e),t[e])}},_=function(t){if(!g(t))throw TypeError(String(t)+" is not an object");return t},M=Object.defineProperty,P={f:c?M:function(t,e,n){if(_(t),e=S(e,!0),_(n),E)try{return M(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},I=c?function(t,e,n){return P.f(t,e,f(1,n))}:function(t,e,n){return t[e]=n,t},R=function(t,e){try{I(i,t,e)}catch(n){i[t]=e}return e},k="__core-js_shared__",F=i[k]||R(k,{}),N=Function.toString;"function"!=typeof F.inspectSource&&(F.inspectSource=function(t){return N.call(t)});var L,D,B,U=F.inspectSource,$=i.WeakMap,z="function"==typeof $&&/native code/.test(U($)),q=o((function(t){(t.exports=function(t,e){return F[t]||(F[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.5",mode:"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})})),K=0,W=Math.random(),G=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++K+W).toString(36)},V=q("keys"),Y=function(t){return V[t]||(V[t]=G(t))},X={},Q=i.WeakMap;if(z){var H=new Q,J=H.get,Z=H.has,tt=H.set;L=function(t,e){return tt.call(H,t,e),e},D=function(t){return J.call(H,t)||{}},B=function(t){return Z.call(H,t)}}else{var et=Y("state");X[et]=!0,L=function(t,e){return I(t,et,e),e},D=function(t){return w(t,et)?t[et]:{}},B=function(t){return w(t,et)}}var nt,rt,ot={set:L,get:D,has:B,enforce:function(t){return B(t)?D(t):L(t,{})},getterFor:function(t){return function(e){var n;if(!g(e)||(n=D(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},at=o((function(t){var e=ot.get,n=ot.enforce,r=String(String).split("String");(t.exports=function(t,e,o,a){var l=!!a&&!!a.unsafe,c=!!a&&!!a.enumerable,u=!!a&&!!a.noTargetGet;"function"==typeof o&&("string"!=typeof e||w(o,"name")||I(o,"name",e),n(o).source=r.join("string"==typeof e?e:"")),t!==i?(l?!u&&t[e]&&(c=!0):delete t[e],c?t[e]=o:I(t,e,o)):c?t[e]=o:R(e,o)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||U(this)}))})),it=i,lt=function(t){return"function"==typeof t?t:void 0},ct=function(t,e){return arguments.length<2?lt(it[t])||lt(i[t]):it[t]&&it[t][e]||i[t]&&i[t][e]},ut=Math.ceil,st=Math.floor,dt=function(t){return isNaN(t=+t)?0:(t>0?st:ut)(t)},ft=Math.min,ht=function(t){return t>0?ft(dt(t),9007199254740991):0},pt=Math.max,vt=Math.min,bt=function(t){return function(e,n,r){var o,a=y(e),i=ht(a.length),l=function(t,e){var n=dt(t);return n<0?pt(n+e,0):vt(n,e)}(r,i);if(t&&n!=n){for(;i>l;)if((o=a[l++])!=o)return!0}else for(;i>l;l++)if((t||l in a)&&a[l]===n)return t||l||0;return!t&&-1}},mt={includes:bt(!0),indexOf:bt(!1)},yt=mt.indexOf,gt=function(t,e){var n,r=y(t),o=0,a=[];for(n in r)!w(X,n)&&w(r,n)&&a.push(n);for(;e.length>o;)w(r,n=e[o++])&&(~yt(a,n)||a.push(n));return a},St=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],xt=St.concat("length","prototype"),wt={f:Object.getOwnPropertyNames||function(t){return gt(t,xt)}},Ot={f:Object.getOwnPropertySymbols},Tt=ct("Reflect","ownKeys")||function(t){var e=wt.f(_(t)),n=Ot.f;return n?e.concat(n(t)):e},jt=function(t,e){for(var n=Tt(e),r=P.f,o=C.f,a=0;a<n.length;a++){var i=n[a];w(t,i)||r(t,i,o(e,i))}},Et=/#|\.prototype\./,At=function(t,e){var n=_t[Ct(t)];return n==Pt||n!=Mt&&("function"==typeof e?l(e):!!e)},Ct=At.normalize=function(t){return String(t).replace(Et,".").toLowerCase()},_t=At.data={},Mt=At.NATIVE="N",Pt=At.POLYFILL="P",It=At,Rt=C.f,kt=function(t,e){var n,r,o,a,l,c=t.target,u=t.global,s=t.stat;if(n=u?i:s?i[c]||R(c,{}):(i[c]||{}).prototype)for(r in e){if(a=e[r],o=t.noTargetGet?(l=Rt(n,r))&&l.value:n[r],!It(u?r:c+(s?".":"#")+r,t.forced)&&void 0!==o){if(typeof a==typeof o)continue;jt(a,o)}(t.sham||o&&o.sham)&&I(a,"sham",!0),at(n,r,a,t)}},Ft=Array.isArray||function(t){return"Array"==p(t)},Nt=function(t){return Object(m(t))},Lt=function(t,e,n){var r=S(e);r in t?P.f(t,r,f(0,n)):t[r]=n},Dt=!!Object.getOwnPropertySymbols&&!l((function(){return!String(Symbol())})),Bt=Dt&&!Symbol.sham&&"symbol"==typeof Symbol.iterator,Ut=q("wks"),$t=i.Symbol,zt=Bt?$t:$t&&$t.withoutSetter||G,qt=function(t){return w(Ut,t)||(Dt&&w($t,t)?Ut[t]=$t[t]:Ut[t]=zt("Symbol."+t)),Ut[t]},Kt=qt("species"),Wt=function(t,e){var n;return Ft(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!Ft(n.prototype)?g(n)&&null===(n=n[Kt])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)},Gt=ct("navigator","userAgent")||"",Vt=i.process,Yt=Vt&&Vt.versions,Xt=Yt&&Yt.v8;Xt?rt=(nt=Xt.split("."))[0]+nt[1]:Gt&&(!(nt=Gt.match(/Edge\/(\d+)/))||nt[1]>=74)&&(nt=Gt.match(/Chrome\/(\d+)/))&&(rt=nt[1]);var Qt=rt&&+rt,Ht=qt("species"),Jt=function(t){return Qt>=51||!l((function(){var e=[];return(e.constructor={})[Ht]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},Zt=qt("isConcatSpreadable"),te=9007199254740991,ee="Maximum allowed index exceeded",ne=Qt>=51||!l((function(){var t=[];return t[Zt]=!1,t.concat()[0]!==t})),re=Jt("concat"),oe=function(t){if(!g(t))return!1;var e=t[Zt];return void 0!==e?!!e:Ft(t)};kt({target:"Array",proto:!0,forced:!ne||!re},{concat:function(t){var e,n,r,o,a,i=Nt(this),l=Wt(i,0),c=0;for(e=-1,r=arguments.length;e<r;e++)if(oe(a=-1===e?i:arguments[e])){if(c+(o=ht(a.length))>te)throw TypeError(ee);for(n=0;n<o;n++,c++)n in a&&Lt(l,c,a[n])}else{if(c>=te)throw TypeError(ee);Lt(l,c++,a)}return l.length=c,l}});var ae=function(t,e,n){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}},ie=[].push,le=function(t){var e=1==t,n=2==t,r=3==t,o=4==t,a=6==t,i=5==t||a;return function(l,c,u,s){for(var d,f,h=Nt(l),p=b(h),v=ae(c,u,3),m=ht(p.length),y=0,g=s||Wt,S=e?g(l,m):n?g(l,0):void 0;m>y;y++)if((i||y in p)&&(f=v(d=p[y],y,h),t))if(e)S[y]=f;else if(f)switch(t){case 3:return!0;case 5:return d;case 6:return y;case 2:ie.call(S,d)}else if(o)return!1;return a?-1:r||o?o:S}},ce={forEach:le(0),map:le(1),filter:le(2),some:le(3),every:le(4),find:le(5),findIndex:le(6)},ue=Object.defineProperty,se={},de=function(t){throw t},fe=function(t,e){if(w(se,t))return se[t];e||(e={});var n=[][t],r=!!w(e,"ACCESSORS")&&e.ACCESSORS,o=w(e,0)?e[0]:de,a=w(e,1)?e[1]:void 0;return se[t]=!!n&&!l((function(){if(r&&!c)return!0;var t={length:-1};r?ue(t,1,{enumerable:!0,get:de}):t[1]=1,n.call(t,o,a)}))},he=ce.filter,pe=Jt("filter"),ve=fe("filter");kt({target:"Array",proto:!0,forced:!pe||!ve},{filter:function(t){return he(this,t,arguments.length>1?arguments[1]:void 0)}});var be,me=Object.keys||function(t){return gt(t,St)},ye=c?Object.defineProperties:function(t,e){_(t);for(var n,r=me(e),o=r.length,a=0;o>a;)P.f(t,n=r[a++],e[n]);return t},ge=ct("document","documentElement"),Se=Y("IE_PROTO"),xe=function(){},we=function(t){return"<script>"+t+"</"+"script>"},Oe=function(){try{be=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Oe=be?function(t){t.write(we("")),t.close();var e=t.parentWindow.Object;return t=null,e}(be):((e=j("iframe")).style.display="none",ge.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(we("document.F=Object")),t.close(),t.F);for(var n=St.length;n--;)delete Oe.prototype[St[n]];return Oe()};X[Se]=!0;var Te=Object.create||function(t,e){var n;return null!==t?(xe.prototype=_(t),n=new xe,xe.prototype=null,n[Se]=t):n=Oe(),void 0===e?n:ye(n,e)},je=qt("unscopables"),Ee=Array.prototype;null==Ee[je]&&P.f(Ee,je,{configurable:!0,value:Te(null)});var Ae=function(t){Ee[je][t]=!0},Ce=ce.find,_e="find",Me=!0,Pe=fe(_e);_e in[]&&Array(1).find((function(){Me=!1})),kt({target:"Array",proto:!0,forced:Me||!Pe},{find:function(t){return Ce(this,t,arguments.length>1?arguments[1]:void 0)}}),Ae(_e);var Ie=mt.includes;kt({target:"Array",proto:!0,forced:!fe("indexOf",{ACCESSORS:!0,1:0})},{includes:function(t){return Ie(this,t,arguments.length>1?arguments[1]:void 0)}}),Ae("includes");var Re=function(t,e){var n=[][t];return!!n&&l((function(){n.call(null,e||function(){throw 1},1)}))},ke=mt.indexOf,Fe=[].indexOf,Ne=!!Fe&&1/[1].indexOf(1,-0)<0,Le=Re("indexOf"),De=fe("indexOf",{ACCESSORS:!0,1:0});kt({target:"Array",proto:!0,forced:Ne||!Le||!De},{indexOf:function(t){return Ne?Fe.apply(this,arguments)||0:ke(this,t,arguments.length>1?arguments[1]:void 0)}});var Be=[].join,Ue=b!=Object,$e=Re("join",",");kt({target:"Array",proto:!0,forced:Ue||!$e},{join:function(t){return Be.call(y(this),void 0===t?",":t)}});var ze=Object.assign,qe=Object.defineProperty,Ke=!ze||l((function(){if(c&&1!==ze({b:1},ze(qe({},"a",{enumerable:!0,get:function(){qe(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},n=Symbol(),r="abcdefghijklmnopqrst";return t[n]=7,r.split("").forEach((function(t){e[t]=t})),7!=ze({},t)[n]||me(ze({},e)).join("")!=r}))?function(t,e){for(var n=Nt(t),r=arguments.length,o=1,a=Ot.f,i=d.f;r>o;)for(var l,u=b(arguments[o++]),s=a?me(u).concat(a(u)):me(u),f=s.length,h=0;f>h;)l=s[h++],c&&!i.call(u,l)||(n[l]=u[l]);return n}:ze;kt({target:"Object",stat:!0,forced:Object.assign!==Ke},{assign:Ke});var We=d.f,Ge=function(t){return function(e){for(var n,r=y(e),o=me(r),a=o.length,i=0,l=[];a>i;)n=o[i++],c&&!We.call(r,n)||l.push(t?[n,r[n]]:r[n]);return l}},Ve={entries:Ge(!0),values:Ge(!1)}.entries;kt({target:"Object",stat:!0},{entries:function(t){return Ve(t)}});var Ye=function(){var t=_(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function Xe(t,e){return RegExp(t,e)}var Qe,He,Je={UNSUPPORTED_Y:l((function(){var t=Xe("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:l((function(){var t=Xe("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},Ze=RegExp.prototype.exec,tn=String.prototype.replace,en=Ze,nn=(Qe=/a/,He=/b*/g,Ze.call(Qe,"a"),Ze.call(He,"a"),0!==Qe.lastIndex||0!==He.lastIndex),rn=Je.UNSUPPORTED_Y||Je.BROKEN_CARET,on=void 0!==/()??/.exec("")[1];(nn||on||rn)&&(en=function(t){var e,n,r,o,a=this,i=rn&&a.sticky,l=Ye.call(a),c=a.source,u=0,s=t;return i&&(-1===(l=l.replace("y","")).indexOf("g")&&(l+="g"),s=String(t).slice(a.lastIndex),a.lastIndex>0&&(!a.multiline||a.multiline&&"\n"!==t[a.lastIndex-1])&&(c="(?: "+c+")",s=" "+s,u++),n=new RegExp("^(?:"+c+")",l)),on&&(n=new RegExp("^"+c+"$(?!\\s)",l)),nn&&(e=a.lastIndex),r=Ze.call(i?n:a,s),i?r?(r.input=r.input.slice(u),r[0]=r[0].slice(u),r.index=a.lastIndex,a.lastIndex+=r[0].length):a.lastIndex=0:nn&&r&&(a.lastIndex=a.global?r.index+r[0].length:e),on&&r&&r.length>1&&tn.call(r[0],n,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(r[o]=void 0)})),r});var an=en;kt({target:"RegExp",proto:!0,forced:/./.exec!==an},{exec:an});var ln=qt("match"),cn=function(t){if(function(t){var e;return g(t)&&(void 0!==(e=t[ln])?!!e:"RegExp"==p(t))}(t))throw TypeError("The method doesn't accept regular expressions");return t},un=qt("match");kt({target:"String",proto:!0,forced:!function(t){var e=/./;try{"/./"[t](e)}catch(n){try{return e[un]=!1,"/./"[t](e)}catch(t){}}return!1}("includes")},{includes:function(t){return!!~String(m(this)).indexOf(cn(t),arguments.length>1?arguments[1]:void 0)}});var sn=qt("species"),dn=!l((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),fn="$0"==="a".replace(/./,"$0"),hn=qt("replace"),pn=!!/./[hn]&&""===/./[hn]("a","$0"),vn=!l((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var n="ab".split(t);return 2!==n.length||"a"!==n[0]||"b"!==n[1]})),bn=Object.is||function(t,e){return t===e?0!==t||1/t==1/e:t!=t&&e!=e};!function(t,e,n,r){var o=qt(t),a=!l((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),i=a&&!l((function(){var e=!1,n=/a/;return"split"===t&&((n={}).constructor={},n.constructor[sn]=function(){return n},n.flags="",n[o]=/./[o]),n.exec=function(){return e=!0,null},n[o](""),!e}));if(!a||!i||"replace"===t&&(!dn||!fn||pn)||"split"===t&&!vn){var c=/./[o],u=n(o,""[t],(function(t,e,n,r,o){return e.exec===an?a&&!o?{done:!0,value:c.call(e,n,r)}:{done:!0,value:t.call(n,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:fn,REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE:pn}),s=u[0],d=u[1];at(String.prototype,t,s),at(RegExp.prototype,o,2==e?function(t,e){return d.call(t,this,e)}:function(t){return d.call(t,this)})}r&&I(RegExp.prototype[o],"sham",!0)}("search",1,(function(t,e,n){return[function(e){var n=m(this),r=null==e?void 0:e[t];return void 0!==r?r.call(e,n):new RegExp(e)[t](String(n))},function(t){var r=n(e,t,this);if(r.done)return r.value;var o=_(t),a=String(this),i=o.lastIndex;bn(i,0)||(o.lastIndex=0);var l=function(t,e){var n=t.exec;if("function"==typeof n){var r=n.call(t,e);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==p(t))throw TypeError("RegExp#exec called on incompatible receiver");return an.call(t,e)}(o,a);return bn(o.lastIndex,i)||(o.lastIndex=i),null===l?-1:l.index}]}));var mn,yn="\t\n\v\f\r                　\u2028\u2029\ufeff",gn="["+yn+"]",Sn=RegExp("^"+gn+gn+"*"),xn=RegExp(gn+gn+"*$"),wn=function(t){return function(e){var n=String(m(e));return 1&t&&(n=n.replace(Sn,"")),2&t&&(n=n.replace(xn,"")),n}},On={start:wn(1),end:wn(2),trim:wn(3)},Tn=On.trim;function jn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function En(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function An(t){return(An=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Cn(t,e){return(Cn=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function _n(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Mn(t){var e=function(){if("undefined"==typeof Reflect||!Reflect.construct)return!1;if(Reflect.construct.sham)return!1;if("function"==typeof Proxy)return!0;try{return Date.prototype.toString.call(Reflect.construct(Date,[],(function(){}))),!0}catch(t){return!1}}();return function(){var n,r=An(t);if(e){var o=An(this).constructor;n=Reflect.construct(r,arguments,o)}else n=r.apply(this,arguments);return _n(this,n)}}function Pn(t,e,n){return(Pn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=An(t)););return t}(t,e);if(r){var o=Object.getOwnPropertyDescriptor(r,e);return o.get?o.get.call(n):o.value}})(t,e,n||t)}function In(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(t)))return;var n=[],r=!0,o=!1,a=void 0;try{for(var i,l=t[Symbol.iterator]();!(r=(i=l.next()).done)&&(n.push(i.value),!e||n.length!==e);r=!0);}catch(t){o=!0,a=t}finally{try{r||null==l.return||l.return()}finally{if(o)throw a}}return n}(t,e)||kn(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Rn(t){return function(t){if(Array.isArray(t))return Fn(t)}(t)||function(t){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(t))return Array.from(t)}(t)||kn(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function kn(t,e){if(t){if("string"==typeof t)return Fn(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Object"===n&&t.constructor&&(n=t.constructor.name),"Map"===n||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?Fn(t,e):void 0}}function Fn(t,e){(null==e||e>t.length)&&(e=t.length);for(var n=0,r=new Array(e);n<e;n++)r[n]=t[n];return r}kt({target:"String",proto:!0,forced:(mn="trim",l((function(){return!!yn[mn]()||"​…᠎"!="​…᠎"[mn]()||yn[mn].name!==mn})))},{trim:function(){return Tn(this)}});var Nn=n.default.fn.bootstrapTable.utils,Ln={bootstrap3:{icons:{advancedSearchIcon:"glyphicon-chevron-down"},html:{modal:'\n        <div id="avdSearchModal_%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">\n          <div class="modal-dialog modal-xs">\n            <div class="modal-content">\n              <div class="modal-header">\n                <h4 class="modal-title">%s</h4>\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n                  <span aria-hidden="true">&times;</span>\n                </button>\n              </div>\n              <div class="modal-body modal-body-custom">\n                <div class="container-fluid" id="avdSearchModalContent_%s"\n                  style="padding-right: 0px; padding-left: 0px;" >\n                </div>\n              </div>\n              <div class="modal-footer">\n                <button type="button" id="btnCloseAvd_%s" class="btn btn-%s">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      '}},bootstrap4:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div id="avdSearchModal_%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">\n          <div class="modal-dialog modal-xs">\n            <div class="modal-content">\n              <div class="modal-header">\n                <h4 class="modal-title">%s</h4>\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n                  <span aria-hidden="true">&times;</span>\n                </button>\n              </div>\n              <div class="modal-body modal-body-custom">\n                <div class="container-fluid" id="avdSearchModalContent_%s"\n                  style="padding-right: 0; padding-left: 0;" >\n                </div>\n              </div>\n              <div class="modal-footer">\n                <button type="button" id="btnCloseAvd_%s" class="btn btn-%s">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      '}},bootstrap5:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div id="avdSearchModal_%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">\n          <div class="modal-dialog modal-xs">\n            <div class="modal-content">\n              <div class="modal-header">\n                <h4 class="modal-title">%s</h4>\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n                  <span aria-hidden="true">&times;</span>\n                </button>\n              </div>\n              <div class="modal-body modal-body-custom">\n                <div class="container-fluid" id="avdSearchModalContent_%s"\n                  style="padding-right: 0; padding-left: 0;" >\n                </div>\n              </div>\n              <div class="modal-footer">\n                <button type="button" id="btnCloseAvd_%s" class="btn btn-%s">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      '}},bulma:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div class="modal" id="avdSearchModal_%s">\n          <div class="modal-background"></div>\n          <div class="modal-card">\n            <header class="modal-card-head">\n              <p class="modal-card-title">%s</p>\n              <button class="delete" aria-label="close"></button>\n            </header>\n            <section class="modal-card-body" id="avdSearchModalContent_%s"></section>\n            <footer class="modal-card-foot">\n              <button class="button" id="btnCloseAvd_%s" data-close="btn btn-%s">%s</button>\n            </footer>\n          </div>\n        </div>\n      '}},foundation:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div class="reveal" id="avdSearchModal_%s" data-reveal>\n          <h1>%s</h1>\n          <div id="avdSearchModalContent_%s">\n\n          </div>\n          <button class="close-button" data-close aria-label="Close modal" type="button">\n            <span aria-hidden="true">&times;</span>\n          </button>\n\n          <button id="btnCloseAvd_%s" class="%s" type="button">%s</button>\n        </div>\n      '}},materialize:{icons:{advancedSearchIcon:"expand_more"},html:{modal:'\n        <div id="avdSearchModal_%s" class="modal">\n          <div class="modal-content">\n            <h4>%s</h4>\n            <div id="avdSearchModalContent_%s">\n\n            </div>\n          </div>\n          <div class="modal-footer">\n            <a href="javascript:void(0)"" id="btnCloseAvd_%s" class="modal-close waves-effect waves-green btn-flat %s">%s</a>\n          </div>\n        </div>\n      '}},semantic:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div class="ui modal" id="avdSearchModal_%s">\n          <i class="close icon"></i>\n          <div class="header">\n            %s\n          </div>\n          <div class="image content ui form" id="avdSearchModalContent_%s"></div>\n          <div class="actions">\n            <div id="btnCloseAvd_%s" class="ui black deny button %s">%s</div>\n          </div>\n        </div>\n      '}}}[n.default.fn.bootstrapTable.theme];n.default.extend(n.default.fn.bootstrapTable.defaults,{advancedSearch:!1,idForm:"advancedSearch",actionForm:"",idTable:void 0,onColumnAdvancedSearch:function(t,e){return!1}}),n.default.extend(n.default.fn.bootstrapTable.defaults.icons,{advancedSearchIcon:Ln.icons.advancedSearchIcon}),n.default.extend(n.default.fn.bootstrapTable.Constructor.EVENTS,{"column-advanced-search.bs.table":"onColumnAdvancedSearch"}),n.default.extend(n.default.fn.bootstrapTable.locales,{formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}}),n.default.extend(n.default.fn.bootstrapTable.defaults,n.default.fn.bootstrapTable.locales),n.default.BootstrapTable=function(t){!function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Cn(t,e)}(i,t);var e,r,o,a=Mn(i);function i(){return jn(this,i),a.apply(this,arguments)}return e=i,(r=[{key:"initToolbar",value:function(){var t=this.options;this.showToolbar=this.showToolbar||t.search&&t.advancedSearch&&t.idTable,t.search&&t.advancedSearch&&t.idTable&&(this.buttons=Object.assign(this.buttons,{advancedSearch:{text:this.options.formatAdvancedSearch(),icon:this.options.icons.advancedSearchIcon,event:this.showAvdSearch,attributes:{"aria-label":this.options.formatAdvancedSearch(),title:this.options.formatAdvancedSearch()}}})),Pn(An(i.prototype),"initToolbar",this).call(this)}},{key:"showAvdSearch",value:function(){var t=this,e=this.options,r="#avdSearchModal_".concat(e.idTable);if(n.default(r).length<=0){n.default("body").append(Nn.sprintf(Ln.html.modal,e.idTable,e.formatAdvancedSearch(),e.idTable,e.idTable,e.buttonsClass,e.formatAdvancedCloseButton()));var o=0;n.default("#avdSearchModalContent_".concat(e.idTable)).append(this.createFormAvd().join("")),n.default("#".concat(e.idForm)).off("keyup blur","input").on("keyup blur","input",(function(n){"server"===e.sidePagination?t.onColumnAdvancedSearch(n):(clearTimeout(o),o=setTimeout((function(){t.onColumnAdvancedSearch(n)}),e.searchTimeOut))})),n.default("#btnCloseAvd_".concat(e.idTable)).click((function(){return t.hideModal()})),"bulma"===n.default.fn.bootstrapTable.theme&&n.default(r).find(".delete").off("click").on("click",(function(){return t.hideModal()})),this.showModal()}else this.showModal()}},{key:"showModal",value:function(){var t="#avdSearchModal_".concat(this.options.idTable);-1!==n.default.inArray(n.default.fn.bootstrapTable.theme,["bootstrap3","bootstrap4"])?n.default(t).modal():"bootstrap5"===n.default.fn.bootstrapTable.theme?(this.toolbarModal||(this.toolbarModal=new bootstrap.Modal(document.getElementById("avdSearchModal_".concat(this.options.idTable)),{})),this.toolbarModal.show()):"bulma"===n.default.fn.bootstrapTable.theme?n.default(t).toggleClass("is-active"):"foundation"===n.default.fn.bootstrapTable.theme?(this.toolbarModal||(this.toolbarModal=new Foundation.Reveal(n.default(t))),this.toolbarModal.open()):"materialize"===n.default.fn.bootstrapTable.theme?(n.default(t).modal(),n.default(t).modal("open")):"semantic"===n.default.fn.bootstrapTable.theme&&n.default(t).modal("show")}},{key:"hideModal",value:function(){var t=n.default("#avdSearchModal_".concat(this.options.idTable)),e="#avdSearchModal_".concat(this.options.idTable);-1!==n.default.inArray(n.default.fn.bootstrapTable.theme,["bootstrap3","bootstrap4"])?t.modal("hide"):"bootstrap5"===n.default.fn.bootstrapTable.theme?this.toolbarModal.hide():"bulma"===n.default.fn.bootstrapTable.theme?(n.default("html").toggleClass("is-clipped"),n.default(e).toggleClass("is-active")):"foundation"===n.default.fn.bootstrapTable.theme?this.toolbarModal.close():"materialize"===n.default.fn.bootstrapTable.theme?n.default(e).modal("open"):"semantic"===n.default.fn.bootstrapTable.theme&&n.default(e).modal("close"),"server"===this.options.sidePagination&&(this.options.pageNumber=1,this.updatePagination(),this.trigger("column-advanced-search",this.filterColumnsPartial))}},{key:"createFormAvd",value:function(){var t,e=this.options,n=['<form class="form-horizontal" id="'.concat(e.idForm,'" action="').concat(e.actionForm,'">')],r=function(t,e){var n;if("undefined"==typeof Symbol||null==t[Symbol.iterator]){if(Array.isArray(t)||(n=kn(t))||e&&t&&"number"==typeof t.length){n&&(t=n);var r=0,o=function(){};return{s:o,n:function(){return r>=t.length?{done:!0}:{done:!1,value:t[r++]}},e:function(t){throw t},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,i=!0,l=!1;return{s:function(){n=t[Symbol.iterator]()},n:function(){var t=n.next();return i=t.done,t},e:function(t){l=!0,a=t},f:function(){try{i||null==n.return||n.return()}finally{if(l)throw a}}}}(this.columns);try{for(r.s();!(t=r.n()).done;){var o=t.value;!o.checkbox&&o.visible&&o.searchable&&n.push('\n          <div class="form-group row">\n            <label class="col-sm-4 control-label">'.concat(o.title,'</label>\n            <div class="col-sm-6">\n              <input type="text" class="form-control ').concat(this.constants.classes.input,'" name="').concat(o.field,'" placeholder="').concat(o.title,'" id="').concat(o.field,'">\n            </div>\n          </div>\n        '))}}catch(t){r.e(t)}finally{r.f()}return n.push("</form>"),n}},{key:"initSearch",value:function(){var t=this;if(Pn(An(i.prototype),"initSearch",this).call(this),this.options.advancedSearch&&"server"!==this.options.sidePagination){var e=n.default.isEmptyObject(this.filterColumnsPartial)?null:this.filterColumnsPartial;this.data=e?this.data.filter((function(n,r){for(var o=0,a=Object.entries(e);o<a.length;o++){var i=In(a[o],2),l=i[0],c=i[1].toLowerCase(),u=n[l],s=t.header.fields.indexOf(l);if(u=Nn.calculateObjectValue(t.header,t.header.formatters[s],[u,n,r],u),-1===s||"string"!=typeof u&&"number"!=typeof u||!"".concat(u).toLowerCase().includes(c))return!1}return!0})):this.data,this.unsortedData=Rn(this.data)}}},{key:"onColumnAdvancedSearch",value:function(t){var e=n.default.trim(n.default(t.currentTarget).val()),r=n.default(t.currentTarget)[0].id;n.default.isEmptyObject(this.filterColumnsPartial)&&(this.filterColumnsPartial={}),e?this.filterColumnsPartial[r]=e:delete this.filterColumnsPartial[r],"server"!==this.options.sidePagination&&(this.options.pageNumber=1,this.onSearch(t),this.updatePagination(),this.trigger("column-advanced-search",r,e))}}])&&En(e.prototype,r),o&&En(e,o),i}(n.default.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table.min.js b/web/skins/classic/js/bootstrap-table.min.js
index 57ea49dc0..bc5b95377 100644
--- a/web/skins/classic/js/bootstrap-table.min.js
+++ b/web/skins/classic/js/bootstrap-table.min.js
@@ -1,10 +1,10 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.17.1
+  * @version v1.18.1
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
   */
 
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):(t=t||self).BootstrapTable=e(t.jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function i(t,e){return t(e={exports:{}},e.exports),e.exports}var n=function(t){return t&&t.Math==Math&&t},o=n("object"==typeof globalThis&&globalThis)||n("object"==typeof window&&window)||n("object"==typeof self&&self)||n("object"==typeof e&&e)||Function("return this")(),r=function(t){try{return!!t()}catch(t){return!0}},a=!r((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),s={}.propertyIsEnumerable,l=Object.getOwnPropertyDescriptor,c={f:l&&!s.call({1:2},1)?function(t){var e=l(this,t);return!!e&&e.enumerable}:s},h=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},u={}.toString,d=function(t){return u.call(t).slice(8,-1)},p="".split,f=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==d(t)?p.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},v=function(t){return f(g(t))},b=function(t){return"object"==typeof t?null!==t:"function"==typeof t},m=function(t,e){if(!b(t))return t;var i,n;if(e&&"function"==typeof(i=t.toString)&&!b(n=i.call(t)))return n;if("function"==typeof(i=t.valueOf)&&!b(n=i.call(t)))return n;if(!e&&"function"==typeof(i=t.toString)&&!b(n=i.call(t)))return n;throw TypeError("Can't convert object to primitive value")},y={}.hasOwnProperty,w=function(t,e){return y.call(t,e)},S=o.document,x=b(S)&&b(S.createElement),k=function(t){return x?S.createElement(t):{}},O=!a&&!r((function(){return 7!=Object.defineProperty(k("div"),"a",{get:function(){return 7}}).a})),C=Object.getOwnPropertyDescriptor,T={f:a?C:function(t,e){if(t=v(t),e=m(e,!0),O)try{return C(t,e)}catch(t){}if(w(t,e))return h(!c.f.call(t,e),t[e])}},P=function(t){if(!b(t))throw TypeError(String(t)+" is not an object");return t},I=Object.defineProperty,A={f:a?I:function(t,e,i){if(P(t),e=m(e,!0),P(i),O)try{return I(t,e,i)}catch(t){}if("get"in i||"set"in i)throw TypeError("Accessors not supported");return"value"in i&&(t[e]=i.value),t}},$=a?function(t,e,i){return A.f(t,e,h(1,i))}:function(t,e,i){return t[e]=i,t},E=function(t,e){try{$(o,t,e)}catch(i){o[t]=e}return e},R=o["__core-js_shared__"]||E("__core-js_shared__",{}),j=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return j.call(t)});var N,F,_,B=R.inspectSource,V=o.WeakMap,D="function"==typeof V&&/native code/.test(B(V)),L=i((function(t){(t.exports=function(t,e){return R[t]||(R[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),H=0,M=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++H+M).toString(36)},z=L("keys"),q=function(t){return z[t]||(z[t]=U(t))},W={},G=o.WeakMap;if(D){var K=new G,J=K.get,Y=K.has,X=K.set;N=function(t,e){return X.call(K,t,e),e},F=function(t){return J.call(K,t)||{}},_=function(t){return Y.call(K,t)}}else{var Q=q("state");W[Q]=!0,N=function(t,e){return $(t,Q,e),e},F=function(t){return w(t,Q)?t[Q]:{}},_=function(t){return w(t,Q)}}var Z,tt={set:N,get:F,has:_,enforce:function(t){return _(t)?F(t):N(t,{})},getterFor:function(t){return function(e){var i;if(!b(e)||(i=F(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return i}}},et=i((function(t){var e=tt.get,i=tt.enforce,n=String(String).split("String");(t.exports=function(t,e,r,a){var s=!!a&&!!a.unsafe,l=!!a&&!!a.enumerable,c=!!a&&!!a.noTargetGet;"function"==typeof r&&("string"!=typeof e||w(r,"name")||$(r,"name",e),i(r).source=n.join("string"==typeof e?e:"")),t!==o?(s?!c&&t[e]&&(l=!0):delete t[e],l?t[e]=r:$(t,e,r)):l?t[e]=r:E(e,r)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||B(this)}))})),it=o,nt=function(t){return"function"==typeof t?t:void 0},ot=function(t,e){return arguments.length<2?nt(it[t])||nt(o[t]):it[t]&&it[t][e]||o[t]&&o[t][e]},rt=Math.ceil,at=Math.floor,st=function(t){return isNaN(t=+t)?0:(t>0?at:rt)(t)},lt=Math.min,ct=function(t){return t>0?lt(st(t),9007199254740991):0},ht=Math.max,ut=Math.min,dt=function(t,e){var i=st(t);return i<0?ht(i+e,0):ut(i,e)},pt=function(t){return function(e,i,n){var o,r=v(e),a=ct(r.length),s=dt(n,a);if(t&&i!=i){for(;a>s;)if((o=r[s++])!=o)return!0}else for(;a>s;s++)if((t||s in r)&&r[s]===i)return t||s||0;return!t&&-1}},ft={includes:pt(!0),indexOf:pt(!1)},gt=ft.indexOf,vt=function(t,e){var i,n=v(t),o=0,r=[];for(i in n)!w(W,i)&&w(n,i)&&r.push(i);for(;e.length>o;)w(n,i=e[o++])&&(~gt(r,i)||r.push(i));return r},bt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],mt=bt.concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return vt(t,mt)}},wt={f:Object.getOwnPropertySymbols},St=ot("Reflect","ownKeys")||function(t){var e=yt.f(P(t)),i=wt.f;return i?e.concat(i(t)):e},xt=function(t,e){for(var i=St(e),n=A.f,o=T.f,r=0;r<i.length;r++){var a=i[r];w(t,a)||n(t,a,o(e,a))}},kt=/#|\.prototype\./,Ot=function(t,e){var i=Tt[Ct(t)];return i==It||i!=Pt&&("function"==typeof e?r(e):!!e)},Ct=Ot.normalize=function(t){return String(t).replace(kt,".").toLowerCase()},Tt=Ot.data={},Pt=Ot.NATIVE="N",It=Ot.POLYFILL="P",At=Ot,$t=T.f,Et=function(t,e){var i,n,r,a,s,l=t.target,c=t.global,h=t.stat;if(i=c?o:h?o[l]||E(l,{}):(o[l]||{}).prototype)for(n in e){if(a=e[n],r=t.noTargetGet?(s=$t(i,n))&&s.value:i[n],!At(c?n:l+(h?".":"#")+n,t.forced)&&void 0!==r){if(typeof a==typeof r)continue;xt(a,r)}(t.sham||r&&r.sham)&&$(a,"sham",!0),et(i,n,a,t)}},Rt=!!Object.getOwnPropertySymbols&&!r((function(){return!String(Symbol())})),jt=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),Nt=Array.isArray||function(t){return"Array"==d(t)},Ft=function(t){return Object(g(t))},_t=Object.keys||function(t){return vt(t,bt)},Bt=a?Object.defineProperties:function(t,e){P(t);for(var i,n=_t(e),o=n.length,r=0;o>r;)A.f(t,i=n[r++],e[i]);return t},Vt=ot("document","documentElement"),Dt=q("IE_PROTO"),Lt=function(){},Ht=function(t){return"<script>"+t+"<\/script>"},Mt=function(){try{Z=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Mt=Z?function(t){t.write(Ht("")),t.close();var e=t.parentWindow.Object;return t=null,e}(Z):((e=k("iframe")).style.display="none",Vt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Ht("document.F=Object")),t.close(),t.F);for(var i=bt.length;i--;)delete Mt.prototype[bt[i]];return Mt()};W[Dt]=!0;var Ut=Object.create||function(t,e){var i;return null!==t?(Lt.prototype=P(t),i=new Lt,Lt.prototype=null,i[Dt]=t):i=Mt(),void 0===e?i:Bt(i,e)},zt=yt.f,qt={}.toString,Wt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Gt={f:function(t){return Wt&&"[object Window]"==qt.call(t)?function(t){try{return zt(t)}catch(t){return Wt.slice()}}(t):zt(v(t))}},Kt=L("wks"),Jt=o.Symbol,Yt=jt?Jt:U,Xt=function(t){return w(Kt,t)||(Rt&&w(Jt,t)?Kt[t]=Jt[t]:Kt[t]=Yt("Symbol."+t)),Kt[t]},Qt={f:Xt},Zt=A.f,te=function(t){var e=it.Symbol||(it.Symbol={});w(e,t)||Zt(e,t,{value:Qt.f(t)})},ee=A.f,ie=Xt("toStringTag"),ne=function(t,e,i){t&&!w(t=i?t:t.prototype,ie)&&ee(t,ie,{configurable:!0,value:e})},oe=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},re=Xt("species"),ae=function(t,e){var i;return Nt(t)&&("function"!=typeof(i=t.constructor)||i!==Array&&!Nt(i.prototype)?b(i)&&null===(i=i[re])&&(i=void 0):i=void 0),new(void 0===i?Array:i)(0===e?0:e)},se=[].push,le=function(t){var e=1==t,i=2==t,n=3==t,o=4==t,r=6==t,a=5==t||r;return function(s,l,c,h){for(var u,d,p=Ft(s),g=f(p),v=function(t,e,i){if(oe(t),void 0===e)return t;switch(i){case 0:return function(){return t.call(e)};case 1:return function(i){return t.call(e,i)};case 2:return function(i,n){return t.call(e,i,n)};case 3:return function(i,n,o){return t.call(e,i,n,o)}}return function(){return t.apply(e,arguments)}}(l,c,3),b=ct(g.length),m=0,y=h||ae,w=e?y(s,b):i?y(s,0):void 0;b>m;m++)if((a||m in g)&&(d=v(u=g[m],m,p),t))if(e)w[m]=d;else if(d)switch(t){case 3:return!0;case 5:return u;case 6:return m;case 2:se.call(w,u)}else if(o)return!1;return r?-1:n||o?o:w}},ce={forEach:le(0),map:le(1),filter:le(2),some:le(3),every:le(4),find:le(5),findIndex:le(6)},he=ce.forEach,ue=q("hidden"),de=Xt("toPrimitive"),pe=tt.set,fe=tt.getterFor("Symbol"),ge=Object.prototype,ve=o.Symbol,be=ot("JSON","stringify"),me=T.f,ye=A.f,we=Gt.f,Se=c.f,xe=L("symbols"),ke=L("op-symbols"),Oe=L("string-to-symbol-registry"),Ce=L("symbol-to-string-registry"),Te=L("wks"),Pe=o.QObject,Ie=!Pe||!Pe.prototype||!Pe.prototype.findChild,Ae=a&&r((function(){return 7!=Ut(ye({},"a",{get:function(){return ye(this,"a",{value:7}).a}})).a}))?function(t,e,i){var n=me(ge,e);n&&delete ge[e],ye(t,e,i),n&&t!==ge&&ye(ge,e,n)}:ye,$e=function(t,e){var i=xe[t]=Ut(ve.prototype);return pe(i,{type:"Symbol",tag:t,description:e}),a||(i.description=e),i},Ee=Rt&&"symbol"==typeof ve.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ve},Re=function(t,e,i){t===ge&&Re(ke,e,i),P(t);var n=m(e,!0);return P(i),w(xe,n)?(i.enumerable?(w(t,ue)&&t[ue][n]&&(t[ue][n]=!1),i=Ut(i,{enumerable:h(0,!1)})):(w(t,ue)||ye(t,ue,h(1,{})),t[ue][n]=!0),Ae(t,n,i)):ye(t,n,i)},je=function(t,e){P(t);var i=v(e),n=_t(i).concat(Be(i));return he(n,(function(e){a&&!Ne.call(i,e)||Re(t,e,i[e])})),t},Ne=function(t){var e=m(t,!0),i=Se.call(this,e);return!(this===ge&&w(xe,e)&&!w(ke,e))&&(!(i||!w(this,e)||!w(xe,e)||w(this,ue)&&this[ue][e])||i)},Fe=function(t,e){var i=v(t),n=m(e,!0);if(i!==ge||!w(xe,n)||w(ke,n)){var o=me(i,n);return!o||!w(xe,n)||w(i,ue)&&i[ue][n]||(o.enumerable=!0),o}},_e=function(t){var e=we(v(t)),i=[];return he(e,(function(t){w(xe,t)||w(W,t)||i.push(t)})),i},Be=function(t){var e=t===ge,i=we(e?ke:v(t)),n=[];return he(i,(function(t){!w(xe,t)||e&&!w(ge,t)||n.push(xe[t])})),n};if(Rt||(et((ve=function(){if(this instanceof ve)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=U(t),i=function(t){this===ge&&i.call(ke,t),w(this,ue)&&w(this[ue],e)&&(this[ue][e]=!1),Ae(this,e,h(1,t))};return a&&Ie&&Ae(ge,e,{configurable:!0,set:i}),$e(e,t)}).prototype,"toString",(function(){return fe(this).tag})),c.f=Ne,A.f=Re,T.f=Fe,yt.f=Gt.f=_e,wt.f=Be,a&&(ye(ve.prototype,"description",{configurable:!0,get:function(){return fe(this).description}}),et(ge,"propertyIsEnumerable",Ne,{unsafe:!0}))),jt||(Qt.f=function(t){return $e(Xt(t),t)}),Et({global:!0,wrap:!0,forced:!Rt,sham:!Rt},{Symbol:ve}),he(_t(Te),(function(t){te(t)})),Et({target:"Symbol",stat:!0,forced:!Rt},{for:function(t){var e=String(t);if(w(Oe,e))return Oe[e];var i=ve(e);return Oe[e]=i,Ce[i]=e,i},keyFor:function(t){if(!Ee(t))throw TypeError(t+" is not a symbol");if(w(Ce,t))return Ce[t]},useSetter:function(){Ie=!0},useSimple:function(){Ie=!1}}),Et({target:"Object",stat:!0,forced:!Rt,sham:!a},{create:function(t,e){return void 0===e?Ut(t):je(Ut(t),e)},defineProperty:Re,defineProperties:je,getOwnPropertyDescriptor:Fe}),Et({target:"Object",stat:!0,forced:!Rt},{getOwnPropertyNames:_e,getOwnPropertySymbols:Be}),Et({target:"Object",stat:!0,forced:r((function(){wt.f(1)}))},{getOwnPropertySymbols:function(t){return wt.f(Ft(t))}}),be){var Ve=!Rt||r((function(){var t=ve();return"[null]"!=be([t])||"{}"!=be({a:t})||"{}"!=be(Object(t))}));Et({target:"JSON",stat:!0,forced:Ve},{stringify:function(t,e,i){for(var n,o=[t],r=1;arguments.length>r;)o.push(arguments[r++]);if(n=e,(b(e)||void 0!==t)&&!Ee(t))return Nt(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!Ee(e))return e}),o[1]=e,be.apply(null,o)}})}ve.prototype[de]||$(ve.prototype,de,ve.prototype.valueOf),ne(ve,"Symbol"),W[ue]=!0;var De=A.f,Le=o.Symbol;if(a&&"function"==typeof Le&&(!("description"in Le.prototype)||void 0!==Le().description)){var He={},Me=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof Me?new Le(t):void 0===t?Le():Le(t);return""===t&&(He[e]=!0),e};xt(Me,Le);var Ue=Me.prototype=Le.prototype;Ue.constructor=Me;var ze=Ue.toString,qe="Symbol(test)"==String(Le("test")),We=/^Symbol\((.*)\)[^)]+$/;De(Ue,"description",{configurable:!0,get:function(){var t=b(this)?this.valueOf():this,e=ze.call(t);if(w(He,t))return"";var i=qe?e.slice(7,-1):e.replace(We,"$1");return""===i?void 0:i}}),Et({global:!0,forced:!0},{Symbol:Me})}te("iterator");var Ge,Ke,Je=function(t,e,i){var n=m(e);n in t?A.f(t,n,h(0,i)):t[n]=i},Ye=ot("navigator","userAgent")||"",Xe=o.process,Qe=Xe&&Xe.versions,Ze=Qe&&Qe.v8;Ze?Ke=(Ge=Ze.split("."))[0]+Ge[1]:Ye&&(!(Ge=Ye.match(/Edge\/(\d+)/))||Ge[1]>=74)&&(Ge=Ye.match(/Chrome\/(\d+)/))&&(Ke=Ge[1]);var ti=Ke&&+Ke,ei=Xt("species"),ii=function(t){return ti>=51||!r((function(){var e=[];return(e.constructor={})[ei]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},ni=Xt("isConcatSpreadable"),oi=ti>=51||!r((function(){var t=[];return t[ni]=!1,t.concat()[0]!==t})),ri=ii("concat"),ai=function(t){if(!b(t))return!1;var e=t[ni];return void 0!==e?!!e:Nt(t)};Et({target:"Array",proto:!0,forced:!oi||!ri},{concat:function(t){var e,i,n,o,r,a=Ft(this),s=ae(a,0),l=0;for(e=-1,n=arguments.length;e<n;e++)if(ai(r=-1===e?a:arguments[e])){if(l+(o=ct(r.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(i=0;i<o;i++,l++)i in r&&Je(s,l,r[i])}else{if(l>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Je(s,l++,r)}return s.length=l,s}});var si=ce.filter,li=ii("filter"),ci=li&&!r((function(){[].filter.call({length:-1,0:1},(function(t){throw t}))}));Et({target:"Array",proto:!0,forced:!li||!ci},{filter:function(t){return si(this,t,arguments.length>1?arguments[1]:void 0)}});var hi=Xt("unscopables"),ui=Array.prototype;null==ui[hi]&&A.f(ui,hi,{configurable:!0,value:Ut(null)});var di=function(t){ui[hi][t]=!0},pi=ce.find,fi=!0;"find"in[]&&Array(1).find((function(){fi=!1})),Et({target:"Array",proto:!0,forced:fi},{find:function(t){return pi(this,t,arguments.length>1?arguments[1]:void 0)}}),di("find");var gi=ce.findIndex,vi=!0;"findIndex"in[]&&Array(1).findIndex((function(){vi=!1})),Et({target:"Array",proto:!0,forced:vi},{findIndex:function(t){return gi(this,t,arguments.length>1?arguments[1]:void 0)}}),di("findIndex");var bi=ft.includes;Et({target:"Array",proto:!0},{includes:function(t){return bi(this,t,arguments.length>1?arguments[1]:void 0)}}),di("includes");var mi=function(t,e){var i=[][t];return!i||!r((function(){i.call(null,e||function(){throw 1},1)}))},yi=ft.indexOf,wi=[].indexOf,Si=!!wi&&1/[1].indexOf(1,-0)<0,xi=mi("indexOf");Et({target:"Array",proto:!0,forced:Si||xi},{indexOf:function(t){return Si?wi.apply(this,arguments)||0:yi(this,t,arguments.length>1?arguments[1]:void 0)}});var ki,Oi,Ci,Ti=!r((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),Pi=q("IE_PROTO"),Ii=Object.prototype,Ai=Ti?Object.getPrototypeOf:function(t){return t=Ft(t),w(t,Pi)?t[Pi]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?Ii:null},$i=Xt("iterator"),Ei=!1;[].keys&&("next"in(Ci=[].keys())?(Oi=Ai(Ai(Ci)))!==Object.prototype&&(ki=Oi):Ei=!0),null==ki&&(ki={}),w(ki,$i)||$(ki,$i,(function(){return this}));var Ri={IteratorPrototype:ki,BUGGY_SAFARI_ITERATORS:Ei},ji=Ri.IteratorPrototype,Ni=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,i={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(i,[]),e=i instanceof Array}catch(t){}return function(i,n){return P(i),function(t){if(!b(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(n),e?t.call(i,n):i.__proto__=n,i}}():void 0),Fi=Ri.IteratorPrototype,_i=Ri.BUGGY_SAFARI_ITERATORS,Bi=Xt("iterator"),Vi=function(){return this},Di=function(t,e,i,n,o,r,a){!function(t,e,i){var n=e+" Iterator";t.prototype=Ut(ji,{next:h(1,i)}),ne(t,n,!1)}(i,e,n);var s,l,c,u=function(t){if(t===o&&v)return v;if(!_i&&t in f)return f[t];switch(t){case"keys":case"values":case"entries":return function(){return new i(this,t)}}return function(){return new i(this)}},d=e+" Iterator",p=!1,f=t.prototype,g=f[Bi]||f["@@iterator"]||o&&f[o],v=!_i&&g||u(o),b="Array"==e&&f.entries||g;if(b&&(s=Ai(b.call(new t)),Fi!==Object.prototype&&s.next&&(Ai(s)!==Fi&&(Ni?Ni(s,Fi):"function"!=typeof s[Bi]&&$(s,Bi,Vi)),ne(s,d,!0))),"values"==o&&g&&"values"!==g.name&&(p=!0,v=function(){return g.call(this)}),f[Bi]!==v&&$(f,Bi,v),o)if(l={values:u("values"),keys:r?v:u("keys"),entries:u("entries")},a)for(c in l)(_i||p||!(c in f))&&et(f,c,l[c]);else Et({target:e,proto:!0,forced:_i||p},l);return l},Li=tt.set,Hi=tt.getterFor("Array Iterator"),Mi=Di(Array,"Array",(function(t,e){Li(this,{type:"Array Iterator",target:v(t),index:0,kind:e})}),(function(){var t=Hi(this),e=t.target,i=t.kind,n=t.index++;return!e||n>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==i?{value:n,done:!1}:"values"==i?{value:e[n],done:!1}:{value:[n,e[n]],done:!1}}),"values");di("keys"),di("values"),di("entries");var Ui=[].join,zi=f!=Object,qi=mi("join",",");Et({target:"Array",proto:!0,forced:zi||qi},{join:function(t){return Ui.call(v(this),void 0===t?",":t)}});var Wi=ce.map,Gi=ii("map"),Ki=Gi&&!r((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));Et({target:"Array",proto:!0,forced:!Gi||!Ki},{map:function(t){return Wi(this,t,arguments.length>1?arguments[1]:void 0)}});var Ji=[].reverse,Yi=[1,2];Et({target:"Array",proto:!0,forced:String(Yi)===String(Yi.reverse())},{reverse:function(){return Nt(this)&&(this.length=this.length),Ji.call(this)}});var Xi=Xt("species"),Qi=[].slice,Zi=Math.max;Et({target:"Array",proto:!0,forced:!ii("slice")},{slice:function(t,e){var i,n,o,r=v(this),a=ct(r.length),s=dt(t,a),l=dt(void 0===e?a:e,a);if(Nt(r)&&("function"!=typeof(i=r.constructor)||i!==Array&&!Nt(i.prototype)?b(i)&&null===(i=i[Xi])&&(i=void 0):i=void 0,i===Array||void 0===i))return Qi.call(r,s,l);for(n=new(void 0===i?Array:i)(Zi(l-s,0)),o=0;s<l;s++,o++)s in r&&Je(n,o,r[s]);return n.length=o,n}});var tn=[],en=tn.sort,nn=r((function(){tn.sort(void 0)})),on=r((function(){tn.sort(null)})),rn=mi("sort");Et({target:"Array",proto:!0,forced:nn||!on||rn},{sort:function(t){return void 0===t?en.call(Ft(this)):en.call(Ft(this),oe(t))}});var an=Math.max,sn=Math.min;Et({target:"Array",proto:!0,forced:!ii("splice")},{splice:function(t,e){var i,n,o,r,a,s,l=Ft(this),c=ct(l.length),h=dt(t,c),u=arguments.length;if(0===u?i=n=0:1===u?(i=0,n=c-h):(i=u-2,n=sn(an(st(e),0),c-h)),c+i-n>9007199254740991)throw TypeError("Maximum allowed length exceeded");for(o=ae(l,n),r=0;r<n;r++)(a=h+r)in l&&Je(o,r,l[a]);if(o.length=n,i<n){for(r=h;r<c-n;r++)s=r+i,(a=r+n)in l?l[s]=l[a]:delete l[s];for(r=c;r>c-n+i;r--)delete l[r-1]}else if(i>n)for(r=c-n;r>h;r--)s=r+i-1,(a=r+n-1)in l?l[s]=l[a]:delete l[s];for(r=0;r<i;r++)l[r+h]=arguments[r+2];return l.length=c-n+i,o}});var ln=function(t,e,i){var n,o;return Ni&&"function"==typeof(n=e.constructor)&&n!==i&&b(o=n.prototype)&&o!==i.prototype&&Ni(t,o),t},cn="\t\n\v\f\r                　\u2028\u2029\ufeff",hn="["+cn+"]",un=RegExp("^"+hn+hn+"*"),dn=RegExp(hn+hn+"*$"),pn=function(t){return function(e){var i=String(g(e));return 1&t&&(i=i.replace(un,"")),2&t&&(i=i.replace(dn,"")),i}},fn={start:pn(1),end:pn(2),trim:pn(3)},gn=yt.f,vn=T.f,bn=A.f,mn=fn.trim,yn=o.Number,wn=yn.prototype,Sn="Number"==d(Ut(wn)),xn=function(t){var e,i,n,o,r,a,s,l,c=m(t,!1);if("string"==typeof c&&c.length>2)if(43===(e=(c=mn(c)).charCodeAt(0))||45===e){if(88===(i=c.charCodeAt(2))||120===i)return NaN}else if(48===e){switch(c.charCodeAt(1)){case 66:case 98:n=2,o=49;break;case 79:case 111:n=8,o=55;break;default:return+c}for(a=(r=c.slice(2)).length,s=0;s<a;s++)if((l=r.charCodeAt(s))<48||l>o)return NaN;return parseInt(r,n)}return+c};if(At("Number",!yn(" 0o1")||!yn("0b1")||yn("+0x1"))){for(var kn,On=function(t){var e=arguments.length<1?0:t,i=this;return i instanceof On&&(Sn?r((function(){wn.valueOf.call(i)})):"Number"!=d(i))?ln(new yn(xn(e)),i,On):xn(e)},Cn=a?gn(yn):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),Tn=0;Cn.length>Tn;Tn++)w(yn,kn=Cn[Tn])&&!w(On,kn)&&bn(On,kn,vn(yn,kn));On.prototype=wn,wn.constructor=On,et(o,"Number",On)}var Pn=Object.assign,In=Object.defineProperty,An=!Pn||r((function(){if(a&&1!==Pn({b:1},Pn(In({},"a",{enumerable:!0,get:function(){In(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},i=Symbol();return t[i]=7,"abcdefghijklmnopqrst".split("").forEach((function(t){e[t]=t})),7!=Pn({},t)[i]||"abcdefghijklmnopqrst"!=_t(Pn({},e)).join("")}))?function(t,e){for(var i=Ft(t),n=arguments.length,o=1,r=wt.f,s=c.f;n>o;)for(var l,h=f(arguments[o++]),u=r?_t(h).concat(r(h)):_t(h),d=u.length,p=0;d>p;)l=u[p++],a&&!s.call(h,l)||(i[l]=h[l]);return i}:Pn;Et({target:"Object",stat:!0,forced:Object.assign!==An},{assign:An});var $n=c.f,En=function(t){return function(e){for(var i,n=v(e),o=_t(n),r=o.length,s=0,l=[];r>s;)i=o[s++],a&&!$n.call(n,i)||l.push(t?[i,n[i]]:n[i]);return l}},Rn={entries:En(!0),values:En(!1)}.entries;Et({target:"Object",stat:!0},{entries:function(t){return Rn(t)}});var jn={};jn[Xt("toStringTag")]="z";var Nn="[object z]"===String(jn),Fn=Xt("toStringTag"),_n="Arguments"==d(function(){return arguments}()),Bn=Nn?d:function(t){var e,i,n;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(i=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),Fn))?i:_n?d(e):"Object"==(n=d(e))&&"function"==typeof e.callee?"Arguments":n},Vn=Nn?{}.toString:function(){return"[object "+Bn(this)+"]"};Nn||et(Object.prototype,"toString",Vn,{unsafe:!0});var Dn=fn.trim,Ln=o.parseFloat,Hn=1/Ln(cn+"-0")!=-1/0?function(t){var e=Dn(String(t)),i=Ln(e);return 0===i&&"-"==e.charAt(0)?-0:i}:Ln;Et({global:!0,forced:parseFloat!=Hn},{parseFloat:Hn});var Mn=fn.trim,Un=o.parseInt,zn=/^[+-]?0[Xx]/,qn=8!==Un(cn+"08")||22!==Un(cn+"0x16")?function(t,e){var i=Mn(String(t));return Un(i,e>>>0||(zn.test(i)?16:10))}:Un;Et({global:!0,forced:parseInt!=qn},{parseInt:qn});var Wn=function(){var t=P(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function Gn(t,e){return RegExp(t,e)}var Kn,Jn,Yn={UNSUPPORTED_Y:r((function(){var t=Gn("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:r((function(){var t=Gn("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},Xn=RegExp.prototype.exec,Qn=String.prototype.replace,Zn=Xn,to=(Kn=/a/,Jn=/b*/g,Xn.call(Kn,"a"),Xn.call(Jn,"a"),0!==Kn.lastIndex||0!==Jn.lastIndex),eo=Yn.UNSUPPORTED_Y||Yn.BROKEN_CARET,io=void 0!==/()??/.exec("")[1];(to||io||eo)&&(Zn=function(t){var e,i,n,o,r=this,a=eo&&r.sticky,s=Wn.call(r),l=r.source,c=0,h=t;return a&&(-1===(s=s.replace("y","")).indexOf("g")&&(s+="g"),h=String(t).slice(r.lastIndex),r.lastIndex>0&&(!r.multiline||r.multiline&&"\n"!==t[r.lastIndex-1])&&(l="(?: "+l+")",h=" "+h,c++),i=new RegExp("^(?:"+l+")",s)),io&&(i=new RegExp("^"+l+"$(?!\\s)",s)),to&&(e=r.lastIndex),n=Xn.call(a?i:r,h),a?n?(n.input=n.input.slice(c),n[0]=n[0].slice(c),n.index=r.lastIndex,r.lastIndex+=n[0].length):r.lastIndex=0:to&&n&&(r.lastIndex=r.global?n.index+n[0].length:e),io&&n&&n.length>1&&Qn.call(n[0],i,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(n[o]=void 0)})),n});var no=Zn;Et({target:"RegExp",proto:!0,forced:/./.exec!==no},{exec:no});var oo=RegExp.prototype,ro=oo.toString,ao=r((function(){return"/a/b"!=ro.call({source:"a",flags:"b"})})),so="toString"!=ro.name;(ao||so)&&et(RegExp.prototype,"toString",(function(){var t=P(this),e=String(t.source),i=t.flags;return"/"+e+"/"+String(void 0===i&&t instanceof RegExp&&!("flags"in oo)?Wn.call(t):i)}),{unsafe:!0});var lo=Xt("match"),co=function(t){var e;return b(t)&&(void 0!==(e=t[lo])?!!e:"RegExp"==d(t))},ho=function(t){if(co(t))throw TypeError("The method doesn't accept regular expressions");return t},uo=Xt("match"),po=function(t){var e=/./;try{"/./"[t](e)}catch(i){try{return e[uo]=!1,"/./"[t](e)}catch(t){}}return!1};Et({target:"String",proto:!0,forced:!po("includes")},{includes:function(t){return!!~String(g(this)).indexOf(ho(t),arguments.length>1?arguments[1]:void 0)}});var fo=function(t){return function(e,i){var n,o,r=String(g(e)),a=st(i),s=r.length;return a<0||a>=s?t?"":void 0:(n=r.charCodeAt(a))<55296||n>56319||a+1===s||(o=r.charCodeAt(a+1))<56320||o>57343?t?r.charAt(a):n:t?r.slice(a,a+2):o-56320+(n-55296<<10)+65536}},go={codeAt:fo(!1),charAt:fo(!0)},vo=go.charAt,bo=tt.set,mo=tt.getterFor("String Iterator");Di(String,"String",(function(t){bo(this,{type:"String Iterator",string:String(t),index:0})}),(function(){var t,e=mo(this),i=e.string,n=e.index;return n>=i.length?{value:void 0,done:!0}:(t=vo(i,n),e.index+=t.length,{value:t,done:!1})}));var yo=Xt("species"),wo=!r((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),So="$0"==="a".replace(/./,"$0"),xo=!r((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var i="ab".split(t);return 2!==i.length||"a"!==i[0]||"b"!==i[1]})),ko=function(t,e,i,n){var o=Xt(t),a=!r((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),s=a&&!r((function(){var e=!1,i=/a/;return"split"===t&&((i={}).constructor={},i.constructor[yo]=function(){return i},i.flags="",i[o]=/./[o]),i.exec=function(){return e=!0,null},i[o](""),!e}));if(!a||!s||"replace"===t&&(!wo||!So)||"split"===t&&!xo){var l=/./[o],c=i(o,""[t],(function(t,e,i,n,o){return e.exec===no?a&&!o?{done:!0,value:l.call(e,i,n)}:{done:!0,value:t.call(i,e,n)}:{done:!1}}),{REPLACE_KEEPS_$0:So}),h=c[0],u=c[1];et(String.prototype,t,h),et(RegExp.prototype,o,2==e?function(t,e){return u.call(t,this,e)}:function(t){return u.call(t,this)})}n&&$(RegExp.prototype[o],"sham",!0)},Oo=go.charAt,Co=function(t,e,i){return e+(i?Oo(t,e).length:1)},To=function(t,e){var i=t.exec;if("function"==typeof i){var n=i.call(t,e);if("object"!=typeof n)throw TypeError("RegExp exec method returned something other than an Object or null");return n}if("RegExp"!==d(t))throw TypeError("RegExp#exec called on incompatible receiver");return no.call(t,e)},Po=Math.max,Io=Math.min,Ao=Math.floor,$o=/\$([$&'`]|\d\d?|<[^>]*>)/g,Eo=/\$([$&'`]|\d\d?)/g;ko("replace",2,(function(t,e,i,n){return[function(i,n){var o=g(this),r=null==i?void 0:i[t];return void 0!==r?r.call(i,o,n):e.call(String(o),i,n)},function(t,r){if(n.REPLACE_KEEPS_$0||"string"==typeof r&&-1===r.indexOf("$0")){var a=i(e,t,this,r);if(a.done)return a.value}var s=P(t),l=String(this),c="function"==typeof r;c||(r=String(r));var h=s.global;if(h){var u=s.unicode;s.lastIndex=0}for(var d=[];;){var p=To(s,l);if(null===p)break;if(d.push(p),!h)break;""===String(p[0])&&(s.lastIndex=Co(l,ct(s.lastIndex),u))}for(var f,g="",v=0,b=0;b<d.length;b++){p=d[b];for(var m=String(p[0]),y=Po(Io(st(p.index),l.length),0),w=[],S=1;S<p.length;S++)w.push(void 0===(f=p[S])?f:String(f));var x=p.groups;if(c){var k=[m].concat(w,y,l);void 0!==x&&k.push(x);var O=String(r.apply(void 0,k))}else O=o(m,l,y,w,x,r);y>=v&&(g+=l.slice(v,y)+O,v=y+m.length)}return g+l.slice(v)}];function o(t,i,n,o,r,a){var s=n+t.length,l=o.length,c=Eo;return void 0!==r&&(r=Ft(r),c=$o),e.call(a,c,(function(e,a){var c;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return i.slice(0,n);case"'":return i.slice(s);case"<":c=r[a.slice(1,-1)];break;default:var h=+a;if(0===h)return e;if(h>l){var u=Ao(h/10);return 0===u?e:u<=l?void 0===o[u-1]?a.charAt(1):o[u-1]+a.charAt(1):e}c=o[h-1]}return void 0===c?"":c}))}}));var Ro=Object.is||function(t,e){return t===e?0!==t||1/t==1/e:t!=t&&e!=e};ko("search",1,(function(t,e,i){return[function(e){var i=g(this),n=null==e?void 0:e[t];return void 0!==n?n.call(e,i):new RegExp(e)[t](String(i))},function(t){var n=i(e,t,this);if(n.done)return n.value;var o=P(t),r=String(this),a=o.lastIndex;Ro(a,0)||(o.lastIndex=0);var s=To(o,r);return Ro(o.lastIndex,a)||(o.lastIndex=a),null===s?-1:s.index}]}));var jo=Xt("species"),No=[].push,Fo=Math.min,_o=!r((function(){return!RegExp(4294967295,"y")}));ko("split",2,(function(t,e,i){var n;return n="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,i){var n=String(g(this)),o=void 0===i?4294967295:i>>>0;if(0===o)return[];if(void 0===t)return[n];if(!co(t))return e.call(n,t,o);for(var r,a,s,l=[],c=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),h=0,u=new RegExp(t.source,c+"g");(r=no.call(u,n))&&!((a=u.lastIndex)>h&&(l.push(n.slice(h,r.index)),r.length>1&&r.index<n.length&&No.apply(l,r.slice(1)),s=r[0].length,h=a,l.length>=o));)u.lastIndex===r.index&&u.lastIndex++;return h===n.length?!s&&u.test("")||l.push(""):l.push(n.slice(h)),l.length>o?l.slice(0,o):l}:"0".split(void 0,0).length?function(t,i){return void 0===t&&0===i?[]:e.call(this,t,i)}:e,[function(e,i){var o=g(this),r=null==e?void 0:e[t];return void 0!==r?r.call(e,o,i):n.call(String(o),e,i)},function(t,o){var r=i(n,t,this,o,n!==e);if(r.done)return r.value;var a=P(t),s=String(this),l=function(t,e){var i,n=P(t).constructor;return void 0===n||null==(i=P(n)[jo])?e:oe(i)}(a,RegExp),c=a.unicode,h=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(_o?"y":"g"),u=new l(_o?a:"^(?:"+a.source+")",h),d=void 0===o?4294967295:o>>>0;if(0===d)return[];if(0===s.length)return null===To(u,s)?[s]:[];for(var p=0,f=0,g=[];f<s.length;){u.lastIndex=_o?f:0;var v,b=To(u,_o?s:s.slice(f));if(null===b||(v=Fo(ct(u.lastIndex+(_o?0:f)),s.length))===p)f=Co(s,f,c);else{if(g.push(s.slice(p,f)),g.length===d)return g;for(var m=1;m<=b.length-1;m++)if(g.push(b[m]),g.length===d)return g;f=p=v}}return g.push(s.slice(p)),g}]}),!_o);var Bo=fn.trim;Et({target:"String",proto:!0,forced:function(t){return r((function(){return!!cn[t]()||"​…᠎"!="​…᠎"[t]()||cn[t].name!==t}))}("trim")},{trim:function(){return Bo(this)}});var Vo={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},Do=ce.forEach,Lo=mi("forEach")?function(t){return Do(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var Ho in Vo){var Mo=o[Ho],Uo=Mo&&Mo.prototype;if(Uo&&Uo.forEach!==Lo)try{$(Uo,"forEach",Lo)}catch(t){Uo.forEach=Lo}}var zo=Xt("iterator"),qo=Xt("toStringTag"),Wo=Mi.values;for(var Go in Vo){var Ko=o[Go],Jo=Ko&&Ko.prototype;if(Jo){if(Jo[zo]!==Wo)try{$(Jo,zo,Wo)}catch(t){Jo[zo]=Wo}if(Jo[qo]||$(Jo,qo,Go),Vo[Go])for(var Yo in Mi)if(Jo[Yo]!==Mi[Yo])try{$(Jo,Yo,Mi[Yo])}catch(t){Jo[Yo]=Mi[Yo]}}}function Xo(t){return(Xo="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Qo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Zo(t,e){for(var i=0;i<e.length;i++){var n=e[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function tr(t,e,i){return e&&Zo(t.prototype,e),i&&Zo(t,i),t}function er(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if(!(Symbol.iterator in Object(t))&&"[object Arguments]"!==Object.prototype.toString.call(t))return;var i=[],n=!0,o=!1,r=void 0;try{for(var a,s=t[Symbol.iterator]();!(n=(a=s.next()).done)&&(i.push(a.value),!e||i.length!==e);n=!0);}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}return i}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}function ir(t){return function(t){if(Array.isArray(t)){for(var e=0,i=new Array(t.length);e<t.length;e++)i[e]=t[e];return i}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}var nr=4;try{var or=t.fn.dropdown.Constructor.VERSION;void 0!==or&&(nr=parseInt(or,10))}catch(t){}try{var rr=bootstrap.Tooltip.VERSION;void 0!==rr&&(nr=parseInt(rr,10))}catch(t){}var ar={3:{iconsPrefix:"glyphicon",icons:{paginationSwitchDown:"glyphicon-collapse-down icon-chevron-down",paginationSwitchUp:"glyphicon-collapse-up icon-chevron-up",refresh:"glyphicon-refresh icon-refresh",toggleOff:"glyphicon-list-alt icon-list-alt",toggleOn:"glyphicon-list-alt icon-list-alt",columns:"glyphicon-th icon-th",detailOpen:"glyphicon-plus icon-plus",detailClose:"glyphicon-minus icon-minus",fullscreen:"glyphicon-fullscreen",search:"glyphicon-search",clearSearch:"glyphicon-trash"},classes:{buttonsPrefix:"btn",buttons:"default",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"pull",inputGroup:"input-group",inputPrefix:"input-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],toolbarDropdownItem:'<li class="dropdown-item-marker" role="menuitem"><label>%s</label></li>',toolbarDropdownSeparator:'<li class="divider"></li>',pageDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],pageDropdownItem:'<li role="menuitem" class="%s"><a href="#">%s</a></li>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<span class="input-group-btn">%s</span></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},4:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},5:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}}}[nr],sr={height:void 0,classes:"table table-bordered table-hover",theadClasses:"",headerStyle:function(t){return{}},rowStyle:function(t,e){return{}},rowAttributes:function(t,e){return{}},undefinedText:"-",locale:void 0,virtualScroll:!1,virtualScrollItemHeight:void 0,sortable:!0,sortClass:void 0,silentSort:!0,sortName:void 0,sortOrder:void 0,sortReset:!1,sortStable:!1,rememberOrder:!1,serverSort:!0,customSort:void 0,columns:[[]],data:[],url:void 0,method:"get",cache:!0,contentType:"application/json",dataType:"json",ajax:void 0,ajaxOptions:{},queryParams:function(t){return t},queryParamsType:"limit",responseHandler:function(t){return t},totalField:"total",totalNotFilteredField:"totalNotFiltered",dataField:"rows",pagination:!1,paginationParts:["pageInfo","pageSize","pageList"],showExtendedPagination:!1,paginationLoop:!0,sidePagination:"client",totalRows:0,totalNotFiltered:0,pageNumber:1,pageSize:10,pageList:[10,25,50,100],paginationHAlign:"right",paginationVAlign:"bottom",paginationDetailHAlign:"left",paginationPreText:"&lsaquo;",paginationNextText:"&rsaquo;",paginationSuccessivelySize:5,paginationPagesBySide:1,paginationUseIntermediate:!1,search:!1,searchOnEnterKey:!1,strictSearch:!1,visibleSearch:!1,showButtonIcons:!0,showButtonText:!1,showSearchButton:!1,showSearchClearButton:!1,trimOnSearch:!0,searchAlign:"right",searchTimeOut:500,searchText:"",customSearch:void 0,showHeader:!0,showFooter:!1,footerStyle:function(t){return{}},searchAccentNeutralise:!1,showColumns:!1,showColumnsToggleAll:!1,showColumnsSearch:!1,minimumCountColumns:1,showPaginationSwitch:!1,showRefresh:!1,showToggle:!1,showFullscreen:!1,smartDisplay:!0,escape:!1,filterOptions:{filterAlgorithm:"and"},idField:void 0,selectItemName:"btSelectItem",clickToSelect:!1,ignoreClickToSelectOn:function(t){var e=t.tagName;return["A","BUTTON"].includes(e)},singleSelect:!1,checkboxHeader:!0,maintainMetaData:!1,multipleSelectRow:!1,uniqueId:void 0,cardView:!1,detailView:!1,detailViewIcon:!0,detailViewByClick:!1,detailViewAlign:"left",detailFormatter:function(t,e){return""},detailFilter:function(t,e){return!0},toolbar:void 0,toolbarAlign:"left",buttonsToolbar:void 0,buttonsAlign:"right",buttonsOrder:["paginationSwitch","refresh","toggle","fullscreen","columns"],buttonsPrefix:ar.classes.buttonsPrefix,buttonsClass:ar.classes.buttons,icons:ar.icons,iconSize:void 0,iconsPrefix:ar.iconsPrefix,loadingFontSize:"auto",loadingTemplate:function(t){return'<span class="loading-wrap">\n      <span class="loading-text">'.concat(t,'</span>\n      <span class="animation-wrap"><span class="animation-dot"></span></span>\n      </span>\n    ')},onAll:function(t,e){return!1},onClickCell:function(t,e,i,n){return!1},onDblClickCell:function(t,e,i,n){return!1},onClickRow:function(t,e){return!1},onDblClickRow:function(t,e){return!1},onSort:function(t,e){return!1},onCheck:function(t){return!1},onUncheck:function(t){return!1},onCheckAll:function(t){return!1},onUncheckAll:function(t){return!1},onCheckSome:function(t){return!1},onUncheckSome:function(t){return!1},onLoadSuccess:function(t){return!1},onLoadError:function(t){return!1},onColumnSwitch:function(t,e){return!1},onPageChange:function(t,e){return!1},onSearch:function(t){return!1},onToggle:function(t){return!1},onPreBody:function(t){return!1},onPostBody:function(){return!1},onPostHeader:function(){return!1},onPostFooter:function(){return!1},onExpandRow:function(t,e,i){return!1},onCollapseRow:function(t,e){return!1},onRefreshOptions:function(t){return!1},onRefresh:function(t){return!1},onResetView:function(){return!1},onScrollBody:function(){return!1}},lr={formatLoadingMessage:function(){return"Loading, please wait"},formatRecordsPerPage:function(t){return"".concat(t," rows per page")},formatShowingRows:function(t,e,i,n){return void 0!==n&&n>0&&n>i?"Showing ".concat(t," to ").concat(e," of ").concat(i," rows (filtered from ").concat(n," total rows)"):"Showing ".concat(t," to ").concat(e," of ").concat(i," rows")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatSearch:function(){return"Search"},formatClearSearch:function(){return"Clear Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"}},cr={field:void 0,title:void 0,titleTooltip:void 0,class:void 0,width:void 0,widthUnit:"px",rowspan:void 0,colspan:void 0,align:void 0,halign:void 0,falign:void 0,valign:void 0,cellStyle:void 0,radio:!1,checkbox:!1,checkboxEnabled:!0,clickToSelect:!0,showSelectTitle:!1,sortable:!1,sortName:void 0,order:"asc",sorter:void 0,visible:!0,switchable:!0,cardVisible:!0,searchable:!0,formatter:void 0,footerFormatter:void 0,detailFormatter:void 0,searchFormatter:!0,escape:!1,events:void 0};Object.assign(sr,lr);var hr={VERSION:"1.17.1",THEME:"bootstrap".concat(nr),CONSTANTS:ar,DEFAULTS:sr,COLUMN_DEFAULTS:cr,METHODS:["getOptions","refreshOptions","getData","getSelections","getAllSelections","load","append","prepend","remove","removeAll","insertRow","updateRow","getRowByUniqueId","updateByUniqueId","removeByUniqueId","updateCell","updateCellByUniqueId","showRow","hideRow","getHiddenRows","showColumn","hideColumn","getVisibleColumns","getHiddenColumns","showAllColumns","hideAllColumns","mergeCells","checkAll","uncheckAll","checkInvert","check","uncheck","checkBy","uncheckBy","refresh","destroy","resetView","showLoading","hideLoading","togglePagination","toggleFullscreen","toggleView","resetSearch","filterBy","scrollTo","getScrollPosition","selectPage","prevPage","nextPage","toggleDetailView","expandRow","collapseRow","expandRowByUniqueId","collapseRowByUniqueId","expandAllRows","collapseAllRows","updateColumnTitle","updateFormatText"],EVENTS:{"all.bs.table":"onAll","click-row.bs.table":"onClickRow","dbl-click-row.bs.table":"onDblClickRow","click-cell.bs.table":"onClickCell","dbl-click-cell.bs.table":"onDblClickCell","sort.bs.table":"onSort","check.bs.table":"onCheck","uncheck.bs.table":"onUncheck","check-all.bs.table":"onCheckAll","uncheck-all.bs.table":"onUncheckAll","check-some.bs.table":"onCheckSome","uncheck-some.bs.table":"onUncheckSome","load-success.bs.table":"onLoadSuccess","load-error.bs.table":"onLoadError","column-switch.bs.table":"onColumnSwitch","page-change.bs.table":"onPageChange","search.bs.table":"onSearch","toggle.bs.table":"onToggle","pre-body.bs.table":"onPreBody","post-body.bs.table":"onPostBody","post-header.bs.table":"onPostHeader","post-footer.bs.table":"onPostFooter","expand-row.bs.table":"onExpandRow","collapse-row.bs.table":"onCollapseRow","refresh-options.bs.table":"onRefreshOptions","reset-view.bs.table":"onResetView","refresh.bs.table":"onRefresh","scroll-body.bs.table":"onScrollBody"},LOCALES:{en:lr,"en-US":lr}},ur=r((function(){_t(1)}));Et({target:"Object",stat:!0,forced:ur},{keys:function(t){return _t(Ft(t))}});var dr,pr=T.f,fr="".endsWith,gr=Math.min,vr=po("endsWith"),br=!(vr||(dr=pr(String.prototype,"endsWith"),!dr||dr.writable));Et({target:"String",proto:!0,forced:!br&&!vr},{endsWith:function(t){var e=String(g(this));ho(t);var i=arguments.length>1?arguments[1]:void 0,n=ct(e.length),o=void 0===i?n:gr(ct(i),n),r=String(t);return fr?fr.call(e,r,o):e.slice(o-r.length,o)===r}});var mr=T.f,yr="".startsWith,wr=Math.min,Sr=po("startsWith"),xr=!Sr&&!!function(){var t=mr(String.prototype,"startsWith");return t&&!t.writable}();Et({target:"String",proto:!0,forced:!xr&&!Sr},{startsWith:function(t){var e=String(g(this));ho(t);var i=ct(wr(arguments.length>1?arguments[1]:void 0,e.length)),n=String(t);return yr?yr.call(e,n,i):e.slice(i,i+n.length)===n}});var kr={sprintf:function(t){for(var e=arguments.length,i=new Array(e>1?e-1:0),n=1;n<e;n++)i[n-1]=arguments[n];var o=!0,r=0,a=t.replace(/%s/g,(function(){var t=i[r++];return void 0===t?(o=!1,""):t}));return o?a:""},isEmptyObject:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return 0===Object.entries(t).length&&t.constructor===Object},isNumeric:function(t){return!isNaN(parseFloat(t))&&isFinite(t)},getFieldTitle:function(t,e){var i=!0,n=!1,o=void 0;try{for(var r,a=t[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s=r.value;if(s.field===e)return s.title}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}return""},setFieldIndex:function(t){var e=0,i=[],n=!0,o=!1,r=void 0;try{for(var a,s=t[0][Symbol.iterator]();!(n=(a=s.next()).done);n=!0){e+=a.value.colspan||1}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}for(var l=0;l<t.length;l++){i[l]=[];for(var c=0;c<e;c++)i[l][c]=!1}for(var h=0;h<t.length;h++){var u=!0,d=!1,p=void 0;try{for(var f,g=t[h][Symbol.iterator]();!(u=(f=g.next()).done);u=!0){var v=f.value,b=v.rowspan||1,m=v.colspan||1,y=i[h].indexOf(!1);v.colspanIndex=y,1===m?(v.fieldIndex=y,void 0===v.field&&(v.field=y)):v.colspanGroup=v.colspan;for(var w=0;w<b;w++)i[h+w][y]=!0;for(var S=0;S<m;S++)i[h][y+S]=!0}}catch(t){d=!0,p=t}finally{try{u||null==g.return||g.return()}finally{if(d)throw p}}}},normalizeAccent:function(t){return t.normalize("NFD").replace(/[\u0300-\u036f]/g,"")},updateFieldGroup:function(t){var e,i=(e=[]).concat.apply(e,ir(t)),n=!0,o=!1,r=void 0;try{for(var a,s=t[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value,c=!0,h=!1,u=void 0;try{for(var d,p=l[Symbol.iterator]();!(c=(d=p.next()).done);c=!0){var f=d.value;if(f.colspanGroup>1){for(var g=0,v=function(t){i.find((function(e){return e.fieldIndex===t})).visible&&g++},b=f.colspanIndex;b<f.colspanIndex+f.colspanGroup;b++)v(b);f.colspan=g,f.visible=g>0}}}catch(t){h=!0,u=t}finally{try{c||null==p.return||p.return()}finally{if(h)throw u}}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}},getScrollBarWidth:function(){if(void 0===this.cachedWidth){var e=t("<div/>").addClass("fixed-table-scroll-inner"),i=t("<div/>").addClass("fixed-table-scroll-outer");i.append(e),t("body").append(i);var n=e[0].offsetWidth;i.css("overflow","scroll");var o=e[0].offsetWidth;n===o&&(o=i[0].clientWidth),i.remove(),this.cachedWidth=n-o}return this.cachedWidth},calculateObjectValue:function(t,e,i,n){var o=e;if("string"==typeof e){var r=e.split(".");if(r.length>1){o=window;var a=!0,s=!1,l=void 0;try{for(var c,h=r[Symbol.iterator]();!(a=(c=h.next()).done);a=!0){o=o[c.value]}}catch(t){s=!0,l=t}finally{try{a||null==h.return||h.return()}finally{if(s)throw l}}}else o=window[e]}return null!==o&&"object"===Xo(o)?o:"function"==typeof o?o.apply(t,i||[]):!o&&"string"==typeof e&&this.sprintf.apply(this,[e].concat(ir(i)))?this.sprintf.apply(this,[e].concat(ir(i))):n},compareObjects:function(t,e,i){var n=Object.keys(t),o=Object.keys(e);if(i&&n.length!==o.length)return!1;for(var r=0,a=n;r<a.length;r++){var s=a[r];if(o.includes(s)&&t[s]!==e[s])return!1}return!0},escapeHTML:function(t){return"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#039;").replace(/`/g,"&#x60;"):t},unescapeHTML:function(t){return"string"==typeof t?t.replace(/&amp;/g,"&").replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&#039;/g,"'").replace(/&#x60;/g,"`"):t},getRealDataAttr:function(t){for(var e=0,i=Object.entries(t);e<i.length;e++){var n=er(i[e],2),o=n[0],r=n[1],a=o.split(/(?=[A-Z])/).join("-").toLowerCase();a!==o&&(t[a]=r,delete t[o])}return t},getItemField:function(t,e,i){var n=t;if("string"!=typeof e||t.hasOwnProperty(e))return i?this.escapeHTML(t[e]):t[e];var o=e.split("."),r=!0,a=!1,s=void 0;try{for(var l,c=o[Symbol.iterator]();!(r=(l=c.next()).done);r=!0){var h=l.value;n=n&&n[h]}}catch(t){a=!0,s=t}finally{try{r||null==c.return||c.return()}finally{if(a)throw s}}return i?this.escapeHTML(n):n},isIEBrowser:function(){return navigator.userAgent.includes("MSIE ")||/Trident.*rv:11\./.test(navigator.userAgent)},findIndex:function(t,e){var i=!0,n=!1,o=void 0;try{for(var r,a=t[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s=r.value;if(JSON.stringify(s)===JSON.stringify(e))return t.indexOf(s)}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}return-1},trToData:function(e,i){var n=this,o=[],r=[];return i.each((function(i,a){var s={};s._id=t(a).attr("id"),s._class=t(a).attr("class"),s._data=n.getRealDataAttr(t(a).data()),t(a).find(">td,>th").each((function(o,a){for(var l=+t(a).attr("colspan")||1,c=+t(a).attr("rowspan")||1,h=o;r[i]&&r[i][h];h++);for(var u=h;u<h+l;u++)for(var d=i;d<i+c;d++)r[d]||(r[d]=[]),r[d][u]=!0;var p=e[h].field;s[p]=t(a).html().trim(),s["_".concat(p,"_id")]=t(a).attr("id"),s["_".concat(p,"_class")]=t(a).attr("class"),s["_".concat(p,"_rowspan")]=t(a).attr("rowspan"),s["_".concat(p,"_colspan")]=t(a).attr("colspan"),s["_".concat(p,"_title")]=t(a).attr("title"),s["_".concat(p,"_data")]=n.getRealDataAttr(t(a).data())})),o.push(s)})),o},sort:function(t,e,i,n,o,r){return null==t&&(t=""),null==e&&(e=""),n&&t===e&&(t=o,e=r),this.isNumeric(t)&&this.isNumeric(e)?(t=parseFloat(t))<(e=parseFloat(e))?-1*i:t>e?i:0:t===e?0:("string"!=typeof t&&(t=t.toString()),-1===t.localeCompare(e)?-1*i:i)},getResizeEventName:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return t=t||"".concat(+new Date).concat(~~(1e6*Math.random())),"resize.bootstrap-table-".concat(t)},hasDetailViewIcon:function(t){return t.detailView&&t.detailViewIcon&&!t.cardView},checkAutoMergeCells:function(t){var e=!0,i=!1,n=void 0;try{for(var o,r=t[Symbol.iterator]();!(e=(o=r.next()).done);e=!0)for(var a=o.value,s=0,l=Object.keys(a);s<l.length;s++){var c=l[s];if(c.startsWith("_")&&(c.endsWith("_rowspan")||c.endsWith("_colspan")))return!0}}catch(t){i=!0,n=t}finally{try{e||null==r.return||r.return()}finally{if(i)throw n}}return!1}},Or=function(){function t(e){var i=this;Qo(this,t),this.rows=e.rows,this.scrollEl=e.scrollEl,this.contentEl=e.contentEl,this.callback=e.callback,this.itemHeight=e.itemHeight,this.cache={},this.scrollTop=this.scrollEl.scrollTop,this.initDOM(this.rows,e.fixedScroll),this.scrollEl.scrollTop=this.scrollTop,this.lastCluster=0;var n=function(){i.lastCluster!==(i.lastCluster=i.getNum())&&(i.initDOM(i.rows),i.callback())};this.scrollEl.addEventListener("scroll",n,!1),this.destroy=function(){i.contentEl.innerHtml="",i.scrollEl.removeEventListener("scroll",n,!1)}}return tr(t,[{key:"initDOM",value:function(t,e){void 0===this.clusterHeight&&(this.cache.scrollTop=this.scrollEl.scrollTop,this.cache.data=this.contentEl.innerHTML=t[0]+t[0]+t[0],this.getRowsHeight(t));var i=this.initData(t,this.getNum(e)),n=i.rows.join(""),o=this.checkChanges("data",n),r=this.checkChanges("top",i.topOffset),a=this.checkChanges("bottom",i.bottomOffset),s=[];o&&r?(i.topOffset&&s.push(this.getExtra("top",i.topOffset)),s.push(n),i.bottomOffset&&s.push(this.getExtra("bottom",i.bottomOffset)),this.contentEl.innerHTML=s.join(""),e&&(this.contentEl.scrollTop=this.cache.scrollTop)):a&&(this.contentEl.lastChild.style.height="".concat(i.bottomOffset,"px"))}},{key:"getRowsHeight",value:function(){if(void 0===this.itemHeight){var t=this.contentEl.children,e=t[Math.floor(t.length/2)];this.itemHeight=e.offsetHeight}this.blockHeight=50*this.itemHeight,this.clusterRows=200,this.clusterHeight=4*this.blockHeight}},{key:"getNum",value:function(t){return this.scrollTop=t?this.cache.scrollTop:this.scrollEl.scrollTop,Math.floor(this.scrollTop/(this.clusterHeight-this.blockHeight))||0}},{key:"initData",value:function(t,e){if(t.length<50)return{topOffset:0,bottomOffset:0,rowsAbove:0,rows:t};var i=Math.max((this.clusterRows-50)*e,0),n=i+this.clusterRows,o=Math.max(i*this.itemHeight,0),r=Math.max((t.length-n)*this.itemHeight,0),a=[],s=i;o<1&&s++;for(var l=i;l<n;l++)t[l]&&a.push(t[l]);return{topOffset:o,bottomOffset:r,rowsAbove:s,rows:a}}},{key:"checkChanges",value:function(t,e){var i=e!==this.cache[t];return this.cache[t]=e,i}},{key:"getExtra",value:function(t,e){var i=document.createElement("tr");return i.className="virtual-scroll-".concat(t),e&&(i.style.height="".concat(e,"px")),i.outerHTML}}]),t}(),Cr=function(){function e(i,n){Qo(this,e),this.options=n,this.$el=t(i),this.$el_=this.$el.clone(),this.timeoutId_=0,this.timeoutFooter_=0,this.init()}return tr(e,[{key:"init",value:function(){this.initConstants(),this.initLocale(),this.initContainer(),this.initTable(),this.initHeader(),this.initData(),this.initHiddenRows(),this.initToolbar(),this.initPagination(),this.initBody(),this.initSearchText(),this.initServer()}},{key:"initConstants",value:function(){var e=this.options;this.constants=hr.CONSTANTS,this.constants.theme=t.fn.bootstrapTable.theme;var i=e.buttonsPrefix?"".concat(e.buttonsPrefix,"-"):"";this.constants.buttonsClass=[e.buttonsPrefix,i+e.buttonsClass,kr.sprintf("".concat(i,"%s"),e.iconSize)].join(" ").trim()}},{key:"initLocale",value:function(){if(this.options.locale){var e=t.fn.bootstrapTable.locales,i=this.options.locale.split(/-|_/);i[0]=i[0].toLowerCase(),i[1]&&(i[1]=i[1].toUpperCase()),e[this.options.locale]?t.extend(this.options,e[this.options.locale]):e[i.join("-")]?t.extend(this.options,e[i.join("-")]):e[i[0]]&&t.extend(this.options,e[i[0]])}}},{key:"initContainer",value:function(){var e=["top","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination clearfix"></div>':"",i=["bottom","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination"></div>':"",n=kr.calculateObjectValue(this.options,this.options.loadingTemplate,[this.options.formatLoadingMessage()]);this.$container=t('\n      <div class="bootstrap-table '.concat(this.constants.theme,'">\n      <div class="fixed-table-toolbar"></div>\n      ').concat(e,'\n      <div class="fixed-table-container">\n      <div class="fixed-table-header"><table></table></div>\n      <div class="fixed-table-body">\n      <div class="fixed-table-loading">\n      ').concat(n,'\n      </div>\n      </div>\n      <div class="fixed-table-footer"><table><thead><tr></tr></thead></table></div>\n      </div>\n      ').concat(i,"\n      </div>\n    ")),this.$container.insertAfter(this.$el),this.$tableContainer=this.$container.find(".fixed-table-container"),this.$tableHeader=this.$container.find(".fixed-table-header"),this.$tableBody=this.$container.find(".fixed-table-body"),this.$tableLoading=this.$container.find(".fixed-table-loading"),this.$tableFooter=this.$el.find("tfoot"),this.options.buttonsToolbar?this.$toolbar=t("body").find(this.options.buttonsToolbar):this.$toolbar=this.$container.find(".fixed-table-toolbar"),this.$pagination=this.$container.find(".fixed-table-pagination"),this.$tableBody.append(this.$el),this.$container.after('<div class="clearfix"></div>'),this.$el.addClass(this.options.classes),this.$tableLoading.addClass(this.options.classes),this.options.height&&(this.$tableContainer.addClass("fixed-height"),this.options.showFooter&&this.$tableContainer.addClass("has-footer"),this.options.classes.split(" ").includes("table-bordered")&&(this.$tableBody.append('<div class="fixed-table-border"></div>'),this.$tableBorder=this.$tableBody.find(".fixed-table-border"),this.$tableLoading.addClass("fixed-table-border")),this.$tableFooter=this.$container.find(".fixed-table-footer"))}},{key:"initTable",value:function(){var i=this,n=[];if(this.$header=this.$el.find(">thead"),this.$header.length?this.options.theadClasses&&this.$header.addClass(this.options.theadClasses):this.$header=t('<thead class="'.concat(this.options.theadClasses,'"></thead>')).appendTo(this.$el),this._headerTrClasses=[],this.$header.find("tr").each((function(e,o){var r=t(o),a=[];r.find("th").each((function(e,i){var n=t(i);void 0!==n.data("field")&&n.data("field","".concat(n.data("field"))),a.push(t.extend({},{title:n.html(),class:n.attr("class"),titleTooltip:n.attr("title"),rowspan:n.attr("rowspan")?+n.attr("rowspan"):void 0,colspan:n.attr("colspan")?+n.attr("colspan"):void 0},n.data()))})),n.push(a),r.attr("class")&&i._headerTrClasses.push(r.attr("class"))})),Array.isArray(this.options.columns[0])||(this.options.columns=[this.options.columns]),this.options.columns=t.extend(!0,[],n,this.options.columns),this.columns=[],this.fieldsColumnsIndex=[],kr.setFieldIndex(this.options.columns),this.options.columns.forEach((function(n,o){n.forEach((function(n,r){var a=t.extend({},e.COLUMN_DEFAULTS,n);void 0!==a.fieldIndex&&(i.columns[a.fieldIndex]=a,i.fieldsColumnsIndex[a.field]=a.fieldIndex),i.options.columns[o][r]=a}))})),!this.options.data.length){var o=kr.trToData(this.columns,this.$el.find(">tbody>tr"));o.length&&(this.options.data=o,this.fromHtml=!0)}this.footerData=kr.trToData(this.columns,this.$el.find(">tfoot>tr")),this.footerData&&this.$el.find("tfoot").html("<tr></tr>"),!this.options.showFooter||this.options.cardView?this.$tableFooter.hide():this.$tableFooter.show()}},{key:"initHeader",value:function(){var e=this,i={},n=[];this.header={fields:[],styles:[],classes:[],formatters:[],detailFormatters:[],events:[],sorters:[],sortNames:[],cellStyles:[],searchables:[]},kr.updateFieldGroup(this.options.columns),this.options.columns.forEach((function(t,o){n.push("<tr".concat(kr.sprintf(' class="%s"',e._headerTrClasses[o]),">"));var r="";0===o&&kr.hasDetailViewIcon(e.options)&&(r='<th class="detail" rowspan="'.concat(e.options.columns.length,'">\n          <div class="fht-cell"></div>\n          </th>')),r&&"right"!==e.options.detailViewAlign&&n.push(r),t.forEach((function(t,r){var a=kr.sprintf(' class="%s"',t.class),s=t.widthUnit,l=parseFloat(t.width),c=kr.sprintf("text-align: %s; ",t.halign?t.halign:t.align),h=kr.sprintf("text-align: %s; ",t.align),u=kr.sprintf("vertical-align: %s; ",t.valign);if(u+=kr.sprintf("width: %s; ",!t.checkbox&&!t.radio||l?l?l+s:void 0:t.showSelectTitle?void 0:"36px"),void 0!==t.fieldIndex||t.visible){var d=kr.calculateObjectValue(null,e.options.headerStyle,[t]),p=[],f="";if(d&&d.css)for(var g=0,v=Object.entries(d.css);g<v.length;g++){var b=er(v[g],2),m=b[0],y=b[1];p.push("".concat(m,": ").concat(y))}if(d&&d.classes&&(f=kr.sprintf(' class="%s"',t.class?[t.class,d.classes].join(" "):d.classes)),void 0!==t.fieldIndex){if(e.header.fields[t.fieldIndex]=t.field,e.header.styles[t.fieldIndex]=h+u,e.header.classes[t.fieldIndex]=a,e.header.formatters[t.fieldIndex]=t.formatter,e.header.detailFormatters[t.fieldIndex]=t.detailFormatter,e.header.events[t.fieldIndex]=t.events,e.header.sorters[t.fieldIndex]=t.sorter,e.header.sortNames[t.fieldIndex]=t.sortName,e.header.cellStyles[t.fieldIndex]=t.cellStyle,e.header.searchables[t.fieldIndex]=t.searchable,!t.visible)return;if(e.options.cardView&&!t.cardVisible)return;i[t.field]=t}n.push("<th".concat(kr.sprintf(' title="%s"',t.titleTooltip)),t.checkbox||t.radio?kr.sprintf(' class="bs-checkbox %s"',t.class||""):f||a,kr.sprintf(' style="%s"',c+u+p.join("; ")),kr.sprintf(' rowspan="%s"',t.rowspan),kr.sprintf(' colspan="%s"',t.colspan),kr.sprintf(' data-field="%s"',t.field),0===r&&o>0?" data-not-first-th":"",">"),n.push(kr.sprintf('<div class="th-inner %s">',e.options.sortable&&t.sortable?"sortable both":""));var w=e.options.escape?kr.escapeHTML(t.title):t.title,S=w;t.checkbox&&(w="",!e.options.singleSelect&&e.options.checkboxHeader&&(w='<label><input name="btSelectAll" type="checkbox" /><span></span></label>'),e.header.stateField=t.field),t.radio&&(w="",e.header.stateField=t.field),!w&&t.showSelectTitle&&(w+=S),n.push(w),n.push("</div>"),n.push('<div class="fht-cell"></div>'),n.push("</div>"),n.push("</th>")}})),r&&"right"===e.options.detailViewAlign&&n.push(r),n.push("</tr>")})),this.$header.html(n.join("")),this.$header.find("th[data-field]").each((function(e,n){t(n).data(i[t(n).data("field")])})),this.$container.off("click",".th-inner").on("click",".th-inner",(function(i){var n=t(i.currentTarget);if(e.options.detailView&&!n.parent().hasClass("bs-checkbox")&&n.closest(".bootstrap-table")[0]!==e.$container[0])return!1;e.options.sortable&&n.parent().data().sortable&&e.onSort(i)})),this.$header.children().children().off("keypress").on("keypress",(function(i){e.options.sortable&&t(i.currentTarget).data().sortable&&(13===(i.keyCode||i.which)&&e.onSort(i))}));var o=kr.getResizeEventName(this.$el.attr("id"));t(window).off(o),!this.options.showHeader||this.options.cardView?(this.$header.hide(),this.$tableHeader.hide(),this.$tableLoading.css("top",0)):(this.$header.show(),this.$tableHeader.show(),this.$tableLoading.css("top",this.$header.outerHeight()+1),this.getCaret(),t(window).on(o,(function(){return e.resetView()}))),this.$selectAll=this.$header.find('[name="btSelectAll"]'),this.$selectAll.off("click").on("click",(function(i){i.stopPropagation();var n=t(i.currentTarget).prop("checked");e[n?"checkAll":"uncheckAll"](),e.updateSelected()}))}},{key:"initData",value:function(t,e){"append"===e?this.options.data=this.options.data.concat(t):"prepend"===e?this.options.data=[].concat(t).concat(this.options.data):(t=t||this.options.data,this.options.data=Array.isArray(t)?t:t[this.options.dataField]),this.data=ir(this.options.data),this.options.sortReset&&(this.unsortedData=ir(this.data)),"server"!==this.options.sidePagination&&this.initSort()}},{key:"initSort",value:function(){var t=this,e=this.options.sortName,i="desc"===this.options.sortOrder?-1:1,n=this.header.fields.indexOf(this.options.sortName),o=0;-1!==n?(this.options.sortStable&&this.data.forEach((function(t,e){t.hasOwnProperty("_position")||(t._position=e)})),this.options.customSort?kr.calculateObjectValue(this.options,this.options.customSort,[this.options.sortName,this.options.sortOrder,this.data]):this.data.sort((function(o,r){t.header.sortNames[n]&&(e=t.header.sortNames[n]);var a=kr.getItemField(o,e,t.options.escape),s=kr.getItemField(r,e,t.options.escape),l=kr.calculateObjectValue(t.header,t.header.sorters[n],[a,s,o,r]);return void 0!==l?t.options.sortStable&&0===l?i*(o._position-r._position):i*l:kr.sort(a,s,i,t.options.sortStable,o._position,r._position)})),void 0!==this.options.sortClass&&(clearTimeout(o),o=setTimeout((function(){t.$el.removeClass(t.options.sortClass);var e=t.$header.find('[data-field="'.concat(t.options.sortName,'"]')).index();t.$el.find("tr td:nth-child(".concat(e+1,")")).addClass(t.options.sortClass)}),250))):this.options.sortReset&&(this.data=ir(this.unsortedData))}},{key:"onSort",value:function(e){var i=e.type,n=e.currentTarget,o="keypress"===i?t(n):t(n).parent(),r=this.$header.find("th").eq(o.index());if(this.$header.add(this.$header_).find("span.order").remove(),this.options.sortName===o.data("field")){var a=this.options.sortOrder;void 0===a?this.options.sortOrder="asc":"asc"===a?this.options.sortOrder="desc":"desc"===this.options.sortOrder&&(this.options.sortOrder=this.options.sortReset?void 0:"asc"),void 0===this.options.sortOrder&&(this.options.sortName=void 0)}else this.options.sortName=o.data("field"),this.options.rememberOrder?this.options.sortOrder="asc"===o.data("order")?"desc":"asc":this.options.sortOrder=this.columns[this.fieldsColumnsIndex[o.data("field")]].sortOrder||this.columns[this.fieldsColumnsIndex[o.data("field")]].order;if(this.trigger("sort",this.options.sortName,this.options.sortOrder),o.add(r).data("order",this.options.sortOrder),this.getCaret(),"server"===this.options.sidePagination&&this.options.serverSort)return this.options.pageNumber=1,void this.initServer(this.options.silentSort);this.initSort(),this.initBody()}},{key:"initToolbar",value:function(){var e,i=this,n=this.options,o=[],r=0,a=0;this.$toolbar.find(".bs-bars").children().length&&t("body").append(t(n.toolbar)),this.$toolbar.html(""),"string"!=typeof n.toolbar&&"object"!==Xo(n.toolbar)||t(kr.sprintf('<div class="bs-bars %s-%s"></div>',this.constants.classes.pull,n.toolbarAlign)).appendTo(this.$toolbar).append(t(n.toolbar)),o=['<div class="'.concat(["columns","columns-".concat(n.buttonsAlign),this.constants.classes.buttonsGroup,"".concat(this.constants.classes.pull,"-").concat(n.buttonsAlign)].join(" "),'">')],"string"==typeof n.icons&&(n.icons=kr.calculateObjectValue(null,n.icons));var s={paginationSwitch:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="paginationSwitch"\n        aria-label="Pagination Switch" title="').concat(n.formatPaginationSwitch(),'">\n        ').concat(n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.paginationSwitchDown):"","\n        ").concat(n.showButtonText?n.formatPaginationSwitchUp():"","\n        </button>"),refresh:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="refresh"\n        aria-label="Refresh" title="').concat(n.formatRefresh(),'">\n        ').concat(n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.refresh):"","\n        ").concat(n.showButtonText?n.formatRefresh():"","\n        </button>"),toggle:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="toggle"\n        aria-label="Toggle" title="').concat(n.formatToggle(),'">\n        ').concat(n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.toggleOff):"","\n        ").concat(n.showButtonText?n.formatToggleOn():"","\n        </button>"),fullscreen:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="fullscreen"\n        aria-label="Fullscreen" title="').concat(n.formatFullscreen(),'">\n        ').concat(n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.fullscreen):"","\n        ").concat(n.showButtonText?n.formatFullscreen():"","\n        </button>"),columns:function(){var t=[];if(t.push('<div class="keep-open '.concat(i.constants.classes.buttonsDropdown,'" title="').concat(n.formatColumns(),'">\n          <button class="').concat(i.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown"\n          aria-label="Columns" title="').concat(n.formatColumns(),'">\n          ').concat(n.showButtonIcons?kr.sprintf(i.constants.html.icon,n.iconsPrefix,n.icons.columns):"","\n          ").concat(n.showButtonText?n.formatColumns():"","\n          ").concat(i.constants.html.dropdownCaret,"\n          </button>\n          ").concat(i.constants.html.toolbarDropdown[0])),n.showColumnsSearch&&(t.push(kr.sprintf(i.constants.html.toolbarDropdownItem,kr.sprintf('<input type="text" class="%s" name="columnsSearch" placeholder="%s" autocomplete="off">',i.constants.classes.input,n.formatSearch()))),t.push(i.constants.html.toolbarDropdownSeparator)),n.showColumnsToggleAll){var e=i.getVisibleColumns().length===i.columns.filter((function(t){return!i.isSelectionColumn(t)})).length;t.push(kr.sprintf(i.constants.html.toolbarDropdownItem,kr.sprintf('<input type="checkbox" class="toggle-all" %s> <span>%s</span>',e?'checked="checked"':"",n.formatColumnsToggleAll()))),t.push(i.constants.html.toolbarDropdownSeparator)}var o=0;return i.columns.forEach((function(t,e){t.visible&&o++})),i.columns.forEach((function(e,r){if(!i.isSelectionColumn(e)&&(!n.cardView||e.cardVisible)){var s=e.visible?' checked="checked"':"",l=o<=i.options.minimumCountColumns&&s?' disabled="disabled"':"";e.switchable&&(t.push(kr.sprintf(i.constants.html.toolbarDropdownItem,kr.sprintf('<input type="checkbox" data-field="%s" value="%s"%s%s> <span>%s</span>',e.field,r,s,l,e.title))),a++)}})),t.push(i.constants.html.toolbarDropdown[1],"</div>"),t.join("")}()};"string"==typeof n.buttonsOrder&&(n.buttonsOrder=n.buttonsOrder.replace(/\[|\]| |'/g,"").toLowerCase().split(","));var l=!0,c=!1,h=void 0;try{for(var u,d=n.buttonsOrder[Symbol.iterator]();!(l=(u=d.next()).done);l=!0){var p=u.value;n["show"+p.charAt(0).toUpperCase()+p.substring(1)]&&o.push(s[p])}}catch(t){c=!0,h=t}finally{try{l||null==d.return||d.return()}finally{if(c)throw h}}if(o.push("</div>"),(this.showToolbar||o.length>2)&&this.$toolbar.append(o.join("")),n.showPaginationSwitch&&this.$toolbar.find('button[name="paginationSwitch"]').off("click").on("click",(function(){return i.togglePagination()})),n.showFullscreen&&this.$toolbar.find('button[name="fullscreen"]').off("click").on("click",(function(){return i.toggleFullscreen()})),n.showRefresh&&this.$toolbar.find('button[name="refresh"]').off("click").on("click",(function(){return i.refresh()})),n.showToggle&&this.$toolbar.find('button[name="toggle"]').off("click").on("click",(function(){i.toggleView()})),n.showColumns){var f=(e=this.$toolbar.find(".keep-open")).find('input[type="checkbox"]:not(".toggle-all")'),g=e.find('input[type="checkbox"].toggle-all');if(a<=n.minimumCountColumns&&e.find("input").prop("disabled",!0),e.find("li, label").off("click").on("click",(function(t){t.stopImmediatePropagation()})),f.off("click").on("click",(function(e){var n=e.currentTarget,o=t(n);i._toggleColumn(o.val(),o.prop("checked"),!1),i.trigger("column-switch",o.data("field"),o.prop("checked")),g.prop("checked",f.filter(":checked").length===i.columns.filter((function(t){return!i.isSelectionColumn(t)})).length)})),g.off("click").on("click",(function(e){var n=e.currentTarget;i._toggleAllColumns(t(n).prop("checked"))})),n.showColumnsSearch){var v=e.find('[name="columnsSearch"]'),b=e.find(".dropdown-item-marker");v.on("keyup paste change",(function(e){var i=e.currentTarget,n=t(i).val().toLowerCase();b.show(),f.each((function(e,i){var o=t(i).parents(".dropdown-item-marker");o.text().toLowerCase().includes(n)||o.hide()}))}))}}if(n.search||this.showSearchClearButton){o=[];var m=kr.sprintf(this.constants.html.searchButton,this.constants.buttonsClass,n.formatSearch(),n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.search):"",n.showButtonText?n.formatSearch():""),y=kr.sprintf(this.constants.html.searchClearButton,this.constants.buttonsClass,n.formatClearSearch(),n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.clearSearch):"",n.showButtonText?n.formatClearSearch():""),w='<input class="'.concat(this.constants.classes.input,"\n        ").concat(kr.sprintf(" %s%s",this.constants.classes.inputPrefix,n.iconSize),'\n        search-input" type="text" placeholder="').concat(n.formatSearch(),'" autocomplete="off">'),S=w;if(n.showSearchButton||n.showSearchClearButton){var x=(n.showSearchButton?m:"")+(n.showSearchClearButton?y:"");S=n.search?kr.sprintf(this.constants.html.inputGroup,w,x):x}o.push(kr.sprintf('\n        <div class="'.concat(this.constants.classes.pull,"-").concat(n.searchAlign," search ").concat(this.constants.classes.inputGroup,'">\n          %s\n        </div>\n      '),S)),this.$toolbar.append(o.join(""));var k=this.$toolbar.find(".search input"),O=function(){var t="keyup drop blur ".concat(kr.isIEBrowser()?"mouseup":"");k.off(t).on(t,(function(t){n.searchOnEnterKey&&13!==t.keyCode||[37,38,39,40].includes(t.keyCode)||(clearTimeout(r),r=setTimeout((function(){i.onSearch({currentTarget:t.currentTarget})}),n.searchTimeOut))}))};n.showSearchButton?(this.$toolbar.find(".search button[name=search]").off("click").on("click",(function(t){clearTimeout(r),r=setTimeout((function(){i.onSearch({currentTarget:k})}),n.searchTimeOut)})),n.searchOnEnterKey&&O()):O(),n.showSearchClearButton&&this.$toolbar.find(".search button[name=clearSearch]").click((function(){i.resetSearch()}))}}},{key:"onSearch",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},i=e.currentTarget,n=e.firedByInitSearchText,o=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(void 0!==i&&t(i).length&&o){var r=t(i).val().trim();if(this.options.trimOnSearch&&t(i).val()!==r&&t(i).val(r),this.searchText===r&&r.length>0)return;t(i).hasClass("search-input")&&(this.searchText=r,this.options.searchText=r)}n||(this.options.pageNumber=1),this.initSearch(),n?"client"===this.options.sidePagination&&this.updatePagination():this.updatePagination(),this.trigger("search",this.searchText)}},{key:"initSearch",value:function(){var t=this;if(this.filterOptions=this.filterOptions||this.options.filterOptions,"server"!==this.options.sidePagination){if(this.options.customSearch)return void(this.data=kr.calculateObjectValue(this.options,this.options.customSearch,[this.options.data,this.searchText,this.filterColumns]));var e=this.searchText&&(this.fromHtml?kr.escapeHTML(this.searchText):this.searchText).toLowerCase(),i=kr.isEmptyObject(this.filterColumns)?null:this.filterColumns;"function"==typeof this.filterOptions.filterAlgorithm?this.data=this.options.data.filter((function(e,n){return t.filterOptions.filterAlgorithm.apply(null,[e,i])})):"string"==typeof this.filterOptions.filterAlgorithm&&(this.data=i?this.options.data.filter((function(e,n){var o=t.filterOptions.filterAlgorithm;if("and"===o){for(var r in i)if(Array.isArray(i[r])&&!i[r].includes(e[r])||!Array.isArray(i[r])&&e[r]!==i[r])return!1}else if("or"===o){var a=!1;for(var s in i)(Array.isArray(i[s])&&i[s].includes(e[s])||!Array.isArray(i[s])&&e[s]===i[s])&&(a=!0);return a}return!0})):ir(this.options.data));var n=this.getVisibleFields();this.data=e?this.data.filter((function(i,o){for(var r=0;r<t.header.fields.length;r++)if(t.header.searchables[r]&&(!t.options.visibleSearch||-1!==n.indexOf(t.header.fields[r]))){var a=kr.isNumeric(t.header.fields[r])?parseInt(t.header.fields[r],10):t.header.fields[r],s=t.columns[t.fieldsColumnsIndex[a]],l=void 0;if("string"==typeof a){l=i;for(var c=a.split("."),h=0;h<c.length;h++)null!==l[c[h]]&&(l=l[c[h]])}else l=i[a];if(t.options.searchAccentNeutralise&&(l=kr.normalizeAccent(l)),s&&s.searchFormatter&&(l=kr.calculateObjectValue(s,t.header.formatters[r],[l,i,o,s.field],l)),"string"==typeof l||"number"==typeof l)if(t.options.strictSearch){if("".concat(l).toLowerCase()===e)return!0}else{var u=/(?:(<=|=>|=<|>=|>|<)(?:\s+)?(\d+)?|(\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm.exec(e),d=!1;if(u){var p=u[1]||"".concat(u[5],"l"),f=u[2]||u[3],g=parseInt(l,10),v=parseInt(f,10);switch(p){case">":case"<l":d=g>v;break;case"<":case">l":d=g<v;break;case"<=":case"=<":case">=l":case"=>l":d=g<=v;break;case">=":case"=>":case"<=l":case"=<l":d=g>=v}}if(d||"".concat(l).toLowerCase().includes(e))return!0}}return!1})):this.data,this.options.sortReset&&(this.unsortedData=ir(this.data)),this.initSort()}}},{key:"initPagination",value:function(){var t=this,e=this.options;if(e.pagination){this.$pagination.show();var i,n,o,r,a,s,l,c=[],h=!1,u=this.getData({includeHiddenRows:!1}),d=e.pageList;if("string"==typeof d&&(d=d.replace(/\[|\]| /g,"").toLowerCase().split(",")),d=d.map((function(t){return"string"==typeof t?t.toLowerCase()===e.formatAllRows().toLowerCase()||["all","unlimited"].includes(t.toLowerCase())?e.formatAllRows():+t:t})),this.paginationParts=e.paginationParts,"string"==typeof this.paginationParts&&(this.paginationParts=this.paginationParts.replace(/\[|\]| |'/g,"").split(",")),"server"!==e.sidePagination&&(e.totalRows=u.length),this.totalPages=0,e.totalRows&&(e.pageSize===e.formatAllRows()&&(e.pageSize=e.totalRows,h=!0),this.totalPages=1+~~((e.totalRows-1)/e.pageSize),e.totalPages=this.totalPages),this.totalPages>0&&e.pageNumber>this.totalPages&&(e.pageNumber=this.totalPages),this.pageFrom=(e.pageNumber-1)*e.pageSize+1,this.pageTo=e.pageNumber*e.pageSize,this.pageTo>e.totalRows&&(this.pageTo=e.totalRows),this.options.pagination&&"server"!==this.options.sidePagination&&(this.options.totalNotFiltered=this.options.data.length),this.options.showExtendedPagination||(this.options.totalNotFiltered=void 0),(this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")||this.paginationParts.includes("pageSize"))&&c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationDetailHAlign,' pagination-detail">')),this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")){var p=this.paginationParts.includes("pageInfoShort")?e.formatDetailPagination(e.totalRows):e.formatShowingRows(this.pageFrom,this.pageTo,e.totalRows,e.totalNotFiltered);c.push('<span class="pagination-info">\n      '.concat(p,"\n      </span>"))}if(this.paginationParts.includes("pageSize")){c.push('<span class="page-list">');var f=['<span class="'.concat(this.constants.classes.paginationDropdown,'">\n        <button class="').concat(this.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown">\n        <span class="page-size">\n        ').concat(h?e.formatAllRows():e.pageSize,"\n        </span>\n        ").concat(this.constants.html.dropdownCaret,"\n        </button>\n        ").concat(this.constants.html.pageDropdown[0])];d.forEach((function(i,n){var o;(!e.smartDisplay||0===n||d[n-1]<e.totalRows)&&(o=h?i===e.formatAllRows()?t.constants.classes.dropdownActive:"":i===e.pageSize?t.constants.classes.dropdownActive:"",f.push(kr.sprintf(t.constants.html.pageDropdownItem,o,i)))})),f.push("".concat(this.constants.html.pageDropdown[1],"</span>")),c.push(e.formatRecordsPerPage(f.join("")))}if((this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")||this.paginationParts.includes("pageSize"))&&c.push("</span></div>"),this.paginationParts.includes("pageList")){c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationHAlign,' pagination">'),kr.sprintf(this.constants.html.pagination[0],kr.sprintf(" pagination-%s",e.iconSize)),kr.sprintf(this.constants.html.paginationItem," page-pre",e.formatSRPaginationPreText(),e.paginationPreText)),this.totalPages<e.paginationSuccessivelySize?(n=1,o=this.totalPages):o=(n=e.pageNumber-e.paginationPagesBySide)+2*e.paginationPagesBySide,e.pageNumber<e.paginationSuccessivelySize-1&&(o=e.paginationSuccessivelySize),e.paginationSuccessivelySize>this.totalPages-n&&(n=n-(e.paginationSuccessivelySize-(this.totalPages-n))+1),n<1&&(n=1),o>this.totalPages&&(o=this.totalPages);var g=Math.round(e.paginationPagesBySide/2),v=function(i){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return kr.sprintf(t.constants.html.paginationItem,n+(i===e.pageNumber?" ".concat(t.constants.classes.paginationActive):""),e.formatSRPaginationPageText(i),i)};if(n>1){var b=e.paginationPagesBySide;for(b>=n&&(b=n-1),i=1;i<=b;i++)c.push(v(i));n-1===b+1?(i=n-1,c.push(v(i))):n-1>b&&(n-2*e.paginationPagesBySide>e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((n-g)/2+g),c.push(v(i," page-intermediate"))):c.push(kr.sprintf(this.constants.html.paginationItem," page-first-separator disabled","","...")))}for(i=n;i<=o;i++)c.push(v(i));if(this.totalPages>o){var m=this.totalPages-(e.paginationPagesBySide-1);for(o>=m&&(m=o+1),o+1===m-1?(i=o+1,c.push(v(i))):m>o+1&&(this.totalPages-o>2*e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((this.totalPages-g-o)/2+o),c.push(v(i," page-intermediate"))):c.push(kr.sprintf(this.constants.html.paginationItem," page-last-separator disabled","","..."))),i=m;i<=this.totalPages;i++)c.push(v(i))}c.push(kr.sprintf(this.constants.html.paginationItem," page-next",e.formatSRPaginationNextText(),e.paginationNextText)),c.push(this.constants.html.pagination[1],"</div>")}this.$pagination.html(c.join(""));var y=["bottom","both"].includes(e.paginationVAlign)?" ".concat(this.constants.classes.dropup):"";this.$pagination.last().find(".page-list > span").addClass(y),e.onlyInfoPagination||(r=this.$pagination.find(".page-list a"),a=this.$pagination.find(".page-pre"),s=this.$pagination.find(".page-next"),l=this.$pagination.find(".page-item").not(".page-next, .page-pre, .page-last-separator, .page-first-separator"),this.totalPages<=1&&this.$pagination.find("div.pagination").hide(),e.smartDisplay&&(d.length<2||e.totalRows<=d[0])&&this.$pagination.find("span.page-list").hide(),this.$pagination[this.getData().length?"show":"hide"](),e.paginationLoop||(1===e.pageNumber&&a.addClass("disabled"),e.pageNumber===this.totalPages&&s.addClass("disabled")),h&&(e.pageSize=e.formatAllRows()),r.off("click").on("click",(function(e){return t.onPageListChange(e)})),a.off("click").on("click",(function(e){return t.onPagePre(e)})),s.off("click").on("click",(function(e){return t.onPageNext(e)})),l.off("click").on("click",(function(e){return t.onPageNumber(e)})))}else this.$pagination.hide()}},{key:"updatePagination",value:function(e){e&&t(e.currentTarget).hasClass("disabled")||(this.options.maintainMetaData||this.resetRows(),this.initPagination(),this.trigger("page-change",this.options.pageNumber,this.options.pageSize),"server"===this.options.sidePagination?this.initServer():this.initBody())}},{key:"onPageListChange",value:function(e){e.preventDefault();var i=t(e.currentTarget);return i.parent().addClass(this.constants.classes.dropdownActive).siblings().removeClass(this.constants.classes.dropdownActive),this.options.pageSize=i.text().toUpperCase()===this.options.formatAllRows().toUpperCase()?this.options.formatAllRows():+i.text(),this.$toolbar.find(".page-size").text(this.options.pageSize),this.updatePagination(e),!1}},{key:"onPagePre",value:function(t){return t.preventDefault(),this.options.pageNumber-1==0?this.options.pageNumber=this.options.totalPages:this.options.pageNumber--,this.updatePagination(t),!1}},{key:"onPageNext",value:function(t){return t.preventDefault(),this.options.pageNumber+1>this.options.totalPages?this.options.pageNumber=1:this.options.pageNumber++,this.updatePagination(t),!1}},{key:"onPageNumber",value:function(e){if(e.preventDefault(),this.options.pageNumber!==+t(e.currentTarget).text())return this.options.pageNumber=+t(e.currentTarget).text(),this.updatePagination(e),!1}},{key:"initRow",value:function(t,e,i,n){var o=this,r=[],a={},s=[],l="",c={},h=[];if(!(kr.findIndex(this.hiddenRows,t)>-1)){if((a=kr.calculateObjectValue(this.options,this.options.rowStyle,[t,e],a))&&a.css)for(var u=0,d=Object.entries(a.css);u<d.length;u++){var p=er(d[u],2),f=p[0],g=p[1];s.push("".concat(f,": ").concat(g))}if(c=kr.calculateObjectValue(this.options,this.options.rowAttributes,[t,e],c))for(var v=0,b=Object.entries(c);v<b.length;v++){var m=er(b[v],2),y=m[0],w=m[1];h.push("".concat(y,'="').concat(kr.escapeHTML(w),'"'))}if(t._data&&!kr.isEmptyObject(t._data))for(var S=0,x=Object.entries(t._data);S<x.length;S++){var k=er(x[S],2),O=k[0],C=k[1];if("index"===O)return;l+=" data-".concat(O,"='").concat("object"===Xo(C)?JSON.stringify(C):C,"'")}r.push("<tr",kr.sprintf(" %s",h.length?h.join(" "):void 0),kr.sprintf(' id="%s"',Array.isArray(t)?void 0:t._id),kr.sprintf(' class="%s"',a.classes||(Array.isArray(t)?void 0:t._class)),' data-index="'.concat(e,'"'),kr.sprintf(' data-uniqueid="%s"',kr.getItemField(t,this.options.uniqueId,!1)),kr.sprintf(' data-has-detail-view="%s"',this.options.detailView&&kr.calculateObjectValue(null,this.options.detailFilter,[e,t])?"true":void 0),kr.sprintf("%s",l),">"),this.options.cardView&&r.push('<td colspan="'.concat(this.header.fields.length,'"><div class="card-views">'));var T="";return kr.hasDetailViewIcon(this.options)&&(T="<td>",kr.calculateObjectValue(null,this.options.detailFilter,[e,t])&&(T+='\n          <a class="detail-icon" href="#">\n          '.concat(kr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen),"\n          </a>\n        ")),T+="</td>"),T&&"right"!==this.options.detailViewAlign&&r.push(T),this.header.fields.forEach((function(i,n){var a="",l=kr.getItemField(t,i,o.options.escape),c="",h="",u={},d="",p=o.header.classes[n],f="",g="",v="",b="",m="",y=o.columns[n];if((!o.fromHtml&&!o.autoMergeCells||void 0!==l||y.checkbox||y.radio)&&y.visible&&(!o.options.cardView||y.cardVisible)){if(y.escape&&(l=kr.escapeHTML(l)),s.concat([o.header.styles[n]]).length&&(f=' style="'.concat(s.concat([o.header.styles[n]]).join("; "),'"')),t["_".concat(i,"_id")]&&(d=kr.sprintf(' id="%s"',t["_".concat(i,"_id")])),t["_".concat(i,"_class")]&&(p=kr.sprintf(' class="%s"',t["_".concat(i,"_class")])),t["_".concat(i,"_rowspan")]&&(v=kr.sprintf(' rowspan="%s"',t["_".concat(i,"_rowspan")])),t["_".concat(i,"_colspan")]&&(b=kr.sprintf(' colspan="%s"',t["_".concat(i,"_colspan")])),t["_".concat(i,"_title")]&&(m=kr.sprintf(' title="%s"',t["_".concat(i,"_title")])),(u=kr.calculateObjectValue(o.header,o.header.cellStyles[n],[l,t,e,i],u)).classes&&(p=' class="'.concat(u.classes,'"')),u.css){for(var w=[],S=0,x=Object.entries(u.css);S<x.length;S++){var k=er(x[S],2),O=k[0],C=k[1];w.push("".concat(O,": ").concat(C))}f=' style="'.concat(w.concat(o.header.styles[n]).join("; "),'"')}if(c=kr.calculateObjectValue(y,o.header.formatters[n],[l,t,e,i],l),t["_".concat(i,"_data")]&&!kr.isEmptyObject(t["_".concat(i,"_data")]))for(var T=0,P=Object.entries(t["_".concat(i,"_data")]);T<P.length;T++){var I=er(P[T],2),A=I[0],$=I[1];if("index"===A)return;g+=" data-".concat(A,'="').concat($,'"')}if(y.checkbox||y.radio){h=y.checkbox?"checkbox":h,h=y.radio?"radio":h;var E=y.class||"",R=(!0===c||l||c&&c.checked)&&!1!==c,j=!y.checkboxEnabled||c&&c.disabled;a=[o.options.cardView?'<div class="card-view '.concat(E,'">'):'<td class="bs-checkbox '.concat(E,'"').concat(p).concat(f,">"),'<label>\n            <input\n            data-index="'.concat(e,'"\n            name="').concat(o.options.selectItemName,'"\n            type="').concat(h,'"\n            ').concat(kr.sprintf('value="%s"',t[o.options.idField]),"\n            ").concat(kr.sprintf('checked="%s"',R?"checked":void 0),"\n            ").concat(kr.sprintf('disabled="%s"',j?"disabled":void 0)," />\n            <span></span>\n            </label>"),o.header.formatters[n]&&"string"==typeof c?c:"",o.options.cardView?"</div>":"</td>"].join(""),t[o.header.stateField]=!0===c||!!l||c&&c.checked}else if(c=null==c?o.options.undefinedText:c,o.options.cardView){var N=o.options.showHeader?'<span class="card-view-title"'.concat(f,">").concat(kr.getFieldTitle(o.columns,i),"</span>"):"";a='<div class="card-view">'.concat(N,'<span class="card-view-value">').concat(c,"</span></div>"),o.options.smartDisplay&&""===c&&(a='<div class="card-view"></div>')}else a="<td".concat(d).concat(p).concat(f).concat(g).concat(v).concat(b).concat(m,">").concat(c,"</td>");r.push(a)}})),T&&"right"===this.options.detailViewAlign&&r.push(T),this.options.cardView&&r.push("</div></td>"),r.push("</tr>"),r.join("")}}},{key:"initBody",value:function(e){var i=this,n=this.getData();this.trigger("pre-body",n),this.$body=this.$el.find(">tbody"),this.$body.length||(this.$body=t("<tbody></tbody>").appendTo(this.$el)),this.options.pagination&&"server"!==this.options.sidePagination||(this.pageFrom=1,this.pageTo=n.length);var o=[],r=t(document.createDocumentFragment()),a=!1;this.autoMergeCells=kr.checkAutoMergeCells(n.slice(this.pageFrom-1,this.pageTo));for(var s=this.pageFrom-1;s<this.pageTo;s++){var l=n[s],c=this.initRow(l,s,n,r);a=a||!!c,c&&"string"==typeof c&&(this.options.virtualScroll?o.push(c):r.append(c))}a?this.options.virtualScroll?(this.virtualScroll&&this.virtualScroll.destroy(),this.virtualScroll=new Or({rows:o,fixedScroll:e,scrollEl:this.$tableBody[0],contentEl:this.$body[0],itemHeight:this.options.virtualScrollItemHeight,callback:function(){i.fitHeader(),i.initBodyEvent()}})):this.$body.html(r):this.$body.html('<tr class="no-records-found">'.concat(kr.sprintf('<td colspan="%s">%s</td>',this.getVisibleFields().length,this.options.formatNoMatches()),"</tr>")),e||this.scrollTo(0),this.initBodyEvent(),this.updateSelected(),this.initFooter(),this.resetView(),"server"!==this.options.sidePagination&&(this.options.totalRows=n.length),this.trigger("post-body",n)}},{key:"initBodyEvent",value:function(){var e=this;this.$body.find("> tr[data-index] > td").off("click dblclick").on("click dblclick",(function(i){var n=t(i.currentTarget),o=n.parent(),r=t(i.target).parents(".card-views").children(),a=t(i.target).parents(".card-view"),s=o.data("index"),l=e.data[s],c=e.options.cardView?r.index(a):n[0].cellIndex,h=e.getVisibleFields()[kr.hasDetailViewIcon(e.options)&&"right"!==e.options.detailViewAlign?c-1:c],u=e.columns[e.fieldsColumnsIndex[h]],d=kr.getItemField(l,h,e.options.escape);if(!n.find(".detail-icon").length){if(e.trigger("click"===i.type?"click-cell":"dbl-click-cell",h,d,l,n),e.trigger("click"===i.type?"click-row":"dbl-click-row",l,o,h),"click"===i.type&&e.options.clickToSelect&&u.clickToSelect&&!kr.calculateObjectValue(e.options,e.options.ignoreClickToSelectOn,[i.target])){var p=o.find(kr.sprintf('[name="%s"]',e.options.selectItemName));p.length&&p[0].click()}"click"===i.type&&e.options.detailViewByClick&&e.toggleDetailView(s,e.header.detailFormatters[e.fieldsColumnsIndex[h]])}})).off("mousedown").on("mousedown",(function(t){e.multipleSelectRowCtrlKey=t.ctrlKey||t.metaKey,e.multipleSelectRowShiftKey=t.shiftKey})),this.$body.find("> tr[data-index] > td > .detail-icon").off("click").on("click",(function(i){return i.preventDefault(),e.toggleDetailView(t(i.currentTarget).parent().parent().data("index")),!1})),this.$selectItem=this.$body.find(kr.sprintf('[name="%s"]',this.options.selectItemName)),this.$selectItem.off("click").on("click",(function(i){i.stopImmediatePropagation();var n=t(i.currentTarget);e._toggleCheck(n.prop("checked"),n.data("index"))})),this.header.events.forEach((function(i,n){var o=i;if(o){"string"==typeof o&&(o=kr.calculateObjectValue(null,o));var r=e.header.fields[n],a=e.getVisibleFields().indexOf(r);if(-1!==a){kr.hasDetailViewIcon(e.options)&&"right"!==e.options.detailViewAlign&&(a+=1);var s=function(i){if(!o.hasOwnProperty(i))return"continue";var n=o[i];e.$body.find(">tr:not(.no-records-found)").each((function(o,s){var l=t(s),c=l.find(e.options.cardView?".card-views>.card-view":">td").eq(a),h=i.indexOf(" "),u=i.substring(0,h),d=i.substring(h+1);c.find(d).off(u).on(u,(function(t){var i=l.data("index"),o=e.data[i],a=o[r];n.apply(e,[t,a,o,i])}))}))};for(var l in o)s(l)}}}))}},{key:"initServer",value:function(e,i,n){var o=this,r={},a=this.header.fields.indexOf(this.options.sortName),s={searchText:this.searchText,sortName:this.options.sortName,sortOrder:this.options.sortOrder};if(this.header.sortNames[a]&&(s.sortName=this.header.sortNames[a]),this.options.pagination&&"server"===this.options.sidePagination&&(s.pageSize=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,s.pageNumber=this.options.pageNumber),n||this.options.url||this.options.ajax){if("limit"===this.options.queryParamsType&&(s={search:s.searchText,sort:s.sortName,order:s.sortOrder},this.options.pagination&&"server"===this.options.sidePagination&&(s.offset=this.options.pageSize===this.options.formatAllRows()?0:this.options.pageSize*(this.options.pageNumber-1),s.limit=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,0===s.limit&&delete s.limit)),this.options.search&&"server"===this.options.sidePagination&&this.columns.filter((function(t){return!t.searchable})).length){s.searchable=[];var l=!0,c=!1,h=void 0;try{for(var u,d=this.columns[Symbol.iterator]();!(l=(u=d.next()).done);l=!0){var p=u.value;!p.checkbox&&p.searchable&&(this.options.visibleSearch&&p.visible||!this.options.visibleSearch)&&s.searchable.push(p.field)}}catch(t){c=!0,h=t}finally{try{l||null==d.return||d.return()}finally{if(c)throw h}}}if(kr.isEmptyObject(this.filterColumnsPartial)||(s.filter=JSON.stringify(this.filterColumnsPartial,null)),t.extend(s,i||{}),!1!==(r=kr.calculateObjectValue(this.options,this.options.queryParams,[s],r))){e||this.showLoading();var f=t.extend({},kr.calculateObjectValue(null,this.options.ajaxOptions),{type:this.options.method,url:n||this.options.url,data:"application/json"===this.options.contentType&&"post"===this.options.method?JSON.stringify(r):r,cache:this.options.cache,contentType:this.options.contentType,dataType:this.options.dataType,success:function(t,i,n){var r=kr.calculateObjectValue(o.options,o.options.responseHandler,[t,n],t);o.load(r),o.trigger("load-success",r,n&&n.status,n),e||o.hideLoading(),"server"===o.options.sidePagination&&r[o.options.totalField]>0&&!r[o.options.dataField].length&&o.updatePagination()},error:function(t){var i=[];"server"===o.options.sidePagination&&((i={})[o.options.totalField]=0,i[o.options.dataField]=[]),o.load(i),o.trigger("load-error",t&&t.status,t),e||o.$tableLoading.hide()}});return this.options.ajax?kr.calculateObjectValue(this,this.options.ajax,[f],null):(this._xhr&&4!==this._xhr.readyState&&this._xhr.abort(),this._xhr=t.ajax(f)),r}}}},{key:"initSearchText",value:function(){if(this.options.search&&(this.searchText="",""!==this.options.searchText)){var t=this.$toolbar.find(".search input");t.val(this.options.searchText),this.onSearch({currentTarget:t,firedByInitSearchText:!0})}}},{key:"getCaret",value:function(){var e=this;this.$header.find("th").each((function(i,n){t(n).find(".sortable").removeClass("desc asc").addClass(t(n).data("field")===e.options.sortName?e.options.sortOrder:"both")}))}},{key:"updateSelected",value:function(){var e=this.$selectItem.filter(":enabled").length&&this.$selectItem.filter(":enabled").length===this.$selectItem.filter(":enabled").filter(":checked").length;this.$selectAll.add(this.$selectAll_).prop("checked",e),this.$selectItem.each((function(e,i){t(i).closest("tr")[t(i).prop("checked")?"addClass":"removeClass"]("selected")}))}},{key:"updateRows",value:function(){var e=this;this.$selectItem.each((function(i,n){e.data[t(n).data("index")][e.header.stateField]=t(n).prop("checked")}))}},{key:"resetRows",value:function(){var t=!0,e=!1,i=void 0;try{for(var n,o=this.data[Symbol.iterator]();!(t=(n=o.next()).done);t=!0){var r=n.value;this.$selectAll.prop("checked",!1),this.$selectItem.prop("checked",!1),this.header.stateField&&(r[this.header.stateField]=!1)}}catch(t){e=!0,i=t}finally{try{t||null==o.return||o.return()}finally{if(e)throw i}}this.initHiddenRows()}},{key:"trigger",value:function(i){for(var n,o="".concat(i,".bs.table"),r=arguments.length,a=new Array(r>1?r-1:0),s=1;s<r;s++)a[s-1]=arguments[s];(n=this.options)[e.EVENTS[o]].apply(n,a),this.$el.trigger(t.Event(o),a),this.options.onAll(o,a),this.$el.trigger(t.Event("all.bs.table"),[o,a])}},{key:"resetHeader",value:function(){var t=this;clearTimeout(this.timeoutId_),this.timeoutId_=setTimeout((function(){return t.fitHeader()}),this.$el.is(":hidden")?100:0)}},{key:"fitHeader",value:function(){var e=this;if(this.$el.is(":hidden"))this.timeoutId_=setTimeout((function(){return e.fitHeader()}),100);else{var i=this.$tableBody.get(0),n=i.scrollWidth>i.clientWidth&&i.scrollHeight>i.clientHeight+this.$header.outerHeight()?kr.getScrollBarWidth():0;this.$el.css("margin-top",-this.$header.outerHeight());var o=t(":focus");if(o.length>0){var r=o.parents("th");if(r.length>0){var a=r.attr("data-field");if(void 0!==a){var s=this.$header.find("[data-field='".concat(a,"']"));s.length>0&&s.find(":input").addClass("focus-temp")}}}this.$header_=this.$header.clone(!0,!0),this.$selectAll_=this.$header_.find('[name="btSelectAll"]'),this.$tableHeader.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).html("").attr("class",this.$el.attr("class")).append(this.$header_),this.$tableLoading.css("width",this.$el.outerWidth());var l=t(".focus-temp:visible:eq(0)");l.length>0&&(l.focus(),this.$header.find(".focus-temp").removeClass("focus-temp")),this.$header.find("th[data-field]").each((function(i,n){e.$header_.find(kr.sprintf('th[data-field="%s"]',t(n).data("field"))).data(t(n).data())}));for(var c=this.getVisibleFields(),h=this.$header_.find("th"),u=this.$body.find(">tr:not(.no-records-found,.virtual-scroll-top)").eq(0);u.length&&u.find('>td[colspan]:not([colspan="1"])').length;)u=u.next();var d=u.find("> *").length;u.find("> *").each((function(i,n){var o=t(n);if(kr.hasDetailViewIcon(e.options)&&(0===i&&"right"!==e.options.detailViewAlign||i===d-1&&"right"===e.options.detailViewAlign)){var r=h.filter(".detail"),a=r.innerWidth()-r.find(".fht-cell").width();r.find(".fht-cell").width(o.innerWidth()-a)}else{var s=kr.hasDetailViewIcon(e.options)&&"right"!==e.options.detailViewAlign?i-1:i,l=e.$header_.find(kr.sprintf('th[data-field="%s"]',c[s]));l.length>1&&(l=t(h[o[0].cellIndex]));var u=l.innerWidth()-l.find(".fht-cell").width();l.find(".fht-cell").width(o.innerWidth()-u)}})),this.horizontalScroll(),this.trigger("post-header")}}},{key:"initFooter",value:function(){if(this.options.showFooter&&!this.options.cardView){var t=this.getData(),e=[],i="";kr.hasDetailViewIcon(this.options)&&(i='<th class="detail"><div class="th-inner"></div><div class="fht-cell"></div></th>'),i&&"right"!==this.options.detailViewAlign&&e.push(i);var n=!0,o=!1,r=void 0;try{for(var a,s=this.columns[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l,c,h=a.value,u=[],d={},p=kr.sprintf(' class="%s"',h.class);if(h.visible){if(this.options.cardView&&!h.cardVisible)return;if(l=kr.sprintf("text-align: %s; ",h.falign?h.falign:h.align),c=kr.sprintf("vertical-align: %s; ",h.valign),(d=kr.calculateObjectValue(null,this.options.footerStyle,[h]))&&d.css)for(var f=0,g=Object.entries(d.css);f<g.length;f++){var v=er(g[f],2),b=v[0],m=v[1];u.push("".concat(b,": ").concat(m))}d&&d.classes&&(p=kr.sprintf(' class="%s"',h.class?[h.class,d.classes].join(" "):d.classes)),e.push("<th",p,kr.sprintf(' style="%s"',l+c+u.concat().join("; ")),">"),e.push('<div class="th-inner">'),e.push(kr.calculateObjectValue(h,h.footerFormatter,[t],this.footerData[0]&&this.footerData[0][h.field]||"")),e.push("</div>"),e.push('<div class="fht-cell"></div>'),e.push("</div>"),e.push("</th>")}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}i&&"right"===this.options.detailViewAlign&&e.push(i),this.options.height||this.$tableFooter.length||(this.$el.append("<tfoot><tr></tr></tfoot>"),this.$tableFooter=this.$el.find("tfoot")),this.$tableFooter.find("tr").html(e.join("")),this.trigger("post-footer",this.$tableFooter)}}},{key:"fitFooter",value:function(){var e=this;if(this.$el.is(":hidden"))setTimeout((function(){return e.fitFooter()}),100);else{var i=this.$tableBody.get(0),n=i.scrollWidth>i.clientWidth&&i.scrollHeight>i.clientHeight+this.$header.outerHeight()?kr.getScrollBarWidth():0;this.$tableFooter.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).attr("class",this.$el.attr("class"));this.getVisibleFields();for(var o=this.$tableFooter.find("th"),r=this.$body.find(">tr:first-child:not(.no-records-found)");r.length&&r.find('>td[colspan]:not([colspan="1"])').length;)r=r.next();var a=r.find("> *").length;r.find("> *").each((function(i,n){var r=t(n);if(kr.hasDetailViewIcon(e.options)&&(0===i&&"left"===e.options.detailViewAlign||i===a-1&&"right"===e.options.detailViewAlign)){var s=o.filter(".detail"),l=s.innerWidth()-s.find(".fht-cell").width();s.find(".fht-cell").width(r.innerWidth()-l)}else{var c=o.eq(i),h=c.innerWidth()-c.find(".fht-cell").width();c.find(".fht-cell").width(r.innerWidth()-h)}})),this.horizontalScroll()}}},{key:"horizontalScroll",value:function(){var t=this;this.$tableBody.off("scroll").on("scroll",(function(){var e=t.$tableBody.scrollLeft();t.options.showHeader&&t.options.height&&t.$tableHeader.scrollLeft(e),t.options.showFooter&&!t.options.cardView&&t.$tableFooter.scrollLeft(e),t.trigger("scroll-body",t.$tableBody)}))}},{key:"getVisibleFields",value:function(){var t=[],e=!0,i=!1,n=void 0;try{for(var o,r=this.header.fields[Symbol.iterator]();!(e=(o=r.next()).done);e=!0){var a=o.value,s=this.columns[this.fieldsColumnsIndex[a]];s&&s.visible&&t.push(a)}}catch(t){i=!0,n=t}finally{try{e||null==r.return||r.return()}finally{if(i)throw n}}return t}},{key:"initHiddenRows",value:function(){this.hiddenRows=[]}},{key:"getOptions",value:function(){var e=t.extend({},this.options);return delete e.data,t.extend(!0,{},e)}},{key:"refreshOptions",value:function(e){kr.compareObjects(this.options,e,!0)||(this.options=t.extend(this.options,e),this.trigger("refresh-options",this.options),this.destroy(),this.init())}},{key:"getData",value:function(t){var e=this,i=this.options.data;if(!(this.searchText||this.options.customSearch||this.options.sortName)&&kr.isEmptyObject(this.filterColumns)&&kr.isEmptyObject(this.filterColumnsPartial)||t&&t.unfiltered||(i=this.data),t&&t.useCurrentPage&&(i=i.slice(this.pageFrom-1,this.pageTo)),t&&!t.includeHiddenRows){var n=this.getHiddenRows();i=i.filter((function(t){return-1===kr.findIndex(n,t)}))}return t&&t.formatted&&i.forEach((function(t){for(var i=0,n=Object.entries(t);i<n.length;i++){var o=er(n[i],2),r=o[0],a=o[1],s=e.columns[e.fieldsColumnsIndex[r]];if(!s)return;t[r]=kr.calculateObjectValue(s,e.header.formatters[s.fieldIndex],[a,t,t.index,s.field],a)}})),i}},{key:"getSelections",value:function(){var t=this;return this.data.filter((function(e){return!0===e[t.header.stateField]}))}},{key:"getAllSelections",value:function(){var t=this;return this.options.data.filter((function(e){return!0===e[t.header.stateField]}))}},{key:"load",value:function(t){var e,i=t;this.options.pagination&&"server"===this.options.sidePagination&&(this.options.totalRows=i[this.options.totalField]),this.options.pagination&&"server"===this.options.sidePagination&&(this.options.totalNotFiltered=i[this.options.totalNotFilteredField]),e=i.fixedScroll,i=Array.isArray(i)?i:i[this.options.dataField],this.initData(i),this.initSearch(),this.initPagination(),this.initBody(e)}},{key:"append",value:function(t){this.initData(t,"append"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"prepend",value:function(t){this.initData(t,"prepend"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"remove",value:function(t){var e,i,n=this.options.data.length;if(t.hasOwnProperty("field")&&t.hasOwnProperty("values")){for(e=n-1;e>=0;e--){((i=this.options.data[e]).hasOwnProperty(t.field)||"$index"===t.field)&&((i.hasOwnProperty(t.field)||"$index"!==t.field?t.values.includes(i[t.field]):t.values.includes(e))&&(this.options.data.splice(e,1),"server"===this.options.sidePagination&&(this.options.totalRows-=1)))}n!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}}},{key:"removeAll",value:function(){this.options.data.length>0&&(this.options.data.splice(0,this.options.data.length),this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"insertRow",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("row")&&(this.options.data.splice(t.index,0,t.row),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}},{key:"updateRow",value:function(e){var i=Array.isArray(e)?e:[e],n=!0,o=!1,r=void 0;try{for(var a,s=i[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;l.hasOwnProperty("index")&&l.hasOwnProperty("row")&&(l.hasOwnProperty("replace")&&l.replace?this.options.data[l.index]=l.row:t.extend(this.options.data[l.index],l.row))}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"getRowByUniqueId",value:function(t){var e,i,n,o=this.options.uniqueId,r=t,a=null;for(e=this.options.data.length-1;e>=0;e--){if((i=this.options.data[e]).hasOwnProperty(o))n=i[o];else{if(!i._data||!i._data.hasOwnProperty(o))continue;n=i._data[o]}if("string"==typeof n?r=r.toString():"number"==typeof n&&(Number(n)===n&&n%1==0?r=parseInt(r):n===Number(n)&&0!==n&&(r=parseFloat(r))),n===r){a=i;break}}return a}},{key:"updateByUniqueId",value:function(e){var i=Array.isArray(e)?e:[e],n=!0,o=!1,r=void 0;try{for(var a,s=i[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;if(l.hasOwnProperty("id")&&l.hasOwnProperty("row")){var c=this.options.data.indexOf(this.getRowByUniqueId(l.id));-1!==c&&(l.hasOwnProperty("replace")&&l.replace?this.options.data[c]=l.row:t.extend(this.options.data[c],l.row))}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"removeByUniqueId",value:function(t){var e=this.options.data.length,i=this.getRowByUniqueId(t);i&&this.options.data.splice(this.options.data.indexOf(i),1),e!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"updateCell",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("field")&&t.hasOwnProperty("value")&&(this.data[t.index][t.field]=t.value,!1!==t.reinit&&(this.initSort(),this.initBody(!0)))}},{key:"updateCellByUniqueId",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){var i=t.id,n=t.field,o=t.value,r=e.options.data.indexOf(e.getRowByUniqueId(i));-1!==r&&(e.options.data[r][n]=o)})),!1!==t.reinit&&(this.initSort(),this.initBody(!0))}},{key:"showRow",value:function(t){this._toggleRow(t,!0)}},{key:"hideRow",value:function(t){this._toggleRow(t,!1)}},{key:"_toggleRow",value:function(t,e){var i;if(t.hasOwnProperty("index")?i=this.getData()[t.index]:t.hasOwnProperty("uniqueId")&&(i=this.getRowByUniqueId(t.uniqueId)),i){var n=kr.findIndex(this.hiddenRows,i);e||-1!==n?e&&n>-1&&this.hiddenRows.splice(n,1):this.hiddenRows.push(i),this.initBody(!0),this.initPagination()}}},{key:"getHiddenRows",value:function(t){if(t)return this.initHiddenRows(),this.initBody(!0),void this.initPagination();var e=this.getData(),i=[],n=!0,o=!1,r=void 0;try{for(var a,s=e[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;this.hiddenRows.includes(l)&&i.push(l)}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}return this.hiddenRows=i,i}},{key:"showColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!0,!0)}))}},{key:"hideColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!1,!0)}))}},{key:"_toggleColumn",value:function(t,e,i){if(-1!==t&&this.columns[t].visible!==e&&(this.columns[t].visible=e,this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns)){var n=this.$toolbar.find('.keep-open input:not(".toggle-all")').prop("disabled",!1);i&&n.filter(kr.sprintf('[value="%s"]',t)).prop("checked",e),n.filter(":checked").length<=this.options.minimumCountColumns&&n.filter(":checked").prop("disabled",!0)}}},{key:"getVisibleColumns",value:function(){var t=this;return this.columns.filter((function(e){return e.visible&&!t.isSelectionColumn(e)}))}},{key:"getHiddenColumns",value:function(){return this.columns.filter((function(t){return!t.visible}))}},{key:"isSelectionColumn",value:function(t){return t.radio||t.checkbox}},{key:"showAllColumns",value:function(){this._toggleAllColumns(!0)}},{key:"hideAllColumns",value:function(){this._toggleAllColumns(!1)}},{key:"_toggleAllColumns",value:function(e){var i=this,n=!0,o=!1,r=void 0;try{for(var a,s=this.columns.slice().reverse()[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;if(l.switchable){if(!e&&this.options.showColumns&&this.getVisibleColumns().length===this.options.minimumCountColumns)continue;l.visible=e}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}if(this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns){var c=this.$toolbar.find('.keep-open input[type="checkbox"]:not(".toggle-all")').prop("disabled",!1);e?c.prop("checked",e):c.get().reverse().forEach((function(n){c.filter(":checked").length>i.options.minimumCountColumns&&t(n).prop("checked",e)})),c.filter(":checked").length<=this.options.minimumCountColumns&&c.filter(":checked").prop("disabled",!0)}}},{key:"mergeCells",value:function(t){var e,i,n=t.index,o=this.getVisibleFields().indexOf(t.field),r=t.rowspan||1,a=t.colspan||1,s=this.$body.find(">tr");kr.hasDetailViewIcon(this.options)&&(o+=1);var l=s.eq(n).find(">td").eq(o);if(!(n<0||o<0||n>=this.data.length)){for(e=n;e<n+r;e++)for(i=o;i<o+a;i++)s.eq(e).find(">td").eq(i).hide();l.attr("rowspan",r).attr("colspan",a).show()}}},{key:"checkAll",value:function(){this._toggleCheckAll(!0)}},{key:"uncheckAll",value:function(){this._toggleCheckAll(!1)}},{key:"_toggleCheckAll",value:function(t){var e=this.getSelections();this.$selectAll.add(this.$selectAll_).prop("checked",t),this.$selectItem.filter(":enabled").prop("checked",t),this.updateRows();var i=this.getSelections();t?this.trigger("check-all",i,e):this.trigger("uncheck-all",i,e)}},{key:"checkInvert",value:function(){var e=this.$selectItem.filter(":enabled"),i=e.filter(":checked");e.each((function(e,i){t(i).prop("checked",!t(i).prop("checked"))})),this.updateRows(),this.updateSelected(),this.trigger("uncheck-some",i),i=this.getSelections(),this.trigger("check-some",i)}},{key:"check",value:function(t){this._toggleCheck(!0,t)}},{key:"uncheck",value:function(t){this._toggleCheck(!1,t)}},{key:"_toggleCheck",value:function(t,e){var i=this.$selectItem.filter('[data-index="'.concat(e,'"]')),n=this.data[e];if(i.is(":radio")||this.options.singleSelect||this.options.multipleSelectRow&&!this.multipleSelectRowCtrlKey&&!this.multipleSelectRowShiftKey){var o=!0,r=!1,a=void 0;try{for(var s,l=this.options.data[Symbol.iterator]();!(o=(s=l.next()).done);o=!0){s.value[this.header.stateField]=!1}}catch(t){r=!0,a=t}finally{try{o||null==l.return||l.return()}finally{if(r)throw a}}this.$selectItem.filter(":checked").not(i).prop("checked",!1)}if(n[this.header.stateField]=t,this.options.multipleSelectRow){if(this.multipleSelectRowShiftKey&&this.multipleSelectRowLastSelectedIndex>=0)for(var c=[this.multipleSelectRowLastSelectedIndex,e].sort(),h=c[0]+1;h<c[1];h++)this.data[h][this.header.stateField]=!0,this.$selectItem.filter('[data-index="'.concat(h,'"]')).prop("checked",!0);this.multipleSelectRowCtrlKey=!1,this.multipleSelectRowShiftKey=!1,this.multipleSelectRowLastSelectedIndex=t?e:-1}i.prop("checked",t),this.updateSelected(),this.trigger(t?"check":"uncheck",this.data[e],i)}},{key:"checkBy",value:function(t){this._toggleCheckBy(!0,t)}},{key:"uncheckBy",value:function(t){this._toggleCheckBy(!1,t)}},{key:"_toggleCheckBy",value:function(t,e){var i=this;if(e.hasOwnProperty("field")&&e.hasOwnProperty("values")){var n=[];this.data.forEach((function(o,r){if(!o.hasOwnProperty(e.field))return!1;if(e.values.includes(o[e.field])){var a=i.$selectItem.filter(":enabled").filter(kr.sprintf('[data-index="%s"]',r));if(!(a=t?a.not(":checked"):a.filter(":checked")).length)return;a.prop("checked",t),o[i.header.stateField]=t,n.push(o),i.trigger(t?"check":"uncheck",o,a)}})),this.updateSelected(),this.trigger(t?"check-some":"uncheck-some",n)}}},{key:"refresh",value:function(t){t&&t.url&&(this.options.url=t.url),t&&t.pageNumber&&(this.options.pageNumber=t.pageNumber),t&&t.pageSize&&(this.options.pageSize=t.pageSize),this.trigger("refresh",this.initServer(t&&t.silent,t&&t.query,t&&t.url))}},{key:"destroy",value:function(){this.$el.insertBefore(this.$container),t(this.options.toolbar).insertBefore(this.$el),this.$container.next().remove(),this.$container.remove(),this.$el.html(this.$el_.html()).css("margin-top","0").attr("class",this.$el_.attr("class")||"")}},{key:"resetView",value:function(t){var e=0;if(t&&t.height&&(this.options.height=t.height),this.$selectAll.prop("checked",this.$selectItem.length>0&&this.$selectItem.length===this.$selectItem.filter(":checked").length),this.$tableContainer.toggleClass("has-card-view",this.options.cardView),!this.options.cardView&&this.options.showHeader&&this.options.height?(this.$tableHeader.show(),this.resetHeader(),e+=this.$header.outerHeight(!0)+1):(this.$tableHeader.hide(),this.trigger("post-header")),!this.options.cardView&&this.options.showFooter&&(this.$tableFooter.show(),this.fitFooter(),this.options.height&&(e+=this.$tableFooter.outerHeight(!0))),this.$container.hasClass("fullscreen"))this.$tableContainer.css("height",""),this.$tableContainer.css("width","");else if(this.options.height){this.$tableBorder&&(this.$tableBorder.css("width",""),this.$tableBorder.css("height",""));var i=this.$toolbar.outerHeight(!0),n=this.$pagination.outerHeight(!0),o=this.options.height-i-n,r=this.$tableBody.find(">table"),a=r.outerHeight();if(this.$tableContainer.css("height","".concat(o,"px")),this.$tableBorder&&r.is(":visible")){var s=o-a-2;this.$tableBody[0].scrollWidth-this.$tableBody.innerWidth()&&(s-=kr.getScrollBarWidth()),this.$tableBorder.css("width","".concat(r.outerWidth(),"px")),this.$tableBorder.css("height","".concat(s,"px"))}}this.options.cardView?(this.$el.css("margin-top","0"),this.$tableContainer.css("padding-bottom","0"),this.$tableFooter.hide()):(this.getCaret(),this.$tableContainer.css("padding-bottom","".concat(e,"px"))),this.trigger("reset-view")}},{key:"showLoading",value:function(){this.$tableLoading.css("display","flex");var t=this.options.loadingFontSize;"auto"===this.options.loadingFontSize&&(t=.04*this.$tableLoading.width(),t=Math.max(12,t),t=Math.min(32,t),t="".concat(t,"px")),this.$tableLoading.find(".loading-text").css("font-size",t)}},{key:"hideLoading",value:function(){this.$tableLoading.css("display","none")}},{key:"togglePagination",value:function(){this.options.pagination=!this.options.pagination;var t=this.options.showButtonIcons?this.options.pagination?this.options.icons.paginationSwitchDown:this.options.icons.paginationSwitchUp:"",e=this.options.showButtonText?this.options.pagination?this.options.formatPaginationSwitchUp():this.options.formatPaginationSwitchDown():"";this.$toolbar.find('button[name="paginationSwitch"]').html(kr.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)+" "+e),this.updatePagination()}},{key:"toggleFullscreen",value:function(){this.$el.closest(".bootstrap-table").toggleClass("fullscreen"),this.resetView()}},{key:"toggleView",value:function(){this.options.cardView=!this.options.cardView,this.initHeader();var t=this.options.showButtonIcons?this.options.cardView?this.options.icons.toggleOn:this.options.icons.toggleOff:"",e=this.options.showButtonText?this.options.cardView?this.options.formatToggleOff():this.options.formatToggleOn():"";this.$toolbar.find('button[name="toggle"]').html(kr.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)+" "+e),this.initBody(),this.trigger("toggle",this.options.cardView)}},{key:"resetSearch",value:function(t){var e=this.$toolbar.find(".search input");e.val(t||""),this.onSearch({currentTarget:e})}},{key:"filterBy",value:function(e,i){this.filterOptions=kr.isEmptyObject(i)?this.options.filterOptions:t.extend(this.options.filterOptions,i),this.filterColumns=kr.isEmptyObject(e)?{}:e,this.options.pageNumber=1,this.initSearch(),this.updatePagination()}},{key:"scrollTo",value:function(e){if(void 0===e)return this.$tableBody.scrollTop();var i={unit:"px",value:0};"object"===Xo(e)?i=Object.assign(i,e):"string"==typeof e&&"bottom"===e?i.value=this.$tableBody[0].scrollHeight:"string"!=typeof e&&"number"!=typeof e||(i.value=e);var n=i.value;"rows"===i.unit&&(n=0,this.$body.find("> tr:lt(".concat(i.value,")")).each((function(e,i){n+=t(i).outerHeight(!0)}))),this.$tableBody.scrollTop(n)}},{key:"getScrollPosition",value:function(){return this.scrollTo()}},{key:"selectPage",value:function(t){t>0&&t<=this.options.totalPages&&(this.options.pageNumber=t,this.updatePagination())}},{key:"prevPage",value:function(){this.options.pageNumber>1&&(this.options.pageNumber--,this.updatePagination())}},{key:"nextPage",value:function(){this.options.pageNumber<this.options.totalPages&&(this.options.pageNumber++,this.updatePagination())}},{key:"toggleDetailView",value:function(t,e){this.$body.find(kr.sprintf('> tr[data-index="%s"]',t)).next().is("tr.detail-view")?this.collapseRow(t):this.expandRow(t,e),this.resetView()}},{key:"expandRow",value:function(t,e){var i=this.data[t],n=this.$body.find(kr.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));if(!n.next().is("tr.detail-view")){this.options.detailViewIcon&&n.find("a.detail-icon").html(kr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailClose)),n.after(kr.sprintf('<tr class="detail-view"><td colspan="%s"></td></tr>',n.children("td").length));var o=n.next().find("td"),r=e||this.options.detailFormatter,a=kr.calculateObjectValue(this.options,r,[t,i,o],"");1===o.length&&o.append(a),this.trigger("expand-row",t,i,o)}}},{key:"expandRowByUniqueId",value:function(t){var e=this.getRowByUniqueId(t);e&&this.expandRow(this.data.indexOf(e))}},{key:"collapseRow",value:function(t){var e=this.data[t],i=this.$body.find(kr.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));i.next().is("tr.detail-view")&&(this.options.detailViewIcon&&i.find("a.detail-icon").html(kr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen)),this.trigger("collapse-row",t,e,i.next()),i.next().remove())}},{key:"collapseRowByUniqueId",value:function(t){var e=this.getRowByUniqueId(t);e&&this.collapseRow(this.data.indexOf(e))}},{key:"expandAllRows",value:function(){for(var e=this.$body.find("> tr[data-index][data-has-detail-view]"),i=0;i<e.length;i++)this.expandRow(t(e[i]).data("index"))}},{key:"collapseAllRows",value:function(){for(var e=this.$body.find("> tr[data-index][data-has-detail-view]"),i=0;i<e.length;i++)this.collapseRow(t(e[i]).data("index"))}},{key:"updateColumnTitle",value:function(e){e.hasOwnProperty("field")&&e.hasOwnProperty("title")&&(this.columns[this.fieldsColumnsIndex[e.field]].title=this.options.escape?kr.escapeHTML(e.title):e.title,this.columns[this.fieldsColumnsIndex[e.field]].visible&&(void 0!==this.options.height?this.$tableHeader:this.$header).find("th[data-field]").each((function(i,n){if(t(n).data("field")===e.field)return t(t(n).find(".th-inner")[0]).text(e.title),!1})))}},{key:"updateFormatText",value:function(t,e){/^format/.test(t)&&this.options[t]&&("string"==typeof e?this.options[t]=function(){return e}:"function"==typeof e&&(this.options[t]=e),this.initToolbar(),this.initPagination(),this.initBody())}}]),e}();return Cr.VERSION=hr.VERSION,Cr.DEFAULTS=hr.DEFAULTS,Cr.LOCALES=hr.LOCALES,Cr.COLUMN_DEFAULTS=hr.COLUMN_DEFAULTS,Cr.METHODS=hr.METHODS,Cr.EVENTS=hr.EVENTS,t.BootstrapTable=Cr,t.fn.bootstrapTable=function(e){for(var i=arguments.length,n=new Array(i>1?i-1:0),o=1;o<i;o++)n[o-1]=arguments[o];var r;return this.each((function(i,o){var a=t(o).data("bootstrap.table"),s=t.extend({},Cr.DEFAULTS,t(o).data(),"object"===Xo(e)&&e);if("string"==typeof e){var l;if(!hr.METHODS.includes(e))throw new Error("Unknown method: ".concat(e));if(!a)return;r=(l=a)[e].apply(l,n),"destroy"===e&&t(o).removeData("bootstrap.table")}a||t(o).data("bootstrap.table",a=new t.BootstrapTable(o,s))})),void 0===r?this:r},t.fn.bootstrapTable.Constructor=Cr,t.fn.bootstrapTable.theme=hr.THEME,t.fn.bootstrapTable.VERSION=hr.VERSION,t.fn.bootstrapTable.defaults=Cr.DEFAULTS,t.fn.bootstrapTable.columnDefaults=Cr.COLUMN_DEFAULTS,t.fn.bootstrapTable.events=Cr.EVENTS,t.fn.bootstrapTable.locales=Cr.LOCALES,t.fn.bootstrapTable.methods=Cr.METHODS,t.fn.bootstrapTable.utils=kr,t((function(){t('[data-toggle="table"]').bootstrapTable()})),Cr}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):(t="undefined"!=typeof globalThis?globalThis:t||self).BootstrapTable=e(t.jQuery)}(this,(function(t){"use strict";function e(t){return t&&"object"==typeof t&&"default"in t?t:{default:t}}var i=e(t),n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function o(t,e){return t(e={exports:{}},e.exports),e.exports}var a=function(t){return t&&t.Math==Math&&t},s=a("object"==typeof globalThis&&globalThis)||a("object"==typeof window&&window)||a("object"==typeof self&&self)||a("object"==typeof n&&n)||Function("return this")(),r=function(t){try{return!!t()}catch(t){return!0}},l=!r((function(){return 7!=Object.defineProperty({},1,{get:function(){return 7}})[1]})),c={}.propertyIsEnumerable,h=Object.getOwnPropertyDescriptor,u={f:h&&!c.call({1:2},1)?function(t){var e=h(this,t);return!!e&&e.enumerable}:c},d=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},f={}.toString,p=function(t){return f.call(t).slice(8,-1)},g="".split,v=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?g.call(t,""):Object(t)}:Object,b=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},m=function(t){return v(b(t))},y=function(t){return"object"==typeof t?null!==t:"function"==typeof t},w=function(t,e){if(!y(t))return t;var i,n;if(e&&"function"==typeof(i=t.toString)&&!y(n=i.call(t)))return n;if("function"==typeof(i=t.valueOf)&&!y(n=i.call(t)))return n;if(!e&&"function"==typeof(i=t.toString)&&!y(n=i.call(t)))return n;throw TypeError("Can't convert object to primitive value")},S={}.hasOwnProperty,x=function(t,e){return S.call(t,e)},k=s.document,O=y(k)&&y(k.createElement),C=function(t){return O?k.createElement(t):{}},T=!l&&!r((function(){return 7!=Object.defineProperty(C("div"),"a",{get:function(){return 7}}).a})),P=Object.getOwnPropertyDescriptor,A={f:l?P:function(t,e){if(t=m(t),e=w(e,!0),T)try{return P(t,e)}catch(t){}if(x(t,e))return d(!u.f.call(t,e),t[e])}},I=function(t){if(!y(t))throw TypeError(String(t)+" is not an object");return t},$=Object.defineProperty,E={f:l?$:function(t,e,i){if(I(t),e=w(e,!0),I(i),T)try{return $(t,e,i)}catch(t){}if("get"in i||"set"in i)throw TypeError("Accessors not supported");return"value"in i&&(t[e]=i.value),t}},R=l?function(t,e,i){return E.f(t,e,d(1,i))}:function(t,e,i){return t[e]=i,t},j=function(t,e){try{R(s,t,e)}catch(i){s[t]=e}return e},_="__core-js_shared__",N=s[_]||j(_,{}),F=Function.toString;"function"!=typeof N.inspectSource&&(N.inspectSource=function(t){return F.call(t)});var D,V,B,L=N.inspectSource,H=s.WeakMap,M="function"==typeof H&&/native code/.test(L(H)),U=o((function(t){(t.exports=function(t,e){return N[t]||(N[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.5",mode:"global",copyright:"© 2020 Denis Pushkarev (zloirock.ru)"})})),z=0,q=Math.random(),W=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++z+q).toString(36)},G=U("keys"),K=function(t){return G[t]||(G[t]=W(t))},Y={},X=s.WeakMap;if(M){var J=new X,Q=J.get,Z=J.has,tt=J.set;D=function(t,e){return tt.call(J,t,e),e},V=function(t){return Q.call(J,t)||{}},B=function(t){return Z.call(J,t)}}else{var et=K("state");Y[et]=!0,D=function(t,e){return R(t,et,e),e},V=function(t){return x(t,et)?t[et]:{}},B=function(t){return x(t,et)}}var it,nt,ot={set:D,get:V,has:B,enforce:function(t){return B(t)?V(t):D(t,{})},getterFor:function(t){return function(e){var i;if(!y(e)||(i=V(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return i}}},at=o((function(t){var e=ot.get,i=ot.enforce,n=String(String).split("String");(t.exports=function(t,e,o,a){var r=!!a&&!!a.unsafe,l=!!a&&!!a.enumerable,c=!!a&&!!a.noTargetGet;"function"==typeof o&&("string"!=typeof e||x(o,"name")||R(o,"name",e),i(o).source=n.join("string"==typeof e?e:"")),t!==s?(r?!c&&t[e]&&(l=!0):delete t[e],l?t[e]=o:R(t,e,o)):l?t[e]=o:j(e,o)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||L(this)}))})),st=s,rt=function(t){return"function"==typeof t?t:void 0},lt=function(t,e){return arguments.length<2?rt(st[t])||rt(s[t]):st[t]&&st[t][e]||s[t]&&s[t][e]},ct=Math.ceil,ht=Math.floor,ut=function(t){return isNaN(t=+t)?0:(t>0?ht:ct)(t)},dt=Math.min,ft=function(t){return t>0?dt(ut(t),9007199254740991):0},pt=Math.max,gt=Math.min,vt=function(t,e){var i=ut(t);return i<0?pt(i+e,0):gt(i,e)},bt=function(t){return function(e,i,n){var o,a=m(e),s=ft(a.length),r=vt(n,s);if(t&&i!=i){for(;s>r;)if((o=a[r++])!=o)return!0}else for(;s>r;r++)if((t||r in a)&&a[r]===i)return t||r||0;return!t&&-1}},mt={includes:bt(!0),indexOf:bt(!1)},yt=mt.indexOf,wt=function(t,e){var i,n=m(t),o=0,a=[];for(i in n)!x(Y,i)&&x(n,i)&&a.push(i);for(;e.length>o;)x(n,i=e[o++])&&(~yt(a,i)||a.push(i));return a},St=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],xt=St.concat("length","prototype"),kt={f:Object.getOwnPropertyNames||function(t){return wt(t,xt)}},Ot={f:Object.getOwnPropertySymbols},Ct=lt("Reflect","ownKeys")||function(t){var e=kt.f(I(t)),i=Ot.f;return i?e.concat(i(t)):e},Tt=function(t,e){for(var i=Ct(e),n=E.f,o=A.f,a=0;a<i.length;a++){var s=i[a];x(t,s)||n(t,s,o(e,s))}},Pt=/#|\.prototype\./,At=function(t,e){var i=$t[It(t)];return i==Rt||i!=Et&&("function"==typeof e?r(e):!!e)},It=At.normalize=function(t){return String(t).replace(Pt,".").toLowerCase()},$t=At.data={},Et=At.NATIVE="N",Rt=At.POLYFILL="P",jt=At,_t=A.f,Nt=function(t,e){var i,n,o,a,r,l=t.target,c=t.global,h=t.stat;if(i=c?s:h?s[l]||j(l,{}):(s[l]||{}).prototype)for(n in e){if(a=e[n],o=t.noTargetGet?(r=_t(i,n))&&r.value:i[n],!jt(c?n:l+(h?".":"#")+n,t.forced)&&void 0!==o){if(typeof a==typeof o)continue;Tt(a,o)}(t.sham||o&&o.sham)&&R(a,"sham",!0),at(i,n,a,t)}},Ft=Array.isArray||function(t){return"Array"==p(t)},Dt=function(t){return Object(b(t))},Vt=function(t,e,i){var n=w(e);n in t?E.f(t,n,d(0,i)):t[n]=i},Bt=!!Object.getOwnPropertySymbols&&!r((function(){return!String(Symbol())})),Lt=Bt&&!Symbol.sham&&"symbol"==typeof Symbol.iterator,Ht=U("wks"),Mt=s.Symbol,Ut=Lt?Mt:Mt&&Mt.withoutSetter||W,zt=function(t){return x(Ht,t)||(Bt&&x(Mt,t)?Ht[t]=Mt[t]:Ht[t]=Ut("Symbol."+t)),Ht[t]},qt=zt("species"),Wt=function(t,e){var i;return Ft(t)&&("function"!=typeof(i=t.constructor)||i!==Array&&!Ft(i.prototype)?y(i)&&null===(i=i[qt])&&(i=void 0):i=void 0),new(void 0===i?Array:i)(0===e?0:e)},Gt=lt("navigator","userAgent")||"",Kt=s.process,Yt=Kt&&Kt.versions,Xt=Yt&&Yt.v8;Xt?nt=(it=Xt.split("."))[0]+it[1]:Gt&&(!(it=Gt.match(/Edge\/(\d+)/))||it[1]>=74)&&(it=Gt.match(/Chrome\/(\d+)/))&&(nt=it[1]);var Jt=nt&&+nt,Qt=zt("species"),Zt=function(t){return Jt>=51||!r((function(){var e=[];return(e.constructor={})[Qt]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},te=zt("isConcatSpreadable"),ee=9007199254740991,ie="Maximum allowed index exceeded",ne=Jt>=51||!r((function(){var t=[];return t[te]=!1,t.concat()[0]!==t})),oe=Zt("concat"),ae=function(t){if(!y(t))return!1;var e=t[te];return void 0!==e?!!e:Ft(t)};Nt({target:"Array",proto:!0,forced:!ne||!oe},{concat:function(t){var e,i,n,o,a,s=Dt(this),r=Wt(s,0),l=0;for(e=-1,n=arguments.length;e<n;e++)if(ae(a=-1===e?s:arguments[e])){if(l+(o=ft(a.length))>ee)throw TypeError(ie);for(i=0;i<o;i++,l++)i in a&&Vt(r,l,a[i])}else{if(l>=ee)throw TypeError(ie);Vt(r,l++,a)}return r.length=l,r}});var se=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},re=[].push,le=function(t){var e=1==t,i=2==t,n=3==t,o=4==t,a=6==t,s=5==t||a;return function(r,l,c,h){for(var u,d,f=Dt(r),p=v(f),g=function(t,e,i){if(se(t),void 0===e)return t;switch(i){case 0:return function(){return t.call(e)};case 1:return function(i){return t.call(e,i)};case 2:return function(i,n){return t.call(e,i,n)};case 3:return function(i,n,o){return t.call(e,i,n,o)}}return function(){return t.apply(e,arguments)}}(l,c,3),b=ft(p.length),m=0,y=h||Wt,w=e?y(r,b):i?y(r,0):void 0;b>m;m++)if((s||m in p)&&(d=g(u=p[m],m,f),t))if(e)w[m]=d;else if(d)switch(t){case 3:return!0;case 5:return u;case 6:return m;case 2:re.call(w,u)}else if(o)return!1;return a?-1:n||o?o:w}},ce={forEach:le(0),map:le(1),filter:le(2),some:le(3),every:le(4),find:le(5),findIndex:le(6)},he=Object.defineProperty,ue={},de=function(t){throw t},fe=function(t,e){if(x(ue,t))return ue[t];e||(e={});var i=[][t],n=!!x(e,"ACCESSORS")&&e.ACCESSORS,o=x(e,0)?e[0]:de,a=x(e,1)?e[1]:void 0;return ue[t]=!!i&&!r((function(){if(n&&!l)return!0;var t={length:-1};n?he(t,1,{enumerable:!0,get:de}):t[1]=1,i.call(t,o,a)}))},pe=ce.filter,ge=Zt("filter"),ve=fe("filter");Nt({target:"Array",proto:!0,forced:!ge||!ve},{filter:function(t){return pe(this,t,arguments.length>1?arguments[1]:void 0)}});var be,me=Object.keys||function(t){return wt(t,St)},ye=l?Object.defineProperties:function(t,e){I(t);for(var i,n=me(e),o=n.length,a=0;o>a;)E.f(t,i=n[a++],e[i]);return t},we=lt("document","documentElement"),Se=K("IE_PROTO"),xe=function(){},ke=function(t){return"<script>"+t+"</"+"script>"},Oe=function(){try{be=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Oe=be?function(t){t.write(ke("")),t.close();var e=t.parentWindow.Object;return t=null,e}(be):((e=C("iframe")).style.display="none",we.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(ke("document.F=Object")),t.close(),t.F);for(var i=St.length;i--;)delete Oe.prototype[St[i]];return Oe()};Y[Se]=!0;var Ce=Object.create||function(t,e){var i;return null!==t?(xe.prototype=I(t),i=new xe,xe.prototype=null,i[Se]=t):i=Oe(),void 0===e?i:ye(i,e)},Te=zt("unscopables"),Pe=Array.prototype;null==Pe[Te]&&E.f(Pe,Te,{configurable:!0,value:Ce(null)});var Ae=function(t){Pe[Te][t]=!0},Ie=ce.find,$e="find",Ee=!0,Re=fe($e);$e in[]&&Array(1).find((function(){Ee=!1})),Nt({target:"Array",proto:!0,forced:Ee||!Re},{find:function(t){return Ie(this,t,arguments.length>1?arguments[1]:void 0)}}),Ae($e);var je=ce.findIndex,_e="findIndex",Ne=!0,Fe=fe(_e);_e in[]&&Array(1).findIndex((function(){Ne=!1})),Nt({target:"Array",proto:!0,forced:Ne||!Fe},{findIndex:function(t){return je(this,t,arguments.length>1?arguments[1]:void 0)}}),Ae(_e);var De=function(t,e){var i=[][t];return!!i&&r((function(){i.call(null,e||function(){throw 1},1)}))},Ve=ce.forEach,Be=De("forEach"),Le=fe("forEach"),He=Be&&Le?[].forEach:function(t){return Ve(this,t,arguments.length>1?arguments[1]:void 0)};Nt({target:"Array",proto:!0,forced:[].forEach!=He},{forEach:He});var Me=mt.includes,Ue=fe("indexOf",{ACCESSORS:!0,1:0});Nt({target:"Array",proto:!0,forced:!Ue},{includes:function(t){return Me(this,t,arguments.length>1?arguments[1]:void 0)}}),Ae("includes");var ze=mt.indexOf,qe=[].indexOf,We=!!qe&&1/[1].indexOf(1,-0)<0,Ge=De("indexOf"),Ke=fe("indexOf",{ACCESSORS:!0,1:0});Nt({target:"Array",proto:!0,forced:We||!Ge||!Ke},{indexOf:function(t){return We?qe.apply(this,arguments)||0:ze(this,t,arguments.length>1?arguments[1]:void 0)}});var Ye,Xe,Je,Qe=!r((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),Ze=K("IE_PROTO"),ti=Object.prototype,ei=Qe?Object.getPrototypeOf:function(t){return t=Dt(t),x(t,Ze)?t[Ze]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?ti:null},ii=zt("iterator"),ni=!1;[].keys&&("next"in(Je=[].keys())?(Xe=ei(ei(Je)))!==Object.prototype&&(Ye=Xe):ni=!0),null==Ye&&(Ye={}),x(Ye,ii)||R(Ye,ii,(function(){return this}));var oi={IteratorPrototype:Ye,BUGGY_SAFARI_ITERATORS:ni},ai=E.f,si=zt("toStringTag"),ri=function(t,e,i){t&&!x(t=i?t:t.prototype,si)&&ai(t,si,{configurable:!0,value:e})},li=oi.IteratorPrototype,ci=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,i={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(i,[]),e=i instanceof Array}catch(t){}return function(i,n){return I(i),function(t){if(!y(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(n),e?t.call(i,n):i.__proto__=n,i}}():void 0),hi=oi.IteratorPrototype,ui=oi.BUGGY_SAFARI_ITERATORS,di=zt("iterator"),fi="keys",pi="values",gi="entries",vi=function(){return this},bi="Array Iterator",mi=ot.set,yi=ot.getterFor(bi),wi=function(t,e,i,n,o,a,s){!function(t,e,i){var n=e+" Iterator";t.prototype=Ce(li,{next:d(1,i)}),ri(t,n,!1)}(i,e,n);var r,l,c,h=function(t){if(t===o&&v)return v;if(!ui&&t in p)return p[t];switch(t){case fi:case pi:case gi:return function(){return new i(this,t)}}return function(){return new i(this)}},u=e+" Iterator",f=!1,p=t.prototype,g=p[di]||p["@@iterator"]||o&&p[o],v=!ui&&g||h(o),b="Array"==e&&p.entries||g;if(b&&(r=ei(b.call(new t)),hi!==Object.prototype&&r.next&&(ei(r)!==hi&&(ci?ci(r,hi):"function"!=typeof r[di]&&R(r,di,vi)),ri(r,u,!0))),o==pi&&g&&g.name!==pi&&(f=!0,v=function(){return g.call(this)}),p[di]!==v&&R(p,di,v),o)if(l={values:h(pi),keys:a?v:h(fi),entries:h(gi)},s)for(c in l)(ui||f||!(c in p))&&at(p,c,l[c]);else Nt({target:e,proto:!0,forced:ui||f},l);return l}(Array,"Array",(function(t,e){mi(this,{type:bi,target:m(t),index:0,kind:e})}),(function(){var t=yi(this),e=t.target,i=t.kind,n=t.index++;return!e||n>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==i?{value:n,done:!1}:"values"==i?{value:e[n],done:!1}:{value:[n,e[n]],done:!1}}),"values");Ae("keys"),Ae("values"),Ae("entries");var Si=[].join,xi=v!=Object,ki=De("join",",");Nt({target:"Array",proto:!0,forced:xi||!ki},{join:function(t){return Si.call(m(this),void 0===t?",":t)}});var Oi=ce.map,Ci=Zt("map"),Ti=fe("map");Nt({target:"Array",proto:!0,forced:!Ci||!Ti},{map:function(t){return Oi(this,t,arguments.length>1?arguments[1]:void 0)}});var Pi=[].reverse,Ai=[1,2];Nt({target:"Array",proto:!0,forced:String(Ai)===String(Ai.reverse())},{reverse:function(){return Ft(this)&&(this.length=this.length),Pi.call(this)}});var Ii=Zt("slice"),$i=fe("slice",{ACCESSORS:!0,0:0,1:2}),Ei=zt("species"),Ri=[].slice,ji=Math.max;Nt({target:"Array",proto:!0,forced:!Ii||!$i},{slice:function(t,e){var i,n,o,a=m(this),s=ft(a.length),r=vt(t,s),l=vt(void 0===e?s:e,s);if(Ft(a)&&("function"!=typeof(i=a.constructor)||i!==Array&&!Ft(i.prototype)?y(i)&&null===(i=i[Ei])&&(i=void 0):i=void 0,i===Array||void 0===i))return Ri.call(a,r,l);for(n=new(void 0===i?Array:i)(ji(l-r,0)),o=0;r<l;r++,o++)r in a&&Vt(n,o,a[r]);return n.length=o,n}});var _i=[],Ni=_i.sort,Fi=r((function(){_i.sort(void 0)})),Di=r((function(){_i.sort(null)})),Vi=De("sort");Nt({target:"Array",proto:!0,forced:Fi||!Di||!Vi},{sort:function(t){return void 0===t?Ni.call(Dt(this)):Ni.call(Dt(this),se(t))}});var Bi=Zt("splice"),Li=fe("splice",{ACCESSORS:!0,0:0,1:2}),Hi=Math.max,Mi=Math.min,Ui=9007199254740991,zi="Maximum allowed length exceeded";Nt({target:"Array",proto:!0,forced:!Bi||!Li},{splice:function(t,e){var i,n,o,a,s,r,l=Dt(this),c=ft(l.length),h=vt(t,c),u=arguments.length;if(0===u?i=n=0:1===u?(i=0,n=c-h):(i=u-2,n=Mi(Hi(ut(e),0),c-h)),c+i-n>Ui)throw TypeError(zi);for(o=Wt(l,n),a=0;a<n;a++)(s=h+a)in l&&Vt(o,a,l[s]);if(o.length=n,i<n){for(a=h;a<c-n;a++)r=a+i,(s=a+n)in l?l[r]=l[s]:delete l[r];for(a=c;a>c-n+i;a--)delete l[a-1]}else if(i>n)for(a=c-n;a>h;a--)r=a+i-1,(s=a+n-1)in l?l[r]=l[s]:delete l[r];for(a=0;a<i;a++)l[a+h]=arguments[a+2];return l.length=c-n+i,o}});var qi=function(t,e,i){var n,o;return ci&&"function"==typeof(n=e.constructor)&&n!==i&&y(o=n.prototype)&&o!==i.prototype&&ci(t,o),t},Wi="\t\n\v\f\r                　\u2028\u2029\ufeff",Gi="["+Wi+"]",Ki=RegExp("^"+Gi+Gi+"*"),Yi=RegExp(Gi+Gi+"*$"),Xi=function(t){return function(e){var i=String(b(e));return 1&t&&(i=i.replace(Ki,"")),2&t&&(i=i.replace(Yi,"")),i}},Ji={start:Xi(1),end:Xi(2),trim:Xi(3)},Qi=kt.f,Zi=A.f,tn=E.f,en=Ji.trim,nn="Number",on=s.Number,an=on.prototype,sn=p(Ce(an))==nn,rn=function(t){var e,i,n,o,a,s,r,l,c=w(t,!1);if("string"==typeof c&&c.length>2)if(43===(e=(c=en(c)).charCodeAt(0))||45===e){if(88===(i=c.charCodeAt(2))||120===i)return NaN}else if(48===e){switch(c.charCodeAt(1)){case 66:case 98:n=2,o=49;break;case 79:case 111:n=8,o=55;break;default:return+c}for(s=(a=c.slice(2)).length,r=0;r<s;r++)if((l=a.charCodeAt(r))<48||l>o)return NaN;return parseInt(a,n)}return+c};if(jt(nn,!on(" 0o1")||!on("0b1")||on("+0x1"))){for(var ln,cn=function(t){var e=arguments.length<1?0:t,i=this;return i instanceof cn&&(sn?r((function(){an.valueOf.call(i)})):p(i)!=nn)?qi(new on(rn(e)),i,cn):rn(e)},hn=l?Qi(on):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),un=0;hn.length>un;un++)x(on,ln=hn[un])&&!x(cn,ln)&&tn(cn,ln,Zi(on,ln));cn.prototype=an,an.constructor=cn,at(s,nn,cn)}var dn=Object.assign,fn=Object.defineProperty,pn=!dn||r((function(){if(l&&1!==dn({b:1},dn(fn({},"a",{enumerable:!0,get:function(){fn(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},i=Symbol(),n="abcdefghijklmnopqrst";return t[i]=7,n.split("").forEach((function(t){e[t]=t})),7!=dn({},t)[i]||me(dn({},e)).join("")!=n}))?function(t,e){for(var i=Dt(t),n=arguments.length,o=1,a=Ot.f,s=u.f;n>o;)for(var r,c=v(arguments[o++]),h=a?me(c).concat(a(c)):me(c),d=h.length,f=0;d>f;)r=h[f++],l&&!s.call(c,r)||(i[r]=c[r]);return i}:dn;Nt({target:"Object",stat:!0,forced:Object.assign!==pn},{assign:pn});var gn=u.f,vn=function(t){return function(e){for(var i,n=m(e),o=me(n),a=o.length,s=0,r=[];a>s;)i=o[s++],l&&!gn.call(n,i)||r.push(t?[i,n[i]]:n[i]);return r}},bn={entries:vn(!0),values:vn(!1)}.entries;Nt({target:"Object",stat:!0},{entries:function(t){return bn(t)}});var mn={};mn[zt("toStringTag")]="z";var yn="[object z]"===String(mn),wn=zt("toStringTag"),Sn="Arguments"==p(function(){return arguments}()),xn=yn?p:function(t){var e,i,n;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(i=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),wn))?i:Sn?p(e):"Object"==(n=p(e))&&"function"==typeof e.callee?"Arguments":n},kn=yn?{}.toString:function(){return"[object "+xn(this)+"]"};yn||at(Object.prototype,"toString",kn,{unsafe:!0});var On=Ji.trim,Cn=s.parseFloat,Tn=1/Cn(Wi+"-0")!=-1/0?function(t){var e=On(String(t)),i=Cn(e);return 0===i&&"-"==e.charAt(0)?-0:i}:Cn;Nt({global:!0,forced:parseFloat!=Tn},{parseFloat:Tn});var Pn=Ji.trim,An=s.parseInt,In=/^[+-]?0[Xx]/,$n=8!==An(Wi+"08")||22!==An(Wi+"0x16")?function(t,e){var i=Pn(String(t));return An(i,e>>>0||(In.test(i)?16:10))}:An;Nt({global:!0,forced:parseInt!=$n},{parseInt:$n});var En=zt("match"),Rn=function(t){var e;return y(t)&&(void 0!==(e=t[En])?!!e:"RegExp"==p(t))},jn=function(){var t=I(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function _n(t,e){return RegExp(t,e)}var Nn={UNSUPPORTED_Y:r((function(){var t=_n("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:r((function(){var t=_n("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},Fn=zt("species"),Dn=E.f,Vn=kt.f,Bn=ot.set,Ln=zt("match"),Hn=s.RegExp,Mn=Hn.prototype,Un=/a/g,zn=/a/g,qn=new Hn(Un)!==Un,Wn=Nn.UNSUPPORTED_Y;if(l&&jt("RegExp",!qn||Wn||r((function(){return zn[Ln]=!1,Hn(Un)!=Un||Hn(zn)==zn||"/a/i"!=Hn(Un,"i")})))){for(var Gn=function(t,e){var i,n=this instanceof Gn,o=Rn(t),a=void 0===e;if(!n&&o&&t.constructor===Gn&&a)return t;qn?o&&!a&&(t=t.source):t instanceof Gn&&(a&&(e=jn.call(t)),t=t.source),Wn&&(i=!!e&&e.indexOf("y")>-1)&&(e=e.replace(/y/g,""));var s=qi(qn?new Hn(t,e):Hn(t,e),n?this:Mn,Gn);return Wn&&i&&Bn(s,{sticky:i}),s},Kn=function(t){t in Gn||Dn(Gn,t,{configurable:!0,get:function(){return Hn[t]},set:function(e){Hn[t]=e}})},Yn=Vn(Hn),Xn=0;Yn.length>Xn;)Kn(Yn[Xn++]);Mn.constructor=Gn,Gn.prototype=Mn,at(s,"RegExp",Gn)}!function(t){var e=lt(t),i=E.f;l&&e&&!e[Fn]&&i(e,Fn,{configurable:!0,get:function(){return this}})}("RegExp");var Jn=RegExp.prototype.exec,Qn=String.prototype.replace,Zn=Jn,to=function(){var t=/a/,e=/b*/g;return Jn.call(t,"a"),Jn.call(e,"a"),0!==t.lastIndex||0!==e.lastIndex}(),eo=Nn.UNSUPPORTED_Y||Nn.BROKEN_CARET,io=void 0!==/()??/.exec("")[1];(to||io||eo)&&(Zn=function(t){var e,i,n,o,a=this,s=eo&&a.sticky,r=jn.call(a),l=a.source,c=0,h=t;return s&&(-1===(r=r.replace("y","")).indexOf("g")&&(r+="g"),h=String(t).slice(a.lastIndex),a.lastIndex>0&&(!a.multiline||a.multiline&&"\n"!==t[a.lastIndex-1])&&(l="(?: "+l+")",h=" "+h,c++),i=new RegExp("^(?:"+l+")",r)),io&&(i=new RegExp("^"+l+"$(?!\\s)",r)),to&&(e=a.lastIndex),n=Jn.call(s?i:a,h),s?n?(n.input=n.input.slice(c),n[0]=n[0].slice(c),n.index=a.lastIndex,a.lastIndex+=n[0].length):a.lastIndex=0:to&&n&&(a.lastIndex=a.global?n.index+n[0].length:e),io&&n&&n.length>1&&Qn.call(n[0],i,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(n[o]=void 0)})),n});var no=Zn;Nt({target:"RegExp",proto:!0,forced:/./.exec!==no},{exec:no});var oo="toString",ao=RegExp.prototype,so=ao.toString,ro=r((function(){return"/a/b"!=so.call({source:"a",flags:"b"})})),lo=so.name!=oo;(ro||lo)&&at(RegExp.prototype,oo,(function(){var t=I(this),e=String(t.source),i=t.flags;return"/"+e+"/"+String(void 0===i&&t instanceof RegExp&&!("flags"in ao)?jn.call(t):i)}),{unsafe:!0});var co=function(t){if(Rn(t))throw TypeError("The method doesn't accept regular expressions");return t},ho=zt("match"),uo=function(t){var e=/./;try{"/./"[t](e)}catch(i){try{return e[ho]=!1,"/./"[t](e)}catch(t){}}return!1};Nt({target:"String",proto:!0,forced:!uo("includes")},{includes:function(t){return!!~String(b(this)).indexOf(co(t),arguments.length>1?arguments[1]:void 0)}});var fo=zt("species"),po=!r((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),go="$0"==="a".replace(/./,"$0"),vo=zt("replace"),bo=!!/./[vo]&&""===/./[vo]("a","$0"),mo=!r((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var i="ab".split(t);return 2!==i.length||"a"!==i[0]||"b"!==i[1]})),yo=function(t,e,i,n){var o=zt(t),a=!r((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),s=a&&!r((function(){var e=!1,i=/a/;return"split"===t&&((i={}).constructor={},i.constructor[fo]=function(){return i},i.flags="",i[o]=/./[o]),i.exec=function(){return e=!0,null},i[o](""),!e}));if(!a||!s||"replace"===t&&(!po||!go||bo)||"split"===t&&!mo){var l=/./[o],c=i(o,""[t],(function(t,e,i,n,o){return e.exec===no?a&&!o?{done:!0,value:l.call(e,i,n)}:{done:!0,value:t.call(i,e,n)}:{done:!1}}),{REPLACE_KEEPS_$0:go,REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE:bo}),h=c[0],u=c[1];at(String.prototype,t,h),at(RegExp.prototype,o,2==e?function(t,e){return u.call(t,this,e)}:function(t){return u.call(t,this)})}n&&R(RegExp.prototype[o],"sham",!0)},wo=function(t){return function(e,i){var n,o,a=String(b(e)),s=ut(i),r=a.length;return s<0||s>=r?t?"":void 0:(n=a.charCodeAt(s))<55296||n>56319||s+1===r||(o=a.charCodeAt(s+1))<56320||o>57343?t?a.charAt(s):n:t?a.slice(s,s+2):o-56320+(n-55296<<10)+65536}},So={codeAt:wo(!1),charAt:wo(!0)}.charAt,xo=function(t,e,i){return e+(i?So(t,e).length:1)},ko=function(t,e){var i=t.exec;if("function"==typeof i){var n=i.call(t,e);if("object"!=typeof n)throw TypeError("RegExp exec method returned something other than an Object or null");return n}if("RegExp"!==p(t))throw TypeError("RegExp#exec called on incompatible receiver");return no.call(t,e)},Oo=Math.max,Co=Math.min,To=Math.floor,Po=/\$([$&'`]|\d\d?|<[^>]*>)/g,Ao=/\$([$&'`]|\d\d?)/g;yo("replace",2,(function(t,e,i,n){var o=n.REGEXP_REPLACE_SUBSTITUTES_UNDEFINED_CAPTURE,a=n.REPLACE_KEEPS_$0,s=o?"$":"$0";return[function(i,n){var o=b(this),a=null==i?void 0:i[t];return void 0!==a?a.call(i,o,n):e.call(String(o),i,n)},function(t,n){if(!o&&a||"string"==typeof n&&-1===n.indexOf(s)){var l=i(e,t,this,n);if(l.done)return l.value}var c=I(t),h=String(this),u="function"==typeof n;u||(n=String(n));var d=c.global;if(d){var f=c.unicode;c.lastIndex=0}for(var p=[];;){var g=ko(c,h);if(null===g)break;if(p.push(g),!d)break;""===String(g[0])&&(c.lastIndex=xo(h,ft(c.lastIndex),f))}for(var v,b="",m=0,y=0;y<p.length;y++){g=p[y];for(var w=String(g[0]),S=Oo(Co(ut(g.index),h.length),0),x=[],k=1;k<g.length;k++)x.push(void 0===(v=g[k])?v:String(v));var O=g.groups;if(u){var C=[w].concat(x,S,h);void 0!==O&&C.push(O);var T=String(n.apply(void 0,C))}else T=r(w,h,S,x,O,n);S>=m&&(b+=h.slice(m,S)+T,m=S+w.length)}return b+h.slice(m)}];function r(t,i,n,o,a,s){var r=n+t.length,l=o.length,c=Ao;return void 0!==a&&(a=Dt(a),c=Po),e.call(s,c,(function(e,s){var c;switch(s.charAt(0)){case"$":return"$";case"&":return t;case"`":return i.slice(0,n);case"'":return i.slice(r);case"<":c=a[s.slice(1,-1)];break;default:var h=+s;if(0===h)return e;if(h>l){var u=To(h/10);return 0===u?e:u<=l?void 0===o[u-1]?s.charAt(1):o[u-1]+s.charAt(1):e}c=o[h-1]}return void 0===c?"":c}))}}));var Io=Object.is||function(t,e){return t===e?0!==t||1/t==1/e:t!=t&&e!=e};yo("search",1,(function(t,e,i){return[function(e){var i=b(this),n=null==e?void 0:e[t];return void 0!==n?n.call(e,i):new RegExp(e)[t](String(i))},function(t){var n=i(e,t,this);if(n.done)return n.value;var o=I(t),a=String(this),s=o.lastIndex;Io(s,0)||(o.lastIndex=0);var r=ko(o,a);return Io(o.lastIndex,s)||(o.lastIndex=s),null===r?-1:r.index}]}));var $o=zt("species"),Eo=[].push,Ro=Math.min,jo=4294967295,_o=!r((function(){return!RegExp(jo,"y")}));yo("split",2,(function(t,e,i){var n;return n="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,i){var n=String(b(this)),o=void 0===i?jo:i>>>0;if(0===o)return[];if(void 0===t)return[n];if(!Rn(t))return e.call(n,t,o);for(var a,s,r,l=[],c=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),h=0,u=new RegExp(t.source,c+"g");(a=no.call(u,n))&&!((s=u.lastIndex)>h&&(l.push(n.slice(h,a.index)),a.length>1&&a.index<n.length&&Eo.apply(l,a.slice(1)),r=a[0].length,h=s,l.length>=o));)u.lastIndex===a.index&&u.lastIndex++;return h===n.length?!r&&u.test("")||l.push(""):l.push(n.slice(h)),l.length>o?l.slice(0,o):l}:"0".split(void 0,0).length?function(t,i){return void 0===t&&0===i?[]:e.call(this,t,i)}:e,[function(e,i){var o=b(this),a=null==e?void 0:e[t];return void 0!==a?a.call(e,o,i):n.call(String(o),e,i)},function(t,o){var a=i(n,t,this,o,n!==e);if(a.done)return a.value;var s=I(t),r=String(this),l=function(t,e){var i,n=I(t).constructor;return void 0===n||null==(i=I(n)[$o])?e:se(i)}(s,RegExp),c=s.unicode,h=(s.ignoreCase?"i":"")+(s.multiline?"m":"")+(s.unicode?"u":"")+(_o?"y":"g"),u=new l(_o?s:"^(?:"+s.source+")",h),d=void 0===o?jo:o>>>0;if(0===d)return[];if(0===r.length)return null===ko(u,r)?[r]:[];for(var f=0,p=0,g=[];p<r.length;){u.lastIndex=_o?p:0;var v,b=ko(u,_o?r:r.slice(p));if(null===b||(v=Ro(ft(u.lastIndex+(_o?0:p)),r.length))===f)p=xo(r,p,c);else{if(g.push(r.slice(f,p)),g.length===d)return g;for(var m=1;m<=b.length-1;m++)if(g.push(b[m]),g.length===d)return g;p=f=v}}return g.push(r.slice(f)),g}]}),!_o);var No=Ji.trim;Nt({target:"String",proto:!0,forced:function(t){return r((function(){return!!Wi[t]()||"​…᠎"!="​…᠎"[t]()||Wi[t].name!==t}))}("trim")},{trim:function(){return No(this)}});var Fo={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0};for(var Do in Fo){var Vo=s[Do],Bo=Vo&&Vo.prototype;if(Bo&&Bo.forEach!==He)try{R(Bo,"forEach",He)}catch(t){Bo.forEach=He}}var Lo=zt("iterator"),Ho=zt("toStringTag"),Mo=wi.values;for(var Uo in Fo){var zo=s[Uo],qo=zo&&zo.prototype;if(qo){if(qo[Lo]!==Mo)try{R(qo,Lo,Mo)}catch(t){qo[Lo]=Mo}if(qo[Ho]||R(qo,Ho,Uo),Fo[Uo])for(var Wo in wi)if(qo[Wo]!==wi[Wo])try{R(qo,Wo,wi[Wo])}catch(t){qo[Wo]=wi[Wo]}}}function Go(t){return(Go="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Ko(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Yo(t,e){for(var i=0;i<e.length;i++){var n=e[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function Xo(t,e,i){return e&&Yo(t.prototype,e),i&&Yo(t,i),t}function Jo(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if("undefined"==typeof Symbol||!(Symbol.iterator in Object(t)))return;var i=[],n=!0,o=!1,a=void 0;try{for(var s,r=t[Symbol.iterator]();!(n=(s=r.next()).done)&&(i.push(s.value),!e||i.length!==e);n=!0);}catch(t){o=!0,a=t}finally{try{n||null==r.return||r.return()}finally{if(o)throw a}}return i}(t,e)||Zo(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Qo(t){return function(t){if(Array.isArray(t))return ta(t)}(t)||function(t){if("undefined"!=typeof Symbol&&Symbol.iterator in Object(t))return Array.from(t)}(t)||Zo(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}()}function Zo(t,e){if(t){if("string"==typeof t)return ta(t,e);var i=Object.prototype.toString.call(t).slice(8,-1);return"Object"===i&&t.constructor&&(i=t.constructor.name),"Map"===i||"Set"===i?Array.from(t):"Arguments"===i||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(i)?ta(t,e):void 0}}function ta(t,e){(null==e||e>t.length)&&(e=t.length);for(var i=0,n=new Array(e);i<e;i++)n[i]=t[i];return n}function ea(t,e){var i;if("undefined"==typeof Symbol||null==t[Symbol.iterator]){if(Array.isArray(t)||(i=Zo(t))||e&&t&&"number"==typeof t.length){i&&(t=i);var n=0,o=function(){};return{s:o,n:function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}},e:function(t){throw t},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var a,s=!0,r=!1;return{s:function(){i=t[Symbol.iterator]()},n:function(){var t=i.next();return s=t.done,t},e:function(t){r=!0,a=t},f:function(){try{s||null==i.return||i.return()}finally{if(r)throw a}}}}var ia=4;try{var na=i.default.fn.dropdown.Constructor.VERSION;void 0!==na&&(ia=parseInt(na,10))}catch(t){}try{var oa=bootstrap.Tooltip.VERSION;void 0!==oa&&(ia=parseInt(oa,10))}catch(t){}var aa={3:{iconsPrefix:"glyphicon",icons:{paginationSwitchDown:"glyphicon-collapse-down icon-chevron-down",paginationSwitchUp:"glyphicon-collapse-up icon-chevron-up",refresh:"glyphicon-refresh icon-refresh",toggleOff:"glyphicon-list-alt icon-list-alt",toggleOn:"glyphicon-list-alt icon-list-alt",columns:"glyphicon-th icon-th",detailOpen:"glyphicon-plus icon-plus",detailClose:"glyphicon-minus icon-minus",fullscreen:"glyphicon-fullscreen",search:"glyphicon-search",clearSearch:"glyphicon-trash"},classes:{buttonsPrefix:"btn",buttons:"default",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"pull",inputGroup:"input-group",inputPrefix:"input-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],toolbarDropdownItem:'<li class="dropdown-item-marker" role="menuitem"><label>%s</label></li>',toolbarDropdownSeparator:'<li class="divider"></li>',pageDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],pageDropdownItem:'<li role="menuitem" class="%s"><a href="#">%s</a></li>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<span class="input-group-btn">%s</span></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},4:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},5:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}}}[ia],sa={height:void 0,classes:"table table-bordered table-hover",buttons:{},theadClasses:"",headerStyle:function(t){return{}},rowStyle:function(t,e){return{}},rowAttributes:function(t,e){return{}},undefinedText:"-",locale:void 0,virtualScroll:!1,virtualScrollItemHeight:void 0,sortable:!0,sortClass:void 0,silentSort:!0,sortName:void 0,sortOrder:void 0,sortReset:!1,sortStable:!1,rememberOrder:!1,serverSort:!0,customSort:void 0,columns:[[]],data:[],url:void 0,method:"get",cache:!0,contentType:"application/json",dataType:"json",ajax:void 0,ajaxOptions:{},queryParams:function(t){return t},queryParamsType:"limit",responseHandler:function(t){return t},totalField:"total",totalNotFilteredField:"totalNotFiltered",dataField:"rows",footerField:"footer",pagination:!1,paginationParts:["pageInfo","pageSize","pageList"],showExtendedPagination:!1,paginationLoop:!0,sidePagination:"client",totalRows:0,totalNotFiltered:0,pageNumber:1,pageSize:10,pageList:[10,25,50,100],paginationHAlign:"right",paginationVAlign:"bottom",paginationDetailHAlign:"left",paginationPreText:"&lsaquo;",paginationNextText:"&rsaquo;",paginationSuccessivelySize:5,paginationPagesBySide:1,paginationUseIntermediate:!1,search:!1,searchHighlight:!1,searchOnEnterKey:!1,strictSearch:!1,searchSelector:!1,visibleSearch:!1,showButtonIcons:!0,showButtonText:!1,showSearchButton:!1,showSearchClearButton:!1,trimOnSearch:!0,searchAlign:"right",searchTimeOut:500,searchText:"",customSearch:void 0,showHeader:!0,showFooter:!1,footerStyle:function(t){return{}},searchAccentNeutralise:!1,showColumns:!1,showColumnsToggleAll:!1,showColumnsSearch:!1,minimumCountColumns:1,showPaginationSwitch:!1,showRefresh:!1,showToggle:!1,showFullscreen:!1,smartDisplay:!0,escape:!1,filterOptions:{filterAlgorithm:"and"},idField:void 0,selectItemName:"btSelectItem",clickToSelect:!1,ignoreClickToSelectOn:function(t){var e=t.tagName;return["A","BUTTON"].includes(e)},singleSelect:!1,checkboxHeader:!0,maintainMetaData:!1,multipleSelectRow:!1,uniqueId:void 0,cardView:!1,detailView:!1,detailViewIcon:!0,detailViewByClick:!1,detailViewAlign:"left",detailFormatter:function(t,e){return""},detailFilter:function(t,e){return!0},toolbar:void 0,toolbarAlign:"left",buttonsToolbar:void 0,buttonsAlign:"right",buttonsOrder:["paginationSwitch","refresh","toggle","fullscreen","columns"],buttonsPrefix:aa.classes.buttonsPrefix,buttonsClass:aa.classes.buttons,icons:aa.icons,iconSize:void 0,iconsPrefix:aa.iconsPrefix,loadingFontSize:"auto",loadingTemplate:function(t){return'<span class="loading-wrap">\n      <span class="loading-text">'.concat(t,'</span>\n      <span class="animation-wrap"><span class="animation-dot"></span></span>\n      </span>\n    ')},onAll:function(t,e){return!1},onClickCell:function(t,e,i,n){return!1},onDblClickCell:function(t,e,i,n){return!1},onClickRow:function(t,e){return!1},onDblClickRow:function(t,e){return!1},onSort:function(t,e){return!1},onCheck:function(t){return!1},onUncheck:function(t){return!1},onCheckAll:function(t){return!1},onUncheckAll:function(t){return!1},onCheckSome:function(t){return!1},onUncheckSome:function(t){return!1},onLoadSuccess:function(t){return!1},onLoadError:function(t){return!1},onColumnSwitch:function(t,e){return!1},onPageChange:function(t,e){return!1},onSearch:function(t){return!1},onToggle:function(t){return!1},onPreBody:function(t){return!1},onPostBody:function(){return!1},onPostHeader:function(){return!1},onPostFooter:function(){return!1},onExpandRow:function(t,e,i){return!1},onCollapseRow:function(t,e){return!1},onRefreshOptions:function(t){return!1},onRefresh:function(t){return!1},onResetView:function(){return!1},onScrollBody:function(){return!1}},ra={formatLoadingMessage:function(){return"Loading, please wait"},formatRecordsPerPage:function(t){return"".concat(t," rows per page")},formatShowingRows:function(t,e,i,n){return void 0!==n&&n>0&&n>i?"Showing ".concat(t," to ").concat(e," of ").concat(i," rows (filtered from ").concat(n," total rows)"):"Showing ".concat(t," to ").concat(e," of ").concat(i," rows")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatSearch:function(){return"Search"},formatClearSearch:function(){return"Clear Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"}},la={field:void 0,title:void 0,titleTooltip:void 0,class:void 0,width:void 0,widthUnit:"px",rowspan:void 0,colspan:void 0,align:void 0,halign:void 0,falign:void 0,valign:void 0,cellStyle:void 0,radio:!1,checkbox:!1,checkboxEnabled:!0,clickToSelect:!0,showSelectTitle:!1,sortable:!1,sortName:void 0,order:"asc",sorter:void 0,visible:!0,switchable:!0,cardVisible:!0,searchable:!0,formatter:void 0,footerFormatter:void 0,detailFormatter:void 0,searchFormatter:!0,searchHighlightFormatter:!1,escape:!1,events:void 0};Object.assign(sa,ra);var ca={VERSION:"1.18.1",THEME:"bootstrap".concat(ia),CONSTANTS:aa,DEFAULTS:sa,COLUMN_DEFAULTS:la,METHODS:["getOptions","refreshOptions","getData","getSelections","load","append","prepend","remove","removeAll","insertRow","updateRow","getRowByUniqueId","updateByUniqueId","removeByUniqueId","updateCell","updateCellByUniqueId","showRow","hideRow","getHiddenRows","showColumn","hideColumn","getVisibleColumns","getHiddenColumns","showAllColumns","hideAllColumns","mergeCells","checkAll","uncheckAll","checkInvert","check","uncheck","checkBy","uncheckBy","refresh","destroy","resetView","showLoading","hideLoading","togglePagination","toggleFullscreen","toggleView","resetSearch","filterBy","scrollTo","getScrollPosition","selectPage","prevPage","nextPage","toggleDetailView","expandRow","collapseRow","expandRowByUniqueId","collapseRowByUniqueId","expandAllRows","collapseAllRows","updateColumnTitle","updateFormatText"],EVENTS:{"all.bs.table":"onAll","click-row.bs.table":"onClickRow","dbl-click-row.bs.table":"onDblClickRow","click-cell.bs.table":"onClickCell","dbl-click-cell.bs.table":"onDblClickCell","sort.bs.table":"onSort","check.bs.table":"onCheck","uncheck.bs.table":"onUncheck","check-all.bs.table":"onCheckAll","uncheck-all.bs.table":"onUncheckAll","check-some.bs.table":"onCheckSome","uncheck-some.bs.table":"onUncheckSome","load-success.bs.table":"onLoadSuccess","load-error.bs.table":"onLoadError","column-switch.bs.table":"onColumnSwitch","page-change.bs.table":"onPageChange","search.bs.table":"onSearch","toggle.bs.table":"onToggle","pre-body.bs.table":"onPreBody","post-body.bs.table":"onPostBody","post-header.bs.table":"onPostHeader","post-footer.bs.table":"onPostFooter","expand-row.bs.table":"onExpandRow","collapse-row.bs.table":"onCollapseRow","refresh-options.bs.table":"onRefreshOptions","reset-view.bs.table":"onResetView","refresh.bs.table":"onRefresh","scroll-body.bs.table":"onScrollBody"},LOCALES:{en:ra,"en-US":ra}},ha=r((function(){me(1)}));Nt({target:"Object",stat:!0,forced:ha},{keys:function(t){return me(Dt(t))}});var ua,da=A.f,fa="".endsWith,pa=Math.min,ga=uo("endsWith"),va=!(ga||(ua=da(String.prototype,"endsWith"),!ua||ua.writable));Nt({target:"String",proto:!0,forced:!va&&!ga},{endsWith:function(t){var e=String(b(this));co(t);var i=arguments.length>1?arguments[1]:void 0,n=ft(e.length),o=void 0===i?n:pa(ft(i),n),a=String(t);return fa?fa.call(e,a,o):e.slice(o-a.length,o)===a}});var ba=A.f,ma="".startsWith,ya=Math.min,wa=uo("startsWith"),Sa=!wa&&!!function(){var t=ba(String.prototype,"startsWith");return t&&!t.writable}();Nt({target:"String",proto:!0,forced:!Sa&&!wa},{startsWith:function(t){var e=String(b(this));co(t);var i=ft(ya(arguments.length>1?arguments[1]:void 0,e.length)),n=String(t);return ma?ma.call(e,n,i):e.slice(i,i+n.length)===n}});var xa={getSearchInput:function(t){return"string"==typeof t.options.searchSelector?i.default(t.options.searchSelector):t.$toolbar.find(".search input")},sprintf:function(t){for(var e=arguments.length,i=new Array(e>1?e-1:0),n=1;n<e;n++)i[n-1]=arguments[n];var o=!0,a=0,s=t.replace(/%s/g,(function(){var t=i[a++];return void 0===t?(o=!1,""):t}));return o?s:""},isObject:function(t){return t instanceof Object&&!Array.isArray(t)},isEmptyObject:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return 0===Object.entries(t).length&&t.constructor===Object},isNumeric:function(t){return!isNaN(parseFloat(t))&&isFinite(t)},getFieldTitle:function(t,e){var i,n=ea(t);try{for(n.s();!(i=n.n()).done;){var o=i.value;if(o.field===e)return o.title}}catch(t){n.e(t)}finally{n.f()}return""},setFieldIndex:function(t){var e,i=0,n=[],o=ea(t[0]);try{for(o.s();!(e=o.n()).done;){i+=e.value.colspan||1}}catch(t){o.e(t)}finally{o.f()}for(var a=0;a<t.length;a++){n[a]=[];for(var s=0;s<i;s++)n[a][s]=!1}for(var r=0;r<t.length;r++){var l,c=ea(t[r]);try{for(c.s();!(l=c.n()).done;){var h=l.value,u=h.rowspan||1,d=h.colspan||1,f=n[r].indexOf(!1);h.colspanIndex=f,1===d?(h.fieldIndex=f,void 0===h.field&&(h.field=f)):h.colspanGroup=h.colspan;for(var p=0;p<u;p++)for(var g=0;g<d;g++)n[r+p][f+g]=!0}}catch(t){c.e(t)}finally{c.f()}}},normalizeAccent:function(t){return"string"!=typeof t?t:t.normalize("NFD").replace(/[\u0300-\u036f]/g,"")},updateFieldGroup:function(t){var e,i,n=(e=[]).concat.apply(e,Qo(t)),o=ea(t);try{for(o.s();!(i=o.n()).done;){var a,s=ea(i.value);try{for(s.s();!(a=s.n()).done;){var r=a.value;if(r.colspanGroup>1){for(var l=0,c=function(t){n.find((function(e){return e.fieldIndex===t})).visible&&l++},h=r.colspanIndex;h<r.colspanIndex+r.colspanGroup;h++)c(h);r.colspan=l,r.visible=l>0}}}catch(t){s.e(t)}finally{s.f()}}}catch(t){o.e(t)}finally{o.f()}},getScrollBarWidth:function(){if(void 0===this.cachedWidth){var t=i.default("<div/>").addClass("fixed-table-scroll-inner"),e=i.default("<div/>").addClass("fixed-table-scroll-outer");e.append(t),i.default("body").append(e);var n=t[0].offsetWidth;e.css("overflow","scroll");var o=t[0].offsetWidth;n===o&&(o=e[0].clientWidth),e.remove(),this.cachedWidth=n-o}return this.cachedWidth},calculateObjectValue:function(t,e,i,n){var o=e;if("string"==typeof e){var a=e.split(".");if(a.length>1){o=window;var s,r=ea(a);try{for(r.s();!(s=r.n()).done;){o=o[s.value]}}catch(t){r.e(t)}finally{r.f()}}else o=window[e]}return null!==o&&"object"===Go(o)?o:"function"==typeof o?o.apply(t,i||[]):!o&&"string"==typeof e&&this.sprintf.apply(this,[e].concat(Qo(i)))?this.sprintf.apply(this,[e].concat(Qo(i))):n},compareObjects:function(t,e,i){var n=Object.keys(t),o=Object.keys(e);if(i&&n.length!==o.length)return!1;for(var a=0,s=n;a<s.length;a++){var r=s[a];if(o.includes(r)&&t[r]!==e[r])return!1}return!0},escapeHTML:function(t){return"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#039;").replace(/`/g,"&#x60;"):t},unescapeHTML:function(t){return"string"==typeof t?t.replace(/&amp;/g,"&").replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&#039;/g,"'").replace(/&#x60;/g,"`"):t},getRealDataAttr:function(t){for(var e=0,i=Object.entries(t);e<i.length;e++){var n=Jo(i[e],2),o=n[0],a=n[1],s=o.split(/(?=[A-Z])/).join("-").toLowerCase();s!==o&&(t[s]=a,delete t[o])}return t},getItemField:function(t,e,i){var n=t;if("string"!=typeof e||t.hasOwnProperty(e))return i?this.escapeHTML(t[e]):t[e];var o,a=ea(e.split("."));try{for(a.s();!(o=a.n()).done;){var s=o.value;n=n&&n[s]}}catch(t){a.e(t)}finally{a.f()}return i?this.escapeHTML(n):n},isIEBrowser:function(){return navigator.userAgent.includes("MSIE ")||/Trident.*rv:11\./.test(navigator.userAgent)},findIndex:function(t,e){var i,n=ea(t);try{for(n.s();!(i=n.n()).done;){var o=i.value;if(JSON.stringify(o)===JSON.stringify(e))return t.indexOf(o)}}catch(t){n.e(t)}finally{n.f()}return-1},trToData:function(t,e){var n=this,o=[],a=[];return e.each((function(e,s){var r=i.default(s),l={};l._id=r.attr("id"),l._class=r.attr("class"),l._data=n.getRealDataAttr(r.data()),l._style=r.attr("style"),r.find(">td,>th").each((function(o,s){for(var r=i.default(s),c=+r.attr("colspan")||1,h=+r.attr("rowspan")||1,u=o;a[e]&&a[e][u];u++);for(var d=u;d<u+c;d++)for(var f=e;f<e+h;f++)a[f]||(a[f]=[]),a[f][d]=!0;var p=t[u].field;l[p]=r.html().trim(),l["_".concat(p,"_id")]=r.attr("id"),l["_".concat(p,"_class")]=r.attr("class"),l["_".concat(p,"_rowspan")]=r.attr("rowspan"),l["_".concat(p,"_colspan")]=r.attr("colspan"),l["_".concat(p,"_title")]=r.attr("title"),l["_".concat(p,"_data")]=n.getRealDataAttr(r.data()),l["_".concat(p,"_style")]=r.attr("style")})),o.push(l)})),o},sort:function(t,e,i,n,o,a){return null==t&&(t=""),null==e&&(e=""),n&&t===e&&(t=o,e=a),this.isNumeric(t)&&this.isNumeric(e)?(t=parseFloat(t))<(e=parseFloat(e))?-1*i:t>e?i:0:t===e?0:("string"!=typeof t&&(t=t.toString()),-1===t.localeCompare(e)?-1*i:i)},getEventName:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return e=e||"".concat(+new Date).concat(~~(1e6*Math.random())),"".concat(t,"-").concat(e)},hasDetailViewIcon:function(t){return t.detailView&&t.detailViewIcon&&!t.cardView},getDetailViewIndexOffset:function(t){return this.hasDetailViewIcon(t)&&"right"!==t.detailViewAlign?1:0},checkAutoMergeCells:function(t){var e,i=ea(t);try{for(i.s();!(e=i.n()).done;)for(var n=e.value,o=0,a=Object.keys(n);o<a.length;o++){var s=a[o];if(s.startsWith("_")&&(s.endsWith("_rowspan")||s.endsWith("_colspan")))return!0}}catch(t){i.e(t)}finally{i.f()}return!1},deepCopy:function(t){return void 0===t?t:i.default.extend(!0,Array.isArray(t)?[]:{},t)}},ka=function(){function t(e){var i=this;Ko(this,t),this.rows=e.rows,this.scrollEl=e.scrollEl,this.contentEl=e.contentEl,this.callback=e.callback,this.itemHeight=e.itemHeight,this.cache={},this.scrollTop=this.scrollEl.scrollTop,this.initDOM(this.rows,e.fixedScroll),this.scrollEl.scrollTop=this.scrollTop,this.lastCluster=0;var n=function(){i.lastCluster!==(i.lastCluster=i.getNum())&&(i.initDOM(i.rows),i.callback())};this.scrollEl.addEventListener("scroll",n,!1),this.destroy=function(){i.contentEl.innerHtml="",i.scrollEl.removeEventListener("scroll",n,!1)}}return Xo(t,[{key:"initDOM",value:function(t,e){void 0===this.clusterHeight&&(this.cache.scrollTop=this.scrollEl.scrollTop,this.cache.data=this.contentEl.innerHTML=t[0]+t[0]+t[0],this.getRowsHeight(t));var i=this.initData(t,this.getNum(e)),n=i.rows.join(""),o=this.checkChanges("data",n),a=this.checkChanges("top",i.topOffset),s=this.checkChanges("bottom",i.bottomOffset),r=[];o&&a?(i.topOffset&&r.push(this.getExtra("top",i.topOffset)),r.push(n),i.bottomOffset&&r.push(this.getExtra("bottom",i.bottomOffset)),this.contentEl.innerHTML=r.join(""),e&&(this.contentEl.scrollTop=this.cache.scrollTop)):s&&(this.contentEl.lastChild.style.height="".concat(i.bottomOffset,"px"))}},{key:"getRowsHeight",value:function(){if(void 0===this.itemHeight){var t=this.contentEl.children,e=t[Math.floor(t.length/2)];this.itemHeight=e.offsetHeight}this.blockHeight=50*this.itemHeight,this.clusterRows=200,this.clusterHeight=4*this.blockHeight}},{key:"getNum",value:function(t){return this.scrollTop=t?this.cache.scrollTop:this.scrollEl.scrollTop,Math.floor(this.scrollTop/(this.clusterHeight-this.blockHeight))||0}},{key:"initData",value:function(t,e){if(t.length<50)return{topOffset:0,bottomOffset:0,rowsAbove:0,rows:t};var i=Math.max((this.clusterRows-50)*e,0),n=i+this.clusterRows,o=Math.max(i*this.itemHeight,0),a=Math.max((t.length-n)*this.itemHeight,0),s=[],r=i;o<1&&r++;for(var l=i;l<n;l++)t[l]&&s.push(t[l]);return{topOffset:o,bottomOffset:a,rowsAbove:r,rows:s}}},{key:"checkChanges",value:function(t,e){var i=e!==this.cache[t];return this.cache[t]=e,i}},{key:"getExtra",value:function(t,e){var i=document.createElement("tr");return i.className="virtual-scroll-".concat(t),e&&(i.style.height="".concat(e,"px")),i.outerHTML}}]),t}(),Oa=function(){function t(e,n){Ko(this,t),this.options=n,this.$el=i.default(e),this.$el_=this.$el.clone(),this.timeoutId_=0,this.timeoutFooter_=0}return Xo(t,[{key:"init",value:function(){this.initConstants(),this.initLocale(),this.initContainer(),this.initTable(),this.initHeader(),this.initData(),this.initHiddenRows(),this.initToolbar(),this.initPagination(),this.initBody(),this.initSearchText(),this.initServer()}},{key:"initConstants",value:function(){var t=this.options;this.constants=ca.CONSTANTS,this.constants.theme=i.default.fn.bootstrapTable.theme;var e=t.buttonsPrefix?"".concat(t.buttonsPrefix,"-"):"";this.constants.buttonsClass=[t.buttonsPrefix,e+t.buttonsClass,xa.sprintf("".concat(e,"%s"),t.iconSize)].join(" ").trim(),this.buttons=xa.calculateObjectValue(this,t.buttons,[],{}),"object"!==Go(this.buttons)&&(this.buttons={}),"string"==typeof t.icons&&(t.icons=xa.calculateObjectValue(null,t.icons))}},{key:"initLocale",value:function(){if(this.options.locale){var t=i.default.fn.bootstrapTable.locales,e=this.options.locale.split(/-|_/);e[0]=e[0].toLowerCase(),e[1]&&(e[1]=e[1].toUpperCase()),t[this.options.locale]?i.default.extend(this.options,t[this.options.locale]):t[e.join("-")]?i.default.extend(this.options,t[e.join("-")]):t[e[0]]&&i.default.extend(this.options,t[e[0]])}}},{key:"initContainer",value:function(){var t=["top","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination clearfix"></div>':"",e=["bottom","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination"></div>':"",n=xa.calculateObjectValue(this.options,this.options.loadingTemplate,[this.options.formatLoadingMessage()]);this.$container=i.default('\n      <div class="bootstrap-table '.concat(this.constants.theme,'">\n      <div class="fixed-table-toolbar"></div>\n      ').concat(t,'\n      <div class="fixed-table-container">\n      <div class="fixed-table-header"><table></table></div>\n      <div class="fixed-table-body">\n      <div class="fixed-table-loading">\n      ').concat(n,'\n      </div>\n      </div>\n      <div class="fixed-table-footer"><table><thead><tr></tr></thead></table></div>\n      </div>\n      ').concat(e,"\n      </div>\n    ")),this.$container.insertAfter(this.$el),this.$tableContainer=this.$container.find(".fixed-table-container"),this.$tableHeader=this.$container.find(".fixed-table-header"),this.$tableBody=this.$container.find(".fixed-table-body"),this.$tableLoading=this.$container.find(".fixed-table-loading"),this.$tableFooter=this.$el.find("tfoot"),this.options.buttonsToolbar?this.$toolbar=i.default("body").find(this.options.buttonsToolbar):this.$toolbar=this.$container.find(".fixed-table-toolbar"),this.$pagination=this.$container.find(".fixed-table-pagination"),this.$tableBody.append(this.$el),this.$container.after('<div class="clearfix"></div>'),this.$el.addClass(this.options.classes),this.$tableLoading.addClass(this.options.classes),this.options.height&&(this.$tableContainer.addClass("fixed-height"),this.options.showFooter&&this.$tableContainer.addClass("has-footer"),this.options.classes.split(" ").includes("table-bordered")&&(this.$tableBody.append('<div class="fixed-table-border"></div>'),this.$tableBorder=this.$tableBody.find(".fixed-table-border"),this.$tableLoading.addClass("fixed-table-border")),this.$tableFooter=this.$container.find(".fixed-table-footer"))}},{key:"initTable",value:function(){var e=this,n=[];if(this.$header=this.$el.find(">thead"),this.$header.length?this.options.theadClasses&&this.$header.addClass(this.options.theadClasses):this.$header=i.default('<thead class="'.concat(this.options.theadClasses,'"></thead>')).appendTo(this.$el),this._headerTrClasses=[],this._headerTrStyles=[],this.$header.find("tr").each((function(t,o){var a=i.default(o),s=[];a.find("th").each((function(t,e){var n=i.default(e);void 0!==n.data("field")&&n.data("field","".concat(n.data("field"))),s.push(i.default.extend({},{title:n.html(),class:n.attr("class"),titleTooltip:n.attr("title"),rowspan:n.attr("rowspan")?+n.attr("rowspan"):void 0,colspan:n.attr("colspan")?+n.attr("colspan"):void 0},n.data()))})),n.push(s),a.attr("class")&&e._headerTrClasses.push(a.attr("class")),a.attr("style")&&e._headerTrStyles.push(a.attr("style"))})),Array.isArray(this.options.columns[0])||(this.options.columns=[this.options.columns]),this.options.columns=i.default.extend(!0,[],n,this.options.columns),this.columns=[],this.fieldsColumnsIndex=[],xa.setFieldIndex(this.options.columns),this.options.columns.forEach((function(n,o){n.forEach((function(n,a){var s=i.default.extend({},t.COLUMN_DEFAULTS,n);void 0!==s.fieldIndex&&(e.columns[s.fieldIndex]=s,e.fieldsColumnsIndex[s.field]=s.fieldIndex),e.options.columns[o][a]=s}))})),!this.options.data.length){var o=xa.trToData(this.columns,this.$el.find(">tbody>tr"));o.length&&(this.options.data=o,this.fromHtml=!0)}this.options.pagination&&"server"!==this.options.sidePagination||(this.footerData=xa.trToData(this.columns,this.$el.find(">tfoot>tr"))),this.footerData&&this.$el.find("tfoot").html("<tr></tr>"),!this.options.showFooter||this.options.cardView?this.$tableFooter.hide():this.$tableFooter.show()}},{key:"initHeader",value:function(){var t=this,e={},n=[];this.header={fields:[],styles:[],classes:[],formatters:[],detailFormatters:[],events:[],sorters:[],sortNames:[],cellStyles:[],searchables:[]},xa.updateFieldGroup(this.options.columns),this.options.columns.forEach((function(i,o){n.push("<tr".concat(xa.sprintf(' class="%s"',t._headerTrClasses[o])," ").concat(xa.sprintf(' style="%s"',t._headerTrStyles[o]),">"));var a="";0===o&&xa.hasDetailViewIcon(t.options)&&(a='<th class="detail" rowspan="'.concat(t.options.columns.length,'">\n          <div class="fht-cell"></div>\n          </th>')),a&&"right"!==t.options.detailViewAlign&&n.push(a),i.forEach((function(i,a){var s=xa.sprintf(' class="%s"',i.class),r=i.widthUnit,l=parseFloat(i.width),c=xa.sprintf("text-align: %s; ",i.halign?i.halign:i.align),h=xa.sprintf("text-align: %s; ",i.align),u=xa.sprintf("vertical-align: %s; ",i.valign);if(u+=xa.sprintf("width: %s; ",!i.checkbox&&!i.radio||l?l?l+r:void 0:i.showSelectTitle?void 0:"36px"),void 0!==i.fieldIndex||i.visible){var d=xa.calculateObjectValue(null,t.options.headerStyle,[i]),f=[],p="";if(d&&d.css)for(var g=0,v=Object.entries(d.css);g<v.length;g++){var b=Jo(v[g],2),m=b[0],y=b[1];f.push("".concat(m,": ").concat(y))}if(d&&d.classes&&(p=xa.sprintf(' class="%s"',i.class?[i.class,d.classes].join(" "):d.classes)),void 0!==i.fieldIndex){if(t.header.fields[i.fieldIndex]=i.field,t.header.styles[i.fieldIndex]=h+u,t.header.classes[i.fieldIndex]=s,t.header.formatters[i.fieldIndex]=i.formatter,t.header.detailFormatters[i.fieldIndex]=i.detailFormatter,t.header.events[i.fieldIndex]=i.events,t.header.sorters[i.fieldIndex]=i.sorter,t.header.sortNames[i.fieldIndex]=i.sortName,t.header.cellStyles[i.fieldIndex]=i.cellStyle,t.header.searchables[i.fieldIndex]=i.searchable,!i.visible)return;if(t.options.cardView&&!i.cardVisible)return;e[i.field]=i}n.push("<th".concat(xa.sprintf(' title="%s"',i.titleTooltip)),i.checkbox||i.radio?xa.sprintf(' class="bs-checkbox %s"',i.class||""):p||s,xa.sprintf(' style="%s"',c+u+f.join("; ")),xa.sprintf(' rowspan="%s"',i.rowspan),xa.sprintf(' colspan="%s"',i.colspan),xa.sprintf(' data-field="%s"',i.field),0===a&&o>0?" data-not-first-th":"",">"),n.push(xa.sprintf('<div class="th-inner %s">',t.options.sortable&&i.sortable?"sortable both":""));var w=t.options.escape?xa.escapeHTML(i.title):i.title,S=w;i.checkbox&&(w="",!t.options.singleSelect&&t.options.checkboxHeader&&(w='<label><input name="btSelectAll" type="checkbox" /><span></span></label>'),t.header.stateField=i.field),i.radio&&(w="",t.header.stateField=i.field),!w&&i.showSelectTitle&&(w+=S),n.push(w),n.push("</div>"),n.push('<div class="fht-cell"></div>'),n.push("</div>"),n.push("</th>")}})),a&&"right"===t.options.detailViewAlign&&n.push(a),n.push("</tr>")})),this.$header.html(n.join("")),this.$header.find("th[data-field]").each((function(t,n){i.default(n).data(e[i.default(n).data("field")])})),this.$container.off("click",".th-inner").on("click",".th-inner",(function(e){var n=i.default(e.currentTarget);if(t.options.detailView&&!n.parent().hasClass("bs-checkbox")&&n.closest(".bootstrap-table")[0]!==t.$container[0])return!1;t.options.sortable&&n.parent().data().sortable&&t.onSort(e)})),this.$header.children().children().off("keypress").on("keypress",(function(e){t.options.sortable&&i.default(e.currentTarget).data().sortable&&(13===(e.keyCode||e.which)&&t.onSort(e))}));var o=xa.getEventName("resize.bootstrap-table",this.$el.attr("id"));i.default(window).off(o),!this.options.showHeader||this.options.cardView?(this.$header.hide(),this.$tableHeader.hide(),this.$tableLoading.css("top",0)):(this.$header.show(),this.$tableHeader.show(),this.$tableLoading.css("top",this.$header.outerHeight()+1),this.getCaret(),i.default(window).on(o,(function(){return t.resetView()}))),this.$selectAll=this.$header.find('[name="btSelectAll"]'),this.$selectAll.off("click").on("click",(function(e){e.stopPropagation();var n=i.default(e.currentTarget).prop("checked");t[n?"checkAll":"uncheckAll"](),t.updateSelected()}))}},{key:"initData",value:function(t,e){"append"===e?this.options.data=this.options.data.concat(t):"prepend"===e?this.options.data=[].concat(t).concat(this.options.data):(t=t||xa.deepCopy(this.options.data),this.options.data=Array.isArray(t)?t:t[this.options.dataField]),this.data=Qo(this.options.data),this.options.sortReset&&(this.unsortedData=Qo(this.data)),"server"!==this.options.sidePagination&&this.initSort()}},{key:"initSort",value:function(){var t=this,e=this.options.sortName,i="desc"===this.options.sortOrder?-1:1,n=this.header.fields.indexOf(this.options.sortName),o=0;-1!==n?(this.options.sortStable&&this.data.forEach((function(t,e){t.hasOwnProperty("_position")||(t._position=e)})),this.options.customSort?xa.calculateObjectValue(this.options,this.options.customSort,[this.options.sortName,this.options.sortOrder,this.data]):this.data.sort((function(o,a){t.header.sortNames[n]&&(e=t.header.sortNames[n]);var s=xa.getItemField(o,e,t.options.escape),r=xa.getItemField(a,e,t.options.escape),l=xa.calculateObjectValue(t.header,t.header.sorters[n],[s,r,o,a]);return void 0!==l?t.options.sortStable&&0===l?i*(o._position-a._position):i*l:xa.sort(s,r,i,t.options.sortStable,o._position,a._position)})),void 0!==this.options.sortClass&&(clearTimeout(o),o=setTimeout((function(){t.$el.removeClass(t.options.sortClass);var e=t.$header.find('[data-field="'.concat(t.options.sortName,'"]')).index();t.$el.find("tr td:nth-child(".concat(e+1,")")).addClass(t.options.sortClass)}),250))):this.options.sortReset&&(this.data=Qo(this.unsortedData))}},{key:"onSort",value:function(t){var e=t.type,n=t.currentTarget,o="keypress"===e?i.default(n):i.default(n).parent(),a=this.$header.find("th").eq(o.index());if(this.$header.add(this.$header_).find("span.order").remove(),this.options.sortName===o.data("field")){var s=this.options.sortOrder;void 0===s?this.options.sortOrder="asc":"asc"===s?this.options.sortOrder="desc":"desc"===this.options.sortOrder&&(this.options.sortOrder=this.options.sortReset?void 0:"asc"),void 0===this.options.sortOrder&&(this.options.sortName=void 0)}else this.options.sortName=o.data("field"),this.options.rememberOrder?this.options.sortOrder="asc"===o.data("order")?"desc":"asc":this.options.sortOrder=this.columns[this.fieldsColumnsIndex[o.data("field")]].sortOrder||this.columns[this.fieldsColumnsIndex[o.data("field")]].order;if(this.trigger("sort",this.options.sortName,this.options.sortOrder),o.add(a).data("order",this.options.sortOrder),this.getCaret(),"server"===this.options.sidePagination&&this.options.serverSort)return this.options.pageNumber=1,void this.initServer(this.options.silentSort);this.initSort(),this.initBody()}},{key:"initToolbar",value:function(){var t,e=this,n=this.options,o=[],a=0,s=0;this.$toolbar.find(".bs-bars").children().length&&i.default("body").append(i.default(n.toolbar)),this.$toolbar.html(""),"string"!=typeof n.toolbar&&"object"!==Go(n.toolbar)||i.default(xa.sprintf('<div class="bs-bars %s-%s"></div>',this.constants.classes.pull,n.toolbarAlign)).appendTo(this.$toolbar).append(i.default(n.toolbar)),o=['<div class="'.concat(["columns","columns-".concat(n.buttonsAlign),this.constants.classes.buttonsGroup,"".concat(this.constants.classes.pull,"-").concat(n.buttonsAlign)].join(" "),'">')],"string"==typeof n.buttonsOrder&&(n.buttonsOrder=n.buttonsOrder.replace(/\[|\]| |'/g,"").split(",")),this.buttons=Object.assign(this.buttons,{paginationSwitch:{text:n.pagination?n.formatPaginationSwitchUp():n.formatPaginationSwitchDown(),icon:n.pagination?n.icons.paginationSwitchDown:n.icons.paginationSwitchUp,render:!1,event:this.togglePagination,attributes:{"aria-label":n.formatPaginationSwitch(),title:n.formatPaginationSwitch()}},refresh:{text:n.formatRefresh(),icon:n.icons.refresh,render:!1,event:this.refresh,attributes:{"aria-label":n.formatRefresh(),title:n.formatRefresh()}},toggle:{text:n.formatToggle(),icon:n.icons.toggleOff,render:!1,event:this.toggleView,attributes:{"aria-label":n.formatToggleOn(),title:n.formatToggleOn()}},fullscreen:{text:n.formatFullscreen(),icon:n.icons.fullscreen,render:!1,event:this.toggleFullscreen,attributes:{"aria-label":n.formatFullscreen(),title:n.formatFullscreen()}},columns:{render:!1,html:function(){var t=[];if(t.push('<div class="keep-open '.concat(e.constants.classes.buttonsDropdown,'" title="').concat(n.formatColumns(),'">\n            <button class="').concat(e.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown"\n            aria-label="Columns" title="').concat(n.formatColumns(),'">\n            ').concat(n.showButtonIcons?xa.sprintf(e.constants.html.icon,n.iconsPrefix,n.icons.columns):"","\n            ").concat(n.showButtonText?n.formatColumns():"","\n            ").concat(e.constants.html.dropdownCaret,"\n            </button>\n            ").concat(e.constants.html.toolbarDropdown[0])),n.showColumnsSearch&&(t.push(xa.sprintf(e.constants.html.toolbarDropdownItem,xa.sprintf('<input type="text" class="%s" name="columnsSearch" placeholder="%s" autocomplete="off">',e.constants.classes.input,n.formatSearch()))),t.push(e.constants.html.toolbarDropdownSeparator)),n.showColumnsToggleAll){var i=e.getVisibleColumns().length===e.columns.filter((function(t){return!e.isSelectionColumn(t)})).length;t.push(xa.sprintf(e.constants.html.toolbarDropdownItem,xa.sprintf('<input type="checkbox" class="toggle-all" %s> <span>%s</span>',i?'checked="checked"':"",n.formatColumnsToggleAll()))),t.push(e.constants.html.toolbarDropdownSeparator)}var o=0;return e.columns.forEach((function(t){t.visible&&o++})),e.columns.forEach((function(i,a){if(!e.isSelectionColumn(i)&&(!n.cardView||i.cardVisible)){var r=i.visible?' checked="checked"':"",l=o<=n.minimumCountColumns&&r?' disabled="disabled"':"";i.switchable&&(t.push(xa.sprintf(e.constants.html.toolbarDropdownItem,xa.sprintf('<input type="checkbox" data-field="%s" value="%s"%s%s> <span>%s</span>',i.field,a,r,l,i.title))),s++)}})),t.push(e.constants.html.toolbarDropdown[1],"</div>"),t.join("")}}});for(var r={},l=0,c=Object.entries(this.buttons);l<c.length;l++){var h=Jo(c[l],2),u=h[0],d=h[1],f=void 0;if(d.hasOwnProperty("html"))"function"==typeof d.html?f=d.html():"string"==typeof d.html&&(f=d.html);else{if(f='<button class="'.concat(this.constants.buttonsClass,'" type="button" name="').concat(u,'"'),d.hasOwnProperty("attributes"))for(var p=0,g=Object.entries(d.attributes);p<g.length;p++){var v=Jo(g[p],2),b=v[0],m=v[1];f+=" ".concat(b,'="').concat(m,'"')}f+=">",n.showButtonIcons&&d.hasOwnProperty("icon")&&(f+="".concat(xa.sprintf(this.constants.html.icon,n.iconsPrefix,d.icon)," ")),n.showButtonText&&d.hasOwnProperty("text")&&(f+=d.text),f+="</button>"}r[u]=f;var y="show".concat(u.charAt(0).toUpperCase()).concat(u.substring(1)),w=n[y];!(!d.hasOwnProperty("render")||d.hasOwnProperty("render")&&d.render)||void 0!==w&&!0!==w||(n[y]=!0),n.buttonsOrder.includes(u)||n.buttonsOrder.push(u)}var S,x=ea(n.buttonsOrder);try{for(x.s();!(S=x.n()).done;){var k=S.value;n["show".concat(k.charAt(0).toUpperCase()).concat(k.substring(1))]&&o.push(r[k])}}catch(t){x.e(t)}finally{x.f()}o.push("</div>"),(this.showToolbar||o.length>2)&&this.$toolbar.append(o.join(""));for(var O=0,C=Object.entries(this.buttons);O<C.length;O++){var T=Jo(C[O],2),P=T[0],A=T[1];if(A.hasOwnProperty("event")){if("function"==typeof A.event||"string"==typeof A.event)if("continue"===function(){var t="string"==typeof A.event?window[A.event]:A.event;return e.$toolbar.find('button[name="'.concat(P,'"]')).off("click").on("click",(function(){return t.call(e)})),"continue"}())continue;for(var I=function(){var t=Jo(E[$],2),i=t[0],n=t[1],o="string"==typeof n?window[n]:n;e.$toolbar.find('button[name="'.concat(P,'"]')).off(i).on(i,(function(){return o.call(e)}))},$=0,E=Object.entries(A.event);$<E.length;$++)I()}}if(n.showColumns){var R=(t=this.$toolbar.find(".keep-open")).find('input[type="checkbox"]:not(".toggle-all")'),j=t.find('input[type="checkbox"].toggle-all');if(s<=n.minimumCountColumns&&t.find("input").prop("disabled",!0),t.find("li, label").off("click").on("click",(function(t){t.stopImmediatePropagation()})),R.off("click").on("click",(function(t){var n=t.currentTarget,o=i.default(n);e._toggleColumn(o.val(),o.prop("checked"),!1),e.trigger("column-switch",o.data("field"),o.prop("checked")),j.prop("checked",R.filter(":checked").length===e.columns.filter((function(t){return!e.isSelectionColumn(t)})).length)})),j.off("click").on("click",(function(t){var n=t.currentTarget;e._toggleAllColumns(i.default(n).prop("checked"))})),n.showColumnsSearch){var _=t.find('[name="columnsSearch"]'),N=t.find(".dropdown-item-marker");_.on("keyup paste change",(function(t){var e=t.currentTarget,n=i.default(e).val().toLowerCase();N.show(),R.each((function(t,e){var o=i.default(e).parents(".dropdown-item-marker");o.text().toLowerCase().includes(n)||o.hide()}))}))}}var F=function(t){var i="keyup drop blur mouseup";t.off(i).on(i,(function(t){n.searchOnEnterKey&&13!==t.keyCode||[37,38,39,40].includes(t.keyCode)||(clearTimeout(a),a=setTimeout((function(){e.onSearch({currentTarget:t.currentTarget})}),n.searchTimeOut))}))};if((n.search||this.showSearchClearButton)&&"string"!=typeof n.searchSelector){o=[];var D=xa.sprintf(this.constants.html.searchButton,this.constants.buttonsClass,n.formatSearch(),n.showButtonIcons?xa.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.search):"",n.showButtonText?n.formatSearch():""),V=xa.sprintf(this.constants.html.searchClearButton,this.constants.buttonsClass,n.formatClearSearch(),n.showButtonIcons?xa.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.clearSearch):"",n.showButtonText?n.formatClearSearch():""),B='<input class="'.concat(this.constants.classes.input,"\n        ").concat(xa.sprintf(" %s%s",this.constants.classes.inputPrefix,n.iconSize),'\n        search-input" type="search" placeholder="').concat(n.formatSearch(),'" autocomplete="off">'),L=B;if(n.showSearchButton||n.showSearchClearButton){var H=(n.showSearchButton?D:"")+(n.showSearchClearButton?V:"");L=n.search?xa.sprintf(this.constants.html.inputGroup,B,H):H}o.push(xa.sprintf('\n        <div class="'.concat(this.constants.classes.pull,"-").concat(n.searchAlign," search ").concat(this.constants.classes.inputGroup,'">\n          %s\n        </div>\n      '),L)),this.$toolbar.append(o.join(""));var M=xa.getSearchInput(this);n.showSearchButton?(this.$toolbar.find(".search button[name=search]").off("click").on("click",(function(){clearTimeout(a),a=setTimeout((function(){e.onSearch({currentTarget:M})}),n.searchTimeOut)})),n.searchOnEnterKey&&F(M)):F(M),n.showSearchClearButton&&this.$toolbar.find(".search button[name=clearSearch]").click((function(){e.resetSearch()}))}else if("string"==typeof n.searchSelector){F(xa.getSearchInput(this))}}},{key:"onSearch",value:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},e=t.currentTarget,n=t.firedByInitSearchText,o=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(void 0!==e&&i.default(e).length&&o){var a=i.default(e).val().trim();if(this.options.trimOnSearch&&i.default(e).val()!==a&&i.default(e).val(a),this.searchText===a)return;(e===xa.getSearchInput(this)[0]||i.default(e).hasClass("search-input"))&&(this.searchText=a,this.options.searchText=a)}n||(this.options.pageNumber=1),this.initSearch(),n?"client"===this.options.sidePagination&&this.updatePagination():this.updatePagination(),this.trigger("search",this.searchText)}},{key:"initSearch",value:function(){var t=this;if(this.filterOptions=this.filterOptions||this.options.filterOptions,"server"!==this.options.sidePagination){if(this.options.customSearch)return this.data=xa.calculateObjectValue(this.options,this.options.customSearch,[this.options.data,this.searchText,this.filterColumns]),void(this.options.sortReset&&(this.unsortedData=Qo(this.data)));var e=this.searchText&&(this.fromHtml?xa.escapeHTML(this.searchText):this.searchText).toLowerCase(),i=xa.isEmptyObject(this.filterColumns)?null:this.filterColumns;"function"==typeof this.filterOptions.filterAlgorithm?this.data=this.options.data.filter((function(e){return t.filterOptions.filterAlgorithm.apply(null,[e,i])})):"string"==typeof this.filterOptions.filterAlgorithm&&(this.data=i?this.options.data.filter((function(e){var n=t.filterOptions.filterAlgorithm;if("and"===n){for(var o in i)if(Array.isArray(i[o])&&!i[o].includes(e[o])||!Array.isArray(i[o])&&e[o]!==i[o])return!1}else if("or"===n){var a=!1;for(var s in i)(Array.isArray(i[s])&&i[s].includes(e[s])||!Array.isArray(i[s])&&e[s]===i[s])&&(a=!0);return a}return!0})):Qo(this.options.data));var n=this.getVisibleFields();this.data=e?this.data.filter((function(i,o){for(var a=0;a<t.header.fields.length;a++)if(t.header.searchables[a]&&(!t.options.visibleSearch||-1!==n.indexOf(t.header.fields[a]))){var s=xa.isNumeric(t.header.fields[a])?parseInt(t.header.fields[a],10):t.header.fields[a],r=t.columns[t.fieldsColumnsIndex[s]],l=void 0;if("string"==typeof s){l=i;for(var c=s.split("."),h=0;h<c.length;h++)null!==l[c[h]]&&(l=l[c[h]])}else l=i[s];if(t.options.searchAccentNeutralise&&(l=xa.normalizeAccent(l)),r&&r.searchFormatter&&(l=xa.calculateObjectValue(r,t.header.formatters[a],[l,i,o,r.field],l)),"string"==typeof l||"number"==typeof l)if(t.options.strictSearch){if("".concat(l).toLowerCase()===e)return!0}else{var u=/(?:(<=|=>|=<|>=|>|<)(?:\s+)?(\d+)?|(\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm.exec(e),d=!1;if(u){var f=u[1]||"".concat(u[5],"l"),p=u[2]||u[3],g=parseInt(l,10),v=parseInt(p,10);switch(f){case">":case"<l":d=g>v;break;case"<":case">l":d=g<v;break;case"<=":case"=<":case">=l":case"=>l":d=g<=v;break;case">=":case"=>":case"<=l":case"=<l":d=g>=v}}if(d||"".concat(l).toLowerCase().includes(e))return!0}}return!1})):this.data,this.options.sortReset&&(this.unsortedData=Qo(this.data)),this.initSort()}}},{key:"initPagination",value:function(){var t=this,e=this.options;if(e.pagination){this.$pagination.show();var i,n,o,a,s,r,l,c=[],h=!1,u=this.getData({includeHiddenRows:!1}),d=e.pageList;if("string"==typeof d&&(d=d.replace(/\[|\]| /g,"").toLowerCase().split(",")),d=d.map((function(t){return"string"==typeof t?t.toLowerCase()===e.formatAllRows().toLowerCase()||["all","unlimited"].includes(t.toLowerCase())?e.formatAllRows():+t:t})),this.paginationParts=e.paginationParts,"string"==typeof this.paginationParts&&(this.paginationParts=this.paginationParts.replace(/\[|\]| |'/g,"").split(",")),"server"!==e.sidePagination&&(e.totalRows=u.length),this.totalPages=0,e.totalRows&&(e.pageSize===e.formatAllRows()&&(e.pageSize=e.totalRows,h=!0),this.totalPages=1+~~((e.totalRows-1)/e.pageSize),e.totalPages=this.totalPages),this.totalPages>0&&e.pageNumber>this.totalPages&&(e.pageNumber=this.totalPages),this.pageFrom=(e.pageNumber-1)*e.pageSize+1,this.pageTo=e.pageNumber*e.pageSize,this.pageTo>e.totalRows&&(this.pageTo=e.totalRows),this.options.pagination&&"server"!==this.options.sidePagination&&(this.options.totalNotFiltered=this.options.data.length),this.options.showExtendedPagination||(this.options.totalNotFiltered=void 0),(this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")||this.paginationParts.includes("pageSize"))&&c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationDetailHAlign,' pagination-detail">')),this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")){var f=this.paginationParts.includes("pageInfoShort")?e.formatDetailPagination(e.totalRows):e.formatShowingRows(this.pageFrom,this.pageTo,e.totalRows,e.totalNotFiltered);c.push('<span class="pagination-info">\n      '.concat(f,"\n      </span>"))}if(this.paginationParts.includes("pageSize")){c.push('<span class="page-list">');var p=['<span class="'.concat(this.constants.classes.paginationDropdown,'">\n        <button class="').concat(this.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown">\n        <span class="page-size">\n        ').concat(h?e.formatAllRows():e.pageSize,"\n        </span>\n        ").concat(this.constants.html.dropdownCaret,"\n        </button>\n        ").concat(this.constants.html.pageDropdown[0])];d.forEach((function(i,n){var o;(!e.smartDisplay||0===n||d[n-1]<e.totalRows||i===e.formatAllRows())&&(o=h?i===e.formatAllRows()?t.constants.classes.dropdownActive:"":i===e.pageSize?t.constants.classes.dropdownActive:"",p.push(xa.sprintf(t.constants.html.pageDropdownItem,o,i)))})),p.push("".concat(this.constants.html.pageDropdown[1],"</span>")),c.push(e.formatRecordsPerPage(p.join("")))}if((this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")||this.paginationParts.includes("pageSize"))&&c.push("</span></div>"),this.paginationParts.includes("pageList")){c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationHAlign,' pagination">'),xa.sprintf(this.constants.html.pagination[0],xa.sprintf(" pagination-%s",e.iconSize)),xa.sprintf(this.constants.html.paginationItem," page-pre",e.formatSRPaginationPreText(),e.paginationPreText)),this.totalPages<e.paginationSuccessivelySize?(n=1,o=this.totalPages):o=(n=e.pageNumber-e.paginationPagesBySide)+2*e.paginationPagesBySide,e.pageNumber<e.paginationSuccessivelySize-1&&(o=e.paginationSuccessivelySize),e.paginationSuccessivelySize>this.totalPages-n&&(n=n-(e.paginationSuccessivelySize-(this.totalPages-n))+1),n<1&&(n=1),o>this.totalPages&&(o=this.totalPages);var g=Math.round(e.paginationPagesBySide/2),v=function(i){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return xa.sprintf(t.constants.html.paginationItem,n+(i===e.pageNumber?" ".concat(t.constants.classes.paginationActive):""),e.formatSRPaginationPageText(i),i)};if(n>1){var b=e.paginationPagesBySide;for(b>=n&&(b=n-1),i=1;i<=b;i++)c.push(v(i));n-1===b+1?(i=n-1,c.push(v(i))):n-1>b&&(n-2*e.paginationPagesBySide>e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((n-g)/2+g),c.push(v(i," page-intermediate"))):c.push(xa.sprintf(this.constants.html.paginationItem," page-first-separator disabled","","...")))}for(i=n;i<=o;i++)c.push(v(i));if(this.totalPages>o){var m=this.totalPages-(e.paginationPagesBySide-1);for(o>=m&&(m=o+1),o+1===m-1?(i=o+1,c.push(v(i))):m>o+1&&(this.totalPages-o>2*e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((this.totalPages-g-o)/2+o),c.push(v(i," page-intermediate"))):c.push(xa.sprintf(this.constants.html.paginationItem," page-last-separator disabled","","..."))),i=m;i<=this.totalPages;i++)c.push(v(i))}c.push(xa.sprintf(this.constants.html.paginationItem," page-next",e.formatSRPaginationNextText(),e.paginationNextText)),c.push(this.constants.html.pagination[1],"</div>")}this.$pagination.html(c.join(""));var y=["bottom","both"].includes(e.paginationVAlign)?" ".concat(this.constants.classes.dropup):"";this.$pagination.last().find(".page-list > span").addClass(y),e.onlyInfoPagination||(a=this.$pagination.find(".page-list a"),s=this.$pagination.find(".page-pre"),r=this.$pagination.find(".page-next"),l=this.$pagination.find(".page-item").not(".page-next, .page-pre, .page-last-separator, .page-first-separator"),this.totalPages<=1&&this.$pagination.find("div.pagination").hide(),e.smartDisplay&&(d.length<2||e.totalRows<=d[0])&&this.$pagination.find("span.page-list").hide(),this.$pagination[this.getData().length?"show":"hide"](),e.paginationLoop||(1===e.pageNumber&&s.addClass("disabled"),e.pageNumber===this.totalPages&&r.addClass("disabled")),h&&(e.pageSize=e.formatAllRows()),a.off("click").on("click",(function(e){return t.onPageListChange(e)})),s.off("click").on("click",(function(e){return t.onPagePre(e)})),r.off("click").on("click",(function(e){return t.onPageNext(e)})),l.off("click").on("click",(function(e){return t.onPageNumber(e)})))}else this.$pagination.hide()}},{key:"updatePagination",value:function(t){t&&i.default(t.currentTarget).hasClass("disabled")||(this.options.maintainMetaData||this.resetRows(),this.initPagination(),this.trigger("page-change",this.options.pageNumber,this.options.pageSize),"server"===this.options.sidePagination?this.initServer():this.initBody())}},{key:"onPageListChange",value:function(t){t.preventDefault();var e=i.default(t.currentTarget);return e.parent().addClass(this.constants.classes.dropdownActive).siblings().removeClass(this.constants.classes.dropdownActive),this.options.pageSize=e.text().toUpperCase()===this.options.formatAllRows().toUpperCase()?this.options.formatAllRows():+e.text(),this.$toolbar.find(".page-size").text(this.options.pageSize),this.updatePagination(t),!1}},{key:"onPagePre",value:function(t){return t.preventDefault(),this.options.pageNumber-1==0?this.options.pageNumber=this.options.totalPages:this.options.pageNumber--,this.updatePagination(t),!1}},{key:"onPageNext",value:function(t){return t.preventDefault(),this.options.pageNumber+1>this.options.totalPages?this.options.pageNumber=1:this.options.pageNumber++,this.updatePagination(t),!1}},{key:"onPageNumber",value:function(t){if(t.preventDefault(),this.options.pageNumber!==+i.default(t.currentTarget).text())return this.options.pageNumber=+i.default(t.currentTarget).text(),this.updatePagination(t),!1}},{key:"initRow",value:function(t,e,i,n){var o=this,a=[],s={},r=[],l="",c={},h=[];if(!(xa.findIndex(this.hiddenRows,t)>-1)){if((s=xa.calculateObjectValue(this.options,this.options.rowStyle,[t,e],s))&&s.css)for(var u=0,d=Object.entries(s.css);u<d.length;u++){var f=Jo(d[u],2),p=f[0],g=f[1];r.push("".concat(p,": ").concat(g))}if(c=xa.calculateObjectValue(this.options,this.options.rowAttributes,[t,e],c))for(var v=0,b=Object.entries(c);v<b.length;v++){var m=Jo(b[v],2),y=m[0],w=m[1];h.push("".concat(y,'="').concat(xa.escapeHTML(w),'"'))}if(t._data&&!xa.isEmptyObject(t._data))for(var S=0,x=Object.entries(t._data);S<x.length;S++){var k=Jo(x[S],2),O=k[0],C=k[1];if("index"===O)return;l+=" data-".concat(O,"='").concat("object"===Go(C)?JSON.stringify(C):C,"'")}a.push("<tr",xa.sprintf(" %s",h.length?h.join(" "):void 0),xa.sprintf(' id="%s"',Array.isArray(t)?void 0:t._id),xa.sprintf(' class="%s"',s.classes||(Array.isArray(t)?void 0:t._class)),xa.sprintf(' style="%s"',Array.isArray(t)?void 0:t._style),' data-index="'.concat(e,'"'),xa.sprintf(' data-uniqueid="%s"',xa.getItemField(t,this.options.uniqueId,!1)),xa.sprintf(' data-has-detail-view="%s"',this.options.detailView&&xa.calculateObjectValue(null,this.options.detailFilter,[e,t])?"true":void 0),xa.sprintf("%s",l),">"),this.options.cardView&&a.push('<td colspan="'.concat(this.header.fields.length,'"><div class="card-views">'));var T="";return xa.hasDetailViewIcon(this.options)&&(T="<td>",xa.calculateObjectValue(null,this.options.detailFilter,[e,t])&&(T+='\n          <a class="detail-icon" href="#">\n          '.concat(xa.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen),"\n          </a>\n        ")),T+="</td>"),T&&"right"!==this.options.detailViewAlign&&a.push(T),this.header.fields.forEach((function(i,n){var s="",l=xa.getItemField(t,i,o.options.escape),c="",h="",u={},d="",f=o.header.classes[n],p="",g="",v="",b="",m="",y="",w=o.columns[n];if((!o.fromHtml&&!o.autoMergeCells||void 0!==l||w.checkbox||w.radio)&&w.visible&&(!o.options.cardView||w.cardVisible)){if(w.escape&&(l=xa.escapeHTML(l)),r.concat([o.header.styles[n]]).length&&(g+="".concat(r.concat([o.header.styles[n]]).join("; "))),t["_".concat(i,"_style")]&&(g+="".concat(t["_".concat(i,"_style")])),g&&(p=' style="'.concat(g,'"')),t["_".concat(i,"_id")]&&(d=xa.sprintf(' id="%s"',t["_".concat(i,"_id")])),t["_".concat(i,"_class")]&&(f=xa.sprintf(' class="%s"',t["_".concat(i,"_class")])),t["_".concat(i,"_rowspan")]&&(b=xa.sprintf(' rowspan="%s"',t["_".concat(i,"_rowspan")])),t["_".concat(i,"_colspan")]&&(m=xa.sprintf(' colspan="%s"',t["_".concat(i,"_colspan")])),t["_".concat(i,"_title")]&&(y=xa.sprintf(' title="%s"',t["_".concat(i,"_title")])),(u=xa.calculateObjectValue(o.header,o.header.cellStyles[n],[l,t,e,i],u)).classes&&(f=' class="'.concat(u.classes,'"')),u.css){for(var S=[],x=0,k=Object.entries(u.css);x<k.length;x++){var O=Jo(k[x],2),C=O[0],T=O[1];S.push("".concat(C,": ").concat(T))}p=' style="'.concat(S.concat(o.header.styles[n]).join("; "),'"')}if(c=null==(c=xa.calculateObjectValue(w,o.header.formatters[n],[l,t,e,i],l))?o.options.undefinedText:c,""!==o.searchText&&o.options.searchHighlight&&(c=xa.calculateObjectValue(w,w.searchHighlightFormatter,[c,o.searchText],c.toString().replace(new RegExp("(".concat(o.searchText.replace(/[.*+?^${}()|[\]\\]/g,"\\$&"),")"),"gim"),"<mark>$1</mark>"))),t["_".concat(i,"_data")]&&!xa.isEmptyObject(t["_".concat(i,"_data")]))for(var P=0,A=Object.entries(t["_".concat(i,"_data")]);P<A.length;P++){var I=Jo(A[P],2),$=I[0],E=I[1];if("index"===$)return;v+=" data-".concat($,'="').concat(E,'"')}if(w.checkbox||w.radio){h=w.checkbox?"checkbox":h,h=w.radio?"radio":h;var R=w.class||"",j=xa.isObject(c)&&c.hasOwnProperty("checked")?c.checked:(!0===c||l)&&!1!==c,_=!w.checkboxEnabled||c&&c.disabled;s=[o.options.cardView?'<div class="card-view '.concat(R,'">'):'<td class="bs-checkbox '.concat(R,'"').concat(f).concat(p,">"),'<label>\n            <input\n            data-index="'.concat(e,'"\n            name="').concat(o.options.selectItemName,'"\n            type="').concat(h,'"\n            ').concat(xa.sprintf('value="%s"',t[o.options.idField]),"\n            ").concat(xa.sprintf('checked="%s"',j?"checked":void 0),"\n            ").concat(xa.sprintf('disabled="%s"',_?"disabled":void 0)," />\n            <span></span>\n            </label>"),o.header.formatters[n]&&"string"==typeof c?c:"",o.options.cardView?"</div>":"</td>"].join(""),t[o.header.stateField]=!0===c||!!l||c&&c.checked}else if(o.options.cardView){var N=o.options.showHeader?'<span class="card-view-title '.concat(u.classes,'"').concat(p,">").concat(xa.getFieldTitle(o.columns,i),"</span>"):"";s='<div class="card-view">'.concat(N,'<span class="card-view-value ').concat(u.classes,'"').concat(p,">").concat(c,"</span></div>"),o.options.smartDisplay&&""===c&&(s='<div class="card-view"></div>')}else s="<td".concat(d).concat(f).concat(p).concat(v).concat(b).concat(m).concat(y,">").concat(c,"</td>");a.push(s)}})),T&&"right"===this.options.detailViewAlign&&a.push(T),this.options.cardView&&a.push("</div></td>"),a.push("</tr>"),a.join("")}}},{key:"initBody",value:function(t){var e=this,n=this.getData();this.trigger("pre-body",n),this.$body=this.$el.find(">tbody"),this.$body.length||(this.$body=i.default("<tbody></tbody>").appendTo(this.$el)),this.options.pagination&&"server"!==this.options.sidePagination||(this.pageFrom=1,this.pageTo=n.length);var o=[],a=i.default(document.createDocumentFragment()),s=!1;this.autoMergeCells=xa.checkAutoMergeCells(n.slice(this.pageFrom-1,this.pageTo));for(var r=this.pageFrom-1;r<this.pageTo;r++){var l=n[r],c=this.initRow(l,r,n,a);s=s||!!c,c&&"string"==typeof c&&(this.options.virtualScroll?o.push(c):a.append(c))}s?this.options.virtualScroll?(this.virtualScroll&&this.virtualScroll.destroy(),this.virtualScroll=new ka({rows:o,fixedScroll:t,scrollEl:this.$tableBody[0],contentEl:this.$body[0],itemHeight:this.options.virtualScrollItemHeight,callback:function(){e.fitHeader(),e.initBodyEvent()}})):this.$body.html(a):this.$body.html('<tr class="no-records-found">'.concat(xa.sprintf('<td colspan="%s">%s</td>',this.getVisibleFields().length+xa.getDetailViewIndexOffset(this.options),this.options.formatNoMatches()),"</tr>")),t||this.scrollTo(0),this.initBodyEvent(),this.updateSelected(),this.initFooter(),this.resetView(),"server"!==this.options.sidePagination&&(this.options.totalRows=n.length),this.trigger("post-body",n)}},{key:"initBodyEvent",value:function(){var t=this;this.$body.find("> tr[data-index] > td").off("click dblclick").on("click dblclick",(function(e){var n=i.default(e.currentTarget),o=n.parent(),a=i.default(e.target).parents(".card-views").children(),s=i.default(e.target).parents(".card-view"),r=o.data("index"),l=t.data[r],c=t.options.cardView?a.index(s):n[0].cellIndex,h=t.getVisibleFields()[c-xa.getDetailViewIndexOffset(t.options)],u=t.columns[t.fieldsColumnsIndex[h]],d=xa.getItemField(l,h,t.options.escape);if(!n.find(".detail-icon").length){if(t.trigger("click"===e.type?"click-cell":"dbl-click-cell",h,d,l,n),t.trigger("click"===e.type?"click-row":"dbl-click-row",l,o,h),"click"===e.type&&t.options.clickToSelect&&u.clickToSelect&&!xa.calculateObjectValue(t.options,t.options.ignoreClickToSelectOn,[e.target])){var f=o.find(xa.sprintf('[name="%s"]',t.options.selectItemName));f.length&&f[0].click()}"click"===e.type&&t.options.detailViewByClick&&t.toggleDetailView(r,t.header.detailFormatters[t.fieldsColumnsIndex[h]])}})).off("mousedown").on("mousedown",(function(e){t.multipleSelectRowCtrlKey=e.ctrlKey||e.metaKey,t.multipleSelectRowShiftKey=e.shiftKey})),this.$body.find("> tr[data-index] > td > .detail-icon").off("click").on("click",(function(e){return e.preventDefault(),t.toggleDetailView(i.default(e.currentTarget).parent().parent().data("index")),!1})),this.$selectItem=this.$body.find(xa.sprintf('[name="%s"]',this.options.selectItemName)),this.$selectItem.off("click").on("click",(function(e){e.stopImmediatePropagation();var n=i.default(e.currentTarget);t._toggleCheck(n.prop("checked"),n.data("index"))})),this.header.events.forEach((function(e,n){var o=e;if(o){"string"==typeof o&&(o=xa.calculateObjectValue(null,o));var a=t.header.fields[n],s=t.getVisibleFields().indexOf(a);if(-1!==s){s+=xa.getDetailViewIndexOffset(t.options);var r=function(e){if(!o.hasOwnProperty(e))return"continue";var n=o[e];t.$body.find(">tr:not(.no-records-found)").each((function(o,r){var l=i.default(r),c=l.find(t.options.cardView?".card-views>.card-view":">td").eq(s),h=e.indexOf(" "),u=e.substring(0,h),d=e.substring(h+1);c.find(d).off(u).on(u,(function(e){var i=l.data("index"),o=t.data[i],s=o[a];n.apply(t,[e,s,o,i])}))}))};for(var l in o)r(l)}}}))}},{key:"initServer",value:function(t,e,n){var o=this,a={},s=this.header.fields.indexOf(this.options.sortName),r={searchText:this.searchText,sortName:this.options.sortName,sortOrder:this.options.sortOrder};if(this.header.sortNames[s]&&(r.sortName=this.header.sortNames[s]),this.options.pagination&&"server"===this.options.sidePagination&&(r.pageSize=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,r.pageNumber=this.options.pageNumber),n||this.options.url||this.options.ajax){if("limit"===this.options.queryParamsType&&(r={search:r.searchText,sort:r.sortName,order:r.sortOrder},this.options.pagination&&"server"===this.options.sidePagination&&(r.offset=this.options.pageSize===this.options.formatAllRows()?0:this.options.pageSize*(this.options.pageNumber-1),r.limit=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,0===r.limit&&delete r.limit)),this.options.search&&"server"===this.options.sidePagination&&this.columns.filter((function(t){return!t.searchable})).length){r.searchable=[];var l,c=ea(this.columns);try{for(c.s();!(l=c.n()).done;){var h=l.value;!h.checkbox&&h.searchable&&(this.options.visibleSearch&&h.visible||!this.options.visibleSearch)&&r.searchable.push(h.field)}}catch(t){c.e(t)}finally{c.f()}}if(xa.isEmptyObject(this.filterColumnsPartial)||(r.filter=JSON.stringify(this.filterColumnsPartial,null)),i.default.extend(r,e||{}),!1!==(a=xa.calculateObjectValue(this.options,this.options.queryParams,[r],a))){t||this.showLoading();var u=i.default.extend({},xa.calculateObjectValue(null,this.options.ajaxOptions),{type:this.options.method,url:n||this.options.url,data:"application/json"===this.options.contentType&&"post"===this.options.method?JSON.stringify(a):a,cache:this.options.cache,contentType:this.options.contentType,dataType:this.options.dataType,success:function(e,i,n){var a=xa.calculateObjectValue(o.options,o.options.responseHandler,[e,n],e);o.load(a),o.trigger("load-success",a,n&&n.status,n),t||o.hideLoading(),"server"===o.options.sidePagination&&a[o.options.totalField]>0&&!a[o.options.dataField].length&&o.updatePagination()},error:function(e){var i=[];"server"===o.options.sidePagination&&((i={})[o.options.totalField]=0,i[o.options.dataField]=[]),o.load(i),o.trigger("load-error",e&&e.status,e),t||o.$tableLoading.hide()}});return this.options.ajax?xa.calculateObjectValue(this,this.options.ajax,[u],null):(this._xhr&&4!==this._xhr.readyState&&this._xhr.abort(),this._xhr=i.default.ajax(u)),a}}}},{key:"initSearchText",value:function(){if(this.options.search&&(this.searchText="",""!==this.options.searchText)){var t=xa.getSearchInput(this);t.val(this.options.searchText),this.onSearch({currentTarget:t,firedByInitSearchText:!0})}}},{key:"getCaret",value:function(){var t=this;this.$header.find("th").each((function(e,n){i.default(n).find(".sortable").removeClass("desc asc").addClass(i.default(n).data("field")===t.options.sortName?t.options.sortOrder:"both")}))}},{key:"updateSelected",value:function(){var t=this.$selectItem.filter(":enabled").length&&this.$selectItem.filter(":enabled").length===this.$selectItem.filter(":enabled").filter(":checked").length;this.$selectAll.add(this.$selectAll_).prop("checked",t),this.$selectItem.each((function(t,e){i.default(e).closest("tr")[i.default(e).prop("checked")?"addClass":"removeClass"]("selected")}))}},{key:"updateRows",value:function(){var t=this;this.$selectItem.each((function(e,n){t.data[i.default(n).data("index")][t.header.stateField]=i.default(n).prop("checked")}))}},{key:"resetRows",value:function(){var t,e=ea(this.data);try{for(e.s();!(t=e.n()).done;){var i=t.value;this.$selectAll.prop("checked",!1),this.$selectItem.prop("checked",!1),this.header.stateField&&(i[this.header.stateField]=!1)}}catch(t){e.e(t)}finally{e.f()}this.initHiddenRows()}},{key:"trigger",value:function(e){for(var n,o,a="".concat(e,".bs.table"),s=arguments.length,r=new Array(s>1?s-1:0),l=1;l<s;l++)r[l-1]=arguments[l];(n=this.options)[t.EVENTS[a]].apply(n,[].concat(r,[this])),this.$el.trigger(i.default.Event(a,{sender:this}),r),(o=this.options).onAll.apply(o,[a].concat([].concat(r,[this]))),this.$el.trigger(i.default.Event("all.bs.table",{sender:this}),[a,r])}},{key:"resetHeader",value:function(){var t=this;clearTimeout(this.timeoutId_),this.timeoutId_=setTimeout((function(){return t.fitHeader()}),this.$el.is(":hidden")?100:0)}},{key:"fitHeader",value:function(){var t=this;if(this.$el.is(":hidden"))this.timeoutId_=setTimeout((function(){return t.fitHeader()}),100);else{var e=this.$tableBody.get(0),n=e.scrollWidth>e.clientWidth&&e.scrollHeight>e.clientHeight+this.$header.outerHeight()?xa.getScrollBarWidth():0;this.$el.css("margin-top",-this.$header.outerHeight());var o=i.default(":focus");if(o.length>0){var a=o.parents("th");if(a.length>0){var s=a.attr("data-field");if(void 0!==s){var r=this.$header.find("[data-field='".concat(s,"']"));r.length>0&&r.find(":input").addClass("focus-temp")}}}this.$header_=this.$header.clone(!0,!0),this.$selectAll_=this.$header_.find('[name="btSelectAll"]'),this.$tableHeader.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).html("").attr("class",this.$el.attr("class")).append(this.$header_),this.$tableLoading.css("width",this.$el.outerWidth());var l=i.default(".focus-temp:visible:eq(0)");l.length>0&&(l.focus(),this.$header.find(".focus-temp").removeClass("focus-temp")),this.$header.find("th[data-field]").each((function(e,n){t.$header_.find(xa.sprintf('th[data-field="%s"]',i.default(n).data("field"))).data(i.default(n).data())}));for(var c=this.getVisibleFields(),h=this.$header_.find("th"),u=this.$body.find(">tr:not(.no-records-found,.virtual-scroll-top)").eq(0);u.length&&u.find('>td[colspan]:not([colspan="1"])').length;)u=u.next();var d=u.find("> *").length;u.find("> *").each((function(e,n){var o=i.default(n);if(xa.hasDetailViewIcon(t.options)&&(0===e&&"right"!==t.options.detailViewAlign||e===d-1&&"right"===t.options.detailViewAlign)){var a=h.filter(".detail"),s=a.innerWidth()-a.find(".fht-cell").width();a.find(".fht-cell").width(o.innerWidth()-s)}else{var r=e-xa.getDetailViewIndexOffset(t.options),l=t.$header_.find(xa.sprintf('th[data-field="%s"]',c[r]));l.length>1&&(l=i.default(h[o[0].cellIndex]));var u=l.innerWidth()-l.find(".fht-cell").width();l.find(".fht-cell").width(o.innerWidth()-u)}})),this.horizontalScroll(),this.trigger("post-header")}}},{key:"initFooter",value:function(){if(this.options.showFooter&&!this.options.cardView){var t=this.getData(),e=[],i="";xa.hasDetailViewIcon(this.options)&&(i='<th class="detail"><div class="th-inner"></div><div class="fht-cell"></div></th>'),i&&"right"!==this.options.detailViewAlign&&e.push(i);var n,o=ea(this.columns);try{for(o.s();!(n=o.n()).done;){var a,s,r=n.value,l=[],c={},h=xa.sprintf(' class="%s"',r.class);if(!(!r.visible||this.footerData&&this.footerData.length>0&&!(r.field in this.footerData[0]))){if(this.options.cardView&&!r.cardVisible)return;if(a=xa.sprintf("text-align: %s; ",r.falign?r.falign:r.align),s=xa.sprintf("vertical-align: %s; ",r.valign),(c=xa.calculateObjectValue(null,this.options.footerStyle,[r]))&&c.css)for(var u=0,d=Object.entries(c.css);u<d.length;u++){var f=Jo(d[u],2),p=f[0],g=f[1];l.push("".concat(p,": ").concat(g))}c&&c.classes&&(h=xa.sprintf(' class="%s"',r.class?[r.class,c.classes].join(" "):c.classes)),e.push("<th",h,xa.sprintf(' style="%s"',a+s+l.concat().join("; ")));var v=0;this.footerData&&this.footerData.length>0&&(v=this.footerData[0]["_".concat(r.field,"_colspan")]||0),v&&e.push(' colspan="'.concat(v,'" ')),e.push(">"),e.push('<div class="th-inner">');var b="";this.footerData&&this.footerData.length>0&&(b=this.footerData[0][r.field]||""),e.push(xa.calculateObjectValue(r,r.footerFormatter,[t,b],b)),e.push("</div>"),e.push('<div class="fht-cell"></div>'),e.push("</div>"),e.push("</th>")}}}catch(t){o.e(t)}finally{o.f()}i&&"right"===this.options.detailViewAlign&&e.push(i),this.options.height||this.$tableFooter.length||(this.$el.append("<tfoot><tr></tr></tfoot>"),this.$tableFooter=this.$el.find("tfoot")),this.$tableFooter.find("tr").html(e.join("")),this.trigger("post-footer",this.$tableFooter)}}},{key:"fitFooter",value:function(){var t=this;if(this.$el.is(":hidden"))setTimeout((function(){return t.fitFooter()}),100);else{var e=this.$tableBody.get(0),n=e.scrollWidth>e.clientWidth&&e.scrollHeight>e.clientHeight+this.$header.outerHeight()?xa.getScrollBarWidth():0;this.$tableFooter.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).attr("class",this.$el.attr("class"));var o=this.$tableFooter.find("th"),a=this.$body.find(">tr:first-child:not(.no-records-found)");for(o.find(".fht-cell").width("auto");a.length&&a.find('>td[colspan]:not([colspan="1"])').length;)a=a.next();var s=a.find("> *").length;a.find("> *").each((function(e,n){var a=i.default(n);if(xa.hasDetailViewIcon(t.options)&&(0===e&&"left"===t.options.detailViewAlign||e===s-1&&"right"===t.options.detailViewAlign)){var r=o.filter(".detail"),l=r.innerWidth()-r.find(".fht-cell").width();r.find(".fht-cell").width(a.innerWidth()-l)}else{var c=o.eq(e),h=c.innerWidth()-c.find(".fht-cell").width();c.find(".fht-cell").width(a.innerWidth()-h)}})),this.horizontalScroll()}}},{key:"horizontalScroll",value:function(){var t=this;this.$tableBody.off("scroll").on("scroll",(function(){var e=t.$tableBody.scrollLeft();t.options.showHeader&&t.options.height&&t.$tableHeader.scrollLeft(e),t.options.showFooter&&!t.options.cardView&&t.$tableFooter.scrollLeft(e),t.trigger("scroll-body",t.$tableBody)}))}},{key:"getVisibleFields",value:function(){var t,e=[],i=ea(this.header.fields);try{for(i.s();!(t=i.n()).done;){var n=t.value,o=this.columns[this.fieldsColumnsIndex[n]];o&&o.visible&&e.push(n)}}catch(t){i.e(t)}finally{i.f()}return e}},{key:"initHiddenRows",value:function(){this.hiddenRows=[]}},{key:"getOptions",value:function(){var t=i.default.extend({},this.options);return delete t.data,i.default.extend(!0,{},t)}},{key:"refreshOptions",value:function(t){xa.compareObjects(this.options,t,!0)||(this.options=i.default.extend(this.options,t),this.trigger("refresh-options",this.options),this.destroy(),this.init())}},{key:"getData",value:function(t){var e=this,i=this.options.data;if(!this.searchText&&!this.options.customSearch&&void 0===this.options.sortName&&xa.isEmptyObject(this.filterColumns)&&xa.isEmptyObject(this.filterColumnsPartial)||t&&t.unfiltered||(i=this.data),t&&t.useCurrentPage&&(i=i.slice(this.pageFrom-1,this.pageTo)),t&&!t.includeHiddenRows){var n=this.getHiddenRows();i=i.filter((function(t){return-1===xa.findIndex(n,t)}))}return t&&t.formatted&&i.forEach((function(t){for(var i=0,n=Object.entries(t);i<n.length;i++){var o=Jo(n[i],2),a=o[0],s=o[1],r=e.columns[e.fieldsColumnsIndex[a]];if(!r)return;t[a]=xa.calculateObjectValue(r,e.header.formatters[r.fieldIndex],[s,t,t.index,r.field],s)}})),i}},{key:"getSelections",value:function(){var t=this;return(this.options.maintainMetaData?this.options.data:this.data).filter((function(e){return!0===e[t.header.stateField]}))}},{key:"load",value:function(t){var e,i=t;this.options.pagination&&"server"===this.options.sidePagination&&(this.options.totalRows=i[this.options.totalField],this.options.totalNotFiltered=i[this.options.totalNotFilteredField],this.footerData=i[this.options.footerField]?[i[this.options.footerField]]:void 0),e=i.fixedScroll,i=Array.isArray(i)?i:i[this.options.dataField],this.initData(i),this.initSearch(),this.initPagination(),this.initBody(e)}},{key:"append",value:function(t){this.initData(t,"append"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"prepend",value:function(t){this.initData(t,"prepend"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"remove",value:function(t){for(var e=0,i=this.options.data.length-1;i>=0;i--){var n=this.options.data[i];(n.hasOwnProperty(t.field)||"$index"===t.field)&&((!n.hasOwnProperty(t.field)&&"$index"===t.field&&t.values.includes(i)||t.values.includes(n[t.field]))&&(e++,this.options.data.splice(i,1)))}e&&("server"===this.options.sidePagination&&(this.options.totalRows-=e,this.data=Qo(this.options.data)),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}},{key:"removeAll",value:function(){this.options.data.length>0&&(this.options.data.splice(0,this.options.data.length),this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"insertRow",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("row")&&(this.options.data.splice(t.index,0,t.row),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}},{key:"updateRow",value:function(t){var e,n=ea(Array.isArray(t)?t:[t]);try{for(n.s();!(e=n.n()).done;){var o=e.value;o.hasOwnProperty("index")&&o.hasOwnProperty("row")&&(o.hasOwnProperty("replace")&&o.replace?this.options.data[o.index]=o.row:i.default.extend(this.options.data[o.index],o.row))}}catch(t){n.e(t)}finally{n.f()}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"getRowByUniqueId",value:function(t){var e,i,n,o=this.options.uniqueId,a=t,s=null;for(e=this.options.data.length-1;e>=0;e--){if((i=this.options.data[e]).hasOwnProperty(o))n=i[o];else{if(!i._data||!i._data.hasOwnProperty(o))continue;n=i._data[o]}if("string"==typeof n?a=a.toString():"number"==typeof n&&(Number(n)===n&&n%1==0?a=parseInt(a):n===Number(n)&&0!==n&&(a=parseFloat(a))),n===a){s=i;break}}return s}},{key:"updateByUniqueId",value:function(t){var e,n=ea(Array.isArray(t)?t:[t]);try{for(n.s();!(e=n.n()).done;){var o=e.value;if(o.hasOwnProperty("id")&&o.hasOwnProperty("row")){var a=this.options.data.indexOf(this.getRowByUniqueId(o.id));-1!==a&&(o.hasOwnProperty("replace")&&o.replace?this.options.data[a]=o.row:i.default.extend(this.options.data[a],o.row))}}}catch(t){n.e(t)}finally{n.f()}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"removeByUniqueId",value:function(t){var e=this.options.data.length,i=this.getRowByUniqueId(t);i&&this.options.data.splice(this.options.data.indexOf(i),1),e!==this.options.data.length&&("server"===this.options.sidePagination&&(this.options.totalRows-=1,this.data=Qo(this.options.data)),this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"updateCell",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("field")&&t.hasOwnProperty("value")&&(this.data[t.index][t.field]=t.value,!1!==t.reinit&&(this.initSort(),this.initBody(!0)))}},{key:"updateCellByUniqueId",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){var i=t.id,n=t.field,o=t.value,a=e.options.data.indexOf(e.getRowByUniqueId(i));-1!==a&&(e.options.data[a][n]=o)})),!1!==t.reinit&&(this.initSort(),this.initBody(!0))}},{key:"showRow",value:function(t){this._toggleRow(t,!0)}},{key:"hideRow",value:function(t){this._toggleRow(t,!1)}},{key:"_toggleRow",value:function(t,e){var i;if(t.hasOwnProperty("index")?i=this.getData()[t.index]:t.hasOwnProperty("uniqueId")&&(i=this.getRowByUniqueId(t.uniqueId)),i){var n=xa.findIndex(this.hiddenRows,i);e||-1!==n?e&&n>-1&&this.hiddenRows.splice(n,1):this.hiddenRows.push(i),this.initBody(!0),this.initPagination()}}},{key:"getHiddenRows",value:function(t){if(t)return this.initHiddenRows(),this.initBody(!0),void this.initPagination();var e,i=[],n=ea(this.getData());try{for(n.s();!(e=n.n()).done;){var o=e.value;this.hiddenRows.includes(o)&&i.push(o)}}catch(t){n.e(t)}finally{n.f()}return this.hiddenRows=i,i}},{key:"showColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!0,!0)}))}},{key:"hideColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!1,!0)}))}},{key:"_toggleColumn",value:function(t,e,i){if(-1!==t&&this.columns[t].visible!==e&&(this.columns[t].visible=e,this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns)){var n=this.$toolbar.find('.keep-open input:not(".toggle-all")').prop("disabled",!1);i&&n.filter(xa.sprintf('[value="%s"]',t)).prop("checked",e),n.filter(":checked").length<=this.options.minimumCountColumns&&n.filter(":checked").prop("disabled",!0)}}},{key:"getVisibleColumns",value:function(){var t=this;return this.columns.filter((function(e){return e.visible&&!t.isSelectionColumn(e)}))}},{key:"getHiddenColumns",value:function(){return this.columns.filter((function(t){return!t.visible}))}},{key:"isSelectionColumn",value:function(t){return t.radio||t.checkbox}},{key:"showAllColumns",value:function(){this._toggleAllColumns(!0)}},{key:"hideAllColumns",value:function(){this._toggleAllColumns(!1)}},{key:"_toggleAllColumns",value:function(t){var e,n=this,o=ea(this.columns.slice().reverse());try{for(o.s();!(e=o.n()).done;){var a=e.value;if(a.switchable){if(!t&&this.options.showColumns&&this.getVisibleColumns().length===this.options.minimumCountColumns)continue;a.visible=t}}}catch(t){o.e(t)}finally{o.f()}if(this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns){var s=this.$toolbar.find('.keep-open input[type="checkbox"]:not(".toggle-all")').prop("disabled",!1);t?s.prop("checked",t):s.get().reverse().forEach((function(e){s.filter(":checked").length>n.options.minimumCountColumns&&i.default(e).prop("checked",t)})),s.filter(":checked").length<=this.options.minimumCountColumns&&s.filter(":checked").prop("disabled",!0)}}},{key:"mergeCells",value:function(t){var e,i,n=t.index,o=this.getVisibleFields().indexOf(t.field),a=t.rowspan||1,s=t.colspan||1,r=this.$body.find(">tr");o+=xa.getDetailViewIndexOffset(this.options);var l=r.eq(n).find(">td").eq(o);if(!(n<0||o<0||n>=this.data.length)){for(e=n;e<n+a;e++)for(i=o;i<o+s;i++)r.eq(e).find(">td").eq(i).hide();l.attr("rowspan",a).attr("colspan",s).show()}}},{key:"checkAll",value:function(){this._toggleCheckAll(!0)}},{key:"uncheckAll",value:function(){this._toggleCheckAll(!1)}},{key:"_toggleCheckAll",value:function(t){var e=this.getSelections();this.$selectAll.add(this.$selectAll_).prop("checked",t),this.$selectItem.filter(":enabled").prop("checked",t),this.updateRows(),this.updateSelected();var i=this.getSelections();t?this.trigger("check-all",i,e):this.trigger("uncheck-all",i,e)}},{key:"checkInvert",value:function(){var t=this.$selectItem.filter(":enabled"),e=t.filter(":checked");t.each((function(t,e){i.default(e).prop("checked",!i.default(e).prop("checked"))})),this.updateRows(),this.updateSelected(),this.trigger("uncheck-some",e),e=this.getSelections(),this.trigger("check-some",e)}},{key:"check",value:function(t){this._toggleCheck(!0,t)}},{key:"uncheck",value:function(t){this._toggleCheck(!1,t)}},{key:"_toggleCheck",value:function(t,e){var i=this.$selectItem.filter('[data-index="'.concat(e,'"]')),n=this.data[e];if(i.is(":radio")||this.options.singleSelect||this.options.multipleSelectRow&&!this.multipleSelectRowCtrlKey&&!this.multipleSelectRowShiftKey){var o,a=ea(this.options.data);try{for(a.s();!(o=a.n()).done;){o.value[this.header.stateField]=!1}}catch(t){a.e(t)}finally{a.f()}this.$selectItem.filter(":checked").not(i).prop("checked",!1)}if(n[this.header.stateField]=t,this.options.multipleSelectRow){if(this.multipleSelectRowShiftKey&&this.multipleSelectRowLastSelectedIndex>=0)for(var s=Jo(this.multipleSelectRowLastSelectedIndex<e?[this.multipleSelectRowLastSelectedIndex,e]:[e,this.multipleSelectRowLastSelectedIndex],2),r=s[0],l=s[1],c=r+1;c<l;c++)this.data[c][this.header.stateField]=!0,this.$selectItem.filter('[data-index="'.concat(c,'"]')).prop("checked",!0);this.multipleSelectRowCtrlKey=!1,this.multipleSelectRowShiftKey=!1,this.multipleSelectRowLastSelectedIndex=t?e:-1}i.prop("checked",t),this.updateSelected(),this.trigger(t?"check":"uncheck",this.data[e],i)}},{key:"checkBy",value:function(t){this._toggleCheckBy(!0,t)}},{key:"uncheckBy",value:function(t){this._toggleCheckBy(!1,t)}},{key:"_toggleCheckBy",value:function(t,e){var i=this;if(e.hasOwnProperty("field")&&e.hasOwnProperty("values")){var n=[];this.data.forEach((function(o,a){if(!o.hasOwnProperty(e.field))return!1;if(e.values.includes(o[e.field])){var s=i.$selectItem.filter(":enabled").filter(xa.sprintf('[data-index="%s"]',a));if(!(s=t?s.not(":checked"):s.filter(":checked")).length)return;s.prop("checked",t),o[i.header.stateField]=t,n.push(o),i.trigger(t?"check":"uncheck",o,s)}})),this.updateSelected(),this.trigger(t?"check-some":"uncheck-some",n)}}},{key:"refresh",value:function(t){t&&t.url&&(this.options.url=t.url),t&&t.pageNumber&&(this.options.pageNumber=t.pageNumber),t&&t.pageSize&&(this.options.pageSize=t.pageSize),this.trigger("refresh",this.initServer(t&&t.silent,t&&t.query,t&&t.url))}},{key:"destroy",value:function(){this.$el.insertBefore(this.$container),i.default(this.options.toolbar).insertBefore(this.$el),this.$container.next().remove(),this.$container.remove(),this.$el.html(this.$el_.html()).css("margin-top","0").attr("class",this.$el_.attr("class")||"")}},{key:"resetView",value:function(t){var e=0;if(t&&t.height&&(this.options.height=t.height),this.$selectAll.prop("checked",this.$selectItem.length>0&&this.$selectItem.length===this.$selectItem.filter(":checked").length),this.$tableContainer.toggleClass("has-card-view",this.options.cardView),!this.options.cardView&&this.options.showHeader&&this.options.height?(this.$tableHeader.show(),this.resetHeader(),e+=this.$header.outerHeight(!0)+1):(this.$tableHeader.hide(),this.trigger("post-header")),!this.options.cardView&&this.options.showFooter&&(this.$tableFooter.show(),this.fitFooter(),this.options.height&&(e+=this.$tableFooter.outerHeight(!0))),this.$container.hasClass("fullscreen"))this.$tableContainer.css("height",""),this.$tableContainer.css("width","");else if(this.options.height){this.$tableBorder&&(this.$tableBorder.css("width",""),this.$tableBorder.css("height",""));var i=this.$toolbar.outerHeight(!0),n=this.$pagination.outerHeight(!0),o=this.options.height-i-n,a=this.$tableBody.find(">table"),s=a.outerHeight();if(this.$tableContainer.css("height","".concat(o,"px")),this.$tableBorder&&a.is(":visible")){var r=o-s-2;this.$tableBody[0].scrollWidth-this.$tableBody.innerWidth()&&(r-=xa.getScrollBarWidth()),this.$tableBorder.css("width","".concat(a.outerWidth(),"px")),this.$tableBorder.css("height","".concat(r,"px"))}}this.options.cardView?(this.$el.css("margin-top","0"),this.$tableContainer.css("padding-bottom","0"),this.$tableFooter.hide()):(this.getCaret(),this.$tableContainer.css("padding-bottom","".concat(e,"px"))),this.trigger("reset-view")}},{key:"showLoading",value:function(){this.$tableLoading.toggleClass("open",!0);var t=this.options.loadingFontSize;"auto"===this.options.loadingFontSize&&(t=.04*this.$tableLoading.width(),t=Math.max(12,t),t=Math.min(32,t),t="".concat(t,"px")),this.$tableLoading.find(".loading-text").css("font-size",t)}},{key:"hideLoading",value:function(){this.$tableLoading.toggleClass("open",!1)}},{key:"togglePagination",value:function(){this.options.pagination=!this.options.pagination;var t=this.options.showButtonIcons?this.options.pagination?this.options.icons.paginationSwitchDown:this.options.icons.paginationSwitchUp:"",e=this.options.showButtonText?this.options.pagination?this.options.formatPaginationSwitchUp():this.options.formatPaginationSwitchDown():"";this.$toolbar.find('button[name="paginationSwitch"]').html("".concat(xa.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)," ").concat(e)),this.updatePagination()}},{key:"toggleFullscreen",value:function(){this.$el.closest(".bootstrap-table").toggleClass("fullscreen"),this.resetView()}},{key:"toggleView",value:function(){this.options.cardView=!this.options.cardView,this.initHeader();var t=this.options.showButtonIcons?this.options.cardView?this.options.icons.toggleOn:this.options.icons.toggleOff:"",e=this.options.showButtonText?this.options.cardView?this.options.formatToggleOff():this.options.formatToggleOn():"";this.$toolbar.find('button[name="toggle"]').html("".concat(xa.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)," ").concat(e)),this.initBody(),this.trigger("toggle",this.options.cardView)}},{key:"resetSearch",value:function(t){var e=xa.getSearchInput(this);e.val(t||""),this.onSearch({currentTarget:e})}},{key:"filterBy",value:function(t,e){this.filterOptions=xa.isEmptyObject(e)?this.options.filterOptions:i.default.extend(this.options.filterOptions,e),this.filterColumns=xa.isEmptyObject(t)?{}:t,this.options.pageNumber=1,this.initSearch(),this.updatePagination()}},{key:"scrollTo",value:function(t){var e={unit:"px",value:0};"object"===Go(t)?e=Object.assign(e,t):"string"==typeof t&&"bottom"===t?e.value=this.$tableBody[0].scrollHeight:"string"!=typeof t&&"number"!=typeof t||(e.value=t);var n=e.value;"rows"===e.unit&&(n=0,this.$body.find("> tr:lt(".concat(e.value,")")).each((function(t,e){n+=i.default(e).outerHeight(!0)}))),this.$tableBody.scrollTop(n)}},{key:"getScrollPosition",value:function(){return this.$tableBody.scrollTop()}},{key:"selectPage",value:function(t){t>0&&t<=this.options.totalPages&&(this.options.pageNumber=t,this.updatePagination())}},{key:"prevPage",value:function(){this.options.pageNumber>1&&(this.options.pageNumber--,this.updatePagination())}},{key:"nextPage",value:function(){this.options.pageNumber<this.options.totalPages&&(this.options.pageNumber++,this.updatePagination())}},{key:"toggleDetailView",value:function(t,e){this.$body.find(xa.sprintf('> tr[data-index="%s"]',t)).next().is("tr.detail-view")?this.collapseRow(t):this.expandRow(t,e),this.resetView()}},{key:"expandRow",value:function(t,e){var i=this.data[t],n=this.$body.find(xa.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));if(!n.next().is("tr.detail-view")){this.options.detailViewIcon&&n.find("a.detail-icon").html(xa.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailClose)),n.after(xa.sprintf('<tr class="detail-view"><td colspan="%s"></td></tr>',n.children("td").length));var o=n.next().find("td"),a=e||this.options.detailFormatter,s=xa.calculateObjectValue(this.options,a,[t,i,o],"");1===o.length&&o.append(s),this.trigger("expand-row",t,i,o)}}},{key:"expandRowByUniqueId",value:function(t){var e=this.getRowByUniqueId(t);e&&this.expandRow(this.data.indexOf(e))}},{key:"collapseRow",value:function(t){var e=this.data[t],i=this.$body.find(xa.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));i.next().is("tr.detail-view")&&(this.options.detailViewIcon&&i.find("a.detail-icon").html(xa.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen)),this.trigger("collapse-row",t,e,i.next()),i.next().remove())}},{key:"collapseRowByUniqueId",value:function(t){var e=this.getRowByUniqueId(t);e&&this.collapseRow(this.data.indexOf(e))}},{key:"expandAllRows",value:function(){for(var t=this.$body.find("> tr[data-index][data-has-detail-view]"),e=0;e<t.length;e++)this.expandRow(i.default(t[e]).data("index"))}},{key:"collapseAllRows",value:function(){for(var t=this.$body.find("> tr[data-index][data-has-detail-view]"),e=0;e<t.length;e++)this.collapseRow(i.default(t[e]).data("index"))}},{key:"updateColumnTitle",value:function(t){t.hasOwnProperty("field")&&t.hasOwnProperty("title")&&(this.columns[this.fieldsColumnsIndex[t.field]].title=this.options.escape?xa.escapeHTML(t.title):t.title,this.columns[this.fieldsColumnsIndex[t.field]].visible&&(this.$header.find("th[data-field]").each((function(e,n){if(i.default(n).data("field")===t.field)return i.default(i.default(n).find(".th-inner")[0]).text(t.title),!1})),this.resetView()))}},{key:"updateFormatText",value:function(t,e){/^format/.test(t)&&this.options[t]&&("string"==typeof e?this.options[t]=function(){return e}:"function"==typeof e&&(this.options[t]=e),this.initToolbar(),this.initPagination(),this.initBody())}}]),t}();return Oa.VERSION=ca.VERSION,Oa.DEFAULTS=ca.DEFAULTS,Oa.LOCALES=ca.LOCALES,Oa.COLUMN_DEFAULTS=ca.COLUMN_DEFAULTS,Oa.METHODS=ca.METHODS,Oa.EVENTS=ca.EVENTS,i.default.BootstrapTable=Oa,i.default.fn.bootstrapTable=function(t){for(var e=arguments.length,n=new Array(e>1?e-1:0),o=1;o<e;o++)n[o-1]=arguments[o];var a;return this.each((function(e,o){var s=i.default(o).data("bootstrap.table"),r=i.default.extend({},Oa.DEFAULTS,i.default(o).data(),"object"===Go(t)&&t);if("string"==typeof t){var l;if(!ca.METHODS.includes(t))throw new Error("Unknown method: ".concat(t));if(!s)return;a=(l=s)[t].apply(l,n),"destroy"===t&&i.default(o).removeData("bootstrap.table")}s||(s=new i.default.BootstrapTable(o,r),i.default(o).data("bootstrap.table",s),s.init())})),void 0===a?this:a},i.default.fn.bootstrapTable.Constructor=Oa,i.default.fn.bootstrapTable.theme=ca.THEME,i.default.fn.bootstrapTable.VERSION=ca.VERSION,i.default.fn.bootstrapTable.defaults=Oa.DEFAULTS,i.default.fn.bootstrapTable.columnDefaults=Oa.COLUMN_DEFAULTS,i.default.fn.bootstrapTable.events=Oa.EVENTS,i.default.fn.bootstrapTable.locales=Oa.LOCALES,i.default.fn.bootstrapTable.methods=Oa.METHODS,i.default.fn.bootstrapTable.utils=xa,i.default((function(){i.default('[data-toggle="table"]').bootstrapTable()})),Oa}));
diff --git a/web/skins/classic/js/classic.js b/web/skins/classic/js/classic.js
deleted file mode 100644
index 447f31aae..000000000
--- a/web/skins/classic/js/classic.js
+++ /dev/null
@@ -1,76 +0,0 @@
-//
-// ZoneMinder base static javascript file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-//
-// This file should only contain static JavaScript and no php.
-// Use skin.js.php for JavaScript that need pre-processing
-//
-
-// Javascript window sizes
-/* eslint-disable key-spacing */
-var popupSizes = {
-  'bandwidth':    {'width': 300, 'height': 220},
-  'console':      {'width': 750, 'height': 312},
-  'control':      {'width': 380, 'height': 480},
-  'controlcaps':  {'width': 780, 'height': 320},
-  'controlcap':   {'width': 600, 'height': 400},
-  'cycle':        {'addWidth': 32, 'minWidth': 384, 'addHeight': 62},
-  'device':       {'width': 260, 'height': 150},
-  'devices':      {'width': 400, 'height': 240},
-  'donate':       {'width': 500, 'height': 480},
-  'download':     {'width': 350, 'height': 215},
-  'event':        {'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540},
-  'eventdetail':  {'width': 600, 'height': 420},
-  'events':       {'width': 1020, 'height': 780},
-  'export':       {'width': 400, 'height': 340},
-  'filter':       {'width': 820, 'height': 700},
-  'frame':        {'addWidth': 32, 'minWidth': 384, 'addHeight': 200},
-  'frames':       {'width': 600, 'height': 700},
-  'function':     {'width': 400, 'height': 250},
-  'group':        {'width': 660, 'height': 520},
-  'groups':       {'width': 440, 'height': 220},
-  'image':        {'addWidth': 48, 'addHeight': 80},
-  'log':          {'width': 1080, 'height': 720},
-  'login':        {'width': 720, 'height': 480},
-  'logout':       {'width': 460, 'height': 300},
-  'monitor':      {'width': 700, 'height': 680},
-  'monitorpreset':{'width': 440, 'height': 200},
-  'monitorprobe': {'width': 500, 'height': 240},
-  'monitorselect':{'width': 160, 'height': 200},
-  'monitors':      {'width': 300, 'height': 640},
-  'montage':      {'width': -1, 'height': -1},
-  'onvifprobe':   {'width': 700, 'height': 550},
-  'optionhelp':   {'width': 400, 'height': 320},
-  'options':      {'width': 1000, 'height': 660},
-  'preset':       {'width': 300, 'height': 120},
-  'server':       {'width': 600, 'height': 405},
-  'settings':     {'width': 220, 'height': 225},
-  'state':        {'width': 370, 'height': 134},
-  'stats':        {'width': 840, 'height': 200},
-  'storage':      {'width': 600, 'height': 425},
-  'timeline':     {'width': 760, 'height': 540},
-  'user':         {'width': 360, 'height': 720},
-  'version':      {'width': 360, 'height': 140},
-  'video':        {'width': 420, 'height': 360},
-  'videoview':    {'addWidth': 48, 'addHeight': 80},
-  'watch':        {'addWidth': 96, 'minWidth': 420, 'addHeight': 384},
-  'zone':         {'addWidth': 450, 'addHeight': 200, 'minHeight': 450},
-  'zones':        {'addWidth': 72, 'addHeight': 232}
-};
-/* eslint-enable key-spacing */
diff --git a/web/skins/classic/js/jquery-2.2.4.js b/web/skins/classic/js/jquery-2.2.4.js
deleted file mode 100644
index 5c3c456ac..000000000
--- a/web/skins/classic/js/jquery-2.2.4.js
+++ /dev/null
@@ -1,9814 +0,0 @@
-/*!
- * jQuery JavaScript Library v2.2.4
- * http://jquery.com/
- *
- * Includes Sizzle.js
- * http://sizzlejs.com/
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2016-05-20T17:23Z
- */
-
-(function( global, factory ) {
-
-	if ( typeof module === "object" && typeof module.exports === "object" ) {
-		// For CommonJS and CommonJS-like environments where a proper `window`
-		// is present, execute the factory and get jQuery.
-		// For environments that do not have a `window` with a `document`
-		// (such as Node.js), expose a factory as module.exports.
-		// This accentuates the need for the creation of a real `window`.
-		// e.g. var jQuery = require("jquery")(window);
-		// See ticket #14549 for more info.
-		module.exports = global.document ?
-			factory( global, true ) :
-			function( w ) {
-				if ( !w.document ) {
-					throw new Error( "jQuery requires a window with a document" );
-				}
-				return factory( w );
-			};
-	} else {
-		factory( global );
-	}
-
-// Pass this if window is not defined yet
-}(typeof window !== "undefined" ? window : this, function( window, noGlobal ) {
-
-// Support: Firefox 18+
-// Can't be in strict mode, several libs including ASP.NET trace
-// the stack via arguments.caller.callee and Firefox dies if
-// you try to trace through "use strict" call chains. (#13335)
-//"use strict";
-var arr = [];
-
-var document = window.document;
-
-var slice = arr.slice;
-
-var concat = arr.concat;
-
-var push = arr.push;
-
-var indexOf = arr.indexOf;
-
-var class2type = {};
-
-var toString = class2type.toString;
-
-var hasOwn = class2type.hasOwnProperty;
-
-var support = {};
-
-
-
-var
-	version = "2.2.4",
-
-	// Define a local copy of jQuery
-	jQuery = function( selector, context ) {
-
-		// The jQuery object is actually just the init constructor 'enhanced'
-		// Need init if jQuery is called (just allow error to be thrown if not included)
-		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android<4.1
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,
-
-	// Matches dashed string for camelizing
-	rmsPrefix = /^-ms-/,
-	rdashAlpha = /-([\da-z])/gi,
-
-	// Used by jQuery.camelCase as callback to replace()
-	fcamelCase = function( all, letter ) {
-		return letter.toUpperCase();
-	};
-
-jQuery.fn = jQuery.prototype = {
-
-	// The current version of jQuery being used
-	jquery: version,
-
-	constructor: jQuery,
-
-	// Start with an empty selector
-	selector: "",
-
-	// The default length of a jQuery object is 0
-	length: 0,
-
-	toArray: function() {
-		return slice.call( this );
-	},
-
-	// Get the Nth element in the matched element set OR
-	// Get the whole matched element set as a clean array
-	get: function( num ) {
-		return num != null ?
-
-			// Return just the one element from the set
-			( num < 0 ? this[ num + this.length ] : this[ num ] ) :
-
-			// Return all the elements in a clean array
-			slice.call( this );
-	},
-
-	// Take an array of elements and push it onto the stack
-	// (returning the new matched element set)
-	pushStack: function( elems ) {
-
-		// Build a new jQuery matched element set
-		var ret = jQuery.merge( this.constructor(), elems );
-
-		// Add the old object onto the stack (as a reference)
-		ret.prevObject = this;
-		ret.context = this.context;
-
-		// Return the newly-formed element set
-		return ret;
-	},
-
-	// Execute a callback for every element in the matched set.
-	each: function( callback ) {
-		return jQuery.each( this, callback );
-	},
-
-	map: function( callback ) {
-		return this.pushStack( jQuery.map( this, function( elem, i ) {
-			return callback.call( elem, i, elem );
-		} ) );
-	},
-
-	slice: function() {
-		return this.pushStack( slice.apply( this, arguments ) );
-	},
-
-	first: function() {
-		return this.eq( 0 );
-	},
-
-	last: function() {
-		return this.eq( -1 );
-	},
-
-	eq: function( i ) {
-		var len = this.length,
-			j = +i + ( i < 0 ? len : 0 );
-		return this.pushStack( j >= 0 && j < len ? [ this[ j ] ] : [] );
-	},
-
-	end: function() {
-		return this.prevObject || this.constructor();
-	},
-
-	// For internal use only.
-	// Behaves like an Array's method, not like a jQuery method.
-	push: push,
-	sort: arr.sort,
-	splice: arr.splice
-};
-
-jQuery.extend = jQuery.fn.extend = function() {
-	var options, name, src, copy, copyIsArray, clone,
-		target = arguments[ 0 ] || {},
-		i = 1,
-		length = arguments.length,
-		deep = false;
-
-	// Handle a deep copy situation
-	if ( typeof target === "boolean" ) {
-		deep = target;
-
-		// Skip the boolean and the target
-		target = arguments[ i ] || {};
-		i++;
-	}
-
-	// Handle case when target is a string or something (possible in deep copy)
-	if ( typeof target !== "object" && !jQuery.isFunction( target ) ) {
-		target = {};
-	}
-
-	// Extend jQuery itself if only one argument is passed
-	if ( i === length ) {
-		target = this;
-		i--;
-	}
-
-	for ( ; i < length; i++ ) {
-
-		// Only deal with non-null/undefined values
-		if ( ( options = arguments[ i ] ) != null ) {
-
-			// Extend the base object
-			for ( name in options ) {
-				src = target[ name ];
-				copy = options[ name ];
-
-				// Prevent never-ending loop
-				if ( target === copy ) {
-					continue;
-				}
-
-				// Recurse if we're merging plain objects or arrays
-				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
-					( copyIsArray = jQuery.isArray( copy ) ) ) ) {
-
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && jQuery.isArray( src ) ? src : [];
-
-					} else {
-						clone = src && jQuery.isPlainObject( src ) ? src : {};
-					}
-
-					// Never move original objects, clone them
-					target[ name ] = jQuery.extend( deep, clone, copy );
-
-				// Don't bring in undefined values
-				} else if ( copy !== undefined ) {
-					target[ name ] = copy;
-				}
-			}
-		}
-	}
-
-	// Return the modified object
-	return target;
-};
-
-jQuery.extend( {
-
-	// Unique for each copy of jQuery on the page
-	expando: "jQuery" + ( version + Math.random() ).replace( /\D/g, "" ),
-
-	// Assume jQuery is ready without the ready module
-	isReady: true,
-
-	error: function( msg ) {
-		throw new Error( msg );
-	},
-
-	noop: function() {},
-
-	isFunction: function( obj ) {
-		return jQuery.type( obj ) === "function";
-	},
-
-	isArray: Array.isArray,
-
-	isWindow: function( obj ) {
-		return obj != null && obj === obj.window;
-	},
-
-	isNumeric: function( obj ) {
-
-		// parseFloat NaNs numeric-cast false positives (null|true|false|"")
-		// ...but misinterprets leading-number strings, particularly hex literals ("0x...")
-		// subtraction forces infinities to NaN
-		// adding 1 corrects loss of precision from parseFloat (#15100)
-		var realStringObj = obj && obj.toString();
-		return !jQuery.isArray( obj ) && ( realStringObj - parseFloat( realStringObj ) + 1 ) >= 0;
-	},
-
-	isPlainObject: function( obj ) {
-		var key;
-
-		// Not plain objects:
-		// - Any object or value whose internal [[Class]] property is not "[object Object]"
-		// - DOM nodes
-		// - window
-		if ( jQuery.type( obj ) !== "object" || obj.nodeType || jQuery.isWindow( obj ) ) {
-			return false;
-		}
-
-		// Not own constructor property must be Object
-		if ( obj.constructor &&
-				!hasOwn.call( obj, "constructor" ) &&
-				!hasOwn.call( obj.constructor.prototype || {}, "isPrototypeOf" ) ) {
-			return false;
-		}
-
-		// Own properties are enumerated firstly, so to speed up,
-		// if last one is own, then all properties are own
-		for ( key in obj ) {}
-
-		return key === undefined || hasOwn.call( obj, key );
-	},
-
-	isEmptyObject: function( obj ) {
-		var name;
-		for ( name in obj ) {
-			return false;
-		}
-		return true;
-	},
-
-	type: function( obj ) {
-		if ( obj == null ) {
-			return obj + "";
-		}
-
-		// Support: Android<4.0, iOS<6 (functionish RegExp)
-		return typeof obj === "object" || typeof obj === "function" ?
-			class2type[ toString.call( obj ) ] || "object" :
-			typeof obj;
-	},
-
-	// Evaluates a script in a global context
-	globalEval: function( code ) {
-		var script,
-			indirect = eval;
-
-		code = jQuery.trim( code );
-
-		if ( code ) {
-
-			// If the code includes a valid, prologue position
-			// strict mode pragma, execute code by injecting a
-			// script tag into the document.
-			if ( code.indexOf( "use strict" ) === 1 ) {
-				script = document.createElement( "script" );
-				script.text = code;
-				document.head.appendChild( script ).parentNode.removeChild( script );
-			} else {
-
-				// Otherwise, avoid the DOM node creation, insertion
-				// and removal by using an indirect global eval
-
-				indirect( code );
-			}
-		}
-	},
-
-	// Convert dashed to camelCase; used by the css and data modules
-	// Support: IE9-11+
-	// Microsoft forgot to hump their vendor prefix (#9572)
-	camelCase: function( string ) {
-		return string.replace( rmsPrefix, "ms-" ).replace( rdashAlpha, fcamelCase );
-	},
-
-	nodeName: function( elem, name ) {
-		return elem.nodeName && elem.nodeName.toLowerCase() === name.toLowerCase();
-	},
-
-	each: function( obj, callback ) {
-		var length, i = 0;
-
-		if ( isArrayLike( obj ) ) {
-			length = obj.length;
-			for ( ; i < length; i++ ) {
-				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
-					break;
-				}
-			}
-		} else {
-			for ( i in obj ) {
-				if ( callback.call( obj[ i ], i, obj[ i ] ) === false ) {
-					break;
-				}
-			}
-		}
-
-		return obj;
-	},
-
-	// Support: Android<4.1
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
-	// results is for internal usage only
-	makeArray: function( arr, results ) {
-		var ret = results || [];
-
-		if ( arr != null ) {
-			if ( isArrayLike( Object( arr ) ) ) {
-				jQuery.merge( ret,
-					typeof arr === "string" ?
-					[ arr ] : arr
-				);
-			} else {
-				push.call( ret, arr );
-			}
-		}
-
-		return ret;
-	},
-
-	inArray: function( elem, arr, i ) {
-		return arr == null ? -1 : indexOf.call( arr, elem, i );
-	},
-
-	merge: function( first, second ) {
-		var len = +second.length,
-			j = 0,
-			i = first.length;
-
-		for ( ; j < len; j++ ) {
-			first[ i++ ] = second[ j ];
-		}
-
-		first.length = i;
-
-		return first;
-	},
-
-	grep: function( elems, callback, invert ) {
-		var callbackInverse,
-			matches = [],
-			i = 0,
-			length = elems.length,
-			callbackExpect = !invert;
-
-		// Go through the array, only saving the items
-		// that pass the validator function
-		for ( ; i < length; i++ ) {
-			callbackInverse = !callback( elems[ i ], i );
-			if ( callbackInverse !== callbackExpect ) {
-				matches.push( elems[ i ] );
-			}
-		}
-
-		return matches;
-	},
-
-	// arg is for internal usage only
-	map: function( elems, callback, arg ) {
-		var length, value,
-			i = 0,
-			ret = [];
-
-		// Go through the array, translating each of the items to their new values
-		if ( isArrayLike( elems ) ) {
-			length = elems.length;
-			for ( ; i < length; i++ ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-
-		// Go through every key on the object,
-		} else {
-			for ( i in elems ) {
-				value = callback( elems[ i ], i, arg );
-
-				if ( value != null ) {
-					ret.push( value );
-				}
-			}
-		}
-
-		// Flatten any nested arrays
-		return concat.apply( [], ret );
-	},
-
-	// A global GUID counter for objects
-	guid: 1,
-
-	// Bind a function to a context, optionally partially applying any
-	// arguments.
-	proxy: function( fn, context ) {
-		var tmp, args, proxy;
-
-		if ( typeof context === "string" ) {
-			tmp = fn[ context ];
-			context = fn;
-			fn = tmp;
-		}
-
-		// Quick check to determine if target is callable, in the spec
-		// this throws a TypeError, but we will just return undefined.
-		if ( !jQuery.isFunction( fn ) ) {
-			return undefined;
-		}
-
-		// Simulated bind
-		args = slice.call( arguments, 2 );
-		proxy = function() {
-			return fn.apply( context || this, args.concat( slice.call( arguments ) ) );
-		};
-
-		// Set the guid of unique handler to the same of original handler, so it can be removed
-		proxy.guid = fn.guid = fn.guid || jQuery.guid++;
-
-		return proxy;
-	},
-
-	now: Date.now,
-
-	// jQuery.support is not used in Core but other projects attach their
-	// properties to it so it needs to exist.
-	support: support
-} );
-
-// JSHint would error on this code due to the Symbol not being defined in ES5.
-// Defining this global in .jshintrc would create a danger of using the global
-// unguarded in another place, it seems safer to just disable JSHint for these
-// three lines.
-/* jshint ignore: start */
-if ( typeof Symbol === "function" ) {
-	jQuery.fn[ Symbol.iterator ] = arr[ Symbol.iterator ];
-}
-/* jshint ignore: end */
-
-// Populate the class2type map
-jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( i, name ) {
-	class2type[ "[object " + name + "]" ] = name.toLowerCase();
-} );
-
-function isArrayLike( obj ) {
-
-	// Support: iOS 8.2 (not reproducible in simulator)
-	// `in` check used to prevent JIT error (gh-2145)
-	// hasOwn isn't used here due to false negatives
-	// regarding Nodelist length in IE
-	var length = !!obj && "length" in obj && obj.length,
-		type = jQuery.type( obj );
-
-	if ( type === "function" || jQuery.isWindow( obj ) ) {
-		return false;
-	}
-
-	return type === "array" || length === 0 ||
-		typeof length === "number" && length > 0 && ( length - 1 ) in obj;
-}
-var Sizzle =
-/*!
- * Sizzle CSS Selector Engine v2.2.1
- * http://sizzlejs.com/
- *
- * Copyright jQuery Foundation and other contributors
- * Released under the MIT license
- * http://jquery.org/license
- *
- * Date: 2015-10-17
- */
-(function( window ) {
-
-var i,
-	support,
-	Expr,
-	getText,
-	isXML,
-	tokenize,
-	compile,
-	select,
-	outermostContext,
-	sortInput,
-	hasDuplicate,
-
-	// Local document vars
-	setDocument,
-	document,
-	docElem,
-	documentIsHTML,
-	rbuggyQSA,
-	rbuggyMatches,
-	matches,
-	contains,
-
-	// Instance-specific data
-	expando = "sizzle" + 1 * new Date(),
-	preferredDoc = window.document,
-	dirruns = 0,
-	done = 0,
-	classCache = createCache(),
-	tokenCache = createCache(),
-	compilerCache = createCache(),
-	sortOrder = function( a, b ) {
-		if ( a === b ) {
-			hasDuplicate = true;
-		}
-		return 0;
-	},
-
-	// General-purpose constants
-	MAX_NEGATIVE = 1 << 31,
-
-	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
-	arr = [],
-	pop = arr.pop,
-	push_native = arr.push,
-	push = arr.push,
-	slice = arr.slice,
-	// Use a stripped-down indexOf as it's faster than native
-	// http://jsperf.com/thor-indexof-vs-for/5
-	indexOf = function( list, elem ) {
-		var i = 0,
-			len = list.length;
-		for ( ; i < len; i++ ) {
-			if ( list[i] === elem ) {
-				return i;
-			}
-		}
-		return -1;
-	},
-
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
-
-	// Regular expressions
-
-	// http://www.w3.org/TR/css3-selectors/#whitespace
-	whitespace = "[\\x20\\t\\r\\n\\f]",
-
-	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = "(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",
-
-	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
-	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
-		// Operator (capture 2)
-		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
-
-	pseudos = ":(" + identifier + ")(?:\\((" +
-		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
-		// 1. quoted (capture 3; capture 4 or capture 5)
-		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
-		// 2. simple (capture 6)
-		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
-		// 3. anything else (capture 2)
-		".*" +
-		")\\)|)",
-
-	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
-	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
-
-	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
-
-	rpseudo = new RegExp( pseudos ),
-	ridentifier = new RegExp( "^" + identifier + "$" ),
-
-	matchExpr = {
-		"ID": new RegExp( "^#(" + identifier + ")" ),
-		"CLASS": new RegExp( "^\\.(" + identifier + ")" ),
-		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
-		"ATTR": new RegExp( "^" + attributes ),
-		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
-		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
-		// For use in libraries implementing .is()
-		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
-	},
-
-	rinputs = /^(?:input|select|textarea|button)$/i,
-	rheader = /^h\d$/i,
-
-	rnative = /^[^{]+\{\s*\[native \w/,
-
-	// Easily-parseable/retrievable ID or TAG or CLASS selectors
-	rquickExpr = /^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,
-
-	rsibling = /[+~]/,
-	rescape = /'|\\/g,
-
-	// CSS escapes http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
-			high < 0 ?
-				// BMP codepoint
-				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
-				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
-	},
-
-	// Used for iframes
-	// See setDocument()
-	// Removing the function wrapper causes a "Permission Denied"
-	// error in IE
-	unloadHandler = function() {
-		setDocument();
-	};
-
-// Optimize for push.apply( _, NodeList )
-try {
-	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
-		preferredDoc.childNodes
-	);
-	// Support: Android<4.0
-	// Detect silently failing push.apply
-	arr[ preferredDoc.childNodes.length ].nodeType;
-} catch ( e ) {
-	push = { apply: arr.length ?
-
-		// Leverage slice if possible
-		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
-		} :
-
-		// Support: IE<9
-		// Otherwise append directly
-		function( target, els ) {
-			var j = target.length,
-				i = 0;
-			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
-			target.length = j - 1;
-		}
-	};
-}
-
-function Sizzle( selector, context, results, seed ) {
-	var m, i, elem, nid, nidselect, match, groups, newSelector,
-		newContext = context && context.ownerDocument,
-
-		// nodeType defaults to 9, since context defaults to document
-		nodeType = context ? context.nodeType : 9;
-
-	results = results || [];
-
-	// Return early from calls with invalid selector or context
-	if ( typeof selector !== "string" || !selector ||
-		nodeType !== 1 && nodeType !== 9 && nodeType !== 11 ) {
-
-		return results;
-	}
-
-	// Try to shortcut find operations (as opposed to filters) in HTML documents
-	if ( !seed ) {
-
-		if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-			setDocument( context );
-		}
-		context = context || document;
-
-		if ( documentIsHTML ) {
-
-			// If the selector is sufficiently simple, try using a "get*By*" DOM method
-			// (excepting DocumentFragment context, where the methods don't exist)
-			if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
-
-				// ID selector
-				if ( (m = match[1]) ) {
-
-					// Document context
-					if ( nodeType === 9 ) {
-						if ( (elem = context.getElementById( m )) ) {
-
-							// Support: IE, Opera, Webkit
-							// TODO: identify versions
-							// getElementById can match elements by name instead of ID
-							if ( elem.id === m ) {
-								results.push( elem );
-								return results;
-							}
-						} else {
-							return results;
-						}
-
-					// Element context
-					} else {
-
-						// Support: IE, Opera, Webkit
-						// TODO: identify versions
-						// getElementById can match elements by name instead of ID
-						if ( newContext && (elem = newContext.getElementById( m )) &&
-							contains( context, elem ) &&
-							elem.id === m ) {
-
-							results.push( elem );
-							return results;
-						}
-					}
-
-				// Type selector
-				} else if ( match[2] ) {
-					push.apply( results, context.getElementsByTagName( selector ) );
-					return results;
-
-				// Class selector
-				} else if ( (m = match[3]) && support.getElementsByClassName &&
-					context.getElementsByClassName ) {
-
-					push.apply( results, context.getElementsByClassName( m ) );
-					return results;
-				}
-			}
-
-			// Take advantage of querySelectorAll
-			if ( support.qsa &&
-				!compilerCache[ selector + " " ] &&
-				(!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
-
-				if ( nodeType !== 1 ) {
-					newContext = context;
-					newSelector = selector;
-
-				// qSA looks outside Element context, which is not what we want
-				// Thanks to Andrew Dupont for this workaround technique
-				// Support: IE <=8
-				// Exclude object elements
-				} else if ( context.nodeName.toLowerCase() !== "object" ) {
-
-					// Capture the context ID, setting it first if necessary
-					if ( (nid = context.getAttribute( "id" )) ) {
-						nid = nid.replace( rescape, "\\$&" );
-					} else {
-						context.setAttribute( "id", (nid = expando) );
-					}
-
-					// Prefix every selector in the list
-					groups = tokenize( selector );
-					i = groups.length;
-					nidselect = ridentifier.test( nid ) ? "#" + nid : "[id='" + nid + "']";
-					while ( i-- ) {
-						groups[i] = nidselect + " " + toSelector( groups[i] );
-					}
-					newSelector = groups.join( "," );
-
-					// Expand context for sibling selectors
-					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
-						context;
-				}
-
-				if ( newSelector ) {
-					try {
-						push.apply( results,
-							newContext.querySelectorAll( newSelector )
-						);
-						return results;
-					} catch ( qsaError ) {
-					} finally {
-						if ( nid === expando ) {
-							context.removeAttribute( "id" );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// All others
-	return select( selector.replace( rtrim, "$1" ), context, results, seed );
-}
-
-/**
- * Create key-value caches of limited size
- * @returns {function(string, object)} Returns the Object data after storing it on itself with
- *	property name the (space-suffixed) string and (if the cache is larger than Expr.cacheLength)
- *	deleting the oldest entry
- */
-function createCache() {
-	var keys = [];
-
-	function cache( key, value ) {
-		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
-		if ( keys.push( key + " " ) > Expr.cacheLength ) {
-			// Only keep the most recent entries
-			delete cache[ keys.shift() ];
-		}
-		return (cache[ key + " " ] = value);
-	}
-	return cache;
-}
-
-/**
- * Mark a function for special use by Sizzle
- * @param {Function} fn The function to mark
- */
-function markFunction( fn ) {
-	fn[ expando ] = true;
-	return fn;
-}
-
-/**
- * Support testing using an element
- * @param {Function} fn Passed the created div and expects a boolean result
- */
-function assert( fn ) {
-	var div = document.createElement("div");
-
-	try {
-		return !!fn( div );
-	} catch (e) {
-		return false;
-	} finally {
-		// Remove from its parent by default
-		if ( div.parentNode ) {
-			div.parentNode.removeChild( div );
-		}
-		// release memory in IE
-		div = null;
-	}
-}
-
-/**
- * Adds the same handler for all of the specified attrs
- * @param {String} attrs Pipe-separated list of attributes
- * @param {Function} handler The method that will be applied
- */
-function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
-		i = arr.length;
-
-	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
-	}
-}
-
-/**
- * Checks document order of two siblings
- * @param {Element} a
- * @param {Element} b
- * @returns {Number} Returns less than 0 if a precedes b, greater than 0 if a follows b
- */
-function siblingCheck( a, b ) {
-	var cur = b && a,
-		diff = cur && a.nodeType === 1 && b.nodeType === 1 &&
-			( ~b.sourceIndex || MAX_NEGATIVE ) -
-			( ~a.sourceIndex || MAX_NEGATIVE );
-
-	// Use IE sourceIndex if available on both nodes
-	if ( diff ) {
-		return diff;
-	}
-
-	// Check if b follows a
-	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
-			if ( cur === b ) {
-				return -1;
-			}
-		}
-	}
-
-	return a ? 1 : -1;
-}
-
-/**
- * Returns a function to use in pseudos for input types
- * @param {String} type
- */
-function createInputPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return name === "input" && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for buttons
- * @param {String} type
- */
-function createButtonPseudo( type ) {
-	return function( elem ) {
-		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
-	};
-}
-
-/**
- * Returns a function to use in pseudos for positionals
- * @param {Function} fn
- */
-function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
-		argument = +argument;
-		return markFunction(function( seed, matches ) {
-			var j,
-				matchIndexes = fn( [], seed.length, argument ),
-				i = matchIndexes.length;
-
-			// Match elements found at the specified indexes
-			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
-				}
-			}
-		});
-	});
-}
-
-/**
- * Checks a node for validity as a Sizzle context
- * @param {Element|Object=} context
- * @returns {Element|Object|Boolean} The input node if acceptable, otherwise a falsy value
- */
-function testContext( context ) {
-	return context && typeof context.getElementsByTagName !== "undefined" && context;
-}
-
-// Expose support vars for convenience
-support = Sizzle.support = {};
-
-/**
- * Detects XML nodes
- * @param {Element|Object} elem An element or a document
- * @returns {Boolean} True iff elem is a non-HTML XML node
- */
-isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
-};
-
-/**
- * Sets document-related variables once based on the current document
- * @param {Element|Object} [doc] An element or document object to use to set the document
- * @returns {Object} Returns the current document
- */
-setDocument = Sizzle.setDocument = function( node ) {
-	var hasCompare, parent,
-		doc = node ? node.ownerDocument || node : preferredDoc;
-
-	// Return early if doc is invalid or already selected
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
-		return document;
-	}
-
-	// Update global variables
-	document = doc;
-	docElem = document.documentElement;
-	documentIsHTML = !isXML( document );
-
-	// Support: IE 9-11, Edge
-	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
-	if ( (parent = document.defaultView) && parent.top !== parent ) {
-		// Support: IE 11
-		if ( parent.addEventListener ) {
-			parent.addEventListener( "unload", unloadHandler, false );
-
-		// Support: IE 9 - 10 only
-		} else if ( parent.attachEvent ) {
-			parent.attachEvent( "onunload", unloadHandler );
-		}
-	}
-
-	/* Attributes
-	---------------------------------------------------------------------- */
-
-	// Support: IE<8
-	// Verify that getAttribute really returns attributes and not properties
-	// (excepting IE8 booleans)
-	support.attributes = assert(function( div ) {
-		div.className = "i";
-		return !div.getAttribute("className");
-	});
-
-	/* getElement(s)By*
-	---------------------------------------------------------------------- */
-
-	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( div ) {
-		div.appendChild( document.createComment("") );
-		return !div.getElementsByTagName("*").length;
-	});
-
-	// Support: IE<9
-	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
-
-	// Support: IE<10
-	// Check if getElementById returns elements by name
-	// The broken getElementById methods don't pick up programatically-set names,
-	// so use a roundabout getElementsByName test
-	support.getById = assert(function( div ) {
-		docElem.appendChild( div ).id = expando;
-		return !document.getElementsByName || !document.getElementsByName( expando ).length;
-	});
-
-	// ID find and filter
-	if ( support.getById ) {
-		Expr.find["ID"] = function( id, context ) {
-			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
-				var m = context.getElementById( id );
-				return m ? [ m ] : [];
-			}
-		};
-		Expr.filter["ID"] = function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
-			};
-		};
-	} else {
-		// Support: IE6/7
-		// getElementById is not reliable as a find shortcut
-		delete Expr.find["ID"];
-
-		Expr.filter["ID"] =  function( id ) {
-			var attrId = id.replace( runescape, funescape );
-			return function( elem ) {
-				var node = typeof elem.getAttributeNode !== "undefined" &&
-					elem.getAttributeNode("id");
-				return node && node.value === attrId;
-			};
-		};
-	}
-
-	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
-		function( tag, context ) {
-			if ( typeof context.getElementsByTagName !== "undefined" ) {
-				return context.getElementsByTagName( tag );
-
-			// DocumentFragment nodes don't have gEBTN
-			} else if ( support.qsa ) {
-				return context.querySelectorAll( tag );
-			}
-		} :
-
-		function( tag, context ) {
-			var elem,
-				tmp = [],
-				i = 0,
-				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
-				results = context.getElementsByTagName( tag );
-
-			// Filter out possible comments
-			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
-					if ( elem.nodeType === 1 ) {
-						tmp.push( elem );
-					}
-				}
-
-				return tmp;
-			}
-			return results;
-		};
-
-	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
-		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
-			return context.getElementsByClassName( className );
-		}
-	};
-
-	/* QSA/matchesSelector
-	---------------------------------------------------------------------- */
-
-	// QSA and matchesSelector support
-
-	// matchesSelector(:active) reports false when true (IE9/Opera 11.5)
-	rbuggyMatches = [];
-
-	// qSa(:focus) reports false when true (Chrome 21)
-	// We allow this because of a bug in IE8/9 that throws an error
-	// whenever `document.activeElement` is accessed on an iframe
-	// So, we allow :focus to pass through QSA all the time to avoid the IE error
-	// See http://bugs.jquery.com/ticket/13378
-	rbuggyQSA = [];
-
-	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
-		// Build QSA regex
-		// Regex strategy adopted from Diego Perini
-		assert(function( div ) {
-			// Select is set to empty string on purpose
-			// This is to test IE's treatment of not explicitly
-			// setting a boolean content attribute,
-			// since its presence should be enough
-			// http://bugs.jquery.com/ticket/12359
-			docElem.appendChild( div ).innerHTML = "<a id='" + expando + "'></a>" +
-				"<select id='" + expando + "-\r\\' msallowcapture=''>" +
-				"<option selected=''></option></select>";
-
-			// Support: IE8, Opera 11-12.16
-			// Nothing should be selected when empty strings follow ^= or $= or *=
-			// The test attribute must be unknown in Opera but "safe" for WinRT
-			// http://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( div.querySelectorAll("[msallowcapture^='']").length ) {
-				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
-			}
-
-			// Support: IE8
-			// Boolean attributes and "value" are not treated correctly
-			if ( !div.querySelectorAll("[selected]").length ) {
-				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
-			}
-
-			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
-			if ( !div.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push("~=");
-			}
-
-			// Webkit/Opera - :checked should return selected option elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
-			}
-
-			// Support: Safari 8+, iOS 8+
-			// https://bugs.webkit.org/show_bug.cgi?id=136851
-			// In-page `selector#id sibing-combinator selector` fails
-			if ( !div.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push(".#.+[+~]");
-			}
-		});
-
-		assert(function( div ) {
-			// Support: Windows 8 Native Apps
-			// The type and name attributes are restricted during .innerHTML assignment
-			var input = document.createElement("input");
-			input.setAttribute( "type", "hidden" );
-			div.appendChild( input ).setAttribute( "name", "D" );
-
-			// Support: IE8
-			// Enforce case-sensitivity of name attribute
-			if ( div.querySelectorAll("[name=d]").length ) {
-				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
-			}
-
-			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
-			// IE8 throws error here and will not see later tests
-			if ( !div.querySelectorAll(":enabled").length ) {
-				rbuggyQSA.push( ":enabled", ":disabled" );
-			}
-
-			// Opera 10-11 does not throw on post-comma invalid pseudos
-			div.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
-	}
-
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
-		docElem.webkitMatchesSelector ||
-		docElem.mozMatchesSelector ||
-		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
-
-		assert(function( div ) {
-			// Check to see if it's possible to do matchesSelector
-			// on a disconnected node (IE 9)
-			support.disconnectedMatch = matches.call( div, "div" );
-
-			// This should fail with an exception
-			// Gecko does not error, returns false instead
-			matches.call( div, "[s!='']:x" );
-			rbuggyMatches.push( "!=", pseudos );
-		});
-	}
-
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
-
-	/* Contains
-	---------------------------------------------------------------------- */
-	hasCompare = rnative.test( docElem.compareDocumentPosition );
-
-	// Element contains another
-	// Purposefully self-exclusive
-	// As in, an element does not contain itself
-	contains = hasCompare || rnative.test( docElem.contains ) ?
-		function( a, b ) {
-			var adown = a.nodeType === 9 ? a.documentElement : a,
-				bup = b && b.parentNode;
-			return a === bup || !!( bup && bup.nodeType === 1 && (
-				adown.contains ?
-					adown.contains( bup ) :
-					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
-		} :
-		function( a, b ) {
-			if ( b ) {
-				while ( (b = b.parentNode) ) {
-					if ( b === a ) {
-						return true;
-					}
-				}
-			}
-			return false;
-		};
-
-	/* Sorting
-	---------------------------------------------------------------------- */
-
-	// Document order sorting
-	sortOrder = hasCompare ?
-	function( a, b ) {
-
-		// Flag for duplicate removal
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		// Sort on method existence if only one input has compareDocumentPosition
-		var compare = !a.compareDocumentPosition - !b.compareDocumentPosition;
-		if ( compare ) {
-			return compare;
-		}
-
-		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
-			a.compareDocumentPosition( b ) :
-
-			// Otherwise we know they are disconnected
-			1;
-
-		// Disconnected nodes
-		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
-
-			// Choose the first element that is related to our preferred document
-			if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
-				return -1;
-			}
-			if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
-				return 1;
-			}
-
-			// Maintain original order
-			return sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-		}
-
-		return compare & 4 ? -1 : 1;
-	} :
-	function( a, b ) {
-		// Exit early if the nodes are identical
-		if ( a === b ) {
-			hasDuplicate = true;
-			return 0;
-		}
-
-		var cur,
-			i = 0,
-			aup = a.parentNode,
-			bup = b.parentNode,
-			ap = [ a ],
-			bp = [ b ];
-
-		// Parentless nodes are either documents or disconnected
-		if ( !aup || !bup ) {
-			return a === document ? -1 :
-				b === document ? 1 :
-				aup ? -1 :
-				bup ? 1 :
-				sortInput ?
-				( indexOf( sortInput, a ) - indexOf( sortInput, b ) ) :
-				0;
-
-		// If the nodes are siblings, we can do a quick check
-		} else if ( aup === bup ) {
-			return siblingCheck( a, b );
-		}
-
-		// Otherwise we need full lists of their ancestors for comparison
-		cur = a;
-		while ( (cur = cur.parentNode) ) {
-			ap.unshift( cur );
-		}
-		cur = b;
-		while ( (cur = cur.parentNode) ) {
-			bp.unshift( cur );
-		}
-
-		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
-			i++;
-		}
-
-		return i ?
-			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
-
-			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
-			0;
-	};
-
-	return document;
-};
-
-Sizzle.matches = function( expr, elements ) {
-	return Sizzle( expr, null, null, elements );
-};
-
-Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
-
-	if ( support.matchesSelector && documentIsHTML &&
-		!compilerCache[ expr + " " ] &&
-		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
-		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
-
-		try {
-			var ret = matches.call( elem, expr );
-
-			// IE 9's matchesSelector returns false on disconnected nodes
-			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
-				return ret;
-			}
-		} catch (e) {}
-	}
-
-	return Sizzle( expr, document, null, [ elem ] ).length > 0;
-};
-
-Sizzle.contains = function( context, elem ) {
-	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
-		setDocument( context );
-	}
-	return contains( context, elem );
-};
-
-Sizzle.attr = function( elem, name ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	var fn = Expr.attrHandle[ name.toLowerCase() ],
-		// Don't get fooled by Object.prototype properties (jQuery #13807)
-		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
-			fn( elem, name, !documentIsHTML ) :
-			undefined;
-
-	return val !== undefined ?
-		val :
-		support.attributes || !documentIsHTML ?
-			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
-				val.value :
-				null;
-};
-
-Sizzle.error = function( msg ) {
-	throw new Error( "Syntax error, unrecognized expression: " + msg );
-};
-
-/**
- * Document sorting and removing duplicates
- * @param {ArrayLike} results
- */
-Sizzle.uniqueSort = function( results ) {
-	var elem,
-		duplicates = [],
-		j = 0,
-		i = 0;
-
-	// Unless we *know* we can detect duplicates, assume their presence
-	hasDuplicate = !support.detectDuplicates;
-	sortInput = !support.sortStable && results.slice( 0 );
-	results.sort( sortOrder );
-
-	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
-			if ( elem === results[ i ] ) {
-				j = duplicates.push( i );
-			}
-		}
-		while ( j-- ) {
-			results.splice( duplicates[ j ], 1 );
-		}
-	}
-
-	// Clear input after sorting to release objects
-	// See https://github.com/jquery/sizzle/pull/225
-	sortInput = null;
-
-	return results;
-};
-
-/**
- * Utility function for retrieving the text value of an array of DOM nodes
- * @param {Array|Element} elem
- */
-getText = Sizzle.getText = function( elem ) {
-	var node,
-		ret = "",
-		i = 0,
-		nodeType = elem.nodeType;
-
-	if ( !nodeType ) {
-		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
-			// Do not traverse comment nodes
-			ret += getText( node );
-		}
-	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
-		// Use textContent for elements
-		// innerText usage removed for consistency of new lines (jQuery #11153)
-		if ( typeof elem.textContent === "string" ) {
-			return elem.textContent;
-		} else {
-			// Traverse its children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				ret += getText( elem );
-			}
-		}
-	} else if ( nodeType === 3 || nodeType === 4 ) {
-		return elem.nodeValue;
-	}
-	// Do not include comment or processing instruction nodes
-
-	return ret;
-};
-
-Expr = Sizzle.selectors = {
-
-	// Can be adjusted by the user
-	cacheLength: 50,
-
-	createPseudo: markFunction,
-
-	match: matchExpr,
-
-	attrHandle: {},
-
-	find: {},
-
-	relative: {
-		">": { dir: "parentNode", first: true },
-		" ": { dir: "parentNode" },
-		"+": { dir: "previousSibling", first: true },
-		"~": { dir: "previousSibling" }
-	},
-
-	preFilter: {
-		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
-
-			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
-
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
-			}
-
-			return match.slice( 0, 4 );
-		},
-
-		"CHILD": function( match ) {
-			/* matches from matchExpr["CHILD"]
-				1 type (only|nth|...)
-				2 what (child|of-type)
-				3 argument (even|odd|\d*|\d*n([+-]\d+)?|...)
-				4 xn-component of xn+y argument ([+-]?\d*n|)
-				5 sign of xn-component
-				6 x of xn-component
-				7 sign of y-component
-				8 y of y-component
-			*/
-			match[1] = match[1].toLowerCase();
-
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
-				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
-				}
-
-				// numeric x and y parameters for Expr.filter.CHILD
-				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
-
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
-			}
-
-			return match;
-		},
-
-		"PSEUDO": function( match ) {
-			var excess,
-				unquoted = !match[6] && match[2];
-
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
-				return null;
-			}
-
-			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
-
-			// Strip excess characters from unquoted arguments
-			} else if ( unquoted && rpseudo.test( unquoted ) &&
-				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
-				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
-
-				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
-			}
-
-			// Return only captures needed by the pseudo filter method (type and argument)
-			return match.slice( 0, 3 );
-		}
-	},
-
-	filter: {
-
-		"TAG": function( nodeNameSelector ) {
-			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
-			return nodeNameSelector === "*" ?
-				function() { return true; } :
-				function( elem ) {
-					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
-				};
-		},
-
-		"CLASS": function( className ) {
-			var pattern = classCache[ className + " " ];
-
-			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-				});
-		},
-
-		"ATTR": function( name, operator, check ) {
-			return function( elem ) {
-				var result = Sizzle.attr( elem, name );
-
-				if ( result == null ) {
-					return operator === "!=";
-				}
-				if ( !operator ) {
-					return true;
-				}
-
-				result += "";
-
-				return operator === "=" ? result === check :
-					operator === "!=" ? result !== check :
-					operator === "^=" ? check && result.indexOf( check ) === 0 :
-					operator === "*=" ? check && result.indexOf( check ) > -1 :
-					operator === "$=" ? check && result.slice( -check.length ) === check :
-					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
-					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
-					false;
-			};
-		},
-
-		"CHILD": function( type, what, argument, first, last ) {
-			var simple = type.slice( 0, 3 ) !== "nth",
-				forward = type.slice( -4 ) !== "last",
-				ofType = what === "of-type";
-
-			return first === 1 && last === 0 ?
-
-				// Shortcut for :nth-*(n)
-				function( elem ) {
-					return !!elem.parentNode;
-				} :
-
-				function( elem, context, xml ) {
-					var cache, uniqueCache, outerCache, node, nodeIndex, start,
-						dir = simple !== forward ? "nextSibling" : "previousSibling",
-						parent = elem.parentNode,
-						name = ofType && elem.nodeName.toLowerCase(),
-						useCache = !xml && !ofType,
-						diff = false;
-
-					if ( parent ) {
-
-						// :(first|last|only)-(child|of-type)
-						if ( simple ) {
-							while ( dir ) {
-								node = elem;
-								while ( (node = node[ dir ]) ) {
-									if ( ofType ?
-										node.nodeName.toLowerCase() === name :
-										node.nodeType === 1 ) {
-
-										return false;
-									}
-								}
-								// Reverse direction for :only-* (if we haven't yet done so)
-								start = dir = type === "only" && !start && "nextSibling";
-							}
-							return true;
-						}
-
-						start = [ forward ? parent.firstChild : parent.lastChild ];
-
-						// non-xml :nth-child(...) stores cache data on `parent`
-						if ( forward && useCache ) {
-
-							// Seek `elem` from a previously-cached index
-
-							// ...in a gzip-friendly way
-							node = parent;
-							outerCache = node[ expando ] || (node[ expando ] = {});
-
-							// Support: IE <9 only
-							// Defend against cloned attroperties (jQuery gh-1709)
-							uniqueCache = outerCache[ node.uniqueID ] ||
-								(outerCache[ node.uniqueID ] = {});
-
-							cache = uniqueCache[ type ] || [];
-							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
-							diff = nodeIndex && cache[ 2 ];
-							node = nodeIndex && parent.childNodes[ nodeIndex ];
-
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
-
-								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
-
-								// When found, cache indexes on `parent` and break
-								if ( node.nodeType === 1 && ++diff && node === elem ) {
-									uniqueCache[ type ] = [ dirruns, nodeIndex, diff ];
-									break;
-								}
-							}
-
-						} else {
-							// Use previously-cached element index if available
-							if ( useCache ) {
-								// ...in a gzip-friendly way
-								node = elem;
-								outerCache = node[ expando ] || (node[ expando ] = {});
-
-								// Support: IE <9 only
-								// Defend against cloned attroperties (jQuery gh-1709)
-								uniqueCache = outerCache[ node.uniqueID ] ||
-									(outerCache[ node.uniqueID ] = {});
-
-								cache = uniqueCache[ type ] || [];
-								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
-								diff = nodeIndex;
-							}
-
-							// xml :nth-child(...)
-							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
-							if ( diff === false ) {
-								// Use the same loop as above to seek `elem` from the start
-								while ( (node = ++nodeIndex && node && node[ dir ] ||
-									(diff = nodeIndex = 0) || start.pop()) ) {
-
-									if ( ( ofType ?
-										node.nodeName.toLowerCase() === name :
-										node.nodeType === 1 ) &&
-										++diff ) {
-
-										// Cache the index of each encountered element
-										if ( useCache ) {
-											outerCache = node[ expando ] || (node[ expando ] = {});
-
-											// Support: IE <9 only
-											// Defend against cloned attroperties (jQuery gh-1709)
-											uniqueCache = outerCache[ node.uniqueID ] ||
-												(outerCache[ node.uniqueID ] = {});
-
-											uniqueCache[ type ] = [ dirruns, diff ];
-										}
-
-										if ( node === elem ) {
-											break;
-										}
-									}
-								}
-							}
-						}
-
-						// Incorporate the offset, then check against cycle size
-						diff -= last;
-						return diff === first || ( diff % first === 0 && diff / first >= 0 );
-					}
-				};
-		},
-
-		"PSEUDO": function( pseudo, argument ) {
-			// pseudo-class names are case-insensitive
-			// http://www.w3.org/TR/selectors/#pseudo-classes
-			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
-			// Remember that setFilters inherits from pseudos
-			var args,
-				fn = Expr.pseudos[ pseudo ] || Expr.setFilters[ pseudo.toLowerCase() ] ||
-					Sizzle.error( "unsupported pseudo: " + pseudo );
-
-			// The user may use createPseudo to indicate that
-			// arguments are needed to create the filter function
-			// just as Sizzle does
-			if ( fn[ expando ] ) {
-				return fn( argument );
-			}
-
-			// But maintain support for old signatures
-			if ( fn.length > 1 ) {
-				args = [ pseudo, pseudo, "", argument ];
-				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
-						var idx,
-							matched = fn( seed, argument ),
-							i = matched.length;
-						while ( i-- ) {
-							idx = indexOf( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
-						}
-					}) :
-					function( elem ) {
-						return fn( elem, 0, args );
-					};
-			}
-
-			return fn;
-		}
-	},
-
-	pseudos: {
-		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
-			// Trim the selector passed to compile
-			// to avoid treating leading and trailing
-			// spaces as combinators
-			var input = [],
-				results = [],
-				matcher = compile( selector.replace( rtrim, "$1" ) );
-
-			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
-					var elem,
-						unmatched = matcher( seed, null, xml, [] ),
-						i = seed.length;
-
-					// Match elements unmatched by `matcher`
-					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
-						}
-					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
-					matcher( input, null, xml, results );
-					// Don't keep the element (issue #299)
-					input[0] = null;
-					return !results.pop();
-				};
-		}),
-
-		"has": markFunction(function( selector ) {
-			return function( elem ) {
-				return Sizzle( selector, elem ).length > 0;
-			};
-		}),
-
-		"contains": markFunction(function( text ) {
-			text = text.replace( runescape, funescape );
-			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
-			};
-		}),
-
-		// "Whether an element is represented by a :lang() selector
-		// is based solely on the element's language value
-		// being equal to the identifier C,
-		// or beginning with the identifier C immediately followed by "-".
-		// The matching of C against the element's language value is performed case-insensitively.
-		// The identifier C does not have to be a valid language name."
-		// http://www.w3.org/TR/selectors/#lang-pseudo
-		"lang": markFunction( function( lang ) {
-			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
-				Sizzle.error( "unsupported lang: " + lang );
-			}
-			lang = lang.replace( runescape, funescape ).toLowerCase();
-			return function( elem ) {
-				var elemLang;
-				do {
-					if ( (elemLang = documentIsHTML ?
-						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
-
-						elemLang = elemLang.toLowerCase();
-						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
-					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
-				return false;
-			};
-		}),
-
-		// Miscellaneous
-		"target": function( elem ) {
-			var hash = window.location && window.location.hash;
-			return hash && hash.slice( 1 ) === elem.id;
-		},
-
-		"root": function( elem ) {
-			return elem === docElem;
-		},
-
-		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
-		},
-
-		// Boolean properties
-		"enabled": function( elem ) {
-			return elem.disabled === false;
-		},
-
-		"disabled": function( elem ) {
-			return elem.disabled === true;
-		},
-
-		"checked": function( elem ) {
-			// In CSS3, :checked should return both checked and selected elements
-			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
-			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
-		},
-
-		"selected": function( elem ) {
-			// Accessing this property makes selected-by-default
-			// options in Safari work properly
-			if ( elem.parentNode ) {
-				elem.parentNode.selectedIndex;
-			}
-
-			return elem.selected === true;
-		},
-
-		// Contents
-		"empty": function( elem ) {
-			// http://www.w3.org/TR/selectors/#empty-pseudo
-			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
-			//   but not by others (comment: 8; processing instruction: 7; etc.)
-			// nodeType < 6 works because attributes (2) do not appear as children
-			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
-				if ( elem.nodeType < 6 ) {
-					return false;
-				}
-			}
-			return true;
-		},
-
-		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
-		},
-
-		// Element/input types
-		"header": function( elem ) {
-			return rheader.test( elem.nodeName );
-		},
-
-		"input": function( elem ) {
-			return rinputs.test( elem.nodeName );
-		},
-
-		"button": function( elem ) {
-			var name = elem.nodeName.toLowerCase();
-			return name === "input" && elem.type === "button" || name === "button";
-		},
-
-		"text": function( elem ) {
-			var attr;
-			return elem.nodeName.toLowerCase() === "input" &&
-				elem.type === "text" &&
-
-				// Support: IE<8
-				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
-		},
-
-		// Position-in-collection
-		"first": createPositionalPseudo(function() {
-			return [ 0 ];
-		}),
-
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
-			return [ length - 1 ];
-		}),
-
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			return [ argument < 0 ? argument + length : argument ];
-		}),
-
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 0;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
-			var i = 1;
-			for ( ; i < length; i += 2 ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; --i >= 0; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		}),
-
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
-			for ( ; ++i < length; ) {
-				matchIndexes.push( i );
-			}
-			return matchIndexes;
-		})
-	}
-};
-
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
-
-// Add button/input type pseudos
-for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
-	Expr.pseudos[ i ] = createInputPseudo( i );
-}
-for ( i in { submit: true, reset: true } ) {
-	Expr.pseudos[ i ] = createButtonPseudo( i );
-}
-
-// Easy API for creating new setFilters
-function setFilters() {}
-setFilters.prototype = Expr.filters = Expr.pseudos;
-Expr.setFilters = new setFilters();
-
-tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
-	var matched, match, tokens, type,
-		soFar, groups, preFilters,
-		cached = tokenCache[ selector + " " ];
-
-	if ( cached ) {
-		return parseOnly ? 0 : cached.slice( 0 );
-	}
-
-	soFar = selector;
-	groups = [];
-	preFilters = Expr.preFilter;
-
-	while ( soFar ) {
-
-		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
-			if ( match ) {
-				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
-			}
-			groups.push( (tokens = []) );
-		}
-
-		matched = false;
-
-		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
-			matched = match.shift();
-			tokens.push({
-				value: matched,
-				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
-			soFar = soFar.slice( matched.length );
-		}
-
-		// Filters
-		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
-				matched = match.shift();
-				tokens.push({
-					value: matched,
-					type: type,
-					matches: match
-				});
-				soFar = soFar.slice( matched.length );
-			}
-		}
-
-		if ( !matched ) {
-			break;
-		}
-	}
-
-	// Return the length of the invalid excess
-	// if we're just parsing
-	// Otherwise, throw an error or return tokens
-	return parseOnly ?
-		soFar.length :
-		soFar ?
-			Sizzle.error( selector ) :
-			// Cache the tokens
-			tokenCache( selector, groups ).slice( 0 );
-};
-
-function toSelector( tokens ) {
-	var i = 0,
-		len = tokens.length,
-		selector = "";
-	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
-	}
-	return selector;
-}
-
-function addCombinator( matcher, combinator, base ) {
-	var dir = combinator.dir,
-		checkNonElements = base && dir === "parentNode",
-		doneName = done++;
-
-	return combinator.first ?
-		// Check against closest ancestor/preceding element
-		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
-				if ( elem.nodeType === 1 || checkNonElements ) {
-					return matcher( elem, context, xml );
-				}
-			}
-		} :
-
-		// Check against all ancestor/preceding elements
-		function( elem, context, xml ) {
-			var oldCache, uniqueCache, outerCache,
-				newCache = [ dirruns, doneName ];
-
-			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
-			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						if ( matcher( elem, context, xml ) ) {
-							return true;
-						}
-					}
-				}
-			} else {
-				while ( (elem = elem[ dir ]) ) {
-					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
-
-						// Support: IE <9 only
-						// Defend against cloned attroperties (jQuery gh-1709)
-						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
-
-						if ( (oldCache = uniqueCache[ dir ]) &&
-							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
-
-							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
-						} else {
-							// Reuse newcache so results back-propagate to previous elements
-							uniqueCache[ dir ] = newCache;
-
-							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
-								return true;
-							}
-						}
-					}
-				}
-			}
-		};
-}
-
-function elementMatcher( matchers ) {
-	return matchers.length > 1 ?
-		function( elem, context, xml ) {
-			var i = matchers.length;
-			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
-					return false;
-				}
-			}
-			return true;
-		} :
-		matchers[0];
-}
-
-function multipleContexts( selector, contexts, results ) {
-	var i = 0,
-		len = contexts.length;
-	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
-	}
-	return results;
-}
-
-function condense( unmatched, map, filter, context, xml ) {
-	var elem,
-		newUnmatched = [],
-		i = 0,
-		len = unmatched.length,
-		mapped = map != null;
-
-	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
-			if ( !filter || filter( elem, context, xml ) ) {
-				newUnmatched.push( elem );
-				if ( mapped ) {
-					map.push( i );
-				}
-			}
-		}
-	}
-
-	return newUnmatched;
-}
-
-function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postSelector ) {
-	if ( postFilter && !postFilter[ expando ] ) {
-		postFilter = setMatcher( postFilter );
-	}
-	if ( postFinder && !postFinder[ expando ] ) {
-		postFinder = setMatcher( postFinder, postSelector );
-	}
-	return markFunction(function( seed, results, context, xml ) {
-		var temp, i, elem,
-			preMap = [],
-			postMap = [],
-			preexisting = results.length,
-
-			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
-
-			// Prefilter to get matcher input, preserving a map for seed-results synchronization
-			matcherIn = preFilter && ( seed || !selector ) ?
-				condense( elems, preMap, preFilter, context, xml ) :
-				elems,
-
-			matcherOut = matcher ?
-				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
-				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
-
-					// ...intermediate processing is necessary
-					[] :
-
-					// ...otherwise use results directly
-					results :
-				matcherIn;
-
-		// Find primary matches
-		if ( matcher ) {
-			matcher( matcherIn, matcherOut, context, xml );
-		}
-
-		// Apply postFilter
-		if ( postFilter ) {
-			temp = condense( matcherOut, postMap );
-			postFilter( temp, [], context, xml );
-
-			// Un-match failing elements by moving them back to matcherIn
-			i = temp.length;
-			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
-				}
-			}
-		}
-
-		if ( seed ) {
-			if ( postFinder || preFilter ) {
-				if ( postFinder ) {
-					// Get the final matcherOut by condensing this intermediate into postFinder contexts
-					temp = [];
-					i = matcherOut.length;
-					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
-							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
-						}
-					}
-					postFinder( null, (matcherOut = []), temp, xml );
-				}
-
-				// Move matched elements from seed to results to keep them synchronized
-				i = matcherOut.length;
-				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
-
-						seed[temp] = !(results[temp] = elem);
-					}
-				}
-			}
-
-		// Add elements to results, through postFinder if defined
-		} else {
-			matcherOut = condense(
-				matcherOut === results ?
-					matcherOut.splice( preexisting, matcherOut.length ) :
-					matcherOut
-			);
-			if ( postFinder ) {
-				postFinder( null, results, matcherOut, xml );
-			} else {
-				push.apply( results, matcherOut );
-			}
-		}
-	});
-}
-
-function matcherFromTokens( tokens ) {
-	var checkContext, matcher, j,
-		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
-		i = leadingRelative ? 1 : 0,
-
-		// The foundational matcher ensures that elements are reachable from top-level context(s)
-		matchContext = addCombinator( function( elem ) {
-			return elem === checkContext;
-		}, implicitRelative, true ),
-		matchAnyContext = addCombinator( function( elem ) {
-			return indexOf( checkContext, elem ) > -1;
-		}, implicitRelative, true ),
-		matchers = [ function( elem, context, xml ) {
-			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
-					matchContext( elem, context, xml ) :
-					matchAnyContext( elem, context, xml ) );
-			// Avoid hanging onto element (issue #299)
-			checkContext = null;
-			return ret;
-		} ];
-
-	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
-		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
-
-			// Return special upon seeing a positional matcher
-			if ( matcher[ expando ] ) {
-				// Find the next relative operator (if any) for proper handling
-				j = ++i;
-				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
-						break;
-					}
-				}
-				return setMatcher(
-					i > 1 && elementMatcher( matchers ),
-					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
-					).replace( rtrim, "$1" ),
-					matcher,
-					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
-					j < len && toSelector( tokens )
-				);
-			}
-			matchers.push( matcher );
-		}
-	}
-
-	return elementMatcher( matchers );
-}
-
-function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
-	var bySet = setMatchers.length > 0,
-		byElement = elementMatchers.length > 0,
-		superMatcher = function( seed, context, xml, results, outermost ) {
-			var elem, j, matcher,
-				matchedCount = 0,
-				i = "0",
-				unmatched = seed && [],
-				setMatched = [],
-				contextBackup = outermostContext,
-				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
-				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
-				len = elems.length;
-
-			if ( outermost ) {
-				outermostContext = context === document || context || outermost;
-			}
-
-			// Add elements passing elementMatchers directly to results
-			// Support: IE<9, Safari
-			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
-				if ( byElement && elem ) {
-					j = 0;
-					if ( !context && elem.ownerDocument !== document ) {
-						setDocument( elem );
-						xml = !documentIsHTML;
-					}
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context || document, xml) ) {
-							results.push( elem );
-							break;
-						}
-					}
-					if ( outermost ) {
-						dirruns = dirrunsUnique;
-					}
-				}
-
-				// Track unmatched elements for set filters
-				if ( bySet ) {
-					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
-						matchedCount--;
-					}
-
-					// Lengthen the array for every element, matched or not
-					if ( seed ) {
-						unmatched.push( elem );
-					}
-				}
-			}
-
-			// `i` is now the count of elements visited above, and adding it to `matchedCount`
-			// makes the latter nonnegative.
-			matchedCount += i;
-
-			// Apply set filters to unmatched elements
-			// NOTE: This can be skipped if there are no unmatched elements (i.e., `matchedCount`
-			// equals `i`), unless we didn't visit _any_ elements in the above loop because we have
-			// no element matchers and no seed.
-			// Incrementing an initially-string "0" `i` allows `i` to remain a string only in that
-			// case, which will result in a "00" `matchedCount` that differs from `i` but is also
-			// numerically zero.
-			if ( bySet && i !== matchedCount ) {
-				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
-					matcher( unmatched, setMatched, context, xml );
-				}
-
-				if ( seed ) {
-					// Reintegrate element matches to eliminate the need for sorting
-					if ( matchedCount > 0 ) {
-						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
-							}
-						}
-					}
-
-					// Discard index placeholder values to get only actual matches
-					setMatched = condense( setMatched );
-				}
-
-				// Add matches to results
-				push.apply( results, setMatched );
-
-				// Seedless set matches succeeding multiple successful matchers stipulate sorting
-				if ( outermost && !seed && setMatched.length > 0 &&
-					( matchedCount + setMatchers.length ) > 1 ) {
-
-					Sizzle.uniqueSort( results );
-				}
-			}
-
-			// Override manipulation of globals by nested matchers
-			if ( outermost ) {
-				dirruns = dirrunsUnique;
-				outermostContext = contextBackup;
-			}
-
-			return unmatched;
-		};
-
-	return bySet ?
-		markFunction( superMatcher ) :
-		superMatcher;
-}
-
-compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
-	var i,
-		setMatchers = [],
-		elementMatchers = [],
-		cached = compilerCache[ selector + " " ];
-
-	if ( !cached ) {
-		// Generate a function of recursive functions that can be used to check each element
-		if ( !match ) {
-			match = tokenize( selector );
-		}
-		i = match.length;
-		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
-			if ( cached[ expando ] ) {
-				setMatchers.push( cached );
-			} else {
-				elementMatchers.push( cached );
-			}
-		}
-
-		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
-
-		// Save selector and tokenization
-		cached.selector = selector;
-	}
-	return cached;
-};
-
-/**
- * A low-level selection function that works with Sizzle's compiled
- *  selector functions
- * @param {String|Function} selector A selector or a pre-compiled
- *  selector function built with Sizzle.compile
- * @param {Element} context
- * @param {Array} [results]
- * @param {Array} [seed] A set of elements to match against
- */
-select = Sizzle.select = function( selector, context, results, seed ) {
-	var i, tokens, token, type, find,
-		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
-
-	results = results || [];
-
-	// Try to minimize operations if there is only one selector in the list and no seed
-	// (the latter of which guarantees us context)
-	if ( match.length === 1 ) {
-
-		// Reduce context if the leading compound selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				support.getById && context.nodeType === 9 && documentIsHTML &&
-				Expr.relative[ tokens[1].type ] ) {
-
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
-			if ( !context ) {
-				return results;
-
-			// Precompiled matchers will still verify ancestry, so step up a level
-			} else if ( compiled ) {
-				context = context.parentNode;
-			}
-
-			selector = selector.slice( tokens.shift().value.length );
-		}
-
-		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
-		while ( i-- ) {
-			token = tokens[i];
-
-			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
-				break;
-			}
-			if ( (find = Expr.find[ type ]) ) {
-				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
-
-					// If seed is empty or no tokens remain, we can return early
-					tokens.splice( i, 1 );
-					selector = seed.length && toSelector( tokens );
-					if ( !selector ) {
-						push.apply( results, seed );
-						return results;
-					}
-
-					break;
-				}
-			}
-		}
-	}
-
-	// Compile and execute a filtering function if one is not provided
-	// Provide `match` to avoid retokenization if we modified the selector above
-	( compiled || compile( selector, match ) )(
-		seed,
-		context,
-		!documentIsHTML,
-		results,
-		!context || rsibling.test( selector ) && testContext( context.parentNode ) || context
-	);
-	return results;
-};
-
-// One-time assignments
-
-// Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
-
-// Support: Chrome 14-35+
-// Always assume duplicates if they aren't passed to the comparison function
-support.detectDuplicates = !!hasDuplicate;
-
-// Initialize against the default document
-setDocument();
-
-// Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
-// Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( div1 ) {
-	// Should return 1, but returns 4 (following)
-	return div1.compareDocumentPosition( document.createElement("div") ) & 1;
-});
-
-// Support: IE<8
-// Prevent attribute/property "interpolation"
-// http://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( div ) {
-	div.innerHTML = "<a href='#'></a>";
-	return div.firstChild.getAttribute("href") === "#" ;
-}) ) {
-	addHandle( "type|href|height|width", function( elem, name, isXML ) {
-		if ( !isXML ) {
-			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
-		}
-	});
-}
-
-// Support: IE<9
-// Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( div ) {
-	div.innerHTML = "<input/>";
-	div.firstChild.setAttribute( "value", "" );
-	return div.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
-		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
-			return elem.defaultValue;
-		}
-	});
-}
-
-// Support: IE<9
-// Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( div ) {
-	return div.getAttribute("disabled") == null;
-}) ) {
-	addHandle( booleans, function( elem, name, isXML ) {
-		var val;
-		if ( !isXML ) {
-			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
-					val.value :
-				null;
-		}
-	});
-}
-
-return Sizzle;
-
-})( window );
-
-
-
-jQuery.find = Sizzle;
-jQuery.expr = Sizzle.selectors;
-jQuery.expr[ ":" ] = jQuery.expr.pseudos;
-jQuery.uniqueSort = jQuery.unique = Sizzle.uniqueSort;
-jQuery.text = Sizzle.getText;
-jQuery.isXMLDoc = Sizzle.isXML;
-jQuery.contains = Sizzle.contains;
-
-
-
-var dir = function( elem, dir, until ) {
-	var matched = [],
-		truncate = until !== undefined;
-
-	while ( ( elem = elem[ dir ] ) && elem.nodeType !== 9 ) {
-		if ( elem.nodeType === 1 ) {
-			if ( truncate && jQuery( elem ).is( until ) ) {
-				break;
-			}
-			matched.push( elem );
-		}
-	}
-	return matched;
-};
-
-
-var siblings = function( n, elem ) {
-	var matched = [];
-
-	for ( ; n; n = n.nextSibling ) {
-		if ( n.nodeType === 1 && n !== elem ) {
-			matched.push( n );
-		}
-	}
-
-	return matched;
-};
-
-
-var rneedsContext = jQuery.expr.match.needsContext;
-
-var rsingleTag = ( /^<([\w-]+)\s*\/?>(?:<\/\1>|)$/ );
-
-
-
-var risSimple = /^.[^:#\[\.,]*$/;
-
-// Implement the identical functionality for filter and not
-function winnow( elements, qualifier, not ) {
-	if ( jQuery.isFunction( qualifier ) ) {
-		return jQuery.grep( elements, function( elem, i ) {
-			/* jshint -W018 */
-			return !!qualifier.call( elem, i, elem ) !== not;
-		} );
-
-	}
-
-	if ( qualifier.nodeType ) {
-		return jQuery.grep( elements, function( elem ) {
-			return ( elem === qualifier ) !== not;
-		} );
-
-	}
-
-	if ( typeof qualifier === "string" ) {
-		if ( risSimple.test( qualifier ) ) {
-			return jQuery.filter( qualifier, elements, not );
-		}
-
-		qualifier = jQuery.filter( qualifier, elements );
-	}
-
-	return jQuery.grep( elements, function( elem ) {
-		return ( indexOf.call( qualifier, elem ) > -1 ) !== not;
-	} );
-}
-
-jQuery.filter = function( expr, elems, not ) {
-	var elem = elems[ 0 ];
-
-	if ( not ) {
-		expr = ":not(" + expr + ")";
-	}
-
-	return elems.length === 1 && elem.nodeType === 1 ?
-		jQuery.find.matchesSelector( elem, expr ) ? [ elem ] : [] :
-		jQuery.find.matches( expr, jQuery.grep( elems, function( elem ) {
-			return elem.nodeType === 1;
-		} ) );
-};
-
-jQuery.fn.extend( {
-	find: function( selector ) {
-		var i,
-			len = this.length,
-			ret = [],
-			self = this;
-
-		if ( typeof selector !== "string" ) {
-			return this.pushStack( jQuery( selector ).filter( function() {
-				for ( i = 0; i < len; i++ ) {
-					if ( jQuery.contains( self[ i ], this ) ) {
-						return true;
-					}
-				}
-			} ) );
-		}
-
-		for ( i = 0; i < len; i++ ) {
-			jQuery.find( selector, self[ i ], ret );
-		}
-
-		// Needed because $( selector, context ) becomes $( context ).find( selector )
-		ret = this.pushStack( len > 1 ? jQuery.unique( ret ) : ret );
-		ret.selector = this.selector ? this.selector + " " + selector : selector;
-		return ret;
-	},
-	filter: function( selector ) {
-		return this.pushStack( winnow( this, selector || [], false ) );
-	},
-	not: function( selector ) {
-		return this.pushStack( winnow( this, selector || [], true ) );
-	},
-	is: function( selector ) {
-		return !!winnow(
-			this,
-
-			// If this is a positional/relative selector, check membership in the returned set
-			// so $("p:first").is("p:last") won't return true for a doc with two "p".
-			typeof selector === "string" && rneedsContext.test( selector ) ?
-				jQuery( selector ) :
-				selector || [],
-			false
-		).length;
-	}
-} );
-
-
-// Initialize a jQuery object
-
-
-// A central reference to the root jQuery(document)
-var rootjQuery,
-
-	// A simple way to check for HTML strings
-	// Prioritize #id over <tag> to avoid XSS via location.hash (#9521)
-	// Strict HTML recognition (#11290: must start with <)
-	rquickExpr = /^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,
-
-	init = jQuery.fn.init = function( selector, context, root ) {
-		var match, elem;
-
-		// HANDLE: $(""), $(null), $(undefined), $(false)
-		if ( !selector ) {
-			return this;
-		}
-
-		// Method init() accepts an alternate rootjQuery
-		// so migrate can support jQuery.sub (gh-2101)
-		root = root || rootjQuery;
-
-		// Handle HTML strings
-		if ( typeof selector === "string" ) {
-			if ( selector[ 0 ] === "<" &&
-				selector[ selector.length - 1 ] === ">" &&
-				selector.length >= 3 ) {
-
-				// Assume that strings that start and end with <> are HTML and skip the regex check
-				match = [ null, selector, null ];
-
-			} else {
-				match = rquickExpr.exec( selector );
-			}
-
-			// Match html or make sure no context is specified for #id
-			if ( match && ( match[ 1 ] || !context ) ) {
-
-				// HANDLE: $(html) -> $(array)
-				if ( match[ 1 ] ) {
-					context = context instanceof jQuery ? context[ 0 ] : context;
-
-					// Option to run scripts is true for back-compat
-					// Intentionally let the error be thrown if parseHTML is not present
-					jQuery.merge( this, jQuery.parseHTML(
-						match[ 1 ],
-						context && context.nodeType ? context.ownerDocument || context : document,
-						true
-					) );
-
-					// HANDLE: $(html, props)
-					if ( rsingleTag.test( match[ 1 ] ) && jQuery.isPlainObject( context ) ) {
-						for ( match in context ) {
-
-							// Properties of context are called as methods if possible
-							if ( jQuery.isFunction( this[ match ] ) ) {
-								this[ match ]( context[ match ] );
-
-							// ...and otherwise set as attributes
-							} else {
-								this.attr( match, context[ match ] );
-							}
-						}
-					}
-
-					return this;
-
-				// HANDLE: $(#id)
-				} else {
-					elem = document.getElementById( match[ 2 ] );
-
-					// Support: Blackberry 4.6
-					// gEBID returns nodes no longer in the document (#6963)
-					if ( elem && elem.parentNode ) {
-
-						// Inject the element directly into the jQuery object
-						this.length = 1;
-						this[ 0 ] = elem;
-					}
-
-					this.context = document;
-					this.selector = selector;
-					return this;
-				}
-
-			// HANDLE: $(expr, $(...))
-			} else if ( !context || context.jquery ) {
-				return ( context || root ).find( selector );
-
-			// HANDLE: $(expr, context)
-			// (which is just equivalent to: $(context).find(expr)
-			} else {
-				return this.constructor( context ).find( selector );
-			}
-
-		// HANDLE: $(DOMElement)
-		} else if ( selector.nodeType ) {
-			this.context = this[ 0 ] = selector;
-			this.length = 1;
-			return this;
-
-		// HANDLE: $(function)
-		// Shortcut for document ready
-		} else if ( jQuery.isFunction( selector ) ) {
-			return root.ready !== undefined ?
-				root.ready( selector ) :
-
-				// Execute immediately if ready is not present
-				selector( jQuery );
-		}
-
-		if ( selector.selector !== undefined ) {
-			this.selector = selector.selector;
-			this.context = selector.context;
-		}
-
-		return jQuery.makeArray( selector, this );
-	};
-
-// Give the init function the jQuery prototype for later instantiation
-init.prototype = jQuery.fn;
-
-// Initialize central reference
-rootjQuery = jQuery( document );
-
-
-var rparentsprev = /^(?:parents|prev(?:Until|All))/,
-
-	// Methods guaranteed to produce a unique set when starting from a unique set
-	guaranteedUnique = {
-		children: true,
-		contents: true,
-		next: true,
-		prev: true
-	};
-
-jQuery.fn.extend( {
-	has: function( target ) {
-		var targets = jQuery( target, this ),
-			l = targets.length;
-
-		return this.filter( function() {
-			var i = 0;
-			for ( ; i < l; i++ ) {
-				if ( jQuery.contains( this, targets[ i ] ) ) {
-					return true;
-				}
-			}
-		} );
-	},
-
-	closest: function( selectors, context ) {
-		var cur,
-			i = 0,
-			l = this.length,
-			matched = [],
-			pos = rneedsContext.test( selectors ) || typeof selectors !== "string" ?
-				jQuery( selectors, context || this.context ) :
-				0;
-
-		for ( ; i < l; i++ ) {
-			for ( cur = this[ i ]; cur && cur !== context; cur = cur.parentNode ) {
-
-				// Always skip document fragments
-				if ( cur.nodeType < 11 && ( pos ?
-					pos.index( cur ) > -1 :
-
-					// Don't pass non-elements to Sizzle
-					cur.nodeType === 1 &&
-						jQuery.find.matchesSelector( cur, selectors ) ) ) {
-
-					matched.push( cur );
-					break;
-				}
-			}
-		}
-
-		return this.pushStack( matched.length > 1 ? jQuery.uniqueSort( matched ) : matched );
-	},
-
-	// Determine the position of an element within the set
-	index: function( elem ) {
-
-		// No argument, return index in parent
-		if ( !elem ) {
-			return ( this[ 0 ] && this[ 0 ].parentNode ) ? this.first().prevAll().length : -1;
-		}
-
-		// Index in selector
-		if ( typeof elem === "string" ) {
-			return indexOf.call( jQuery( elem ), this[ 0 ] );
-		}
-
-		// Locate the position of the desired element
-		return indexOf.call( this,
-
-			// If it receives a jQuery object, the first element is used
-			elem.jquery ? elem[ 0 ] : elem
-		);
-	},
-
-	add: function( selector, context ) {
-		return this.pushStack(
-			jQuery.uniqueSort(
-				jQuery.merge( this.get(), jQuery( selector, context ) )
-			)
-		);
-	},
-
-	addBack: function( selector ) {
-		return this.add( selector == null ?
-			this.prevObject : this.prevObject.filter( selector )
-		);
-	}
-} );
-
-function sibling( cur, dir ) {
-	while ( ( cur = cur[ dir ] ) && cur.nodeType !== 1 ) {}
-	return cur;
-}
-
-jQuery.each( {
-	parent: function( elem ) {
-		var parent = elem.parentNode;
-		return parent && parent.nodeType !== 11 ? parent : null;
-	},
-	parents: function( elem ) {
-		return dir( elem, "parentNode" );
-	},
-	parentsUntil: function( elem, i, until ) {
-		return dir( elem, "parentNode", until );
-	},
-	next: function( elem ) {
-		return sibling( elem, "nextSibling" );
-	},
-	prev: function( elem ) {
-		return sibling( elem, "previousSibling" );
-	},
-	nextAll: function( elem ) {
-		return dir( elem, "nextSibling" );
-	},
-	prevAll: function( elem ) {
-		return dir( elem, "previousSibling" );
-	},
-	nextUntil: function( elem, i, until ) {
-		return dir( elem, "nextSibling", until );
-	},
-	prevUntil: function( elem, i, until ) {
-		return dir( elem, "previousSibling", until );
-	},
-	siblings: function( elem ) {
-		return siblings( ( elem.parentNode || {} ).firstChild, elem );
-	},
-	children: function( elem ) {
-		return siblings( elem.firstChild );
-	},
-	contents: function( elem ) {
-		return elem.contentDocument || jQuery.merge( [], elem.childNodes );
-	}
-}, function( name, fn ) {
-	jQuery.fn[ name ] = function( until, selector ) {
-		var matched = jQuery.map( this, fn, until );
-
-		if ( name.slice( -5 ) !== "Until" ) {
-			selector = until;
-		}
-
-		if ( selector && typeof selector === "string" ) {
-			matched = jQuery.filter( selector, matched );
-		}
-
-		if ( this.length > 1 ) {
-
-			// Remove duplicates
-			if ( !guaranteedUnique[ name ] ) {
-				jQuery.uniqueSort( matched );
-			}
-
-			// Reverse order for parents* and prev-derivatives
-			if ( rparentsprev.test( name ) ) {
-				matched.reverse();
-			}
-		}
-
-		return this.pushStack( matched );
-	};
-} );
-var rnotwhite = ( /\S+/g );
-
-
-
-// Convert String-formatted options into Object-formatted ones
-function createOptions( options ) {
-	var object = {};
-	jQuery.each( options.match( rnotwhite ) || [], function( _, flag ) {
-		object[ flag ] = true;
-	} );
-	return object;
-}
-
-/*
- * Create a callback list using the following parameters:
- *
- *	options: an optional list of space-separated options that will change how
- *			the callback list behaves or a more traditional option object
- *
- * By default a callback list will act like an event callback list and can be
- * "fired" multiple times.
- *
- * Possible options:
- *
- *	once:			will ensure the callback list can only be fired once (like a Deferred)
- *
- *	memory:			will keep track of previous values and will call any callback added
- *					after the list has been fired right away with the latest "memorized"
- *					values (like a Deferred)
- *
- *	unique:			will ensure a callback can only be added once (no duplicate in the list)
- *
- *	stopOnFalse:	interrupt callings when a callback returns false
- *
- */
-jQuery.Callbacks = function( options ) {
-
-	// Convert options from String-formatted to Object-formatted if needed
-	// (we check in cache first)
-	options = typeof options === "string" ?
-		createOptions( options ) :
-		jQuery.extend( {}, options );
-
-	var // Flag to know if list is currently firing
-		firing,
-
-		// Last fire value for non-forgettable lists
-		memory,
-
-		// Flag to know if list was already fired
-		fired,
-
-		// Flag to prevent firing
-		locked,
-
-		// Actual callback list
-		list = [],
-
-		// Queue of execution data for repeatable lists
-		queue = [],
-
-		// Index of currently firing callback (modified by add/remove as needed)
-		firingIndex = -1,
-
-		// Fire callbacks
-		fire = function() {
-
-			// Enforce single-firing
-			locked = options.once;
-
-			// Execute callbacks for all pending executions,
-			// respecting firingIndex overrides and runtime changes
-			fired = firing = true;
-			for ( ; queue.length; firingIndex = -1 ) {
-				memory = queue.shift();
-				while ( ++firingIndex < list.length ) {
-
-					// Run callback and check for early termination
-					if ( list[ firingIndex ].apply( memory[ 0 ], memory[ 1 ] ) === false &&
-						options.stopOnFalse ) {
-
-						// Jump to end and forget the data so .add doesn't re-fire
-						firingIndex = list.length;
-						memory = false;
-					}
-				}
-			}
-
-			// Forget the data if we're done with it
-			if ( !options.memory ) {
-				memory = false;
-			}
-
-			firing = false;
-
-			// Clean up if we're done firing for good
-			if ( locked ) {
-
-				// Keep an empty list if we have data for future add calls
-				if ( memory ) {
-					list = [];
-
-				// Otherwise, this object is spent
-				} else {
-					list = "";
-				}
-			}
-		},
-
-		// Actual Callbacks object
-		self = {
-
-			// Add a callback or a collection of callbacks to the list
-			add: function() {
-				if ( list ) {
-
-					// If we have memory from a past run, we should fire after adding
-					if ( memory && !firing ) {
-						firingIndex = list.length - 1;
-						queue.push( memory );
-					}
-
-					( function add( args ) {
-						jQuery.each( args, function( _, arg ) {
-							if ( jQuery.isFunction( arg ) ) {
-								if ( !options.unique || !self.has( arg ) ) {
-									list.push( arg );
-								}
-							} else if ( arg && arg.length && jQuery.type( arg ) !== "string" ) {
-
-								// Inspect recursively
-								add( arg );
-							}
-						} );
-					} )( arguments );
-
-					if ( memory && !firing ) {
-						fire();
-					}
-				}
-				return this;
-			},
-
-			// Remove a callback from the list
-			remove: function() {
-				jQuery.each( arguments, function( _, arg ) {
-					var index;
-					while ( ( index = jQuery.inArray( arg, list, index ) ) > -1 ) {
-						list.splice( index, 1 );
-
-						// Handle firing indexes
-						if ( index <= firingIndex ) {
-							firingIndex--;
-						}
-					}
-				} );
-				return this;
-			},
-
-			// Check if a given callback is in the list.
-			// If no argument is given, return whether or not list has callbacks attached.
-			has: function( fn ) {
-				return fn ?
-					jQuery.inArray( fn, list ) > -1 :
-					list.length > 0;
-			},
-
-			// Remove all callbacks from the list
-			empty: function() {
-				if ( list ) {
-					list = [];
-				}
-				return this;
-			},
-
-			// Disable .fire and .add
-			// Abort any current/pending executions
-			// Clear all callbacks and values
-			disable: function() {
-				locked = queue = [];
-				list = memory = "";
-				return this;
-			},
-			disabled: function() {
-				return !list;
-			},
-
-			// Disable .fire
-			// Also disable .add unless we have memory (since it would have no effect)
-			// Abort any pending executions
-			lock: function() {
-				locked = queue = [];
-				if ( !memory ) {
-					list = memory = "";
-				}
-				return this;
-			},
-			locked: function() {
-				return !!locked;
-			},
-
-			// Call all callbacks with the given context and arguments
-			fireWith: function( context, args ) {
-				if ( !locked ) {
-					args = args || [];
-					args = [ context, args.slice ? args.slice() : args ];
-					queue.push( args );
-					if ( !firing ) {
-						fire();
-					}
-				}
-				return this;
-			},
-
-			// Call all the callbacks with the given arguments
-			fire: function() {
-				self.fireWith( this, arguments );
-				return this;
-			},
-
-			// To know if the callbacks have already been called at least once
-			fired: function() {
-				return !!fired;
-			}
-		};
-
-	return self;
-};
-
-
-jQuery.extend( {
-
-	Deferred: function( func ) {
-		var tuples = [
-
-				// action, add listener, listener list, final state
-				[ "resolve", "done", jQuery.Callbacks( "once memory" ), "resolved" ],
-				[ "reject", "fail", jQuery.Callbacks( "once memory" ), "rejected" ],
-				[ "notify", "progress", jQuery.Callbacks( "memory" ) ]
-			],
-			state = "pending",
-			promise = {
-				state: function() {
-					return state;
-				},
-				always: function() {
-					deferred.done( arguments ).fail( arguments );
-					return this;
-				},
-				then: function( /* fnDone, fnFail, fnProgress */ ) {
-					var fns = arguments;
-					return jQuery.Deferred( function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
-							var fn = jQuery.isFunction( fns[ i ] ) && fns[ i ];
-
-							// deferred[ done | fail | progress ] for forwarding actions to newDefer
-							deferred[ tuple[ 1 ] ]( function() {
-								var returned = fn && fn.apply( this, arguments );
-								if ( returned && jQuery.isFunction( returned.promise ) ) {
-									returned.promise()
-										.progress( newDefer.notify )
-										.done( newDefer.resolve )
-										.fail( newDefer.reject );
-								} else {
-									newDefer[ tuple[ 0 ] + "With" ](
-										this === promise ? newDefer.promise() : this,
-										fn ? [ returned ] : arguments
-									);
-								}
-							} );
-						} );
-						fns = null;
-					} ).promise();
-				},
-
-				// Get a promise for this deferred
-				// If obj is provided, the promise aspect is added to the object
-				promise: function( obj ) {
-					return obj != null ? jQuery.extend( obj, promise ) : promise;
-				}
-			},
-			deferred = {};
-
-		// Keep pipe for back-compat
-		promise.pipe = promise.then;
-
-		// Add list-specific methods
-		jQuery.each( tuples, function( i, tuple ) {
-			var list = tuple[ 2 ],
-				stateString = tuple[ 3 ];
-
-			// promise[ done | fail | progress ] = list.add
-			promise[ tuple[ 1 ] ] = list.add;
-
-			// Handle state
-			if ( stateString ) {
-				list.add( function() {
-
-					// state = [ resolved | rejected ]
-					state = stateString;
-
-				// [ reject_list | resolve_list ].disable; progress_list.lock
-				}, tuples[ i ^ 1 ][ 2 ].disable, tuples[ 2 ][ 2 ].lock );
-			}
-
-			// deferred[ resolve | reject | notify ]
-			deferred[ tuple[ 0 ] ] = function() {
-				deferred[ tuple[ 0 ] + "With" ]( this === deferred ? promise : this, arguments );
-				return this;
-			};
-			deferred[ tuple[ 0 ] + "With" ] = list.fireWith;
-		} );
-
-		// Make the deferred a promise
-		promise.promise( deferred );
-
-		// Call given func if any
-		if ( func ) {
-			func.call( deferred, deferred );
-		}
-
-		// All done!
-		return deferred;
-	},
-
-	// Deferred helper
-	when: function( subordinate /* , ..., subordinateN */ ) {
-		var i = 0,
-			resolveValues = slice.call( arguments ),
-			length = resolveValues.length,
-
-			// the count of uncompleted subordinates
-			remaining = length !== 1 ||
-				( subordinate && jQuery.isFunction( subordinate.promise ) ) ? length : 0,
-
-			// the master Deferred.
-			// If resolveValues consist of only a single Deferred, just use that.
-			deferred = remaining === 1 ? subordinate : jQuery.Deferred(),
-
-			// Update function for both resolve and progress values
-			updateFunc = function( i, contexts, values ) {
-				return function( value ) {
-					contexts[ i ] = this;
-					values[ i ] = arguments.length > 1 ? slice.call( arguments ) : value;
-					if ( values === progressValues ) {
-						deferred.notifyWith( contexts, values );
-					} else if ( !( --remaining ) ) {
-						deferred.resolveWith( contexts, values );
-					}
-				};
-			},
-
-			progressValues, progressContexts, resolveContexts;
-
-		// Add listeners to Deferred subordinates; treat others as resolved
-		if ( length > 1 ) {
-			progressValues = new Array( length );
-			progressContexts = new Array( length );
-			resolveContexts = new Array( length );
-			for ( ; i < length; i++ ) {
-				if ( resolveValues[ i ] && jQuery.isFunction( resolveValues[ i ].promise ) ) {
-					resolveValues[ i ].promise()
-						.progress( updateFunc( i, progressContexts, progressValues ) )
-						.done( updateFunc( i, resolveContexts, resolveValues ) )
-						.fail( deferred.reject );
-				} else {
-					--remaining;
-				}
-			}
-		}
-
-		// If we're not waiting on anything, resolve the master
-		if ( !remaining ) {
-			deferred.resolveWith( resolveContexts, resolveValues );
-		}
-
-		return deferred.promise();
-	}
-} );
-
-
-// The deferred used on DOM ready
-var readyList;
-
-jQuery.fn.ready = function( fn ) {
-
-	// Add the callback
-	jQuery.ready.promise().done( fn );
-
-	return this;
-};
-
-jQuery.extend( {
-
-	// Is the DOM ready to be used? Set to true once it occurs.
-	isReady: false,
-
-	// A counter to track how many items to wait for before
-	// the ready event fires. See #6781
-	readyWait: 1,
-
-	// Hold (or release) the ready event
-	holdReady: function( hold ) {
-		if ( hold ) {
-			jQuery.readyWait++;
-		} else {
-			jQuery.ready( true );
-		}
-	},
-
-	// Handle when the DOM is ready
-	ready: function( wait ) {
-
-		// Abort if there are pending holds or we're already ready
-		if ( wait === true ? --jQuery.readyWait : jQuery.isReady ) {
-			return;
-		}
-
-		// Remember that the DOM is ready
-		jQuery.isReady = true;
-
-		// If a normal DOM Ready event fired, decrement, and wait if need be
-		if ( wait !== true && --jQuery.readyWait > 0 ) {
-			return;
-		}
-
-		// If there are functions bound, to execute
-		readyList.resolveWith( document, [ jQuery ] );
-
-		// Trigger any bound ready events
-		if ( jQuery.fn.triggerHandler ) {
-			jQuery( document ).triggerHandler( "ready" );
-			jQuery( document ).off( "ready" );
-		}
-	}
-} );
-
-/**
- * The ready event handler and self cleanup method
- */
-function completed() {
-	document.removeEventListener( "DOMContentLoaded", completed );
-	window.removeEventListener( "load", completed );
-	jQuery.ready();
-}
-
-jQuery.ready.promise = function( obj ) {
-	if ( !readyList ) {
-
-		readyList = jQuery.Deferred();
-
-		// Catch cases where $(document).ready() is called
-		// after the browser event has already occurred.
-		// Support: IE9-10 only
-		// Older IE sometimes signals "interactive" too soon
-		if ( document.readyState === "complete" ||
-			( document.readyState !== "loading" && !document.documentElement.doScroll ) ) {
-
-			// Handle it asynchronously to allow scripts the opportunity to delay ready
-			window.setTimeout( jQuery.ready );
-
-		} else {
-
-			// Use the handy event callback
-			document.addEventListener( "DOMContentLoaded", completed );
-
-			// A fallback to window.onload, that will always work
-			window.addEventListener( "load", completed );
-		}
-	}
-	return readyList.promise( obj );
-};
-
-// Kick off the DOM ready check even if the user does not
-jQuery.ready.promise();
-
-
-
-
-// Multifunctional method to get and set values of a collection
-// The value/s can optionally be executed if it's a function
-var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
-	var i = 0,
-		len = elems.length,
-		bulk = key == null;
-
-	// Sets many values
-	if ( jQuery.type( key ) === "object" ) {
-		chainable = true;
-		for ( i in key ) {
-			access( elems, fn, i, key[ i ], true, emptyGet, raw );
-		}
-
-	// Sets one value
-	} else if ( value !== undefined ) {
-		chainable = true;
-
-		if ( !jQuery.isFunction( value ) ) {
-			raw = true;
-		}
-
-		if ( bulk ) {
-
-			// Bulk operations run against the entire set
-			if ( raw ) {
-				fn.call( elems, value );
-				fn = null;
-
-			// ...except when executing function values
-			} else {
-				bulk = fn;
-				fn = function( elem, key, value ) {
-					return bulk.call( jQuery( elem ), value );
-				};
-			}
-		}
-
-		if ( fn ) {
-			for ( ; i < len; i++ ) {
-				fn(
-					elems[ i ], key, raw ?
-					value :
-					value.call( elems[ i ], i, fn( elems[ i ], key ) )
-				);
-			}
-		}
-	}
-
-	return chainable ?
-		elems :
-
-		// Gets
-		bulk ?
-			fn.call( elems ) :
-			len ? fn( elems[ 0 ], key ) : emptyGet;
-};
-var acceptData = function( owner ) {
-
-	// Accepts only:
-	//  - Node
-	//    - Node.ELEMENT_NODE
-	//    - Node.DOCUMENT_NODE
-	//  - Object
-	//    - Any
-	/* jshint -W018 */
-	return owner.nodeType === 1 || owner.nodeType === 9 || !( +owner.nodeType );
-};
-
-
-
-
-function Data() {
-	this.expando = jQuery.expando + Data.uid++;
-}
-
-Data.uid = 1;
-
-Data.prototype = {
-
-	register: function( owner, initial ) {
-		var value = initial || {};
-
-		// If it is a node unlikely to be stringify-ed or looped over
-		// use plain assignment
-		if ( owner.nodeType ) {
-			owner[ this.expando ] = value;
-
-		// Otherwise secure it in a non-enumerable, non-writable property
-		// configurability must be true to allow the property to be
-		// deleted with the delete operator
-		} else {
-			Object.defineProperty( owner, this.expando, {
-				value: value,
-				writable: true,
-				configurable: true
-			} );
-		}
-		return owner[ this.expando ];
-	},
-	cache: function( owner ) {
-
-		// We can accept data for non-element nodes in modern browsers,
-		// but we should not, see #8335.
-		// Always return an empty object.
-		if ( !acceptData( owner ) ) {
-			return {};
-		}
-
-		// Check if the owner object already has a cache
-		var value = owner[ this.expando ];
-
-		// If not, create one
-		if ( !value ) {
-			value = {};
-
-			// We can accept data for non-element nodes in modern browsers,
-			// but we should not, see #8335.
-			// Always return an empty object.
-			if ( acceptData( owner ) ) {
-
-				// If it is a node unlikely to be stringify-ed or looped over
-				// use plain assignment
-				if ( owner.nodeType ) {
-					owner[ this.expando ] = value;
-
-				// Otherwise secure it in a non-enumerable property
-				// configurable must be true to allow the property to be
-				// deleted when data is removed
-				} else {
-					Object.defineProperty( owner, this.expando, {
-						value: value,
-						configurable: true
-					} );
-				}
-			}
-		}
-
-		return value;
-	},
-	set: function( owner, data, value ) {
-		var prop,
-			cache = this.cache( owner );
-
-		// Handle: [ owner, key, value ] args
-		if ( typeof data === "string" ) {
-			cache[ data ] = value;
-
-		// Handle: [ owner, { properties } ] args
-		} else {
-
-			// Copy the properties one-by-one to the cache object
-			for ( prop in data ) {
-				cache[ prop ] = data[ prop ];
-			}
-		}
-		return cache;
-	},
-	get: function( owner, key ) {
-		return key === undefined ?
-			this.cache( owner ) :
-			owner[ this.expando ] && owner[ this.expando ][ key ];
-	},
-	access: function( owner, key, value ) {
-		var stored;
-
-		// In cases where either:
-		//
-		//   1. No key was specified
-		//   2. A string key was specified, but no value provided
-		//
-		// Take the "read" path and allow the get method to determine
-		// which value to return, respectively either:
-		//
-		//   1. The entire cache object
-		//   2. The data stored at the key
-		//
-		if ( key === undefined ||
-				( ( key && typeof key === "string" ) && value === undefined ) ) {
-
-			stored = this.get( owner, key );
-
-			return stored !== undefined ?
-				stored : this.get( owner, jQuery.camelCase( key ) );
-		}
-
-		// When the key is not a string, or both a key and value
-		// are specified, set or extend (existing objects) with either:
-		//
-		//   1. An object of properties
-		//   2. A key and value
-		//
-		this.set( owner, key, value );
-
-		// Since the "set" path can have two possible entry points
-		// return the expected data based on which path was taken[*]
-		return value !== undefined ? value : key;
-	},
-	remove: function( owner, key ) {
-		var i, name, camel,
-			cache = owner[ this.expando ];
-
-		if ( cache === undefined ) {
-			return;
-		}
-
-		if ( key === undefined ) {
-			this.register( owner );
-
-		} else {
-
-			// Support array or space separated string of keys
-			if ( jQuery.isArray( key ) ) {
-
-				// If "name" is an array of keys...
-				// When data is initially created, via ("key", "val") signature,
-				// keys will be converted to camelCase.
-				// Since there is no way to tell _how_ a key was added, remove
-				// both plain key and camelCase key. #12786
-				// This will only penalize the array argument path.
-				name = key.concat( key.map( jQuery.camelCase ) );
-			} else {
-				camel = jQuery.camelCase( key );
-
-				// Try the string as a key before any manipulation
-				if ( key in cache ) {
-					name = [ key, camel ];
-				} else {
-
-					// If a key with the spaces exists, use it.
-					// Otherwise, create an array by matching non-whitespace
-					name = camel;
-					name = name in cache ?
-						[ name ] : ( name.match( rnotwhite ) || [] );
-				}
-			}
-
-			i = name.length;
-
-			while ( i-- ) {
-				delete cache[ name[ i ] ];
-			}
-		}
-
-		// Remove the expando if there's no more data
-		if ( key === undefined || jQuery.isEmptyObject( cache ) ) {
-
-			// Support: Chrome <= 35-45+
-			// Webkit & Blink performance suffers when deleting properties
-			// from DOM nodes, so set to undefined instead
-			// https://code.google.com/p/chromium/issues/detail?id=378607
-			if ( owner.nodeType ) {
-				owner[ this.expando ] = undefined;
-			} else {
-				delete owner[ this.expando ];
-			}
-		}
-	},
-	hasData: function( owner ) {
-		var cache = owner[ this.expando ];
-		return cache !== undefined && !jQuery.isEmptyObject( cache );
-	}
-};
-var dataPriv = new Data();
-
-var dataUser = new Data();
-
-
-
-//	Implementation Summary
-//
-//	1. Enforce API surface and semantic compatibility with 1.9.x branch
-//	2. Improve the module's maintainability by reducing the storage
-//		paths to a single mechanism.
-//	3. Use the same single mechanism to support "private" and "user" data.
-//	4. _Never_ expose "private" data to user code (TODO: Drop _data, _removeData)
-//	5. Avoid exposing implementation details on user objects (eg. expando properties)
-//	6. Provide a clear path for implementation upgrade to WeakMap in 2014
-
-var rbrace = /^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,
-	rmultiDash = /[A-Z]/g;
-
-function dataAttr( elem, key, data ) {
-	var name;
-
-	// If nothing was found internally, try to fetch any
-	// data from the HTML5 data-* attribute
-	if ( data === undefined && elem.nodeType === 1 ) {
-		name = "data-" + key.replace( rmultiDash, "-$&" ).toLowerCase();
-		data = elem.getAttribute( name );
-
-		if ( typeof data === "string" ) {
-			try {
-				data = data === "true" ? true :
-					data === "false" ? false :
-					data === "null" ? null :
-
-					// Only convert to a number if it doesn't change the string
-					+data + "" === data ? +data :
-					rbrace.test( data ) ? jQuery.parseJSON( data ) :
-					data;
-			} catch ( e ) {}
-
-			// Make sure we set the data so it isn't changed later
-			dataUser.set( elem, key, data );
-		} else {
-			data = undefined;
-		}
-	}
-	return data;
-}
-
-jQuery.extend( {
-	hasData: function( elem ) {
-		return dataUser.hasData( elem ) || dataPriv.hasData( elem );
-	},
-
-	data: function( elem, name, data ) {
-		return dataUser.access( elem, name, data );
-	},
-
-	removeData: function( elem, name ) {
-		dataUser.remove( elem, name );
-	},
-
-	// TODO: Now that all calls to _data and _removeData have been replaced
-	// with direct calls to dataPriv methods, these can be deprecated.
-	_data: function( elem, name, data ) {
-		return dataPriv.access( elem, name, data );
-	},
-
-	_removeData: function( elem, name ) {
-		dataPriv.remove( elem, name );
-	}
-} );
-
-jQuery.fn.extend( {
-	data: function( key, value ) {
-		var i, name, data,
-			elem = this[ 0 ],
-			attrs = elem && elem.attributes;
-
-		// Gets all values
-		if ( key === undefined ) {
-			if ( this.length ) {
-				data = dataUser.get( elem );
-
-				if ( elem.nodeType === 1 && !dataPriv.get( elem, "hasDataAttrs" ) ) {
-					i = attrs.length;
-					while ( i-- ) {
-
-						// Support: IE11+
-						// The attrs elements can be null (#14894)
-						if ( attrs[ i ] ) {
-							name = attrs[ i ].name;
-							if ( name.indexOf( "data-" ) === 0 ) {
-								name = jQuery.camelCase( name.slice( 5 ) );
-								dataAttr( elem, name, data[ name ] );
-							}
-						}
-					}
-					dataPriv.set( elem, "hasDataAttrs", true );
-				}
-			}
-
-			return data;
-		}
-
-		// Sets multiple values
-		if ( typeof key === "object" ) {
-			return this.each( function() {
-				dataUser.set( this, key );
-			} );
-		}
-
-		return access( this, function( value ) {
-			var data, camelKey;
-
-			// The calling jQuery object (element matches) is not empty
-			// (and therefore has an element appears at this[ 0 ]) and the
-			// `value` parameter was not undefined. An empty jQuery object
-			// will result in `undefined` for elem = this[ 0 ] which will
-			// throw an exception if an attempt to read a data cache is made.
-			if ( elem && value === undefined ) {
-
-				// Attempt to get data from the cache
-				// with the key as-is
-				data = dataUser.get( elem, key ) ||
-
-					// Try to find dashed key if it exists (gh-2779)
-					// This is for 2.2.x only
-					dataUser.get( elem, key.replace( rmultiDash, "-$&" ).toLowerCase() );
-
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				camelKey = jQuery.camelCase( key );
-
-				// Attempt to get data from the cache
-				// with the key camelized
-				data = dataUser.get( elem, camelKey );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// Attempt to "discover" the data in
-				// HTML5 custom data-* attrs
-				data = dataAttr( elem, camelKey, undefined );
-				if ( data !== undefined ) {
-					return data;
-				}
-
-				// We tried really hard, but the data doesn't exist.
-				return;
-			}
-
-			// Set the data...
-			camelKey = jQuery.camelCase( key );
-			this.each( function() {
-
-				// First, attempt to store a copy or reference of any
-				// data that might've been store with a camelCased key.
-				var data = dataUser.get( this, camelKey );
-
-				// For HTML5 data-* attribute interop, we have to
-				// store property names with dashes in a camelCase form.
-				// This might not apply to all properties...*
-				dataUser.set( this, camelKey, value );
-
-				// *... In the case of properties that might _actually_
-				// have dashes, we need to also store a copy of that
-				// unchanged property.
-				if ( key.indexOf( "-" ) > -1 && data !== undefined ) {
-					dataUser.set( this, key, value );
-				}
-			} );
-		}, null, value, arguments.length > 1, null, true );
-	},
-
-	removeData: function( key ) {
-		return this.each( function() {
-			dataUser.remove( this, key );
-		} );
-	}
-} );
-
-
-jQuery.extend( {
-	queue: function( elem, type, data ) {
-		var queue;
-
-		if ( elem ) {
-			type = ( type || "fx" ) + "queue";
-			queue = dataPriv.get( elem, type );
-
-			// Speed up dequeue by getting out quickly if this is just a lookup
-			if ( data ) {
-				if ( !queue || jQuery.isArray( data ) ) {
-					queue = dataPriv.access( elem, type, jQuery.makeArray( data ) );
-				} else {
-					queue.push( data );
-				}
-			}
-			return queue || [];
-		}
-	},
-
-	dequeue: function( elem, type ) {
-		type = type || "fx";
-
-		var queue = jQuery.queue( elem, type ),
-			startLength = queue.length,
-			fn = queue.shift(),
-			hooks = jQuery._queueHooks( elem, type ),
-			next = function() {
-				jQuery.dequeue( elem, type );
-			};
-
-		// If the fx queue is dequeued, always remove the progress sentinel
-		if ( fn === "inprogress" ) {
-			fn = queue.shift();
-			startLength--;
-		}
-
-		if ( fn ) {
-
-			// Add a progress sentinel to prevent the fx queue from being
-			// automatically dequeued
-			if ( type === "fx" ) {
-				queue.unshift( "inprogress" );
-			}
-
-			// Clear up the last queue stop function
-			delete hooks.stop;
-			fn.call( elem, next, hooks );
-		}
-
-		if ( !startLength && hooks ) {
-			hooks.empty.fire();
-		}
-	},
-
-	// Not public - generate a queueHooks object, or return the current one
-	_queueHooks: function( elem, type ) {
-		var key = type + "queueHooks";
-		return dataPriv.get( elem, key ) || dataPriv.access( elem, key, {
-			empty: jQuery.Callbacks( "once memory" ).add( function() {
-				dataPriv.remove( elem, [ type + "queue", key ] );
-			} )
-		} );
-	}
-} );
-
-jQuery.fn.extend( {
-	queue: function( type, data ) {
-		var setter = 2;
-
-		if ( typeof type !== "string" ) {
-			data = type;
-			type = "fx";
-			setter--;
-		}
-
-		if ( arguments.length < setter ) {
-			return jQuery.queue( this[ 0 ], type );
-		}
-
-		return data === undefined ?
-			this :
-			this.each( function() {
-				var queue = jQuery.queue( this, type, data );
-
-				// Ensure a hooks for this queue
-				jQuery._queueHooks( this, type );
-
-				if ( type === "fx" && queue[ 0 ] !== "inprogress" ) {
-					jQuery.dequeue( this, type );
-				}
-			} );
-	},
-	dequeue: function( type ) {
-		return this.each( function() {
-			jQuery.dequeue( this, type );
-		} );
-	},
-	clearQueue: function( type ) {
-		return this.queue( type || "fx", [] );
-	},
-
-	// Get a promise resolved when queues of a certain type
-	// are emptied (fx is the type by default)
-	promise: function( type, obj ) {
-		var tmp,
-			count = 1,
-			defer = jQuery.Deferred(),
-			elements = this,
-			i = this.length,
-			resolve = function() {
-				if ( !( --count ) ) {
-					defer.resolveWith( elements, [ elements ] );
-				}
-			};
-
-		if ( typeof type !== "string" ) {
-			obj = type;
-			type = undefined;
-		}
-		type = type || "fx";
-
-		while ( i-- ) {
-			tmp = dataPriv.get( elements[ i ], type + "queueHooks" );
-			if ( tmp && tmp.empty ) {
-				count++;
-				tmp.empty.add( resolve );
-			}
-		}
-		resolve();
-		return defer.promise( obj );
-	}
-} );
-var pnum = ( /[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/ ).source;
-
-var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
-
-
-var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
-
-var isHidden = function( elem, el ) {
-
-		// isHidden might be called from jQuery#filter function;
-		// in that case, element will be second argument
-		elem = el || elem;
-		return jQuery.css( elem, "display" ) === "none" ||
-			!jQuery.contains( elem.ownerDocument, elem );
-	};
-
-
-
-function adjustCSS( elem, prop, valueParts, tween ) {
-	var adjusted,
-		scale = 1,
-		maxIterations = 20,
-		currentValue = tween ?
-			function() { return tween.cur(); } :
-			function() { return jQuery.css( elem, prop, "" ); },
-		initial = currentValue(),
-		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
-
-		// Starting value computation is required for potential unit mismatches
-		initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
-			rcssNum.exec( jQuery.css( elem, prop ) );
-
-	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
-
-		// Trust units reported by jQuery.css
-		unit = unit || initialInUnit[ 3 ];
-
-		// Make sure we update the tween properties later on
-		valueParts = valueParts || [];
-
-		// Iteratively approximate from a nonzero starting point
-		initialInUnit = +initial || 1;
-
-		do {
-
-			// If previous iteration zeroed out, double until we get *something*.
-			// Use string for doubling so we don't accidentally see scale as unchanged below
-			scale = scale || ".5";
-
-			// Adjust and apply
-			initialInUnit = initialInUnit / scale;
-			jQuery.style( elem, prop, initialInUnit + unit );
-
-		// Update scale, tolerating zero or NaN from tween.cur()
-		// Break the loop if scale is unchanged or perfect, or if we've just had enough.
-		} while (
-			scale !== ( scale = currentValue() / initial ) && scale !== 1 && --maxIterations
-		);
-	}
-
-	if ( valueParts ) {
-		initialInUnit = +initialInUnit || +initial || 0;
-
-		// Apply relative offset (+=/-=) if specified
-		adjusted = valueParts[ 1 ] ?
-			initialInUnit + ( valueParts[ 1 ] + 1 ) * valueParts[ 2 ] :
-			+valueParts[ 2 ];
-		if ( tween ) {
-			tween.unit = unit;
-			tween.start = initialInUnit;
-			tween.end = adjusted;
-		}
-	}
-	return adjusted;
-}
-var rcheckableType = ( /^(?:checkbox|radio)$/i );
-
-var rtagName = ( /<([\w:-]+)/ );
-
-var rscriptType = ( /^$|\/(?:java|ecma)script/i );
-
-
-
-// We have to close these tags to support XHTML (#13200)
-var wrapMap = {
-
-	// Support: IE9
-	option: [ 1, "<select multiple='multiple'>", "</select>" ],
-
-	// XHTML parsers do not magically insert elements in the
-	// same way that tag soup parsers do. So we cannot shorten
-	// this by omitting <tbody> or other required elements.
-	thead: [ 1, "<table>", "</table>" ],
-	col: [ 2, "<table><colgroup>", "</colgroup></table>" ],
-	tr: [ 2, "<table><tbody>", "</tbody></table>" ],
-	td: [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ],
-
-	_default: [ 0, "", "" ]
-};
-
-// Support: IE9
-wrapMap.optgroup = wrapMap.option;
-
-wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
-wrapMap.th = wrapMap.td;
-
-
-function getAll( context, tag ) {
-
-	// Support: IE9-11+
-	// Use typeof to avoid zero-argument method invocation on host objects (#15151)
-	var ret = typeof context.getElementsByTagName !== "undefined" ?
-			context.getElementsByTagName( tag || "*" ) :
-			typeof context.querySelectorAll !== "undefined" ?
-				context.querySelectorAll( tag || "*" ) :
-			[];
-
-	return tag === undefined || tag && jQuery.nodeName( context, tag ) ?
-		jQuery.merge( [ context ], ret ) :
-		ret;
-}
-
-
-// Mark scripts as having already been evaluated
-function setGlobalEval( elems, refElements ) {
-	var i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		dataPriv.set(
-			elems[ i ],
-			"globalEval",
-			!refElements || dataPriv.get( refElements[ i ], "globalEval" )
-		);
-	}
-}
-
-
-var rhtml = /<|&#?\w+;/;
-
-function buildFragment( elems, context, scripts, selection, ignored ) {
-	var elem, tmp, tag, wrap, contains, j,
-		fragment = context.createDocumentFragment(),
-		nodes = [],
-		i = 0,
-		l = elems.length;
-
-	for ( ; i < l; i++ ) {
-		elem = elems[ i ];
-
-		if ( elem || elem === 0 ) {
-
-			// Add nodes directly
-			if ( jQuery.type( elem ) === "object" ) {
-
-				// Support: Android<4.1, PhantomJS<2
-				// push.apply(_, arraylike) throws on ancient WebKit
-				jQuery.merge( nodes, elem.nodeType ? [ elem ] : elem );
-
-			// Convert non-html into a text node
-			} else if ( !rhtml.test( elem ) ) {
-				nodes.push( context.createTextNode( elem ) );
-
-			// Convert html into DOM nodes
-			} else {
-				tmp = tmp || fragment.appendChild( context.createElement( "div" ) );
-
-				// Deserialize a standard representation
-				tag = ( rtagName.exec( elem ) || [ "", "" ] )[ 1 ].toLowerCase();
-				wrap = wrapMap[ tag ] || wrapMap._default;
-				tmp.innerHTML = wrap[ 1 ] + jQuery.htmlPrefilter( elem ) + wrap[ 2 ];
-
-				// Descend through wrappers to the right content
-				j = wrap[ 0 ];
-				while ( j-- ) {
-					tmp = tmp.lastChild;
-				}
-
-				// Support: Android<4.1, PhantomJS<2
-				// push.apply(_, arraylike) throws on ancient WebKit
-				jQuery.merge( nodes, tmp.childNodes );
-
-				// Remember the top-level container
-				tmp = fragment.firstChild;
-
-				// Ensure the created nodes are orphaned (#12392)
-				tmp.textContent = "";
-			}
-		}
-	}
-
-	// Remove wrapper from fragment
-	fragment.textContent = "";
-
-	i = 0;
-	while ( ( elem = nodes[ i++ ] ) ) {
-
-		// Skip elements already in the context collection (trac-4087)
-		if ( selection && jQuery.inArray( elem, selection ) > -1 ) {
-			if ( ignored ) {
-				ignored.push( elem );
-			}
-			continue;
-		}
-
-		contains = jQuery.contains( elem.ownerDocument, elem );
-
-		// Append to fragment
-		tmp = getAll( fragment.appendChild( elem ), "script" );
-
-		// Preserve script evaluation history
-		if ( contains ) {
-			setGlobalEval( tmp );
-		}
-
-		// Capture executables
-		if ( scripts ) {
-			j = 0;
-			while ( ( elem = tmp[ j++ ] ) ) {
-				if ( rscriptType.test( elem.type || "" ) ) {
-					scripts.push( elem );
-				}
-			}
-		}
-	}
-
-	return fragment;
-}
-
-
-( function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) ),
-		input = document.createElement( "input" );
-
-	// Support: Android 4.0-4.3, Safari<=5.1
-	// Check state lost if the name is set (#11217)
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Safari<=5.1, Android<4.2
-	// Older WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE<=11+
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-} )();
-
-
-var
-	rkeyEvent = /^key/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
-
-function returnTrue() {
-	return true;
-}
-
-function returnFalse() {
-	return false;
-}
-
-// Support: IE9
-// See #13393 for more info
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-
-function on( elem, types, selector, data, fn, one ) {
-	var origFn, type;
-
-	// Types can be a map of types/handlers
-	if ( typeof types === "object" ) {
-
-		// ( types-Object, selector, data )
-		if ( typeof selector !== "string" ) {
-
-			// ( types-Object, data )
-			data = data || selector;
-			selector = undefined;
-		}
-		for ( type in types ) {
-			on( elem, type, selector, data, types[ type ], one );
-		}
-		return elem;
-	}
-
-	if ( data == null && fn == null ) {
-
-		// ( types, fn )
-		fn = selector;
-		data = selector = undefined;
-	} else if ( fn == null ) {
-		if ( typeof selector === "string" ) {
-
-			// ( types, selector, fn )
-			fn = data;
-			data = undefined;
-		} else {
-
-			// ( types, data, fn )
-			fn = data;
-			data = selector;
-			selector = undefined;
-		}
-	}
-	if ( fn === false ) {
-		fn = returnFalse;
-	} else if ( !fn ) {
-		return elem;
-	}
-
-	if ( one === 1 ) {
-		origFn = fn;
-		fn = function( event ) {
-
-			// Can use an empty set, since event contains the info
-			jQuery().off( event );
-			return origFn.apply( this, arguments );
-		};
-
-		// Use same guid so caller can remove using origFn
-		fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
-	}
-	return elem.each( function() {
-		jQuery.event.add( this, types, fn, data, selector );
-	} );
-}
-
-/*
- * Helper functions for managing events -- not part of the public interface.
- * Props to Dean Edwards' addEvent library for many of the ideas.
- */
-jQuery.event = {
-
-	global: {},
-
-	add: function( elem, types, handler, data, selector ) {
-
-		var handleObjIn, eventHandle, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = dataPriv.get( elem );
-
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
-			return;
-		}
-
-		// Caller can pass in an object of custom data in lieu of the handler
-		if ( handler.handler ) {
-			handleObjIn = handler;
-			handler = handleObjIn.handler;
-			selector = handleObjIn.selector;
-		}
-
-		// Make sure that the handler has a unique ID, used to find/remove it later
-		if ( !handler.guid ) {
-			handler.guid = jQuery.guid++;
-		}
-
-		// Init the element's event structure and main handler, if this is the first
-		if ( !( events = elemData.events ) ) {
-			events = elemData.events = {};
-		}
-		if ( !( eventHandle = elemData.handle ) ) {
-			eventHandle = elemData.handle = function( e ) {
-
-				// Discard the second event of a jQuery.event.trigger() and
-				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ?
-					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
-			};
-		}
-
-		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[ t ] ) || [];
-			type = origType = tmp[ 1 ];
-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
-			// There *must* be a type, no attaching namespace-only handlers
-			if ( !type ) {
-				continue;
-			}
-
-			// If event changes its type, use the special event handlers for the changed type
-			special = jQuery.event.special[ type ] || {};
-
-			// If selector defined, determine special event api type, otherwise given type
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-
-			// Update special based on newly reset type
-			special = jQuery.event.special[ type ] || {};
-
-			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend( {
-				type: type,
-				origType: origType,
-				data: data,
-				handler: handler,
-				guid: handler.guid,
-				selector: selector,
-				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join( "." )
-			}, handleObjIn );
-
-			// Init the event handler queue if we're the first
-			if ( !( handlers = events[ type ] ) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
-
-				// Only use addEventListener if the special events handler returns false
-				if ( !special.setup ||
-					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
-
-					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle );
-					}
-				}
-			}
-
-			if ( special.add ) {
-				special.add.call( elem, handleObj );
-
-				if ( !handleObj.handler.guid ) {
-					handleObj.handler.guid = handler.guid;
-				}
-			}
-
-			// Add to the element's handler list, delegates in front
-			if ( selector ) {
-				handlers.splice( handlers.delegateCount++, 0, handleObj );
-			} else {
-				handlers.push( handleObj );
-			}
-
-			// Keep track of which events have ever been used, for event optimization
-			jQuery.event.global[ type ] = true;
-		}
-
-	},
-
-	// Detach an event or set of events from an element
-	remove: function( elem, types, handler, selector, mappedTypes ) {
-
-		var j, origCount, tmp,
-			events, t, handleObj,
-			special, handlers, type, namespaces, origType,
-			elemData = dataPriv.hasData( elem ) && dataPriv.get( elem );
-
-		if ( !elemData || !( events = elemData.events ) ) {
-			return;
-		}
-
-		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnotwhite ) || [ "" ];
-		t = types.length;
-		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[ t ] ) || [];
-			type = origType = tmp[ 1 ];
-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
-
-			// Unbind all events (on this namespace, if provided) for the element
-			if ( !type ) {
-				for ( type in events ) {
-					jQuery.event.remove( elem, type + types[ t ], handler, selector, true );
-				}
-				continue;
-			}
-
-			special = jQuery.event.special[ type ] || {};
-			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[ 2 ] &&
-				new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
-
-			// Remove matching events
-			origCount = j = handlers.length;
-			while ( j-- ) {
-				handleObj = handlers[ j ];
-
-				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
-					( !selector || selector === handleObj.selector ||
-						selector === "**" && handleObj.selector ) ) {
-					handlers.splice( j, 1 );
-
-					if ( handleObj.selector ) {
-						handlers.delegateCount--;
-					}
-					if ( special.remove ) {
-						special.remove.call( elem, handleObj );
-					}
-				}
-			}
-
-			// Remove generic event handler if we removed something and no more handlers exist
-			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown ||
-					special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
-
-					jQuery.removeEvent( elem, type, elemData.handle );
-				}
-
-				delete events[ type ];
-			}
-		}
-
-		// Remove data and the expando if it's no longer used
-		if ( jQuery.isEmptyObject( events ) ) {
-			dataPriv.remove( elem, "handle events" );
-		}
-	},
-
-	dispatch: function( event ) {
-
-		// Make a writable jQuery.Event from the native event object
-		event = jQuery.event.fix( event );
-
-		var i, j, ret, matched, handleObj,
-			handlerQueue = [],
-			args = slice.call( arguments ),
-			handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
-			special = jQuery.event.special[ event.type ] || {};
-
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
-		args[ 0 ] = event;
-		event.delegateTarget = this;
-
-		// Call the preDispatch hook for the mapped type, and let it bail if desired
-		if ( special.preDispatch && special.preDispatch.call( this, event ) === false ) {
-			return;
-		}
-
-		// Determine handlers
-		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
-
-		// Run delegates first; they may want to stop propagation beneath us
-		i = 0;
-		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
-			event.currentTarget = matched.elem;
-
-			j = 0;
-			while ( ( handleObj = matched.handlers[ j++ ] ) &&
-				!event.isImmediatePropagationStopped() ) {
-
-				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
-				// a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
-
-					event.handleObj = handleObj;
-					event.data = handleObj.data;
-
-					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
-						handleObj.handler ).apply( matched.elem, args );
-
-					if ( ret !== undefined ) {
-						if ( ( event.result = ret ) === false ) {
-							event.preventDefault();
-							event.stopPropagation();
-						}
-					}
-				}
-			}
-		}
-
-		// Call the postDispatch hook for the mapped type
-		if ( special.postDispatch ) {
-			special.postDispatch.call( this, event );
-		}
-
-		return event.result;
-	},
-
-	handlers: function( event, handlers ) {
-		var i, matches, sel, handleObj,
-			handlerQueue = [],
-			delegateCount = handlers.delegateCount,
-			cur = event.target;
-
-		// Support (at least): Chrome, IE9
-		// Find delegate handlers
-		// Black-hole SVG <use> instance trees (#13180)
-		//
-		// Support: Firefox<=42+
-		// Avoid non-left-click in FF but don't block IE radio events (#3861, gh-2343)
-		if ( delegateCount && cur.nodeType &&
-			( event.type !== "click" || isNaN( event.button ) || event.button < 1 ) ) {
-
-			for ( ; cur !== this; cur = cur.parentNode || this ) {
-
-				// Don't check non-elements (#13208)
-				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && ( cur.disabled !== true || event.type !== "click" ) ) {
-					matches = [];
-					for ( i = 0; i < delegateCount; i++ ) {
-						handleObj = handlers[ i ];
-
-						// Don't conflict with Object.prototype properties (#13203)
-						sel = handleObj.selector + " ";
-
-						if ( matches[ sel ] === undefined ) {
-							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) > -1 :
-								jQuery.find( sel, this, null, [ cur ] ).length;
-						}
-						if ( matches[ sel ] ) {
-							matches.push( handleObj );
-						}
-					}
-					if ( matches.length ) {
-						handlerQueue.push( { elem: cur, handlers: matches } );
-					}
-				}
-			}
-		}
-
-		// Add the remaining (directly-bound) handlers
-		if ( delegateCount < handlers.length ) {
-			handlerQueue.push( { elem: this, handlers: handlers.slice( delegateCount ) } );
-		}
-
-		return handlerQueue;
-	},
-
-	// Includes some event props shared by KeyEvent and MouseEvent
-	props: ( "altKey bubbles cancelable ctrlKey currentTarget detail eventPhase " +
-		"metaKey relatedTarget shiftKey target timeStamp view which" ).split( " " ),
-
-	fixHooks: {},
-
-	keyHooks: {
-		props: "char charCode key keyCode".split( " " ),
-		filter: function( event, original ) {
-
-			// Add which for key events
-			if ( event.which == null ) {
-				event.which = original.charCode != null ? original.charCode : original.keyCode;
-			}
-
-			return event;
-		}
-	},
-
-	mouseHooks: {
-		props: ( "button buttons clientX clientY offsetX offsetY pageX pageY " +
-			"screenX screenY toElement" ).split( " " ),
-		filter: function( event, original ) {
-			var eventDoc, doc, body,
-				button = original.button;
-
-			// Calculate pageX/Y if missing and clientX/Y available
-			if ( event.pageX == null && original.clientX != null ) {
-				eventDoc = event.target.ownerDocument || document;
-				doc = eventDoc.documentElement;
-				body = eventDoc.body;
-
-				event.pageX = original.clientX +
-					( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) -
-					( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				event.pageY = original.clientY +
-					( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) -
-					( doc && doc.clientTop  || body && body.clientTop  || 0 );
-			}
-
-			// Add which for click: 1 === left; 2 === middle; 3 === right
-			// Note: button is not normalized, so don't use it
-			if ( !event.which && button !== undefined ) {
-				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
-			}
-
-			return event;
-		}
-	},
-
-	fix: function( event ) {
-		if ( event[ jQuery.expando ] ) {
-			return event;
-		}
-
-		// Create a writable copy of the event object and normalize some properties
-		var i, prop, copy,
-			type = event.type,
-			originalEvent = event,
-			fixHook = this.fixHooks[ type ];
-
-		if ( !fixHook ) {
-			this.fixHooks[ type ] = fixHook =
-				rmouseEvent.test( type ) ? this.mouseHooks :
-				rkeyEvent.test( type ) ? this.keyHooks :
-				{};
-		}
-		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
-
-		event = new jQuery.Event( originalEvent );
-
-		i = copy.length;
-		while ( i-- ) {
-			prop = copy[ i ];
-			event[ prop ] = originalEvent[ prop ];
-		}
-
-		// Support: Cordova 2.5 (WebKit) (#13255)
-		// All events should have a target; Cordova deviceready doesn't
-		if ( !event.target ) {
-			event.target = document;
-		}
-
-		// Support: Safari 6.0+, Chrome<28
-		// Target should not be a text node (#504, #13143)
-		if ( event.target.nodeType === 3 ) {
-			event.target = event.target.parentNode;
-		}
-
-		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	},
-
-	special: {
-		load: {
-
-			// Prevent triggered image.load events from bubbling to window.load
-			noBubble: true
-		},
-		focus: {
-
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					this.focus();
-					return false;
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
-		click: {
-
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
-					this.click();
-					return false;
-				}
-			},
-
-			// For cross-browser consistency, don't fire native .click() on links
-			_default: function( event ) {
-				return jQuery.nodeName( event.target, "a" );
-			}
-		},
-
-		beforeunload: {
-			postDispatch: function( event ) {
-
-				// Support: Firefox 20+
-				// Firefox doesn't alert if the returnValue field is not set.
-				if ( event.result !== undefined && event.originalEvent ) {
-					event.originalEvent.returnValue = event.result;
-				}
-			}
-		}
-	}
-};
-
-jQuery.removeEvent = function( elem, type, handle ) {
-
-	// This "if" is needed for plain objects
-	if ( elem.removeEventListener ) {
-		elem.removeEventListener( type, handle );
-	}
-};
-
-jQuery.Event = function( src, props ) {
-
-	// Allow instantiation without the 'new' keyword
-	if ( !( this instanceof jQuery.Event ) ) {
-		return new jQuery.Event( src, props );
-	}
-
-	// Event object
-	if ( src && src.type ) {
-		this.originalEvent = src;
-		this.type = src.type;
-
-		// Events bubbling up the document may have been marked as prevented
-		// by a handler lower down the tree; reflect the correct value.
-		this.isDefaultPrevented = src.defaultPrevented ||
-				src.defaultPrevented === undefined &&
-
-				// Support: Android<4.0
-				src.returnValue === false ?
-			returnTrue :
-			returnFalse;
-
-	// Event type
-	} else {
-		this.type = src;
-	}
-
-	// Put explicitly provided properties onto the event object
-	if ( props ) {
-		jQuery.extend( this, props );
-	}
-
-	// Create a timestamp if incoming event doesn't have one
-	this.timeStamp = src && src.timeStamp || jQuery.now();
-
-	// Mark it as fixed
-	this[ jQuery.expando ] = true;
-};
-
-// jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	constructor: jQuery.Event,
-	isDefaultPrevented: returnFalse,
-	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-	isSimulated: false,
-
-	preventDefault: function() {
-		var e = this.originalEvent;
-
-		this.isDefaultPrevented = returnTrue;
-
-		if ( e && !this.isSimulated ) {
-			e.preventDefault();
-		}
-	},
-	stopPropagation: function() {
-		var e = this.originalEvent;
-
-		this.isPropagationStopped = returnTrue;
-
-		if ( e && !this.isSimulated ) {
-			e.stopPropagation();
-		}
-	},
-	stopImmediatePropagation: function() {
-		var e = this.originalEvent;
-
-		this.isImmediatePropagationStopped = returnTrue;
-
-		if ( e && !this.isSimulated ) {
-			e.stopImmediatePropagation();
-		}
-
-		this.stopPropagation();
-	}
-};
-
-// Create mouseenter/leave events using mouseover/out and event-time checks
-// so that event delegation works in jQuery.
-// Do the same for pointerenter/pointerleave and pointerover/pointerout
-//
-// Support: Safari 7 only
-// Safari sends mouseenter too often; see:
-// https://code.google.com/p/chromium/issues/detail?id=470258
-// for the description of the bug (it existed in older Chrome versions as well).
-jQuery.each( {
-	mouseenter: "mouseover",
-	mouseleave: "mouseout",
-	pointerenter: "pointerover",
-	pointerleave: "pointerout"
-}, function( orig, fix ) {
-	jQuery.event.special[ orig ] = {
-		delegateType: fix,
-		bindType: fix,
-
-		handle: function( event ) {
-			var ret,
-				target = this,
-				related = event.relatedTarget,
-				handleObj = event.handleObj;
-
-			// For mouseenter/leave call the handler if related is outside the target.
-			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
-				event.type = handleObj.origType;
-				ret = handleObj.handler.apply( this, arguments );
-				event.type = fix;
-			}
-			return ret;
-		}
-	};
-} );
-
-jQuery.fn.extend( {
-	on: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn );
-	},
-	one: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn, 1 );
-	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
-		if ( types && types.preventDefault && types.handleObj ) {
-
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ?
-					handleObj.origType + "." + handleObj.namespace :
-					handleObj.origType,
-				handleObj.selector,
-				handleObj.handler
-			);
-			return this;
-		}
-		if ( typeof types === "object" ) {
-
-			// ( types-object [, selector] )
-			for ( type in types ) {
-				this.off( type, selector, types[ type ] );
-			}
-			return this;
-		}
-		if ( selector === false || typeof selector === "function" ) {
-
-			// ( types [, fn] )
-			fn = selector;
-			selector = undefined;
-		}
-		if ( fn === false ) {
-			fn = returnFalse;
-		}
-		return this.each( function() {
-			jQuery.event.remove( this, types, fn, selector );
-		} );
-	}
-} );
-
-
-var
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:-]+)[^>]*)\/>/gi,
-
-	// Support: IE 10-11, Edge 10240+
-	// In IE/Edge using regex groups here causes severe slowdowns.
-	// See https://connect.microsoft.com/IE/feedback/details/1736512/
-	rnoInnerhtml = /<script|<style|<link/i,
-
-	// checked="checked" or checked
-	rchecked = /checked\s*(?:[^=]|=\s*.checked.)/i,
-	rscriptTypeMasked = /^true\/(.*)/,
-	rcleanScript = /^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;
-
-// Manipulating tables requires a tbody
-function manipulationTarget( elem, content ) {
-	return jQuery.nodeName( elem, "table" ) &&
-		jQuery.nodeName( content.nodeType !== 11 ? content : content.firstChild, "tr" ) ?
-
-		elem.getElementsByTagName( "tbody" )[ 0 ] ||
-			elem.appendChild( elem.ownerDocument.createElement( "tbody" ) ) :
-		elem;
-}
-
-// Replace/restore the type attribute of script elements for safe DOM manipulation
-function disableScript( elem ) {
-	elem.type = ( elem.getAttribute( "type" ) !== null ) + "/" + elem.type;
-	return elem;
-}
-function restoreScript( elem ) {
-	var match = rscriptTypeMasked.exec( elem.type );
-
-	if ( match ) {
-		elem.type = match[ 1 ];
-	} else {
-		elem.removeAttribute( "type" );
-	}
-
-	return elem;
-}
-
-function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
-
-	if ( dest.nodeType !== 1 ) {
-		return;
-	}
-
-	// 1. Copy private data: events, handlers, etc.
-	if ( dataPriv.hasData( src ) ) {
-		pdataOld = dataPriv.access( src );
-		pdataCur = dataPriv.set( dest, pdataOld );
-		events = pdataOld.events;
-
-		if ( events ) {
-			delete pdataCur.handle;
-			pdataCur.events = {};
-
-			for ( type in events ) {
-				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
-					jQuery.event.add( dest, type, events[ type ][ i ] );
-				}
-			}
-		}
-	}
-
-	// 2. Copy user data
-	if ( dataUser.hasData( src ) ) {
-		udataOld = dataUser.access( src );
-		udataCur = jQuery.extend( {}, udataOld );
-
-		dataUser.set( dest, udataCur );
-	}
-}
-
-// Fix IE bugs, see support tests
-function fixInput( src, dest ) {
-	var nodeName = dest.nodeName.toLowerCase();
-
-	// Fails to persist the checked state of a cloned checkbox or radio button.
-	if ( nodeName === "input" && rcheckableType.test( src.type ) ) {
-		dest.checked = src.checked;
-
-	// Fails to return the selected option to the default selected state when cloning options
-	} else if ( nodeName === "input" || nodeName === "textarea" ) {
-		dest.defaultValue = src.defaultValue;
-	}
-}
-
-function domManip( collection, args, callback, ignored ) {
-
-	// Flatten any nested arrays
-	args = concat.apply( [], args );
-
-	var fragment, first, scripts, hasScripts, node, doc,
-		i = 0,
-		l = collection.length,
-		iNoClone = l - 1,
-		value = args[ 0 ],
-		isFunction = jQuery.isFunction( value );
-
-	// We can't cloneNode fragments that contain checked, in WebKit
-	if ( isFunction ||
-			( l > 1 && typeof value === "string" &&
-				!support.checkClone && rchecked.test( value ) ) ) {
-		return collection.each( function( index ) {
-			var self = collection.eq( index );
-			if ( isFunction ) {
-				args[ 0 ] = value.call( this, index, self.html() );
-			}
-			domManip( self, args, callback, ignored );
-		} );
-	}
-
-	if ( l ) {
-		fragment = buildFragment( args, collection[ 0 ].ownerDocument, false, collection, ignored );
-		first = fragment.firstChild;
-
-		if ( fragment.childNodes.length === 1 ) {
-			fragment = first;
-		}
-
-		// Require either new content or an interest in ignored elements to invoke the callback
-		if ( first || ignored ) {
-			scripts = jQuery.map( getAll( fragment, "script" ), disableScript );
-			hasScripts = scripts.length;
-
-			// Use the original fragment for the last item
-			// instead of the first because it can end up
-			// being emptied incorrectly in certain situations (#8070).
-			for ( ; i < l; i++ ) {
-				node = fragment;
-
-				if ( i !== iNoClone ) {
-					node = jQuery.clone( node, true, true );
-
-					// Keep references to cloned scripts for later restoration
-					if ( hasScripts ) {
-
-						// Support: Android<4.1, PhantomJS<2
-						// push.apply(_, arraylike) throws on ancient WebKit
-						jQuery.merge( scripts, getAll( node, "script" ) );
-					}
-				}
-
-				callback.call( collection[ i ], node, i );
-			}
-
-			if ( hasScripts ) {
-				doc = scripts[ scripts.length - 1 ].ownerDocument;
-
-				// Reenable scripts
-				jQuery.map( scripts, restoreScript );
-
-				// Evaluate executable scripts on first document insertion
-				for ( i = 0; i < hasScripts; i++ ) {
-					node = scripts[ i ];
-					if ( rscriptType.test( node.type || "" ) &&
-						!dataPriv.access( node, "globalEval" ) &&
-						jQuery.contains( doc, node ) ) {
-
-						if ( node.src ) {
-
-							// Optional AJAX dependency, but won't run scripts if not present
-							if ( jQuery._evalUrl ) {
-								jQuery._evalUrl( node.src );
-							}
-						} else {
-							jQuery.globalEval( node.textContent.replace( rcleanScript, "" ) );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return collection;
-}
-
-function remove( elem, selector, keepData ) {
-	var node,
-		nodes = selector ? jQuery.filter( selector, elem ) : elem,
-		i = 0;
-
-	for ( ; ( node = nodes[ i ] ) != null; i++ ) {
-		if ( !keepData && node.nodeType === 1 ) {
-			jQuery.cleanData( getAll( node ) );
-		}
-
-		if ( node.parentNode ) {
-			if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
-				setGlobalEval( getAll( node, "script" ) );
-			}
-			node.parentNode.removeChild( node );
-		}
-	}
-
-	return elem;
-}
-
-jQuery.extend( {
-	htmlPrefilter: function( html ) {
-		return html.replace( rxhtmlTag, "<$1></$2>" );
-	},
-
-	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
-		var i, l, srcElements, destElements,
-			clone = elem.cloneNode( true ),
-			inPage = jQuery.contains( elem.ownerDocument, elem );
-
-		// Fix IE cloning issues
-		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
-				!jQuery.isXMLDoc( elem ) ) {
-
-			// We eschew Sizzle here for performance reasons: http://jsperf.com/getall-vs-sizzle/2
-			destElements = getAll( clone );
-			srcElements = getAll( elem );
-
-			for ( i = 0, l = srcElements.length; i < l; i++ ) {
-				fixInput( srcElements[ i ], destElements[ i ] );
-			}
-		}
-
-		// Copy the events from the original to the clone
-		if ( dataAndEvents ) {
-			if ( deepDataAndEvents ) {
-				srcElements = srcElements || getAll( elem );
-				destElements = destElements || getAll( clone );
-
-				for ( i = 0, l = srcElements.length; i < l; i++ ) {
-					cloneCopyEvent( srcElements[ i ], destElements[ i ] );
-				}
-			} else {
-				cloneCopyEvent( elem, clone );
-			}
-		}
-
-		// Preserve script evaluation history
-		destElements = getAll( clone, "script" );
-		if ( destElements.length > 0 ) {
-			setGlobalEval( destElements, !inPage && getAll( elem, "script" ) );
-		}
-
-		// Return the cloned set
-		return clone;
-	},
-
-	cleanData: function( elems ) {
-		var data, elem, type,
-			special = jQuery.event.special,
-			i = 0;
-
-		for ( ; ( elem = elems[ i ] ) !== undefined; i++ ) {
-			if ( acceptData( elem ) ) {
-				if ( ( data = elem[ dataPriv.expando ] ) ) {
-					if ( data.events ) {
-						for ( type in data.events ) {
-							if ( special[ type ] ) {
-								jQuery.event.remove( elem, type );
-
-							// This is a shortcut to avoid jQuery.event.remove's overhead
-							} else {
-								jQuery.removeEvent( elem, type, data.handle );
-							}
-						}
-					}
-
-					// Support: Chrome <= 35-45+
-					// Assign undefined instead of using delete, see Data#remove
-					elem[ dataPriv.expando ] = undefined;
-				}
-				if ( elem[ dataUser.expando ] ) {
-
-					// Support: Chrome <= 35-45+
-					// Assign undefined instead of using delete, see Data#remove
-					elem[ dataUser.expando ] = undefined;
-				}
-			}
-		}
-	}
-} );
-
-jQuery.fn.extend( {
-
-	// Keep domManip exposed until 3.0 (gh-2225)
-	domManip: domManip,
-
-	detach: function( selector ) {
-		return remove( this, selector, true );
-	},
-
-	remove: function( selector ) {
-		return remove( this, selector );
-	},
-
-	text: function( value ) {
-		return access( this, function( value ) {
-			return value === undefined ?
-				jQuery.text( this ) :
-				this.empty().each( function() {
-					if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-						this.textContent = value;
-					}
-				} );
-		}, null, value, arguments.length );
-	},
-
-	append: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.appendChild( elem );
-			}
-		} );
-	},
-
-	prepend: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.nodeType === 1 || this.nodeType === 11 || this.nodeType === 9 ) {
-				var target = manipulationTarget( this, elem );
-				target.insertBefore( elem, target.firstChild );
-			}
-		} );
-	},
-
-	before: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this );
-			}
-		} );
-	},
-
-	after: function() {
-		return domManip( this, arguments, function( elem ) {
-			if ( this.parentNode ) {
-				this.parentNode.insertBefore( elem, this.nextSibling );
-			}
-		} );
-	},
-
-	empty: function() {
-		var elem,
-			i = 0;
-
-		for ( ; ( elem = this[ i ] ) != null; i++ ) {
-			if ( elem.nodeType === 1 ) {
-
-				// Prevent memory leaks
-				jQuery.cleanData( getAll( elem, false ) );
-
-				// Remove any remaining nodes
-				elem.textContent = "";
-			}
-		}
-
-		return this;
-	},
-
-	clone: function( dataAndEvents, deepDataAndEvents ) {
-		dataAndEvents = dataAndEvents == null ? false : dataAndEvents;
-		deepDataAndEvents = deepDataAndEvents == null ? dataAndEvents : deepDataAndEvents;
-
-		return this.map( function() {
-			return jQuery.clone( this, dataAndEvents, deepDataAndEvents );
-		} );
-	},
-
-	html: function( value ) {
-		return access( this, function( value ) {
-			var elem = this[ 0 ] || {},
-				i = 0,
-				l = this.length;
-
-			if ( value === undefined && elem.nodeType === 1 ) {
-				return elem.innerHTML;
-			}
-
-			// See if we can take a shortcut and just use innerHTML
-			if ( typeof value === "string" && !rnoInnerhtml.test( value ) &&
-				!wrapMap[ ( rtagName.exec( value ) || [ "", "" ] )[ 1 ].toLowerCase() ] ) {
-
-				value = jQuery.htmlPrefilter( value );
-
-				try {
-					for ( ; i < l; i++ ) {
-						elem = this[ i ] || {};
-
-						// Remove element nodes and prevent memory leaks
-						if ( elem.nodeType === 1 ) {
-							jQuery.cleanData( getAll( elem, false ) );
-							elem.innerHTML = value;
-						}
-					}
-
-					elem = 0;
-
-				// If using innerHTML throws an exception, use the fallback method
-				} catch ( e ) {}
-			}
-
-			if ( elem ) {
-				this.empty().append( value );
-			}
-		}, null, value, arguments.length );
-	},
-
-	replaceWith: function() {
-		var ignored = [];
-
-		// Make the changes, replacing each non-ignored context element with the new content
-		return domManip( this, arguments, function( elem ) {
-			var parent = this.parentNode;
-
-			if ( jQuery.inArray( this, ignored ) < 0 ) {
-				jQuery.cleanData( getAll( this ) );
-				if ( parent ) {
-					parent.replaceChild( elem, this );
-				}
-			}
-
-		// Force callback invocation
-		}, ignored );
-	}
-} );
-
-jQuery.each( {
-	appendTo: "append",
-	prependTo: "prepend",
-	insertBefore: "before",
-	insertAfter: "after",
-	replaceAll: "replaceWith"
-}, function( name, original ) {
-	jQuery.fn[ name ] = function( selector ) {
-		var elems,
-			ret = [],
-			insert = jQuery( selector ),
-			last = insert.length - 1,
-			i = 0;
-
-		for ( ; i <= last; i++ ) {
-			elems = i === last ? this : this.clone( true );
-			jQuery( insert[ i ] )[ original ]( elems );
-
-			// Support: QtWebKit
-			// .get() because push.apply(_, arraylike) throws
-			push.apply( ret, elems.get() );
-		}
-
-		return this.pushStack( ret );
-	};
-} );
-
-
-var iframe,
-	elemdisplay = {
-
-		// Support: Firefox
-		// We have to pre-define these values for FF (#10227)
-		HTML: "block",
-		BODY: "block"
-	};
-
-/**
- * Retrieve the actual display of a element
- * @param {String} name nodeName of the element
- * @param {Object} doc Document object
- */
-
-// Called only from within defaultDisplay
-function actualDisplay( name, doc ) {
-	var elem = jQuery( doc.createElement( name ) ).appendTo( doc.body ),
-
-		display = jQuery.css( elem[ 0 ], "display" );
-
-	// We don't have any data stored on the element,
-	// so use "detach" method as fast way to get rid of the element
-	elem.detach();
-
-	return display;
-}
-
-/**
- * Try to determine the default display value of an element
- * @param {String} nodeName
- */
-function defaultDisplay( nodeName ) {
-	var doc = document,
-		display = elemdisplay[ nodeName ];
-
-	if ( !display ) {
-		display = actualDisplay( nodeName, doc );
-
-		// If the simple way fails, read from inside an iframe
-		if ( display === "none" || !display ) {
-
-			// Use the already-created iframe if possible
-			iframe = ( iframe || jQuery( "<iframe frameborder='0' width='0' height='0'/>" ) )
-				.appendTo( doc.documentElement );
-
-			// Always write a new HTML skeleton so Webkit and Firefox don't choke on reuse
-			doc = iframe[ 0 ].contentDocument;
-
-			// Support: IE
-			doc.write();
-			doc.close();
-
-			display = actualDisplay( nodeName, doc );
-			iframe.detach();
-		}
-
-		// Store the correct default display
-		elemdisplay[ nodeName ] = display;
-	}
-
-	return display;
-}
-var rmargin = ( /^margin/ );
-
-var rnumnonpx = new RegExp( "^(" + pnum + ")(?!px)[a-z%]+$", "i" );
-
-var getStyles = function( elem ) {
-
-		// Support: IE<=11+, Firefox<=30+ (#15098, #14150)
-		// IE throws on elements created in popups
-		// FF meanwhile throws on frame elements through "defaultView.getComputedStyle"
-		var view = elem.ownerDocument.defaultView;
-
-		if ( !view || !view.opener ) {
-			view = window;
-		}
-
-		return view.getComputedStyle( elem );
-	};
-
-var swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
-var documentElement = document.documentElement;
-
-
-
-( function() {
-	var pixelPositionVal, boxSizingReliableVal, pixelMarginRightVal, reliableMarginLeftVal,
-		container = document.createElement( "div" ),
-		div = document.createElement( "div" );
-
-	// Finish early in limited (non-browser) environments
-	if ( !div.style ) {
-		return;
-	}
-
-	// Support: IE9-11+
-	// Style of cloned element affects source element cloned (#8908)
-	div.style.backgroundClip = "content-box";
-	div.cloneNode( true ).style.backgroundClip = "";
-	support.clearCloneStyle = div.style.backgroundClip === "content-box";
-
-	container.style.cssText = "border:0;width:8px;height:0;top:0;left:-9999px;" +
-		"padding:0;margin-top:1px;position:absolute";
-	container.appendChild( div );
-
-	// Executing both pixelPosition & boxSizingReliable tests require only one layout
-	// so they're executed at the same time to save the second computation.
-	function computeStyleTests() {
-		div.style.cssText =
-
-			// Support: Firefox<29, Android 2.3
-			// Vendor-prefix box-sizing
-			"-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;" +
-			"position:relative;display:block;" +
-			"margin:auto;border:1px;padding:1px;" +
-			"top:1%;width:50%";
-		div.innerHTML = "";
-		documentElement.appendChild( container );
-
-		var divStyle = window.getComputedStyle( div );
-		pixelPositionVal = divStyle.top !== "1%";
-		reliableMarginLeftVal = divStyle.marginLeft === "2px";
-		boxSizingReliableVal = divStyle.width === "4px";
-
-		// Support: Android 4.0 - 4.3 only
-		// Some styles come back with percentage values, even though they shouldn't
-		div.style.marginRight = "50%";
-		pixelMarginRightVal = divStyle.marginRight === "4px";
-
-		documentElement.removeChild( container );
-	}
-
-	jQuery.extend( support, {
-		pixelPosition: function() {
-
-			// This test is executed only once but we still do memoizing
-			// since we can use the boxSizingReliable pre-computing.
-			// No need to check if the test was already performed, though.
-			computeStyleTests();
-			return pixelPositionVal;
-		},
-		boxSizingReliable: function() {
-			if ( boxSizingReliableVal == null ) {
-				computeStyleTests();
-			}
-			return boxSizingReliableVal;
-		},
-		pixelMarginRight: function() {
-
-			// Support: Android 4.0-4.3
-			// We're checking for boxSizingReliableVal here instead of pixelMarginRightVal
-			// since that compresses better and they're computed together anyway.
-			if ( boxSizingReliableVal == null ) {
-				computeStyleTests();
-			}
-			return pixelMarginRightVal;
-		},
-		reliableMarginLeft: function() {
-
-			// Support: IE <=8 only, Android 4.0 - 4.3 only, Firefox <=3 - 37
-			if ( boxSizingReliableVal == null ) {
-				computeStyleTests();
-			}
-			return reliableMarginLeftVal;
-		},
-		reliableMarginRight: function() {
-
-			// Support: Android 2.3
-			// Check if div with explicit width and no margin-right incorrectly
-			// gets computed margin-right based on width of container. (#3333)
-			// WebKit Bug 13343 - getComputedStyle returns wrong value for margin-right
-			// This support function is only executed once so no memoizing is needed.
-			var ret,
-				marginDiv = div.appendChild( document.createElement( "div" ) );
-
-			// Reset CSS: box-sizing; display; margin; border; padding
-			marginDiv.style.cssText = div.style.cssText =
-
-				// Support: Android 2.3
-				// Vendor-prefix box-sizing
-				"-webkit-box-sizing:content-box;box-sizing:content-box;" +
-				"display:block;margin:0;border:0;padding:0";
-			marginDiv.style.marginRight = marginDiv.style.width = "0";
-			div.style.width = "1px";
-			documentElement.appendChild( container );
-
-			ret = !parseFloat( window.getComputedStyle( marginDiv ).marginRight );
-
-			documentElement.removeChild( container );
-			div.removeChild( marginDiv );
-
-			return ret;
-		}
-	} );
-} )();
-
-
-function curCSS( elem, name, computed ) {
-	var width, minWidth, maxWidth, ret,
-		style = elem.style;
-
-	computed = computed || getStyles( elem );
-	ret = computed ? computed.getPropertyValue( name ) || computed[ name ] : undefined;
-
-	// Support: Opera 12.1x only
-	// Fall back to style even without computed
-	// computed is undefined for elems on document fragments
-	if ( ( ret === "" || ret === undefined ) && !jQuery.contains( elem.ownerDocument, elem ) ) {
-		ret = jQuery.style( elem, name );
-	}
-
-	// Support: IE9
-	// getPropertyValue is only needed for .css('filter') (#12537)
-	if ( computed ) {
-
-		// A tribute to the "awesome hack by Dean Edwards"
-		// Android Browser returns percentage for some values,
-		// but width seems to be reliably pixels.
-		// This is against the CSSOM draft spec:
-		// http://dev.w3.org/csswg/cssom/#resolved-values
-		if ( !support.pixelMarginRight() && rnumnonpx.test( ret ) && rmargin.test( name ) ) {
-
-			// Remember the original values
-			width = style.width;
-			minWidth = style.minWidth;
-			maxWidth = style.maxWidth;
-
-			// Put in the new values to get a computed value out
-			style.minWidth = style.maxWidth = style.width = ret;
-			ret = computed.width;
-
-			// Revert the changed values
-			style.width = width;
-			style.minWidth = minWidth;
-			style.maxWidth = maxWidth;
-		}
-	}
-
-	return ret !== undefined ?
-
-		// Support: IE9-11+
-		// IE returns zIndex value as an integer.
-		ret + "" :
-		ret;
-}
-
-
-function addGetHookIf( conditionFn, hookFn ) {
-
-	// Define the hook, we'll check on the first run if it's really needed.
-	return {
-		get: function() {
-			if ( conditionFn() ) {
-
-				// Hook not needed (or it's not possible to use it due
-				// to missing dependency), remove it.
-				delete this.get;
-				return;
-			}
-
-			// Hook needed; redefine it so that the support test is not executed again.
-			return ( this.get = hookFn ).apply( this, arguments );
-		}
-	};
-}
-
-
-var
-
-	// Swappable if display is none or starts with table
-	// except "table", "table-cell", or "table-caption"
-	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: "0",
-		fontWeight: "400"
-	},
-
-	cssPrefixes = [ "Webkit", "O", "Moz", "ms" ],
-	emptyStyle = document.createElement( "div" ).style;
-
-// Return a css property mapped to a potentially vendor prefixed property
-function vendorPropName( name ) {
-
-	// Shortcut for names that are not vendor prefixed
-	if ( name in emptyStyle ) {
-		return name;
-	}
-
-	// Check for vendor prefixed names
-	var capName = name[ 0 ].toUpperCase() + name.slice( 1 ),
-		i = cssPrefixes.length;
-
-	while ( i-- ) {
-		name = cssPrefixes[ i ] + capName;
-		if ( name in emptyStyle ) {
-			return name;
-		}
-	}
-}
-
-function setPositiveNumber( elem, value, subtract ) {
-
-	// Any relative (+/-) values have already been
-	// normalized at this point
-	var matches = rcssNum.exec( value );
-	return matches ?
-
-		// Guard against undefined "subtract", e.g., when used as in cssHooks
-		Math.max( 0, matches[ 2 ] - ( subtract || 0 ) ) + ( matches[ 3 ] || "px" ) :
-		value;
-}
-
-function augmentWidthOrHeight( elem, name, extra, isBorderBox, styles ) {
-	var i = extra === ( isBorderBox ? "border" : "content" ) ?
-
-		// If we already have the right measurement, avoid augmentation
-		4 :
-
-		// Otherwise initialize for horizontal or vertical properties
-		name === "width" ? 1 : 0,
-
-		val = 0;
-
-	for ( ; i < 4; i += 2 ) {
-
-		// Both box models exclude margin, so add it if we want it
-		if ( extra === "margin" ) {
-			val += jQuery.css( elem, extra + cssExpand[ i ], true, styles );
-		}
-
-		if ( isBorderBox ) {
-
-			// border-box includes padding, so remove it if we want content
-			if ( extra === "content" ) {
-				val -= jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-			}
-
-			// At this point, extra isn't border nor margin, so remove border
-			if ( extra !== "margin" ) {
-				val -= jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		} else {
-
-			// At this point, extra isn't content, so add padding
-			val += jQuery.css( elem, "padding" + cssExpand[ i ], true, styles );
-
-			// At this point, extra isn't content nor padding, so add border
-			if ( extra !== "padding" ) {
-				val += jQuery.css( elem, "border" + cssExpand[ i ] + "Width", true, styles );
-			}
-		}
-	}
-
-	return val;
-}
-
-function getWidthOrHeight( elem, name, extra ) {
-
-	// Start with offset property, which is equivalent to the border-box value
-	var valueIsBorderBox = true,
-		val = name === "width" ? elem.offsetWidth : elem.offsetHeight,
-		styles = getStyles( elem ),
-		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
-
-	// Some non-html elements return undefined for offsetWidth, so check for null/undefined
-	// svg - https://bugzilla.mozilla.org/show_bug.cgi?id=649285
-	// MathML - https://bugzilla.mozilla.org/show_bug.cgi?id=491668
-	if ( val <= 0 || val == null ) {
-
-		// Fall back to computed then uncomputed css if necessary
-		val = curCSS( elem, name, styles );
-		if ( val < 0 || val == null ) {
-			val = elem.style[ name ];
-		}
-
-		// Computed unit is not pixels. Stop here and return.
-		if ( rnumnonpx.test( val ) ) {
-			return val;
-		}
-
-		// Check for style in case a browser which returns unreliable values
-		// for getComputedStyle silently falls back to the reliable elem.style
-		valueIsBorderBox = isBorderBox &&
-			( support.boxSizingReliable() || val === elem.style[ name ] );
-
-		// Normalize "", auto, and prepare for extra
-		val = parseFloat( val ) || 0;
-	}
-
-	// Use the active box-sizing model to add/subtract irrelevant styles
-	return ( val +
-		augmentWidthOrHeight(
-			elem,
-			name,
-			extra || ( isBorderBox ? "border" : "content" ),
-			valueIsBorderBox,
-			styles
-		)
-	) + "px";
-}
-
-function showHide( elements, show ) {
-	var display, elem, hidden,
-		values = [],
-		index = 0,
-		length = elements.length;
-
-	for ( ; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-
-		values[ index ] = dataPriv.get( elem, "olddisplay" );
-		display = elem.style.display;
-		if ( show ) {
-
-			// Reset the inline display of this element to learn if it is
-			// being hidden by cascaded rules or not
-			if ( !values[ index ] && display === "none" ) {
-				elem.style.display = "";
-			}
-
-			// Set elements which have been overridden with display: none
-			// in a stylesheet to whatever the default browser style is
-			// for such an element
-			if ( elem.style.display === "" && isHidden( elem ) ) {
-				values[ index ] = dataPriv.access(
-					elem,
-					"olddisplay",
-					defaultDisplay( elem.nodeName )
-				);
-			}
-		} else {
-			hidden = isHidden( elem );
-
-			if ( display !== "none" || !hidden ) {
-				dataPriv.set(
-					elem,
-					"olddisplay",
-					hidden ? display : jQuery.css( elem, "display" )
-				);
-			}
-		}
-	}
-
-	// Set the display of most of the elements in a second loop
-	// to avoid the constant reflow
-	for ( index = 0; index < length; index++ ) {
-		elem = elements[ index ];
-		if ( !elem.style ) {
-			continue;
-		}
-		if ( !show || elem.style.display === "none" || elem.style.display === "" ) {
-			elem.style.display = show ? values[ index ] || "" : "none";
-		}
-	}
-
-	return elements;
-}
-
-jQuery.extend( {
-
-	// Add in style property hooks for overriding the default
-	// behavior of getting and setting a style property
-	cssHooks: {
-		opacity: {
-			get: function( elem, computed ) {
-				if ( computed ) {
-
-					// We should always get a number back from opacity
-					var ret = curCSS( elem, "opacity" );
-					return ret === "" ? "1" : ret;
-				}
-			}
-		}
-	},
-
-	// Don't automatically add "px" to these possibly-unitless properties
-	cssNumber: {
-		"animationIterationCount": true,
-		"columnCount": true,
-		"fillOpacity": true,
-		"flexGrow": true,
-		"flexShrink": true,
-		"fontWeight": true,
-		"lineHeight": true,
-		"opacity": true,
-		"order": true,
-		"orphans": true,
-		"widows": true,
-		"zIndex": true,
-		"zoom": true
-	},
-
-	// Add in properties whose names you wish to fix before
-	// setting or getting the value
-	cssProps: {
-		"float": "cssFloat"
-	},
-
-	// Get and set the style property on a DOM Node
-	style: function( elem, name, value, extra ) {
-
-		// Don't set styles on text and comment nodes
-		if ( !elem || elem.nodeType === 3 || elem.nodeType === 8 || !elem.style ) {
-			return;
-		}
-
-		// Make sure that we're working with the right name
-		var ret, type, hooks,
-			origName = jQuery.camelCase( name ),
-			style = elem.style;
-
-		name = jQuery.cssProps[ origName ] ||
-			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
-
-		// Gets hook for the prefixed version, then unprefixed version
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// Check if we're setting a value
-		if ( value !== undefined ) {
-			type = typeof value;
-
-			// Convert "+=" or "-=" to relative numbers (#7345)
-			if ( type === "string" && ( ret = rcssNum.exec( value ) ) && ret[ 1 ] ) {
-				value = adjustCSS( elem, name, ret );
-
-				// Fixes bug #9237
-				type = "number";
-			}
-
-			// Make sure that null and NaN values aren't set (#7116)
-			if ( value == null || value !== value ) {
-				return;
-			}
-
-			// If a number was passed in, add the unit (except for certain CSS properties)
-			if ( type === "number" ) {
-				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
-			}
-
-			// Support: IE9-11+
-			// background-* props affect original clone's values
-			if ( !support.clearCloneStyle && value === "" && name.indexOf( "background" ) === 0 ) {
-				style[ name ] = "inherit";
-			}
-
-			// If a hook was provided, use that value, otherwise just set the specified value
-			if ( !hooks || !( "set" in hooks ) ||
-				( value = hooks.set( elem, value, extra ) ) !== undefined ) {
-
-				style[ name ] = value;
-			}
-
-		} else {
-
-			// If a hook was provided get the non-computed value from there
-			if ( hooks && "get" in hooks &&
-				( ret = hooks.get( elem, false, extra ) ) !== undefined ) {
-
-				return ret;
-			}
-
-			// Otherwise just get the value from the style object
-			return style[ name ];
-		}
-	},
-
-	css: function( elem, name, extra, styles ) {
-		var val, num, hooks,
-			origName = jQuery.camelCase( name );
-
-		// Make sure that we're working with the right name
-		name = jQuery.cssProps[ origName ] ||
-			( jQuery.cssProps[ origName ] = vendorPropName( origName ) || origName );
-
-		// Try prefixed name followed by the unprefixed name
-		hooks = jQuery.cssHooks[ name ] || jQuery.cssHooks[ origName ];
-
-		// If a hook was provided get the computed value from there
-		if ( hooks && "get" in hooks ) {
-			val = hooks.get( elem, true, extra );
-		}
-
-		// Otherwise, if a way to get the computed value exists, use that
-		if ( val === undefined ) {
-			val = curCSS( elem, name, styles );
-		}
-
-		// Convert "normal" to computed value
-		if ( val === "normal" && name in cssNormalTransform ) {
-			val = cssNormalTransform[ name ];
-		}
-
-		// Make numeric if forced or a qualifier was provided and val looks numeric
-		if ( extra === "" || extra ) {
-			num = parseFloat( val );
-			return extra === true || isFinite( num ) ? num || 0 : val;
-		}
-		return val;
-	}
-} );
-
-jQuery.each( [ "height", "width" ], function( i, name ) {
-	jQuery.cssHooks[ name ] = {
-		get: function( elem, computed, extra ) {
-			if ( computed ) {
-
-				// Certain elements can have dimension info if we invisibly show them
-				// but it must have a current display style that would benefit
-				return rdisplayswap.test( jQuery.css( elem, "display" ) ) &&
-					elem.offsetWidth === 0 ?
-						swap( elem, cssShow, function() {
-							return getWidthOrHeight( elem, name, extra );
-						} ) :
-						getWidthOrHeight( elem, name, extra );
-			}
-		},
-
-		set: function( elem, value, extra ) {
-			var matches,
-				styles = extra && getStyles( elem ),
-				subtract = extra && augmentWidthOrHeight(
-					elem,
-					name,
-					extra,
-					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-					styles
-				);
-
-			// Convert to pixels if value adjustment is needed
-			if ( subtract && ( matches = rcssNum.exec( value ) ) &&
-				( matches[ 3 ] || "px" ) !== "px" ) {
-
-				elem.style[ name ] = value;
-				value = jQuery.css( elem, name );
-			}
-
-			return setPositiveNumber( elem, value, subtract );
-		}
-	};
-} );
-
-jQuery.cssHooks.marginLeft = addGetHookIf( support.reliableMarginLeft,
-	function( elem, computed ) {
-		if ( computed ) {
-			return ( parseFloat( curCSS( elem, "marginLeft" ) ) ||
-				elem.getBoundingClientRect().left -
-					swap( elem, { marginLeft: 0 }, function() {
-						return elem.getBoundingClientRect().left;
-					} )
-				) + "px";
-		}
-	}
-);
-
-// Support: Android 2.3
-jQuery.cssHooks.marginRight = addGetHookIf( support.reliableMarginRight,
-	function( elem, computed ) {
-		if ( computed ) {
-			return swap( elem, { "display": "inline-block" },
-				curCSS, [ elem, "marginRight" ] );
-		}
-	}
-);
-
-// These hooks are used by animate to expand properties
-jQuery.each( {
-	margin: "",
-	padding: "",
-	border: "Width"
-}, function( prefix, suffix ) {
-	jQuery.cssHooks[ prefix + suffix ] = {
-		expand: function( value ) {
-			var i = 0,
-				expanded = {},
-
-				// Assumes a single number if not a string
-				parts = typeof value === "string" ? value.split( " " ) : [ value ];
-
-			for ( ; i < 4; i++ ) {
-				expanded[ prefix + cssExpand[ i ] + suffix ] =
-					parts[ i ] || parts[ i - 2 ] || parts[ 0 ];
-			}
-
-			return expanded;
-		}
-	};
-
-	if ( !rmargin.test( prefix ) ) {
-		jQuery.cssHooks[ prefix + suffix ].set = setPositiveNumber;
-	}
-} );
-
-jQuery.fn.extend( {
-	css: function( name, value ) {
-		return access( this, function( elem, name, value ) {
-			var styles, len,
-				map = {},
-				i = 0;
-
-			if ( jQuery.isArray( name ) ) {
-				styles = getStyles( elem );
-				len = name.length;
-
-				for ( ; i < len; i++ ) {
-					map[ name[ i ] ] = jQuery.css( elem, name[ i ], false, styles );
-				}
-
-				return map;
-			}
-
-			return value !== undefined ?
-				jQuery.style( elem, name, value ) :
-				jQuery.css( elem, name );
-		}, name, value, arguments.length > 1 );
-	},
-	show: function() {
-		return showHide( this, true );
-	},
-	hide: function() {
-		return showHide( this );
-	},
-	toggle: function( state ) {
-		if ( typeof state === "boolean" ) {
-			return state ? this.show() : this.hide();
-		}
-
-		return this.each( function() {
-			if ( isHidden( this ) ) {
-				jQuery( this ).show();
-			} else {
-				jQuery( this ).hide();
-			}
-		} );
-	}
-} );
-
-
-function Tween( elem, options, prop, end, easing ) {
-	return new Tween.prototype.init( elem, options, prop, end, easing );
-}
-jQuery.Tween = Tween;
-
-Tween.prototype = {
-	constructor: Tween,
-	init: function( elem, options, prop, end, easing, unit ) {
-		this.elem = elem;
-		this.prop = prop;
-		this.easing = easing || jQuery.easing._default;
-		this.options = options;
-		this.start = this.now = this.cur();
-		this.end = end;
-		this.unit = unit || ( jQuery.cssNumber[ prop ] ? "" : "px" );
-	},
-	cur: function() {
-		var hooks = Tween.propHooks[ this.prop ];
-
-		return hooks && hooks.get ?
-			hooks.get( this ) :
-			Tween.propHooks._default.get( this );
-	},
-	run: function( percent ) {
-		var eased,
-			hooks = Tween.propHooks[ this.prop ];
-
-		if ( this.options.duration ) {
-			this.pos = eased = jQuery.easing[ this.easing ](
-				percent, this.options.duration * percent, 0, 1, this.options.duration
-			);
-		} else {
-			this.pos = eased = percent;
-		}
-		this.now = ( this.end - this.start ) * eased + this.start;
-
-		if ( this.options.step ) {
-			this.options.step.call( this.elem, this.now, this );
-		}
-
-		if ( hooks && hooks.set ) {
-			hooks.set( this );
-		} else {
-			Tween.propHooks._default.set( this );
-		}
-		return this;
-	}
-};
-
-Tween.prototype.init.prototype = Tween.prototype;
-
-Tween.propHooks = {
-	_default: {
-		get: function( tween ) {
-			var result;
-
-			// Use a property on the element directly when it is not a DOM element,
-			// or when there is no matching style property that exists.
-			if ( tween.elem.nodeType !== 1 ||
-				tween.elem[ tween.prop ] != null && tween.elem.style[ tween.prop ] == null ) {
-				return tween.elem[ tween.prop ];
-			}
-
-			// Passing an empty string as a 3rd parameter to .css will automatically
-			// attempt a parseFloat and fallback to a string if the parse fails.
-			// Simple values such as "10px" are parsed to Float;
-			// complex values such as "rotate(1rad)" are returned as-is.
-			result = jQuery.css( tween.elem, tween.prop, "" );
-
-			// Empty strings, null, undefined and "auto" are converted to 0.
-			return !result || result === "auto" ? 0 : result;
-		},
-		set: function( tween ) {
-
-			// Use step hook for back compat.
-			// Use cssHook if its there.
-			// Use .style if available and use plain properties where available.
-			if ( jQuery.fx.step[ tween.prop ] ) {
-				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.nodeType === 1 &&
-				( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null ||
-					jQuery.cssHooks[ tween.prop ] ) ) {
-				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
-			} else {
-				tween.elem[ tween.prop ] = tween.now;
-			}
-		}
-	}
-};
-
-// Support: IE9
-// Panic based approach to setting things on disconnected nodes
-Tween.propHooks.scrollTop = Tween.propHooks.scrollLeft = {
-	set: function( tween ) {
-		if ( tween.elem.nodeType && tween.elem.parentNode ) {
-			tween.elem[ tween.prop ] = tween.now;
-		}
-	}
-};
-
-jQuery.easing = {
-	linear: function( p ) {
-		return p;
-	},
-	swing: function( p ) {
-		return 0.5 - Math.cos( p * Math.PI ) / 2;
-	},
-	_default: "swing"
-};
-
-jQuery.fx = Tween.prototype.init;
-
-// Back Compat <1.8 extension point
-jQuery.fx.step = {};
-
-
-
-
-var
-	fxNow, timerId,
-	rfxtypes = /^(?:toggle|show|hide)$/,
-	rrun = /queueHooks$/;
-
-// Animations created synchronously will run synchronously
-function createFxNow() {
-	window.setTimeout( function() {
-		fxNow = undefined;
-	} );
-	return ( fxNow = jQuery.now() );
-}
-
-// Generate parameters to create a standard animation
-function genFx( type, includeWidth ) {
-	var which,
-		i = 0,
-		attrs = { height: type };
-
-	// If we include width, step value is 1 to do all cssExpand values,
-	// otherwise step value is 2 to skip over Left and Right
-	includeWidth = includeWidth ? 1 : 0;
-	for ( ; i < 4 ; i += 2 - includeWidth ) {
-		which = cssExpand[ i ];
-		attrs[ "margin" + which ] = attrs[ "padding" + which ] = type;
-	}
-
-	if ( includeWidth ) {
-		attrs.opacity = attrs.width = type;
-	}
-
-	return attrs;
-}
-
-function createTween( value, prop, animation ) {
-	var tween,
-		collection = ( Animation.tweeners[ prop ] || [] ).concat( Animation.tweeners[ "*" ] ),
-		index = 0,
-		length = collection.length;
-	for ( ; index < length; index++ ) {
-		if ( ( tween = collection[ index ].call( animation, prop, value ) ) ) {
-
-			// We're done with this property
-			return tween;
-		}
-	}
-}
-
-function defaultPrefilter( elem, props, opts ) {
-	/* jshint validthis: true */
-	var prop, value, toggle, tween, hooks, oldfire, display, checkDisplay,
-		anim = this,
-		orig = {},
-		style = elem.style,
-		hidden = elem.nodeType && isHidden( elem ),
-		dataShow = dataPriv.get( elem, "fxshow" );
-
-	// Handle queue: false promises
-	if ( !opts.queue ) {
-		hooks = jQuery._queueHooks( elem, "fx" );
-		if ( hooks.unqueued == null ) {
-			hooks.unqueued = 0;
-			oldfire = hooks.empty.fire;
-			hooks.empty.fire = function() {
-				if ( !hooks.unqueued ) {
-					oldfire();
-				}
-			};
-		}
-		hooks.unqueued++;
-
-		anim.always( function() {
-
-			// Ensure the complete handler is called before this completes
-			anim.always( function() {
-				hooks.unqueued--;
-				if ( !jQuery.queue( elem, "fx" ).length ) {
-					hooks.empty.fire();
-				}
-			} );
-		} );
-	}
-
-	// Height/width overflow pass
-	if ( elem.nodeType === 1 && ( "height" in props || "width" in props ) ) {
-
-		// Make sure that nothing sneaks out
-		// Record all 3 overflow attributes because IE9-10 do not
-		// change the overflow attribute when overflowX and
-		// overflowY are set to the same value
-		opts.overflow = [ style.overflow, style.overflowX, style.overflowY ];
-
-		// Set display property to inline-block for height/width
-		// animations on inline elements that are having width/height animated
-		display = jQuery.css( elem, "display" );
-
-		// Test default display if display is currently "none"
-		checkDisplay = display === "none" ?
-			dataPriv.get( elem, "olddisplay" ) || defaultDisplay( elem.nodeName ) : display;
-
-		if ( checkDisplay === "inline" && jQuery.css( elem, "float" ) === "none" ) {
-			style.display = "inline-block";
-		}
-	}
-
-	if ( opts.overflow ) {
-		style.overflow = "hidden";
-		anim.always( function() {
-			style.overflow = opts.overflow[ 0 ];
-			style.overflowX = opts.overflow[ 1 ];
-			style.overflowY = opts.overflow[ 2 ];
-		} );
-	}
-
-	// show/hide pass
-	for ( prop in props ) {
-		value = props[ prop ];
-		if ( rfxtypes.exec( value ) ) {
-			delete props[ prop ];
-			toggle = toggle || value === "toggle";
-			if ( value === ( hidden ? "hide" : "show" ) ) {
-
-				// If there is dataShow left over from a stopped hide or show
-				// and we are going to proceed with show, we should pretend to be hidden
-				if ( value === "show" && dataShow && dataShow[ prop ] !== undefined ) {
-					hidden = true;
-				} else {
-					continue;
-				}
-			}
-			orig[ prop ] = dataShow && dataShow[ prop ] || jQuery.style( elem, prop );
-
-		// Any non-fx value stops us from restoring the original display value
-		} else {
-			display = undefined;
-		}
-	}
-
-	if ( !jQuery.isEmptyObject( orig ) ) {
-		if ( dataShow ) {
-			if ( "hidden" in dataShow ) {
-				hidden = dataShow.hidden;
-			}
-		} else {
-			dataShow = dataPriv.access( elem, "fxshow", {} );
-		}
-
-		// Store state if its toggle - enables .stop().toggle() to "reverse"
-		if ( toggle ) {
-			dataShow.hidden = !hidden;
-		}
-		if ( hidden ) {
-			jQuery( elem ).show();
-		} else {
-			anim.done( function() {
-				jQuery( elem ).hide();
-			} );
-		}
-		anim.done( function() {
-			var prop;
-
-			dataPriv.remove( elem, "fxshow" );
-			for ( prop in orig ) {
-				jQuery.style( elem, prop, orig[ prop ] );
-			}
-		} );
-		for ( prop in orig ) {
-			tween = createTween( hidden ? dataShow[ prop ] : 0, prop, anim );
-
-			if ( !( prop in dataShow ) ) {
-				dataShow[ prop ] = tween.start;
-				if ( hidden ) {
-					tween.end = tween.start;
-					tween.start = prop === "width" || prop === "height" ? 1 : 0;
-				}
-			}
-		}
-
-	// If this is a noop like .hide().hide(), restore an overwritten display value
-	} else if ( ( display === "none" ? defaultDisplay( elem.nodeName ) : display ) === "inline" ) {
-		style.display = display;
-	}
-}
-
-function propFilter( props, specialEasing ) {
-	var index, name, easing, value, hooks;
-
-	// camelCase, specialEasing and expand cssHook pass
-	for ( index in props ) {
-		name = jQuery.camelCase( index );
-		easing = specialEasing[ name ];
-		value = props[ index ];
-		if ( jQuery.isArray( value ) ) {
-			easing = value[ 1 ];
-			value = props[ index ] = value[ 0 ];
-		}
-
-		if ( index !== name ) {
-			props[ name ] = value;
-			delete props[ index ];
-		}
-
-		hooks = jQuery.cssHooks[ name ];
-		if ( hooks && "expand" in hooks ) {
-			value = hooks.expand( value );
-			delete props[ name ];
-
-			// Not quite $.extend, this won't overwrite existing keys.
-			// Reusing 'index' because we have the correct "name"
-			for ( index in value ) {
-				if ( !( index in props ) ) {
-					props[ index ] = value[ index ];
-					specialEasing[ index ] = easing;
-				}
-			}
-		} else {
-			specialEasing[ name ] = easing;
-		}
-	}
-}
-
-function Animation( elem, properties, options ) {
-	var result,
-		stopped,
-		index = 0,
-		length = Animation.prefilters.length,
-		deferred = jQuery.Deferred().always( function() {
-
-			// Don't match elem in the :animated selector
-			delete tick.elem;
-		} ),
-		tick = function() {
-			if ( stopped ) {
-				return false;
-			}
-			var currentTime = fxNow || createFxNow(),
-				remaining = Math.max( 0, animation.startTime + animation.duration - currentTime ),
-
-				// Support: Android 2.3
-				// Archaic crash bug won't allow us to use `1 - ( 0.5 || 0 )` (#12497)
-				temp = remaining / animation.duration || 0,
-				percent = 1 - temp,
-				index = 0,
-				length = animation.tweens.length;
-
-			for ( ; index < length ; index++ ) {
-				animation.tweens[ index ].run( percent );
-			}
-
-			deferred.notifyWith( elem, [ animation, percent, remaining ] );
-
-			if ( percent < 1 && length ) {
-				return remaining;
-			} else {
-				deferred.resolveWith( elem, [ animation ] );
-				return false;
-			}
-		},
-		animation = deferred.promise( {
-			elem: elem,
-			props: jQuery.extend( {}, properties ),
-			opts: jQuery.extend( true, {
-				specialEasing: {},
-				easing: jQuery.easing._default
-			}, options ),
-			originalProperties: properties,
-			originalOptions: options,
-			startTime: fxNow || createFxNow(),
-			duration: options.duration,
-			tweens: [],
-			createTween: function( prop, end ) {
-				var tween = jQuery.Tween( elem, animation.opts, prop, end,
-						animation.opts.specialEasing[ prop ] || animation.opts.easing );
-				animation.tweens.push( tween );
-				return tween;
-			},
-			stop: function( gotoEnd ) {
-				var index = 0,
-
-					// If we are going to the end, we want to run all the tweens
-					// otherwise we skip this part
-					length = gotoEnd ? animation.tweens.length : 0;
-				if ( stopped ) {
-					return this;
-				}
-				stopped = true;
-				for ( ; index < length ; index++ ) {
-					animation.tweens[ index ].run( 1 );
-				}
-
-				// Resolve when we played the last frame; otherwise, reject
-				if ( gotoEnd ) {
-					deferred.notifyWith( elem, [ animation, 1, 0 ] );
-					deferred.resolveWith( elem, [ animation, gotoEnd ] );
-				} else {
-					deferred.rejectWith( elem, [ animation, gotoEnd ] );
-				}
-				return this;
-			}
-		} ),
-		props = animation.props;
-
-	propFilter( props, animation.opts.specialEasing );
-
-	for ( ; index < length ; index++ ) {
-		result = Animation.prefilters[ index ].call( animation, elem, props, animation.opts );
-		if ( result ) {
-			if ( jQuery.isFunction( result.stop ) ) {
-				jQuery._queueHooks( animation.elem, animation.opts.queue ).stop =
-					jQuery.proxy( result.stop, result );
-			}
-			return result;
-		}
-	}
-
-	jQuery.map( props, createTween, animation );
-
-	if ( jQuery.isFunction( animation.opts.start ) ) {
-		animation.opts.start.call( elem, animation );
-	}
-
-	jQuery.fx.timer(
-		jQuery.extend( tick, {
-			elem: elem,
-			anim: animation,
-			queue: animation.opts.queue
-		} )
-	);
-
-	// attach callbacks from options
-	return animation.progress( animation.opts.progress )
-		.done( animation.opts.done, animation.opts.complete )
-		.fail( animation.opts.fail )
-		.always( animation.opts.always );
-}
-
-jQuery.Animation = jQuery.extend( Animation, {
-	tweeners: {
-		"*": [ function( prop, value ) {
-			var tween = this.createTween( prop, value );
-			adjustCSS( tween.elem, prop, rcssNum.exec( value ), tween );
-			return tween;
-		} ]
-	},
-
-	tweener: function( props, callback ) {
-		if ( jQuery.isFunction( props ) ) {
-			callback = props;
-			props = [ "*" ];
-		} else {
-			props = props.match( rnotwhite );
-		}
-
-		var prop,
-			index = 0,
-			length = props.length;
-
-		for ( ; index < length ; index++ ) {
-			prop = props[ index ];
-			Animation.tweeners[ prop ] = Animation.tweeners[ prop ] || [];
-			Animation.tweeners[ prop ].unshift( callback );
-		}
-	},
-
-	prefilters: [ defaultPrefilter ],
-
-	prefilter: function( callback, prepend ) {
-		if ( prepend ) {
-			Animation.prefilters.unshift( callback );
-		} else {
-			Animation.prefilters.push( callback );
-		}
-	}
-} );
-
-jQuery.speed = function( speed, easing, fn ) {
-	var opt = speed && typeof speed === "object" ? jQuery.extend( {}, speed ) : {
-		complete: fn || !fn && easing ||
-			jQuery.isFunction( speed ) && speed,
-		duration: speed,
-		easing: fn && easing || easing && !jQuery.isFunction( easing ) && easing
-	};
-
-	opt.duration = jQuery.fx.off ? 0 : typeof opt.duration === "number" ?
-		opt.duration : opt.duration in jQuery.fx.speeds ?
-			jQuery.fx.speeds[ opt.duration ] : jQuery.fx.speeds._default;
-
-	// Normalize opt.queue - true/undefined/null -> "fx"
-	if ( opt.queue == null || opt.queue === true ) {
-		opt.queue = "fx";
-	}
-
-	// Queueing
-	opt.old = opt.complete;
-
-	opt.complete = function() {
-		if ( jQuery.isFunction( opt.old ) ) {
-			opt.old.call( this );
-		}
-
-		if ( opt.queue ) {
-			jQuery.dequeue( this, opt.queue );
-		}
-	};
-
-	return opt;
-};
-
-jQuery.fn.extend( {
-	fadeTo: function( speed, to, easing, callback ) {
-
-		// Show any hidden elements after setting opacity to 0
-		return this.filter( isHidden ).css( "opacity", 0 ).show()
-
-			// Animate to the value specified
-			.end().animate( { opacity: to }, speed, easing, callback );
-	},
-	animate: function( prop, speed, easing, callback ) {
-		var empty = jQuery.isEmptyObject( prop ),
-			optall = jQuery.speed( speed, easing, callback ),
-			doAnimation = function() {
-
-				// Operate on a copy of prop so per-property easing won't be lost
-				var anim = Animation( this, jQuery.extend( {}, prop ), optall );
-
-				// Empty animations, or finishing resolves immediately
-				if ( empty || dataPriv.get( this, "finish" ) ) {
-					anim.stop( true );
-				}
-			};
-			doAnimation.finish = doAnimation;
-
-		return empty || optall.queue === false ?
-			this.each( doAnimation ) :
-			this.queue( optall.queue, doAnimation );
-	},
-	stop: function( type, clearQueue, gotoEnd ) {
-		var stopQueue = function( hooks ) {
-			var stop = hooks.stop;
-			delete hooks.stop;
-			stop( gotoEnd );
-		};
-
-		if ( typeof type !== "string" ) {
-			gotoEnd = clearQueue;
-			clearQueue = type;
-			type = undefined;
-		}
-		if ( clearQueue && type !== false ) {
-			this.queue( type || "fx", [] );
-		}
-
-		return this.each( function() {
-			var dequeue = true,
-				index = type != null && type + "queueHooks",
-				timers = jQuery.timers,
-				data = dataPriv.get( this );
-
-			if ( index ) {
-				if ( data[ index ] && data[ index ].stop ) {
-					stopQueue( data[ index ] );
-				}
-			} else {
-				for ( index in data ) {
-					if ( data[ index ] && data[ index ].stop && rrun.test( index ) ) {
-						stopQueue( data[ index ] );
-					}
-				}
-			}
-
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this &&
-					( type == null || timers[ index ].queue === type ) ) {
-
-					timers[ index ].anim.stop( gotoEnd );
-					dequeue = false;
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Start the next in the queue if the last step wasn't forced.
-			// Timers currently will call their complete callbacks, which
-			// will dequeue but only if they were gotoEnd.
-			if ( dequeue || !gotoEnd ) {
-				jQuery.dequeue( this, type );
-			}
-		} );
-	},
-	finish: function( type ) {
-		if ( type !== false ) {
-			type = type || "fx";
-		}
-		return this.each( function() {
-			var index,
-				data = dataPriv.get( this ),
-				queue = data[ type + "queue" ],
-				hooks = data[ type + "queueHooks" ],
-				timers = jQuery.timers,
-				length = queue ? queue.length : 0;
-
-			// Enable finishing flag on private data
-			data.finish = true;
-
-			// Empty the queue first
-			jQuery.queue( this, type, [] );
-
-			if ( hooks && hooks.stop ) {
-				hooks.stop.call( this, true );
-			}
-
-			// Look for any active animations, and finish them
-			for ( index = timers.length; index--; ) {
-				if ( timers[ index ].elem === this && timers[ index ].queue === type ) {
-					timers[ index ].anim.stop( true );
-					timers.splice( index, 1 );
-				}
-			}
-
-			// Look for any animations in the old queue and finish them
-			for ( index = 0; index < length; index++ ) {
-				if ( queue[ index ] && queue[ index ].finish ) {
-					queue[ index ].finish.call( this );
-				}
-			}
-
-			// Turn off finishing flag
-			delete data.finish;
-		} );
-	}
-} );
-
-jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
-	var cssFn = jQuery.fn[ name ];
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return speed == null || typeof speed === "boolean" ?
-			cssFn.apply( this, arguments ) :
-			this.animate( genFx( name, true ), speed, easing, callback );
-	};
-} );
-
-// Generate shortcuts for custom animations
-jQuery.each( {
-	slideDown: genFx( "show" ),
-	slideUp: genFx( "hide" ),
-	slideToggle: genFx( "toggle" ),
-	fadeIn: { opacity: "show" },
-	fadeOut: { opacity: "hide" },
-	fadeToggle: { opacity: "toggle" }
-}, function( name, props ) {
-	jQuery.fn[ name ] = function( speed, easing, callback ) {
-		return this.animate( props, speed, easing, callback );
-	};
-} );
-
-jQuery.timers = [];
-jQuery.fx.tick = function() {
-	var timer,
-		i = 0,
-		timers = jQuery.timers;
-
-	fxNow = jQuery.now();
-
-	for ( ; i < timers.length; i++ ) {
-		timer = timers[ i ];
-
-		// Checks the timer has not already been removed
-		if ( !timer() && timers[ i ] === timer ) {
-			timers.splice( i--, 1 );
-		}
-	}
-
-	if ( !timers.length ) {
-		jQuery.fx.stop();
-	}
-	fxNow = undefined;
-};
-
-jQuery.fx.timer = function( timer ) {
-	jQuery.timers.push( timer );
-	if ( timer() ) {
-		jQuery.fx.start();
-	} else {
-		jQuery.timers.pop();
-	}
-};
-
-jQuery.fx.interval = 13;
-jQuery.fx.start = function() {
-	if ( !timerId ) {
-		timerId = window.setInterval( jQuery.fx.tick, jQuery.fx.interval );
-	}
-};
-
-jQuery.fx.stop = function() {
-	window.clearInterval( timerId );
-
-	timerId = null;
-};
-
-jQuery.fx.speeds = {
-	slow: 600,
-	fast: 200,
-
-	// Default speed
-	_default: 400
-};
-
-
-// Based off of the plugin by Clint Helfers, with permission.
-// http://web.archive.org/web/20100324014747/http://blindsignals.com/index.php/2009/07/jquery-delay/
-jQuery.fn.delay = function( time, type ) {
-	time = jQuery.fx ? jQuery.fx.speeds[ time ] || time : time;
-	type = type || "fx";
-
-	return this.queue( type, function( next, hooks ) {
-		var timeout = window.setTimeout( next, time );
-		hooks.stop = function() {
-			window.clearTimeout( timeout );
-		};
-	} );
-};
-
-
-( function() {
-	var input = document.createElement( "input" ),
-		select = document.createElement( "select" ),
-		opt = select.appendChild( document.createElement( "option" ) );
-
-	input.type = "checkbox";
-
-	// Support: iOS<=5.1, Android<=4.2+
-	// Default value for a checkbox should be "on"
-	support.checkOn = input.value !== "";
-
-	// Support: IE<=11+
-	// Must access selectedIndex to make default options select
-	support.optSelected = opt.selected;
-
-	// Support: Android<=2.3
-	// Options inside disabled selects are incorrectly marked as disabled
-	select.disabled = true;
-	support.optDisabled = !opt.disabled;
-
-	// Support: IE<=11+
-	// An input loses its value after becoming a radio
-	input = document.createElement( "input" );
-	input.value = "t";
-	input.type = "radio";
-	support.radioValue = input.value === "t";
-} )();
-
-
-var boolHook,
-	attrHandle = jQuery.expr.attrHandle;
-
-jQuery.fn.extend( {
-	attr: function( name, value ) {
-		return access( this, jQuery.attr, name, value, arguments.length > 1 );
-	},
-
-	removeAttr: function( name ) {
-		return this.each( function() {
-			jQuery.removeAttr( this, name );
-		} );
-	}
-} );
-
-jQuery.extend( {
-	attr: function( elem, name, value ) {
-		var ret, hooks,
-			nType = elem.nodeType;
-
-		// Don't get/set attributes on text, comment and attribute nodes
-		if ( nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		// Fallback to prop when attributes are not supported
-		if ( typeof elem.getAttribute === "undefined" ) {
-			return jQuery.prop( elem, name, value );
-		}
-
-		// All attributes are lowercase
-		// Grab necessary hook if one is defined
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-			name = name.toLowerCase();
-			hooks = jQuery.attrHooks[ name ] ||
-				( jQuery.expr.match.bool.test( name ) ? boolHook : undefined );
-		}
-
-		if ( value !== undefined ) {
-			if ( value === null ) {
-				jQuery.removeAttr( elem, name );
-				return;
-			}
-
-			if ( hooks && "set" in hooks &&
-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
-				return ret;
-			}
-
-			elem.setAttribute( name, value + "" );
-			return value;
-		}
-
-		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
-			return ret;
-		}
-
-		ret = jQuery.find.attr( elem, name );
-
-		// Non-existent attributes return null, we normalize to undefined
-		return ret == null ? undefined : ret;
-	},
-
-	attrHooks: {
-		type: {
-			set: function( elem, value ) {
-				if ( !support.radioValue && value === "radio" &&
-					jQuery.nodeName( elem, "input" ) ) {
-					var val = elem.value;
-					elem.setAttribute( "type", value );
-					if ( val ) {
-						elem.value = val;
-					}
-					return value;
-				}
-			}
-		}
-	},
-
-	removeAttr: function( elem, value ) {
-		var name, propName,
-			i = 0,
-			attrNames = value && value.match( rnotwhite );
-
-		if ( attrNames && elem.nodeType === 1 ) {
-			while ( ( name = attrNames[ i++ ] ) ) {
-				propName = jQuery.propFix[ name ] || name;
-
-				// Boolean attributes get special treatment (#10870)
-				if ( jQuery.expr.match.bool.test( name ) ) {
-
-					// Set corresponding property to false
-					elem[ propName ] = false;
-				}
-
-				elem.removeAttribute( name );
-			}
-		}
-	}
-} );
-
-// Hooks for boolean attributes
-boolHook = {
-	set: function( elem, value, name ) {
-		if ( value === false ) {
-
-			// Remove boolean attributes when set to false
-			jQuery.removeAttr( elem, name );
-		} else {
-			elem.setAttribute( name, name );
-		}
-		return name;
-	}
-};
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
-	var getter = attrHandle[ name ] || jQuery.find.attr;
-
-	attrHandle[ name ] = function( elem, name, isXML ) {
-		var ret, handle;
-		if ( !isXML ) {
-
-			// Avoid an infinite loop by temporarily removing this function from the getter
-			handle = attrHandle[ name ];
-			attrHandle[ name ] = ret;
-			ret = getter( elem, name, isXML ) != null ?
-				name.toLowerCase() :
-				null;
-			attrHandle[ name ] = handle;
-		}
-		return ret;
-	};
-} );
-
-
-
-
-var rfocusable = /^(?:input|select|textarea|button)$/i,
-	rclickable = /^(?:a|area)$/i;
-
-jQuery.fn.extend( {
-	prop: function( name, value ) {
-		return access( this, jQuery.prop, name, value, arguments.length > 1 );
-	},
-
-	removeProp: function( name ) {
-		return this.each( function() {
-			delete this[ jQuery.propFix[ name ] || name ];
-		} );
-	}
-} );
-
-jQuery.extend( {
-	prop: function( elem, name, value ) {
-		var ret, hooks,
-			nType = elem.nodeType;
-
-		// Don't get/set properties on text, comment and attribute nodes
-		if ( nType === 3 || nType === 8 || nType === 2 ) {
-			return;
-		}
-
-		if ( nType !== 1 || !jQuery.isXMLDoc( elem ) ) {
-
-			// Fix name and attach hooks
-			name = jQuery.propFix[ name ] || name;
-			hooks = jQuery.propHooks[ name ];
-		}
-
-		if ( value !== undefined ) {
-			if ( hooks && "set" in hooks &&
-				( ret = hooks.set( elem, value, name ) ) !== undefined ) {
-				return ret;
-			}
-
-			return ( elem[ name ] = value );
-		}
-
-		if ( hooks && "get" in hooks && ( ret = hooks.get( elem, name ) ) !== null ) {
-			return ret;
-		}
-
-		return elem[ name ];
-	},
-
-	propHooks: {
-		tabIndex: {
-			get: function( elem ) {
-
-				// elem.tabIndex doesn't always return the
-				// correct value when it hasn't been explicitly set
-				// http://fluidproject.org/blog/2008/01/09/getting-setting-and-removing-tabindex-values-with-javascript/
-				// Use proper attribute retrieval(#12072)
-				var tabindex = jQuery.find.attr( elem, "tabindex" );
-
-				return tabindex ?
-					parseInt( tabindex, 10 ) :
-					rfocusable.test( elem.nodeName ) ||
-						rclickable.test( elem.nodeName ) && elem.href ?
-							0 :
-							-1;
-			}
-		}
-	},
-
-	propFix: {
-		"for": "htmlFor",
-		"class": "className"
-	}
-} );
-
-// Support: IE <=11 only
-// Accessing the selectedIndex property
-// forces the browser to respect setting selected
-// on the option
-// The getter ensures a default option is selected
-// when in an optgroup
-if ( !support.optSelected ) {
-	jQuery.propHooks.selected = {
-		get: function( elem ) {
-			var parent = elem.parentNode;
-			if ( parent && parent.parentNode ) {
-				parent.parentNode.selectedIndex;
-			}
-			return null;
-		},
-		set: function( elem ) {
-			var parent = elem.parentNode;
-			if ( parent ) {
-				parent.selectedIndex;
-
-				if ( parent.parentNode ) {
-					parent.parentNode.selectedIndex;
-				}
-			}
-		}
-	};
-}
-
-jQuery.each( [
-	"tabIndex",
-	"readOnly",
-	"maxLength",
-	"cellSpacing",
-	"cellPadding",
-	"rowSpan",
-	"colSpan",
-	"useMap",
-	"frameBorder",
-	"contentEditable"
-], function() {
-	jQuery.propFix[ this.toLowerCase() ] = this;
-} );
-
-
-
-
-var rclass = /[\t\r\n\f]/g;
-
-function getClass( elem ) {
-	return elem.getAttribute && elem.getAttribute( "class" ) || "";
-}
-
-jQuery.fn.extend( {
-	addClass: function( value ) {
-		var classes, elem, cur, curValue, clazz, j, finalValue,
-			i = 0;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( j ) {
-				jQuery( this ).addClass( value.call( this, j, getClass( this ) ) );
-			} );
-		}
-
-		if ( typeof value === "string" && value ) {
-			classes = value.match( rnotwhite ) || [];
-
-			while ( ( elem = this[ i++ ] ) ) {
-				curValue = getClass( elem );
-				cur = elem.nodeType === 1 &&
-					( " " + curValue + " " ).replace( rclass, " " );
-
-				if ( cur ) {
-					j = 0;
-					while ( ( clazz = classes[ j++ ] ) ) {
-						if ( cur.indexOf( " " + clazz + " " ) < 0 ) {
-							cur += clazz + " ";
-						}
-					}
-
-					// Only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( curValue !== finalValue ) {
-						elem.setAttribute( "class", finalValue );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	removeClass: function( value ) {
-		var classes, elem, cur, curValue, clazz, j, finalValue,
-			i = 0;
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( j ) {
-				jQuery( this ).removeClass( value.call( this, j, getClass( this ) ) );
-			} );
-		}
-
-		if ( !arguments.length ) {
-			return this.attr( "class", "" );
-		}
-
-		if ( typeof value === "string" && value ) {
-			classes = value.match( rnotwhite ) || [];
-
-			while ( ( elem = this[ i++ ] ) ) {
-				curValue = getClass( elem );
-
-				// This expression is here for better compressibility (see addClass)
-				cur = elem.nodeType === 1 &&
-					( " " + curValue + " " ).replace( rclass, " " );
-
-				if ( cur ) {
-					j = 0;
-					while ( ( clazz = classes[ j++ ] ) ) {
-
-						// Remove *all* instances
-						while ( cur.indexOf( " " + clazz + " " ) > -1 ) {
-							cur = cur.replace( " " + clazz + " ", " " );
-						}
-					}
-
-					// Only assign if different to avoid unneeded rendering.
-					finalValue = jQuery.trim( cur );
-					if ( curValue !== finalValue ) {
-						elem.setAttribute( "class", finalValue );
-					}
-				}
-			}
-		}
-
-		return this;
-	},
-
-	toggleClass: function( value, stateVal ) {
-		var type = typeof value;
-
-		if ( typeof stateVal === "boolean" && type === "string" ) {
-			return stateVal ? this.addClass( value ) : this.removeClass( value );
-		}
-
-		if ( jQuery.isFunction( value ) ) {
-			return this.each( function( i ) {
-				jQuery( this ).toggleClass(
-					value.call( this, i, getClass( this ), stateVal ),
-					stateVal
-				);
-			} );
-		}
-
-		return this.each( function() {
-			var className, i, self, classNames;
-
-			if ( type === "string" ) {
-
-				// Toggle individual class names
-				i = 0;
-				self = jQuery( this );
-				classNames = value.match( rnotwhite ) || [];
-
-				while ( ( className = classNames[ i++ ] ) ) {
-
-					// Check each className given, space separated list
-					if ( self.hasClass( className ) ) {
-						self.removeClass( className );
-					} else {
-						self.addClass( className );
-					}
-				}
-
-			// Toggle whole class name
-			} else if ( value === undefined || type === "boolean" ) {
-				className = getClass( this );
-				if ( className ) {
-
-					// Store className if set
-					dataPriv.set( this, "__className__", className );
-				}
-
-				// If the element has a class name or if we're passed `false`,
-				// then remove the whole classname (if there was one, the above saved it).
-				// Otherwise bring back whatever was previously saved (if anything),
-				// falling back to the empty string if nothing was stored.
-				if ( this.setAttribute ) {
-					this.setAttribute( "class",
-						className || value === false ?
-						"" :
-						dataPriv.get( this, "__className__" ) || ""
-					);
-				}
-			}
-		} );
-	},
-
-	hasClass: function( selector ) {
-		var className, elem,
-			i = 0;
-
-		className = " " + selector + " ";
-		while ( ( elem = this[ i++ ] ) ) {
-			if ( elem.nodeType === 1 &&
-				( " " + getClass( elem ) + " " ).replace( rclass, " " )
-					.indexOf( className ) > -1
-			) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-} );
-
-
-
-
-var rreturn = /\r/g,
-	rspaces = /[\x20\t\r\n\f]+/g;
-
-jQuery.fn.extend( {
-	val: function( value ) {
-		var hooks, ret, isFunction,
-			elem = this[ 0 ];
-
-		if ( !arguments.length ) {
-			if ( elem ) {
-				hooks = jQuery.valHooks[ elem.type ] ||
-					jQuery.valHooks[ elem.nodeName.toLowerCase() ];
-
-				if ( hooks &&
-					"get" in hooks &&
-					( ret = hooks.get( elem, "value" ) ) !== undefined
-				) {
-					return ret;
-				}
-
-				ret = elem.value;
-
-				return typeof ret === "string" ?
-
-					// Handle most common string cases
-					ret.replace( rreturn, "" ) :
-
-					// Handle cases where value is null/undef or number
-					ret == null ? "" : ret;
-			}
-
-			return;
-		}
-
-		isFunction = jQuery.isFunction( value );
-
-		return this.each( function( i ) {
-			var val;
-
-			if ( this.nodeType !== 1 ) {
-				return;
-			}
-
-			if ( isFunction ) {
-				val = value.call( this, i, jQuery( this ).val() );
-			} else {
-				val = value;
-			}
-
-			// Treat null/undefined as ""; convert numbers to string
-			if ( val == null ) {
-				val = "";
-
-			} else if ( typeof val === "number" ) {
-				val += "";
-
-			} else if ( jQuery.isArray( val ) ) {
-				val = jQuery.map( val, function( value ) {
-					return value == null ? "" : value + "";
-				} );
-			}
-
-			hooks = jQuery.valHooks[ this.type ] || jQuery.valHooks[ this.nodeName.toLowerCase() ];
-
-			// If set returns undefined, fall back to normal setting
-			if ( !hooks || !( "set" in hooks ) || hooks.set( this, val, "value" ) === undefined ) {
-				this.value = val;
-			}
-		} );
-	}
-} );
-
-jQuery.extend( {
-	valHooks: {
-		option: {
-			get: function( elem ) {
-
-				var val = jQuery.find.attr( elem, "value" );
-				return val != null ?
-					val :
-
-					// Support: IE10-11+
-					// option.text throws exceptions (#14686, #14858)
-					// Strip and collapse whitespace
-					// https://html.spec.whatwg.org/#strip-and-collapse-whitespace
-					jQuery.trim( jQuery.text( elem ) ).replace( rspaces, " " );
-			}
-		},
-		select: {
-			get: function( elem ) {
-				var value, option,
-					options = elem.options,
-					index = elem.selectedIndex,
-					one = elem.type === "select-one" || index < 0,
-					values = one ? null : [],
-					max = one ? index + 1 : options.length,
-					i = index < 0 ?
-						max :
-						one ? index : 0;
-
-				// Loop through all the selected options
-				for ( ; i < max; i++ ) {
-					option = options[ i ];
-
-					// IE8-9 doesn't update selected after form reset (#2551)
-					if ( ( option.selected || i === index ) &&
-
-							// Don't return options that are disabled or in a disabled optgroup
-							( support.optDisabled ?
-								!option.disabled : option.getAttribute( "disabled" ) === null ) &&
-							( !option.parentNode.disabled ||
-								!jQuery.nodeName( option.parentNode, "optgroup" ) ) ) {
-
-						// Get the specific value for the option
-						value = jQuery( option ).val();
-
-						// We don't need an array for one selects
-						if ( one ) {
-							return value;
-						}
-
-						// Multi-Selects return an array
-						values.push( value );
-					}
-				}
-
-				return values;
-			},
-
-			set: function( elem, value ) {
-				var optionSet, option,
-					options = elem.options,
-					values = jQuery.makeArray( value ),
-					i = options.length;
-
-				while ( i-- ) {
-					option = options[ i ];
-					if ( option.selected =
-						jQuery.inArray( jQuery.valHooks.option.get( option ), values ) > -1
-					) {
-						optionSet = true;
-					}
-				}
-
-				// Force browsers to behave consistently when non-matching value is set
-				if ( !optionSet ) {
-					elem.selectedIndex = -1;
-				}
-				return values;
-			}
-		}
-	}
-} );
-
-// Radios and checkboxes getter/setter
-jQuery.each( [ "radio", "checkbox" ], function() {
-	jQuery.valHooks[ this ] = {
-		set: function( elem, value ) {
-			if ( jQuery.isArray( value ) ) {
-				return ( elem.checked = jQuery.inArray( jQuery( elem ).val(), value ) > -1 );
-			}
-		}
-	};
-	if ( !support.checkOn ) {
-		jQuery.valHooks[ this ].get = function( elem ) {
-			return elem.getAttribute( "value" ) === null ? "on" : elem.value;
-		};
-	}
-} );
-
-
-
-
-// Return jQuery for attributes-only inclusion
-
-
-var rfocusMorph = /^(?:focusinfocus|focusoutblur)$/;
-
-jQuery.extend( jQuery.event, {
-
-	trigger: function( event, data, elem, onlyHandlers ) {
-
-		var i, cur, tmp, bubbleType, ontype, handle, special,
-			eventPath = [ elem || document ],
-			type = hasOwn.call( event, "type" ) ? event.type : event,
-			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split( "." ) : [];
-
-		cur = tmp = elem = elem || document;
-
-		// Don't do events on text and comment nodes
-		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
-			return;
-		}
-
-		// focus/blur morphs to focusin/out; ensure we're not firing them right now
-		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
-			return;
-		}
-
-		if ( type.indexOf( "." ) > -1 ) {
-
-			// Namespaced trigger; create a regexp to match event type in handle()
-			namespaces = type.split( "." );
-			type = namespaces.shift();
-			namespaces.sort();
-		}
-		ontype = type.indexOf( ":" ) < 0 && "on" + type;
-
-		// Caller can pass in a jQuery.Event object, Object, or just an event type string
-		event = event[ jQuery.expando ] ?
-			event :
-			new jQuery.Event( type, typeof event === "object" && event );
-
-		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
-		event.isTrigger = onlyHandlers ? 2 : 3;
-		event.namespace = namespaces.join( "." );
-		event.rnamespace = event.namespace ?
-			new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" ) :
-			null;
-
-		// Clean up the event in case it is being reused
-		event.result = undefined;
-		if ( !event.target ) {
-			event.target = elem;
-		}
-
-		// Clone any incoming data and prepend the event, creating the handler arg list
-		data = data == null ?
-			[ event ] :
-			jQuery.makeArray( data, [ event ] );
-
-		// Allow special events to draw outside the lines
-		special = jQuery.event.special[ type ] || {};
-		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
-			return;
-		}
-
-		// Determine event propagation path in advance, per W3C events spec (#9951)
-		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
-		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
-
-			bubbleType = special.delegateType || type;
-			if ( !rfocusMorph.test( bubbleType + type ) ) {
-				cur = cur.parentNode;
-			}
-			for ( ; cur; cur = cur.parentNode ) {
-				eventPath.push( cur );
-				tmp = cur;
-			}
-
-			// Only add window if we got to document (e.g., not plain obj or detached DOM)
-			if ( tmp === ( elem.ownerDocument || document ) ) {
-				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
-			}
-		}
-
-		// Fire handlers on the event path
-		i = 0;
-		while ( ( cur = eventPath[ i++ ] ) && !event.isPropagationStopped() ) {
-
-			event.type = i > 1 ?
-				bubbleType :
-				special.bindType || type;
-
-			// jQuery handler
-			handle = ( dataPriv.get( cur, "events" ) || {} )[ event.type ] &&
-				dataPriv.get( cur, "handle" );
-			if ( handle ) {
-				handle.apply( cur, data );
-			}
-
-			// Native handler
-			handle = ontype && cur[ ontype ];
-			if ( handle && handle.apply && acceptData( cur ) ) {
-				event.result = handle.apply( cur, data );
-				if ( event.result === false ) {
-					event.preventDefault();
-				}
-			}
-		}
-		event.type = type;
-
-		// If nobody prevented the default action, do it now
-		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
-
-			if ( ( !special._default ||
-				special._default.apply( eventPath.pop(), data ) === false ) &&
-				acceptData( elem ) ) {
-
-				// Call a native DOM method on the target with the same name name as the event.
-				// Don't do default actions on window, that's where global variables be (#6170)
-				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
-
-					// Don't re-trigger an onFOO event when we call its FOO() method
-					tmp = elem[ ontype ];
-
-					if ( tmp ) {
-						elem[ ontype ] = null;
-					}
-
-					// Prevent re-triggering of the same event, since we already bubbled it above
-					jQuery.event.triggered = type;
-					elem[ type ]();
-					jQuery.event.triggered = undefined;
-
-					if ( tmp ) {
-						elem[ ontype ] = tmp;
-					}
-				}
-			}
-		}
-
-		return event.result;
-	},
-
-	// Piggyback on a donor event to simulate a different one
-	// Used only for `focus(in | out)` events
-	simulate: function( type, elem, event ) {
-		var e = jQuery.extend(
-			new jQuery.Event(),
-			event,
-			{
-				type: type,
-				isSimulated: true
-			}
-		);
-
-		jQuery.event.trigger( e, null, elem );
-	}
-
-} );
-
-jQuery.fn.extend( {
-
-	trigger: function( type, data ) {
-		return this.each( function() {
-			jQuery.event.trigger( type, data, this );
-		} );
-	},
-	triggerHandler: function( type, data ) {
-		var elem = this[ 0 ];
-		if ( elem ) {
-			return jQuery.event.trigger( type, data, elem, true );
-		}
-	}
-} );
-
-
-jQuery.each( ( "blur focus focusin focusout load resize scroll unload click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup error contextmenu" ).split( " " ),
-	function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
-	};
-} );
-
-jQuery.fn.extend( {
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-} );
-
-
-
-
-support.focusin = "onfocusin" in window;
-
-
-// Support: Firefox
-// Firefox doesn't have focus(in | out) events
-// Related ticket - https://bugzilla.mozilla.org/show_bug.cgi?id=687787
-//
-// Support: Chrome, Safari
-// focus(in | out) events fire after focus & blur events,
-// which is spec violation - http://www.w3.org/TR/DOM-Level-3-Events/#events-focusevent-event-order
-// Related ticket - https://code.google.com/p/chromium/issues/detail?id=449857
-if ( !support.focusin ) {
-	jQuery.each( { focus: "focusin", blur: "focusout" }, function( orig, fix ) {
-
-		// Attach a single capturing handler on the document while someone wants focusin/focusout
-		var handler = function( event ) {
-			jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ) );
-		};
-
-		jQuery.event.special[ fix ] = {
-			setup: function() {
-				var doc = this.ownerDocument || this,
-					attaches = dataPriv.access( doc, fix );
-
-				if ( !attaches ) {
-					doc.addEventListener( orig, handler, true );
-				}
-				dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
-			},
-			teardown: function() {
-				var doc = this.ownerDocument || this,
-					attaches = dataPriv.access( doc, fix ) - 1;
-
-				if ( !attaches ) {
-					doc.removeEventListener( orig, handler, true );
-					dataPriv.remove( doc, fix );
-
-				} else {
-					dataPriv.access( doc, fix, attaches );
-				}
-			}
-		};
-	} );
-}
-var location = window.location;
-
-var nonce = jQuery.now();
-
-var rquery = ( /\?/ );
-
-
-
-// Support: Android 2.3
-// Workaround failure to string-cast null input
-jQuery.parseJSON = function( data ) {
-	return JSON.parse( data + "" );
-};
-
-
-// Cross-browser xml parsing
-jQuery.parseXML = function( data ) {
-	var xml;
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-
-	// Support: IE9
-	try {
-		xml = ( new window.DOMParser() ).parseFromString( data, "text/xml" );
-	} catch ( e ) {
-		xml = undefined;
-	}
-
-	if ( !xml || xml.getElementsByTagName( "parsererror" ).length ) {
-		jQuery.error( "Invalid XML: " + data );
-	}
-	return xml;
-};
-
-
-var
-	rhash = /#.*$/,
-	rts = /([?&])_=[^&]*/,
-	rheaders = /^(.*?):[ \t]*([^\r\n]*)$/mg,
-
-	// #7653, #8125, #8152: local protocol detection
-	rlocalProtocol = /^(?:about|app|app-storage|.+-extension|file|res|widget):$/,
-	rnoContent = /^(?:GET|HEAD)$/,
-	rprotocol = /^\/\//,
-
-	/* Prefilters
-	 * 1) They are useful to introduce custom dataTypes (see ajax/jsonp.js for an example)
-	 * 2) These are called:
-	 *    - BEFORE asking for a transport
-	 *    - AFTER param serialization (s.data is a string if s.processData is true)
-	 * 3) key is the dataType
-	 * 4) the catchall symbol "*" can be used
-	 * 5) execution will start with transport dataType and THEN continue down to "*" if needed
-	 */
-	prefilters = {},
-
-	/* Transports bindings
-	 * 1) key is the dataType
-	 * 2) the catchall symbol "*" can be used
-	 * 3) selection will start with transport dataType and THEN go to "*" if needed
-	 */
-	transports = {},
-
-	// Avoid comment-prolog char sequence (#10098); must appease lint and evade compression
-	allTypes = "*/".concat( "*" ),
-
-	// Anchor tag for parsing the document origin
-	originAnchor = document.createElement( "a" );
-	originAnchor.href = location.href;
-
-// Base "constructor" for jQuery.ajaxPrefilter and jQuery.ajaxTransport
-function addToPrefiltersOrTransports( structure ) {
-
-	// dataTypeExpression is optional and defaults to "*"
-	return function( dataTypeExpression, func ) {
-
-		if ( typeof dataTypeExpression !== "string" ) {
-			func = dataTypeExpression;
-			dataTypeExpression = "*";
-		}
-
-		var dataType,
-			i = 0,
-			dataTypes = dataTypeExpression.toLowerCase().match( rnotwhite ) || [];
-
-		if ( jQuery.isFunction( func ) ) {
-
-			// For each dataType in the dataTypeExpression
-			while ( ( dataType = dataTypes[ i++ ] ) ) {
-
-				// Prepend if requested
-				if ( dataType[ 0 ] === "+" ) {
-					dataType = dataType.slice( 1 ) || "*";
-					( structure[ dataType ] = structure[ dataType ] || [] ).unshift( func );
-
-				// Otherwise append
-				} else {
-					( structure[ dataType ] = structure[ dataType ] || [] ).push( func );
-				}
-			}
-		}
-	};
-}
-
-// Base inspection function for prefilters and transports
-function inspectPrefiltersOrTransports( structure, options, originalOptions, jqXHR ) {
-
-	var inspected = {},
-		seekingTransport = ( structure === transports );
-
-	function inspect( dataType ) {
-		var selected;
-		inspected[ dataType ] = true;
-		jQuery.each( structure[ dataType ] || [], function( _, prefilterOrFactory ) {
-			var dataTypeOrTransport = prefilterOrFactory( options, originalOptions, jqXHR );
-			if ( typeof dataTypeOrTransport === "string" &&
-				!seekingTransport && !inspected[ dataTypeOrTransport ] ) {
-
-				options.dataTypes.unshift( dataTypeOrTransport );
-				inspect( dataTypeOrTransport );
-				return false;
-			} else if ( seekingTransport ) {
-				return !( selected = dataTypeOrTransport );
-			}
-		} );
-		return selected;
-	}
-
-	return inspect( options.dataTypes[ 0 ] ) || !inspected[ "*" ] && inspect( "*" );
-}
-
-// A special extend for ajax options
-// that takes "flat" options (not to be deep extended)
-// Fixes #9887
-function ajaxExtend( target, src ) {
-	var key, deep,
-		flatOptions = jQuery.ajaxSettings.flatOptions || {};
-
-	for ( key in src ) {
-		if ( src[ key ] !== undefined ) {
-			( flatOptions[ key ] ? target : ( deep || ( deep = {} ) ) )[ key ] = src[ key ];
-		}
-	}
-	if ( deep ) {
-		jQuery.extend( true, target, deep );
-	}
-
-	return target;
-}
-
-/* Handles responses to an ajax request:
- * - finds the right dataType (mediates between content-type and expected dataType)
- * - returns the corresponding response
- */
-function ajaxHandleResponses( s, jqXHR, responses ) {
-
-	var ct, type, finalDataType, firstDataType,
-		contents = s.contents,
-		dataTypes = s.dataTypes;
-
-	// Remove auto dataType and get content-type in the process
-	while ( dataTypes[ 0 ] === "*" ) {
-		dataTypes.shift();
-		if ( ct === undefined ) {
-			ct = s.mimeType || jqXHR.getResponseHeader( "Content-Type" );
-		}
-	}
-
-	// Check if we're dealing with a known content-type
-	if ( ct ) {
-		for ( type in contents ) {
-			if ( contents[ type ] && contents[ type ].test( ct ) ) {
-				dataTypes.unshift( type );
-				break;
-			}
-		}
-	}
-
-	// Check to see if we have a response for the expected dataType
-	if ( dataTypes[ 0 ] in responses ) {
-		finalDataType = dataTypes[ 0 ];
-	} else {
-
-		// Try convertible dataTypes
-		for ( type in responses ) {
-			if ( !dataTypes[ 0 ] || s.converters[ type + " " + dataTypes[ 0 ] ] ) {
-				finalDataType = type;
-				break;
-			}
-			if ( !firstDataType ) {
-				firstDataType = type;
-			}
-		}
-
-		// Or just use first one
-		finalDataType = finalDataType || firstDataType;
-	}
-
-	// If we found a dataType
-	// We add the dataType to the list if needed
-	// and return the corresponding response
-	if ( finalDataType ) {
-		if ( finalDataType !== dataTypes[ 0 ] ) {
-			dataTypes.unshift( finalDataType );
-		}
-		return responses[ finalDataType ];
-	}
-}
-
-/* Chain conversions given the request and the original response
- * Also sets the responseXXX fields on the jqXHR instance
- */
-function ajaxConvert( s, response, jqXHR, isSuccess ) {
-	var conv2, current, conv, tmp, prev,
-		converters = {},
-
-		// Work with a copy of dataTypes in case we need to modify it for conversion
-		dataTypes = s.dataTypes.slice();
-
-	// Create converters map with lowercased keys
-	if ( dataTypes[ 1 ] ) {
-		for ( conv in s.converters ) {
-			converters[ conv.toLowerCase() ] = s.converters[ conv ];
-		}
-	}
-
-	current = dataTypes.shift();
-
-	// Convert to each sequential dataType
-	while ( current ) {
-
-		if ( s.responseFields[ current ] ) {
-			jqXHR[ s.responseFields[ current ] ] = response;
-		}
-
-		// Apply the dataFilter if provided
-		if ( !prev && isSuccess && s.dataFilter ) {
-			response = s.dataFilter( response, s.dataType );
-		}
-
-		prev = current;
-		current = dataTypes.shift();
-
-		if ( current ) {
-
-		// There's only work to do if current dataType is non-auto
-			if ( current === "*" ) {
-
-				current = prev;
-
-			// Convert response if prev dataType is non-auto and differs from current
-			} else if ( prev !== "*" && prev !== current ) {
-
-				// Seek a direct converter
-				conv = converters[ prev + " " + current ] || converters[ "* " + current ];
-
-				// If none found, seek a pair
-				if ( !conv ) {
-					for ( conv2 in converters ) {
-
-						// If conv2 outputs current
-						tmp = conv2.split( " " );
-						if ( tmp[ 1 ] === current ) {
-
-							// If prev can be converted to accepted input
-							conv = converters[ prev + " " + tmp[ 0 ] ] ||
-								converters[ "* " + tmp[ 0 ] ];
-							if ( conv ) {
-
-								// Condense equivalence converters
-								if ( conv === true ) {
-									conv = converters[ conv2 ];
-
-								// Otherwise, insert the intermediate dataType
-								} else if ( converters[ conv2 ] !== true ) {
-									current = tmp[ 0 ];
-									dataTypes.unshift( tmp[ 1 ] );
-								}
-								break;
-							}
-						}
-					}
-				}
-
-				// Apply converter (if not an equivalence)
-				if ( conv !== true ) {
-
-					// Unless errors are allowed to bubble, catch and return them
-					if ( conv && s.throws ) {
-						response = conv( response );
-					} else {
-						try {
-							response = conv( response );
-						} catch ( e ) {
-							return {
-								state: "parsererror",
-								error: conv ? e : "No conversion from " + prev + " to " + current
-							};
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return { state: "success", data: response };
-}
-
-jQuery.extend( {
-
-	// Counter for holding the number of active queries
-	active: 0,
-
-	// Last-Modified header cache for next request
-	lastModified: {},
-	etag: {},
-
-	ajaxSettings: {
-		url: location.href,
-		type: "GET",
-		isLocal: rlocalProtocol.test( location.protocol ),
-		global: true,
-		processData: true,
-		async: true,
-		contentType: "application/x-www-form-urlencoded; charset=UTF-8",
-		/*
-		timeout: 0,
-		data: null,
-		dataType: null,
-		username: null,
-		password: null,
-		cache: null,
-		throws: false,
-		traditional: false,
-		headers: {},
-		*/
-
-		accepts: {
-			"*": allTypes,
-			text: "text/plain",
-			html: "text/html",
-			xml: "application/xml, text/xml",
-			json: "application/json, text/javascript"
-		},
-
-		contents: {
-			xml: /\bxml\b/,
-			html: /\bhtml/,
-			json: /\bjson\b/
-		},
-
-		responseFields: {
-			xml: "responseXML",
-			text: "responseText",
-			json: "responseJSON"
-		},
-
-		// Data converters
-		// Keys separate source (or catchall "*") and destination types with a single space
-		converters: {
-
-			// Convert anything to text
-			"* text": String,
-
-			// Text to html (true = no transformation)
-			"text html": true,
-
-			// Evaluate text as a json expression
-			"text json": jQuery.parseJSON,
-
-			// Parse text as xml
-			"text xml": jQuery.parseXML
-		},
-
-		// For options that shouldn't be deep extended:
-		// you can add your own custom options here if
-		// and when you create one that shouldn't be
-		// deep extended (see ajaxExtend)
-		flatOptions: {
-			url: true,
-			context: true
-		}
-	},
-
-	// Creates a full fledged settings object into target
-	// with both ajaxSettings and settings fields.
-	// If target is omitted, writes into ajaxSettings.
-	ajaxSetup: function( target, settings ) {
-		return settings ?
-
-			// Building a settings object
-			ajaxExtend( ajaxExtend( target, jQuery.ajaxSettings ), settings ) :
-
-			// Extending ajaxSettings
-			ajaxExtend( jQuery.ajaxSettings, target );
-	},
-
-	ajaxPrefilter: addToPrefiltersOrTransports( prefilters ),
-	ajaxTransport: addToPrefiltersOrTransports( transports ),
-
-	// Main method
-	ajax: function( url, options ) {
-
-		// If url is an object, simulate pre-1.5 signature
-		if ( typeof url === "object" ) {
-			options = url;
-			url = undefined;
-		}
-
-		// Force options to be an object
-		options = options || {};
-
-		var transport,
-
-			// URL without anti-cache param
-			cacheURL,
-
-			// Response headers
-			responseHeadersString,
-			responseHeaders,
-
-			// timeout handle
-			timeoutTimer,
-
-			// Url cleanup var
-			urlAnchor,
-
-			// To know if global events are to be dispatched
-			fireGlobals,
-
-			// Loop variable
-			i,
-
-			// Create the final options object
-			s = jQuery.ajaxSetup( {}, options ),
-
-			// Callbacks context
-			callbackContext = s.context || s,
-
-			// Context for global events is callbackContext if it is a DOM node or jQuery collection
-			globalEventContext = s.context &&
-				( callbackContext.nodeType || callbackContext.jquery ) ?
-					jQuery( callbackContext ) :
-					jQuery.event,
-
-			// Deferreds
-			deferred = jQuery.Deferred(),
-			completeDeferred = jQuery.Callbacks( "once memory" ),
-
-			// Status-dependent callbacks
-			statusCode = s.statusCode || {},
-
-			// Headers (they are sent all at once)
-			requestHeaders = {},
-			requestHeadersNames = {},
-
-			// The jqXHR state
-			state = 0,
-
-			// Default abort message
-			strAbort = "canceled",
-
-			// Fake xhr
-			jqXHR = {
-				readyState: 0,
-
-				// Builds headers hashtable if needed
-				getResponseHeader: function( key ) {
-					var match;
-					if ( state === 2 ) {
-						if ( !responseHeaders ) {
-							responseHeaders = {};
-							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
-							}
-						}
-						match = responseHeaders[ key.toLowerCase() ];
-					}
-					return match == null ? null : match;
-				},
-
-				// Raw string
-				getAllResponseHeaders: function() {
-					return state === 2 ? responseHeadersString : null;
-				},
-
-				// Caches the header
-				setRequestHeader: function( name, value ) {
-					var lname = name.toLowerCase();
-					if ( !state ) {
-						name = requestHeadersNames[ lname ] = requestHeadersNames[ lname ] || name;
-						requestHeaders[ name ] = value;
-					}
-					return this;
-				},
-
-				// Overrides response content-type header
-				overrideMimeType: function( type ) {
-					if ( !state ) {
-						s.mimeType = type;
-					}
-					return this;
-				},
-
-				// Status-dependent callbacks
-				statusCode: function( map ) {
-					var code;
-					if ( map ) {
-						if ( state < 2 ) {
-							for ( code in map ) {
-
-								// Lazy-add the new callback in a way that preserves old ones
-								statusCode[ code ] = [ statusCode[ code ], map[ code ] ];
-							}
-						} else {
-
-							// Execute the appropriate callbacks
-							jqXHR.always( map[ jqXHR.status ] );
-						}
-					}
-					return this;
-				},
-
-				// Cancel the request
-				abort: function( statusText ) {
-					var finalText = statusText || strAbort;
-					if ( transport ) {
-						transport.abort( finalText );
-					}
-					done( 0, finalText );
-					return this;
-				}
-			};
-
-		// Attach deferreds
-		deferred.promise( jqXHR ).complete = completeDeferred.add;
-		jqXHR.success = jqXHR.done;
-		jqXHR.error = jqXHR.fail;
-
-		// Remove hash character (#7531: and string promotion)
-		// Add protocol if not provided (prefilters might expect it)
-		// Handle falsy url in the settings object (#10093: consistency with old signature)
-		// We also use the url parameter if available
-		s.url = ( ( url || s.url || location.href ) + "" ).replace( rhash, "" )
-			.replace( rprotocol, location.protocol + "//" );
-
-		// Alias method option to type as per ticket #12004
-		s.type = options.method || options.type || s.method || s.type;
-
-		// Extract dataTypes list
-		s.dataTypes = jQuery.trim( s.dataType || "*" ).toLowerCase().match( rnotwhite ) || [ "" ];
-
-		// A cross-domain request is in order when the origin doesn't match the current origin.
-		if ( s.crossDomain == null ) {
-			urlAnchor = document.createElement( "a" );
-
-			// Support: IE8-11+
-			// IE throws exception if url is malformed, e.g. http://example.com:80x/
-			try {
-				urlAnchor.href = s.url;
-
-				// Support: IE8-11+
-				// Anchor's host property isn't correctly set when s.url is relative
-				urlAnchor.href = urlAnchor.href;
-				s.crossDomain = originAnchor.protocol + "//" + originAnchor.host !==
-					urlAnchor.protocol + "//" + urlAnchor.host;
-			} catch ( e ) {
-
-				// If there is an error parsing the URL, assume it is crossDomain,
-				// it can be rejected by the transport if it is invalid
-				s.crossDomain = true;
-			}
-		}
-
-		// Convert data if not already a string
-		if ( s.data && s.processData && typeof s.data !== "string" ) {
-			s.data = jQuery.param( s.data, s.traditional );
-		}
-
-		// Apply prefilters
-		inspectPrefiltersOrTransports( prefilters, s, options, jqXHR );
-
-		// If request was aborted inside a prefilter, stop there
-		if ( state === 2 ) {
-			return jqXHR;
-		}
-
-		// We can fire global events as of now if asked to
-		// Don't fire events if jQuery.event is undefined in an AMD-usage scenario (#15118)
-		fireGlobals = jQuery.event && s.global;
-
-		// Watch for a new set of requests
-		if ( fireGlobals && jQuery.active++ === 0 ) {
-			jQuery.event.trigger( "ajaxStart" );
-		}
-
-		// Uppercase the type
-		s.type = s.type.toUpperCase();
-
-		// Determine if request has content
-		s.hasContent = !rnoContent.test( s.type );
-
-		// Save the URL in case we're toying with the If-Modified-Since
-		// and/or If-None-Match header later on
-		cacheURL = s.url;
-
-		// More options handling for requests with no content
-		if ( !s.hasContent ) {
-
-			// If data is available, append data to url
-			if ( s.data ) {
-				cacheURL = ( s.url += ( rquery.test( cacheURL ) ? "&" : "?" ) + s.data );
-
-				// #9682: remove data so that it's not used in an eventual retry
-				delete s.data;
-			}
-
-			// Add anti-cache in url if needed
-			if ( s.cache === false ) {
-				s.url = rts.test( cacheURL ) ?
-
-					// If there is already a '_' parameter, set its value
-					cacheURL.replace( rts, "$1_=" + nonce++ ) :
-
-					// Otherwise add one to the end
-					cacheURL + ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + nonce++;
-			}
-		}
-
-		// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-		if ( s.ifModified ) {
-			if ( jQuery.lastModified[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-Modified-Since", jQuery.lastModified[ cacheURL ] );
-			}
-			if ( jQuery.etag[ cacheURL ] ) {
-				jqXHR.setRequestHeader( "If-None-Match", jQuery.etag[ cacheURL ] );
-			}
-		}
-
-		// Set the correct header, if data is being sent
-		if ( s.data && s.hasContent && s.contentType !== false || options.contentType ) {
-			jqXHR.setRequestHeader( "Content-Type", s.contentType );
-		}
-
-		// Set the Accepts header for the server, depending on the dataType
-		jqXHR.setRequestHeader(
-			"Accept",
-			s.dataTypes[ 0 ] && s.accepts[ s.dataTypes[ 0 ] ] ?
-				s.accepts[ s.dataTypes[ 0 ] ] +
-					( s.dataTypes[ 0 ] !== "*" ? ", " + allTypes + "; q=0.01" : "" ) :
-				s.accepts[ "*" ]
-		);
-
-		// Check for headers option
-		for ( i in s.headers ) {
-			jqXHR.setRequestHeader( i, s.headers[ i ] );
-		}
-
-		// Allow custom headers/mimetypes and early abort
-		if ( s.beforeSend &&
-			( s.beforeSend.call( callbackContext, jqXHR, s ) === false || state === 2 ) ) {
-
-			// Abort if not done already and return
-			return jqXHR.abort();
-		}
-
-		// Aborting is no longer a cancellation
-		strAbort = "abort";
-
-		// Install callbacks on deferreds
-		for ( i in { success: 1, error: 1, complete: 1 } ) {
-			jqXHR[ i ]( s[ i ] );
-		}
-
-		// Get transport
-		transport = inspectPrefiltersOrTransports( transports, s, options, jqXHR );
-
-		// If no transport, we auto-abort
-		if ( !transport ) {
-			done( -1, "No Transport" );
-		} else {
-			jqXHR.readyState = 1;
-
-			// Send global event
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxSend", [ jqXHR, s ] );
-			}
-
-			// If request was aborted inside ajaxSend, stop there
-			if ( state === 2 ) {
-				return jqXHR;
-			}
-
-			// Timeout
-			if ( s.async && s.timeout > 0 ) {
-				timeoutTimer = window.setTimeout( function() {
-					jqXHR.abort( "timeout" );
-				}, s.timeout );
-			}
-
-			try {
-				state = 1;
-				transport.send( requestHeaders, done );
-			} catch ( e ) {
-
-				// Propagate exception as error if not done
-				if ( state < 2 ) {
-					done( -1, e );
-
-				// Simply rethrow otherwise
-				} else {
-					throw e;
-				}
-			}
-		}
-
-		// Callback for when everything is done
-		function done( status, nativeStatusText, responses, headers ) {
-			var isSuccess, success, error, response, modified,
-				statusText = nativeStatusText;
-
-			// Called once
-			if ( state === 2 ) {
-				return;
-			}
-
-			// State is "done" now
-			state = 2;
-
-			// Clear timeout if it exists
-			if ( timeoutTimer ) {
-				window.clearTimeout( timeoutTimer );
-			}
-
-			// Dereference transport for early garbage collection
-			// (no matter how long the jqXHR object will be used)
-			transport = undefined;
-
-			// Cache response headers
-			responseHeadersString = headers || "";
-
-			// Set readyState
-			jqXHR.readyState = status > 0 ? 4 : 0;
-
-			// Determine if successful
-			isSuccess = status >= 200 && status < 300 || status === 304;
-
-			// Get response data
-			if ( responses ) {
-				response = ajaxHandleResponses( s, jqXHR, responses );
-			}
-
-			// Convert no matter what (that way responseXXX fields are always set)
-			response = ajaxConvert( s, response, jqXHR, isSuccess );
-
-			// If successful, handle type chaining
-			if ( isSuccess ) {
-
-				// Set the If-Modified-Since and/or If-None-Match header, if in ifModified mode.
-				if ( s.ifModified ) {
-					modified = jqXHR.getResponseHeader( "Last-Modified" );
-					if ( modified ) {
-						jQuery.lastModified[ cacheURL ] = modified;
-					}
-					modified = jqXHR.getResponseHeader( "etag" );
-					if ( modified ) {
-						jQuery.etag[ cacheURL ] = modified;
-					}
-				}
-
-				// if no content
-				if ( status === 204 || s.type === "HEAD" ) {
-					statusText = "nocontent";
-
-				// if not modified
-				} else if ( status === 304 ) {
-					statusText = "notmodified";
-
-				// If we have data, let's convert it
-				} else {
-					statusText = response.state;
-					success = response.data;
-					error = response.error;
-					isSuccess = !error;
-				}
-			} else {
-
-				// Extract error from statusText and normalize for non-aborts
-				error = statusText;
-				if ( status || !statusText ) {
-					statusText = "error";
-					if ( status < 0 ) {
-						status = 0;
-					}
-				}
-			}
-
-			// Set data for the fake xhr object
-			jqXHR.status = status;
-			jqXHR.statusText = ( nativeStatusText || statusText ) + "";
-
-			// Success/Error
-			if ( isSuccess ) {
-				deferred.resolveWith( callbackContext, [ success, statusText, jqXHR ] );
-			} else {
-				deferred.rejectWith( callbackContext, [ jqXHR, statusText, error ] );
-			}
-
-			// Status-dependent callbacks
-			jqXHR.statusCode( statusCode );
-			statusCode = undefined;
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( isSuccess ? "ajaxSuccess" : "ajaxError",
-					[ jqXHR, s, isSuccess ? success : error ] );
-			}
-
-			// Complete
-			completeDeferred.fireWith( callbackContext, [ jqXHR, statusText ] );
-
-			if ( fireGlobals ) {
-				globalEventContext.trigger( "ajaxComplete", [ jqXHR, s ] );
-
-				// Handle the global AJAX counter
-				if ( !( --jQuery.active ) ) {
-					jQuery.event.trigger( "ajaxStop" );
-				}
-			}
-		}
-
-		return jqXHR;
-	},
-
-	getJSON: function( url, data, callback ) {
-		return jQuery.get( url, data, callback, "json" );
-	},
-
-	getScript: function( url, callback ) {
-		return jQuery.get( url, undefined, callback, "script" );
-	}
-} );
-
-jQuery.each( [ "get", "post" ], function( i, method ) {
-	jQuery[ method ] = function( url, data, callback, type ) {
-
-		// Shift arguments if data argument was omitted
-		if ( jQuery.isFunction( data ) ) {
-			type = type || callback;
-			callback = data;
-			data = undefined;
-		}
-
-		// The url can be an options object (which then must have .url)
-		return jQuery.ajax( jQuery.extend( {
-			url: url,
-			type: method,
-			dataType: type,
-			data: data,
-			success: callback
-		}, jQuery.isPlainObject( url ) && url ) );
-	};
-} );
-
-
-jQuery._evalUrl = function( url ) {
-	return jQuery.ajax( {
-		url: url,
-
-		// Make this explicit, since user can override this through ajaxSetup (#11264)
-		type: "GET",
-		dataType: "script",
-		async: false,
-		global: false,
-		"throws": true
-	} );
-};
-
-
-jQuery.fn.extend( {
-	wrapAll: function( html ) {
-		var wrap;
-
-		if ( jQuery.isFunction( html ) ) {
-			return this.each( function( i ) {
-				jQuery( this ).wrapAll( html.call( this, i ) );
-			} );
-		}
-
-		if ( this[ 0 ] ) {
-
-			// The elements to wrap the target around
-			wrap = jQuery( html, this[ 0 ].ownerDocument ).eq( 0 ).clone( true );
-
-			if ( this[ 0 ].parentNode ) {
-				wrap.insertBefore( this[ 0 ] );
-			}
-
-			wrap.map( function() {
-				var elem = this;
-
-				while ( elem.firstElementChild ) {
-					elem = elem.firstElementChild;
-				}
-
-				return elem;
-			} ).append( this );
-		}
-
-		return this;
-	},
-
-	wrapInner: function( html ) {
-		if ( jQuery.isFunction( html ) ) {
-			return this.each( function( i ) {
-				jQuery( this ).wrapInner( html.call( this, i ) );
-			} );
-		}
-
-		return this.each( function() {
-			var self = jQuery( this ),
-				contents = self.contents();
-
-			if ( contents.length ) {
-				contents.wrapAll( html );
-
-			} else {
-				self.append( html );
-			}
-		} );
-	},
-
-	wrap: function( html ) {
-		var isFunction = jQuery.isFunction( html );
-
-		return this.each( function( i ) {
-			jQuery( this ).wrapAll( isFunction ? html.call( this, i ) : html );
-		} );
-	},
-
-	unwrap: function() {
-		return this.parent().each( function() {
-			if ( !jQuery.nodeName( this, "body" ) ) {
-				jQuery( this ).replaceWith( this.childNodes );
-			}
-		} ).end();
-	}
-} );
-
-
-jQuery.expr.filters.hidden = function( elem ) {
-	return !jQuery.expr.filters.visible( elem );
-};
-jQuery.expr.filters.visible = function( elem ) {
-
-	// Support: Opera <= 12.12
-	// Opera reports offsetWidths and offsetHeights less than zero on some elements
-	// Use OR instead of AND as the element is not visible if either is true
-	// See tickets #10406 and #13132
-	return elem.offsetWidth > 0 || elem.offsetHeight > 0 || elem.getClientRects().length > 0;
-};
-
-
-
-
-var r20 = /%20/g,
-	rbracket = /\[\]$/,
-	rCRLF = /\r?\n/g,
-	rsubmitterTypes = /^(?:submit|button|image|reset|file)$/i,
-	rsubmittable = /^(?:input|select|textarea|keygen)/i;
-
-function buildParams( prefix, obj, traditional, add ) {
-	var name;
-
-	if ( jQuery.isArray( obj ) ) {
-
-		// Serialize array item.
-		jQuery.each( obj, function( i, v ) {
-			if ( traditional || rbracket.test( prefix ) ) {
-
-				// Treat each array item as a scalar.
-				add( prefix, v );
-
-			} else {
-
-				// Item is non-scalar (array or object), encode its numeric index.
-				buildParams(
-					prefix + "[" + ( typeof v === "object" && v != null ? i : "" ) + "]",
-					v,
-					traditional,
-					add
-				);
-			}
-		} );
-
-	} else if ( !traditional && jQuery.type( obj ) === "object" ) {
-
-		// Serialize object item.
-		for ( name in obj ) {
-			buildParams( prefix + "[" + name + "]", obj[ name ], traditional, add );
-		}
-
-	} else {
-
-		// Serialize scalar item.
-		add( prefix, obj );
-	}
-}
-
-// Serialize an array of form elements or a set of
-// key/values into a query string
-jQuery.param = function( a, traditional ) {
-	var prefix,
-		s = [],
-		add = function( key, value ) {
-
-			// If value is a function, invoke it and return its value
-			value = jQuery.isFunction( value ) ? value() : ( value == null ? "" : value );
-			s[ s.length ] = encodeURIComponent( key ) + "=" + encodeURIComponent( value );
-		};
-
-	// Set traditional to true for jQuery <= 1.3.2 behavior.
-	if ( traditional === undefined ) {
-		traditional = jQuery.ajaxSettings && jQuery.ajaxSettings.traditional;
-	}
-
-	// If an array was passed in, assume that it is an array of form elements.
-	if ( jQuery.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
-
-		// Serialize the form elements
-		jQuery.each( a, function() {
-			add( this.name, this.value );
-		} );
-
-	} else {
-
-		// If traditional, encode the "old" way (the way 1.3.2 or older
-		// did it), otherwise encode params recursively.
-		for ( prefix in a ) {
-			buildParams( prefix, a[ prefix ], traditional, add );
-		}
-	}
-
-	// Return the resulting serialization
-	return s.join( "&" ).replace( r20, "+" );
-};
-
-jQuery.fn.extend( {
-	serialize: function() {
-		return jQuery.param( this.serializeArray() );
-	},
-	serializeArray: function() {
-		return this.map( function() {
-
-			// Can add propHook for "elements" to filter or add form elements
-			var elements = jQuery.prop( this, "elements" );
-			return elements ? jQuery.makeArray( elements ) : this;
-		} )
-		.filter( function() {
-			var type = this.type;
-
-			// Use .is( ":disabled" ) so that fieldset[disabled] works
-			return this.name && !jQuery( this ).is( ":disabled" ) &&
-				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
-				( this.checked || !rcheckableType.test( type ) );
-		} )
-		.map( function( i, elem ) {
-			var val = jQuery( this ).val();
-
-			return val == null ?
-				null :
-				jQuery.isArray( val ) ?
-					jQuery.map( val, function( val ) {
-						return { name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-					} ) :
-					{ name: elem.name, value: val.replace( rCRLF, "\r\n" ) };
-		} ).get();
-	}
-} );
-
-
-jQuery.ajaxSettings.xhr = function() {
-	try {
-		return new window.XMLHttpRequest();
-	} catch ( e ) {}
-};
-
-var xhrSuccessStatus = {
-
-		// File protocol always yields status code 0, assume 200
-		0: 200,
-
-		// Support: IE9
-		// #1450: sometimes IE returns 1223 when it should be 204
-		1223: 204
-	},
-	xhrSupported = jQuery.ajaxSettings.xhr();
-
-support.cors = !!xhrSupported && ( "withCredentials" in xhrSupported );
-support.ajax = xhrSupported = !!xhrSupported;
-
-jQuery.ajaxTransport( function( options ) {
-	var callback, errorCallback;
-
-	// Cross domain only allowed if supported through XMLHttpRequest
-	if ( support.cors || xhrSupported && !options.crossDomain ) {
-		return {
-			send: function( headers, complete ) {
-				var i,
-					xhr = options.xhr();
-
-				xhr.open(
-					options.type,
-					options.url,
-					options.async,
-					options.username,
-					options.password
-				);
-
-				// Apply custom fields if provided
-				if ( options.xhrFields ) {
-					for ( i in options.xhrFields ) {
-						xhr[ i ] = options.xhrFields[ i ];
-					}
-				}
-
-				// Override mime type if needed
-				if ( options.mimeType && xhr.overrideMimeType ) {
-					xhr.overrideMimeType( options.mimeType );
-				}
-
-				// X-Requested-With header
-				// For cross-domain requests, seeing as conditions for a preflight are
-				// akin to a jigsaw puzzle, we simply never set it to be sure.
-				// (it can always be set on a per-request basis or even using ajaxSetup)
-				// For same-domain requests, won't change header if already provided.
-				if ( !options.crossDomain && !headers[ "X-Requested-With" ] ) {
-					headers[ "X-Requested-With" ] = "XMLHttpRequest";
-				}
-
-				// Set headers
-				for ( i in headers ) {
-					xhr.setRequestHeader( i, headers[ i ] );
-				}
-
-				// Callback
-				callback = function( type ) {
-					return function() {
-						if ( callback ) {
-							callback = errorCallback = xhr.onload =
-								xhr.onerror = xhr.onabort = xhr.onreadystatechange = null;
-
-							if ( type === "abort" ) {
-								xhr.abort();
-							} else if ( type === "error" ) {
-
-								// Support: IE9
-								// On a manual native abort, IE9 throws
-								// errors on any property access that is not readyState
-								if ( typeof xhr.status !== "number" ) {
-									complete( 0, "error" );
-								} else {
-									complete(
-
-										// File: protocol always yields status 0; see #8605, #14207
-										xhr.status,
-										xhr.statusText
-									);
-								}
-							} else {
-								complete(
-									xhrSuccessStatus[ xhr.status ] || xhr.status,
-									xhr.statusText,
-
-									// Support: IE9 only
-									// IE9 has no XHR2 but throws on binary (trac-11426)
-									// For XHR2 non-text, let the caller handle it (gh-2498)
-									( xhr.responseType || "text" ) !== "text"  ||
-									typeof xhr.responseText !== "string" ?
-										{ binary: xhr.response } :
-										{ text: xhr.responseText },
-									xhr.getAllResponseHeaders()
-								);
-							}
-						}
-					};
-				};
-
-				// Listen to events
-				xhr.onload = callback();
-				errorCallback = xhr.onerror = callback( "error" );
-
-				// Support: IE9
-				// Use onreadystatechange to replace onabort
-				// to handle uncaught aborts
-				if ( xhr.onabort !== undefined ) {
-					xhr.onabort = errorCallback;
-				} else {
-					xhr.onreadystatechange = function() {
-
-						// Check readyState before timeout as it changes
-						if ( xhr.readyState === 4 ) {
-
-							// Allow onerror to be called first,
-							// but that will not handle a native abort
-							// Also, save errorCallback to a variable
-							// as xhr.onerror cannot be accessed
-							window.setTimeout( function() {
-								if ( callback ) {
-									errorCallback();
-								}
-							} );
-						}
-					};
-				}
-
-				// Create the abort callback
-				callback = callback( "abort" );
-
-				try {
-
-					// Do send the request (this may raise an exception)
-					xhr.send( options.hasContent && options.data || null );
-				} catch ( e ) {
-
-					// #14683: Only rethrow if this hasn't been notified as an error yet
-					if ( callback ) {
-						throw e;
-					}
-				}
-			},
-
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-} );
-
-
-
-
-// Install script dataType
-jQuery.ajaxSetup( {
-	accepts: {
-		script: "text/javascript, application/javascript, " +
-			"application/ecmascript, application/x-ecmascript"
-	},
-	contents: {
-		script: /\b(?:java|ecma)script\b/
-	},
-	converters: {
-		"text script": function( text ) {
-			jQuery.globalEval( text );
-			return text;
-		}
-	}
-} );
-
-// Handle cache's special case and crossDomain
-jQuery.ajaxPrefilter( "script", function( s ) {
-	if ( s.cache === undefined ) {
-		s.cache = false;
-	}
-	if ( s.crossDomain ) {
-		s.type = "GET";
-	}
-} );
-
-// Bind script tag hack transport
-jQuery.ajaxTransport( "script", function( s ) {
-
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
-		var script, callback;
-		return {
-			send: function( _, complete ) {
-				script = jQuery( "<script>" ).prop( {
-					charset: s.scriptCharset,
-					src: s.url
-				} ).on(
-					"load error",
-					callback = function( evt ) {
-						script.remove();
-						callback = null;
-						if ( evt ) {
-							complete( evt.type === "error" ? 404 : 200, evt.type );
-						}
-					}
-				);
-
-				// Use native DOM manipulation to avoid our domManip AJAX trickery
-				document.head.appendChild( script[ 0 ] );
-			},
-			abort: function() {
-				if ( callback ) {
-					callback();
-				}
-			}
-		};
-	}
-} );
-
-
-
-
-var oldCallbacks = [],
-	rjsonp = /(=)\?(?=&|$)|\?\?/;
-
-// Default jsonp settings
-jQuery.ajaxSetup( {
-	jsonp: "callback",
-	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
-		this[ callback ] = true;
-		return callback;
-	}
-} );
-
-// Detect, normalize options and install callbacks for jsonp requests
-jQuery.ajaxPrefilter( "json jsonp", function( s, originalSettings, jqXHR ) {
-
-	var callbackName, overwritten, responseContainer,
-		jsonProp = s.jsonp !== false && ( rjsonp.test( s.url ) ?
-			"url" :
-			typeof s.data === "string" &&
-				( s.contentType || "" )
-					.indexOf( "application/x-www-form-urlencoded" ) === 0 &&
-				rjsonp.test( s.data ) && "data"
-		);
-
-	// Handle iff the expected data type is "jsonp" or we have a parameter to set
-	if ( jsonProp || s.dataTypes[ 0 ] === "jsonp" ) {
-
-		// Get callback name, remembering preexisting value associated with it
-		callbackName = s.jsonpCallback = jQuery.isFunction( s.jsonpCallback ) ?
-			s.jsonpCallback() :
-			s.jsonpCallback;
-
-		// Insert callback into url or form data
-		if ( jsonProp ) {
-			s[ jsonProp ] = s[ jsonProp ].replace( rjsonp, "$1" + callbackName );
-		} else if ( s.jsonp !== false ) {
-			s.url += ( rquery.test( s.url ) ? "&" : "?" ) + s.jsonp + "=" + callbackName;
-		}
-
-		// Use data converter to retrieve json after script execution
-		s.converters[ "script json" ] = function() {
-			if ( !responseContainer ) {
-				jQuery.error( callbackName + " was not called" );
-			}
-			return responseContainer[ 0 ];
-		};
-
-		// Force json dataType
-		s.dataTypes[ 0 ] = "json";
-
-		// Install callback
-		overwritten = window[ callbackName ];
-		window[ callbackName ] = function() {
-			responseContainer = arguments;
-		};
-
-		// Clean-up function (fires after converters)
-		jqXHR.always( function() {
-
-			// If previous value didn't exist - remove it
-			if ( overwritten === undefined ) {
-				jQuery( window ).removeProp( callbackName );
-
-			// Otherwise restore preexisting value
-			} else {
-				window[ callbackName ] = overwritten;
-			}
-
-			// Save back as free
-			if ( s[ callbackName ] ) {
-
-				// Make sure that re-using the options doesn't screw things around
-				s.jsonpCallback = originalSettings.jsonpCallback;
-
-				// Save the callback name for future use
-				oldCallbacks.push( callbackName );
-			}
-
-			// Call if it was a function and we have a response
-			if ( responseContainer && jQuery.isFunction( overwritten ) ) {
-				overwritten( responseContainer[ 0 ] );
-			}
-
-			responseContainer = overwritten = undefined;
-		} );
-
-		// Delegate to script
-		return "script";
-	}
-} );
-
-
-
-
-// Argument "data" should be string of html
-// context (optional): If specified, the fragment will be created in this context,
-// defaults to document
-// keepScripts (optional): If true, will include scripts passed in the html string
-jQuery.parseHTML = function( data, context, keepScripts ) {
-	if ( !data || typeof data !== "string" ) {
-		return null;
-	}
-	if ( typeof context === "boolean" ) {
-		keepScripts = context;
-		context = false;
-	}
-	context = context || document;
-
-	var parsed = rsingleTag.exec( data ),
-		scripts = !keepScripts && [];
-
-	// Single tag
-	if ( parsed ) {
-		return [ context.createElement( parsed[ 1 ] ) ];
-	}
-
-	parsed = buildFragment( [ data ], context, scripts );
-
-	if ( scripts && scripts.length ) {
-		jQuery( scripts ).remove();
-	}
-
-	return jQuery.merge( [], parsed.childNodes );
-};
-
-
-// Keep a copy of the old load method
-var _load = jQuery.fn.load;
-
-/**
- * Load a url into a page
- */
-jQuery.fn.load = function( url, params, callback ) {
-	if ( typeof url !== "string" && _load ) {
-		return _load.apply( this, arguments );
-	}
-
-	var selector, type, response,
-		self = this,
-		off = url.indexOf( " " );
-
-	if ( off > -1 ) {
-		selector = jQuery.trim( url.slice( off ) );
-		url = url.slice( 0, off );
-	}
-
-	// If it's a function
-	if ( jQuery.isFunction( params ) ) {
-
-		// We assume that it's the callback
-		callback = params;
-		params = undefined;
-
-	// Otherwise, build a param string
-	} else if ( params && typeof params === "object" ) {
-		type = "POST";
-	}
-
-	// If we have elements to modify, make the request
-	if ( self.length > 0 ) {
-		jQuery.ajax( {
-			url: url,
-
-			// If "type" variable is undefined, then "GET" method will be used.
-			// Make value of this field explicit since
-			// user can override it through ajaxSetup method
-			type: type || "GET",
-			dataType: "html",
-			data: params
-		} ).done( function( responseText ) {
-
-			// Save response for use in complete callback
-			response = arguments;
-
-			self.html( selector ?
-
-				// If a selector was specified, locate the right elements in a dummy div
-				// Exclude scripts to avoid IE 'Permission Denied' errors
-				jQuery( "<div>" ).append( jQuery.parseHTML( responseText ) ).find( selector ) :
-
-				// Otherwise use the full result
-				responseText );
-
-		// If the request succeeds, this function gets "data", "status", "jqXHR"
-		// but they are ignored because response was set above.
-		// If it fails, this function gets "jqXHR", "status", "error"
-		} ).always( callback && function( jqXHR, status ) {
-			self.each( function() {
-				callback.apply( this, response || [ jqXHR.responseText, status, jqXHR ] );
-			} );
-		} );
-	}
-
-	return this;
-};
-
-
-
-
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [
-	"ajaxStart",
-	"ajaxStop",
-	"ajaxComplete",
-	"ajaxError",
-	"ajaxSuccess",
-	"ajaxSend"
-], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-} );
-
-
-
-
-jQuery.expr.filters.animated = function( elem ) {
-	return jQuery.grep( jQuery.timers, function( fn ) {
-		return elem === fn.elem;
-	} ).length;
-};
-
-
-
-
-/**
- * Gets a window from an element
- */
-function getWindow( elem ) {
-	return jQuery.isWindow( elem ) ? elem : elem.nodeType === 9 && elem.defaultView;
-}
-
-jQuery.offset = {
-	setOffset: function( elem, options, i ) {
-		var curPosition, curLeft, curCSSTop, curTop, curOffset, curCSSLeft, calculatePosition,
-			position = jQuery.css( elem, "position" ),
-			curElem = jQuery( elem ),
-			props = {};
-
-		// Set position first, in-case top/left are set even on static elem
-		if ( position === "static" ) {
-			elem.style.position = "relative";
-		}
-
-		curOffset = curElem.offset();
-		curCSSTop = jQuery.css( elem, "top" );
-		curCSSLeft = jQuery.css( elem, "left" );
-		calculatePosition = ( position === "absolute" || position === "fixed" ) &&
-			( curCSSTop + curCSSLeft ).indexOf( "auto" ) > -1;
-
-		// Need to be able to calculate position if either
-		// top or left is auto and position is either absolute or fixed
-		if ( calculatePosition ) {
-			curPosition = curElem.position();
-			curTop = curPosition.top;
-			curLeft = curPosition.left;
-
-		} else {
-			curTop = parseFloat( curCSSTop ) || 0;
-			curLeft = parseFloat( curCSSLeft ) || 0;
-		}
-
-		if ( jQuery.isFunction( options ) ) {
-
-			// Use jQuery.extend here to allow modification of coordinates argument (gh-1848)
-			options = options.call( elem, i, jQuery.extend( {}, curOffset ) );
-		}
-
-		if ( options.top != null ) {
-			props.top = ( options.top - curOffset.top ) + curTop;
-		}
-		if ( options.left != null ) {
-			props.left = ( options.left - curOffset.left ) + curLeft;
-		}
-
-		if ( "using" in options ) {
-			options.using.call( elem, props );
-
-		} else {
-			curElem.css( props );
-		}
-	}
-};
-
-jQuery.fn.extend( {
-	offset: function( options ) {
-		if ( arguments.length ) {
-			return options === undefined ?
-				this :
-				this.each( function( i ) {
-					jQuery.offset.setOffset( this, options, i );
-				} );
-		}
-
-		var docElem, win,
-			elem = this[ 0 ],
-			box = { top: 0, left: 0 },
-			doc = elem && elem.ownerDocument;
-
-		if ( !doc ) {
-			return;
-		}
-
-		docElem = doc.documentElement;
-
-		// Make sure it's not a disconnected DOM node
-		if ( !jQuery.contains( docElem, elem ) ) {
-			return box;
-		}
-
-		box = elem.getBoundingClientRect();
-		win = getWindow( doc );
-		return {
-			top: box.top + win.pageYOffset - docElem.clientTop,
-			left: box.left + win.pageXOffset - docElem.clientLeft
-		};
-	},
-
-	position: function() {
-		if ( !this[ 0 ] ) {
-			return;
-		}
-
-		var offsetParent, offset,
-			elem = this[ 0 ],
-			parentOffset = { top: 0, left: 0 };
-
-		// Fixed elements are offset from window (parentOffset = {top:0, left: 0},
-		// because it is its only offset parent
-		if ( jQuery.css( elem, "position" ) === "fixed" ) {
-
-			// Assume getBoundingClientRect is there when computed position is fixed
-			offset = elem.getBoundingClientRect();
-
-		} else {
-
-			// Get *real* offsetParent
-			offsetParent = this.offsetParent();
-
-			// Get correct offsets
-			offset = this.offset();
-			if ( !jQuery.nodeName( offsetParent[ 0 ], "html" ) ) {
-				parentOffset = offsetParent.offset();
-			}
-
-			// Add offsetParent borders
-			parentOffset.top += jQuery.css( offsetParent[ 0 ], "borderTopWidth", true );
-			parentOffset.left += jQuery.css( offsetParent[ 0 ], "borderLeftWidth", true );
-		}
-
-		// Subtract parent offsets and element margins
-		return {
-			top: offset.top - parentOffset.top - jQuery.css( elem, "marginTop", true ),
-			left: offset.left - parentOffset.left - jQuery.css( elem, "marginLeft", true )
-		};
-	},
-
-	// This method will return documentElement in the following cases:
-	// 1) For the element inside the iframe without offsetParent, this method will return
-	//    documentElement of the parent window
-	// 2) For the hidden or detached element
-	// 3) For body or html element, i.e. in case of the html node - it will return itself
-	//
-	// but those exceptions were never presented as a real life use-cases
-	// and might be considered as more preferable results.
-	//
-	// This logic, however, is not guaranteed and can change at any point in the future
-	offsetParent: function() {
-		return this.map( function() {
-			var offsetParent = this.offsetParent;
-
-			while ( offsetParent && jQuery.css( offsetParent, "position" ) === "static" ) {
-				offsetParent = offsetParent.offsetParent;
-			}
-
-			return offsetParent || documentElement;
-		} );
-	}
-} );
-
-// Create scrollLeft and scrollTop methods
-jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function( method, prop ) {
-	var top = "pageYOffset" === prop;
-
-	jQuery.fn[ method ] = function( val ) {
-		return access( this, function( elem, method, val ) {
-			var win = getWindow( elem );
-
-			if ( val === undefined ) {
-				return win ? win[ prop ] : elem[ method ];
-			}
-
-			if ( win ) {
-				win.scrollTo(
-					!top ? val : win.pageXOffset,
-					top ? val : win.pageYOffset
-				);
-
-			} else {
-				elem[ method ] = val;
-			}
-		}, method, val, arguments.length );
-	};
-} );
-
-// Support: Safari<7-8+, Chrome<37-44+
-// Add the top/left cssHooks using jQuery.fn.position
-// Webkit bug: https://bugs.webkit.org/show_bug.cgi?id=29084
-// Blink bug: https://code.google.com/p/chromium/issues/detail?id=229280
-// getComputedStyle returns percent when specified for top/left/bottom/right;
-// rather than make the css module depend on the offset module, just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
-	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
-		function( elem, computed ) {
-			if ( computed ) {
-				computed = curCSS( elem, prop );
-
-				// If curCSS returns percentage, fallback to offset
-				return rnumnonpx.test( computed ) ?
-					jQuery( elem ).position()[ prop ] + "px" :
-					computed;
-			}
-		}
-	);
-} );
-
-
-// Create innerHeight, innerWidth, height, width, outerHeight and outerWidth methods
-jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
-	jQuery.each( { padding: "inner" + name, content: type, "": "outer" + name },
-		function( defaultExtra, funcName ) {
-
-		// Margin is only for outerHeight, outerWidth
-		jQuery.fn[ funcName ] = function( margin, value ) {
-			var chainable = arguments.length && ( defaultExtra || typeof margin !== "boolean" ),
-				extra = defaultExtra || ( margin === true || value === true ? "margin" : "border" );
-
-			return access( this, function( elem, type, value ) {
-				var doc;
-
-				if ( jQuery.isWindow( elem ) ) {
-
-					// As of 5/8/2012 this will yield incorrect results for Mobile Safari, but there
-					// isn't a whole lot we can do. See pull request at this URL for discussion:
-					// https://github.com/jquery/jquery/pull/764
-					return elem.document.documentElement[ "client" + name ];
-				}
-
-				// Get document width or height
-				if ( elem.nodeType === 9 ) {
-					doc = elem.documentElement;
-
-					// Either scroll[Width/Height] or offset[Width/Height] or client[Width/Height],
-					// whichever is greatest
-					return Math.max(
-						elem.body[ "scroll" + name ], doc[ "scroll" + name ],
-						elem.body[ "offset" + name ], doc[ "offset" + name ],
-						doc[ "client" + name ]
-					);
-				}
-
-				return value === undefined ?
-
-					// Get width or height on the element, requesting but not forcing parseFloat
-					jQuery.css( elem, type, extra ) :
-
-					// Set width or height on the element
-					jQuery.style( elem, type, value, extra );
-			}, type, chainable ? margin : undefined, chainable, null );
-		};
-	} );
-} );
-
-
-jQuery.fn.extend( {
-
-	bind: function( types, data, fn ) {
-		return this.on( types, null, data, fn );
-	},
-	unbind: function( types, fn ) {
-		return this.off( types, null, fn );
-	},
-
-	delegate: function( selector, types, data, fn ) {
-		return this.on( types, selector, data, fn );
-	},
-	undelegate: function( selector, types, fn ) {
-
-		// ( namespace ) or ( selector, types [, fn] )
-		return arguments.length === 1 ?
-			this.off( selector, "**" ) :
-			this.off( types, selector || "**", fn );
-	},
-	size: function() {
-		return this.length;
-	}
-} );
-
-jQuery.fn.andSelf = jQuery.fn.addBack;
-
-
-
-
-// Register as a named AMD module, since jQuery can be concatenated with other
-// files that may use define, but not via a proper concatenation script that
-// understands anonymous AMD modules. A named AMD is safest and most robust
-// way to register. Lowercase jquery is used because AMD module names are
-// derived from file names, and jQuery is normally delivered in a lowercase
-// file name. Do this after creating the global so that if an AMD module wants
-// to call noConflict to hide this version of jQuery, it will work.
-
-// Note that for maximum portability, libraries that are not jQuery should
-// declare themselves as anonymous modules, and avoid setting a global if an
-// AMD loader is present. jQuery is a special case. For more information, see
-// https://github.com/jrburke/requirejs/wiki/Updating-existing-libraries#wiki-anon
-
-if ( typeof define === "function" && define.amd ) {
-	define( "jquery", [], function() {
-		return jQuery;
-	} );
-}
-
-
-
-var
-
-	// Map over jQuery in case of overwrite
-	_jQuery = window.jQuery,
-
-	// Map over the $ in case of overwrite
-	_$ = window.$;
-
-jQuery.noConflict = function( deep ) {
-	if ( window.$ === jQuery ) {
-		window.$ = _$;
-	}
-
-	if ( deep && window.jQuery === jQuery ) {
-		window.jQuery = _jQuery;
-	}
-
-	return jQuery;
-};
-
-// Expose jQuery and $ identifiers, even in AMD
-// (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
-// and CommonJS for browser emulators (#13566)
-if ( !noGlobal ) {
-	window.jQuery = window.$ = jQuery;
-}
-
-return jQuery;
-}));
diff --git a/web/skins/classic/js/jquery-3.5.1.min.js b/web/skins/classic/js/jquery-3.5.1.min.js
new file mode 100644
index 000000000..b0614034a
--- /dev/null
+++ b/web/skins/classic/js/jquery-3.5.1.min.js
@@ -0,0 +1,2 @@
+/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/web/skins/classic/js/jquery-3.5.1.min.map b/web/skins/classic/js/jquery-3.5.1.min.map
new file mode 100644
index 000000000..faa1db8da
--- /dev/null
+++ b/web/skins/classic/js/jquery-3.5.1.min.map
@@ -0,0 +1 @@
+{"version":3,"sources":["jquery-3.5.1.js"],"names":["global","factory","module","exports","document","w","Error","window","this","noGlobal","arr","getProto","Object","getPrototypeOf","slice","flat","array","call","concat","apply","push","indexOf","class2type","toString","hasOwn","hasOwnProperty","fnToString","ObjectFunctionString","support","isFunction","obj","nodeType","isWindow","preservedScriptAttributes","type","src","nonce","noModule","DOMEval","code","node","doc","i","val","script","createElement","text","getAttribute","setAttribute","head","appendChild","parentNode","removeChild","toType","version","jQuery","selector","context","fn","init","isArrayLike","length","prototype","jquery","constructor","toArray","get","num","pushStack","elems","ret","merge","prevObject","each","callback","map","elem","arguments","first","eq","last","even","grep","_elem","odd","len","j","end","sort","splice","extend","options","name","copy","copyIsArray","clone","target","deep","isPlainObject","Array","isArray","undefined","expando","Math","random","replace","isReady","error","msg","noop","proto","Ctor","isEmptyObject","globalEval","makeArray","results","inArray","second","invert","matches","callbackExpect","arg","value","guid","Symbol","iterator","split","_i","toLowerCase","Sizzle","Expr","getText","isXML","tokenize","compile","select","outermostContext","sortInput","hasDuplicate","setDocument","docElem","documentIsHTML","rbuggyQSA","rbuggyMatches","contains","Date","preferredDoc","dirruns","done","classCache","createCache","tokenCache","compilerCache","nonnativeSelectorCache","sortOrder","a","b","pop","pushNative","list","booleans","whitespace","identifier","attributes","pseudos","rwhitespace","RegExp","rtrim","rcomma","rcombinators","rdescend","rpseudo","ridentifier","matchExpr","ID","CLASS","TAG","ATTR","PSEUDO","CHILD","bool","needsContext","rhtml","rinputs","rheader","rnative","rquickExpr","rsibling","runescape","funescape","escape","nonHex","high","String","fromCharCode","rcssescape","fcssescape","ch","asCodePoint","charCodeAt","unloadHandler","inDisabledFieldset","addCombinator","disabled","nodeName","dir","next","childNodes","e","els","seed","m","nid","match","groups","newSelector","newContext","ownerDocument","exec","getElementById","id","getElementsByTagName","getElementsByClassName","qsa","test","testContext","scope","toSelector","join","querySelectorAll","qsaError","removeAttribute","keys","cache","key","cacheLength","shift","markFunction","assert","el","addHandle","attrs","handler","attrHandle","siblingCheck","cur","diff","sourceIndex","nextSibling","createInputPseudo","createButtonPseudo","createDisabledPseudo","isDisabled","createPositionalPseudo","argument","matchIndexes","namespace","namespaceURI","documentElement","hasCompare","subWindow","defaultView","top","addEventListener","attachEvent","className","createComment","getById","getElementsByName","filter","attrId","find","getAttributeNode","tag","tmp","input","innerHTML","matchesSelector","webkitMatchesSelector","mozMatchesSelector","oMatchesSelector","msMatchesSelector","disconnectedMatch","compareDocumentPosition","adown","bup","compare","sortDetached","aup","ap","bp","unshift","expr","elements","attr","specified","sel","uniqueSort","duplicates","detectDuplicates","sortStable","textContent","firstChild","nodeValue","selectors","createPseudo","relative",">"," ","+","~","preFilter","excess","unquoted","nodeNameSelector","pattern","operator","check","result","what","_argument","simple","forward","ofType","_context","xml","uniqueCache","outerCache","nodeIndex","start","parent","useCache","lastChild","uniqueID","pseudo","args","setFilters","idx","matched","not","matcher","unmatched","has","lang","elemLang","hash","location","root","focus","activeElement","hasFocus","href","tabIndex","enabled","checked","selected","selectedIndex","empty","header","button","_matchIndexes","lt","gt","radio","checkbox","file","password","image","submit","reset","tokens","combinator","base","skip","checkNonElements","doneName","oldCache","newCache","elementMatcher","matchers","condense","newUnmatched","mapped","setMatcher","postFilter","postFinder","postSelector","temp","preMap","postMap","preexisting","contexts","multipleContexts","matcherIn","matcherOut","matcherFromTokens","checkContext","leadingRelative","implicitRelative","matchContext","matchAnyContext","filters","parseOnly","soFar","preFilters","cached","elementMatchers","setMatchers","bySet","byElement","superMatcher","outermost","matchedCount","setMatched","contextBackup","dirrunsUnique","token","compiled","_name","defaultValue","unique","isXMLDoc","escapeSelector","until","truncate","is","siblings","n","rneedsContext","rsingleTag","winnow","qualifier","self","rootjQuery","parseHTML","ready","rparentsprev","guaranteedUnique","children","contents","prev","sibling","targets","l","closest","index","prevAll","add","addBack","parents","parentsUntil","nextAll","nextUntil","prevUntil","contentDocument","content","reverse","rnothtmlwhite","Identity","v","Thrower","ex","adoptValue","resolve","reject","noValue","method","promise","fail","then","Callbacks","object","_","flag","firing","memory","fired","locked","queue","firingIndex","fire","once","stopOnFalse","remove","disable","lock","fireWith","Deferred","func","tuples","state","always","deferred","catch","pipe","fns","newDefer","tuple","returned","progress","notify","onFulfilled","onRejected","onProgress","maxDepth","depth","special","that","mightThrow","TypeError","notifyWith","resolveWith","process","exceptionHook","stackTrace","rejectWith","getStackHook","setTimeout","stateString","when","singleValue","remaining","resolveContexts","resolveValues","master","updateFunc","rerrorNames","stack","console","warn","message","readyException","readyList","completed","removeEventListener","readyWait","wait","readyState","doScroll","access","chainable","emptyGet","raw","bulk","_key","rmsPrefix","rdashAlpha","fcamelCase","_all","letter","toUpperCase","camelCase","string","acceptData","owner","Data","uid","defineProperty","configurable","set","data","prop","hasData","dataPriv","dataUser","rbrace","rmultiDash","dataAttr","JSON","parse","removeData","_data","_removeData","dequeue","startLength","hooks","_queueHooks","stop","setter","clearQueue","count","defer","pnum","source","rcssNum","cssExpand","isAttached","composed","getRootNode","isHiddenWithinTree","style","display","css","adjustCSS","valueParts","tween","adjusted","scale","maxIterations","currentValue","initial","unit","cssNumber","initialInUnit","defaultDisplayMap","showHide","show","values","body","hide","toggle","div","rcheckableType","rtagName","rscriptType","createDocumentFragment","checkClone","cloneNode","noCloneChecked","option","wrapMap","thead","col","tr","td","_default","getAll","setGlobalEval","refElements","tbody","tfoot","colgroup","caption","th","optgroup","buildFragment","scripts","selection","ignored","wrap","attached","fragment","nodes","htmlPrefilter","createTextNode","rkeyEvent","rmouseEvent","rtypenamespace","returnTrue","returnFalse","expectSync","err","safeActiveElement","on","types","one","origFn","event","off","leverageNative","notAsync","saved","isTrigger","delegateType","stopPropagation","stopImmediatePropagation","preventDefault","trigger","Event","handleObjIn","eventHandle","events","t","handleObj","handlers","namespaces","origType","elemData","create","handle","triggered","dispatch","bindType","delegateCount","setup","mappedTypes","origCount","teardown","removeEvent","nativeEvent","handlerQueue","fix","delegateTarget","preDispatch","isPropagationStopped","currentTarget","isImmediatePropagationStopped","rnamespace","postDispatch","matchedHandlers","matchedSelectors","addProp","hook","enumerable","originalEvent","writable","load","noBubble","click","beforeunload","returnValue","props","isDefaultPrevented","defaultPrevented","relatedTarget","timeStamp","now","isSimulated","altKey","bubbles","cancelable","changedTouches","ctrlKey","detail","eventPhase","metaKey","pageX","pageY","shiftKey","view","char","charCode","keyCode","buttons","clientX","clientY","offsetX","offsetY","pointerId","pointerType","screenX","screenY","targetTouches","toElement","touches","which","blur","mouseenter","mouseleave","pointerenter","pointerleave","orig","related","rnoInnerhtml","rchecked","rcleanScript","manipulationTarget","disableScript","restoreScript","cloneCopyEvent","dest","udataOld","udataCur","domManip","collection","hasScripts","iNoClone","valueIsFunction","html","_evalUrl","keepData","cleanData","dataAndEvents","deepDataAndEvents","srcElements","destElements","inPage","detach","append","prepend","insertBefore","before","after","replaceWith","replaceChild","appendTo","prependTo","insertAfter","replaceAll","original","insert","rnumnonpx","getStyles","opener","getComputedStyle","swap","old","rboxStyle","curCSS","computed","width","minWidth","maxWidth","getPropertyValue","pixelBoxStyles","addGetHookIf","conditionFn","hookFn","computeStyleTests","container","cssText","divStyle","pixelPositionVal","reliableMarginLeftVal","roundPixelMeasures","marginLeft","right","pixelBoxStylesVal","boxSizingReliableVal","position","scrollboxSizeVal","offsetWidth","measure","round","parseFloat","reliableTrDimensionsVal","backgroundClip","clearCloneStyle","boxSizingReliable","pixelPosition","reliableMarginLeft","scrollboxSize","reliableTrDimensions","table","trChild","trStyle","height","parseInt","cssPrefixes","emptyStyle","vendorProps","finalPropName","final","cssProps","capName","vendorPropName","rdisplayswap","rcustomProp","cssShow","visibility","cssNormalTransform","letterSpacing","fontWeight","setPositiveNumber","subtract","max","boxModelAdjustment","dimension","box","isBorderBox","styles","computedVal","extra","delta","ceil","getWidthOrHeight","valueIsBorderBox","offsetProp","getClientRects","Tween","easing","cssHooks","opacity","animationIterationCount","columnCount","fillOpacity","flexGrow","flexShrink","gridArea","gridColumn","gridColumnEnd","gridColumnStart","gridRow","gridRowEnd","gridRowStart","lineHeight","order","orphans","widows","zIndex","zoom","origName","isCustomProp","setProperty","isFinite","getBoundingClientRect","scrollboxSizeBuggy","left","margin","padding","border","prefix","suffix","expand","expanded","parts","propHooks","run","percent","eased","duration","pos","step","fx","scrollTop","scrollLeft","linear","p","swing","cos","PI","fxNow","inProgress","opt","rfxtypes","rrun","schedule","hidden","requestAnimationFrame","interval","tick","createFxNow","genFx","includeWidth","createTween","animation","Animation","tweeners","properties","stopped","prefilters","currentTime","startTime","tweens","opts","specialEasing","originalProperties","originalOptions","gotoEnd","propFilter","bind","complete","timer","anim","*","tweener","oldfire","propTween","restoreDisplay","isBox","dataShow","unqueued","overflow","overflowX","overflowY","prefilter","speed","speeds","fadeTo","to","animate","optall","doAnimation","finish","stopQueue","timers","cssFn","slideDown","slideUp","slideToggle","fadeIn","fadeOut","fadeToggle","slow","fast","delay","time","timeout","clearTimeout","checkOn","optSelected","radioValue","boolHook","removeAttr","nType","attrHooks","attrNames","getter","lowercaseName","rfocusable","rclickable","stripAndCollapse","getClass","classesToArray","removeProp","propFix","tabindex","for","class","addClass","classes","curValue","clazz","finalValue","removeClass","toggleClass","stateVal","isValidValue","classNames","hasClass","rreturn","valHooks","optionSet","focusin","rfocusMorph","stopPropagationCallback","onlyHandlers","bubbleType","ontype","lastElement","eventPath","parentWindow","simulate","triggerHandler","attaches","rquery","parseXML","DOMParser","parseFromString","rbracket","rCRLF","rsubmitterTypes","rsubmittable","buildParams","traditional","param","s","valueOrFunction","encodeURIComponent","serialize","serializeArray","r20","rhash","rantiCache","rheaders","rnoContent","rprotocol","transports","allTypes","originAnchor","addToPrefiltersOrTransports","structure","dataTypeExpression","dataType","dataTypes","inspectPrefiltersOrTransports","jqXHR","inspected","seekingTransport","inspect","prefilterOrFactory","dataTypeOrTransport","ajaxExtend","flatOptions","ajaxSettings","active","lastModified","etag","url","isLocal","protocol","processData","async","contentType","accepts","json","responseFields","converters","* text","text html","text json","text xml","ajaxSetup","settings","ajaxPrefilter","ajaxTransport","ajax","transport","cacheURL","responseHeadersString","responseHeaders","timeoutTimer","urlAnchor","fireGlobals","uncached","callbackContext","globalEventContext","completeDeferred","statusCode","requestHeaders","requestHeadersNames","strAbort","getResponseHeader","getAllResponseHeaders","setRequestHeader","overrideMimeType","mimeType","status","abort","statusText","finalText","crossDomain","host","hasContent","ifModified","headers","beforeSend","success","send","nativeStatusText","responses","isSuccess","response","modified","ct","finalDataType","firstDataType","ajaxHandleResponses","conv2","current","conv","dataFilter","throws","ajaxConvert","getJSON","getScript","text script","wrapAll","firstElementChild","wrapInner","htmlIsFunction","unwrap","visible","offsetHeight","xhr","XMLHttpRequest","xhrSuccessStatus","0","1223","xhrSupported","cors","errorCallback","open","username","xhrFields","onload","onerror","onabort","ontimeout","onreadystatechange","responseType","responseText","binary","scriptAttrs","charset","scriptCharset","evt","oldCallbacks","rjsonp","jsonp","jsonpCallback","originalSettings","callbackName","overwritten","responseContainer","jsonProp","createHTMLDocument","implementation","keepScripts","parsed","params","animated","offset","setOffset","curPosition","curLeft","curCSSTop","curTop","curOffset","curCSSLeft","curElem","using","rect","win","pageYOffset","pageXOffset","offsetParent","parentOffset","scrollTo","Height","Width","","defaultExtra","funcName","unbind","delegate","undelegate","hover","fnOver","fnOut","proxy","holdReady","hold","parseJSON","isNumeric","isNaN","trim","define","amd","_jQuery","_$","$","noConflict"],"mappings":";CAaA,SAAYA,EAAQC,GAEnB,aAEuB,iBAAXC,QAAiD,iBAAnBA,OAAOC,QAShDD,OAAOC,QAAUH,EAAOI,SACvBH,EAASD,GAAQ,GACjB,SAAUK,GACT,IAAMA,EAAED,SACP,MAAM,IAAIE,MAAO,4CAElB,OAAOL,EAASI,IAGlBJ,EAASD,GAtBX,CA0BuB,oBAAXO,OAAyBA,OAASC,KAAM,SAAUD,EAAQE,GAMtE,aAEA,IAAIC,EAAM,GAENC,EAAWC,OAAOC,eAElBC,EAAQJ,EAAII,MAEZC,EAAOL,EAAIK,KAAO,SAAUC,GAC/B,OAAON,EAAIK,KAAKE,KAAMD,IACnB,SAAUA,GACb,OAAON,EAAIQ,OAAOC,MAAO,GAAIH,IAI1BI,EAAOV,EAAIU,KAEXC,EAAUX,EAAIW,QAEdC,EAAa,GAEbC,EAAWD,EAAWC,SAEtBC,EAASF,EAAWG,eAEpBC,EAAaF,EAAOD,SAEpBI,EAAuBD,EAAWT,KAAML,QAExCgB,EAAU,GAEVC,EAAa,SAAqBC,GAMhC,MAAsB,mBAARA,GAA8C,iBAAjBA,EAAIC,UAIjDC,EAAW,SAAmBF,GAChC,OAAc,MAAPA,GAAeA,IAAQA,EAAIvB,QAIhCH,EAAWG,EAAOH,SAIjB6B,EAA4B,CAC/BC,MAAM,EACNC,KAAK,EACLC,OAAO,EACPC,UAAU,GAGX,SAASC,EAASC,EAAMC,EAAMC,GAG7B,IAAIC,EAAGC,EACNC,GAHDH,EAAMA,GAAOrC,GAGCyC,cAAe,UAG7B,GADAD,EAAOE,KAAOP,EACTC,EACJ,IAAME,KAAKT,GAYVU,EAAMH,EAAME,IAAOF,EAAKO,cAAgBP,EAAKO,aAAcL,KAE1DE,EAAOI,aAAcN,EAAGC,GAI3BF,EAAIQ,KAAKC,YAAaN,GAASO,WAAWC,YAAaR,GAIzD,SAASS,EAAQvB,GAChB,OAAY,MAAPA,EACGA,EAAM,GAIQ,iBAARA,GAAmC,mBAARA,EACxCR,EAAYC,EAASN,KAAMa,KAAW,gBAC/BA,EAQT,IACCwB,EAAU,QAGVC,EAAS,SAAUC,EAAUC,GAI5B,OAAO,IAAIF,EAAOG,GAAGC,KAAMH,EAAUC,IA0VvC,SAASG,EAAa9B,GAMrB,IAAI+B,IAAW/B,GAAO,WAAYA,GAAOA,EAAI+B,OAC5C3B,EAAOmB,EAAQvB,GAEhB,OAAKD,EAAYC,KAASE,EAAUF,KAIpB,UAATI,GAA+B,IAAX2B,GACR,iBAAXA,GAAgC,EAATA,GAAgBA,EAAS,KAAO/B,GArWhEyB,EAAOG,GAAKH,EAAOO,UAAY,CAG9BC,OAAQT,EAERU,YAAaT,EAGbM,OAAQ,EAERI,QAAS,WACR,OAAOnD,EAAMG,KAAMT,OAKpB0D,IAAK,SAAUC,GAGd,OAAY,MAAPA,EACGrD,EAAMG,KAAMT,MAIb2D,EAAM,EAAI3D,KAAM2D,EAAM3D,KAAKqD,QAAWrD,KAAM2D,IAKpDC,UAAW,SAAUC,GAGpB,IAAIC,EAAMf,EAAOgB,MAAO/D,KAAKwD,cAAeK,GAM5C,OAHAC,EAAIE,WAAahE,KAGV8D,GAIRG,KAAM,SAAUC,GACf,OAAOnB,EAAOkB,KAAMjE,KAAMkE,IAG3BC,IAAK,SAAUD,GACd,OAAOlE,KAAK4D,UAAWb,EAAOoB,IAAKnE,KAAM,SAAUoE,EAAMlC,GACxD,OAAOgC,EAASzD,KAAM2D,EAAMlC,EAAGkC,OAIjC9D,MAAO,WACN,OAAON,KAAK4D,UAAWtD,EAAMK,MAAOX,KAAMqE,aAG3CC,MAAO,WACN,OAAOtE,KAAKuE,GAAI,IAGjBC,KAAM,WACL,OAAOxE,KAAKuE,IAAK,IAGlBE,KAAM,WACL,OAAOzE,KAAK4D,UAAWb,EAAO2B,KAAM1E,KAAM,SAAU2E,EAAOzC,GAC1D,OAASA,EAAI,GAAM,MAIrB0C,IAAK,WACJ,OAAO5E,KAAK4D,UAAWb,EAAO2B,KAAM1E,KAAM,SAAU2E,EAAOzC,GAC1D,OAAOA,EAAI,MAIbqC,GAAI,SAAUrC,GACb,IAAI2C,EAAM7E,KAAKqD,OACdyB,GAAK5C,GAAMA,EAAI,EAAI2C,EAAM,GAC1B,OAAO7E,KAAK4D,UAAgB,GAALkB,GAAUA,EAAID,EAAM,CAAE7E,KAAM8E,IAAQ,KAG5DC,IAAK,WACJ,OAAO/E,KAAKgE,YAAchE,KAAKwD,eAKhC5C,KAAMA,EACNoE,KAAM9E,EAAI8E,KACVC,OAAQ/E,EAAI+E,QAGblC,EAAOmC,OAASnC,EAAOG,GAAGgC,OAAS,WAClC,IAAIC,EAASC,EAAMzD,EAAK0D,EAAMC,EAAaC,EAC1CC,EAASnB,UAAW,IAAO,GAC3BnC,EAAI,EACJmB,EAASgB,UAAUhB,OACnBoC,GAAO,EAsBR,IAnBuB,kBAAXD,IACXC,EAAOD,EAGPA,EAASnB,UAAWnC,IAAO,GAC3BA,KAIsB,iBAAXsD,GAAwBnE,EAAYmE,KAC/CA,EAAS,IAILtD,IAAMmB,IACVmC,EAASxF,KACTkC,KAGOA,EAAImB,EAAQnB,IAGnB,GAAqC,OAA9BiD,EAAUd,UAAWnC,IAG3B,IAAMkD,KAAQD,EACbE,EAAOF,EAASC,GAIF,cAATA,GAAwBI,IAAWH,IAKnCI,GAAQJ,IAAUtC,EAAO2C,cAAeL,KAC1CC,EAAcK,MAAMC,QAASP,MAC/B1D,EAAM6D,EAAQJ,GAIbG,EADID,IAAgBK,MAAMC,QAASjE,GAC3B,GACI2D,GAAgBvC,EAAO2C,cAAe/D,GAG1CA,EAFA,GAIT2D,GAAc,EAGdE,EAAQJ,GAASrC,EAAOmC,OAAQO,EAAMF,EAAOF,SAGzBQ,IAATR,IACXG,EAAQJ,GAASC,IAOrB,OAAOG,GAGRzC,EAAOmC,OAAQ,CAGdY,QAAS,UAAahD,EAAUiD,KAAKC,UAAWC,QAAS,MAAO,IAGhEC,SAAS,EAETC,MAAO,SAAUC,GAChB,MAAM,IAAItG,MAAOsG,IAGlBC,KAAM,aAENX,cAAe,SAAUpE,GACxB,IAAIgF,EAAOC,EAIX,SAAMjF,GAAgC,oBAAzBP,EAASN,KAAMa,QAI5BgF,EAAQnG,EAAUmB,KASK,mBADvBiF,EAAOvF,EAAOP,KAAM6F,EAAO,gBAAmBA,EAAM9C,cACftC,EAAWT,KAAM8F,KAAWpF,IAGlEqF,cAAe,SAAUlF,GACxB,IAAI8D,EAEJ,IAAMA,KAAQ9D,EACb,OAAO,EAER,OAAO,GAKRmF,WAAY,SAAU1E,EAAMoD,EAASlD,GACpCH,EAASC,EAAM,CAAEH,MAAOuD,GAAWA,EAAQvD,OAASK,IAGrDgC,KAAM,SAAU3C,EAAK4C,GACpB,IAAIb,EAAQnB,EAAI,EAEhB,GAAKkB,EAAa9B,IAEjB,IADA+B,EAAS/B,EAAI+B,OACLnB,EAAImB,EAAQnB,IACnB,IAAgD,IAA3CgC,EAASzD,KAAMa,EAAKY,GAAKA,EAAGZ,EAAKY,IACrC,WAIF,IAAMA,KAAKZ,EACV,IAAgD,IAA3C4C,EAASzD,KAAMa,EAAKY,GAAKA,EAAGZ,EAAKY,IACrC,MAKH,OAAOZ,GAIRoF,UAAW,SAAUxG,EAAKyG,GACzB,IAAI7C,EAAM6C,GAAW,GAarB,OAXY,MAAPzG,IACCkD,EAAahD,OAAQF,IACzB6C,EAAOgB,MAAOD,EACE,iBAAR5D,EACP,CAAEA,GAAQA,GAGXU,EAAKH,KAAMqD,EAAK5D,IAIX4D,GAGR8C,QAAS,SAAUxC,EAAMlE,EAAKgC,GAC7B,OAAc,MAAPhC,GAAe,EAAIW,EAAQJ,KAAMP,EAAKkE,EAAMlC,IAKpD6B,MAAO,SAAUO,EAAOuC,GAKvB,IAJA,IAAIhC,GAAOgC,EAAOxD,OACjByB,EAAI,EACJ5C,EAAIoC,EAAMjB,OAEHyB,EAAID,EAAKC,IAChBR,EAAOpC,KAAQ2E,EAAQ/B,GAKxB,OAFAR,EAAMjB,OAASnB,EAERoC,GAGRI,KAAM,SAAUb,EAAOK,EAAU4C,GAShC,IARA,IACCC,EAAU,GACV7E,EAAI,EACJmB,EAASQ,EAAMR,OACf2D,GAAkBF,EAIX5E,EAAImB,EAAQnB,KACAgC,EAAUL,EAAO3B,GAAKA,KAChB8E,GACxBD,EAAQnG,KAAMiD,EAAO3B,IAIvB,OAAO6E,GAIR5C,IAAK,SAAUN,EAAOK,EAAU+C,GAC/B,IAAI5D,EAAQ6D,EACXhF,EAAI,EACJ4B,EAAM,GAGP,GAAKV,EAAaS,GAEjB,IADAR,EAASQ,EAAMR,OACPnB,EAAImB,EAAQnB,IAGL,OAFdgF,EAAQhD,EAAUL,EAAO3B,GAAKA,EAAG+E,KAGhCnD,EAAIlD,KAAMsG,QAMZ,IAAMhF,KAAK2B,EAGI,OAFdqD,EAAQhD,EAAUL,EAAO3B,GAAKA,EAAG+E,KAGhCnD,EAAIlD,KAAMsG,GAMb,OAAO3G,EAAMuD,IAIdqD,KAAM,EAIN/F,QAASA,IAGa,mBAAXgG,SACXrE,EAAOG,GAAIkE,OAAOC,UAAanH,EAAKkH,OAAOC,WAI5CtE,EAAOkB,KAAM,uEAAuEqD,MAAO,KAC3F,SAAUC,EAAInC,GACbtE,EAAY,WAAasE,EAAO,KAAQA,EAAKoC,gBAmB9C,IAAIC,EAWJ,SAAY1H,GACZ,IAAImC,EACHd,EACAsG,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EACAC,EAGAC,EACAvI,EACAwI,EACAC,EACAC,EACAC,EACAxB,EACAyB,EAGA1C,EAAU,SAAW,EAAI,IAAI2C,KAC7BC,EAAe3I,EAAOH,SACtB+I,EAAU,EACVC,EAAO,EACPC,EAAaC,KACbC,EAAaD,KACbE,EAAgBF,KAChBG,EAAyBH,KACzBI,EAAY,SAAUC,EAAGC,GAIxB,OAHKD,IAAMC,IACVlB,GAAe,GAET,GAIRlH,EAAS,GAAOC,eAChBf,EAAM,GACNmJ,EAAMnJ,EAAImJ,IACVC,EAAapJ,EAAIU,KACjBA,EAAOV,EAAIU,KACXN,EAAQJ,EAAII,MAIZO,EAAU,SAAU0I,EAAMnF,GAGzB,IAFA,IAAIlC,EAAI,EACP2C,EAAM0E,EAAKlG,OACJnB,EAAI2C,EAAK3C,IAChB,GAAKqH,EAAMrH,KAAQkC,EAClB,OAAOlC,EAGT,OAAQ,GAGTsH,EAAW,6HAMXC,EAAa,sBAGbC,EAAa,0BAA4BD,EACxC,0CAGDE,EAAa,MAAQF,EAAa,KAAOC,EAAa,OAASD,EAG9D,gBAAkBA,EAIlB,2DAA6DC,EAAa,OAC1ED,EAAa,OAEdG,EAAU,KAAOF,EAAa,wFAOAC,EAAa,eAO3CE,EAAc,IAAIC,OAAQL,EAAa,IAAK,KAC5CM,EAAQ,IAAID,OAAQ,IAAML,EAAa,8BACtCA,EAAa,KAAM,KAEpBO,EAAS,IAAIF,OAAQ,IAAML,EAAa,KAAOA,EAAa,KAC5DQ,EAAe,IAAIH,OAAQ,IAAML,EAAa,WAAaA,EAAa,IAAMA,EAC7E,KACDS,EAAW,IAAIJ,OAAQL,EAAa,MAEpCU,EAAU,IAAIL,OAAQF,GACtBQ,EAAc,IAAIN,OAAQ,IAAMJ,EAAa,KAE7CW,EAAY,CACXC,GAAM,IAAIR,OAAQ,MAAQJ,EAAa,KACvCa,MAAS,IAAIT,OAAQ,QAAUJ,EAAa,KAC5Cc,IAAO,IAAIV,OAAQ,KAAOJ,EAAa,SACvCe,KAAQ,IAAIX,OAAQ,IAAMH,GAC1Be,OAAU,IAAIZ,OAAQ,IAAMF,GAC5Be,MAAS,IAAIb,OAAQ,yDACpBL,EAAa,+BAAiCA,EAAa,cAC3DA,EAAa,aAAeA,EAAa,SAAU,KACpDmB,KAAQ,IAAId,OAAQ,OAASN,EAAW,KAAM,KAI9CqB,aAAgB,IAAIf,OAAQ,IAAML,EACjC,mDAAqDA,EACrD,mBAAqBA,EAAa,mBAAoB,MAGxDqB,EAAQ,SACRC,EAAU,sCACVC,EAAU,SAEVC,EAAU,yBAGVC,EAAa,mCAEbC,GAAW,OAIXC,GAAY,IAAItB,OAAQ,uBAAyBL,EAAa,uBAAwB,KACtF4B,GAAY,SAAUC,EAAQC,GAC7B,IAAIC,EAAO,KAAOF,EAAOhL,MAAO,GAAM,MAEtC,OAAOiL,IASNC,EAAO,EACNC,OAAOC,aAAcF,EAAO,OAC5BC,OAAOC,aAAcF,GAAQ,GAAK,MAAe,KAAPA,EAAe,SAK5DG,GAAa,sDACbC,GAAa,SAAUC,EAAIC,GAC1B,OAAKA,EAGQ,OAAPD,EACG,SAIDA,EAAGvL,MAAO,GAAI,GAAM,KAC1BuL,EAAGE,WAAYF,EAAGxI,OAAS,GAAItC,SAAU,IAAO,IAI3C,KAAO8K,GAOfG,GAAgB,WACf7D,KAGD8D,GAAqBC,GACpB,SAAU9H,GACT,OAAyB,IAAlBA,EAAK+H,UAAqD,aAAhC/H,EAAKgI,SAAS5E,eAEhD,CAAE6E,IAAK,aAAcC,KAAM,WAI7B,IACC1L,EAAKD,MACFT,EAAMI,EAAMG,KAAMiI,EAAa6D,YACjC7D,EAAa6D,YAMdrM,EAAKwI,EAAa6D,WAAWlJ,QAAS9B,SACrC,MAAQiL,GACT5L,EAAO,CAAED,MAAOT,EAAImD,OAGnB,SAAUmC,EAAQiH,GACjBnD,EAAW3I,MAAO6E,EAAQlF,EAAMG,KAAMgM,KAKvC,SAAUjH,EAAQiH,GACjB,IAAI3H,EAAIU,EAAOnC,OACdnB,EAAI,EAGL,MAAUsD,EAAQV,KAAQ2H,EAAKvK,MAC/BsD,EAAOnC,OAASyB,EAAI,IAKvB,SAAS2C,GAAQzE,EAAUC,EAAS0D,EAAS+F,GAC5C,IAAIC,EAAGzK,EAAGkC,EAAMwI,EAAKC,EAAOC,EAAQC,EACnCC,EAAa/J,GAAWA,EAAQgK,cAGhC1L,EAAW0B,EAAUA,EAAQ1B,SAAW,EAKzC,GAHAoF,EAAUA,GAAW,GAGI,iBAAb3D,IAA0BA,GACxB,IAAbzB,GAA+B,IAAbA,GAA+B,KAAbA,EAEpC,OAAOoF,EAIR,IAAM+F,IACLvE,EAAalF,GACbA,EAAUA,GAAWrD,EAEhByI,GAAiB,CAIrB,GAAkB,KAAb9G,IAAqBsL,EAAQ3B,EAAWgC,KAAMlK,IAGlD,GAAO2J,EAAIE,EAAO,IAGjB,GAAkB,IAAbtL,EAAiB,CACrB,KAAO6C,EAAOnB,EAAQkK,eAAgBR,IAUrC,OAAOhG,EALP,GAAKvC,EAAKgJ,KAAOT,EAEhB,OADAhG,EAAQ/F,KAAMwD,GACPuC,OAYT,GAAKqG,IAAgB5I,EAAO4I,EAAWG,eAAgBR,KACtDnE,EAAUvF,EAASmB,IACnBA,EAAKgJ,KAAOT,EAGZ,OADAhG,EAAQ/F,KAAMwD,GACPuC,MAKH,CAAA,GAAKkG,EAAO,GAElB,OADAjM,EAAKD,MAAOgG,EAAS1D,EAAQoK,qBAAsBrK,IAC5C2D,EAGD,IAAOgG,EAAIE,EAAO,KAASzL,EAAQkM,wBACzCrK,EAAQqK,uBAGR,OADA1M,EAAKD,MAAOgG,EAAS1D,EAAQqK,uBAAwBX,IAC9ChG,EAKT,GAAKvF,EAAQmM,MACXtE,EAAwBjG,EAAW,QACjCsF,IAAcA,EAAUkF,KAAMxK,MAIlB,IAAbzB,GAAqD,WAAnC0B,EAAQmJ,SAAS5E,eAA+B,CAYpE,GAVAuF,EAAc/J,EACdgK,EAAa/J,EASK,IAAb1B,IACF2I,EAASsD,KAAMxK,IAAciH,EAAauD,KAAMxK,IAAe,EAGjEgK,EAAa7B,GAASqC,KAAMxK,IAAcyK,GAAaxK,EAAQN,aAC9DM,KAImBA,GAAY7B,EAAQsM,SAGhCd,EAAM3J,EAAQV,aAAc,OAClCqK,EAAMA,EAAI3G,QAAS0F,GAAYC,IAE/B3I,EAAQT,aAAc,KAAQoK,EAAM9G,IAMtC5D,GADA4K,EAASjF,EAAU7E,IACRK,OACX,MAAQnB,IACP4K,EAAQ5K,IAAQ0K,EAAM,IAAMA,EAAM,UAAa,IAC9Ce,GAAYb,EAAQ5K,IAEtB6K,EAAcD,EAAOc,KAAM,KAG5B,IAIC,OAHAhN,EAAKD,MAAOgG,EACXqG,EAAWa,iBAAkBd,IAEvBpG,EACN,MAAQmH,GACT7E,EAAwBjG,GAAU,GACjC,QACI4J,IAAQ9G,GACZ7C,EAAQ8K,gBAAiB,QAQ9B,OAAOhG,EAAQ/E,EAASiD,QAAS8D,EAAO,MAAQ9G,EAAS0D,EAAS+F,GASnE,SAAS5D,KACR,IAAIkF,EAAO,GAYX,OAVA,SAASC,EAAOC,EAAKhH,GAQpB,OALK8G,EAAKpN,KAAMsN,EAAM,KAAQxG,EAAKyG,oBAG3BF,EAAOD,EAAKI,SAEXH,EAAOC,EAAM,KAAQhH,GAShC,SAASmH,GAAcnL,GAEtB,OADAA,EAAI4C,IAAY,EACT5C,EAOR,SAASoL,GAAQpL,GAChB,IAAIqL,EAAK3O,EAASyC,cAAe,YAEjC,IACC,QAASa,EAAIqL,GACZ,MAAQ/B,GACT,OAAO,EACN,QAGI+B,EAAG5L,YACP4L,EAAG5L,WAAWC,YAAa2L,GAI5BA,EAAK,MASP,SAASC,GAAWC,EAAOC,GAC1B,IAAIxO,EAAMuO,EAAMnH,MAAO,KACtBpF,EAAIhC,EAAImD,OAET,MAAQnB,IACPwF,EAAKiH,WAAYzO,EAAKgC,IAAQwM,EAUhC,SAASE,GAAczF,EAAGC,GACzB,IAAIyF,EAAMzF,GAAKD,EACd2F,EAAOD,GAAsB,IAAf1F,EAAE5H,UAAiC,IAAf6H,EAAE7H,UACnC4H,EAAE4F,YAAc3F,EAAE2F,YAGpB,GAAKD,EACJ,OAAOA,EAIR,GAAKD,EACJ,MAAUA,EAAMA,EAAIG,YACnB,GAAKH,IAAQzF,EACZ,OAAQ,EAKX,OAAOD,EAAI,GAAK,EAOjB,SAAS8F,GAAmBvN,GAC3B,OAAO,SAAU0C,GAEhB,MAAgB,UADLA,EAAKgI,SAAS5E,eACEpD,EAAK1C,OAASA,GAQ3C,SAASwN,GAAoBxN,GAC5B,OAAO,SAAU0C,GAChB,IAAIgB,EAAOhB,EAAKgI,SAAS5E,cACzB,OAAkB,UAATpC,GAA6B,WAATA,IAAuBhB,EAAK1C,OAASA,GAQpE,SAASyN,GAAsBhD,GAG9B,OAAO,SAAU/H,GAKhB,MAAK,SAAUA,EASTA,EAAKzB,aAAgC,IAAlByB,EAAK+H,SAGvB,UAAW/H,EACV,UAAWA,EAAKzB,WACbyB,EAAKzB,WAAWwJ,WAAaA,EAE7B/H,EAAK+H,WAAaA,EAMpB/H,EAAKgL,aAAejD,GAI1B/H,EAAKgL,cAAgBjD,GACrBF,GAAoB7H,KAAW+H,EAG1B/H,EAAK+H,WAAaA,EAKd,UAAW/H,GACfA,EAAK+H,WAAaA,GAY5B,SAASkD,GAAwBnM,GAChC,OAAOmL,GAAc,SAAUiB,GAE9B,OADAA,GAAYA,EACLjB,GAAc,SAAU3B,EAAM3F,GACpC,IAAIjC,EACHyK,EAAerM,EAAI,GAAIwJ,EAAKrJ,OAAQiM,GACpCpN,EAAIqN,EAAalM,OAGlB,MAAQnB,IACFwK,EAAQ5H,EAAIyK,EAAcrN,MAC9BwK,EAAM5H,KAASiC,EAASjC,GAAM4H,EAAM5H,SAYzC,SAAS2I,GAAaxK,GACrB,OAAOA,GAAmD,oBAAjCA,EAAQoK,sBAAwCpK,EAkrC1E,IAAMf,KA9qCNd,EAAUqG,GAAOrG,QAAU,GAO3BwG,EAAQH,GAAOG,MAAQ,SAAUxD,GAChC,IAAIoL,EAAYpL,EAAKqL,aACpBrH,GAAYhE,EAAK6I,eAAiB7I,GAAOsL,gBAK1C,OAAQ5E,EAAM0C,KAAMgC,GAAapH,GAAWA,EAAQgE,UAAY,SAQjEjE,EAAcV,GAAOU,YAAc,SAAUnG,GAC5C,IAAI2N,EAAYC,EACf3N,EAAMD,EAAOA,EAAKiL,eAAiBjL,EAAO0G,EAO3C,OAAKzG,GAAOrC,GAA6B,IAAjBqC,EAAIV,UAAmBU,EAAIyN,kBAMnDtH,GADAxI,EAAWqC,GACQyN,gBACnBrH,GAAkBT,EAAOhI,GAQpB8I,GAAgB9I,IAClBgQ,EAAYhQ,EAASiQ,cAAiBD,EAAUE,MAAQF,IAGrDA,EAAUG,iBACdH,EAAUG,iBAAkB,SAAU/D,IAAe,GAG1C4D,EAAUI,aACrBJ,EAAUI,YAAa,WAAYhE,KASrC5K,EAAQsM,MAAQY,GAAQ,SAAUC,GAEjC,OADAnG,EAAQ1F,YAAa6L,GAAK7L,YAAa9C,EAASyC,cAAe,QACzB,oBAAxBkM,EAAGV,mBACfU,EAAGV,iBAAkB,uBAAwBxK,SAShDjC,EAAQuI,WAAa2E,GAAQ,SAAUC,GAEtC,OADAA,EAAG0B,UAAY,KACP1B,EAAGhM,aAAc,eAO1BnB,EAAQiM,qBAAuBiB,GAAQ,SAAUC,GAEhD,OADAA,EAAG7L,YAAa9C,EAASsQ,cAAe,MAChC3B,EAAGlB,qBAAsB,KAAMhK,SAIxCjC,EAAQkM,uBAAyBrC,EAAQuC,KAAM5N,EAAS0N,wBAMxDlM,EAAQ+O,QAAU7B,GAAQ,SAAUC,GAEnC,OADAnG,EAAQ1F,YAAa6L,GAAKnB,GAAKtH,GACvBlG,EAASwQ,oBAAsBxQ,EAASwQ,kBAAmBtK,GAAUzC,SAIzEjC,EAAQ+O,SACZzI,EAAK2I,OAAa,GAAI,SAAUjD,GAC/B,IAAIkD,EAASlD,EAAGnH,QAASmF,GAAWC,IACpC,OAAO,SAAUjH,GAChB,OAAOA,EAAK7B,aAAc,QAAW+N,IAGvC5I,EAAK6I,KAAW,GAAI,SAAUnD,EAAInK,GACjC,GAAuC,oBAA3BA,EAAQkK,gBAAkC9E,EAAiB,CACtE,IAAIjE,EAAOnB,EAAQkK,eAAgBC,GACnC,OAAOhJ,EAAO,CAAEA,GAAS,OAI3BsD,EAAK2I,OAAa,GAAK,SAAUjD,GAChC,IAAIkD,EAASlD,EAAGnH,QAASmF,GAAWC,IACpC,OAAO,SAAUjH,GAChB,IAAIpC,EAAwC,oBAA1BoC,EAAKoM,kBACtBpM,EAAKoM,iBAAkB,MACxB,OAAOxO,GAAQA,EAAKkF,QAAUoJ,IAMhC5I,EAAK6I,KAAW,GAAI,SAAUnD,EAAInK,GACjC,GAAuC,oBAA3BA,EAAQkK,gBAAkC9E,EAAiB,CACtE,IAAIrG,EAAME,EAAG2B,EACZO,EAAOnB,EAAQkK,eAAgBC,GAEhC,GAAKhJ,EAAO,CAIX,IADApC,EAAOoC,EAAKoM,iBAAkB,QACjBxO,EAAKkF,QAAUkG,EAC3B,MAAO,CAAEhJ,GAIVP,EAAQZ,EAAQmN,kBAAmBhD,GACnClL,EAAI,EACJ,MAAUkC,EAAOP,EAAO3B,KAEvB,IADAF,EAAOoC,EAAKoM,iBAAkB,QACjBxO,EAAKkF,QAAUkG,EAC3B,MAAO,CAAEhJ,GAKZ,MAAO,MAMVsD,EAAK6I,KAAY,IAAInP,EAAQiM,qBAC5B,SAAUoD,EAAKxN,GACd,MAA6C,oBAAjCA,EAAQoK,qBACZpK,EAAQoK,qBAAsBoD,GAG1BrP,EAAQmM,IACZtK,EAAQ4K,iBAAkB4C,QAD3B,GAKR,SAAUA,EAAKxN,GACd,IAAImB,EACHsM,EAAM,GACNxO,EAAI,EAGJyE,EAAU1D,EAAQoK,qBAAsBoD,GAGzC,GAAa,MAARA,EAAc,CAClB,MAAUrM,EAAOuC,EAASzE,KACF,IAAlBkC,EAAK7C,UACTmP,EAAI9P,KAAMwD,GAIZ,OAAOsM,EAER,OAAO/J,GAITe,EAAK6I,KAAc,MAAInP,EAAQkM,wBAA0B,SAAU2C,EAAWhN,GAC7E,GAA+C,oBAAnCA,EAAQqK,wBAA0CjF,EAC7D,OAAOpF,EAAQqK,uBAAwB2C,IAUzC1H,EAAgB,GAOhBD,EAAY,IAELlH,EAAQmM,IAAMtC,EAAQuC,KAAM5N,EAASiO,qBAI3CS,GAAQ,SAAUC,GAEjB,IAAIoC,EAOJvI,EAAQ1F,YAAa6L,GAAKqC,UAAY,UAAY9K,EAAU,qBAC1CA,EAAU,kEAOvByI,EAAGV,iBAAkB,wBAAyBxK,QAClDiF,EAAU1H,KAAM,SAAW6I,EAAa,gBAKnC8E,EAAGV,iBAAkB,cAAexK,QACzCiF,EAAU1H,KAAM,MAAQ6I,EAAa,aAAeD,EAAW,KAI1D+E,EAAGV,iBAAkB,QAAU/H,EAAU,MAAOzC,QACrDiF,EAAU1H,KAAM,OAQjB+P,EAAQ/Q,EAASyC,cAAe,UAC1BG,aAAc,OAAQ,IAC5B+L,EAAG7L,YAAaiO,GACVpC,EAAGV,iBAAkB,aAAcxK,QACxCiF,EAAU1H,KAAM,MAAQ6I,EAAa,QAAUA,EAAa,KAC3DA,EAAa,gBAMT8E,EAAGV,iBAAkB,YAAaxK,QACvCiF,EAAU1H,KAAM,YAMX2N,EAAGV,iBAAkB,KAAO/H,EAAU,MAAOzC,QAClDiF,EAAU1H,KAAM,YAKjB2N,EAAGV,iBAAkB,QACrBvF,EAAU1H,KAAM,iBAGjB0N,GAAQ,SAAUC,GACjBA,EAAGqC,UAAY,oFAKf,IAAID,EAAQ/Q,EAASyC,cAAe,SACpCsO,EAAMnO,aAAc,OAAQ,UAC5B+L,EAAG7L,YAAaiO,GAAQnO,aAAc,OAAQ,KAIzC+L,EAAGV,iBAAkB,YAAaxK,QACtCiF,EAAU1H,KAAM,OAAS6I,EAAa,eAKW,IAA7C8E,EAAGV,iBAAkB,YAAaxK,QACtCiF,EAAU1H,KAAM,WAAY,aAK7BwH,EAAQ1F,YAAa6L,GAAKpC,UAAW,EACc,IAA9CoC,EAAGV,iBAAkB,aAAcxK,QACvCiF,EAAU1H,KAAM,WAAY,aAK7B2N,EAAGV,iBAAkB,QACrBvF,EAAU1H,KAAM,YAIXQ,EAAQyP,gBAAkB5F,EAAQuC,KAAQzG,EAAUqB,EAAQrB,SAClEqB,EAAQ0I,uBACR1I,EAAQ2I,oBACR3I,EAAQ4I,kBACR5I,EAAQ6I,qBAER3C,GAAQ,SAAUC,GAIjBnN,EAAQ8P,kBAAoBnK,EAAQtG,KAAM8N,EAAI,KAI9CxH,EAAQtG,KAAM8N,EAAI,aAClBhG,EAAc3H,KAAM,KAAMgJ,KAI5BtB,EAAYA,EAAUjF,QAAU,IAAIyG,OAAQxB,EAAUsF,KAAM,MAC5DrF,EAAgBA,EAAclF,QAAU,IAAIyG,OAAQvB,EAAcqF,KAAM,MAIxE+B,EAAa1E,EAAQuC,KAAMpF,EAAQ+I,yBAKnC3I,EAAWmH,GAAc1E,EAAQuC,KAAMpF,EAAQI,UAC9C,SAAUW,EAAGC,GACZ,IAAIgI,EAAuB,IAAfjI,EAAE5H,SAAiB4H,EAAEuG,gBAAkBvG,EAClDkI,EAAMjI,GAAKA,EAAEzG,WACd,OAAOwG,IAAMkI,MAAWA,GAAwB,IAAjBA,EAAI9P,YAClC6P,EAAM5I,SACL4I,EAAM5I,SAAU6I,GAChBlI,EAAEgI,yBAA8D,GAAnChI,EAAEgI,wBAAyBE,MAG3D,SAAUlI,EAAGC,GACZ,GAAKA,EACJ,MAAUA,EAAIA,EAAEzG,WACf,GAAKyG,IAAMD,EACV,OAAO,EAIV,OAAO,GAOTD,EAAYyG,EACZ,SAAUxG,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,OADAlB,GAAe,EACR,EAIR,IAAIoJ,GAAWnI,EAAEgI,yBAA2B/H,EAAE+H,wBAC9C,OAAKG,IAgBU,GAPfA,GAAYnI,EAAE8D,eAAiB9D,KAASC,EAAE6D,eAAiB7D,GAC1DD,EAAEgI,wBAAyB/H,GAG3B,KAIGhI,EAAQmQ,cAAgBnI,EAAE+H,wBAAyBhI,KAAQmI,EAOzDnI,GAAKvJ,GAAYuJ,EAAE8D,eAAiBvE,GACxCF,EAAUE,EAAcS,IAChB,EAOJC,GAAKxJ,GAAYwJ,EAAE6D,eAAiBvE,GACxCF,EAAUE,EAAcU,GACjB,EAIDnB,EACJpH,EAASoH,EAAWkB,GAAMtI,EAASoH,EAAWmB,GAChD,EAGe,EAAVkI,GAAe,EAAI,IAE3B,SAAUnI,EAAGC,GAGZ,GAAKD,IAAMC,EAEV,OADAlB,GAAe,EACR,EAGR,IAAI2G,EACH3M,EAAI,EACJsP,EAAMrI,EAAExG,WACR0O,EAAMjI,EAAEzG,WACR8O,EAAK,CAAEtI,GACPuI,EAAK,CAAEtI,GAGR,IAAMoI,IAAQH,EAMb,OAAOlI,GAAKvJ,GAAY,EACvBwJ,GAAKxJ,EAAW,EAEhB4R,GAAO,EACPH,EAAM,EACNpJ,EACEpH,EAASoH,EAAWkB,GAAMtI,EAASoH,EAAWmB,GAChD,EAGK,GAAKoI,IAAQH,EACnB,OAAOzC,GAAczF,EAAGC,GAIzByF,EAAM1F,EACN,MAAU0F,EAAMA,EAAIlM,WACnB8O,EAAGE,QAAS9C,GAEbA,EAAMzF,EACN,MAAUyF,EAAMA,EAAIlM,WACnB+O,EAAGC,QAAS9C,GAIb,MAAQ4C,EAAIvP,KAAQwP,EAAIxP,GACvBA,IAGD,OAAOA,EAGN0M,GAAc6C,EAAIvP,GAAKwP,EAAIxP,IAO3BuP,EAAIvP,IAAOwG,GAAgB,EAC3BgJ,EAAIxP,IAAOwG,EAAe,EAE1B,IAGK9I,GAGR6H,GAAOV,QAAU,SAAU6K,EAAMC,GAChC,OAAOpK,GAAQmK,EAAM,KAAM,KAAMC,IAGlCpK,GAAOoJ,gBAAkB,SAAUzM,EAAMwN,GAGxC,GAFAzJ,EAAa/D,GAERhD,EAAQyP,iBAAmBxI,IAC9BY,EAAwB2I,EAAO,QAC7BrJ,IAAkBA,EAAciF,KAAMoE,OACtCtJ,IAAkBA,EAAUkF,KAAMoE,IAErC,IACC,IAAI9N,EAAMiD,EAAQtG,KAAM2D,EAAMwN,GAG9B,GAAK9N,GAAO1C,EAAQ8P,mBAInB9M,EAAKxE,UAAuC,KAA3BwE,EAAKxE,SAAS2B,SAC/B,OAAOuC,EAEP,MAAQ0I,GACTvD,EAAwB2I,GAAM,GAIhC,OAAyD,EAAlDnK,GAAQmK,EAAMhS,EAAU,KAAM,CAAEwE,IAASf,QAGjDoE,GAAOe,SAAW,SAAUvF,EAASmB,GAUpC,OAHOnB,EAAQgK,eAAiBhK,IAAarD,GAC5CuI,EAAalF,GAEPuF,EAAUvF,EAASmB,IAG3BqD,GAAOqK,KAAO,SAAU1N,EAAMgB,IAOtBhB,EAAK6I,eAAiB7I,IAAUxE,GACtCuI,EAAa/D,GAGd,IAAIlB,EAAKwE,EAAKiH,WAAYvJ,EAAKoC,eAG9BrF,EAAMe,GAAMlC,EAAOP,KAAMiH,EAAKiH,WAAYvJ,EAAKoC,eAC9CtE,EAAIkB,EAAMgB,GAAOiD,QACjBxC,EAEF,YAAeA,IAAR1D,EACNA,EACAf,EAAQuI,aAAetB,EACtBjE,EAAK7B,aAAc6C,IACjBjD,EAAMiC,EAAKoM,iBAAkBpL,KAAYjD,EAAI4P,UAC9C5P,EAAI+E,MACJ,MAGJO,GAAO6D,OAAS,SAAU0G,GACzB,OAASA,EAAM,IAAK/L,QAAS0F,GAAYC,KAG1CnE,GAAOtB,MAAQ,SAAUC,GACxB,MAAM,IAAItG,MAAO,0CAA4CsG,IAO9DqB,GAAOwK,WAAa,SAAUtL,GAC7B,IAAIvC,EACH8N,EAAa,GACbpN,EAAI,EACJ5C,EAAI,EAOL,GAJAgG,GAAgB9G,EAAQ+Q,iBACxBlK,GAAa7G,EAAQgR,YAAczL,EAAQrG,MAAO,GAClDqG,EAAQ3B,KAAMkE,GAEThB,EAAe,CACnB,MAAU9D,EAAOuC,EAASzE,KACpBkC,IAASuC,EAASzE,KACtB4C,EAAIoN,EAAWtR,KAAMsB,IAGvB,MAAQ4C,IACP6B,EAAQ1B,OAAQiN,EAAYpN,GAAK,GAQnC,OAFAmD,EAAY,KAELtB,GAORgB,EAAUF,GAAOE,QAAU,SAAUvD,GACpC,IAAIpC,EACH8B,EAAM,GACN5B,EAAI,EACJX,EAAW6C,EAAK7C,SAEjB,GAAMA,GAQC,GAAkB,IAAbA,GAA+B,IAAbA,GAA+B,KAAbA,EAAkB,CAIjE,GAAiC,iBAArB6C,EAAKiO,YAChB,OAAOjO,EAAKiO,YAIZ,IAAMjO,EAAOA,EAAKkO,WAAYlO,EAAMA,EAAOA,EAAK4K,YAC/ClL,GAAO6D,EAASvD,QAGZ,GAAkB,IAAb7C,GAA+B,IAAbA,EAC7B,OAAO6C,EAAKmO,eAnBZ,MAAUvQ,EAAOoC,EAAMlC,KAGtB4B,GAAO6D,EAAS3F,GAqBlB,OAAO8B,IAGR4D,EAAOD,GAAO+K,UAAY,CAGzBrE,YAAa,GAEbsE,aAAcpE,GAEdxB,MAAOxC,EAEPsE,WAAY,GAEZ4B,KAAM,GAENmC,SAAU,CACTC,IAAK,CAAEtG,IAAK,aAAc/H,OAAO,GACjCsO,IAAK,CAAEvG,IAAK,cACZwG,IAAK,CAAExG,IAAK,kBAAmB/H,OAAO,GACtCwO,IAAK,CAAEzG,IAAK,oBAGb0G,UAAW,CACVtI,KAAQ,SAAUoC,GAWjB,OAVAA,EAAO,GAAMA,EAAO,GAAI5G,QAASmF,GAAWC,IAG5CwB,EAAO,IAAQA,EAAO,IAAOA,EAAO,IACnCA,EAAO,IAAO,IAAK5G,QAASmF,GAAWC,IAEpB,OAAfwB,EAAO,KACXA,EAAO,GAAM,IAAMA,EAAO,GAAM,KAG1BA,EAAMvM,MAAO,EAAG,IAGxBqK,MAAS,SAAUkC,GAiClB,OArBAA,EAAO,GAAMA,EAAO,GAAIrF,cAEU,QAA7BqF,EAAO,GAAIvM,MAAO,EAAG,IAGnBuM,EAAO,IACZpF,GAAOtB,MAAO0G,EAAO,IAKtBA,EAAO,KAASA,EAAO,GACtBA,EAAO,IAAQA,EAAO,IAAO,GAC7B,GAAqB,SAAfA,EAAO,IAAiC,QAAfA,EAAO,KACvCA,EAAO,KAAWA,EAAO,GAAMA,EAAO,IAAwB,QAAfA,EAAO,KAG3CA,EAAO,IAClBpF,GAAOtB,MAAO0G,EAAO,IAGfA,GAGRnC,OAAU,SAAUmC,GACnB,IAAImG,EACHC,GAAYpG,EAAO,IAAOA,EAAO,GAElC,OAAKxC,EAAmB,MAAEmD,KAAMX,EAAO,IAC/B,MAIHA,EAAO,GACXA,EAAO,GAAMA,EAAO,IAAOA,EAAO,IAAO,GAG9BoG,GAAY9I,EAAQqD,KAAMyF,KAGnCD,EAASnL,EAAUoL,GAAU,MAG7BD,EAASC,EAASpS,QAAS,IAAKoS,EAAS5P,OAAS2P,GAAWC,EAAS5P,UAGxEwJ,EAAO,GAAMA,EAAO,GAAIvM,MAAO,EAAG0S,GAClCnG,EAAO,GAAMoG,EAAS3S,MAAO,EAAG0S,IAI1BnG,EAAMvM,MAAO,EAAG,MAIzB+P,OAAQ,CAEP7F,IAAO,SAAU0I,GAChB,IAAI9G,EAAW8G,EAAiBjN,QAASmF,GAAWC,IAAY7D,cAChE,MAA4B,MAArB0L,EACN,WACC,OAAO,GAER,SAAU9O,GACT,OAAOA,EAAKgI,UAAYhI,EAAKgI,SAAS5E,gBAAkB4E,IAI3D7B,MAAS,SAAU0F,GAClB,IAAIkD,EAAUtK,EAAYoH,EAAY,KAEtC,OAAOkD,IACJA,EAAU,IAAIrJ,OAAQ,MAAQL,EAC/B,IAAMwG,EAAY,IAAMxG,EAAa,SAAaZ,EACjDoH,EAAW,SAAU7L,GACpB,OAAO+O,EAAQ3F,KACY,iBAAnBpJ,EAAK6L,WAA0B7L,EAAK6L,WACd,oBAAtB7L,EAAK7B,cACX6B,EAAK7B,aAAc,UACpB,OAKNkI,KAAQ,SAAUrF,EAAMgO,EAAUC,GACjC,OAAO,SAAUjP,GAChB,IAAIkP,EAAS7L,GAAOqK,KAAM1N,EAAMgB,GAEhC,OAAe,MAAVkO,EACgB,OAAbF,GAEFA,IAINE,GAAU,GAIU,MAAbF,EAAmBE,IAAWD,EACvB,OAAbD,EAAoBE,IAAWD,EAClB,OAAbD,EAAoBC,GAAqC,IAA5BC,EAAOzS,QAASwS,GAChC,OAAbD,EAAoBC,IAAoC,EAA3BC,EAAOzS,QAASwS,GAChC,OAAbD,EAAoBC,GAASC,EAAOhT,OAAQ+S,EAAMhQ,UAAagQ,EAClD,OAAbD,GAA2F,GAArE,IAAME,EAAOrN,QAAS4D,EAAa,KAAQ,KAAMhJ,QAASwS,GACnE,OAAbD,IAAoBE,IAAWD,GAASC,EAAOhT,MAAO,EAAG+S,EAAMhQ,OAAS,KAAQgQ,EAAQ,QAO3F1I,MAAS,SAAUjJ,EAAM6R,EAAMC,EAAWlP,EAAOE,GAChD,IAAIiP,EAAgC,QAAvB/R,EAAKpB,MAAO,EAAG,GAC3BoT,EAA+B,SAArBhS,EAAKpB,OAAQ,GACvBqT,EAAkB,YAATJ,EAEV,OAAiB,IAAVjP,GAAwB,IAATE,EAGrB,SAAUJ,GACT,QAASA,EAAKzB,YAGf,SAAUyB,EAAMwP,EAAUC,GACzB,IAAI5F,EAAO6F,EAAaC,EAAY/R,EAAMgS,EAAWC,EACpD5H,EAAMoH,IAAWC,EAAU,cAAgB,kBAC3CQ,EAAS9P,EAAKzB,WACdyC,EAAOuO,GAAUvP,EAAKgI,SAAS5E,cAC/B2M,GAAYN,IAAQF,EACpB7E,GAAO,EAER,GAAKoF,EAAS,CAGb,GAAKT,EAAS,CACb,MAAQpH,EAAM,CACbrK,EAAOoC,EACP,MAAUpC,EAAOA,EAAMqK,GACtB,GAAKsH,EACJ3R,EAAKoK,SAAS5E,gBAAkBpC,EACd,IAAlBpD,EAAKT,SAEL,OAAO,EAKT0S,EAAQ5H,EAAe,SAAT3K,IAAoBuS,GAAS,cAE5C,OAAO,EAMR,GAHAA,EAAQ,CAAEP,EAAUQ,EAAO5B,WAAa4B,EAAOE,WAG1CV,GAAWS,EAAW,CAe1BrF,GADAkF,GADA/F,GAHA6F,GAJAC,GADA/R,EAAOkS,GACYpO,KAAe9D,EAAM8D,GAAY,KAI1B9D,EAAKqS,YAC5BN,EAAY/R,EAAKqS,UAAa,KAEZ3S,IAAU,IACZ,KAAQiH,GAAWsF,EAAO,KACzBA,EAAO,GAC3BjM,EAAOgS,GAAaE,EAAO3H,WAAYyH,GAEvC,MAAUhS,IAASgS,GAAahS,GAAQA,EAAMqK,KAG3CyC,EAAOkF,EAAY,IAAOC,EAAM5K,MAGlC,GAAuB,IAAlBrH,EAAKT,YAAoBuN,GAAQ9M,IAASoC,EAAO,CACrD0P,EAAapS,GAAS,CAAEiH,EAASqL,EAAWlF,GAC5C,YAyBF,GAlBKqF,IAaJrF,EADAkF,GADA/F,GAHA6F,GAJAC,GADA/R,EAAOoC,GACY0B,KAAe9D,EAAM8D,GAAY,KAI1B9D,EAAKqS,YAC5BN,EAAY/R,EAAKqS,UAAa,KAEZ3S,IAAU,IACZ,KAAQiH,GAAWsF,EAAO,KAMhC,IAATa,EAGJ,MAAU9M,IAASgS,GAAahS,GAAQA,EAAMqK,KAC3CyC,EAAOkF,EAAY,IAAOC,EAAM5K,MAElC,IAAOsK,EACN3R,EAAKoK,SAAS5E,gBAAkBpC,EACd,IAAlBpD,EAAKT,aACHuN,IAGGqF,KAMJL,GALAC,EAAa/R,EAAM8D,KAChB9D,EAAM8D,GAAY,KAIK9D,EAAKqS,YAC5BN,EAAY/R,EAAKqS,UAAa,KAEpB3S,GAAS,CAAEiH,EAASmG,IAG7B9M,IAASoC,GACb,MASL,OADA0K,GAAQtK,KACQF,GAAWwK,EAAOxK,GAAU,GAAqB,GAAhBwK,EAAOxK,KAK5DoG,OAAU,SAAU4J,EAAQhF,GAM3B,IAAIiF,EACHrR,EAAKwE,EAAKkC,QAAS0K,IAAY5M,EAAK8M,WAAYF,EAAO9M,gBACtDC,GAAOtB,MAAO,uBAAyBmO,GAKzC,OAAKpR,EAAI4C,GACD5C,EAAIoM,GAIK,EAAZpM,EAAGG,QACPkR,EAAO,CAAED,EAAQA,EAAQ,GAAIhF,GACtB5H,EAAK8M,WAAWvT,eAAgBqT,EAAO9M,eAC7C6G,GAAc,SAAU3B,EAAM3F,GAC7B,IAAI0N,EACHC,EAAUxR,EAAIwJ,EAAM4C,GACpBpN,EAAIwS,EAAQrR,OACb,MAAQnB,IAEPwK,EADA+H,EAAM5T,EAAS6L,EAAMgI,EAASxS,OACb6E,EAAS0N,GAAQC,EAASxS,MAG7C,SAAUkC,GACT,OAAOlB,EAAIkB,EAAM,EAAGmQ,KAIhBrR,IAIT0G,QAAS,CAGR+K,IAAOtG,GAAc,SAAUrL,GAK9B,IAAI2N,EAAQ,GACXhK,EAAU,GACViO,EAAU9M,EAAS9E,EAASiD,QAAS8D,EAAO,OAE7C,OAAO6K,EAAS9O,GACfuI,GAAc,SAAU3B,EAAM3F,EAAS6M,EAAUC,GAChD,IAAIzP,EACHyQ,EAAYD,EAASlI,EAAM,KAAMmH,EAAK,IACtC3R,EAAIwK,EAAKrJ,OAGV,MAAQnB,KACAkC,EAAOyQ,EAAW3S,MACxBwK,EAAMxK,KAAS6E,EAAS7E,GAAMkC,MAIjC,SAAUA,EAAMwP,EAAUC,GAMzB,OALAlD,EAAO,GAAMvM,EACbwQ,EAASjE,EAAO,KAAMkD,EAAKlN,GAG3BgK,EAAO,GAAM,MACLhK,EAAQ0C,SAInByL,IAAOzG,GAAc,SAAUrL,GAC9B,OAAO,SAAUoB,GAChB,OAAyC,EAAlCqD,GAAQzE,EAAUoB,GAAOf,UAIlCmF,SAAY6F,GAAc,SAAU/L,GAEnC,OADAA,EAAOA,EAAK2D,QAASmF,GAAWC,IACzB,SAAUjH,GAChB,OAAkE,GAAzDA,EAAKiO,aAAe1K,EAASvD,IAASvD,QAASyB,MAW1DyS,KAAQ1G,GAAc,SAAU0G,GAO/B,OAJM3K,EAAYoD,KAAMuH,GAAQ,KAC/BtN,GAAOtB,MAAO,qBAAuB4O,GAEtCA,EAAOA,EAAK9O,QAASmF,GAAWC,IAAY7D,cACrC,SAAUpD,GAChB,IAAI4Q,EACJ,GACC,GAAOA,EAAW3M,EACjBjE,EAAK2Q,KACL3Q,EAAK7B,aAAc,aAAgB6B,EAAK7B,aAAc,QAGtD,OADAyS,EAAWA,EAASxN,iBACAuN,GAA2C,IAAnCC,EAASnU,QAASkU,EAAO,YAE3C3Q,EAAOA,EAAKzB,aAAkC,IAAlByB,EAAK7C,UAC7C,OAAO,KAKTiE,OAAU,SAAUpB,GACnB,IAAI6Q,EAAOlV,EAAOmV,UAAYnV,EAAOmV,SAASD,KAC9C,OAAOA,GAAQA,EAAK3U,MAAO,KAAQ8D,EAAKgJ,IAGzC+H,KAAQ,SAAU/Q,GACjB,OAAOA,IAASgE,GAGjBgN,MAAS,SAAUhR,GAClB,OAAOA,IAASxE,EAASyV,iBACrBzV,EAAS0V,UAAY1V,EAAS0V,gBAC7BlR,EAAK1C,MAAQ0C,EAAKmR,OAASnR,EAAKoR,WAItCC,QAAWtG,IAAsB,GACjChD,SAAYgD,IAAsB,GAElCuG,QAAW,SAAUtR,GAIpB,IAAIgI,EAAWhI,EAAKgI,SAAS5E,cAC7B,MAAsB,UAAb4E,KAA0BhI,EAAKsR,SACxB,WAAbtJ,KAA2BhI,EAAKuR,UAGpCA,SAAY,SAAUvR,GASrB,OALKA,EAAKzB,YAETyB,EAAKzB,WAAWiT,eAGQ,IAAlBxR,EAAKuR,UAIbE,MAAS,SAAUzR,GAMlB,IAAMA,EAAOA,EAAKkO,WAAYlO,EAAMA,EAAOA,EAAK4K,YAC/C,GAAK5K,EAAK7C,SAAW,EACpB,OAAO,EAGT,OAAO,GAGR2S,OAAU,SAAU9P,GACnB,OAAQsD,EAAKkC,QAAiB,MAAGxF,IAIlC0R,OAAU,SAAU1R,GACnB,OAAO4G,EAAQwC,KAAMpJ,EAAKgI,WAG3BuE,MAAS,SAAUvM,GAClB,OAAO2G,EAAQyC,KAAMpJ,EAAKgI,WAG3B2J,OAAU,SAAU3R,GACnB,IAAIgB,EAAOhB,EAAKgI,SAAS5E,cACzB,MAAgB,UAATpC,GAAkC,WAAdhB,EAAK1C,MAA8B,WAAT0D,GAGtD9C,KAAQ,SAAU8B,GACjB,IAAI0N,EACJ,MAAuC,UAAhC1N,EAAKgI,SAAS5E,eACN,SAAdpD,EAAK1C,OAIuC,OAAxCoQ,EAAO1N,EAAK7B,aAAc,UACN,SAAvBuP,EAAKtK,gBAIRlD,MAAS+K,GAAwB,WAChC,MAAO,CAAE,KAGV7K,KAAQ6K,GAAwB,SAAU2G,EAAe3S,GACxD,MAAO,CAAEA,EAAS,KAGnBkB,GAAM8K,GAAwB,SAAU2G,EAAe3S,EAAQiM,GAC9D,MAAO,CAAEA,EAAW,EAAIA,EAAWjM,EAASiM,KAG7C7K,KAAQ4K,GAAwB,SAAUE,EAAclM,GAEvD,IADA,IAAInB,EAAI,EACAA,EAAImB,EAAQnB,GAAK,EACxBqN,EAAa3O,KAAMsB,GAEpB,OAAOqN,IAGR3K,IAAOyK,GAAwB,SAAUE,EAAclM,GAEtD,IADA,IAAInB,EAAI,EACAA,EAAImB,EAAQnB,GAAK,EACxBqN,EAAa3O,KAAMsB,GAEpB,OAAOqN,IAGR0G,GAAM5G,GAAwB,SAAUE,EAAclM,EAAQiM,GAM7D,IALA,IAAIpN,EAAIoN,EAAW,EAClBA,EAAWjM,EACAA,EAAXiM,EACCjM,EACAiM,EACa,KAALpN,GACTqN,EAAa3O,KAAMsB,GAEpB,OAAOqN,IAGR2G,GAAM7G,GAAwB,SAAUE,EAAclM,EAAQiM,GAE7D,IADA,IAAIpN,EAAIoN,EAAW,EAAIA,EAAWjM,EAASiM,IACjCpN,EAAImB,GACbkM,EAAa3O,KAAMsB,GAEpB,OAAOqN,OAKL3F,QAAe,IAAIlC,EAAKkC,QAAc,GAGhC,CAAEuM,OAAO,EAAMC,UAAU,EAAMC,MAAM,EAAMC,UAAU,EAAMC,OAAO,GAC5E7O,EAAKkC,QAAS1H,GAAM+M,GAAmB/M,GAExC,IAAMA,IAAK,CAAEsU,QAAQ,EAAMC,OAAO,GACjC/O,EAAKkC,QAAS1H,GAAMgN,GAAoBhN,GAIzC,SAASsS,MA0ET,SAAS7G,GAAY+I,GAIpB,IAHA,IAAIxU,EAAI,EACP2C,EAAM6R,EAAOrT,OACbL,EAAW,GACJd,EAAI2C,EAAK3C,IAChBc,GAAY0T,EAAQxU,GAAIgF,MAEzB,OAAOlE,EAGR,SAASkJ,GAAe0I,EAAS+B,EAAYC,GAC5C,IAAIvK,EAAMsK,EAAWtK,IACpBwK,EAAOF,EAAWrK,KAClB4B,EAAM2I,GAAQxK,EACdyK,EAAmBF,GAAgB,eAAR1I,EAC3B6I,EAAWnO,IAEZ,OAAO+N,EAAWrS,MAGjB,SAAUF,EAAMnB,EAAS4Q,GACxB,MAAUzP,EAAOA,EAAMiI,GACtB,GAAuB,IAAlBjI,EAAK7C,UAAkBuV,EAC3B,OAAOlC,EAASxQ,EAAMnB,EAAS4Q,GAGjC,OAAO,GAIR,SAAUzP,EAAMnB,EAAS4Q,GACxB,IAAImD,EAAUlD,EAAaC,EAC1BkD,EAAW,CAAEtO,EAASoO,GAGvB,GAAKlD,GACJ,MAAUzP,EAAOA,EAAMiI,GACtB,IAAuB,IAAlBjI,EAAK7C,UAAkBuV,IACtBlC,EAASxQ,EAAMnB,EAAS4Q,GAC5B,OAAO,OAKV,MAAUzP,EAAOA,EAAMiI,GACtB,GAAuB,IAAlBjI,EAAK7C,UAAkBuV,EAQ3B,GAHAhD,GAJAC,EAAa3P,EAAM0B,KAAe1B,EAAM0B,GAAY,KAI1B1B,EAAKiQ,YAC5BN,EAAY3P,EAAKiQ,UAAa,IAE5BwC,GAAQA,IAASzS,EAAKgI,SAAS5E,cACnCpD,EAAOA,EAAMiI,IAASjI,MAChB,CAAA,IAAO4S,EAAWlD,EAAa5F,KACrC8I,EAAU,KAAQrO,GAAWqO,EAAU,KAAQD,EAG/C,OAASE,EAAU,GAAMD,EAAU,GAOnC,IAHAlD,EAAa5F,GAAQ+I,GAGJ,GAAMrC,EAASxQ,EAAMnB,EAAS4Q,GAC9C,OAAO,EAMZ,OAAO,GAIV,SAASqD,GAAgBC,GACxB,OAAyB,EAAlBA,EAAS9T,OACf,SAAUe,EAAMnB,EAAS4Q,GACxB,IAAI3R,EAAIiV,EAAS9T,OACjB,MAAQnB,IACP,IAAMiV,EAAUjV,GAAKkC,EAAMnB,EAAS4Q,GACnC,OAAO,EAGT,OAAO,GAERsD,EAAU,GAYZ,SAASC,GAAUvC,EAAW1Q,EAAKkM,EAAQpN,EAAS4Q,GAOnD,IANA,IAAIzP,EACHiT,EAAe,GACfnV,EAAI,EACJ2C,EAAMgQ,EAAUxR,OAChBiU,EAAgB,MAAPnT,EAEFjC,EAAI2C,EAAK3C,KACTkC,EAAOyQ,EAAW3S,MAClBmO,IAAUA,EAAQjM,EAAMnB,EAAS4Q,KACtCwD,EAAazW,KAAMwD,GACdkT,GACJnT,EAAIvD,KAAMsB,KAMd,OAAOmV,EAGR,SAASE,GAAYxE,EAAW/P,EAAU4R,EAAS4C,EAAYC,EAAYC,GAO1E,OANKF,IAAeA,EAAY1R,KAC/B0R,EAAaD,GAAYC,IAErBC,IAAeA,EAAY3R,KAC/B2R,EAAaF,GAAYE,EAAYC,IAE/BrJ,GAAc,SAAU3B,EAAM/F,EAAS1D,EAAS4Q,GACtD,IAAI8D,EAAMzV,EAAGkC,EACZwT,EAAS,GACTC,EAAU,GACVC,EAAcnR,EAAQtD,OAGtBQ,EAAQ6I,GA5CX,SAA2B1J,EAAU+U,EAAUpR,GAG9C,IAFA,IAAIzE,EAAI,EACP2C,EAAMkT,EAAS1U,OACRnB,EAAI2C,EAAK3C,IAChBuF,GAAQzE,EAAU+U,EAAU7V,GAAKyE,GAElC,OAAOA,EAsCWqR,CACfhV,GAAY,IACZC,EAAQ1B,SAAW,CAAE0B,GAAYA,EACjC,IAIDgV,GAAYlF,IAAerG,GAAS1J,EAEnCa,EADAuT,GAAUvT,EAAO+T,EAAQ7E,EAAW9P,EAAS4Q,GAG9CqE,EAAatD,EAGZ6C,IAAgB/K,EAAOqG,EAAY+E,GAAeN,GAGjD,GAGA7Q,EACDsR,EAQF,GALKrD,GACJA,EAASqD,EAAWC,EAAYjV,EAAS4Q,GAIrC2D,EAAa,CACjBG,EAAOP,GAAUc,EAAYL,GAC7BL,EAAYG,EAAM,GAAI1U,EAAS4Q,GAG/B3R,EAAIyV,EAAKtU,OACT,MAAQnB,KACAkC,EAAOuT,EAAMzV,MACnBgW,EAAYL,EAAS3V,MAAW+V,EAAWJ,EAAS3V,IAAQkC,IAK/D,GAAKsI,GACJ,GAAK+K,GAAc1E,EAAY,CAC9B,GAAK0E,EAAa,CAGjBE,EAAO,GACPzV,EAAIgW,EAAW7U,OACf,MAAQnB,KACAkC,EAAO8T,EAAYhW,KAGzByV,EAAK/W,KAAQqX,EAAW/V,GAAMkC,GAGhCqT,EAAY,KAAQS,EAAa,GAAMP,EAAM9D,GAI9C3R,EAAIgW,EAAW7U,OACf,MAAQnB,KACAkC,EAAO8T,EAAYhW,MACsC,GAA7DyV,EAAOF,EAAa5W,EAAS6L,EAAMtI,GAASwT,EAAQ1V,MAEtDwK,EAAMiL,KAAYhR,EAASgR,GAASvT,UAOvC8T,EAAad,GACZc,IAAevR,EACduR,EAAWjT,OAAQ6S,EAAaI,EAAW7U,QAC3C6U,GAEGT,EACJA,EAAY,KAAM9Q,EAASuR,EAAYrE,GAEvCjT,EAAKD,MAAOgG,EAASuR,KAMzB,SAASC,GAAmBzB,GAyB3B,IAxBA,IAAI0B,EAAcxD,EAAS9P,EAC1BD,EAAM6R,EAAOrT,OACbgV,EAAkB3Q,EAAKgL,SAAUgE,EAAQ,GAAIhV,MAC7C4W,EAAmBD,GAAmB3Q,EAAKgL,SAAU,KACrDxQ,EAAImW,EAAkB,EAAI,EAG1BE,EAAerM,GAAe,SAAU9H,GACvC,OAAOA,IAASgU,GACdE,GAAkB,GACrBE,EAAkBtM,GAAe,SAAU9H,GAC1C,OAAwC,EAAjCvD,EAASuX,EAAchU,IAC5BkU,GAAkB,GACrBnB,EAAW,CAAE,SAAU/S,EAAMnB,EAAS4Q,GACrC,IAAI/P,GAASuU,IAAqBxE,GAAO5Q,IAAY+E,MAClDoQ,EAAenV,GAAU1B,SAC1BgX,EAAcnU,EAAMnB,EAAS4Q,GAC7B2E,EAAiBpU,EAAMnB,EAAS4Q,IAIlC,OADAuE,EAAe,KACRtU,IAGD5B,EAAI2C,EAAK3C,IAChB,GAAO0S,EAAUlN,EAAKgL,SAAUgE,EAAQxU,GAAIR,MAC3CyV,EAAW,CAAEjL,GAAegL,GAAgBC,GAAYvC,QAClD,CAIN,IAHAA,EAAUlN,EAAK2I,OAAQqG,EAAQxU,GAAIR,MAAOf,MAAO,KAAM+V,EAAQxU,GAAI6E,UAGrDjB,GAAY,CAIzB,IADAhB,IAAM5C,EACE4C,EAAID,EAAKC,IAChB,GAAK4C,EAAKgL,SAAUgE,EAAQ5R,GAAIpD,MAC/B,MAGF,OAAO6V,GACF,EAAJrV,GAASgV,GAAgBC,GACrB,EAAJjV,GAASyL,GAGT+I,EACEpW,MAAO,EAAG4B,EAAI,GACdxB,OAAQ,CAAEwG,MAAgC,MAAzBwP,EAAQxU,EAAI,GAAIR,KAAe,IAAM,MACtDuE,QAAS8D,EAAO,MAClB6K,EACA1S,EAAI4C,GAAKqT,GAAmBzB,EAAOpW,MAAO4B,EAAG4C,IAC7CA,EAAID,GAAOsT,GAAqBzB,EAASA,EAAOpW,MAAOwE,IACvDA,EAAID,GAAO8I,GAAY+I,IAGzBS,EAASvW,KAAMgU,GAIjB,OAAOsC,GAAgBC,GAoTxB,OAtpBA3C,GAAWlR,UAAYoE,EAAK+Q,QAAU/Q,EAAKkC,QAC3ClC,EAAK8M,WAAa,IAAIA,GAEtB3M,EAAWJ,GAAOI,SAAW,SAAU7E,EAAU0V,GAChD,IAAIhE,EAAS7H,EAAO6J,EAAQhV,EAC3BiX,EAAO7L,EAAQ8L,EACfC,EAAS9P,EAAY/F,EAAW,KAEjC,GAAK6V,EACJ,OAAOH,EAAY,EAAIG,EAAOvY,MAAO,GAGtCqY,EAAQ3V,EACR8J,EAAS,GACT8L,EAAalR,EAAKqL,UAElB,MAAQ4F,EAAQ,CA2Bf,IAAMjX,KAxBAgT,KAAa7H,EAAQ7C,EAAOkD,KAAMyL,MAClC9L,IAGJ8L,EAAQA,EAAMrY,MAAOuM,EAAO,GAAIxJ,SAAYsV,GAE7C7L,EAAOlM,KAAQ8V,EAAS,KAGzBhC,GAAU,GAGH7H,EAAQ5C,EAAaiD,KAAMyL,MACjCjE,EAAU7H,EAAMuB,QAChBsI,EAAO9V,KAAM,CACZsG,MAAOwN,EAGPhT,KAAMmL,EAAO,GAAI5G,QAAS8D,EAAO,OAElC4O,EAAQA,EAAMrY,MAAOoU,EAAQrR,SAIhBqE,EAAK2I,SACXxD,EAAQxC,EAAW3I,GAAOwL,KAAMyL,KAAgBC,EAAYlX,MAChEmL,EAAQ+L,EAAYlX,GAAQmL,MAC9B6H,EAAU7H,EAAMuB,QAChBsI,EAAO9V,KAAM,CACZsG,MAAOwN,EACPhT,KAAMA,EACNqF,QAAS8F,IAEV8L,EAAQA,EAAMrY,MAAOoU,EAAQrR,SAI/B,IAAMqR,EACL,MAOF,OAAOgE,EACNC,EAAMtV,OACNsV,EACClR,GAAOtB,MAAOnD,GAGd+F,EAAY/F,EAAU8J,GAASxM,MAAO,IA4ZzCwH,EAAUL,GAAOK,QAAU,SAAU9E,EAAU6J,GAC9C,IAAI3K,EA9H8B4W,EAAiBC,EAC/CC,EACHC,EACAC,EA4HAH,EAAc,GACdD,EAAkB,GAClBD,EAAS7P,EAAehG,EAAW,KAEpC,IAAM6V,EAAS,CAGRhM,IACLA,EAAQhF,EAAU7E,IAEnBd,EAAI2K,EAAMxJ,OACV,MAAQnB,KACP2W,EAASV,GAAmBtL,EAAO3K,KACtB4D,GACZiT,EAAYnY,KAAMiY,GAElBC,EAAgBlY,KAAMiY,IAKxBA,EAAS7P,EACRhG,GArJgC8V,EAsJNA,EArJxBE,EAA6B,GADkBD,EAsJNA,GArJrB1V,OACvB4V,EAAqC,EAAzBH,EAAgBzV,OAC5B6V,EAAe,SAAUxM,EAAMzJ,EAAS4Q,EAAKlN,EAASwS,GACrD,IAAI/U,EAAMU,EAAG8P,EACZwE,EAAe,EACflX,EAAI,IACJ2S,EAAYnI,GAAQ,GACpB2M,EAAa,GACbC,EAAgBtR,EAGhBnE,EAAQ6I,GAAQuM,GAAavR,EAAK6I,KAAY,IAAG,IAAK4I,GAGtDI,EAAkB5Q,GAA4B,MAAjB2Q,EAAwB,EAAIvT,KAAKC,UAAY,GAC1EnB,EAAMhB,EAAMR,OAcb,IAZK8V,IAMJnR,EAAmB/E,GAAWrD,GAAYqD,GAAWkW,GAM9CjX,IAAM2C,GAAgC,OAAvBT,EAAOP,EAAO3B,IAAeA,IAAM,CACzD,GAAK+W,GAAa7U,EAAO,CACxBU,EAAI,EAME7B,GAAWmB,EAAK6I,eAAiBrN,IACtCuI,EAAa/D,GACbyP,GAAOxL,GAER,MAAUuM,EAAUkE,EAAiBhU,KACpC,GAAK8P,EAASxQ,EAAMnB,GAAWrD,EAAUiU,GAAQ,CAChDlN,EAAQ/F,KAAMwD,GACd,MAGG+U,IACJxQ,EAAU4Q,GAKPP,KAGG5U,GAAQwQ,GAAWxQ,IACzBgV,IAII1M,GACJmI,EAAUjU,KAAMwD,IAgBnB,GATAgV,GAAgBlX,EASX8W,GAAS9W,IAAMkX,EAAe,CAClCtU,EAAI,EACJ,MAAU8P,EAAUmE,EAAajU,KAChC8P,EAASC,EAAWwE,EAAYpW,EAAS4Q,GAG1C,GAAKnH,EAAO,CAGX,GAAoB,EAAf0M,EACJ,MAAQlX,IACC2S,EAAW3S,IAAOmX,EAAYnX,KACrCmX,EAAYnX,GAAMmH,EAAI5I,KAAMkG,IAM/B0S,EAAajC,GAAUiC,GAIxBzY,EAAKD,MAAOgG,EAAS0S,GAGhBF,IAAczM,GAA4B,EAApB2M,EAAWhW,QACG,EAAtC+V,EAAeL,EAAY1V,QAE7BoE,GAAOwK,WAAYtL,GAUrB,OALKwS,IACJxQ,EAAU4Q,EACVvR,EAAmBsR,GAGbzE,GAGFmE,EACN3K,GAAc6K,GACdA,KAgCOlW,SAAWA,EAEnB,OAAO6V,GAYR9Q,EAASN,GAAOM,OAAS,SAAU/E,EAAUC,EAAS0D,EAAS+F,GAC9D,IAAIxK,EAAGwU,EAAQ8C,EAAO9X,EAAM6O,EAC3BkJ,EAA+B,mBAAbzW,GAA2BA,EAC7C6J,GAASH,GAAQ7E,EAAY7E,EAAWyW,EAASzW,UAAYA,GAM9D,GAJA2D,EAAUA,GAAW,GAIC,IAAjBkG,EAAMxJ,OAAe,CAIzB,GAAqB,GADrBqT,EAAS7J,EAAO,GAAMA,EAAO,GAAIvM,MAAO,IAC5B+C,QAA+C,QAA/BmW,EAAQ9C,EAAQ,IAAMhV,MAC5B,IAArBuB,EAAQ1B,UAAkB8G,GAAkBX,EAAKgL,SAAUgE,EAAQ,GAAIhV,MAAS,CAIhF,KAFAuB,GAAYyE,EAAK6I,KAAW,GAAGiJ,EAAMzS,QAAS,GAC5Cd,QAASmF,GAAWC,IAAapI,IAAa,IAAM,IAErD,OAAO0D,EAGI8S,IACXxW,EAAUA,EAAQN,YAGnBK,EAAWA,EAAS1C,MAAOoW,EAAOtI,QAAQlH,MAAM7D,QAIjDnB,EAAImI,EAA0B,aAAEmD,KAAMxK,GAAa,EAAI0T,EAAOrT,OAC9D,MAAQnB,IAAM,CAIb,GAHAsX,EAAQ9C,EAAQxU,GAGXwF,EAAKgL,SAAYhR,EAAO8X,EAAM9X,MAClC,MAED,IAAO6O,EAAO7I,EAAK6I,KAAM7O,MAGjBgL,EAAO6D,EACbiJ,EAAMzS,QAAS,GAAId,QAASmF,GAAWC,IACvCF,GAASqC,KAAMkJ,EAAQ,GAAIhV,OAAU+L,GAAaxK,EAAQN,aACzDM,IACI,CAKL,GAFAyT,EAAOzR,OAAQ/C,EAAG,KAClBc,EAAW0J,EAAKrJ,QAAUsK,GAAY+I,IAGrC,OADA9V,EAAKD,MAAOgG,EAAS+F,GACd/F,EAGR,QAeJ,OAPE8S,GAAY3R,EAAS9E,EAAU6J,IAChCH,EACAzJ,GACCoF,EACD1B,GACC1D,GAAWkI,GAASqC,KAAMxK,IAAcyK,GAAaxK,EAAQN,aAAgBM,GAExE0D,GAMRvF,EAAQgR,WAAatM,EAAQwB,MAAO,IAAKtC,KAAMkE,GAAY0E,KAAM,MAAS9H,EAI1E1E,EAAQ+Q,mBAAqBjK,EAG7BC,IAIA/G,EAAQmQ,aAAejD,GAAQ,SAAUC,GAGxC,OAA4E,EAArEA,EAAG4C,wBAAyBvR,EAASyC,cAAe,eAMtDiM,GAAQ,SAAUC,GAEvB,OADAA,EAAGqC,UAAY,mBACiC,MAAzCrC,EAAG+D,WAAW/P,aAAc,WAEnCiM,GAAW,yBAA0B,SAAUpK,EAAMgB,EAAMwC,GAC1D,IAAMA,EACL,OAAOxD,EAAK7B,aAAc6C,EAA6B,SAAvBA,EAAKoC,cAA2B,EAAI,KAOjEpG,EAAQuI,YAAe2E,GAAQ,SAAUC,GAG9C,OAFAA,EAAGqC,UAAY,WACfrC,EAAG+D,WAAW9P,aAAc,QAAS,IACY,KAA1C+L,EAAG+D,WAAW/P,aAAc,YAEnCiM,GAAW,QAAS,SAAUpK,EAAMsV,EAAO9R,GAC1C,IAAMA,GAAyC,UAAhCxD,EAAKgI,SAAS5E,cAC5B,OAAOpD,EAAKuV,eAOTrL,GAAQ,SAAUC,GACvB,OAAwC,MAAjCA,EAAGhM,aAAc,eAExBiM,GAAWhF,EAAU,SAAUpF,EAAMgB,EAAMwC,GAC1C,IAAIzF,EACJ,IAAMyF,EACL,OAAwB,IAAjBxD,EAAMgB,GAAkBA,EAAKoC,eACjCrF,EAAMiC,EAAKoM,iBAAkBpL,KAAYjD,EAAI4P,UAC9C5P,EAAI+E,MACJ,OAKEO,GA14EP,CA44EK1H,GAILgD,EAAOwN,KAAO9I,EACd1E,EAAO6O,KAAOnK,EAAO+K,UAGrBzP,EAAO6O,KAAM,KAAQ7O,EAAO6O,KAAKhI,QACjC7G,EAAOkP,WAAalP,EAAO6W,OAASnS,EAAOwK,WAC3ClP,EAAOT,KAAOmF,EAAOE,QACrB5E,EAAO8W,SAAWpS,EAAOG,MACzB7E,EAAOyF,SAAWf,EAAOe,SACzBzF,EAAO+W,eAAiBrS,EAAO6D,OAK/B,IAAIe,EAAM,SAAUjI,EAAMiI,EAAK0N,GAC9B,IAAIrF,EAAU,GACbsF,OAAqBnU,IAAVkU,EAEZ,OAAU3V,EAAOA,EAAMiI,KAA6B,IAAlBjI,EAAK7C,SACtC,GAAuB,IAAlB6C,EAAK7C,SAAiB,CAC1B,GAAKyY,GAAYjX,EAAQqB,GAAO6V,GAAIF,GACnC,MAEDrF,EAAQ9T,KAAMwD,GAGhB,OAAOsQ,GAIJwF,EAAW,SAAUC,EAAG/V,GAG3B,IAFA,IAAIsQ,EAAU,GAENyF,EAAGA,EAAIA,EAAEnL,YACI,IAAfmL,EAAE5Y,UAAkB4Y,IAAM/V,GAC9BsQ,EAAQ9T,KAAMuZ,GAIhB,OAAOzF,GAIJ0F,EAAgBrX,EAAO6O,KAAK/E,MAAMhC,aAItC,SAASuB,EAAUhI,EAAMgB,GAEvB,OAAOhB,EAAKgI,UAAYhI,EAAKgI,SAAS5E,gBAAkBpC,EAAKoC,cAG/D,IAAI6S,EAAa,kEAKjB,SAASC,EAAQzI,EAAU0I,EAAW5F,GACrC,OAAKtT,EAAYkZ,GACTxX,EAAO2B,KAAMmN,EAAU,SAAUzN,EAAMlC,GAC7C,QAASqY,EAAU9Z,KAAM2D,EAAMlC,EAAGkC,KAAWuQ,IAK1C4F,EAAUhZ,SACPwB,EAAO2B,KAAMmN,EAAU,SAAUzN,GACvC,OAASA,IAASmW,IAAgB5F,IAKV,iBAAd4F,EACJxX,EAAO2B,KAAMmN,EAAU,SAAUzN,GACvC,OAA4C,EAAnCvD,EAAQJ,KAAM8Z,EAAWnW,KAAkBuQ,IAK/C5R,EAAOsN,OAAQkK,EAAW1I,EAAU8C,GAG5C5R,EAAOsN,OAAS,SAAUuB,EAAM/N,EAAO8Q,GACtC,IAAIvQ,EAAOP,EAAO,GAMlB,OAJK8Q,IACJ/C,EAAO,QAAUA,EAAO,KAGH,IAAjB/N,EAAMR,QAAkC,IAAlBe,EAAK7C,SACxBwB,EAAOwN,KAAKM,gBAAiBzM,EAAMwN,GAAS,CAAExN,GAAS,GAGxDrB,EAAOwN,KAAKxJ,QAAS6K,EAAM7O,EAAO2B,KAAMb,EAAO,SAAUO,GAC/D,OAAyB,IAAlBA,EAAK7C,aAIdwB,EAAOG,GAAGgC,OAAQ,CACjBqL,KAAM,SAAUvN,GACf,IAAId,EAAG4B,EACNe,EAAM7E,KAAKqD,OACXmX,EAAOxa,KAER,GAAyB,iBAAbgD,EACX,OAAOhD,KAAK4D,UAAWb,EAAQC,GAAWqN,OAAQ,WACjD,IAAMnO,EAAI,EAAGA,EAAI2C,EAAK3C,IACrB,GAAKa,EAAOyF,SAAUgS,EAAMtY,GAAKlC,MAChC,OAAO,KAQX,IAFA8D,EAAM9D,KAAK4D,UAAW,IAEhB1B,EAAI,EAAGA,EAAI2C,EAAK3C,IACrBa,EAAOwN,KAAMvN,EAAUwX,EAAMtY,GAAK4B,GAGnC,OAAa,EAANe,EAAU9B,EAAOkP,WAAYnO,GAAQA,GAE7CuM,OAAQ,SAAUrN,GACjB,OAAOhD,KAAK4D,UAAW0W,EAAQta,KAAMgD,GAAY,IAAI,KAEtD2R,IAAK,SAAU3R,GACd,OAAOhD,KAAK4D,UAAW0W,EAAQta,KAAMgD,GAAY,IAAI,KAEtDiX,GAAI,SAAUjX,GACb,QAASsX,EACRta,KAIoB,iBAAbgD,GAAyBoX,EAAc5M,KAAMxK,GACnDD,EAAQC,GACRA,GAAY,IACb,GACCK,UASJ,IAAIoX,EAMHvP,EAAa,uCAENnI,EAAOG,GAAGC,KAAO,SAAUH,EAAUC,EAASkS,GACpD,IAAItI,EAAOzI,EAGX,IAAMpB,EACL,OAAOhD,KAQR,GAHAmV,EAAOA,GAAQsF,EAGU,iBAAbzX,EAAwB,CAanC,KAPC6J,EALsB,MAAlB7J,EAAU,IACsB,MAApCA,EAAUA,EAASK,OAAS,IACT,GAAnBL,EAASK,OAGD,CAAE,KAAML,EAAU,MAGlBkI,EAAWgC,KAAMlK,MAIV6J,EAAO,IAAQ5J,EA6CxB,OAAMA,GAAWA,EAAQM,QACtBN,GAAWkS,GAAO5E,KAAMvN,GAK1BhD,KAAKwD,YAAaP,GAAUsN,KAAMvN,GAhDzC,GAAK6J,EAAO,GAAM,CAYjB,GAXA5J,EAAUA,aAAmBF,EAASE,EAAS,GAAMA,EAIrDF,EAAOgB,MAAO/D,KAAM+C,EAAO2X,UAC1B7N,EAAO,GACP5J,GAAWA,EAAQ1B,SAAW0B,EAAQgK,eAAiBhK,EAAUrD,GACjE,IAIIya,EAAW7M,KAAMX,EAAO,KAAS9J,EAAO2C,cAAezC,GAC3D,IAAM4J,KAAS5J,EAGT5B,EAAYrB,KAAM6M,IACtB7M,KAAM6M,GAAS5J,EAAS4J,IAIxB7M,KAAK8R,KAAMjF,EAAO5J,EAAS4J,IAK9B,OAAO7M,KAYP,OARAoE,EAAOxE,EAASuN,eAAgBN,EAAO,OAKtC7M,KAAM,GAAMoE,EACZpE,KAAKqD,OAAS,GAERrD,KAcH,OAAKgD,EAASzB,UACpBvB,KAAM,GAAMgD,EACZhD,KAAKqD,OAAS,EACPrD,MAIIqB,EAAY2B,QACD6C,IAAfsP,EAAKwF,MACXxF,EAAKwF,MAAO3X,GAGZA,EAAUD,GAGLA,EAAO2D,UAAW1D,EAAUhD,QAIhCsD,UAAYP,EAAOG,GAGxBuX,EAAa1X,EAAQnD,GAGrB,IAAIgb,EAAe,iCAGlBC,EAAmB,CAClBC,UAAU,EACVC,UAAU,EACVzO,MAAM,EACN0O,MAAM,GAoFR,SAASC,EAASpM,EAAKxC,GACtB,OAAUwC,EAAMA,EAAKxC,KAA4B,IAAjBwC,EAAItN,UACpC,OAAOsN,EAnFR9L,EAAOG,GAAGgC,OAAQ,CACjB4P,IAAK,SAAUtP,GACd,IAAI0V,EAAUnY,EAAQyC,EAAQxF,MAC7Bmb,EAAID,EAAQ7X,OAEb,OAAOrD,KAAKqQ,OAAQ,WAEnB,IADA,IAAInO,EAAI,EACAA,EAAIiZ,EAAGjZ,IACd,GAAKa,EAAOyF,SAAUxI,KAAMkb,EAAShZ,IACpC,OAAO,KAMXkZ,QAAS,SAAU5I,EAAWvP,GAC7B,IAAI4L,EACH3M,EAAI,EACJiZ,EAAInb,KAAKqD,OACTqR,EAAU,GACVwG,EAA+B,iBAAd1I,GAA0BzP,EAAQyP,GAGpD,IAAM4H,EAAc5M,KAAMgF,GACzB,KAAQtQ,EAAIiZ,EAAGjZ,IACd,IAAM2M,EAAM7O,KAAMkC,GAAK2M,GAAOA,IAAQ5L,EAAS4L,EAAMA,EAAIlM,WAGxD,GAAKkM,EAAItN,SAAW,KAAQ2Z,GACH,EAAxBA,EAAQG,MAAOxM,GAGE,IAAjBA,EAAItN,UACHwB,EAAOwN,KAAKM,gBAAiBhC,EAAK2D,IAAgB,CAEnDkC,EAAQ9T,KAAMiO,GACd,MAMJ,OAAO7O,KAAK4D,UAA4B,EAAjB8Q,EAAQrR,OAAaN,EAAOkP,WAAYyC,GAAYA,IAI5E2G,MAAO,SAAUjX,GAGhB,OAAMA,EAKe,iBAATA,EACJvD,EAAQJ,KAAMsC,EAAQqB,GAAQpE,KAAM,IAIrCa,EAAQJ,KAAMT,KAGpBoE,EAAKb,OAASa,EAAM,GAAMA,GAZjBpE,KAAM,IAAOA,KAAM,GAAI2C,WAAe3C,KAAKsE,QAAQgX,UAAUjY,QAAU,GAgBlFkY,IAAK,SAAUvY,EAAUC,GACxB,OAAOjD,KAAK4D,UACXb,EAAOkP,WACNlP,EAAOgB,MAAO/D,KAAK0D,MAAOX,EAAQC,EAAUC,OAK/CuY,QAAS,SAAUxY,GAClB,OAAOhD,KAAKub,IAAiB,MAAZvY,EAChBhD,KAAKgE,WAAahE,KAAKgE,WAAWqM,OAAQrN,OAU7CD,EAAOkB,KAAM,CACZiQ,OAAQ,SAAU9P,GACjB,IAAI8P,EAAS9P,EAAKzB,WAClB,OAAOuR,GAA8B,KAApBA,EAAO3S,SAAkB2S,EAAS,MAEpDuH,QAAS,SAAUrX,GAClB,OAAOiI,EAAKjI,EAAM,eAEnBsX,aAAc,SAAUtX,EAAMmD,EAAIwS,GACjC,OAAO1N,EAAKjI,EAAM,aAAc2V,IAEjCzN,KAAM,SAAUlI,GACf,OAAO6W,EAAS7W,EAAM,gBAEvB4W,KAAM,SAAU5W,GACf,OAAO6W,EAAS7W,EAAM,oBAEvBuX,QAAS,SAAUvX,GAClB,OAAOiI,EAAKjI,EAAM,gBAEnBkX,QAAS,SAAUlX,GAClB,OAAOiI,EAAKjI,EAAM,oBAEnBwX,UAAW,SAAUxX,EAAMmD,EAAIwS,GAC9B,OAAO1N,EAAKjI,EAAM,cAAe2V,IAElC8B,UAAW,SAAUzX,EAAMmD,EAAIwS,GAC9B,OAAO1N,EAAKjI,EAAM,kBAAmB2V,IAEtCG,SAAU,SAAU9V,GACnB,OAAO8V,GAAY9V,EAAKzB,YAAc,IAAK2P,WAAYlO,IAExD0W,SAAU,SAAU1W,GACnB,OAAO8V,EAAU9V,EAAKkO,aAEvByI,SAAU,SAAU3W,GACnB,OAA6B,MAAxBA,EAAK0X,iBAKT3b,EAAUiE,EAAK0X,iBAER1X,EAAK0X,iBAMR1P,EAAUhI,EAAM,cACpBA,EAAOA,EAAK2X,SAAW3X,GAGjBrB,EAAOgB,MAAO,GAAIK,EAAKmI,eAE7B,SAAUnH,EAAMlC,GAClBH,EAAOG,GAAIkC,GAAS,SAAU2U,EAAO/W,GACpC,IAAI0R,EAAU3R,EAAOoB,IAAKnE,KAAMkD,EAAI6W,GAuBpC,MArB0B,UAArB3U,EAAK9E,OAAQ,KACjB0C,EAAW+W,GAGP/W,GAAgC,iBAAbA,IACvB0R,EAAU3R,EAAOsN,OAAQrN,EAAU0R,IAGjB,EAAd1U,KAAKqD,SAGHwX,EAAkBzV,IACvBrC,EAAOkP,WAAYyC,GAIfkG,EAAapN,KAAMpI,IACvBsP,EAAQsH,WAIHhc,KAAK4D,UAAW8Q,MAGzB,IAAIuH,EAAgB,oBAsOpB,SAASC,EAAUC,GAClB,OAAOA,EAER,SAASC,EAASC,GACjB,MAAMA,EAGP,SAASC,EAAYpV,EAAOqV,EAASC,EAAQC,GAC5C,IAAIC,EAEJ,IAGMxV,GAAS7F,EAAcqb,EAASxV,EAAMyV,SAC1CD,EAAOjc,KAAMyG,GAAQ0B,KAAM2T,GAAUK,KAAMJ,GAGhCtV,GAAS7F,EAAcqb,EAASxV,EAAM2V,MACjDH,EAAOjc,KAAMyG,EAAOqV,EAASC,GAQ7BD,EAAQ5b,WAAOkF,EAAW,CAAEqB,GAAQ5G,MAAOmc,IAM3C,MAAQvV,GAITsV,EAAO7b,WAAOkF,EAAW,CAAEqB,KAvO7BnE,EAAO+Z,UAAY,SAAU3X,GA9B7B,IAAwBA,EACnB4X,EAiCJ5X,EAA6B,iBAAZA,GAlCMA,EAmCPA,EAlCZ4X,EAAS,GACbha,EAAOkB,KAAMkB,EAAQ0H,MAAOoP,IAAmB,GAAI,SAAUe,EAAGC,GAC/DF,EAAQE,IAAS,IAEXF,GA+BNha,EAAOmC,OAAQ,GAAIC,GAEpB,IACC+X,EAGAC,EAGAC,EAGAC,EAGA9T,EAAO,GAGP+T,EAAQ,GAGRC,GAAe,EAGfC,EAAO,WAQN,IALAH,EAASA,GAAUlY,EAAQsY,KAI3BL,EAAQF,GAAS,EACTI,EAAMja,OAAQka,GAAe,EAAI,CACxCJ,EAASG,EAAMlP,QACf,QAAUmP,EAAchU,EAAKlG,QAGmC,IAA1DkG,EAAMgU,GAAc5c,MAAOwc,EAAQ,GAAKA,EAAQ,KACpDhY,EAAQuY,cAGRH,EAAchU,EAAKlG,OACnB8Z,GAAS,GAMNhY,EAAQgY,SACbA,GAAS,GAGVD,GAAS,EAGJG,IAIH9T,EADI4T,EACG,GAIA,KAMV3C,EAAO,CAGNe,IAAK,WA2BJ,OA1BKhS,IAGC4T,IAAWD,IACfK,EAAchU,EAAKlG,OAAS,EAC5Bia,EAAM1c,KAAMuc,IAGb,SAAW5B,EAAKhH,GACfxR,EAAOkB,KAAMsQ,EAAM,SAAUyI,EAAG/V,GAC1B5F,EAAY4F,GACV9B,EAAQyU,QAAWY,EAAK1F,IAAK7N,IAClCsC,EAAK3I,KAAMqG,GAEDA,GAAOA,EAAI5D,QAA4B,WAAlBR,EAAQoE,IAGxCsU,EAAKtU,KATR,CAYK5C,WAEA8Y,IAAWD,GACfM,KAGKxd,MAIR2d,OAAQ,WAYP,OAXA5a,EAAOkB,KAAMI,UAAW,SAAU2Y,EAAG/V,GACpC,IAAIoU,EACJ,OAA0D,GAAhDA,EAAQtY,EAAO6D,QAASK,EAAKsC,EAAM8R,IAC5C9R,EAAKtE,OAAQoW,EAAO,GAGfA,GAASkC,GACbA,MAIIvd,MAKR8U,IAAK,SAAU5R,GACd,OAAOA,GACwB,EAA9BH,EAAO6D,QAAS1D,EAAIqG,GACN,EAAdA,EAAKlG,QAIPwS,MAAO,WAIN,OAHKtM,IACJA,EAAO,IAEDvJ,MAMR4d,QAAS,WAGR,OAFAP,EAASC,EAAQ,GACjB/T,EAAO4T,EAAS,GACTnd,MAERmM,SAAU,WACT,OAAQ5C,GAMTsU,KAAM,WAKL,OAJAR,EAASC,EAAQ,GACXH,GAAWD,IAChB3T,EAAO4T,EAAS,IAEVnd,MAERqd,OAAQ,WACP,QAASA,GAIVS,SAAU,SAAU7a,EAASsR,GAS5B,OARM8I,IAEL9I,EAAO,CAAEtR,GADTsR,EAAOA,GAAQ,IACQjU,MAAQiU,EAAKjU,QAAUiU,GAC9C+I,EAAM1c,KAAM2T,GACN2I,GACLM,KAGKxd,MAIRwd,KAAM,WAEL,OADAhD,EAAKsD,SAAU9d,KAAMqE,WACdrE,MAIRod,MAAO,WACN,QAASA,IAIZ,OAAO5C,GA4CRzX,EAAOmC,OAAQ,CAEd6Y,SAAU,SAAUC,GACnB,IAAIC,EAAS,CAIX,CAAE,SAAU,WAAYlb,EAAO+Z,UAAW,UACzC/Z,EAAO+Z,UAAW,UAAY,GAC/B,CAAE,UAAW,OAAQ/Z,EAAO+Z,UAAW,eACtC/Z,EAAO+Z,UAAW,eAAiB,EAAG,YACvC,CAAE,SAAU,OAAQ/Z,EAAO+Z,UAAW,eACrC/Z,EAAO+Z,UAAW,eAAiB,EAAG,aAExCoB,EAAQ,UACRvB,EAAU,CACTuB,MAAO,WACN,OAAOA,GAERC,OAAQ,WAEP,OADAC,EAASxV,KAAMvE,WAAYuY,KAAMvY,WAC1BrE,MAERqe,QAAS,SAAUnb,GAClB,OAAOyZ,EAAQE,KAAM,KAAM3Z,IAI5Bob,KAAM,WACL,IAAIC,EAAMla,UAEV,OAAOtB,EAAOgb,SAAU,SAAUS,GACjCzb,EAAOkB,KAAMga,EAAQ,SAAU1W,EAAIkX,GAGlC,IAAIvb,EAAK7B,EAAYkd,EAAKE,EAAO,MAAWF,EAAKE,EAAO,IAKxDL,EAAUK,EAAO,IAAO,WACvB,IAAIC,EAAWxb,GAAMA,EAAGvC,MAAOX,KAAMqE,WAChCqa,GAAYrd,EAAYqd,EAAS/B,SACrC+B,EAAS/B,UACPgC,SAAUH,EAASI,QACnBhW,KAAM4V,EAASjC,SACfK,KAAM4B,EAAShC,QAEjBgC,EAAUC,EAAO,GAAM,QACtBze,KACAkD,EAAK,CAAEwb,GAAara,eAKxBka,EAAM,OACH5B,WAELE,KAAM,SAAUgC,EAAaC,EAAYC,GACxC,IAAIC,EAAW,EACf,SAASzC,EAAS0C,EAAOb,EAAU1P,EAASwQ,GAC3C,OAAO,WACN,IAAIC,EAAOnf,KACVuU,EAAOlQ,UACP+a,EAAa,WACZ,IAAIV,EAAU7B,EAKd,KAAKoC,EAAQD,GAAb,CAQA,IAJAN,EAAWhQ,EAAQ/N,MAAOwe,EAAM5K,MAId6J,EAASzB,UAC1B,MAAM,IAAI0C,UAAW,4BAOtBxC,EAAO6B,IAKgB,iBAAbA,GACY,mBAAbA,IACRA,EAAS7B,KAGLxb,EAAYwb,GAGXqC,EACJrC,EAAKpc,KACJie,EACAnC,EAASyC,EAAUZ,EAAUlC,EAAUgD,GACvC3C,EAASyC,EAAUZ,EAAUhC,EAAS8C,KAOvCF,IAEAnC,EAAKpc,KACJie,EACAnC,EAASyC,EAAUZ,EAAUlC,EAAUgD,GACvC3C,EAASyC,EAAUZ,EAAUhC,EAAS8C,GACtC3C,EAASyC,EAAUZ,EAAUlC,EAC5BkC,EAASkB,eASP5Q,IAAYwN,IAChBiD,OAAOtZ,EACP0O,EAAO,CAAEmK,KAKRQ,GAAWd,EAASmB,aAAeJ,EAAM5K,MAK7CiL,EAAUN,EACTE,EACA,WACC,IACCA,IACC,MAAQ5S,GAEJzJ,EAAOgb,SAAS0B,eACpB1c,EAAOgb,SAAS0B,cAAejT,EAC9BgT,EAAQE,YAMQV,GAAbC,EAAQ,IAIPvQ,IAAY0N,IAChB+C,OAAOtZ,EACP0O,EAAO,CAAE/H,IAGV4R,EAASuB,WAAYR,EAAM5K,MAS3B0K,EACJO,KAKKzc,EAAOgb,SAAS6B,eACpBJ,EAAQE,WAAa3c,EAAOgb,SAAS6B,gBAEtC7f,EAAO8f,WAAYL,KAKtB,OAAOzc,EAAOgb,SAAU,SAAUS,GAGjCP,EAAQ,GAAK,GAAI1C,IAChBgB,EACC,EACAiC,EACAnd,EAAY0d,GACXA,EACA7C,EACDsC,EAASc,aAKXrB,EAAQ,GAAK,GAAI1C,IAChBgB,EACC,EACAiC,EACAnd,EAAYwd,GACXA,EACA3C,IAKH+B,EAAQ,GAAK,GAAI1C,IAChBgB,EACC,EACAiC,EACAnd,EAAYyd,GACXA,EACA1C,MAGAO,WAKLA,QAAS,SAAUrb,GAClB,OAAc,MAAPA,EAAcyB,EAAOmC,OAAQ5D,EAAKqb,GAAYA,IAGvDyB,EAAW,GAkEZ,OA/DArb,EAAOkB,KAAMga,EAAQ,SAAU/b,EAAGuc,GACjC,IAAIlV,EAAOkV,EAAO,GACjBqB,EAAcrB,EAAO,GAKtB9B,EAAS8B,EAAO,IAAQlV,EAAKgS,IAGxBuE,GACJvW,EAAKgS,IACJ,WAIC2C,EAAQ4B,GAKT7B,EAAQ,EAAI/b,GAAK,GAAI0b,QAIrBK,EAAQ,EAAI/b,GAAK,GAAI0b,QAGrBK,EAAQ,GAAK,GAAIJ,KAGjBI,EAAQ,GAAK,GAAIJ,MAOnBtU,EAAKgS,IAAKkD,EAAO,GAAIjB,MAKrBY,EAAUK,EAAO,IAAQ,WAExB,OADAL,EAAUK,EAAO,GAAM,QAAUze,OAASoe,OAAWvY,EAAY7F,KAAMqE,WAChErE,MAMRoe,EAAUK,EAAO,GAAM,QAAWlV,EAAKuU,WAIxCnB,EAAQA,QAASyB,GAGZJ,GACJA,EAAKvd,KAAM2d,EAAUA,GAIfA,GAIR2B,KAAM,SAAUC,GACf,IAGCC,EAAY5b,UAAUhB,OAGtBnB,EAAI+d,EAGJC,EAAkBva,MAAOzD,GACzBie,EAAgB7f,EAAMG,KAAM4D,WAG5B+b,EAASrd,EAAOgb,WAGhBsC,EAAa,SAAUne,GACtB,OAAO,SAAUgF,GAChBgZ,EAAiBhe,GAAMlC,KACvBmgB,EAAeje,GAAyB,EAAnBmC,UAAUhB,OAAa/C,EAAMG,KAAM4D,WAAc6C,IAC5D+Y,GACTG,EAAOb,YAAaW,EAAiBC,KAMzC,GAAKF,GAAa,IACjB3D,EAAY0D,EAAaI,EAAOxX,KAAMyX,EAAYne,IAAMqa,QAAS6D,EAAO5D,QACtEyD,GAGsB,YAAnBG,EAAOlC,SACX7c,EAAY8e,EAAeje,IAAOie,EAAeje,GAAI2a,OAErD,OAAOuD,EAAOvD,OAKhB,MAAQ3a,IACPoa,EAAY6D,EAAeje,GAAKme,EAAYne,GAAKke,EAAO5D,QAGzD,OAAO4D,EAAOzD,aAOhB,IAAI2D,EAAc,yDAElBvd,EAAOgb,SAAS0B,cAAgB,SAAUtZ,EAAOoa,GAI3CxgB,EAAOygB,SAAWzgB,EAAOygB,QAAQC,MAAQta,GAASma,EAAY9S,KAAMrH,EAAMf,OAC9ErF,EAAOygB,QAAQC,KAAM,8BAAgCta,EAAMua,QAASva,EAAMoa,MAAOA,IAOnFxd,EAAO4d,eAAiB,SAAUxa,GACjCpG,EAAO8f,WAAY,WAClB,MAAM1Z,KAQR,IAAIya,EAAY7d,EAAOgb,WAkDvB,SAAS8C,IACRjhB,EAASkhB,oBAAqB,mBAAoBD,GAClD9gB,EAAO+gB,oBAAqB,OAAQD,GACpC9d,EAAO4X,QAnDR5X,EAAOG,GAAGyX,MAAQ,SAAUzX,GAY3B,OAVA0d,EACE/D,KAAM3Z,GAKNmb,SAAO,SAAUlY,GACjBpD,EAAO4d,eAAgBxa,KAGlBnG,MAGR+C,EAAOmC,OAAQ,CAGdgB,SAAS,EAIT6a,UAAW,EAGXpG,MAAO,SAAUqG,KAGF,IAATA,IAAkBje,EAAOge,UAAYhe,EAAOmD,WAKjDnD,EAAOmD,SAAU,KAGZ8a,GAAsC,IAAnBje,EAAOge,WAK/BH,EAAUrB,YAAa3f,EAAU,CAAEmD,OAIrCA,EAAO4X,MAAMkC,KAAO+D,EAAU/D,KAaD,aAAxBjd,EAASqhB,YACa,YAAxBrhB,EAASqhB,aAA6BrhB,EAAS8P,gBAAgBwR,SAGjEnhB,EAAO8f,WAAY9c,EAAO4X,QAK1B/a,EAASmQ,iBAAkB,mBAAoB8Q,GAG/C9gB,EAAOgQ,iBAAkB,OAAQ8Q,IAQlC,IAAIM,EAAS,SAAUtd,EAAOX,EAAIgL,EAAKhH,EAAOka,EAAWC,EAAUC,GAClE,IAAIpf,EAAI,EACP2C,EAAMhB,EAAMR,OACZke,EAAc,MAAPrT,EAGR,GAAuB,WAAlBrL,EAAQqL,GAEZ,IAAMhM,KADNkf,GAAY,EACDlT,EACViT,EAAQtd,EAAOX,EAAIhB,EAAGgM,EAAKhM,IAAK,EAAMmf,EAAUC,QAI3C,QAAezb,IAAVqB,IACXka,GAAY,EAEN/f,EAAY6F,KACjBoa,GAAM,GAGFC,IAGCD,GACJpe,EAAGzC,KAAMoD,EAAOqD,GAChBhE,EAAK,OAILqe,EAAOre,EACPA,EAAK,SAAUkB,EAAMod,EAAMta,GAC1B,OAAOqa,EAAK9gB,KAAMsC,EAAQqB,GAAQ8C,MAKhChE,GACJ,KAAQhB,EAAI2C,EAAK3C,IAChBgB,EACCW,EAAO3B,GAAKgM,EAAKoT,EACjBpa,EACAA,EAAMzG,KAAMoD,EAAO3B,GAAKA,EAAGgB,EAAIW,EAAO3B,GAAKgM,KAM/C,OAAKkT,EACGvd,EAIH0d,EACGre,EAAGzC,KAAMoD,GAGVgB,EAAM3B,EAAIW,EAAO,GAAKqK,GAAQmT,GAKlCI,EAAY,QACfC,EAAa,YAGd,SAASC,EAAYC,EAAMC,GAC1B,OAAOA,EAAOC,cAMf,SAASC,EAAWC,GACnB,OAAOA,EAAO/b,QAASwb,EAAW,OAAQxb,QAASyb,EAAYC,GAEhE,IAAIM,EAAa,SAAUC,GAQ1B,OAA0B,IAAnBA,EAAM3gB,UAAqC,IAAnB2gB,EAAM3gB,YAAsB2gB,EAAM3gB,UAMlE,SAAS4gB,IACRniB,KAAK8F,QAAU/C,EAAO+C,QAAUqc,EAAKC,MAGtCD,EAAKC,IAAM,EAEXD,EAAK7e,UAAY,CAEhB2K,MAAO,SAAUiU,GAGhB,IAAIhb,EAAQgb,EAAOliB,KAAK8F,SA4BxB,OAzBMoB,IACLA,EAAQ,GAKH+a,EAAYC,KAIXA,EAAM3gB,SACV2gB,EAAOliB,KAAK8F,SAAYoB,EAMxB9G,OAAOiiB,eAAgBH,EAAOliB,KAAK8F,QAAS,CAC3CoB,MAAOA,EACPob,cAAc,MAMXpb,GAERqb,IAAK,SAAUL,EAAOM,EAAMtb,GAC3B,IAAIub,EACHxU,EAAQjO,KAAKiO,MAAOiU,GAIrB,GAAqB,iBAATM,EACXvU,EAAO8T,EAAWS,IAAWtb,OAM7B,IAAMub,KAAQD,EACbvU,EAAO8T,EAAWU,IAAWD,EAAMC,GAGrC,OAAOxU,GAERvK,IAAK,SAAUwe,EAAOhU,GACrB,YAAerI,IAARqI,EACNlO,KAAKiO,MAAOiU,GAGZA,EAAOliB,KAAK8F,UAAaoc,EAAOliB,KAAK8F,SAAWic,EAAW7T,KAE7DiT,OAAQ,SAAUe,EAAOhU,EAAKhH,GAa7B,YAAarB,IAARqI,GACCA,GAAsB,iBAARA,QAAgCrI,IAAVqB,EAElClH,KAAK0D,IAAKwe,EAAOhU,IASzBlO,KAAKuiB,IAAKL,EAAOhU,EAAKhH,QAILrB,IAAVqB,EAAsBA,EAAQgH,IAEtCyP,OAAQ,SAAUuE,EAAOhU,GACxB,IAAIhM,EACH+L,EAAQiU,EAAOliB,KAAK8F,SAErB,QAAeD,IAAVoI,EAAL,CAIA,QAAapI,IAARqI,EAAoB,CAkBxBhM,GAXCgM,EAJIvI,MAAMC,QAASsI,GAIbA,EAAI/J,IAAK4d,IAEf7T,EAAM6T,EAAW7T,MAIJD,EACZ,CAAEC,GACAA,EAAIrB,MAAOoP,IAAmB,IAG1B5Y,OAER,MAAQnB,WACA+L,EAAOC,EAAKhM,UAKR2D,IAARqI,GAAqBnL,EAAOyD,cAAeyH,MAM1CiU,EAAM3gB,SACV2gB,EAAOliB,KAAK8F,cAAYD,SAEjBqc,EAAOliB,KAAK8F,YAItB4c,QAAS,SAAUR,GAClB,IAAIjU,EAAQiU,EAAOliB,KAAK8F,SACxB,YAAiBD,IAAVoI,IAAwBlL,EAAOyD,cAAeyH,KAGvD,IAAI0U,EAAW,IAAIR,EAEfS,EAAW,IAAIT,EAcfU,EAAS,gCACZC,EAAa,SA2Bd,SAASC,EAAU3e,EAAM8J,EAAKsU,GAC7B,IAAIpd,EA1Baod,EA8BjB,QAAc3c,IAAT2c,GAAwC,IAAlBpe,EAAK7C,SAI/B,GAHA6D,EAAO,QAAU8I,EAAIjI,QAAS6c,EAAY,OAAQtb,cAG7B,iBAFrBgb,EAAOpe,EAAK7B,aAAc6C,IAEM,CAC/B,IACCod,EAnCW,UADGA,EAoCEA,IA/BL,UAATA,IAIS,SAATA,EACG,KAIHA,KAAUA,EAAO,IACbA,EAGJK,EAAOrV,KAAMgV,GACVQ,KAAKC,MAAOT,GAGbA,GAeH,MAAQhW,IAGVoW,EAASL,IAAKne,EAAM8J,EAAKsU,QAEzBA,OAAO3c,EAGT,OAAO2c,EAGRzf,EAAOmC,OAAQ,CACdwd,QAAS,SAAUte,GAClB,OAAOwe,EAASF,QAASte,IAAUue,EAASD,QAASte,IAGtDoe,KAAM,SAAUpe,EAAMgB,EAAMod,GAC3B,OAAOI,EAASzB,OAAQ/c,EAAMgB,EAAMod,IAGrCU,WAAY,SAAU9e,EAAMgB,GAC3Bwd,EAASjF,OAAQvZ,EAAMgB,IAKxB+d,MAAO,SAAU/e,EAAMgB,EAAMod,GAC5B,OAAOG,EAASxB,OAAQ/c,EAAMgB,EAAMod,IAGrCY,YAAa,SAAUhf,EAAMgB,GAC5Bud,EAAShF,OAAQvZ,EAAMgB,MAIzBrC,EAAOG,GAAGgC,OAAQ,CACjBsd,KAAM,SAAUtU,EAAKhH,GACpB,IAAIhF,EAAGkD,EAAMod,EACZpe,EAAOpE,KAAM,GACbyO,EAAQrK,GAAQA,EAAKuF,WAGtB,QAAa9D,IAARqI,EAAoB,CACxB,GAAKlO,KAAKqD,SACTmf,EAAOI,EAASlf,IAAKU,GAEE,IAAlBA,EAAK7C,WAAmBohB,EAASjf,IAAKU,EAAM,iBAAmB,CACnElC,EAAIuM,EAAMpL,OACV,MAAQnB,IAIFuM,EAAOvM,IAEsB,KADjCkD,EAAOqJ,EAAOvM,GAAIkD,MACRvE,QAAS,WAClBuE,EAAO2c,EAAW3c,EAAK9E,MAAO,IAC9ByiB,EAAU3e,EAAMgB,EAAMod,EAAMpd,KAI/Bud,EAASJ,IAAKne,EAAM,gBAAgB,GAItC,OAAOoe,EAIR,MAAoB,iBAARtU,EACJlO,KAAKiE,KAAM,WACjB2e,EAASL,IAAKviB,KAAMkO,KAIfiT,EAAQnhB,KAAM,SAAUkH,GAC9B,IAAIsb,EAOJ,GAAKpe,QAAkByB,IAAVqB,EAKZ,YAAcrB,KADd2c,EAAOI,EAASlf,IAAKU,EAAM8J,IAEnBsU,OAMM3c,KADd2c,EAAOO,EAAU3e,EAAM8J,IAEfsU,OAIR,EAIDxiB,KAAKiE,KAAM,WAGV2e,EAASL,IAAKviB,KAAMkO,EAAKhH,MAExB,KAAMA,EAA0B,EAAnB7C,UAAUhB,OAAY,MAAM,IAG7C6f,WAAY,SAAUhV,GACrB,OAAOlO,KAAKiE,KAAM,WACjB2e,EAASjF,OAAQ3d,KAAMkO,QAM1BnL,EAAOmC,OAAQ,CACdoY,MAAO,SAAUlZ,EAAM1C,EAAM8gB,GAC5B,IAAIlF,EAEJ,GAAKlZ,EAYJ,OAXA1C,GAASA,GAAQ,MAAS,QAC1B4b,EAAQqF,EAASjf,IAAKU,EAAM1C,GAGvB8gB,KACElF,GAAS3X,MAAMC,QAAS4c,GAC7BlF,EAAQqF,EAASxB,OAAQ/c,EAAM1C,EAAMqB,EAAO2D,UAAW8b,IAEvDlF,EAAM1c,KAAM4hB,IAGPlF,GAAS,IAIlB+F,QAAS,SAAUjf,EAAM1C,GACxBA,EAAOA,GAAQ,KAEf,IAAI4b,EAAQva,EAAOua,MAAOlZ,EAAM1C,GAC/B4hB,EAAchG,EAAMja,OACpBH,EAAKoa,EAAMlP,QACXmV,EAAQxgB,EAAOygB,YAAapf,EAAM1C,GAMvB,eAAPwB,IACJA,EAAKoa,EAAMlP,QACXkV,KAGIpgB,IAIU,OAATxB,GACJ4b,EAAM3L,QAAS,qBAIT4R,EAAME,KACbvgB,EAAGzC,KAAM2D,EApBF,WACNrB,EAAOsgB,QAASjf,EAAM1C,IAmBF6hB,KAGhBD,GAAeC,GACpBA,EAAM1N,MAAM2H,QAKdgG,YAAa,SAAUpf,EAAM1C,GAC5B,IAAIwM,EAAMxM,EAAO,aACjB,OAAOihB,EAASjf,IAAKU,EAAM8J,IAASyU,EAASxB,OAAQ/c,EAAM8J,EAAK,CAC/D2H,MAAO9S,EAAO+Z,UAAW,eAAgBvB,IAAK,WAC7CoH,EAAShF,OAAQvZ,EAAM,CAAE1C,EAAO,QAASwM,WAM7CnL,EAAOG,GAAGgC,OAAQ,CACjBoY,MAAO,SAAU5b,EAAM8gB,GACtB,IAAIkB,EAAS,EAQb,MANqB,iBAAThiB,IACX8gB,EAAO9gB,EACPA,EAAO,KACPgiB,KAGIrf,UAAUhB,OAASqgB,EAChB3gB,EAAOua,MAAOtd,KAAM,GAAK0B,QAGjBmE,IAAT2c,EACNxiB,KACAA,KAAKiE,KAAM,WACV,IAAIqZ,EAAQva,EAAOua,MAAOtd,KAAM0B,EAAM8gB,GAGtCzf,EAAOygB,YAAaxjB,KAAM0B,GAEZ,OAATA,GAAgC,eAAf4b,EAAO,IAC5Bva,EAAOsgB,QAASrjB,KAAM0B,MAI1B2hB,QAAS,SAAU3hB,GAClB,OAAO1B,KAAKiE,KAAM,WACjBlB,EAAOsgB,QAASrjB,KAAM0B,MAGxBiiB,WAAY,SAAUjiB,GACrB,OAAO1B,KAAKsd,MAAO5b,GAAQ,KAAM,KAKlCib,QAAS,SAAUjb,EAAMJ,GACxB,IAAIoP,EACHkT,EAAQ,EACRC,EAAQ9gB,EAAOgb,WACflM,EAAW7R,KACXkC,EAAIlC,KAAKqD,OACTkZ,EAAU,aACCqH,GACTC,EAAMtE,YAAa1N,EAAU,CAAEA,KAIb,iBAATnQ,IACXJ,EAAMI,EACNA,OAAOmE,GAERnE,EAAOA,GAAQ,KAEf,MAAQQ,KACPwO,EAAMiS,EAASjf,IAAKmO,EAAU3P,GAAKR,EAAO,gBAC9BgP,EAAImF,QACf+N,IACAlT,EAAImF,MAAM0F,IAAKgB,IAIjB,OADAA,IACOsH,EAAMlH,QAASrb,MAGxB,IAAIwiB,GAAO,sCAA0CC,OAEjDC,GAAU,IAAIla,OAAQ,iBAAmBga,GAAO,cAAe,KAG/DG,GAAY,CAAE,MAAO,QAAS,SAAU,QAExCvU,GAAkB9P,EAAS8P,gBAI1BwU,GAAa,SAAU9f,GACzB,OAAOrB,EAAOyF,SAAUpE,EAAK6I,cAAe7I,IAE7C+f,GAAW,CAAEA,UAAU,GAOnBzU,GAAgB0U,cACpBF,GAAa,SAAU9f,GACtB,OAAOrB,EAAOyF,SAAUpE,EAAK6I,cAAe7I,IAC3CA,EAAKggB,YAAaD,MAAe/f,EAAK6I,gBAG1C,IAAIoX,GAAqB,SAAUjgB,EAAMmK,GAOvC,MAA8B,UAH9BnK,EAAOmK,GAAMnK,GAGDkgB,MAAMC,SACM,KAAvBngB,EAAKkgB,MAAMC,SAMXL,GAAY9f,IAEsB,SAAlCrB,EAAOyhB,IAAKpgB,EAAM,YAKrB,SAASqgB,GAAWrgB,EAAMqe,EAAMiC,EAAYC,GAC3C,IAAIC,EAAUC,EACbC,EAAgB,GAChBC,EAAeJ,EACd,WACC,OAAOA,EAAM9V,OAEd,WACC,OAAO9L,EAAOyhB,IAAKpgB,EAAMqe,EAAM,KAEjCuC,EAAUD,IACVE,EAAOP,GAAcA,EAAY,KAAS3hB,EAAOmiB,UAAWzC,GAAS,GAAK,MAG1E0C,EAAgB/gB,EAAK7C,WAClBwB,EAAOmiB,UAAWzC,IAAmB,OAATwC,IAAkBD,IAChDhB,GAAQ9W,KAAMnK,EAAOyhB,IAAKpgB,EAAMqe,IAElC,GAAK0C,GAAiBA,EAAe,KAAQF,EAAO,CAInDD,GAAoB,EAGpBC,EAAOA,GAAQE,EAAe,GAG9BA,GAAiBH,GAAW,EAE5B,MAAQF,IAIP/hB,EAAOuhB,MAAOlgB,EAAMqe,EAAM0C,EAAgBF,IACnC,EAAIJ,IAAY,GAAMA,EAAQE,IAAiBC,GAAW,MAAW,IAC3EF,EAAgB,GAEjBK,GAAgCN,EAIjCM,GAAgC,EAChCpiB,EAAOuhB,MAAOlgB,EAAMqe,EAAM0C,EAAgBF,GAG1CP,EAAaA,GAAc,GAgB5B,OAbKA,IACJS,GAAiBA,IAAkBH,GAAW,EAG9CJ,EAAWF,EAAY,GACtBS,GAAkBT,EAAY,GAAM,GAAMA,EAAY,IACrDA,EAAY,GACTC,IACJA,EAAMM,KAAOA,EACbN,EAAM1Q,MAAQkR,EACdR,EAAM5f,IAAM6f,IAGPA,EAIR,IAAIQ,GAAoB,GAyBxB,SAASC,GAAUxT,EAAUyT,GAO5B,IANA,IAAIf,EAASngB,EAxBcA,EACvBuT,EACH1V,EACAmK,EACAmY,EAqBAgB,EAAS,GACTlK,EAAQ,EACRhY,EAASwO,EAASxO,OAGXgY,EAAQhY,EAAQgY,KACvBjX,EAAOyN,EAAUwJ,IACNiJ,QAIXC,EAAUngB,EAAKkgB,MAAMC,QAChBe,GAKa,SAAZf,IACJgB,EAAQlK,GAAUsH,EAASjf,IAAKU,EAAM,YAAe,KAC/CmhB,EAAQlK,KACbjX,EAAKkgB,MAAMC,QAAU,KAGK,KAAvBngB,EAAKkgB,MAAMC,SAAkBF,GAAoBjgB,KACrDmhB,EAAQlK,IA7CVkJ,EAFAtiB,EADG0V,OAAAA,EACH1V,GAF0BmC,EAiDaA,GA/C5B6I,cACXb,EAAWhI,EAAKgI,UAChBmY,EAAUa,GAAmBhZ,MAM9BuL,EAAO1V,EAAIujB,KAAK9iB,YAAaT,EAAII,cAAe+J,IAChDmY,EAAUxhB,EAAOyhB,IAAK7M,EAAM,WAE5BA,EAAKhV,WAAWC,YAAa+U,GAEZ,SAAZ4M,IACJA,EAAU,SAEXa,GAAmBhZ,GAAamY,MAkCb,SAAZA,IACJgB,EAAQlK,GAAU,OAGlBsH,EAASJ,IAAKne,EAAM,UAAWmgB,KAMlC,IAAMlJ,EAAQ,EAAGA,EAAQhY,EAAQgY,IACR,MAAnBkK,EAAQlK,KACZxJ,EAAUwJ,GAAQiJ,MAAMC,QAAUgB,EAAQlK,IAI5C,OAAOxJ,EAGR9O,EAAOG,GAAGgC,OAAQ,CACjBogB,KAAM,WACL,OAAOD,GAAUrlB,MAAM,IAExBylB,KAAM,WACL,OAAOJ,GAAUrlB,OAElB0lB,OAAQ,SAAUxH,GACjB,MAAsB,kBAAVA,EACJA,EAAQle,KAAKslB,OAAStlB,KAAKylB,OAG5BzlB,KAAKiE,KAAM,WACZogB,GAAoBrkB,MACxB+C,EAAQ/C,MAAOslB,OAEfviB,EAAQ/C,MAAOylB,YAKnB,IAUEE,GACAhV,GAXEiV,GAAiB,wBAEjBC,GAAW,iCAEXC,GAAc,qCAMhBH,GADc/lB,EAASmmB,yBACRrjB,YAAa9C,EAASyC,cAAe,SACpDsO,GAAQ/Q,EAASyC,cAAe,UAM3BG,aAAc,OAAQ,SAC5BmO,GAAMnO,aAAc,UAAW,WAC/BmO,GAAMnO,aAAc,OAAQ,KAE5BmjB,GAAIjjB,YAAaiO,IAIjBvP,EAAQ4kB,WAAaL,GAAIM,WAAW,GAAOA,WAAW,GAAO7R,UAAUsB,QAIvEiQ,GAAI/U,UAAY,yBAChBxP,EAAQ8kB,iBAAmBP,GAAIM,WAAW,GAAO7R,UAAUuF,aAK3DgM,GAAI/U,UAAY,oBAChBxP,EAAQ+kB,SAAWR,GAAIvR,UAKxB,IAAIgS,GAAU,CAKbC,MAAO,CAAE,EAAG,UAAW,YACvBC,IAAK,CAAE,EAAG,oBAAqB,uBAC/BC,GAAI,CAAE,EAAG,iBAAkB,oBAC3BC,GAAI,CAAE,EAAG,qBAAsB,yBAE/BC,SAAU,CAAE,EAAG,GAAI,KAYpB,SAASC,GAAQzjB,EAASwN,GAIzB,IAAI3M,EAYJ,OATCA,EAD4C,oBAAjCb,EAAQoK,qBACbpK,EAAQoK,qBAAsBoD,GAAO,KAEI,oBAA7BxN,EAAQ4K,iBACpB5K,EAAQ4K,iBAAkB4C,GAAO,KAGjC,QAGM5K,IAAR4K,GAAqBA,GAAOrE,EAAUnJ,EAASwN,GAC5C1N,EAAOgB,MAAO,CAAEd,GAAWa,GAG5BA,EAKR,SAAS6iB,GAAe9iB,EAAO+iB,GAI9B,IAHA,IAAI1kB,EAAI,EACPiZ,EAAItX,EAAMR,OAEHnB,EAAIiZ,EAAGjZ,IACdygB,EAASJ,IACR1e,EAAO3B,GACP,cACC0kB,GAAejE,EAASjf,IAAKkjB,EAAa1kB,GAAK,eA1CnDkkB,GAAQS,MAAQT,GAAQU,MAAQV,GAAQW,SAAWX,GAAQY,QAAUZ,GAAQC,MAC7ED,GAAQa,GAAKb,GAAQI,GAGfplB,EAAQ+kB,SACbC,GAAQc,SAAWd,GAAQD,OAAS,CAAE,EAAG,+BAAgC,cA2C1E,IAAIrb,GAAQ,YAEZ,SAASqc,GAAetjB,EAAOZ,EAASmkB,EAASC,EAAWC,GAO3D,IANA,IAAIljB,EAAMsM,EAAKD,EAAK8W,EAAMC,EAAU1iB,EACnC2iB,EAAWxkB,EAAQ8iB,yBACnB2B,EAAQ,GACRxlB,EAAI,EACJiZ,EAAItX,EAAMR,OAEHnB,EAAIiZ,EAAGjZ,IAGd,IAFAkC,EAAOP,EAAO3B,KAEQ,IAATkC,EAGZ,GAAwB,WAAnBvB,EAAQuB,GAIZrB,EAAOgB,MAAO2jB,EAAOtjB,EAAK7C,SAAW,CAAE6C,GAASA,QAG1C,GAAM0G,GAAM0C,KAAMpJ,GAIlB,CACNsM,EAAMA,GAAO+W,EAAS/kB,YAAaO,EAAQZ,cAAe,QAG1DoO,GAAQoV,GAAS3Y,KAAM9I,IAAU,CAAE,GAAI,KAAQ,GAAIoD,cACnD+f,EAAOnB,GAAS3V,IAAS2V,GAAQK,SACjC/V,EAAIE,UAAY2W,EAAM,GAAMxkB,EAAO4kB,cAAevjB,GAASmjB,EAAM,GAGjEziB,EAAIyiB,EAAM,GACV,MAAQziB,IACP4L,EAAMA,EAAI0D,UAKXrR,EAAOgB,MAAO2jB,EAAOhX,EAAInE,aAGzBmE,EAAM+W,EAASnV,YAGXD,YAAc,QAzBlBqV,EAAM9mB,KAAMqC,EAAQ2kB,eAAgBxjB,IA+BvCqjB,EAASpV,YAAc,GAEvBnQ,EAAI,EACJ,MAAUkC,EAAOsjB,EAAOxlB,KAGvB,GAAKmlB,IAAkD,EAArCtkB,EAAO6D,QAASxC,EAAMijB,GAClCC,GACJA,EAAQ1mB,KAAMwD,QAgBhB,GAXAojB,EAAWtD,GAAY9f,GAGvBsM,EAAMgW,GAAQe,EAAS/kB,YAAa0B,GAAQ,UAGvCojB,GACJb,GAAejW,GAIX0W,EAAU,CACdtiB,EAAI,EACJ,MAAUV,EAAOsM,EAAK5L,KAChBghB,GAAYtY,KAAMpJ,EAAK1C,MAAQ,KACnC0lB,EAAQxmB,KAAMwD,GAMlB,OAAOqjB,EAIR,IACCI,GAAY,OACZC,GAAc,iDACdC,GAAiB,sBAElB,SAASC,KACR,OAAO,EAGR,SAASC,KACR,OAAO,EASR,SAASC,GAAY9jB,EAAM1C,GAC1B,OAAS0C,IAMV,WACC,IACC,OAAOxE,EAASyV,cACf,MAAQ8S,KATQC,KAAqC,UAAT1mB,GAY/C,SAAS2mB,GAAIjkB,EAAMkkB,EAAOtlB,EAAUwf,EAAMtf,EAAIqlB,GAC7C,IAAIC,EAAQ9mB,EAGZ,GAAsB,iBAAV4mB,EAAqB,CAShC,IAAM5mB,IANmB,iBAAbsB,IAGXwf,EAAOA,GAAQxf,EACfA,OAAW6C,GAEEyiB,EACbD,GAAIjkB,EAAM1C,EAAMsB,EAAUwf,EAAM8F,EAAO5mB,GAAQ6mB,GAEhD,OAAOnkB,EAsBR,GAnBa,MAARoe,GAAsB,MAANtf,GAGpBA,EAAKF,EACLwf,EAAOxf,OAAW6C,GACD,MAAN3C,IACc,iBAAbF,GAGXE,EAAKsf,EACLA,OAAO3c,IAIP3C,EAAKsf,EACLA,EAAOxf,EACPA,OAAW6C,KAGD,IAAP3C,EACJA,EAAK+kB,QACC,IAAM/kB,EACZ,OAAOkB,EAeR,OAZa,IAARmkB,IACJC,EAAStlB,GACTA,EAAK,SAAUulB,GAId,OADA1lB,IAAS2lB,IAAKD,GACPD,EAAO7nB,MAAOX,KAAMqE,aAIzB8C,KAAOqhB,EAAOrhB,OAAUqhB,EAAOrhB,KAAOpE,EAAOoE,SAE1C/C,EAAKH,KAAM,WACjBlB,EAAO0lB,MAAMlN,IAAKvb,KAAMsoB,EAAOplB,EAAIsf,EAAMxf,KA+a3C,SAAS2lB,GAAgBpa,EAAI7M,EAAMwmB,GAG5BA,GAQNvF,EAASJ,IAAKhU,EAAI7M,GAAM,GACxBqB,EAAO0lB,MAAMlN,IAAKhN,EAAI7M,EAAM,CAC3B8N,WAAW,EACXd,QAAS,SAAU+Z,GAClB,IAAIG,EAAUtV,EACbuV,EAAQlG,EAASjf,IAAK1D,KAAM0B,GAE7B,GAAyB,EAAlB+mB,EAAMK,WAAmB9oB,KAAM0B,IAKrC,GAAMmnB,EAAMxlB,QAiCEN,EAAO0lB,MAAMvJ,QAASxd,IAAU,IAAKqnB,cAClDN,EAAMO,uBAfN,GAdAH,EAAQvoB,EAAMG,KAAM4D,WACpBse,EAASJ,IAAKviB,KAAM0B,EAAMmnB,GAK1BD,EAAWV,EAAYloB,KAAM0B,GAC7B1B,KAAM0B,KAEDmnB,KADLvV,EAASqP,EAASjf,IAAK1D,KAAM0B,KACJknB,EACxBjG,EAASJ,IAAKviB,KAAM0B,GAAM,GAE1B4R,EAAS,GAELuV,IAAUvV,EAKd,OAFAmV,EAAMQ,2BACNR,EAAMS,iBACC5V,EAAOpM,WAeL2hB,EAAMxlB,SAGjBsf,EAASJ,IAAKviB,KAAM0B,EAAM,CACzBwF,MAAOnE,EAAO0lB,MAAMU,QAInBpmB,EAAOmC,OAAQ2jB,EAAO,GAAK9lB,EAAOqmB,MAAM9lB,WACxCulB,EAAMvoB,MAAO,GACbN,QAKFyoB,EAAMQ,qCAzE0BpjB,IAA7B8c,EAASjf,IAAK6K,EAAI7M,IACtBqB,EAAO0lB,MAAMlN,IAAKhN,EAAI7M,EAAMsmB,IA5a/BjlB,EAAO0lB,MAAQ,CAEdjpB,OAAQ,GAER+b,IAAK,SAAUnX,EAAMkkB,EAAO5Z,EAAS8T,EAAMxf,GAE1C,IAAIqmB,EAAaC,EAAa5Y,EAC7B6Y,EAAQC,EAAGC,EACXvK,EAASwK,EAAUhoB,EAAMioB,EAAYC,EACrCC,EAAWlH,EAASjf,IAAKU,GAG1B,GAAM6d,EAAY7d,GAAlB,CAKKsK,EAAQA,UAEZA,GADA2a,EAAc3a,GACQA,QACtB1L,EAAWqmB,EAAYrmB,UAKnBA,GACJD,EAAOwN,KAAKM,gBAAiBnB,GAAiB1M,GAIzC0L,EAAQvH,OACbuH,EAAQvH,KAAOpE,EAAOoE,SAIfoiB,EAASM,EAASN,UACzBA,EAASM,EAASN,OAASnpB,OAAO0pB,OAAQ,QAEnCR,EAAcO,EAASE,UAC9BT,EAAcO,EAASE,OAAS,SAAUvd,GAIzC,MAAyB,oBAAXzJ,GAA0BA,EAAO0lB,MAAMuB,YAAcxd,EAAE9K,KACpEqB,EAAO0lB,MAAMwB,SAAStpB,MAAOyD,EAAMC,gBAAcwB,IAMpD2jB,GADAlB,GAAUA,GAAS,IAAKzb,MAAOoP,IAAmB,CAAE,KAC1C5Y,OACV,MAAQmmB,IAEP9nB,EAAOkoB,GADPlZ,EAAMqX,GAAe7a,KAAMob,EAAOkB,KAAS,IACpB,GACvBG,GAAejZ,EAAK,IAAO,IAAKpJ,MAAO,KAAMtC,OAGvCtD,IAKNwd,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GAG1CA,GAASsB,EAAWkc,EAAQ6J,aAAe7J,EAAQgL,WAAcxoB,EAGjEwd,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GAG1C+nB,EAAY1mB,EAAOmC,OAAQ,CAC1BxD,KAAMA,EACNkoB,SAAUA,EACVpH,KAAMA,EACN9T,QAASA,EACTvH,KAAMuH,EAAQvH,KACdnE,SAAUA,EACV6H,aAAc7H,GAAYD,EAAO6O,KAAK/E,MAAMhC,aAAa2C,KAAMxK,GAC/DwM,UAAWma,EAAW/b,KAAM,MAC1Byb,IAGKK,EAAWH,EAAQ7nB,OAC1BgoB,EAAWH,EAAQ7nB,GAAS,IACnByoB,cAAgB,EAGnBjL,EAAQkL,QACiD,IAA9DlL,EAAQkL,MAAM3pB,KAAM2D,EAAMoe,EAAMmH,EAAYL,IAEvCllB,EAAK2L,kBACT3L,EAAK2L,iBAAkBrO,EAAM4nB,IAK3BpK,EAAQ3D,MACZ2D,EAAQ3D,IAAI9a,KAAM2D,EAAMqlB,GAElBA,EAAU/a,QAAQvH,OACvBsiB,EAAU/a,QAAQvH,KAAOuH,EAAQvH,OAK9BnE,EACJ0mB,EAASzkB,OAAQykB,EAASS,gBAAiB,EAAGV,GAE9CC,EAAS9oB,KAAM6oB,GAIhB1mB,EAAO0lB,MAAMjpB,OAAQkC,IAAS,KAMhCic,OAAQ,SAAUvZ,EAAMkkB,EAAO5Z,EAAS1L,EAAUqnB,GAEjD,IAAIvlB,EAAGwlB,EAAW5Z,EACjB6Y,EAAQC,EAAGC,EACXvK,EAASwK,EAAUhoB,EAAMioB,EAAYC,EACrCC,EAAWlH,EAASD,QAASte,IAAUue,EAASjf,IAAKU,GAEtD,GAAMylB,IAAeN,EAASM,EAASN,QAAvC,CAMAC,GADAlB,GAAUA,GAAS,IAAKzb,MAAOoP,IAAmB,CAAE,KAC1C5Y,OACV,MAAQmmB,IAMP,GAJA9nB,EAAOkoB,GADPlZ,EAAMqX,GAAe7a,KAAMob,EAAOkB,KAAS,IACpB,GACvBG,GAAejZ,EAAK,IAAO,IAAKpJ,MAAO,KAAMtC,OAGvCtD,EAAN,CAOAwd,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GAE1CgoB,EAAWH,EADX7nB,GAASsB,EAAWkc,EAAQ6J,aAAe7J,EAAQgL,WAAcxoB,IACpC,GAC7BgP,EAAMA,EAAK,IACV,IAAI5G,OAAQ,UAAY6f,EAAW/b,KAAM,iBAAoB,WAG9D0c,EAAYxlB,EAAI4kB,EAASrmB,OACzB,MAAQyB,IACP2kB,EAAYC,EAAU5kB,IAEfulB,GAAeT,IAAaH,EAAUG,UACzClb,GAAWA,EAAQvH,OAASsiB,EAAUtiB,MACtCuJ,IAAOA,EAAIlD,KAAMic,EAAUja,YAC3BxM,GAAYA,IAAaymB,EAAUzmB,WACxB,OAAbA,IAAqBymB,EAAUzmB,YAChC0mB,EAASzkB,OAAQH,EAAG,GAEf2kB,EAAUzmB,UACd0mB,EAASS,gBAELjL,EAAQvB,QACZuB,EAAQvB,OAAOld,KAAM2D,EAAMqlB,IAOzBa,IAAcZ,EAASrmB,SACrB6b,EAAQqL,WACkD,IAA/DrL,EAAQqL,SAAS9pB,KAAM2D,EAAMulB,EAAYE,EAASE,SAElDhnB,EAAOynB,YAAapmB,EAAM1C,EAAMmoB,EAASE,eAGnCR,EAAQ7nB,SA1Cf,IAAMA,KAAQ6nB,EACbxmB,EAAO0lB,MAAM9K,OAAQvZ,EAAM1C,EAAO4mB,EAAOkB,GAAK9a,EAAS1L,GAAU,GA8C/DD,EAAOyD,cAAe+iB,IAC1B5G,EAAShF,OAAQvZ,EAAM,mBAIzB6lB,SAAU,SAAUQ,GAEnB,IAAIvoB,EAAG4C,EAAGhB,EAAK4Q,EAAS+U,EAAWiB,EAClCnW,EAAO,IAAI5O,MAAOtB,UAAUhB,QAG5BolB,EAAQ1lB,EAAO0lB,MAAMkC,IAAKF,GAE1Bf,GACE/G,EAASjf,IAAK1D,KAAM,WAAcI,OAAO0pB,OAAQ,OAC/CrB,EAAM/mB,OAAU,GACpBwd,EAAUnc,EAAO0lB,MAAMvJ,QAASuJ,EAAM/mB,OAAU,GAKjD,IAFA6S,EAAM,GAAMkU,EAENvmB,EAAI,EAAGA,EAAImC,UAAUhB,OAAQnB,IAClCqS,EAAMrS,GAAMmC,UAAWnC,GAMxB,GAHAumB,EAAMmC,eAAiB5qB,MAGlBkf,EAAQ2L,cAA2D,IAA5C3L,EAAQ2L,YAAYpqB,KAAMT,KAAMyoB,GAA5D,CAKAiC,EAAe3nB,EAAO0lB,MAAMiB,SAASjpB,KAAMT,KAAMyoB,EAAOiB,GAGxDxnB,EAAI,EACJ,OAAUwS,EAAUgW,EAAcxoB,QAAYumB,EAAMqC,uBAAyB,CAC5ErC,EAAMsC,cAAgBrW,EAAQtQ,KAE9BU,EAAI,EACJ,OAAU2kB,EAAY/U,EAAQgV,SAAU5kB,QACtC2jB,EAAMuC,gCAIDvC,EAAMwC,aAAsC,IAAxBxB,EAAUja,YACnCiZ,EAAMwC,WAAWzd,KAAMic,EAAUja,aAEjCiZ,EAAMgB,UAAYA,EAClBhB,EAAMjG,KAAOiH,EAAUjH,UAKV3c,KAHb/B,IAAUf,EAAO0lB,MAAMvJ,QAASuK,EAAUG,WAAc,IAAKG,QAC5DN,EAAU/a,SAAU/N,MAAO+T,EAAQtQ,KAAMmQ,MAGT,KAAzBkU,EAAMnV,OAASxP,KACrB2kB,EAAMS,iBACNT,EAAMO,oBAYX,OAJK9J,EAAQgM,cACZhM,EAAQgM,aAAazqB,KAAMT,KAAMyoB,GAG3BA,EAAMnV,SAGdoW,SAAU,SAAUjB,EAAOiB,GAC1B,IAAIxnB,EAAGunB,EAAWzX,EAAKmZ,EAAiBC,EACvCV,EAAe,GACfP,EAAgBT,EAASS,cACzBtb,EAAM4Z,EAAMjjB,OAGb,GAAK2kB,GAIJtb,EAAItN,YAOc,UAAfknB,EAAM/mB,MAAoC,GAAhB+mB,EAAM1S,QAEnC,KAAQlH,IAAQ7O,KAAM6O,EAAMA,EAAIlM,YAAc3C,KAI7C,GAAsB,IAAjB6O,EAAItN,WAAoC,UAAfknB,EAAM/mB,OAAqC,IAAjBmN,EAAI1C,UAAsB,CAGjF,IAFAgf,EAAkB,GAClBC,EAAmB,GACblpB,EAAI,EAAGA,EAAIioB,EAAejoB,SAME2D,IAA5BulB,EAFLpZ,GAHAyX,EAAYC,EAAUxnB,IAGNc,SAAW,OAG1BooB,EAAkBpZ,GAAQyX,EAAU5e,cACC,EAApC9H,EAAQiP,EAAKhS,MAAOqb,MAAOxM,GAC3B9L,EAAOwN,KAAMyB,EAAKhS,KAAM,KAAM,CAAE6O,IAAQxL,QAErC+nB,EAAkBpZ,IACtBmZ,EAAgBvqB,KAAM6oB,GAGnB0B,EAAgB9nB,QACpBqnB,EAAa9pB,KAAM,CAAEwD,KAAMyK,EAAK6a,SAAUyB,IAY9C,OALAtc,EAAM7O,KACDmqB,EAAgBT,EAASrmB,QAC7BqnB,EAAa9pB,KAAM,CAAEwD,KAAMyK,EAAK6a,SAAUA,EAASppB,MAAO6pB,KAGpDO,GAGRW,QAAS,SAAUjmB,EAAMkmB,GACxBlrB,OAAOiiB,eAAgBtf,EAAOqmB,MAAM9lB,UAAW8B,EAAM,CACpDmmB,YAAY,EACZjJ,cAAc,EAEd5e,IAAKrC,EAAYiqB,GAChB,WACC,GAAKtrB,KAAKwrB,cACR,OAAOF,EAAMtrB,KAAKwrB,gBAGrB,WACC,GAAKxrB,KAAKwrB,cACR,OAAOxrB,KAAKwrB,cAAepmB,IAI/Bmd,IAAK,SAAUrb,GACd9G,OAAOiiB,eAAgBriB,KAAMoF,EAAM,CAClCmmB,YAAY,EACZjJ,cAAc,EACdmJ,UAAU,EACVvkB,MAAOA,QAMXyjB,IAAK,SAAUa,GACd,OAAOA,EAAezoB,EAAO+C,SAC5B0lB,EACA,IAAIzoB,EAAOqmB,MAAOoC,IAGpBtM,QAAS,CACRwM,KAAM,CAGLC,UAAU,GAEXC,MAAO,CAGNxB,MAAO,SAAU5H,GAIhB,IAAIjU,EAAKvO,MAAQwiB,EAWjB,OARKoD,GAAepY,KAAMe,EAAG7M,OAC5B6M,EAAGqd,OAASxf,EAAUmC,EAAI,UAG1Boa,GAAgBpa,EAAI,QAASyZ,KAIvB,GAERmB,QAAS,SAAU3G,GAIlB,IAAIjU,EAAKvO,MAAQwiB,EAUjB,OAPKoD,GAAepY,KAAMe,EAAG7M,OAC5B6M,EAAGqd,OAASxf,EAAUmC,EAAI,UAE1Boa,GAAgBpa,EAAI,UAId,GAKRkY,SAAU,SAAUgC,GACnB,IAAIjjB,EAASijB,EAAMjjB,OACnB,OAAOogB,GAAepY,KAAMhI,EAAO9D,OAClC8D,EAAOomB,OAASxf,EAAU5G,EAAQ,UAClCmd,EAASjf,IAAK8B,EAAQ,UACtB4G,EAAU5G,EAAQ,OAIrBqmB,aAAc,CACbX,aAAc,SAAUzC,QAID5iB,IAAjB4iB,EAAMnV,QAAwBmV,EAAM+C,gBACxC/C,EAAM+C,cAAcM,YAAcrD,EAAMnV,YA8F7CvQ,EAAOynB,YAAc,SAAUpmB,EAAM1C,EAAMqoB,GAGrC3lB,EAAK0c,qBACT1c,EAAK0c,oBAAqBpf,EAAMqoB,IAIlChnB,EAAOqmB,MAAQ,SAAUznB,EAAKoqB,GAG7B,KAAQ/rB,gBAAgB+C,EAAOqmB,OAC9B,OAAO,IAAIrmB,EAAOqmB,MAAOznB,EAAKoqB,GAI1BpqB,GAAOA,EAAID,MACf1B,KAAKwrB,cAAgB7pB,EACrB3B,KAAK0B,KAAOC,EAAID,KAIhB1B,KAAKgsB,mBAAqBrqB,EAAIsqB,uBACHpmB,IAAzBlE,EAAIsqB,mBAGgB,IAApBtqB,EAAImqB,YACL9D,GACAC,GAKDjoB,KAAKwF,OAAW7D,EAAI6D,QAAkC,IAAxB7D,EAAI6D,OAAOjE,SACxCI,EAAI6D,OAAO7C,WACXhB,EAAI6D,OAELxF,KAAK+qB,cAAgBppB,EAAIopB,cACzB/qB,KAAKksB,cAAgBvqB,EAAIuqB,eAIzBlsB,KAAK0B,KAAOC,EAIRoqB,GACJhpB,EAAOmC,OAAQlF,KAAM+rB,GAItB/rB,KAAKmsB,UAAYxqB,GAAOA,EAAIwqB,WAAa1jB,KAAK2jB,MAG9CpsB,KAAM+C,EAAO+C,UAAY,GAK1B/C,EAAOqmB,MAAM9lB,UAAY,CACxBE,YAAaT,EAAOqmB,MACpB4C,mBAAoB/D,GACpB6C,qBAAsB7C,GACtB+C,8BAA+B/C,GAC/BoE,aAAa,EAEbnD,eAAgB,WACf,IAAI1c,EAAIxM,KAAKwrB,cAEbxrB,KAAKgsB,mBAAqBhE,GAErBxb,IAAMxM,KAAKqsB,aACf7f,EAAE0c,kBAGJF,gBAAiB,WAChB,IAAIxc,EAAIxM,KAAKwrB,cAEbxrB,KAAK8qB,qBAAuB9C,GAEvBxb,IAAMxM,KAAKqsB,aACf7f,EAAEwc,mBAGJC,yBAA0B,WACzB,IAAIzc,EAAIxM,KAAKwrB,cAEbxrB,KAAKgrB,8BAAgChD,GAEhCxb,IAAMxM,KAAKqsB,aACf7f,EAAEyc,2BAGHjpB,KAAKgpB,oBAKPjmB,EAAOkB,KAAM,CACZqoB,QAAQ,EACRC,SAAS,EACTC,YAAY,EACZC,gBAAgB,EAChBC,SAAS,EACTC,QAAQ,EACRC,YAAY,EACZC,SAAS,EACTC,OAAO,EACPC,OAAO,EACPC,UAAU,EACVC,MAAM,EACNC,QAAQ,EACRnrB,MAAM,EACNorB,UAAU,EACVjf,KAAK,EACLkf,SAAS,EACTrX,QAAQ,EACRsX,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,SAAS,EACTC,WAAW,EACXC,aAAa,EACbC,SAAS,EACTC,SAAS,EACTC,eAAe,EACfC,WAAW,EACXC,SAAS,EAETC,MAAO,SAAUxF,GAChB,IAAI1S,EAAS0S,EAAM1S,OAGnB,OAAoB,MAAf0S,EAAMwF,OAAiBpG,GAAUra,KAAMib,EAAM/mB,MACxB,MAAlB+mB,EAAM0E,SAAmB1E,EAAM0E,SAAW1E,EAAM2E,SAIlD3E,EAAMwF,YAAoBpoB,IAAXkQ,GAAwB+R,GAAYta,KAAMib,EAAM/mB,MACtD,EAATqU,EACG,EAGM,EAATA,EACG,EAGM,EAATA,EACG,EAGD,EAGD0S,EAAMwF,QAEZlrB,EAAO0lB,MAAM4C,SAEhBtoB,EAAOkB,KAAM,CAAEmR,MAAO,UAAW8Y,KAAM,YAAc,SAAUxsB,EAAMqnB,GACpEhmB,EAAO0lB,MAAMvJ,QAASxd,GAAS,CAG9B0oB,MAAO,WAQN,OAHAzB,GAAgB3oB,KAAM0B,EAAMwmB,KAGrB,GAERiB,QAAS,WAMR,OAHAR,GAAgB3oB,KAAM0B,IAGf,GAGRqnB,aAAcA,KAYhBhmB,EAAOkB,KAAM,CACZkqB,WAAY,YACZC,WAAY,WACZC,aAAc,cACdC,aAAc,cACZ,SAAUC,EAAM5D,GAClB5nB,EAAO0lB,MAAMvJ,QAASqP,GAAS,CAC9BxF,aAAc4B,EACdT,SAAUS,EAEVZ,OAAQ,SAAUtB,GACjB,IAAI3kB,EAEH0qB,EAAU/F,EAAMyD,cAChBzC,EAAYhB,EAAMgB,UASnB,OALM+E,IAAaA,IANTxuB,MAMgC+C,EAAOyF,SANvCxI,KAMyDwuB,MAClE/F,EAAM/mB,KAAO+nB,EAAUG,SACvB9lB,EAAM2lB,EAAU/a,QAAQ/N,MAAOX,KAAMqE,WACrCokB,EAAM/mB,KAAOipB,GAEP7mB,MAKVf,EAAOG,GAAGgC,OAAQ,CAEjBmjB,GAAI,SAAUC,EAAOtlB,EAAUwf,EAAMtf,GACpC,OAAOmlB,GAAIroB,KAAMsoB,EAAOtlB,EAAUwf,EAAMtf,IAEzCqlB,IAAK,SAAUD,EAAOtlB,EAAUwf,EAAMtf,GACrC,OAAOmlB,GAAIroB,KAAMsoB,EAAOtlB,EAAUwf,EAAMtf,EAAI,IAE7CwlB,IAAK,SAAUJ,EAAOtlB,EAAUE,GAC/B,IAAIumB,EAAW/nB,EACf,GAAK4mB,GAASA,EAAMY,gBAAkBZ,EAAMmB,UAW3C,OARAA,EAAYnB,EAAMmB,UAClB1mB,EAAQulB,EAAMsC,gBAAiBlC,IAC9Be,EAAUja,UACTia,EAAUG,SAAW,IAAMH,EAAUja,UACrCia,EAAUG,SACXH,EAAUzmB,SACVymB,EAAU/a,SAEJ1O,KAER,GAAsB,iBAAVsoB,EAAqB,CAGhC,IAAM5mB,KAAQ4mB,EACbtoB,KAAK0oB,IAAKhnB,EAAMsB,EAAUslB,EAAO5mB,IAElC,OAAO1B,KAWR,OATkB,IAAbgD,GAA0C,mBAAbA,IAGjCE,EAAKF,EACLA,OAAW6C,IAEA,IAAP3C,IACJA,EAAK+kB,IAECjoB,KAAKiE,KAAM,WACjBlB,EAAO0lB,MAAM9K,OAAQ3d,KAAMsoB,EAAOplB,EAAIF,QAMzC,IAKCyrB,GAAe,wBAGfC,GAAW,oCACXC,GAAe,2CAGhB,SAASC,GAAoBxqB,EAAM2X,GAClC,OAAK3P,EAAUhI,EAAM,UACpBgI,EAA+B,KAArB2P,EAAQxa,SAAkBwa,EAAUA,EAAQzJ,WAAY,OAE3DvP,EAAQqB,GAAO0W,SAAU,SAAW,IAGrC1W,EAIR,SAASyqB,GAAezqB,GAEvB,OADAA,EAAK1C,MAAyC,OAAhC0C,EAAK7B,aAAc,SAAsB,IAAM6B,EAAK1C,KAC3D0C,EAER,SAAS0qB,GAAe1qB,GAOvB,MAN2C,WAApCA,EAAK1C,MAAQ,IAAKpB,MAAO,EAAG,GAClC8D,EAAK1C,KAAO0C,EAAK1C,KAAKpB,MAAO,GAE7B8D,EAAK2J,gBAAiB,QAGhB3J,EAGR,SAAS2qB,GAAgBptB,EAAKqtB,GAC7B,IAAI9sB,EAAGiZ,EAAGzZ,EAAgButB,EAAUC,EAAU3F,EAE9C,GAAuB,IAAlByF,EAAKztB,SAAV,CAKA,GAAKohB,EAASD,QAAS/gB,KAEtB4nB,EADW5G,EAASjf,IAAK/B,GACP4nB,QAKjB,IAAM7nB,KAFNihB,EAAShF,OAAQqR,EAAM,iBAETzF,EACb,IAAMrnB,EAAI,EAAGiZ,EAAIoO,EAAQ7nB,GAAO2B,OAAQnB,EAAIiZ,EAAGjZ,IAC9Ca,EAAO0lB,MAAMlN,IAAKyT,EAAMttB,EAAM6nB,EAAQ7nB,GAAQQ,IAO7C0gB,EAASF,QAAS/gB,KACtBstB,EAAWrM,EAASzB,OAAQxf,GAC5ButB,EAAWnsB,EAAOmC,OAAQ,GAAI+pB,GAE9BrM,EAASL,IAAKyM,EAAME,KAkBtB,SAASC,GAAUC,EAAY7a,EAAMrQ,EAAUojB,GAG9C/S,EAAOhU,EAAMgU,GAEb,IAAIkT,EAAUnjB,EAAO8iB,EAASiI,EAAYrtB,EAAMC,EAC/CC,EAAI,EACJiZ,EAAIiU,EAAW/rB,OACfisB,EAAWnU,EAAI,EACfjU,EAAQqN,EAAM,GACdgb,EAAkBluB,EAAY6F,GAG/B,GAAKqoB,GACG,EAAJpU,GAA0B,iBAAVjU,IAChB9F,EAAQ4kB,YAAc0I,GAASlhB,KAAMtG,GACxC,OAAOkoB,EAAWnrB,KAAM,SAAUoX,GACjC,IAAIb,EAAO4U,EAAW7qB,GAAI8W,GACrBkU,IACJhb,EAAM,GAAMrN,EAAMzG,KAAMT,KAAMqb,EAAOb,EAAKgV,SAE3CL,GAAU3U,EAAMjG,EAAMrQ,EAAUojB,KAIlC,GAAKnM,IAEJ7W,GADAmjB,EAAWN,GAAe5S,EAAM6a,EAAY,GAAIniB,eAAe,EAAOmiB,EAAY9H,IACjEhV,WAEmB,IAA/BmV,EAASlb,WAAWlJ,SACxBokB,EAAWnjB,GAIPA,GAASgjB,GAAU,CAOvB,IALA+H,GADAjI,EAAUrkB,EAAOoB,IAAKuiB,GAAQe,EAAU,UAAYoH,KAC/BxrB,OAKbnB,EAAIiZ,EAAGjZ,IACdF,EAAOylB,EAEFvlB,IAAMotB,IACVttB,EAAOe,EAAOwC,MAAOvD,GAAM,GAAM,GAG5BqtB,GAIJtsB,EAAOgB,MAAOqjB,EAASV,GAAQ1kB,EAAM,YAIvCkC,EAASzD,KAAM2uB,EAAYltB,GAAKF,EAAME,GAGvC,GAAKmtB,EAOJ,IANAptB,EAAMmlB,EAASA,EAAQ/jB,OAAS,GAAI4J,cAGpClK,EAAOoB,IAAKijB,EAAS0H,IAGf5sB,EAAI,EAAGA,EAAImtB,EAAYntB,IAC5BF,EAAOolB,EAASllB,GACX4jB,GAAYtY,KAAMxL,EAAKN,MAAQ,MAClCihB,EAASxB,OAAQnf,EAAM,eACxBe,EAAOyF,SAAUvG,EAAKD,KAEjBA,EAAKL,KAA8C,YAArCK,EAAKN,MAAQ,IAAK8F,cAG/BzE,EAAO0sB,WAAaztB,EAAKH,UAC7BkB,EAAO0sB,SAAUztB,EAAKL,IAAK,CAC1BC,MAAOI,EAAKJ,OAASI,EAAKO,aAAc,UACtCN,GAGJH,EAASE,EAAKqQ,YAAYpM,QAAS0oB,GAAc,IAAM3sB,EAAMC,IAQnE,OAAOmtB,EAGR,SAASzR,GAAQvZ,EAAMpB,EAAU0sB,GAKhC,IAJA,IAAI1tB,EACH0lB,EAAQ1kB,EAAWD,EAAOsN,OAAQrN,EAAUoB,GAASA,EACrDlC,EAAI,EAE4B,OAAvBF,EAAO0lB,EAAOxlB,IAAeA,IAChCwtB,GAA8B,IAAlB1tB,EAAKT,UACtBwB,EAAO4sB,UAAWjJ,GAAQ1kB,IAGtBA,EAAKW,aACJ+sB,GAAYxL,GAAYliB,IAC5B2kB,GAAeD,GAAQ1kB,EAAM,WAE9BA,EAAKW,WAAWC,YAAaZ,IAI/B,OAAOoC,EAGRrB,EAAOmC,OAAQ,CACdyiB,cAAe,SAAU6H,GACxB,OAAOA,GAGRjqB,MAAO,SAAUnB,EAAMwrB,EAAeC,GACrC,IAAI3tB,EAAGiZ,EAAG2U,EAAaC,EApINpuB,EAAKqtB,EACnB5iB,EAoIF7G,EAAQnB,EAAK6hB,WAAW,GACxB+J,EAAS9L,GAAY9f,GAGtB,KAAMhD,EAAQ8kB,gBAAsC,IAAlB9hB,EAAK7C,UAAoC,KAAlB6C,EAAK7C,UAC3DwB,EAAO8W,SAAUzV,IAMnB,IAHA2rB,EAAerJ,GAAQnhB,GAGjBrD,EAAI,EAAGiZ,GAFb2U,EAAcpJ,GAAQtiB,IAEOf,OAAQnB,EAAIiZ,EAAGjZ,IAhJ5BP,EAiJLmuB,EAAa5tB,GAjJH8sB,EAiJQe,EAAc7tB,QAhJzCkK,EAGc,WAHdA,EAAW4iB,EAAK5iB,SAAS5E,gBAGAoe,GAAepY,KAAM7L,EAAID,MACrDstB,EAAKtZ,QAAU/T,EAAI+T,QAGK,UAAbtJ,GAAqC,aAAbA,IACnC4iB,EAAKrV,aAAehY,EAAIgY,cA6IxB,GAAKiW,EACJ,GAAKC,EAIJ,IAHAC,EAAcA,GAAepJ,GAAQtiB,GACrC2rB,EAAeA,GAAgBrJ,GAAQnhB,GAEjCrD,EAAI,EAAGiZ,EAAI2U,EAAYzsB,OAAQnB,EAAIiZ,EAAGjZ,IAC3C6sB,GAAgBe,EAAa5tB,GAAK6tB,EAAc7tB,SAGjD6sB,GAAgB3qB,EAAMmB,GAWxB,OAL2B,GAD3BwqB,EAAerJ,GAAQnhB,EAAO,WACZlC,QACjBsjB,GAAeoJ,GAAeC,GAAUtJ,GAAQtiB,EAAM,WAIhDmB,GAGRoqB,UAAW,SAAU9rB,GAKpB,IAJA,IAAI2e,EAAMpe,EAAM1C,EACfwd,EAAUnc,EAAO0lB,MAAMvJ,QACvBhd,EAAI,OAE6B2D,KAAxBzB,EAAOP,EAAO3B,IAAqBA,IAC5C,GAAK+f,EAAY7d,GAAS,CACzB,GAAOoe,EAAOpe,EAAMue,EAAS7c,SAAc,CAC1C,GAAK0c,EAAK+G,OACT,IAAM7nB,KAAQ8gB,EAAK+G,OACbrK,EAASxd,GACbqB,EAAO0lB,MAAM9K,OAAQvZ,EAAM1C,GAI3BqB,EAAOynB,YAAapmB,EAAM1C,EAAM8gB,EAAKuH,QAOxC3lB,EAAMue,EAAS7c,cAAYD,EAEvBzB,EAAMwe,EAAS9c,WAInB1B,EAAMwe,EAAS9c,cAAYD,OAOhC9C,EAAOG,GAAGgC,OAAQ,CACjB+qB,OAAQ,SAAUjtB,GACjB,OAAO2a,GAAQ3d,KAAMgD,GAAU,IAGhC2a,OAAQ,SAAU3a,GACjB,OAAO2a,GAAQ3d,KAAMgD,IAGtBV,KAAM,SAAU4E,GACf,OAAOia,EAAQnhB,KAAM,SAAUkH,GAC9B,YAAiBrB,IAAVqB,EACNnE,EAAOT,KAAMtC,MACbA,KAAK6V,QAAQ5R,KAAM,WACK,IAAlBjE,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,WACxDvB,KAAKqS,YAAcnL,MAGpB,KAAMA,EAAO7C,UAAUhB,SAG3B6sB,OAAQ,WACP,OAAOf,GAAUnvB,KAAMqE,UAAW,SAAUD,GACpB,IAAlBpE,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,UAC3CqtB,GAAoB5uB,KAAMoE,GAChC1B,YAAa0B,MAKvB+rB,QAAS,WACR,OAAOhB,GAAUnvB,KAAMqE,UAAW,SAAUD,GAC3C,GAAuB,IAAlBpE,KAAKuB,UAAoC,KAAlBvB,KAAKuB,UAAqC,IAAlBvB,KAAKuB,SAAiB,CACzE,IAAIiE,EAASopB,GAAoB5uB,KAAMoE,GACvCoB,EAAO4qB,aAAchsB,EAAMoB,EAAO8M,gBAKrC+d,OAAQ,WACP,OAAOlB,GAAUnvB,KAAMqE,UAAW,SAAUD,GACtCpE,KAAK2C,YACT3C,KAAK2C,WAAWytB,aAAchsB,EAAMpE,SAKvCswB,MAAO,WACN,OAAOnB,GAAUnvB,KAAMqE,UAAW,SAAUD,GACtCpE,KAAK2C,YACT3C,KAAK2C,WAAWytB,aAAchsB,EAAMpE,KAAKgP,gBAK5C6G,MAAO,WAIN,IAHA,IAAIzR,EACHlC,EAAI,EAE2B,OAAtBkC,EAAOpE,KAAMkC,IAAeA,IACd,IAAlBkC,EAAK7C,WAGTwB,EAAO4sB,UAAWjJ,GAAQtiB,GAAM,IAGhCA,EAAKiO,YAAc,IAIrB,OAAOrS,MAGRuF,MAAO,SAAUqqB,EAAeC,GAI/B,OAHAD,EAAiC,MAAjBA,GAAgCA,EAChDC,EAAyC,MAArBA,EAA4BD,EAAgBC,EAEzD7vB,KAAKmE,IAAK,WAChB,OAAOpB,EAAOwC,MAAOvF,KAAM4vB,EAAeC,MAI5CL,KAAM,SAAUtoB,GACf,OAAOia,EAAQnhB,KAAM,SAAUkH,GAC9B,IAAI9C,EAAOpE,KAAM,IAAO,GACvBkC,EAAI,EACJiZ,EAAInb,KAAKqD,OAEV,QAAewC,IAAVqB,GAAyC,IAAlB9C,EAAK7C,SAChC,OAAO6C,EAAKwM,UAIb,GAAsB,iBAAV1J,IAAuBunB,GAAajhB,KAAMtG,KACpDkf,IAAWP,GAAS3Y,KAAMhG,IAAW,CAAE,GAAI,KAAQ,GAAIM,eAAkB,CAE1EN,EAAQnE,EAAO4kB,cAAezgB,GAE9B,IACC,KAAQhF,EAAIiZ,EAAGjZ,IAIS,KAHvBkC,EAAOpE,KAAMkC,IAAO,IAGVX,WACTwB,EAAO4sB,UAAWjJ,GAAQtiB,GAAM,IAChCA,EAAKwM,UAAY1J,GAInB9C,EAAO,EAGN,MAAQoI,KAGNpI,GACJpE,KAAK6V,QAAQqa,OAAQhpB,IAEpB,KAAMA,EAAO7C,UAAUhB,SAG3BktB,YAAa,WACZ,IAAIjJ,EAAU,GAGd,OAAO6H,GAAUnvB,KAAMqE,UAAW,SAAUD,GAC3C,IAAI8P,EAASlU,KAAK2C,WAEbI,EAAO6D,QAAS5G,KAAMsnB,GAAY,IACtCvkB,EAAO4sB,UAAWjJ,GAAQ1mB,OACrBkU,GACJA,EAAOsc,aAAcpsB,EAAMpE,QAK3BsnB,MAILvkB,EAAOkB,KAAM,CACZwsB,SAAU,SACVC,UAAW,UACXN,aAAc,SACdO,YAAa,QACbC,WAAY,eACV,SAAUxrB,EAAMyrB,GAClB9tB,EAAOG,GAAIkC,GAAS,SAAUpC,GAO7B,IANA,IAAIa,EACHC,EAAM,GACNgtB,EAAS/tB,EAAQC,GACjBwB,EAAOssB,EAAOztB,OAAS,EACvBnB,EAAI,EAEGA,GAAKsC,EAAMtC,IAClB2B,EAAQ3B,IAAMsC,EAAOxE,KAAOA,KAAKuF,OAAO,GACxCxC,EAAQ+tB,EAAQ5uB,IAAO2uB,GAAYhtB,GAInCjD,EAAKD,MAAOmD,EAAKD,EAAMH,OAGxB,OAAO1D,KAAK4D,UAAWE,MAGzB,IAAIitB,GAAY,IAAIjnB,OAAQ,KAAOga,GAAO,kBAAmB,KAEzDkN,GAAY,SAAU5sB,GAKxB,IAAI6oB,EAAO7oB,EAAK6I,cAAc4C,YAM9B,OAJMod,GAASA,EAAKgE,SACnBhE,EAAOltB,GAGDktB,EAAKiE,iBAAkB9sB,IAG5B+sB,GAAO,SAAU/sB,EAAMe,EAASjB,GACnC,IAAIJ,EAAKsB,EACRgsB,EAAM,GAGP,IAAMhsB,KAAQD,EACbisB,EAAKhsB,GAAShB,EAAKkgB,MAAOlf,GAC1BhB,EAAKkgB,MAAOlf,GAASD,EAASC,GAM/B,IAAMA,KAHNtB,EAAMI,EAASzD,KAAM2D,GAGPe,EACbf,EAAKkgB,MAAOlf,GAASgsB,EAAKhsB,GAG3B,OAAOtB,GAIJutB,GAAY,IAAIvnB,OAAQma,GAAUrW,KAAM,KAAO,KA8HnD,SAAS0jB,GAAQltB,EAAMgB,EAAMmsB,GAC5B,IAAIC,EAAOC,EAAUC,EAAU5tB,EAM9BwgB,EAAQlgB,EAAKkgB,MAqCd,OAnCAiN,EAAWA,GAAYP,GAAW5sB,MAQpB,MAFbN,EAAMytB,EAASI,iBAAkBvsB,IAAUmsB,EAAUnsB,KAEjC8e,GAAY9f,KAC/BN,EAAMf,EAAOuhB,MAAOlgB,EAAMgB,KAQrBhE,EAAQwwB,kBAAoBb,GAAUvjB,KAAM1J,IAASutB,GAAU7jB,KAAMpI,KAG1EosB,EAAQlN,EAAMkN,MACdC,EAAWnN,EAAMmN,SACjBC,EAAWpN,EAAMoN,SAGjBpN,EAAMmN,SAAWnN,EAAMoN,SAAWpN,EAAMkN,MAAQ1tB,EAChDA,EAAMytB,EAASC,MAGflN,EAAMkN,MAAQA,EACdlN,EAAMmN,SAAWA,EACjBnN,EAAMoN,SAAWA,SAIJ7rB,IAAR/B,EAINA,EAAM,GACNA,EAIF,SAAS+tB,GAAcC,EAAaC,GAGnC,MAAO,CACNruB,IAAK,WACJ,IAAKouB,IASL,OAAS9xB,KAAK0D,IAAMquB,GAASpxB,MAAOX,KAAMqE,kBALlCrE,KAAK0D,OAxLhB,WAIC,SAASsuB,IAGR,GAAMrM,EAAN,CAIAsM,EAAU3N,MAAM4N,QAAU,+EAE1BvM,EAAIrB,MAAM4N,QACT,4HAGDxiB,GAAgBhN,YAAauvB,GAAYvvB,YAAaijB,GAEtD,IAAIwM,EAAWpyB,EAAOmxB,iBAAkBvL,GACxCyM,EAAoC,OAAjBD,EAASriB,IAG5BuiB,EAAsE,KAA9CC,EAAoBH,EAASI,YAIrD5M,EAAIrB,MAAMkO,MAAQ,MAClBC,EAA6D,KAAzCH,EAAoBH,EAASK,OAIjDE,EAAgE,KAAzCJ,EAAoBH,EAASX,OAMpD7L,EAAIrB,MAAMqO,SAAW,WACrBC,EAAiE,KAA9CN,EAAoB3M,EAAIkN,YAAc,GAEzDnjB,GAAgB9M,YAAaqvB,GAI7BtM,EAAM,MAGP,SAAS2M,EAAoBQ,GAC5B,OAAO/sB,KAAKgtB,MAAOC,WAAYF,IAGhC,IAAIV,EAAkBM,EAAsBE,EAAkBH,EAC7DQ,EAAyBZ,EACzBJ,EAAYryB,EAASyC,cAAe,OACpCsjB,EAAM/lB,EAASyC,cAAe,OAGzBsjB,EAAIrB,QAMVqB,EAAIrB,MAAM4O,eAAiB,cAC3BvN,EAAIM,WAAW,GAAO3B,MAAM4O,eAAiB,GAC7C9xB,EAAQ+xB,gBAA+C,gBAA7BxN,EAAIrB,MAAM4O,eAEpCnwB,EAAOmC,OAAQ9D,EAAS,CACvBgyB,kBAAmB,WAElB,OADApB,IACOU,GAERd,eAAgB,WAEf,OADAI,IACOS,GAERY,cAAe,WAEd,OADArB,IACOI,GAERkB,mBAAoB,WAEnB,OADAtB,IACOK,GAERkB,cAAe,WAEd,OADAvB,IACOY,GAQRY,qBAAsB,WACrB,IAAIC,EAAOlN,EAAImN,EAASC,EAoBxB,OAnBgC,MAA3BV,IACJQ,EAAQ7zB,EAASyC,cAAe,SAChCkkB,EAAK3mB,EAASyC,cAAe,MAC7BqxB,EAAU9zB,EAASyC,cAAe,OAElCoxB,EAAMnP,MAAM4N,QAAU,kCACtB3L,EAAGjC,MAAMsP,OAAS,MAClBF,EAAQpP,MAAMsP,OAAS,MAEvBlkB,GACEhN,YAAa+wB,GACb/wB,YAAa6jB,GACb7jB,YAAagxB,GAEfC,EAAU5zB,EAAOmxB,iBAAkB3K,GACnC0M,EAAuD,EAA7BY,SAAUF,EAAQC,QAE5ClkB,GAAgB9M,YAAa6wB,IAEvBR,MApHV,GAmMA,IAAIa,GAAc,CAAE,SAAU,MAAO,MACpCC,GAAan0B,EAASyC,cAAe,OAAQiiB,MAC7C0P,GAAc,GAkBf,SAASC,GAAe7uB,GACvB,IAAI8uB,EAAQnxB,EAAOoxB,SAAU/uB,IAAU4uB,GAAa5uB,GAEpD,OAAK8uB,IAGA9uB,KAAQ2uB,GACL3uB,EAED4uB,GAAa5uB,GAxBrB,SAAyBA,GAGxB,IAAIgvB,EAAUhvB,EAAM,GAAI0c,cAAgB1c,EAAK9E,MAAO,GACnD4B,EAAI4xB,GAAYzwB,OAEjB,MAAQnB,IAEP,IADAkD,EAAO0uB,GAAa5xB,GAAMkyB,KACbL,GACZ,OAAO3uB,EAeoBivB,CAAgBjvB,IAAUA,GAIxD,IAKCkvB,GAAe,4BACfC,GAAc,MACdC,GAAU,CAAE7B,SAAU,WAAY8B,WAAY,SAAUlQ,QAAS,SACjEmQ,GAAqB,CACpBC,cAAe,IACfC,WAAY,OAGd,SAASC,GAAmBlwB,EAAOuC,EAAO4tB,GAIzC,IAAI/tB,EAAUid,GAAQ9W,KAAMhG,GAC5B,OAAOH,EAGNhB,KAAKgvB,IAAK,EAAGhuB,EAAS,IAAQ+tB,GAAY,KAAU/tB,EAAS,IAAO,MACpEG,EAGF,SAAS8tB,GAAoB5wB,EAAM6wB,EAAWC,EAAKC,EAAaC,EAAQC,GACvE,IAAInzB,EAAkB,UAAd+yB,EAAwB,EAAI,EACnCK,EAAQ,EACRC,EAAQ,EAGT,GAAKL,KAAUC,EAAc,SAAW,WACvC,OAAO,EAGR,KAAQjzB,EAAI,EAAGA,GAAK,EAGN,WAARgzB,IACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM8wB,EAAMjR,GAAW/hB,IAAK,EAAMkzB,IAIlDD,GAmBQ,YAARD,IACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM,UAAY6f,GAAW/hB,IAAK,EAAMkzB,IAIjD,WAARF,IACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM,SAAW6f,GAAW/hB,GAAM,SAAS,EAAMkzB,MAtBvEG,GAASxyB,EAAOyhB,IAAKpgB,EAAM,UAAY6f,GAAW/hB,IAAK,EAAMkzB,GAGhD,YAARF,EACJK,GAASxyB,EAAOyhB,IAAKpgB,EAAM,SAAW6f,GAAW/hB,GAAM,SAAS,EAAMkzB,GAItEE,GAASvyB,EAAOyhB,IAAKpgB,EAAM,SAAW6f,GAAW/hB,GAAM,SAAS,EAAMkzB,IAoCzE,OAhBMD,GAA8B,GAAfE,IAIpBE,GAASxvB,KAAKgvB,IAAK,EAAGhvB,KAAKyvB,KAC1BpxB,EAAM,SAAW6wB,EAAW,GAAInT,cAAgBmT,EAAU30B,MAAO,IACjE+0B,EACAE,EACAD,EACA,MAIM,GAGDC,EAGR,SAASE,GAAkBrxB,EAAM6wB,EAAWK,GAG3C,IAAIF,EAASpE,GAAW5sB,GAKvB+wB,IADmB/zB,EAAQgyB,qBAAuBkC,IAEE,eAAnDvyB,EAAOyhB,IAAKpgB,EAAM,aAAa,EAAOgxB,GACvCM,EAAmBP,EAEnBhzB,EAAMmvB,GAAQltB,EAAM6wB,EAAWG,GAC/BO,EAAa,SAAWV,EAAW,GAAInT,cAAgBmT,EAAU30B,MAAO,GAIzE,GAAKywB,GAAUvjB,KAAMrL,GAAQ,CAC5B,IAAMmzB,EACL,OAAOnzB,EAERA,EAAM,OAyCP,QAlCQf,EAAQgyB,qBAAuB+B,IAMrC/zB,EAAQoyB,wBAA0BpnB,EAAUhI,EAAM,OAI3C,SAARjC,IAIC6wB,WAAY7wB,IAA0D,WAAjDY,EAAOyhB,IAAKpgB,EAAM,WAAW,EAAOgxB,KAG1DhxB,EAAKwxB,iBAAiBvyB,SAEtB8xB,EAAiE,eAAnDpyB,EAAOyhB,IAAKpgB,EAAM,aAAa,EAAOgxB,IAKpDM,EAAmBC,KAAcvxB,KAEhCjC,EAAMiC,EAAMuxB,MAKdxzB,EAAM6wB,WAAY7wB,IAAS,GAI1B6yB,GACC5wB,EACA6wB,EACAK,IAAWH,EAAc,SAAW,WACpCO,EACAN,EAGAjzB,GAEE,KA+SL,SAAS0zB,GAAOzxB,EAAMe,EAASsd,EAAM1d,EAAK+wB,GACzC,OAAO,IAAID,GAAMvyB,UAAUH,KAAMiB,EAAMe,EAASsd,EAAM1d,EAAK+wB,GA7S5D/yB,EAAOmC,OAAQ,CAId6wB,SAAU,CACTC,QAAS,CACRtyB,IAAK,SAAUU,EAAMmtB,GACpB,GAAKA,EAAW,CAGf,IAAIztB,EAAMwtB,GAAQltB,EAAM,WACxB,MAAe,KAARN,EAAa,IAAMA,MAO9BohB,UAAW,CACV+Q,yBAA2B,EAC3BC,aAAe,EACfC,aAAe,EACfC,UAAY,EACZC,YAAc,EACdzB,YAAc,EACd0B,UAAY,EACZC,YAAc,EACdC,eAAiB,EACjBC,iBAAmB,EACnBC,SAAW,EACXC,YAAc,EACdC,cAAgB,EAChBC,YAAc,EACdb,SAAW,EACXc,OAAS,EACTC,SAAW,EACXC,QAAU,EACVC,QAAU,EACVC,MAAQ,GAKT/C,SAAU,GAGV7P,MAAO,SAAUlgB,EAAMgB,EAAM8B,EAAOouB,GAGnC,GAAMlxB,GAA0B,IAAlBA,EAAK7C,UAAoC,IAAlB6C,EAAK7C,UAAmB6C,EAAKkgB,MAAlE,CAKA,IAAIxgB,EAAKpC,EAAM6hB,EACd4T,EAAWpV,EAAW3c,GACtBgyB,EAAe7C,GAAY/mB,KAAMpI,GACjCkf,EAAQlgB,EAAKkgB,MAad,GARM8S,IACLhyB,EAAO6uB,GAAekD,IAIvB5T,EAAQxgB,EAAOgzB,SAAU3wB,IAAUrC,EAAOgzB,SAAUoB,QAGrCtxB,IAAVqB,EA0CJ,OAAKqc,GAAS,QAASA,QACwB1d,KAA5C/B,EAAMyf,EAAM7f,IAAKU,GAAM,EAAOkxB,IAEzBxxB,EAIDwgB,EAAOlf,GA7CA,YAHd1D,SAAcwF,KAGcpD,EAAMkgB,GAAQ9W,KAAMhG,KAAapD,EAAK,KACjEoD,EAAQud,GAAWrgB,EAAMgB,EAAMtB,GAG/BpC,EAAO,UAIM,MAATwF,GAAiBA,GAAUA,IAOlB,WAATxF,GAAsB01B,IAC1BlwB,GAASpD,GAAOA,EAAK,KAASf,EAAOmiB,UAAWiS,GAAa,GAAK,OAI7D/1B,EAAQ+xB,iBAA6B,KAAVjsB,GAAiD,IAAjC9B,EAAKvE,QAAS,gBAC9DyjB,EAAOlf,GAAS,WAIXme,GAAY,QAASA,QACsB1d,KAA9CqB,EAAQqc,EAAMhB,IAAKne,EAAM8C,EAAOouB,MAE7B8B,EACJ9S,EAAM+S,YAAajyB,EAAM8B,GAEzBod,EAAOlf,GAAS8B,MAkBpBsd,IAAK,SAAUpgB,EAAMgB,EAAMkwB,EAAOF,GACjC,IAAIjzB,EAAKwB,EAAK4f,EACb4T,EAAWpV,EAAW3c,GA6BvB,OA5BgBmvB,GAAY/mB,KAAMpI,KAMjCA,EAAO6uB,GAAekD,KAIvB5T,EAAQxgB,EAAOgzB,SAAU3wB,IAAUrC,EAAOgzB,SAAUoB,KAGtC,QAAS5T,IACtBphB,EAAMohB,EAAM7f,IAAKU,GAAM,EAAMkxB,SAIjBzvB,IAAR1D,IACJA,EAAMmvB,GAAQltB,EAAMgB,EAAMgwB,IAId,WAARjzB,GAAoBiD,KAAQsvB,KAChCvyB,EAAMuyB,GAAoBtvB,IAIZ,KAAVkwB,GAAgBA,GACpB3xB,EAAMqvB,WAAY7wB,IACD,IAAVmzB,GAAkBgC,SAAU3zB,GAAQA,GAAO,EAAIxB,GAGhDA,KAITY,EAAOkB,KAAM,CAAE,SAAU,SAAW,SAAUsD,EAAI0tB,GACjDlyB,EAAOgzB,SAAUd,GAAc,CAC9BvxB,IAAK,SAAUU,EAAMmtB,EAAU+D,GAC9B,GAAK/D,EAIJ,OAAO+C,GAAa9mB,KAAMzK,EAAOyhB,IAAKpgB,EAAM,aAQxCA,EAAKwxB,iBAAiBvyB,QAAWe,EAAKmzB,wBAAwB/F,MAIhEiE,GAAkBrxB,EAAM6wB,EAAWK,GAHnCnE,GAAM/sB,EAAMowB,GAAS,WACpB,OAAOiB,GAAkBrxB,EAAM6wB,EAAWK,MAM/C/S,IAAK,SAAUne,EAAM8C,EAAOouB,GAC3B,IAAIvuB,EACHquB,EAASpE,GAAW5sB,GAIpBozB,GAAsBp2B,EAAQmyB,iBACT,aAApB6B,EAAOzC,SAIRwC,GADkBqC,GAAsBlC,IAEY,eAAnDvyB,EAAOyhB,IAAKpgB,EAAM,aAAa,EAAOgxB,GACvCN,EAAWQ,EACVN,GACC5wB,EACA6wB,EACAK,EACAH,EACAC,GAED,EAqBF,OAjBKD,GAAeqC,IACnB1C,GAAY/uB,KAAKyvB,KAChBpxB,EAAM,SAAW6wB,EAAW,GAAInT,cAAgBmT,EAAU30B,MAAO,IACjE0yB,WAAYoC,EAAQH,IACpBD,GAAoB5wB,EAAM6wB,EAAW,UAAU,EAAOG,GACtD,KAKGN,IAAc/tB,EAAUid,GAAQ9W,KAAMhG,KACb,QAA3BH,EAAS,IAAO,QAElB3C,EAAKkgB,MAAO2Q,GAAc/tB,EAC1BA,EAAQnE,EAAOyhB,IAAKpgB,EAAM6wB,IAGpBJ,GAAmBzwB,EAAM8C,EAAO4tB,OAK1C/xB,EAAOgzB,SAASxD,WAAaV,GAAczwB,EAAQkyB,mBAClD,SAAUlvB,EAAMmtB,GACf,GAAKA,EACJ,OAASyB,WAAY1B,GAAQltB,EAAM,gBAClCA,EAAKmzB,wBAAwBE,KAC5BtG,GAAM/sB,EAAM,CAAEmuB,WAAY,GAAK,WAC9B,OAAOnuB,EAAKmzB,wBAAwBE,QAElC,OAMR10B,EAAOkB,KAAM,CACZyzB,OAAQ,GACRC,QAAS,GACTC,OAAQ,SACN,SAAUC,EAAQC,GACpB/0B,EAAOgzB,SAAU8B,EAASC,GAAW,CACpCC,OAAQ,SAAU7wB,GAOjB,IANA,IAAIhF,EAAI,EACP81B,EAAW,GAGXC,EAAyB,iBAAV/wB,EAAqBA,EAAMI,MAAO,KAAQ,CAAEJ,GAEpDhF,EAAI,EAAGA,IACd81B,EAAUH,EAAS5T,GAAW/hB,GAAM41B,GACnCG,EAAO/1B,IAAO+1B,EAAO/1B,EAAI,IAAO+1B,EAAO,GAGzC,OAAOD,IAIO,WAAXH,IACJ90B,EAAOgzB,SAAU8B,EAASC,GAASvV,IAAMsS,MAI3C9xB,EAAOG,GAAGgC,OAAQ,CACjBsf,IAAK,SAAUpf,EAAM8B,GACpB,OAAOia,EAAQnhB,KAAM,SAAUoE,EAAMgB,EAAM8B,GAC1C,IAAIkuB,EAAQvwB,EACXV,EAAM,GACNjC,EAAI,EAEL,GAAKyD,MAAMC,QAASR,GAAS,CAI5B,IAHAgwB,EAASpE,GAAW5sB,GACpBS,EAAMO,EAAK/B,OAEHnB,EAAI2C,EAAK3C,IAChBiC,EAAKiB,EAAMlD,IAAQa,EAAOyhB,IAAKpgB,EAAMgB,EAAMlD,IAAK,EAAOkzB,GAGxD,OAAOjxB,EAGR,YAAiB0B,IAAVqB,EACNnE,EAAOuhB,MAAOlgB,EAAMgB,EAAM8B,GAC1BnE,EAAOyhB,IAAKpgB,EAAMgB,IACjBA,EAAM8B,EAA0B,EAAnB7C,UAAUhB,aAQ5BN,EAAO8yB,MAAQA,IAETvyB,UAAY,CACjBE,YAAaqyB,GACb1yB,KAAM,SAAUiB,EAAMe,EAASsd,EAAM1d,EAAK+wB,EAAQ7Q,GACjDjlB,KAAKoE,KAAOA,EACZpE,KAAKyiB,KAAOA,EACZziB,KAAK81B,OAASA,GAAU/yB,EAAO+yB,OAAOrP,SACtCzmB,KAAKmF,QAAUA,EACfnF,KAAKiU,MAAQjU,KAAKosB,IAAMpsB,KAAK6O,MAC7B7O,KAAK+E,IAAMA,EACX/E,KAAKilB,KAAOA,IAAUliB,EAAOmiB,UAAWzC,GAAS,GAAK,OAEvD5T,IAAK,WACJ,IAAI0U,EAAQsS,GAAMqC,UAAWl4B,KAAKyiB,MAElC,OAAOc,GAASA,EAAM7f,IACrB6f,EAAM7f,IAAK1D,MACX61B,GAAMqC,UAAUzR,SAAS/iB,IAAK1D,OAEhCm4B,IAAK,SAAUC,GACd,IAAIC,EACH9U,EAAQsS,GAAMqC,UAAWl4B,KAAKyiB,MAoB/B,OAlBKziB,KAAKmF,QAAQmzB,SACjBt4B,KAAKu4B,IAAMF,EAAQt1B,EAAO+yB,OAAQ91B,KAAK81B,QACtCsC,EAASp4B,KAAKmF,QAAQmzB,SAAWF,EAAS,EAAG,EAAGp4B,KAAKmF,QAAQmzB,UAG9Dt4B,KAAKu4B,IAAMF,EAAQD,EAEpBp4B,KAAKosB,KAAQpsB,KAAK+E,IAAM/E,KAAKiU,OAAUokB,EAAQr4B,KAAKiU,MAE/CjU,KAAKmF,QAAQqzB,MACjBx4B,KAAKmF,QAAQqzB,KAAK/3B,KAAMT,KAAKoE,KAAMpE,KAAKosB,IAAKpsB,MAGzCujB,GAASA,EAAMhB,IACnBgB,EAAMhB,IAAKviB,MAEX61B,GAAMqC,UAAUzR,SAASlE,IAAKviB,MAExBA,QAIOmD,KAAKG,UAAYuyB,GAAMvyB,WAEvCuyB,GAAMqC,UAAY,CACjBzR,SAAU,CACT/iB,IAAK,SAAUihB,GACd,IAAIrR,EAIJ,OAA6B,IAAxBqR,EAAMvgB,KAAK7C,UACa,MAA5BojB,EAAMvgB,KAAMugB,EAAMlC,OAAoD,MAAlCkC,EAAMvgB,KAAKkgB,MAAOK,EAAMlC,MACrDkC,EAAMvgB,KAAMugB,EAAMlC,OAO1BnP,EAASvQ,EAAOyhB,IAAKG,EAAMvgB,KAAMugB,EAAMlC,KAAM,MAGhB,SAAXnP,EAAwBA,EAAJ,GAEvCiP,IAAK,SAAUoC,GAKT5hB,EAAO01B,GAAGD,KAAM7T,EAAMlC,MAC1B1f,EAAO01B,GAAGD,KAAM7T,EAAMlC,MAAQkC,GACK,IAAxBA,EAAMvgB,KAAK7C,WACrBwB,EAAOgzB,SAAUpR,EAAMlC,OAC4B,MAAnDkC,EAAMvgB,KAAKkgB,MAAO2P,GAAetP,EAAMlC,OAGxCkC,EAAMvgB,KAAMugB,EAAMlC,MAASkC,EAAMyH,IAFjCrpB,EAAOuhB,MAAOK,EAAMvgB,KAAMugB,EAAMlC,KAAMkC,EAAMyH,IAAMzH,EAAMM,UAU5CyT,UAAY7C,GAAMqC,UAAUS,WAAa,CACxDpW,IAAK,SAAUoC,GACTA,EAAMvgB,KAAK7C,UAAYojB,EAAMvgB,KAAKzB,aACtCgiB,EAAMvgB,KAAMugB,EAAMlC,MAASkC,EAAMyH,OAKpCrpB,EAAO+yB,OAAS,CACf8C,OAAQ,SAAUC,GACjB,OAAOA,GAERC,MAAO,SAAUD,GAChB,MAAO,GAAM9yB,KAAKgzB,IAAKF,EAAI9yB,KAAKizB,IAAO,GAExCvS,SAAU,SAGX1jB,EAAO01B,GAAK5C,GAAMvyB,UAAUH,KAG5BJ,EAAO01B,GAAGD,KAAO,GAKjB,IACCS,GAAOC,GAkrBHvoB,GAEHwoB,GAnrBDC,GAAW,yBACXC,GAAO,cAER,SAASC,KACHJ,MACqB,IAApBt5B,EAAS25B,QAAoBx5B,EAAOy5B,sBACxCz5B,EAAOy5B,sBAAuBF,IAE9Bv5B,EAAO8f,WAAYyZ,GAAUv2B,EAAO01B,GAAGgB,UAGxC12B,EAAO01B,GAAGiB,QAKZ,SAASC,KAIR,OAHA55B,EAAO8f,WAAY,WAClBoZ,QAAQpzB,IAEAozB,GAAQxwB,KAAK2jB,MAIvB,SAASwN,GAAOl4B,EAAMm4B,GACrB,IAAI5L,EACH/rB,EAAI,EACJuM,EAAQ,CAAEmlB,OAAQlyB,GAKnB,IADAm4B,EAAeA,EAAe,EAAI,EAC1B33B,EAAI,EAAGA,GAAK,EAAI23B,EAEvBprB,EAAO,UADPwf,EAAQhK,GAAW/hB,KACSuM,EAAO,UAAYwf,GAAUvsB,EAO1D,OAJKm4B,IACJprB,EAAMunB,QAAUvnB,EAAM+iB,MAAQ9vB,GAGxB+M,EAGR,SAASqrB,GAAa5yB,EAAOub,EAAMsX,GAKlC,IAJA,IAAIpV,EACHyK,GAAe4K,GAAUC,SAAUxX,IAAU,IAAK/hB,OAAQs5B,GAAUC,SAAU,MAC9E5e,EAAQ,EACRhY,EAAS+rB,EAAW/rB,OACbgY,EAAQhY,EAAQgY,IACvB,GAAOsJ,EAAQyK,EAAY/T,GAAQ5a,KAAMs5B,EAAWtX,EAAMvb,GAGzD,OAAOyd,EAsNV,SAASqV,GAAW51B,EAAM81B,EAAY/0B,GACrC,IAAImO,EACH6mB,EACA9e,EAAQ,EACRhY,EAAS22B,GAAUI,WAAW/2B,OAC9B+a,EAAWrb,EAAOgb,WAAWI,OAAQ,kBAG7Bub,EAAKt1B,OAEbs1B,EAAO,WACN,GAAKS,EACJ,OAAO,EAYR,IAVA,IAAIE,EAAcpB,IAASU,KAC1B1Z,EAAYla,KAAKgvB,IAAK,EAAGgF,EAAUO,UAAYP,EAAUzB,SAAW+B,GAKpEjC,EAAU,GADHnY,EAAY8Z,EAAUzB,UAAY,GAEzCjd,EAAQ,EACRhY,EAAS02B,EAAUQ,OAAOl3B,OAEnBgY,EAAQhY,EAAQgY,IACvB0e,EAAUQ,OAAQlf,GAAQ8c,IAAKC,GAMhC,OAHAha,EAASkB,WAAYlb,EAAM,CAAE21B,EAAW3B,EAASnY,IAG5CmY,EAAU,GAAK/0B,EACZ4c,GAIF5c,GACL+a,EAASkB,WAAYlb,EAAM,CAAE21B,EAAW,EAAG,IAI5C3b,EAASmB,YAAanb,EAAM,CAAE21B,KACvB,IAERA,EAAY3b,EAASzB,QAAS,CAC7BvY,KAAMA,EACN2nB,MAAOhpB,EAAOmC,OAAQ,GAAIg1B,GAC1BM,KAAMz3B,EAAOmC,QAAQ,EAAM,CAC1Bu1B,cAAe,GACf3E,OAAQ/yB,EAAO+yB,OAAOrP,UACpBthB,GACHu1B,mBAAoBR,EACpBS,gBAAiBx1B,EACjBm1B,UAAWrB,IAASU,KACpBrB,SAAUnzB,EAAQmzB,SAClBiC,OAAQ,GACRT,YAAa,SAAUrX,EAAM1d,GAC5B,IAAI4f,EAAQ5hB,EAAO8yB,MAAOzxB,EAAM21B,EAAUS,KAAM/X,EAAM1d,EACpDg1B,EAAUS,KAAKC,cAAehY,IAAUsX,EAAUS,KAAK1E,QAEzD,OADAiE,EAAUQ,OAAO35B,KAAM+jB,GAChBA,GAERlB,KAAM,SAAUmX,GACf,IAAIvf,EAAQ,EAIXhY,EAASu3B,EAAUb,EAAUQ,OAAOl3B,OAAS,EAC9C,GAAK82B,EACJ,OAAOn6B,KAGR,IADAm6B,GAAU,EACF9e,EAAQhY,EAAQgY,IACvB0e,EAAUQ,OAAQlf,GAAQ8c,IAAK,GAUhC,OANKyC,GACJxc,EAASkB,WAAYlb,EAAM,CAAE21B,EAAW,EAAG,IAC3C3b,EAASmB,YAAanb,EAAM,CAAE21B,EAAWa,KAEzCxc,EAASuB,WAAYvb,EAAM,CAAE21B,EAAWa,IAElC56B,QAGT+rB,EAAQgO,EAAUhO,MAInB,KA/HD,SAAqBA,EAAO0O,GAC3B,IAAIpf,EAAOjW,EAAM0wB,EAAQ5uB,EAAOqc,EAGhC,IAAMlI,KAAS0Q,EAed,GAbA+J,EAAS2E,EADTr1B,EAAO2c,EAAW1G,IAElBnU,EAAQ6kB,EAAO1Q,GACV1V,MAAMC,QAASsB,KACnB4uB,EAAS5uB,EAAO,GAChBA,EAAQ6kB,EAAO1Q,GAAUnU,EAAO,IAG5BmU,IAAUjW,IACd2mB,EAAO3mB,GAAS8B,SACT6kB,EAAO1Q,KAGfkI,EAAQxgB,EAAOgzB,SAAU3wB,KACX,WAAYme,EAMzB,IAAMlI,KALNnU,EAAQqc,EAAMwU,OAAQ7wB,UACf6kB,EAAO3mB,GAIC8B,EACNmU,KAAS0Q,IAChBA,EAAO1Q,GAAUnU,EAAOmU,GACxBof,EAAepf,GAAUya,QAI3B2E,EAAer1B,GAAS0wB,EA6F1B+E,CAAY9O,EAAOgO,EAAUS,KAAKC,eAE1Bpf,EAAQhY,EAAQgY,IAEvB,GADA/H,EAAS0mB,GAAUI,WAAY/e,GAAQ5a,KAAMs5B,EAAW31B,EAAM2nB,EAAOgO,EAAUS,MAM9E,OAJKn5B,EAAYiS,EAAOmQ,QACvB1gB,EAAOygB,YAAauW,EAAU31B,KAAM21B,EAAUS,KAAKld,OAAQmG,KAC1DnQ,EAAOmQ,KAAKqX,KAAMxnB,IAEbA,EAyBT,OArBAvQ,EAAOoB,IAAK4nB,EAAO+N,GAAaC,GAE3B14B,EAAY04B,EAAUS,KAAKvmB,QAC/B8lB,EAAUS,KAAKvmB,MAAMxT,KAAM2D,EAAM21B,GAIlCA,EACEpb,SAAUob,EAAUS,KAAK7b,UACzB/V,KAAMmxB,EAAUS,KAAK5xB,KAAMmxB,EAAUS,KAAKO,UAC1Cne,KAAMmd,EAAUS,KAAK5d,MACrBuB,OAAQ4b,EAAUS,KAAKrc,QAEzBpb,EAAO01B,GAAGuC,MACTj4B,EAAOmC,OAAQw0B,EAAM,CACpBt1B,KAAMA,EACN62B,KAAMlB,EACNzc,MAAOyc,EAAUS,KAAKld,SAIjByc,EAGRh3B,EAAOi3B,UAAYj3B,EAAOmC,OAAQ80B,GAAW,CAE5CC,SAAU,CACTiB,IAAK,CAAE,SAAUzY,EAAMvb,GACtB,IAAIyd,EAAQ3kB,KAAK85B,YAAarX,EAAMvb,GAEpC,OADAud,GAAWE,EAAMvgB,KAAMqe,EAAMuB,GAAQ9W,KAAMhG,GAASyd,GAC7CA,KAITwW,QAAS,SAAUpP,EAAO7nB,GACpB7C,EAAY0qB,IAChB7nB,EAAW6nB,EACXA,EAAQ,CAAE,MAEVA,EAAQA,EAAMlf,MAAOoP,GAOtB,IAJA,IAAIwG,EACHpH,EAAQ,EACRhY,EAAS0oB,EAAM1oB,OAERgY,EAAQhY,EAAQgY,IACvBoH,EAAOsJ,EAAO1Q,GACd2e,GAAUC,SAAUxX,GAASuX,GAAUC,SAAUxX,IAAU,GAC3DuX,GAAUC,SAAUxX,GAAO9Q,QAASzN,IAItCk2B,WAAY,CA3Wb,SAA2Bh2B,EAAM2nB,EAAOyO,GACvC,IAAI/X,EAAMvb,EAAOwe,EAAQnC,EAAO6X,EAASC,EAAWC,EAAgB/W,EACnEgX,EAAQ,UAAWxP,GAAS,WAAYA,EACxCkP,EAAOj7B,KACPuuB,EAAO,GACPjK,EAAQlgB,EAAKkgB,MACbiV,EAASn1B,EAAK7C,UAAY8iB,GAAoBjgB,GAC9Co3B,EAAW7Y,EAASjf,IAAKU,EAAM,UA6BhC,IAAMqe,KA1BA+X,EAAKld,QAEa,OADvBiG,EAAQxgB,EAAOygB,YAAapf,EAAM,OACvBq3B,WACVlY,EAAMkY,SAAW,EACjBL,EAAU7X,EAAM1N,MAAM2H,KACtB+F,EAAM1N,MAAM2H,KAAO,WACZ+F,EAAMkY,UACXL,MAIH7X,EAAMkY,WAENR,EAAK9c,OAAQ,WAGZ8c,EAAK9c,OAAQ,WACZoF,EAAMkY,WACA14B,EAAOua,MAAOlZ,EAAM,MAAOf,QAChCkgB,EAAM1N,MAAM2H,YAOFuO,EAEb,GADA7kB,EAAQ6kB,EAAOtJ,GACV2W,GAAS5rB,KAAMtG,GAAU,CAG7B,UAFO6kB,EAAOtJ,GACdiD,EAASA,GAAoB,WAAVxe,EACdA,KAAYqyB,EAAS,OAAS,QAAW,CAI7C,GAAe,SAAVryB,IAAoBs0B,QAAiC31B,IAArB21B,EAAU/Y,GAK9C,SAJA8W,GAAS,EAOXhL,EAAM9L,GAAS+Y,GAAYA,EAAU/Y,IAAU1f,EAAOuhB,MAAOlgB,EAAMqe,GAMrE,IADA4Y,GAAat4B,EAAOyD,cAAeulB,MAChBhpB,EAAOyD,cAAe+nB,GA8DzC,IAAM9L,KAzDD8Y,GAA2B,IAAlBn3B,EAAK7C,WAMlBi5B,EAAKkB,SAAW,CAAEpX,EAAMoX,SAAUpX,EAAMqX,UAAWrX,EAAMsX,WAIlC,OADvBN,EAAiBE,GAAYA,EAASjX,WAErC+W,EAAiB3Y,EAASjf,IAAKU,EAAM,YAGrB,UADjBmgB,EAAUxhB,EAAOyhB,IAAKpgB,EAAM,cAEtBk3B,EACJ/W,EAAU+W,GAIVjW,GAAU,CAAEjhB,IAAQ,GACpBk3B,EAAiBl3B,EAAKkgB,MAAMC,SAAW+W,EACvC/W,EAAUxhB,EAAOyhB,IAAKpgB,EAAM,WAC5BihB,GAAU,CAAEjhB,OAKG,WAAZmgB,GAAoC,iBAAZA,GAAgD,MAAlB+W,IACrB,SAAhCv4B,EAAOyhB,IAAKpgB,EAAM,WAGhBi3B,IACLJ,EAAKryB,KAAM,WACV0b,EAAMC,QAAU+W,IAEM,MAAlBA,IACJ/W,EAAUD,EAAMC,QAChB+W,EAA6B,SAAZ/W,EAAqB,GAAKA,IAG7CD,EAAMC,QAAU,iBAKdiW,EAAKkB,WACTpX,EAAMoX,SAAW,SACjBT,EAAK9c,OAAQ,WACZmG,EAAMoX,SAAWlB,EAAKkB,SAAU,GAChCpX,EAAMqX,UAAYnB,EAAKkB,SAAU,GACjCpX,EAAMsX,UAAYpB,EAAKkB,SAAU,MAKnCL,GAAY,EACE9M,EAGP8M,IACAG,EACC,WAAYA,IAChBjC,EAASiC,EAASjC,QAGnBiC,EAAW7Y,EAASxB,OAAQ/c,EAAM,SAAU,CAAEmgB,QAAS+W,IAInD5V,IACJ8V,EAASjC,QAAUA,GAIfA,GACJlU,GAAU,CAAEjhB,IAAQ,GAKrB62B,EAAKryB,KAAM,WASV,IAAM6Z,KAJA8W,GACLlU,GAAU,CAAEjhB,IAEbue,EAAShF,OAAQvZ,EAAM,UACTmqB,EACbxrB,EAAOuhB,MAAOlgB,EAAMqe,EAAM8L,EAAM9L,OAMnC4Y,EAAYvB,GAAaP,EAASiC,EAAU/Y,GAAS,EAAGA,EAAMwY,GACtDxY,KAAQ+Y,IACfA,EAAU/Y,GAAS4Y,EAAUpnB,MACxBslB,IACJ8B,EAAUt2B,IAAMs2B,EAAUpnB,MAC1BonB,EAAUpnB,MAAQ,MAuMrB4nB,UAAW,SAAU33B,EAAUisB,GACzBA,EACJ6J,GAAUI,WAAWzoB,QAASzN,GAE9B81B,GAAUI,WAAWx5B,KAAMsD,MAK9BnB,EAAO+4B,MAAQ,SAAUA,EAAOhG,EAAQ5yB,GACvC,IAAIi2B,EAAM2C,GAA0B,iBAAVA,EAAqB/4B,EAAOmC,OAAQ,GAAI42B,GAAU,CAC3Ef,SAAU73B,IAAOA,GAAM4yB,GACtBz0B,EAAYy6B,IAAWA,EACxBxD,SAAUwD,EACVhG,OAAQ5yB,GAAM4yB,GAAUA,IAAWz0B,EAAYy0B,IAAYA,GAoC5D,OAhCK/yB,EAAO01B,GAAG/P,IACdyQ,EAAIb,SAAW,EAGc,iBAAjBa,EAAIb,WACVa,EAAIb,YAAYv1B,EAAO01B,GAAGsD,OAC9B5C,EAAIb,SAAWv1B,EAAO01B,GAAGsD,OAAQ5C,EAAIb,UAGrCa,EAAIb,SAAWv1B,EAAO01B,GAAGsD,OAAOtV,UAMjB,MAAb0S,EAAI7b,QAA+B,IAAd6b,EAAI7b,QAC7B6b,EAAI7b,MAAQ,MAIb6b,EAAI/H,IAAM+H,EAAI4B,SAEd5B,EAAI4B,SAAW,WACT15B,EAAY83B,EAAI/H,MACpB+H,EAAI/H,IAAI3wB,KAAMT,MAGVm5B,EAAI7b,OACRva,EAAOsgB,QAASrjB,KAAMm5B,EAAI7b,QAIrB6b,GAGRp2B,EAAOG,GAAGgC,OAAQ,CACjB82B,OAAQ,SAAUF,EAAOG,EAAInG,EAAQ5xB,GAGpC,OAAOlE,KAAKqQ,OAAQgU,IAAqBG,IAAK,UAAW,GAAIc,OAG3DvgB,MAAMm3B,QAAS,CAAElG,QAASiG,GAAMH,EAAOhG,EAAQ5xB,IAElDg4B,QAAS,SAAUzZ,EAAMqZ,EAAOhG,EAAQ5xB,GACvC,IAAI2R,EAAQ9S,EAAOyD,cAAeic,GACjC0Z,EAASp5B,EAAO+4B,MAAOA,EAAOhG,EAAQ5xB,GACtCk4B,EAAc,WAGb,IAAInB,EAAOjB,GAAWh6B,KAAM+C,EAAOmC,OAAQ,GAAIud,GAAQ0Z,IAGlDtmB,GAAS8M,EAASjf,IAAK1D,KAAM,YACjCi7B,EAAKxX,MAAM,IAKd,OAFC2Y,EAAYC,OAASD,EAEfvmB,IAA0B,IAAjBsmB,EAAO7e,MACtBtd,KAAKiE,KAAMm4B,GACXp8B,KAAKsd,MAAO6e,EAAO7e,MAAO8e,IAE5B3Y,KAAM,SAAU/hB,EAAMiiB,EAAYiX,GACjC,IAAI0B,EAAY,SAAU/Y,GACzB,IAAIE,EAAOF,EAAME,YACVF,EAAME,KACbA,EAAMmX,IAYP,MATqB,iBAATl5B,IACXk5B,EAAUjX,EACVA,EAAajiB,EACbA,OAAOmE,GAEH8d,GACJ3jB,KAAKsd,MAAO5b,GAAQ,KAAM,IAGpB1B,KAAKiE,KAAM,WACjB,IAAIof,GAAU,EACbhI,EAAgB,MAAR3Z,GAAgBA,EAAO,aAC/B66B,EAASx5B,EAAOw5B,OAChB/Z,EAAOG,EAASjf,IAAK1D,MAEtB,GAAKqb,EACCmH,EAAMnH,IAAWmH,EAAMnH,GAAQoI,MACnC6Y,EAAW9Z,EAAMnH,SAGlB,IAAMA,KAASmH,EACTA,EAAMnH,IAAWmH,EAAMnH,GAAQoI,MAAQ4V,GAAK7rB,KAAM6N,IACtDihB,EAAW9Z,EAAMnH,IAKpB,IAAMA,EAAQkhB,EAAOl5B,OAAQgY,KACvBkhB,EAAQlhB,GAAQjX,OAASpE,MACnB,MAAR0B,GAAgB66B,EAAQlhB,GAAQiC,QAAU5b,IAE5C66B,EAAQlhB,GAAQ4f,KAAKxX,KAAMmX,GAC3BvX,GAAU,EACVkZ,EAAOt3B,OAAQoW,EAAO,KAOnBgI,GAAYuX,GAChB73B,EAAOsgB,QAASrjB,KAAM0B,MAIzB26B,OAAQ,SAAU36B,GAIjB,OAHc,IAATA,IACJA,EAAOA,GAAQ,MAET1B,KAAKiE,KAAM,WACjB,IAAIoX,EACHmH,EAAOG,EAASjf,IAAK1D,MACrBsd,EAAQkF,EAAM9gB,EAAO,SACrB6hB,EAAQf,EAAM9gB,EAAO,cACrB66B,EAASx5B,EAAOw5B,OAChBl5B,EAASia,EAAQA,EAAMja,OAAS,EAajC,IAVAmf,EAAK6Z,QAAS,EAGdt5B,EAAOua,MAAOtd,KAAM0B,EAAM,IAErB6hB,GAASA,EAAME,MACnBF,EAAME,KAAKhjB,KAAMT,MAAM,GAIlBqb,EAAQkhB,EAAOl5B,OAAQgY,KACvBkhB,EAAQlhB,GAAQjX,OAASpE,MAAQu8B,EAAQlhB,GAAQiC,QAAU5b,IAC/D66B,EAAQlhB,GAAQ4f,KAAKxX,MAAM,GAC3B8Y,EAAOt3B,OAAQoW,EAAO,IAKxB,IAAMA,EAAQ,EAAGA,EAAQhY,EAAQgY,IAC3BiC,EAAOjC,IAAWiC,EAAOjC,GAAQghB,QACrC/e,EAAOjC,GAAQghB,OAAO57B,KAAMT,aAKvBwiB,EAAK6Z,YAKft5B,EAAOkB,KAAM,CAAE,SAAU,OAAQ,QAAU,SAAUsD,EAAInC,GACxD,IAAIo3B,EAAQz5B,EAAOG,GAAIkC,GACvBrC,EAAOG,GAAIkC,GAAS,SAAU02B,EAAOhG,EAAQ5xB,GAC5C,OAAgB,MAAT43B,GAAkC,kBAAVA,EAC9BU,EAAM77B,MAAOX,KAAMqE,WACnBrE,KAAKk8B,QAAStC,GAAOx0B,GAAM,GAAQ02B,EAAOhG,EAAQ5xB,MAKrDnB,EAAOkB,KAAM,CACZw4B,UAAW7C,GAAO,QAClB8C,QAAS9C,GAAO,QAChB+C,YAAa/C,GAAO,UACpBgD,OAAQ,CAAE5G,QAAS,QACnB6G,QAAS,CAAE7G,QAAS,QACpB8G,WAAY,CAAE9G,QAAS,WACrB,SAAU5wB,EAAM2mB,GAClBhpB,EAAOG,GAAIkC,GAAS,SAAU02B,EAAOhG,EAAQ5xB,GAC5C,OAAOlE,KAAKk8B,QAASnQ,EAAO+P,EAAOhG,EAAQ5xB,MAI7CnB,EAAOw5B,OAAS,GAChBx5B,EAAO01B,GAAGiB,KAAO,WAChB,IAAIsB,EACH94B,EAAI,EACJq6B,EAASx5B,EAAOw5B,OAIjB,IAFAtD,GAAQxwB,KAAK2jB,MAELlqB,EAAIq6B,EAAOl5B,OAAQnB,KAC1B84B,EAAQuB,EAAQr6B,OAGCq6B,EAAQr6B,KAAQ84B,GAChCuB,EAAOt3B,OAAQ/C,IAAK,GAIhBq6B,EAAOl5B,QACZN,EAAO01B,GAAGhV,OAEXwV,QAAQpzB,GAGT9C,EAAO01B,GAAGuC,MAAQ,SAAUA,GAC3Bj4B,EAAOw5B,OAAO37B,KAAMo6B,GACpBj4B,EAAO01B,GAAGxkB,SAGXlR,EAAO01B,GAAGgB,SAAW,GACrB12B,EAAO01B,GAAGxkB,MAAQ,WACZilB,KAILA,IAAa,EACbI,OAGDv2B,EAAO01B,GAAGhV,KAAO,WAChByV,GAAa,MAGdn2B,EAAO01B,GAAGsD,OAAS,CAClBgB,KAAM,IACNC,KAAM,IAGNvW,SAAU,KAMX1jB,EAAOG,GAAG+5B,MAAQ,SAAUC,EAAMx7B,GAIjC,OAHAw7B,EAAOn6B,EAAO01B,IAAK11B,EAAO01B,GAAGsD,OAAQmB,IAAiBA,EACtDx7B,EAAOA,GAAQ,KAER1B,KAAKsd,MAAO5b,EAAM,SAAU4K,EAAMiX,GACxC,IAAI4Z,EAAUp9B,EAAO8f,WAAYvT,EAAM4wB,GACvC3Z,EAAME,KAAO,WACZ1jB,EAAOq9B,aAAcD,OAOnBxsB,GAAQ/Q,EAASyC,cAAe,SAEnC82B,GADSv5B,EAASyC,cAAe,UACpBK,YAAa9C,EAASyC,cAAe,WAEnDsO,GAAMjP,KAAO,WAIbN,EAAQi8B,QAA0B,KAAhB1sB,GAAMzJ,MAIxB9F,EAAQk8B,YAAcnE,GAAIxjB,UAI1BhF,GAAQ/Q,EAASyC,cAAe,UAC1B6E,MAAQ,IACdyJ,GAAMjP,KAAO,QACbN,EAAQm8B,WAA6B,MAAhB5sB,GAAMzJ,MAI5B,IAAIs2B,GACH7uB,GAAa5L,EAAO6O,KAAKjD,WAE1B5L,EAAOG,GAAGgC,OAAQ,CACjB4M,KAAM,SAAU1M,EAAM8B,GACrB,OAAOia,EAAQnhB,KAAM+C,EAAO+O,KAAM1M,EAAM8B,EAA0B,EAAnB7C,UAAUhB,SAG1Do6B,WAAY,SAAUr4B,GACrB,OAAOpF,KAAKiE,KAAM,WACjBlB,EAAO06B,WAAYz9B,KAAMoF,QAK5BrC,EAAOmC,OAAQ,CACd4M,KAAM,SAAU1N,EAAMgB,EAAM8B,GAC3B,IAAIpD,EAAKyf,EACRma,EAAQt5B,EAAK7C,SAGd,GAAe,IAAVm8B,GAAyB,IAAVA,GAAyB,IAAVA,EAKnC,MAAkC,oBAAtBt5B,EAAK7B,aACTQ,EAAO0f,KAAMre,EAAMgB,EAAM8B,IAKlB,IAAVw2B,GAAgB36B,EAAO8W,SAAUzV,KACrCmf,EAAQxgB,EAAO46B,UAAWv4B,EAAKoC,iBAC5BzE,EAAO6O,KAAK/E,MAAMjC,KAAK4C,KAAMpI,GAASo4B,QAAW33B,SAGtCA,IAAVqB,EACW,OAAVA,OACJnE,EAAO06B,WAAYr5B,EAAMgB,GAIrBme,GAAS,QAASA,QACuB1d,KAA3C/B,EAAMyf,EAAMhB,IAAKne,EAAM8C,EAAO9B,IACzBtB,GAGRM,EAAK5B,aAAc4C,EAAM8B,EAAQ,IAC1BA,GAGHqc,GAAS,QAASA,GAA+C,QAApCzf,EAAMyf,EAAM7f,IAAKU,EAAMgB,IACjDtB,EAMM,OAHdA,EAAMf,EAAOwN,KAAKuB,KAAM1N,EAAMgB,SAGTS,EAAY/B,IAGlC65B,UAAW,CACVj8B,KAAM,CACL6gB,IAAK,SAAUne,EAAM8C,GACpB,IAAM9F,EAAQm8B,YAAwB,UAAVr2B,GAC3BkF,EAAUhI,EAAM,SAAY,CAC5B,IAAIjC,EAAMiC,EAAK8C,MAKf,OAJA9C,EAAK5B,aAAc,OAAQ0E,GACtB/E,IACJiC,EAAK8C,MAAQ/E,GAEP+E,MAMXu2B,WAAY,SAAUr5B,EAAM8C,GAC3B,IAAI9B,EACHlD,EAAI,EAIJ07B,EAAY12B,GAASA,EAAM2F,MAAOoP,GAEnC,GAAK2hB,GAA+B,IAAlBx5B,EAAK7C,SACtB,MAAU6D,EAAOw4B,EAAW17B,KAC3BkC,EAAK2J,gBAAiB3I,MAO1Bo4B,GAAW,CACVjb,IAAK,SAAUne,EAAM8C,EAAO9B,GAQ3B,OAPe,IAAV8B,EAGJnE,EAAO06B,WAAYr5B,EAAMgB,GAEzBhB,EAAK5B,aAAc4C,EAAMA,GAEnBA,IAITrC,EAAOkB,KAAMlB,EAAO6O,KAAK/E,MAAMjC,KAAKmZ,OAAOlX,MAAO,QAAU,SAAUtF,EAAInC,GACzE,IAAIy4B,EAASlvB,GAAYvJ,IAAUrC,EAAOwN,KAAKuB,KAE/CnD,GAAYvJ,GAAS,SAAUhB,EAAMgB,EAAMwC,GAC1C,IAAI9D,EAAKimB,EACR+T,EAAgB14B,EAAKoC,cAYtB,OAVMI,IAGLmiB,EAASpb,GAAYmvB,GACrBnvB,GAAYmvB,GAAkBh6B,EAC9BA,EAAqC,MAA/B+5B,EAAQz5B,EAAMgB,EAAMwC,GACzBk2B,EACA,KACDnvB,GAAYmvB,GAAkB/T,GAExBjmB,KAOT,IAAIi6B,GAAa,sCAChBC,GAAa,gBAyIb,SAASC,GAAkB/2B,GAE1B,OADaA,EAAM2F,MAAOoP,IAAmB,IAC/BrO,KAAM,KAItB,SAASswB,GAAU95B,GAClB,OAAOA,EAAK7B,cAAgB6B,EAAK7B,aAAc,UAAa,GAG7D,SAAS47B,GAAgBj3B,GACxB,OAAKvB,MAAMC,QAASsB,GACZA,EAEc,iBAAVA,GACJA,EAAM2F,MAAOoP,IAEd,GAxJRlZ,EAAOG,GAAGgC,OAAQ,CACjBud,KAAM,SAAUrd,EAAM8B,GACrB,OAAOia,EAAQnhB,KAAM+C,EAAO0f,KAAMrd,EAAM8B,EAA0B,EAAnB7C,UAAUhB,SAG1D+6B,WAAY,SAAUh5B,GACrB,OAAOpF,KAAKiE,KAAM,kBACVjE,KAAM+C,EAAOs7B,QAASj5B,IAAUA,QAK1CrC,EAAOmC,OAAQ,CACdud,KAAM,SAAUre,EAAMgB,EAAM8B,GAC3B,IAAIpD,EAAKyf,EACRma,EAAQt5B,EAAK7C,SAGd,GAAe,IAAVm8B,GAAyB,IAAVA,GAAyB,IAAVA,EAWnC,OAPe,IAAVA,GAAgB36B,EAAO8W,SAAUzV,KAGrCgB,EAAOrC,EAAOs7B,QAASj5B,IAAUA,EACjCme,EAAQxgB,EAAOm1B,UAAW9yB,SAGZS,IAAVqB,EACCqc,GAAS,QAASA,QACuB1d,KAA3C/B,EAAMyf,EAAMhB,IAAKne,EAAM8C,EAAO9B,IACzBtB,EAGCM,EAAMgB,GAAS8B,EAGpBqc,GAAS,QAASA,GAA+C,QAApCzf,EAAMyf,EAAM7f,IAAKU,EAAMgB,IACjDtB,EAGDM,EAAMgB,IAGd8yB,UAAW,CACV1iB,SAAU,CACT9R,IAAK,SAAUU,GAOd,IAAIk6B,EAAWv7B,EAAOwN,KAAKuB,KAAM1N,EAAM,YAEvC,OAAKk6B,EACGzK,SAAUyK,EAAU,IAI3BP,GAAWvwB,KAAMpJ,EAAKgI,WACtB4xB,GAAWxwB,KAAMpJ,EAAKgI,WACtBhI,EAAKmR,KAEE,GAGA,KAKX8oB,QAAS,CACRE,MAAO,UACPC,QAAS,eAYLp9B,EAAQk8B,cACbv6B,EAAOm1B,UAAUviB,SAAW,CAC3BjS,IAAK,SAAUU,GAId,IAAI8P,EAAS9P,EAAKzB,WAIlB,OAHKuR,GAAUA,EAAOvR,YACrBuR,EAAOvR,WAAWiT,cAEZ,MAER2M,IAAK,SAAUne,GAId,IAAI8P,EAAS9P,EAAKzB,WACbuR,IACJA,EAAO0B,cAEF1B,EAAOvR,YACXuR,EAAOvR,WAAWiT,kBAOvB7S,EAAOkB,KAAM,CACZ,WACA,WACA,YACA,cACA,cACA,UACA,UACA,SACA,cACA,mBACE,WACFlB,EAAOs7B,QAASr+B,KAAKwH,eAAkBxH,OA4BxC+C,EAAOG,GAAGgC,OAAQ,CACjBu5B,SAAU,SAAUv3B,GACnB,IAAIw3B,EAASt6B,EAAMyK,EAAK8vB,EAAUC,EAAO95B,EAAG+5B,EAC3C38B,EAAI,EAEL,GAAKb,EAAY6F,GAChB,OAAOlH,KAAKiE,KAAM,SAAUa,GAC3B/B,EAAQ/C,MAAOy+B,SAAUv3B,EAAMzG,KAAMT,KAAM8E,EAAGo5B,GAAUl+B,UAM1D,IAFA0+B,EAAUP,GAAgBj3B,IAEb7D,OACZ,MAAUe,EAAOpE,KAAMkC,KAItB,GAHAy8B,EAAWT,GAAU95B,GACrByK,EAAwB,IAAlBzK,EAAK7C,UAAoB,IAAM08B,GAAkBU,GAAa,IAEzD,CACV75B,EAAI,EACJ,MAAU85B,EAAQF,EAAS55B,KACrB+J,EAAIhO,QAAS,IAAM+9B,EAAQ,KAAQ,IACvC/vB,GAAO+vB,EAAQ,KAMZD,KADLE,EAAaZ,GAAkBpvB,KAE9BzK,EAAK5B,aAAc,QAASq8B,GAMhC,OAAO7+B,MAGR8+B,YAAa,SAAU53B,GACtB,IAAIw3B,EAASt6B,EAAMyK,EAAK8vB,EAAUC,EAAO95B,EAAG+5B,EAC3C38B,EAAI,EAEL,GAAKb,EAAY6F,GAChB,OAAOlH,KAAKiE,KAAM,SAAUa,GAC3B/B,EAAQ/C,MAAO8+B,YAAa53B,EAAMzG,KAAMT,KAAM8E,EAAGo5B,GAAUl+B,UAI7D,IAAMqE,UAAUhB,OACf,OAAOrD,KAAK8R,KAAM,QAAS,IAK5B,IAFA4sB,EAAUP,GAAgBj3B,IAEb7D,OACZ,MAAUe,EAAOpE,KAAMkC,KAMtB,GALAy8B,EAAWT,GAAU95B,GAGrByK,EAAwB,IAAlBzK,EAAK7C,UAAoB,IAAM08B,GAAkBU,GAAa,IAEzD,CACV75B,EAAI,EACJ,MAAU85B,EAAQF,EAAS55B,KAG1B,OAA4C,EAApC+J,EAAIhO,QAAS,IAAM+9B,EAAQ,KAClC/vB,EAAMA,EAAI5I,QAAS,IAAM24B,EAAQ,IAAK,KAMnCD,KADLE,EAAaZ,GAAkBpvB,KAE9BzK,EAAK5B,aAAc,QAASq8B,GAMhC,OAAO7+B,MAGR++B,YAAa,SAAU73B,EAAO83B,GAC7B,IAAIt9B,SAAcwF,EACjB+3B,EAAwB,WAATv9B,GAAqBiE,MAAMC,QAASsB,GAEpD,MAAyB,kBAAb83B,GAA0BC,EAC9BD,EAAWh/B,KAAKy+B,SAAUv3B,GAAUlH,KAAK8+B,YAAa53B,GAGzD7F,EAAY6F,GACTlH,KAAKiE,KAAM,SAAU/B,GAC3Ba,EAAQ/C,MAAO++B,YACd73B,EAAMzG,KAAMT,KAAMkC,EAAGg8B,GAAUl+B,MAAQg/B,GACvCA,KAKIh/B,KAAKiE,KAAM,WACjB,IAAIgM,EAAW/N,EAAGsY,EAAM0kB,EAExB,GAAKD,EAAe,CAGnB/8B,EAAI,EACJsY,EAAOzX,EAAQ/C,MACfk/B,EAAaf,GAAgBj3B,GAE7B,MAAU+I,EAAYivB,EAAYh9B,KAG5BsY,EAAK2kB,SAAUlvB,GACnBuK,EAAKskB,YAAa7uB,GAElBuK,EAAKikB,SAAUxuB,aAKIpK,IAAVqB,GAAgC,YAATxF,KAClCuO,EAAYiuB,GAAUl+B,QAIrB2iB,EAASJ,IAAKviB,KAAM,gBAAiBiQ,GAOjCjQ,KAAKwC,cACTxC,KAAKwC,aAAc,QAClByN,IAAuB,IAAV/I,EACb,GACAyb,EAASjf,IAAK1D,KAAM,kBAAqB,QAO9Cm/B,SAAU,SAAUn8B,GACnB,IAAIiN,EAAW7L,EACdlC,EAAI,EAEL+N,EAAY,IAAMjN,EAAW,IAC7B,MAAUoB,EAAOpE,KAAMkC,KACtB,GAAuB,IAAlBkC,EAAK7C,WACoE,GAA3E,IAAM08B,GAAkBC,GAAU95B,IAAW,KAAMvD,QAASoP,GAC7D,OAAO,EAIV,OAAO,KAOT,IAAImvB,GAAU,MAEdr8B,EAAOG,GAAGgC,OAAQ,CACjB/C,IAAK,SAAU+E,GACd,IAAIqc,EAAOzf,EAAKyrB,EACfnrB,EAAOpE,KAAM,GAEd,OAAMqE,UAAUhB,QA0BhBksB,EAAkBluB,EAAY6F,GAEvBlH,KAAKiE,KAAM,SAAU/B,GAC3B,IAAIC,EAEmB,IAAlBnC,KAAKuB,WAWE,OANXY,EADIotB,EACEroB,EAAMzG,KAAMT,KAAMkC,EAAGa,EAAQ/C,MAAOmC,OAEpC+E,GAKN/E,EAAM,GAEoB,iBAARA,EAClBA,GAAO,GAEIwD,MAAMC,QAASzD,KAC1BA,EAAMY,EAAOoB,IAAKhC,EAAK,SAAU+E,GAChC,OAAgB,MAATA,EAAgB,GAAKA,EAAQ,OAItCqc,EAAQxgB,EAAOs8B,SAAUr/B,KAAK0B,OAAUqB,EAAOs8B,SAAUr/B,KAAKoM,SAAS5E,iBAGrD,QAAS+b,QAA+C1d,IAApC0d,EAAMhB,IAAKviB,KAAMmC,EAAK,WAC3DnC,KAAKkH,MAAQ/E,OAzDTiC,GACJmf,EAAQxgB,EAAOs8B,SAAUj7B,EAAK1C,OAC7BqB,EAAOs8B,SAAUj7B,EAAKgI,SAAS5E,iBAG/B,QAAS+b,QACgC1d,KAAvC/B,EAAMyf,EAAM7f,IAAKU,EAAM,UAElBN,EAMY,iBAHpBA,EAAMM,EAAK8C,OAIHpD,EAAImC,QAASm5B,GAAS,IAIhB,MAAPt7B,EAAc,GAAKA,OAG3B,KAyCHf,EAAOmC,OAAQ,CACdm6B,SAAU,CACTlZ,OAAQ,CACPziB,IAAK,SAAUU,GAEd,IAAIjC,EAAMY,EAAOwN,KAAKuB,KAAM1N,EAAM,SAClC,OAAc,MAAPjC,EACNA,EAMA87B,GAAkBl7B,EAAOT,KAAM8B,MAGlC2D,OAAQ,CACPrE,IAAK,SAAUU,GACd,IAAI8C,EAAOif,EAAQjkB,EAClBiD,EAAUf,EAAKe,QACfkW,EAAQjX,EAAKwR,cACb2S,EAAoB,eAAdnkB,EAAK1C,KACX6jB,EAASgD,EAAM,KAAO,GACtBwM,EAAMxM,EAAMlN,EAAQ,EAAIlW,EAAQ9B,OAUjC,IAPCnB,EADImZ,EAAQ,EACR0Z,EAGAxM,EAAMlN,EAAQ,EAIXnZ,EAAI6yB,EAAK7yB,IAKhB,KAJAikB,EAAShhB,EAASjD,IAIJyT,UAAYzT,IAAMmZ,KAG7B8K,EAAOha,YACLga,EAAOxjB,WAAWwJ,WACnBC,EAAU+Z,EAAOxjB,WAAY,aAAiB,CAMjD,GAHAuE,EAAQnE,EAAQojB,GAAShkB,MAGpBomB,EACJ,OAAOrhB,EAIRqe,EAAO3kB,KAAMsG,GAIf,OAAOqe,GAGRhD,IAAK,SAAUne,EAAM8C,GACpB,IAAIo4B,EAAWnZ,EACdhhB,EAAUf,EAAKe,QACfogB,EAASxiB,EAAO2D,UAAWQ,GAC3BhF,EAAIiD,EAAQ9B,OAEb,MAAQnB,MACPikB,EAAShhB,EAASjD,IAINyT,UACuD,EAAlE5S,EAAO6D,QAAS7D,EAAOs8B,SAASlZ,OAAOziB,IAAKyiB,GAAUZ,MAEtD+Z,GAAY,GAUd,OAHMA,IACLl7B,EAAKwR,eAAiB,GAEhB2P,OAOXxiB,EAAOkB,KAAM,CAAE,QAAS,YAAc,WACrClB,EAAOs8B,SAAUr/B,MAAS,CACzBuiB,IAAK,SAAUne,EAAM8C,GACpB,GAAKvB,MAAMC,QAASsB,GACnB,OAAS9C,EAAKsR,SAA2D,EAAjD3S,EAAO6D,QAAS7D,EAAQqB,GAAOjC,MAAO+E,KAI3D9F,EAAQi8B,UACbt6B,EAAOs8B,SAAUr/B,MAAO0D,IAAM,SAAUU,GACvC,OAAwC,OAAjCA,EAAK7B,aAAc,SAAqB,KAAO6B,EAAK8C,UAW9D9F,EAAQm+B,QAAU,cAAex/B,EAGjC,IAAIy/B,GAAc,kCACjBC,GAA0B,SAAUjzB,GACnCA,EAAEwc,mBAGJjmB,EAAOmC,OAAQnC,EAAO0lB,MAAO,CAE5BU,QAAS,SAAUV,EAAOjG,EAAMpe,EAAMs7B,GAErC,IAAIx9B,EAAG2M,EAAK6B,EAAKivB,EAAYC,EAAQ7V,EAAQ7K,EAAS2gB,EACrDC,EAAY,CAAE17B,GAAQxE,GACtB8B,EAAOV,EAAOP,KAAMgoB,EAAO,QAAWA,EAAM/mB,KAAO+mB,EACnDkB,EAAa3oB,EAAOP,KAAMgoB,EAAO,aAAgBA,EAAMjZ,UAAUlI,MAAO,KAAQ,GAKjF,GAHAuH,EAAMgxB,EAAcnvB,EAAMtM,EAAOA,GAAQxE,EAGlB,IAAlBwE,EAAK7C,UAAoC,IAAlB6C,EAAK7C,WAK5Bi+B,GAAYhyB,KAAM9L,EAAOqB,EAAO0lB,MAAMuB,cAIf,EAAvBtoB,EAAKb,QAAS,OAIlBa,GADAioB,EAAajoB,EAAK4F,MAAO,MACP8G,QAClBub,EAAW3kB,QAEZ46B,EAASl+B,EAAKb,QAAS,KAAQ,GAAK,KAAOa,GAG3C+mB,EAAQA,EAAO1lB,EAAO+C,SACrB2iB,EACA,IAAI1lB,EAAOqmB,MAAO1nB,EAAuB,iBAAV+mB,GAAsBA,IAGhDK,UAAY4W,EAAe,EAAI,EACrCjX,EAAMjZ,UAAYma,EAAW/b,KAAM,KACnC6a,EAAMwC,WAAaxC,EAAMjZ,UACxB,IAAI1F,OAAQ,UAAY6f,EAAW/b,KAAM,iBAAoB,WAC7D,KAGD6a,EAAMnV,YAASzN,EACT4iB,EAAMjjB,SACXijB,EAAMjjB,OAASpB,GAIhBoe,EAAe,MAARA,EACN,CAAEiG,GACF1lB,EAAO2D,UAAW8b,EAAM,CAAEiG,IAG3BvJ,EAAUnc,EAAO0lB,MAAMvJ,QAASxd,IAAU,GACpCg+B,IAAgBxgB,EAAQiK,UAAmD,IAAxCjK,EAAQiK,QAAQxoB,MAAOyD,EAAMoe,IAAtE,CAMA,IAAMkd,IAAiBxgB,EAAQyM,WAAanqB,EAAU4C,GAAS,CAM9D,IAJAu7B,EAAazgB,EAAQ6J,cAAgBrnB,EAC/B89B,GAAYhyB,KAAMmyB,EAAaj+B,KACpCmN,EAAMA,EAAIlM,YAEHkM,EAAKA,EAAMA,EAAIlM,WACtBm9B,EAAUl/B,KAAMiO,GAChB6B,EAAM7B,EAIF6B,KAAUtM,EAAK6I,eAAiBrN,IACpCkgC,EAAUl/B,KAAM8P,EAAIb,aAAea,EAAIqvB,cAAgBhgC,GAKzDmC,EAAI,EACJ,OAAU2M,EAAMixB,EAAW59B,QAAYumB,EAAMqC,uBAC5C+U,EAAchxB,EACd4Z,EAAM/mB,KAAW,EAAJQ,EACZy9B,EACAzgB,EAAQgL,UAAYxoB,GAGrBqoB,GACEpH,EAASjf,IAAKmL,EAAK,WAAczO,OAAO0pB,OAAQ,OAC9CrB,EAAM/mB,OACTihB,EAASjf,IAAKmL,EAAK,YAEnBkb,EAAOppB,MAAOkO,EAAK2T,IAIpBuH,EAAS6V,GAAU/wB,EAAK+wB,KACT7V,EAAOppB,OAASshB,EAAYpT,KAC1C4Z,EAAMnV,OAASyW,EAAOppB,MAAOkO,EAAK2T,IACZ,IAAjBiG,EAAMnV,QACVmV,EAAMS,kBA8CT,OA1CAT,EAAM/mB,KAAOA,EAGPg+B,GAAiBjX,EAAMuD,sBAEpB9M,EAAQuH,WACqC,IAApDvH,EAAQuH,SAAS9lB,MAAOm/B,EAAUz2B,MAAOmZ,KACzCP,EAAY7d,IAIPw7B,GAAUv+B,EAAY+C,EAAM1C,MAAaF,EAAU4C,MAGvDsM,EAAMtM,EAAMw7B,MAGXx7B,EAAMw7B,GAAW,MAIlB78B,EAAO0lB,MAAMuB,UAAYtoB,EAEpB+mB,EAAMqC,wBACV+U,EAAY9vB,iBAAkBrO,EAAM+9B,IAGrCr7B,EAAM1C,KAED+mB,EAAMqC,wBACV+U,EAAY/e,oBAAqBpf,EAAM+9B,IAGxC18B,EAAO0lB,MAAMuB,eAAYnkB,EAEpB6K,IACJtM,EAAMw7B,GAAWlvB,IAMd+X,EAAMnV,SAKd0sB,SAAU,SAAUt+B,EAAM0C,EAAMqkB,GAC/B,IAAIjc,EAAIzJ,EAAOmC,OACd,IAAInC,EAAOqmB,MACXX,EACA,CACC/mB,KAAMA,EACN2qB,aAAa,IAIftpB,EAAO0lB,MAAMU,QAAS3c,EAAG,KAAMpI,MAKjCrB,EAAOG,GAAGgC,OAAQ,CAEjBikB,QAAS,SAAUznB,EAAM8gB,GACxB,OAAOxiB,KAAKiE,KAAM,WACjBlB,EAAO0lB,MAAMU,QAASznB,EAAM8gB,EAAMxiB,SAGpCigC,eAAgB,SAAUv+B,EAAM8gB,GAC/B,IAAIpe,EAAOpE,KAAM,GACjB,GAAKoE,EACJ,OAAOrB,EAAO0lB,MAAMU,QAASznB,EAAM8gB,EAAMpe,GAAM,MAc5ChD,EAAQm+B,SACbx8B,EAAOkB,KAAM,CAAEmR,MAAO,UAAW8Y,KAAM,YAAc,SAAUK,EAAM5D,GAGpE,IAAIjc,EAAU,SAAU+Z,GACvB1lB,EAAO0lB,MAAMuX,SAAUrV,EAAKlC,EAAMjjB,OAAQzC,EAAO0lB,MAAMkC,IAAKlC,KAG7D1lB,EAAO0lB,MAAMvJ,QAASyL,GAAQ,CAC7BP,MAAO,WAIN,IAAInoB,EAAMjC,KAAKiN,eAAiBjN,KAAKJ,UAAYI,KAChDkgC,EAAWvd,EAASxB,OAAQlf,EAAK0oB,GAE5BuV,GACLj+B,EAAI8N,iBAAkBwe,EAAM7f,GAAS,GAEtCiU,EAASxB,OAAQlf,EAAK0oB,GAAOuV,GAAY,GAAM,IAEhD3V,SAAU,WACT,IAAItoB,EAAMjC,KAAKiN,eAAiBjN,KAAKJ,UAAYI,KAChDkgC,EAAWvd,EAASxB,OAAQlf,EAAK0oB,GAAQ,EAEpCuV,EAKLvd,EAASxB,OAAQlf,EAAK0oB,EAAKuV,IAJ3Bj+B,EAAI6e,oBAAqByN,EAAM7f,GAAS,GACxCiU,EAAShF,OAAQ1b,EAAK0oB,QAS3B,IAAIzV,GAAWnV,EAAOmV,SAElBtT,GAAQ,CAAEuF,KAAMsB,KAAK2jB,OAErB+T,GAAS,KAKbp9B,EAAOq9B,SAAW,SAAU5d,GAC3B,IAAI3O,EACJ,IAAM2O,GAAwB,iBAATA,EACpB,OAAO,KAKR,IACC3O,GAAM,IAAM9T,EAAOsgC,WAAcC,gBAAiB9d,EAAM,YACvD,MAAQhW,GACTqH,OAAMhO,EAMP,OAHMgO,IAAOA,EAAIxG,qBAAsB,eAAgBhK,QACtDN,EAAOoD,MAAO,gBAAkBqc,GAE1B3O,GAIR,IACC0sB,GAAW,QACXC,GAAQ,SACRC,GAAkB,wCAClBC,GAAe,qCAEhB,SAASC,GAAa9I,EAAQv2B,EAAKs/B,EAAarlB,GAC/C,IAAInW,EAEJ,GAAKO,MAAMC,QAAStE,GAGnByB,EAAOkB,KAAM3C,EAAK,SAAUY,EAAGia,GACzBykB,GAAeL,GAAS/yB,KAAMqqB,GAGlCtc,EAAKsc,EAAQ1b,GAKbwkB,GACC9I,EAAS,KAAqB,iBAAN1b,GAAuB,MAALA,EAAYja,EAAI,IAAO,IACjEia,EACAykB,EACArlB,UAKG,GAAMqlB,GAAiC,WAAlB/9B,EAAQvB,GAUnCia,EAAKsc,EAAQv2B,QAPb,IAAM8D,KAAQ9D,EACbq/B,GAAa9I,EAAS,IAAMzyB,EAAO,IAAK9D,EAAK8D,GAAQw7B,EAAarlB,GAYrExY,EAAO89B,MAAQ,SAAU13B,EAAGy3B,GAC3B,IAAI/I,EACHiJ,EAAI,GACJvlB,EAAM,SAAUrN,EAAK6yB,GAGpB,IAAI75B,EAAQ7F,EAAY0/B,GACvBA,IACAA,EAEDD,EAAGA,EAAEz9B,QAAW29B,mBAAoB9yB,GAAQ,IAC3C8yB,mBAA6B,MAAT95B,EAAgB,GAAKA,IAG5C,GAAU,MAALiC,EACJ,MAAO,GAIR,GAAKxD,MAAMC,QAASuD,IAASA,EAAE5F,SAAWR,EAAO2C,cAAeyD,GAG/DpG,EAAOkB,KAAMkF,EAAG,WACfoS,EAAKvb,KAAKoF,KAAMpF,KAAKkH,cAOtB,IAAM2wB,KAAU1uB,EACfw3B,GAAa9I,EAAQ1uB,EAAG0uB,GAAU+I,EAAarlB,GAKjD,OAAOulB,EAAElzB,KAAM,MAGhB7K,EAAOG,GAAGgC,OAAQ,CACjB+7B,UAAW,WACV,OAAOl+B,EAAO89B,MAAO7gC,KAAKkhC,mBAE3BA,eAAgB,WACf,OAAOlhC,KAAKmE,IAAK,WAGhB,IAAI0N,EAAW9O,EAAO0f,KAAMziB,KAAM,YAClC,OAAO6R,EAAW9O,EAAO2D,UAAWmL,GAAa7R,OAEjDqQ,OAAQ,WACR,IAAI3O,EAAO1B,KAAK0B,KAGhB,OAAO1B,KAAKoF,OAASrC,EAAQ/C,MAAOia,GAAI,cACvCymB,GAAalzB,KAAMxN,KAAKoM,YAAeq0B,GAAgBjzB,KAAM9L,KAC3D1B,KAAK0V,UAAYkQ,GAAepY,KAAM9L,MAEzCyC,IAAK,SAAUoD,EAAInD,GACnB,IAAIjC,EAAMY,EAAQ/C,MAAOmC,MAEzB,OAAY,MAAPA,EACG,KAGHwD,MAAMC,QAASzD,GACZY,EAAOoB,IAAKhC,EAAK,SAAUA,GACjC,MAAO,CAAEiD,KAAMhB,EAAKgB,KAAM8B,MAAO/E,EAAI8D,QAASu6B,GAAO,WAIhD,CAAEp7B,KAAMhB,EAAKgB,KAAM8B,MAAO/E,EAAI8D,QAASu6B,GAAO,WAClD98B,SAKN,IACCy9B,GAAM,OACNC,GAAQ,OACRC,GAAa,gBACbC,GAAW,6BAIXC,GAAa,iBACbC,GAAY,QAWZpH,GAAa,GAObqH,GAAa,GAGbC,GAAW,KAAKhhC,OAAQ,KAGxBihC,GAAe/hC,EAASyC,cAAe,KAIxC,SAASu/B,GAA6BC,GAGrC,OAAO,SAAUC,EAAoB9jB,GAED,iBAAvB8jB,IACX9jB,EAAO8jB,EACPA,EAAqB,KAGtB,IAAIC,EACH7/B,EAAI,EACJ8/B,EAAYF,EAAmBt6B,cAAcqF,MAAOoP,IAAmB,GAExE,GAAK5a,EAAY2c,GAGhB,MAAU+jB,EAAWC,EAAW9/B,KAGR,MAAlB6/B,EAAU,IACdA,EAAWA,EAASzhC,MAAO,IAAO,KAChCuhC,EAAWE,GAAaF,EAAWE,IAAc,IAAKpwB,QAASqM,KAI/D6jB,EAAWE,GAAaF,EAAWE,IAAc,IAAKnhC,KAAMod,IAQnE,SAASikB,GAA+BJ,EAAW18B,EAASw1B,EAAiBuH,GAE5E,IAAIC,EAAY,GACfC,EAAqBP,IAAcJ,GAEpC,SAASY,EAASN,GACjB,IAAIpsB,EAcJ,OAbAwsB,EAAWJ,IAAa,EACxBh/B,EAAOkB,KAAM49B,EAAWE,IAAc,GAAI,SAAU/kB,EAAGslB,GACtD,IAAIC,EAAsBD,EAAoBn9B,EAASw1B,EAAiBuH,GACxE,MAAoC,iBAAxBK,GACVH,GAAqBD,EAAWI,GAKtBH,IACDzsB,EAAW4sB,QADf,GAHNp9B,EAAQ68B,UAAUrwB,QAAS4wB,GAC3BF,EAASE,IACF,KAKF5sB,EAGR,OAAO0sB,EAASl9B,EAAQ68B,UAAW,MAAUG,EAAW,MAASE,EAAS,KAM3E,SAASG,GAAYh9B,EAAQ7D,GAC5B,IAAIuM,EAAKzI,EACRg9B,EAAc1/B,EAAO2/B,aAAaD,aAAe,GAElD,IAAMv0B,KAAOvM,OACQkE,IAAflE,EAAKuM,MACPu0B,EAAav0B,GAAQ1I,EAAWC,IAAUA,EAAO,KAAUyI,GAAQvM,EAAKuM,IAO5E,OAJKzI,GACJ1C,EAAOmC,QAAQ,EAAMM,EAAQC,GAGvBD,EA/EPm8B,GAAapsB,KAAOL,GAASK,KAgP9BxS,EAAOmC,OAAQ,CAGdy9B,OAAQ,EAGRC,aAAc,GACdC,KAAM,GAENH,aAAc,CACbI,IAAK5tB,GAASK,KACd7T,KAAM,MACNqhC,QAvRgB,4DAuRQv1B,KAAM0H,GAAS8tB,UACvCxjC,QAAQ,EACRyjC,aAAa,EACbC,OAAO,EACPC,YAAa,mDAcbC,QAAS,CACRlI,IAAKwG,GACLp/B,KAAM,aACNktB,KAAM,YACN3b,IAAK,4BACLwvB,KAAM,qCAGPtoB,SAAU,CACTlH,IAAK,UACL2b,KAAM,SACN6T,KAAM,YAGPC,eAAgB,CACfzvB,IAAK,cACLvR,KAAM,eACN+gC,KAAM,gBAKPE,WAAY,CAGXC,SAAU/3B,OAGVg4B,aAAa,EAGbC,YAAa1gB,KAAKC,MAGlB0gB,WAAY5gC,EAAOq9B,UAOpBqC,YAAa,CACZK,KAAK,EACL7/B,SAAS,IAOX2gC,UAAW,SAAUp+B,EAAQq+B,GAC5B,OAAOA,EAGNrB,GAAYA,GAAYh9B,EAAQzC,EAAO2/B,cAAgBmB,GAGvDrB,GAAYz/B,EAAO2/B,aAAcl9B,IAGnCs+B,cAAelC,GAA6BxH,IAC5C2J,cAAenC,GAA6BH,IAG5CuC,KAAM,SAAUlB,EAAK39B,GAGA,iBAAR29B,IACX39B,EAAU29B,EACVA,OAAMj9B,GAIPV,EAAUA,GAAW,GAErB,IAAI8+B,EAGHC,EAGAC,EACAC,EAGAC,EAGAC,EAGAzjB,EAGA0jB,EAGAriC,EAGAsiC,EAGA1D,EAAI/9B,EAAO6gC,UAAW,GAAIz+B,GAG1Bs/B,EAAkB3D,EAAE79B,SAAW69B,EAG/B4D,EAAqB5D,EAAE79B,UACpBwhC,EAAgBljC,UAAYkjC,EAAgBlhC,QAC7CR,EAAQ0hC,GACR1hC,EAAO0lB,MAGTrK,EAAWrb,EAAOgb,WAClB4mB,EAAmB5hC,EAAO+Z,UAAW,eAGrC8nB,EAAa9D,EAAE8D,YAAc,GAG7BC,EAAiB,GACjBC,EAAsB,GAGtBC,EAAW,WAGX7C,EAAQ,CACPjhB,WAAY,EAGZ+jB,kBAAmB,SAAU92B,GAC5B,IAAIrB,EACJ,GAAKgU,EAAY,CAChB,IAAMujB,EAAkB,CACvBA,EAAkB,GAClB,MAAUv3B,EAAQy0B,GAASp0B,KAAMi3B,GAChCC,EAAiBv3B,EAAO,GAAIrF,cAAgB,MACzC48B,EAAiBv3B,EAAO,GAAIrF,cAAgB,MAAS,IACrD9G,OAAQmM,EAAO,IAGpBA,EAAQu3B,EAAiBl2B,EAAI1G,cAAgB,KAE9C,OAAgB,MAATqF,EAAgB,KAAOA,EAAMe,KAAM,OAI3Cq3B,sBAAuB,WACtB,OAAOpkB,EAAYsjB,EAAwB,MAI5Ce,iBAAkB,SAAU9/B,EAAM8B,GAMjC,OALkB,MAAb2Z,IACJzb,EAAO0/B,EAAqB1/B,EAAKoC,eAChCs9B,EAAqB1/B,EAAKoC,gBAAmBpC,EAC9Cy/B,EAAgBz/B,GAAS8B,GAEnBlH,MAIRmlC,iBAAkB,SAAUzjC,GAI3B,OAHkB,MAAbmf,IACJigB,EAAEsE,SAAW1jC,GAEP1B,MAIR4kC,WAAY,SAAUzgC,GACrB,IAAIpC,EACJ,GAAKoC,EACJ,GAAK0c,EAGJqhB,EAAM/jB,OAAQha,EAAK+9B,EAAMmD,cAIzB,IAAMtjC,KAAQoC,EACbygC,EAAY7iC,GAAS,CAAE6iC,EAAY7iC,GAAQoC,EAAKpC,IAInD,OAAO/B,MAIRslC,MAAO,SAAUC,GAChB,IAAIC,EAAYD,GAAcR,EAK9B,OAJKd,GACJA,EAAUqB,MAAOE,GAElB58B,EAAM,EAAG48B,GACFxlC,OAoBV,GAfAoe,EAASzB,QAASulB,GAKlBpB,EAAEgC,MAAUA,GAAOhC,EAAEgC,KAAO5tB,GAASK,MAAS,IAC5CtP,QAASu7B,GAAWtsB,GAAS8tB,SAAW,MAG1ClC,EAAEp/B,KAAOyD,EAAQuX,QAAUvX,EAAQzD,MAAQo/B,EAAEpkB,QAAUokB,EAAEp/B,KAGzDo/B,EAAEkB,WAAclB,EAAEiB,UAAY,KAAMv6B,cAAcqF,MAAOoP,IAAmB,CAAE,IAGxD,MAAjB6kB,EAAE2E,YAAsB,CAC5BnB,EAAY1kC,EAASyC,cAAe,KAKpC,IACCiiC,EAAU/uB,KAAOurB,EAAEgC,IAInBwB,EAAU/uB,KAAO+uB,EAAU/uB,KAC3BurB,EAAE2E,YAAc9D,GAAaqB,SAAW,KAAOrB,GAAa+D,MAC3DpB,EAAUtB,SAAW,KAAOsB,EAAUoB,KACtC,MAAQl5B,GAITs0B,EAAE2E,aAAc,GAalB,GARK3E,EAAEte,MAAQse,EAAEmC,aAAiC,iBAAXnC,EAAEte,OACxCse,EAAEte,KAAOzf,EAAO89B,MAAOC,EAAEte,KAAMse,EAAEF,cAIlCqB,GAA+B7H,GAAY0G,EAAG37B,EAAS+8B,GAGlDrhB,EACJ,OAAOqhB,EA8ER,IAAMhgC,KAzENqiC,EAAcxhC,EAAO0lB,OAASqY,EAAEthC,SAGQ,GAApBuD,EAAO4/B,UAC1B5/B,EAAO0lB,MAAMU,QAAS,aAIvB2X,EAAEp/B,KAAOo/B,EAAEp/B,KAAKogB,cAGhBgf,EAAE6E,YAAcpE,GAAW/zB,KAAMszB,EAAEp/B,MAKnCwiC,EAAWpD,EAAEgC,IAAI78B,QAASm7B,GAAO,IAG3BN,EAAE6E,WAwBI7E,EAAEte,MAAQse,EAAEmC,aACoD,KAAzEnC,EAAEqC,aAAe,IAAKtiC,QAAS,uCACjCigC,EAAEte,KAAOse,EAAEte,KAAKvc,QAASk7B,GAAK,OAvB9BqD,EAAW1D,EAAEgC,IAAIxiC,MAAO4jC,EAAS7gC,QAG5By9B,EAAEte,OAAUse,EAAEmC,aAAiC,iBAAXnC,EAAEte,QAC1C0hB,IAAc/D,GAAO3yB,KAAM02B,GAAa,IAAM,KAAQpD,EAAEte,YAGjDse,EAAEte,OAIO,IAAZse,EAAE7yB,QACNi2B,EAAWA,EAASj+B,QAASo7B,GAAY,MACzCmD,GAAarE,GAAO3yB,KAAM02B,GAAa,IAAM,KAAQ,KAAStiC,GAAMuF,OACnEq9B,GAIF1D,EAAEgC,IAAMoB,EAAWM,GASf1D,EAAE8E,aACD7iC,EAAO6/B,aAAcsB,IACzBhC,EAAMgD,iBAAkB,oBAAqBniC,EAAO6/B,aAAcsB,IAE9DnhC,EAAO8/B,KAAMqB,IACjBhC,EAAMgD,iBAAkB,gBAAiBniC,EAAO8/B,KAAMqB,MAKnDpD,EAAEte,MAAQse,EAAE6E,aAAgC,IAAlB7E,EAAEqC,aAAyBh+B,EAAQg+B,cACjEjB,EAAMgD,iBAAkB,eAAgBpE,EAAEqC,aAI3CjB,EAAMgD,iBACL,SACApE,EAAEkB,UAAW,IAAOlB,EAAEsC,QAAStC,EAAEkB,UAAW,IAC3ClB,EAAEsC,QAAStC,EAAEkB,UAAW,KACA,MAArBlB,EAAEkB,UAAW,GAAc,KAAON,GAAW,WAAa,IAC7DZ,EAAEsC,QAAS,MAIFtC,EAAE+E,QACZ3D,EAAMgD,iBAAkBhjC,EAAG4+B,EAAE+E,QAAS3jC,IAIvC,GAAK4+B,EAAEgF,cAC+C,IAAnDhF,EAAEgF,WAAWrlC,KAAMgkC,EAAiBvC,EAAOpB,IAAiBjgB,GAG9D,OAAOqhB,EAAMoD,QAed,GAXAP,EAAW,QAGXJ,EAAiBppB,IAAKulB,EAAE/F,UACxBmH,EAAMt5B,KAAMk4B,EAAEiF,SACd7D,EAAMtlB,KAAMkkB,EAAE36B,OAGd89B,EAAYhC,GAA+BR,GAAYX,EAAG37B,EAAS+8B,GAK5D,CASN,GARAA,EAAMjhB,WAAa,EAGdsjB,GACJG,EAAmBvb,QAAS,WAAY,CAAE+Y,EAAOpB,IAI7CjgB,EACJ,OAAOqhB,EAIHpB,EAAEoC,OAAqB,EAAZpC,EAAE3D,UACjBkH,EAAetkC,EAAO8f,WAAY,WACjCqiB,EAAMoD,MAAO,YACXxE,EAAE3D,UAGN,IACCtc,GAAY,EACZojB,EAAU+B,KAAMnB,EAAgBj8B,GAC/B,MAAQ4D,GAGT,GAAKqU,EACJ,MAAMrU,EAIP5D,GAAO,EAAG4D,SAhCX5D,GAAO,EAAG,gBAqCX,SAASA,EAAMy8B,EAAQY,EAAkBC,EAAWL,GACnD,IAAIM,EAAWJ,EAAS5/B,EAAOigC,EAAUC,EACxCd,EAAaU,EAGTplB,IAILA,GAAY,EAGPwjB,GACJtkC,EAAOq9B,aAAciH,GAKtBJ,OAAYp+B,EAGZs+B,EAAwB0B,GAAW,GAGnC3D,EAAMjhB,WAAsB,EAATokB,EAAa,EAAI,EAGpCc,EAAsB,KAAVd,GAAiBA,EAAS,KAAkB,MAAXA,EAGxCa,IACJE,EA7lBJ,SAA8BtF,EAAGoB,EAAOgE,GAEvC,IAAII,EAAI5kC,EAAM6kC,EAAeC,EAC5BzrB,EAAW+lB,EAAE/lB,SACbinB,EAAYlB,EAAEkB,UAGf,MAA2B,MAAnBA,EAAW,GAClBA,EAAU5zB,aACEvI,IAAPygC,IACJA,EAAKxF,EAAEsE,UAAYlD,EAAM8C,kBAAmB,iBAK9C,GAAKsB,EACJ,IAAM5kC,KAAQqZ,EACb,GAAKA,EAAUrZ,IAAUqZ,EAAUrZ,GAAO8L,KAAM84B,GAAO,CACtDtE,EAAUrwB,QAASjQ,GACnB,MAMH,GAAKsgC,EAAW,KAAOkE,EACtBK,EAAgBvE,EAAW,OACrB,CAGN,IAAMtgC,KAAQwkC,EAAY,CACzB,IAAMlE,EAAW,IAAOlB,EAAEyC,WAAY7hC,EAAO,IAAMsgC,EAAW,IAAQ,CACrEuE,EAAgB7kC,EAChB,MAEK8kC,IACLA,EAAgB9kC,GAKlB6kC,EAAgBA,GAAiBC,EAMlC,GAAKD,EAIJ,OAHKA,IAAkBvE,EAAW,IACjCA,EAAUrwB,QAAS40B,GAEbL,EAAWK,GA0iBLE,CAAqB3F,EAAGoB,EAAOgE,KAIrCC,IAAwD,EAA3CpjC,EAAO6D,QAAS,SAAUk6B,EAAEkB,aAC9ClB,EAAEyC,WAAY,eAAkB,cAIjC6C,EA5iBH,SAAsBtF,EAAGsF,EAAUlE,EAAOiE,GACzC,IAAIO,EAAOC,EAASC,EAAMl2B,EAAKsK,EAC9BuoB,EAAa,GAGbvB,EAAYlB,EAAEkB,UAAU1hC,QAGzB,GAAK0hC,EAAW,GACf,IAAM4E,KAAQ9F,EAAEyC,WACfA,EAAYqD,EAAKp/B,eAAkBs5B,EAAEyC,WAAYqD,GAInDD,EAAU3E,EAAU5zB,QAGpB,MAAQu4B,EAcP,GAZK7F,EAAEwC,eAAgBqD,KACtBzE,EAAOpB,EAAEwC,eAAgBqD,IAAcP,IAIlCprB,GAAQmrB,GAAarF,EAAE+F,aAC5BT,EAAWtF,EAAE+F,WAAYT,EAAUtF,EAAEiB,WAGtC/mB,EAAO2rB,EACPA,EAAU3E,EAAU5zB,QAKnB,GAAiB,MAAZu4B,EAEJA,EAAU3rB,OAGJ,GAAc,MAATA,GAAgBA,IAAS2rB,EAAU,CAM9C,KAHAC,EAAOrD,EAAYvoB,EAAO,IAAM2rB,IAAapD,EAAY,KAAOoD,IAI/D,IAAMD,KAASnD,EAId,IADA7yB,EAAMg2B,EAAMp/B,MAAO,MACT,KAAQq/B,IAGjBC,EAAOrD,EAAYvoB,EAAO,IAAMtK,EAAK,KACpC6yB,EAAY,KAAO7yB,EAAK,KACb,EAGG,IAATk2B,EACJA,EAAOrD,EAAYmD,IAGgB,IAAxBnD,EAAYmD,KACvBC,EAAUj2B,EAAK,GACfsxB,EAAUrwB,QAASjB,EAAK,KAEzB,MAOJ,IAAc,IAATk2B,EAGJ,GAAKA,GAAQ9F,EAAEgG,UACdV,EAAWQ,EAAMR,QAEjB,IACCA,EAAWQ,EAAMR,GAChB,MAAQ55B,GACT,MAAO,CACN0R,MAAO,cACP/X,MAAOygC,EAAOp6B,EAAI,sBAAwBwO,EAAO,OAAS2rB,IASjE,MAAO,CAAEzoB,MAAO,UAAWsE,KAAM4jB,GA+cpBW,CAAajG,EAAGsF,EAAUlE,EAAOiE,GAGvCA,GAGCrF,EAAE8E,cACNS,EAAWnE,EAAM8C,kBAAmB,oBAEnCjiC,EAAO6/B,aAAcsB,GAAamC,IAEnCA,EAAWnE,EAAM8C,kBAAmB,WAEnCjiC,EAAO8/B,KAAMqB,GAAamC,IAKZ,MAAXhB,GAA6B,SAAXvE,EAAEp/B,KACxB6jC,EAAa,YAGS,MAAXF,EACXE,EAAa,eAIbA,EAAaa,EAASloB,MACtB6nB,EAAUK,EAAS5jB,KAEnB2jB,IADAhgC,EAAQigC,EAASjgC,UAMlBA,EAAQo/B,GACHF,GAAWE,IACfA,EAAa,QACRF,EAAS,IACbA,EAAS,KAMZnD,EAAMmD,OAASA,EACfnD,EAAMqD,YAAeU,GAAoBV,GAAe,GAGnDY,EACJ/nB,EAASmB,YAAaklB,EAAiB,CAAEsB,EAASR,EAAYrD,IAE9D9jB,EAASuB,WAAY8kB,EAAiB,CAAEvC,EAAOqD,EAAYp/B,IAI5D+7B,EAAM0C,WAAYA,GAClBA,OAAa/+B,EAER0+B,GACJG,EAAmBvb,QAASgd,EAAY,cAAgB,YACvD,CAAEjE,EAAOpB,EAAGqF,EAAYJ,EAAU5/B,IAIpCw+B,EAAiB7mB,SAAU2mB,EAAiB,CAAEvC,EAAOqD,IAEhDhB,IACJG,EAAmBvb,QAAS,eAAgB,CAAE+Y,EAAOpB,MAG3C/9B,EAAO4/B,QAChB5/B,EAAO0lB,MAAMU,QAAS,cAKzB,OAAO+Y,GAGR8E,QAAS,SAAUlE,EAAKtgB,EAAMte,GAC7B,OAAOnB,EAAOW,IAAKo/B,EAAKtgB,EAAMte,EAAU,SAGzC+iC,UAAW,SAAUnE,EAAK5+B,GACzB,OAAOnB,EAAOW,IAAKo/B,OAAKj9B,EAAW3B,EAAU,aAI/CnB,EAAOkB,KAAM,CAAE,MAAO,QAAU,SAAUsD,EAAImV,GAC7C3Z,EAAQ2Z,GAAW,SAAUomB,EAAKtgB,EAAMte,EAAUxC,GAUjD,OAPKL,EAAYmhB,KAChB9gB,EAAOA,GAAQwC,EACfA,EAAWse,EACXA,OAAO3c,GAID9C,EAAOihC,KAAMjhC,EAAOmC,OAAQ,CAClC49B,IAAKA,EACLphC,KAAMgb,EACNqlB,SAAUrgC,EACV8gB,KAAMA,EACNujB,QAAS7hC,GACPnB,EAAO2C,cAAeo9B,IAASA,OAIpC//B,EAAO+gC,cAAe,SAAUhD,GAC/B,IAAI5+B,EACJ,IAAMA,KAAK4+B,EAAE+E,QACa,iBAApB3jC,EAAEsF,gBACNs5B,EAAEqC,YAAcrC,EAAE+E,QAAS3jC,IAAO,MAMrCa,EAAO0sB,SAAW,SAAUqT,EAAK39B,EAASlD,GACzC,OAAOc,EAAOihC,KAAM,CACnBlB,IAAKA,EAGLphC,KAAM,MACNqgC,SAAU,SACV9zB,OAAO,EACPi1B,OAAO,EACP1jC,QAAQ,EAKR+jC,WAAY,CACX2D,cAAe,cAEhBL,WAAY,SAAUT,GACrBrjC,EAAO0D,WAAY2/B,EAAUjhC,EAASlD,OAMzCc,EAAOG,GAAGgC,OAAQ,CACjBiiC,QAAS,SAAU3X,GAClB,IAAIjI,EAyBJ,OAvBKvnB,KAAM,KACLqB,EAAYmuB,KAChBA,EAAOA,EAAK/uB,KAAMT,KAAM,KAIzBunB,EAAOxkB,EAAQysB,EAAMxvB,KAAM,GAAIiN,eAAgB1I,GAAI,GAAIgB,OAAO,GAEzDvF,KAAM,GAAI2C,YACd4kB,EAAK6I,aAAcpwB,KAAM,IAG1BunB,EAAKpjB,IAAK,WACT,IAAIC,EAAOpE,KAEX,MAAQoE,EAAKgjC,kBACZhjC,EAAOA,EAAKgjC,kBAGb,OAAOhjC,IACJ8rB,OAAQlwB,OAGNA,MAGRqnC,UAAW,SAAU7X,GACpB,OAAKnuB,EAAYmuB,GACTxvB,KAAKiE,KAAM,SAAU/B,GAC3Ba,EAAQ/C,MAAOqnC,UAAW7X,EAAK/uB,KAAMT,KAAMkC,MAItClC,KAAKiE,KAAM,WACjB,IAAIuW,EAAOzX,EAAQ/C,MAClB+a,EAAWP,EAAKO,WAEZA,EAAS1X,OACb0X,EAASosB,QAAS3X,GAGlBhV,EAAK0V,OAAQV,MAKhBjI,KAAM,SAAUiI,GACf,IAAI8X,EAAiBjmC,EAAYmuB,GAEjC,OAAOxvB,KAAKiE,KAAM,SAAU/B,GAC3Ba,EAAQ/C,MAAOmnC,QAASG,EAAiB9X,EAAK/uB,KAAMT,KAAMkC,GAAMstB,MAIlE+X,OAAQ,SAAUvkC,GAIjB,OAHAhD,KAAKkU,OAAQlR,GAAW2R,IAAK,QAAS1Q,KAAM,WAC3ClB,EAAQ/C,MAAOuwB,YAAavwB,KAAKuM,cAE3BvM,QAKT+C,EAAO6O,KAAKhI,QAAQ2vB,OAAS,SAAUn1B,GACtC,OAAQrB,EAAO6O,KAAKhI,QAAQ49B,QAASpjC,IAEtCrB,EAAO6O,KAAKhI,QAAQ49B,QAAU,SAAUpjC,GACvC,SAAWA,EAAKyuB,aAAezuB,EAAKqjC,cAAgBrjC,EAAKwxB,iBAAiBvyB,SAM3EN,EAAO2/B,aAAagF,IAAM,WACzB,IACC,OAAO,IAAI3nC,EAAO4nC,eACjB,MAAQn7B,MAGX,IAAIo7B,GAAmB,CAGrBC,EAAG,IAIHC,KAAM,KAEPC,GAAehlC,EAAO2/B,aAAagF,MAEpCtmC,EAAQ4mC,OAASD,IAAkB,oBAAqBA,GACxD3mC,EAAQ4iC,KAAO+D,KAAiBA,GAEhChlC,EAAOghC,cAAe,SAAU5+B,GAC/B,IAAIjB,EAAU+jC,EAGd,GAAK7mC,EAAQ4mC,MAAQD,KAAiB5iC,EAAQsgC,YAC7C,MAAO,CACNO,KAAM,SAAUH,EAAS9K,GACxB,IAAI74B,EACHwlC,EAAMviC,EAAQuiC,MAWf,GATAA,EAAIQ,KACH/iC,EAAQzD,KACRyD,EAAQ29B,IACR39B,EAAQ+9B,MACR/9B,EAAQgjC,SACRhjC,EAAQmR,UAIJnR,EAAQijC,UACZ,IAAMlmC,KAAKiD,EAAQijC,UAClBV,EAAKxlC,GAAMiD,EAAQijC,UAAWlmC,GAmBhC,IAAMA,KAdDiD,EAAQigC,UAAYsC,EAAIvC,kBAC5BuC,EAAIvC,iBAAkBhgC,EAAQigC,UAQzBjgC,EAAQsgC,aAAgBI,EAAS,sBACtCA,EAAS,oBAAuB,kBAItBA,EACV6B,EAAIxC,iBAAkBhjC,EAAG2jC,EAAS3jC,IAInCgC,EAAW,SAAUxC,GACpB,OAAO,WACDwC,IACJA,EAAW+jC,EAAgBP,EAAIW,OAC9BX,EAAIY,QAAUZ,EAAIa,QAAUb,EAAIc,UAC/Bd,EAAIe,mBAAqB,KAEb,UAAT/mC,EACJgmC,EAAIpC,QACgB,UAAT5jC,EAKgB,iBAAfgmC,EAAIrC,OACftK,EAAU,EAAG,SAEbA,EAGC2M,EAAIrC,OACJqC,EAAInC,YAINxK,EACC6M,GAAkBF,EAAIrC,SAAYqC,EAAIrC,OACtCqC,EAAInC,WAK+B,UAAjCmC,EAAIgB,cAAgB,SACM,iBAArBhB,EAAIiB,aACV,CAAEC,OAAQlB,EAAItB,UACd,CAAE9jC,KAAMolC,EAAIiB,cACbjB,EAAIzC,4BAQTyC,EAAIW,OAASnkC,IACb+jC,EAAgBP,EAAIY,QAAUZ,EAAIc,UAAYtkC,EAAU,cAKnC2B,IAAhB6hC,EAAIa,QACRb,EAAIa,QAAUN,EAEdP,EAAIe,mBAAqB,WAGA,IAAnBf,EAAIzmB,YAMRlhB,EAAO8f,WAAY,WACb3b,GACJ+jC,OAQL/jC,EAAWA,EAAU,SAErB,IAGCwjC,EAAI1B,KAAM7gC,EAAQwgC,YAAcxgC,EAAQqd,MAAQ,MAC/C,MAAQhW,GAGT,GAAKtI,EACJ,MAAMsI,IAKT84B,MAAO,WACDphC,GACJA,QAWLnB,EAAO+gC,cAAe,SAAUhD,GAC1BA,EAAE2E,cACN3E,EAAE/lB,SAAS3Y,QAAS,KAKtBW,EAAO6gC,UAAW,CACjBR,QAAS,CACRhhC,OAAQ,6FAGT2Y,SAAU,CACT3Y,OAAQ,2BAETmhC,WAAY,CACX2D,cAAe,SAAU5kC,GAExB,OADAS,EAAO0D,WAAYnE,GACZA,MAMVS,EAAO+gC,cAAe,SAAU,SAAUhD,QACxBj7B,IAAZi7B,EAAE7yB,QACN6yB,EAAE7yB,OAAQ,GAEN6yB,EAAE2E,cACN3E,EAAEp/B,KAAO,SAKXqB,EAAOghC,cAAe,SAAU,SAAUjD,GAIxC,IAAI1+B,EAAQ8B,EADb,GAAK48B,EAAE2E,aAAe3E,EAAE+H,YAEvB,MAAO,CACN7C,KAAM,SAAUhpB,EAAG+d,GAClB34B,EAASW,EAAQ,YACf+O,KAAMgvB,EAAE+H,aAAe,IACvBpmB,KAAM,CAAEqmB,QAAShI,EAAEiI,cAAepnC,IAAKm/B,EAAEgC,MACzCza,GAAI,aAAcnkB,EAAW,SAAU8kC,GACvC5mC,EAAOub,SACPzZ,EAAW,KACN8kC,GACJjO,EAAuB,UAAbiO,EAAItnC,KAAmB,IAAM,IAAKsnC,EAAItnC,QAKnD9B,EAAS6C,KAAKC,YAAaN,EAAQ,KAEpCkjC,MAAO,WACDphC,GACJA,QAUL,IAqGKshB,GArGDyjB,GAAe,GAClBC,GAAS,oBAGVnmC,EAAO6gC,UAAW,CACjBuF,MAAO,WACPC,cAAe,WACd,IAAIllC,EAAW+kC,GAAa5/B,OAAWtG,EAAO+C,QAAU,IAAQlE,GAAMuF,OAEtE,OADAnH,KAAMkE,IAAa,EACZA,KAKTnB,EAAO+gC,cAAe,aAAc,SAAUhD,EAAGuI,EAAkBnH,GAElE,IAAIoH,EAAcC,EAAaC,EAC9BC,GAAuB,IAAZ3I,EAAEqI,QAAqBD,GAAO17B,KAAMszB,EAAEgC,KAChD,MACkB,iBAAXhC,EAAEte,MAE6C,KADnDse,EAAEqC,aAAe,IACjBtiC,QAAS,sCACXqoC,GAAO17B,KAAMszB,EAAEte,OAAU,QAI5B,GAAKinB,GAAiC,UAArB3I,EAAEkB,UAAW,GA8D7B,OA3DAsH,EAAexI,EAAEsI,cAAgB/nC,EAAYy/B,EAAEsI,eAC9CtI,EAAEsI,gBACFtI,EAAEsI,cAGEK,EACJ3I,EAAG2I,GAAa3I,EAAG2I,GAAWxjC,QAASijC,GAAQ,KAAOI,IAC/B,IAAZxI,EAAEqI,QACbrI,EAAEgC,MAAS3C,GAAO3yB,KAAMszB,EAAEgC,KAAQ,IAAM,KAAQhC,EAAEqI,MAAQ,IAAMG,GAIjExI,EAAEyC,WAAY,eAAkB,WAI/B,OAHMiG,GACLzmC,EAAOoD,MAAOmjC,EAAe,mBAEvBE,EAAmB,IAI3B1I,EAAEkB,UAAW,GAAM,OAGnBuH,EAAcxpC,EAAQupC,GACtBvpC,EAAQupC,GAAiB,WACxBE,EAAoBnlC,WAIrB69B,EAAM/jB,OAAQ,gBAGQtY,IAAhB0jC,EACJxmC,EAAQhD,GAASq+B,WAAYkL,GAI7BvpC,EAAQupC,GAAiBC,EAIrBzI,EAAGwI,KAGPxI,EAAEsI,cAAgBC,EAAiBD,cAGnCH,GAAaroC,KAAM0oC,IAIfE,GAAqBnoC,EAAYkoC,IACrCA,EAAaC,EAAmB,IAGjCA,EAAoBD,OAAc1jC,IAI5B,WAYTzE,EAAQsoC,qBACHlkB,GAAO5lB,EAAS+pC,eAAeD,mBAAoB,IAAKlkB,MACvD5U,UAAY,6BACiB,IAA3B4U,GAAKjZ,WAAWlJ,QAQxBN,EAAO2X,UAAY,SAAU8H,EAAMvf,EAAS2mC,GAC3C,MAAqB,iBAATpnB,EACJ,IAEgB,kBAAZvf,IACX2mC,EAAc3mC,EACdA,GAAU,GAKLA,IAIA7B,EAAQsoC,qBAMZ9yB,GALA3T,EAAUrD,EAAS+pC,eAAeD,mBAAoB,KAKvCrnC,cAAe,SACzBkT,KAAO3V,EAASsV,SAASK,KAC9BtS,EAAQR,KAAKC,YAAakU,IAE1B3T,EAAUrD,GAKZwnB,GAAWwiB,GAAe,IAD1BC,EAASxvB,EAAWnN,KAAMsV,IAKlB,CAAEvf,EAAQZ,cAAewnC,EAAQ,MAGzCA,EAAS1iB,GAAe,CAAE3E,GAAQvf,EAASmkB,GAEtCA,GAAWA,EAAQ/jB,QACvBN,EAAQqkB,GAAUzJ,SAGZ5a,EAAOgB,MAAO,GAAI8lC,EAAOt9B,cAlChC,IAAIqK,EAAMizB,EAAQziB,GAyCnBrkB,EAAOG,GAAGwoB,KAAO,SAAUoX,EAAKgH,EAAQ5lC,GACvC,IAAIlB,EAAUtB,EAAM0kC,EACnB5rB,EAAOxa,KACP0oB,EAAMoa,EAAIjiC,QAAS,KAsDpB,OApDY,EAAP6nB,IACJ1lB,EAAWi7B,GAAkB6E,EAAIxiC,MAAOooB,IACxCoa,EAAMA,EAAIxiC,MAAO,EAAGooB,IAIhBrnB,EAAYyoC,IAGhB5lC,EAAW4lC,EACXA,OAASjkC,GAGEikC,GAA4B,iBAAXA,IAC5BpoC,EAAO,QAIW,EAAd8Y,EAAKnX,QACTN,EAAOihC,KAAM,CACZlB,IAAKA,EAKLphC,KAAMA,GAAQ,MACdqgC,SAAU,OACVvf,KAAMsnB,IACHlhC,KAAM,SAAU+/B,GAGnBvC,EAAW/hC,UAEXmW,EAAKgV,KAAMxsB,EAIVD,EAAQ,SAAUmtB,OAAQntB,EAAO2X,UAAWiuB,IAAiBp4B,KAAMvN,GAGnE2lC,KAKExqB,OAAQja,GAAY,SAAUg+B,EAAOmD,GACxC7qB,EAAKvW,KAAM,WACVC,EAASvD,MAAOX,KAAMomC,GAAY,CAAElE,EAAMyG,aAActD,EAAQnD,QAK5DliC,MAMR+C,EAAO6O,KAAKhI,QAAQmgC,SAAW,SAAU3lC,GACxC,OAAOrB,EAAO2B,KAAM3B,EAAOw5B,OAAQ,SAAUr5B,GAC5C,OAAOkB,IAASlB,EAAGkB,OAChBf,QAMLN,EAAOinC,OAAS,CACfC,UAAW,SAAU7lC,EAAMe,EAASjD,GACnC,IAAIgoC,EAAaC,EAASC,EAAWC,EAAQC,EAAWC,EACvD5X,EAAW5vB,EAAOyhB,IAAKpgB,EAAM,YAC7BomC,EAAUznC,EAAQqB,GAClB2nB,EAAQ,GAGS,WAAb4G,IACJvuB,EAAKkgB,MAAMqO,SAAW,YAGvB2X,EAAYE,EAAQR,SACpBI,EAAYrnC,EAAOyhB,IAAKpgB,EAAM,OAC9BmmC,EAAaxnC,EAAOyhB,IAAKpgB,EAAM,SACI,aAAbuuB,GAAwC,UAAbA,KACA,GAA9CyX,EAAYG,GAAa1pC,QAAS,SAMpCwpC,GADAH,EAAcM,EAAQ7X,YACD7iB,IACrBq6B,EAAUD,EAAYzS,OAGtB4S,EAASrX,WAAYoX,IAAe,EACpCD,EAAUnX,WAAYuX,IAAgB,GAGlClpC,EAAY8D,KAGhBA,EAAUA,EAAQ1E,KAAM2D,EAAMlC,EAAGa,EAAOmC,OAAQ,GAAIolC,KAGjC,MAAfnlC,EAAQ2K,MACZic,EAAMjc,IAAQ3K,EAAQ2K,IAAMw6B,EAAUx6B,IAAQu6B,GAE1B,MAAhBllC,EAAQsyB,OACZ1L,EAAM0L,KAAStyB,EAAQsyB,KAAO6S,EAAU7S,KAAS0S,GAG7C,UAAWhlC,EACfA,EAAQslC,MAAMhqC,KAAM2D,EAAM2nB,IAGA,iBAAdA,EAAMjc,MACjBic,EAAMjc,KAAO,MAEa,iBAAfic,EAAM0L,OACjB1L,EAAM0L,MAAQ,MAEf+S,EAAQhmB,IAAKuH,MAKhBhpB,EAAOG,GAAGgC,OAAQ,CAGjB8kC,OAAQ,SAAU7kC,GAGjB,GAAKd,UAAUhB,OACd,YAAmBwC,IAAZV,EACNnF,KACAA,KAAKiE,KAAM,SAAU/B,GACpBa,EAAOinC,OAAOC,UAAWjqC,KAAMmF,EAASjD,KAI3C,IAAIwoC,EAAMC,EACTvmC,EAAOpE,KAAM,GAEd,OAAMoE,EAQAA,EAAKwxB,iBAAiBvyB,QAK5BqnC,EAAOtmC,EAAKmzB,wBACZoT,EAAMvmC,EAAK6I,cAAc4C,YAClB,CACNC,IAAK46B,EAAK56B,IAAM66B,EAAIC,YACpBnT,KAAMiT,EAAKjT,KAAOkT,EAAIE,cARf,CAAE/6B,IAAK,EAAG2nB,KAAM,QATxB,GAuBD9E,SAAU,WACT,GAAM3yB,KAAM,GAAZ,CAIA,IAAI8qC,EAAcd,EAAQ/nC,EACzBmC,EAAOpE,KAAM,GACb+qC,EAAe,CAAEj7B,IAAK,EAAG2nB,KAAM,GAGhC,GAAwC,UAAnC10B,EAAOyhB,IAAKpgB,EAAM,YAGtB4lC,EAAS5lC,EAAKmzB,4BAER,CACNyS,EAAShqC,KAAKgqC,SAId/nC,EAAMmC,EAAK6I,cACX69B,EAAe1mC,EAAK0mC,cAAgB7oC,EAAIyN,gBACxC,MAAQo7B,IACLA,IAAiB7oC,EAAIujB,MAAQslB,IAAiB7oC,EAAIyN,kBACT,WAA3C3M,EAAOyhB,IAAKsmB,EAAc,YAE1BA,EAAeA,EAAanoC,WAExBmoC,GAAgBA,IAAiB1mC,GAAkC,IAA1B0mC,EAAavpC,YAG1DwpC,EAAehoC,EAAQ+nC,GAAed,UACzBl6B,KAAO/M,EAAOyhB,IAAKsmB,EAAc,kBAAkB,GAChEC,EAAatT,MAAQ10B,EAAOyhB,IAAKsmB,EAAc,mBAAmB,IAKpE,MAAO,CACNh7B,IAAKk6B,EAAOl6B,IAAMi7B,EAAaj7B,IAAM/M,EAAOyhB,IAAKpgB,EAAM,aAAa,GACpEqzB,KAAMuS,EAAOvS,KAAOsT,EAAatT,KAAO10B,EAAOyhB,IAAKpgB,EAAM,cAAc,MAc1E0mC,aAAc,WACb,OAAO9qC,KAAKmE,IAAK,WAChB,IAAI2mC,EAAe9qC,KAAK8qC,aAExB,MAAQA,GAA2D,WAA3C/nC,EAAOyhB,IAAKsmB,EAAc,YACjDA,EAAeA,EAAaA,aAG7B,OAAOA,GAAgBp7B,QAM1B3M,EAAOkB,KAAM,CAAE00B,WAAY,cAAeD,UAAW,eAAiB,SAAUhc,EAAQ+F,GACvF,IAAI3S,EAAM,gBAAkB2S,EAE5B1f,EAAOG,GAAIwZ,GAAW,SAAUva,GAC/B,OAAOgf,EAAQnhB,KAAM,SAAUoE,EAAMsY,EAAQva,GAG5C,IAAIwoC,EAOJ,GANKnpC,EAAU4C,GACdumC,EAAMvmC,EACuB,IAAlBA,EAAK7C,WAChBopC,EAAMvmC,EAAKyL,kBAGChK,IAAR1D,EACJ,OAAOwoC,EAAMA,EAAKloB,GAASre,EAAMsY,GAG7BiuB,EACJA,EAAIK,SACFl7B,EAAY66B,EAAIE,YAAV1oC,EACP2N,EAAM3N,EAAMwoC,EAAIC,aAIjBxmC,EAAMsY,GAAWva,GAEhBua,EAAQva,EAAKkC,UAAUhB,WAU5BN,EAAOkB,KAAM,CAAE,MAAO,QAAU,SAAUsD,EAAIkb,GAC7C1f,EAAOgzB,SAAUtT,GAASoP,GAAczwB,EAAQiyB,cAC/C,SAAUjvB,EAAMmtB,GACf,GAAKA,EAIJ,OAHAA,EAAWD,GAAQltB,EAAMqe,GAGlBsO,GAAUvjB,KAAM+jB,GACtBxuB,EAAQqB,GAAOuuB,WAAYlQ,GAAS,KACpC8O,MAQLxuB,EAAOkB,KAAM,CAAEgnC,OAAQ,SAAUC,MAAO,SAAW,SAAU9lC,EAAM1D,GAClEqB,EAAOkB,KAAM,CAAE0zB,QAAS,QAAUvyB,EAAM2W,QAASra,EAAMypC,GAAI,QAAU/lC,GACpE,SAAUgmC,EAAcC,GAGxBtoC,EAAOG,GAAImoC,GAAa,SAAU3T,EAAQxwB,GACzC,IAAIka,EAAY/c,UAAUhB,SAAY+nC,GAAkC,kBAAX1T,GAC5DpC,EAAQ8V,KAA6B,IAAX1T,IAA6B,IAAVxwB,EAAiB,SAAW,UAE1E,OAAOia,EAAQnhB,KAAM,SAAUoE,EAAM1C,EAAMwF,GAC1C,IAAIjF,EAEJ,OAAKT,EAAU4C,GAGyB,IAAhCinC,EAASxqC,QAAS,SACxBuD,EAAM,QAAUgB,GAChBhB,EAAKxE,SAAS8P,gBAAiB,SAAWtK,GAIrB,IAAlBhB,EAAK7C,UACTU,EAAMmC,EAAKsL,gBAIJ3J,KAAKgvB,IACX3wB,EAAKohB,KAAM,SAAWpgB,GAAQnD,EAAK,SAAWmD,GAC9ChB,EAAKohB,KAAM,SAAWpgB,GAAQnD,EAAK,SAAWmD,GAC9CnD,EAAK,SAAWmD,UAIDS,IAAVqB,EAGNnE,EAAOyhB,IAAKpgB,EAAM1C,EAAM4zB,GAGxBvyB,EAAOuhB,MAAOlgB,EAAM1C,EAAMwF,EAAOouB,IAChC5zB,EAAM0f,EAAYsW,OAAS7xB,EAAWub,QAM5Cre,EAAOkB,KAAM,CACZ,YACA,WACA,eACA,YACA,cACA,YACE,SAAUsD,EAAI7F,GAChBqB,EAAOG,GAAIxB,GAAS,SAAUwB,GAC7B,OAAOlD,KAAKqoB,GAAI3mB,EAAMwB,MAOxBH,EAAOG,GAAGgC,OAAQ,CAEjB41B,KAAM,SAAUxS,EAAO9F,EAAMtf,GAC5B,OAAOlD,KAAKqoB,GAAIC,EAAO,KAAM9F,EAAMtf,IAEpCooC,OAAQ,SAAUhjB,EAAOplB,GACxB,OAAOlD,KAAK0oB,IAAKJ,EAAO,KAAMplB,IAG/BqoC,SAAU,SAAUvoC,EAAUslB,EAAO9F,EAAMtf,GAC1C,OAAOlD,KAAKqoB,GAAIC,EAAOtlB,EAAUwf,EAAMtf,IAExCsoC,WAAY,SAAUxoC,EAAUslB,EAAOplB,GAGtC,OAA4B,IAArBmB,UAAUhB,OAChBrD,KAAK0oB,IAAK1lB,EAAU,MACpBhD,KAAK0oB,IAAKJ,EAAOtlB,GAAY,KAAME,IAGrCuoC,MAAO,SAAUC,EAAQC,GACxB,OAAO3rC,KAAKmuB,WAAYud,GAAStd,WAAYud,GAASD,MAIxD3oC,EAAOkB,KAAM,wLAEgDqD,MAAO,KACnE,SAAUC,EAAInC,GAGbrC,EAAOG,GAAIkC,GAAS,SAAUod,EAAMtf,GACnC,OAA0B,EAAnBmB,UAAUhB,OAChBrD,KAAKqoB,GAAIjjB,EAAM,KAAMod,EAAMtf,GAC3BlD,KAAKmpB,QAAS/jB,MASlB,IAAI2E,GAAQ,qCAMZhH,EAAO6oC,MAAQ,SAAU1oC,EAAID,GAC5B,IAAIyN,EAAK6D,EAAMq3B,EAUf,GARwB,iBAAZ3oC,IACXyN,EAAMxN,EAAID,GACVA,EAAUC,EACVA,EAAKwN,GAKArP,EAAY6B,GAalB,OARAqR,EAAOjU,EAAMG,KAAM4D,UAAW,IAC9BunC,EAAQ,WACP,OAAO1oC,EAAGvC,MAAOsC,GAAWjD,KAAMuU,EAAK7T,OAAQJ,EAAMG,KAAM4D,eAItD8C,KAAOjE,EAAGiE,KAAOjE,EAAGiE,MAAQpE,EAAOoE,OAElCykC,GAGR7oC,EAAO8oC,UAAY,SAAUC,GACvBA,EACJ/oC,EAAOge,YAEPhe,EAAO4X,OAAO,IAGhB5X,EAAO6C,QAAUD,MAAMC,QACvB7C,EAAOgpC,UAAY/oB,KAAKC,MACxBlgB,EAAOqJ,SAAWA,EAClBrJ,EAAO1B,WAAaA,EACpB0B,EAAOvB,SAAWA,EAClBuB,EAAOgf,UAAYA,EACnBhf,EAAOrB,KAAOmB,EAEdE,EAAOqpB,IAAM3jB,KAAK2jB,IAElBrpB,EAAOipC,UAAY,SAAU1qC,GAK5B,IAAII,EAAOqB,EAAOrB,KAAMJ,GACxB,OAAkB,WAATI,GAA8B,WAATA,KAK5BuqC,MAAO3qC,EAAM0xB,WAAY1xB,KAG5ByB,EAAOmpC,KAAO,SAAU5pC,GACvB,OAAe,MAARA,EACN,IACEA,EAAO,IAAK2D,QAAS8D,GAAO,KAkBT,mBAAXoiC,QAAyBA,OAAOC,KAC3CD,OAAQ,SAAU,GAAI,WACrB,OAAOppC,IAOT,IAGCspC,GAAUtsC,EAAOgD,OAGjBupC,GAAKvsC,EAAOwsC,EAwBb,OAtBAxpC,EAAOypC,WAAa,SAAU/mC,GAS7B,OARK1F,EAAOwsC,IAAMxpC,IACjBhD,EAAOwsC,EAAID,IAGP7mC,GAAQ1F,EAAOgD,SAAWA,IAC9BhD,EAAOgD,OAASspC,IAGVtpC,GAMiB,oBAAb9C,IACXF,EAAOgD,OAAShD,EAAOwsC,EAAIxpC,GAMrBA","file":"jquery-3.5.1.min.js"}
\ No newline at end of file
diff --git a/web/skins/classic/js/jquery.js b/web/skins/classic/js/jquery.js
deleted file mode 120000
index 4858f7908..000000000
--- a/web/skins/classic/js/jquery.js
+++ /dev/null
@@ -1 +0,0 @@
-jquery-2.2.4.js
\ No newline at end of file
diff --git a/web/skins/classic/js/jquery.js.URL b/web/skins/classic/js/jquery.js.URL
deleted file mode 100644
index b3fba6ce6..000000000
--- a/web/skins/classic/js/jquery.js.URL
+++ /dev/null
@@ -1 +0,0 @@
-https://code.jquery.com/jquery-2.2.4.js
diff --git a/web/skins/classic/js/jquery.min.js b/web/skins/classic/js/jquery.min.js
new file mode 120000
index 000000000..5a4f7ea4b
--- /dev/null
+++ b/web/skins/classic/js/jquery.min.js
@@ -0,0 +1 @@
+jquery-3.5.1.min.js
\ No newline at end of file
diff --git a/web/skins/classic/js/jquery.min.js.URL b/web/skins/classic/js/jquery.min.js.URL
new file mode 100644
index 000000000..17d541cb5
--- /dev/null
+++ b/web/skins/classic/js/jquery.min.js.URL
@@ -0,0 +1 @@
+https://code.jquery.com/jquery-3.5.1.min.js
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index 78399280e..4d496cf51 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -21,7 +21,22 @@
 // This file should only contain static JavaScript and no php.
 // Use skin.js.php for JavaScript that need pre-processing
 //
-var popupOptions = "resizable,scrollbars,status=no,toolbar=yes";
+
+// Globally define the icons used in the bootstrap-table top-right toolbar
+var icons = {
+  paginationSwitchDown: 'fa-caret-square-o-down',
+  paginationSwitchUp: 'fa-caret-square-o-up',
+  export: 'fa-download',
+  refresh: 'fa-retweet',
+  autoRefresh: 'fa-clock-o',
+  advancedSearchIcon: 'fa-chevron-down',
+  toggleOff: 'fa-toggle-off',
+  toggleOn: 'fa-toggle-on',
+  columns: 'fa-th-list',
+  fullscreen: 'fa-arrows-alt',
+  detailOpen: 'fa-plus',
+  detailClose: 'fa-minus'
+};
 
 function checkSize() {
   if ( 0 ) {
@@ -43,88 +58,6 @@ function checkSize() {
   }
 }
 
-// Deprecated
-function newWindow( url, name, width, height ) {
-  window.open( url, name, popupOptions+",width="+width+",height="+height );
-}
-
-function getPopupSize( tag, width, height ) {
-  if ( typeof popupSizes == 'undefined' ) {
-    Error("Can't find any window sizes");
-    return {'width': 0, 'height': 0};
-  }
-  var popupSize = Object.clone(popupSizes[tag]);
-  if ( !popupSize ) {
-    Error("Can't find window size for tag '"+tag+"'");
-    return {'width': 0, 'height': 0};
-  }
-  if ( popupSize.width && popupSize.height ) {
-    if ( width || height ) {
-      Warning("Ignoring passed dimensions "+width+"x"+height+" when getting popup size for tag '"+tag+"'");
-    }
-    return popupSize;
-  }
-  if ( popupSize.addWidth ) {
-    popupSize.width = popupSize.addWidth;
-    if ( !width ) {
-      Error("Got addWidth but no passed width when getting popup size for tag '"+tag+"'");
-    } else {
-      popupSize.width += parseInt(width);
-    }
-  } else if ( width ) {
-    popupSize.width = width;
-    Error("Got passed width but no addWidth when getting popup size for tag '"+tag+"'");
-  }
-  if ( popupSize.minWidth && popupSize.width < popupSize.minWidth ) {
-    Warning("Adjusting to minimum width when getting popup size for tag '"+tag+"'");
-    popupSize.width = popupSize.minWidth;
-  }
-  if ( popupSize.addHeight ) {
-    popupSize.height = popupSize.addHeight;
-    if ( !height ) {
-      Error("Got addHeight but no passed height when getting popup size for tag '"+tag+"'");
-    } else {
-      popupSize.height += parseInt(height);
-    }
-  } else if ( height ) {
-    popupSize.height = height;
-    Error("Got passed height but no addHeight when getting popup size for tag '"+tag+"'");
-  }
-  if ( popupSize.minHeight && ( popupSize.height < popupSize.minHeight ) ) {
-    Warning("Adjusting to minimum height ("+popupSize.minHeight+") when getting popup size for tag '"+tag+"' because calculated height is " + popupSize.height);
-    popupSize.height = popupSize.minHeight;
-  }
-  return popupSize;
-}
-
-function zmWindow(sub_url) {
-  var zmWin = window.open( 'https://www.zoneminder.com'+(sub_url?sub_url:''), 'ZoneMinder' );
-  if ( ! zmWin ) {
-    // if popup blocking is enabled, the popup won't be defined.
-    console.log("Please disable popup blocking.");
-  } else {
-    zmWin.focus();
-  }
-}
-
-function createPopup( url, name, tag, width, height ) {
-  var popupSize = getPopupSize( tag, width, height );
-  var popupDimensions = "";
-  if ( popupSize.width > 0 ) {
-    popupDimensions += ",width="+popupSize.width;
-  }
-  if ( popupSize.height > 0 ) {
-    popupDimensions += ",height="+popupSize.height;
-  }
-  var popup = window.open( url+"&popup=1", name, popupOptions+popupDimensions );
-  if ( ! popup ) {
-    // if popup blocking is enabled, the popup won't be defined.
-    console.log("Please disable popup blocking.");
-  } else {
-    popup.focus();
-  }
-}
-
 // Polyfill for NodeList.prototype.forEach on IE.
 if (window.NodeList && !NodeList.prototype.forEach) {
   NodeList.prototype.forEach = Array.prototype.forEach;
@@ -139,7 +72,7 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
     });
   });
 
-  document.querySelectorAll(".popup-link").forEach(function(el) {
+  document.querySelectorAll(".zmlink").forEach(function(el) {
     el.addEventListener("click", function onClick(evt) {
       var el = this;
       var url;
@@ -150,12 +83,8 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
         // buttons
         url = el.getAttribute("data-url");
       }
-      var name = el.getAttribute("data-window-name");
-      var tag = el.getAttribute("data-window-tag");
-      var width = el.getAttribute("data-window-width");
-      var height = el.getAttribute("data-window-height");
       evt.preventDefault();
-      createPopup(url, name, tag, width, height);
+      window.location.assign(url);
     });
   });
 
@@ -163,7 +92,17 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
     el.addEventListener("click", submitTab);
   });
 
-  // 'data-on-click-this' calls the global function in the attribute value with the element when a click happens.
+  dataOnClickThis();
+  dataOnClick();
+  dataOnClickTrue();
+  dataOnChangeThis();
+  dataOnChange();
+  dataOnInput();
+  dataOnInputThis();
+});
+
+// 'data-on-click-this' calls the global function in the attribute value with the element when a click happens.
+function dataOnClickThis() {
   document.querySelectorAll("a[data-on-click-this], button[data-on-click-this], input[data-on-click-this]").forEach(function attachOnClick(el) {
     var fnName = el.getAttribute("data-on-click-this");
     if ( !window[fnName] ) {
@@ -172,8 +111,10 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
     }
     el.onclick = window[fnName].bind(el, el);
   });
+}
 
-  // 'data-on-click' calls the global function in the attribute value with no arguments when a click happens.
+// 'data-on-click' calls the global function in the attribute value with no arguments when a click happens.
+function dataOnClick() {
   document.querySelectorAll("i[data-on-click], a[data-on-click], button[data-on-click], input[data-on-click]").forEach(function attachOnClick(el) {
     var fnName = el.getAttribute("data-on-click");
     if ( !window[fnName] ) {
@@ -185,8 +126,32 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
       window[fnName](ev);
     };
   });
+  document.querySelectorAll("button[data-on-mousedown]").forEach(function(el) {
+    var fnName = el.getAttribute("data-on-mousedown");
+    if ( !window[fnName] ) {
+      console.error("Nothing found to bind to " + fnName + " on element " + el.name);
+      return;
+    }
 
-  // 'data-on-click-true' calls the global function in the attribute value with no arguments when a click happens.
+    el.onmousedown = function(ev) {
+      window[fnName](ev);
+    };
+  });
+  document.querySelectorAll("button[data-on-mouseup]").forEach(function(el) {
+    var fnName = el.getAttribute("data-on-mouseup");
+    if ( !window[fnName] ) {
+      console.error("Nothing found to bind to " + fnName + " on element " + el.name);
+      return;
+    }
+
+    el.onmouseup = function(ev) {
+      window[fnName](ev);
+    };
+  });
+}
+
+// 'data-on-click-true' calls the global function in the attribute value with no arguments when a click happens.
+function dataOnClickTrue() {
   document.querySelectorAll("a[data-on-click-true], button[data-on-click-true], input[data-on-click-true]").forEach(function attachOnClick(el) {
     var fnName = el.getAttribute("data-on-click-true");
     if ( !window[fnName] ) {
@@ -197,8 +162,10 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
       window[fnName](true);
     };
   });
+}
 
-  // 'data-on-change-this' calls the global function in the attribute value with the element when a change happens.
+// 'data-on-change-this' calls the global function in the attribute value with the element when a change happens.
+function dataOnChangeThis() {
   document.querySelectorAll("select[data-on-change-this], input[data-on-change-this]").forEach(function attachOnChangeThis(el) {
     var fnName = el.getAttribute("data-on-change-this");
     if ( !window[fnName] ) {
@@ -207,8 +174,10 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
     }
     el.onchange = window[fnName].bind(el, el);
   });
+}
 
-  // 'data-on-change' adds an event listener for the global function in the attribute value when a change happens.
+// 'data-on-change' adds an event listener for the global function in the attribute value when a change happens.
+function dataOnChange() {
   document.querySelectorAll("select[data-on-change], input[data-on-change]").forEach(function attachOnChange(el) {
     var fnName = el.getAttribute("data-on-change");
     if ( !window[fnName] ) {
@@ -217,8 +186,10 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
     }
     el.onchange = window[fnName];
   });
+}
 
-  // 'data-on-input' adds an event listener for the global function in the attribute value when an input happens.
+// 'data-on-input' adds an event listener for the global function in the attribute value when an input happens.
+function dataOnInput() {
   document.querySelectorAll("input[data-on-input]").forEach(function(el) {
     var fnName = el.getAttribute("data-on-input");
     if ( !window[fnName] ) {
@@ -227,8 +198,10 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
     }
     el.oninput = window[fnName];
   });
+}
 
-  // 'data-on-input-this' calls the global function in the attribute value with the element when an input happens.
+// 'data-on-input-this' calls the global function in the attribute value with the element when an input happens.
+function dataOnInputThis() {
   document.querySelectorAll("input[data-on-input-this]").forEach(function(el) {
     var fnName = el.getAttribute("data-on-input-this");
     if ( !window[fnName] ) {
@@ -237,48 +210,24 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
     }
     el.oninput = window[fnName].bind(el, el);
   });
-});
+}
 
-function createEventPopup( eventId, eventFilter, width, height ) {
+function openEvent( eventId, eventFilter ) {
   var url = '?view=event&eid='+eventId;
   if ( eventFilter ) {
     url += eventFilter;
   }
-  var name = 'zmEvent';
-  var popupSize = getPopupSize( 'event', width, height );
-  var popup = window.open( url, name, popupOptions+",width="+popupSize.width+",height="+popupSize.height );
-  if ( ! popup ) {
-    // if popup blocking is enabled, the popup won't be defined.
-    console.log("Please disable popup blocking.");
-  } else {
-    popup.focus();
-  }
+  window.location.assign(url);
 }
 
-function createFramesPopup( eventId, width, height ) {
+function openFrames( eventId ) {
   var url = '?view=frames&eid='+eventId;
-  var name = 'zmFrames';
-  var popupSize = getPopupSize( 'frames', width, height );
-  var popup = window.open( url, name, popupOptions+",width="+popupSize.width+",height="+popupSize.height );
-  if ( ! popup ) {
-    // if popup blocking is enabled, the popup won't be defined.
-    console.log("Please disable popup blocking.");
-  } else {
-    popup.focus();
-  }
+  window.location.assign(url);
 }
 
-function createFramePopup( eventId, frameId, width, height ) {
+function openFrame( eventId, frameId, width, height ) {
   var url = '?view=frame&eid='+eventId+'&fid='+frameId;
-  var name = 'zmFrame';
-  var popupSize = getPopupSize( 'frame', width, height );
-  var popup = window.open( url, name, popupOptions+",width="+popupSize.width+",height="+popupSize.height );
-  if ( ! popup ) {
-    // if popup blocking is enabled, the popup won't be defined.
-    console.log("Please disable popup blocking.");
-  } else {
-    popup.focus();
-  }
+  window.location.assign(url);
 }
 
 function windowToFront() {
@@ -312,26 +261,14 @@ if ( currentView != 'none' && currentView != 'login' ) {
   $j.ajaxSetup({timeout: AJAX_TIMEOUT}); //sets timeout for all getJSON.
 
   $j(document).ready(function() {
+    // Load the Logout and State modals into the dom
+    $j('#logoutButton').click(clickLogout);
+    if ( canEdit.System ) $j('#stateModalBtn').click(getStateModal);
+
     // Trigger autorefresh of the widget bar stats on the navbar
     if ( $j('.navbar').length ) {
       setInterval(getNavBar, navBarRefresh);
     }
-    // Workaround Bootstrap-Mootools conflict
-    var bootstrapLoaded = (typeof $j().carousel == 'function');
-    var mootoolsLoaded = (typeof MooTools != 'undefined');
-    if (bootstrapLoaded && mootoolsLoaded) {
-      Element.implement({
-        hide: function() {
-          return this;
-        },
-        show: function(v) {
-          return this;
-        },
-        slide: function(v) {
-          return this;
-        }
-      });
-    }
     // Update zmBandwidth cookie when the user makes a selection from the dropdown
     bwClickFunction();
     // Update update reminders when the user makes a selection from the dropdown
@@ -342,10 +279,10 @@ if ( currentView != 'none' && currentView != 'login' ) {
       var flip = $j("#flip");
       if ( flip.html() == 'keyboard_arrow_up' ) {
         flip.html('keyboard_arrow_down');
-        Cookie.write('zmHeaderFlip', 'down', {duration: 10*365} );
+        setCookie('zmHeaderFlip', 'down', 3600);
       } else {
         flip.html('keyboard_arrow_up');
-        Cookie.write('zmHeaderFlip', 'up', {duration: 10*365} );
+        setCookie('zmHeaderFlip', 'up', 3600);
       }
     });
     // Manage the web console filter bar minimize chevron
@@ -354,10 +291,10 @@ if ( currentView != 'none' && currentView != 'login' ) {
       var fbflip = $j("#fbflip");
       if ( fbflip.html() == 'keyboard_arrow_up' ) {
         fbflip.html('keyboard_arrow_down');
-        Cookie.write('zmFilterBarFlip', 'down', {duration: 10*365} );
+        setCookie('zmFilterBarFlip', 'down', 3600);
       } else {
         fbflip.html('keyboard_arrow_up');
-        Cookie.write('zmFilterBarFlip', 'up', {duration: 10*365} );
+        setCookie('zmFilterBarFlip', 'up', 3600);
         $j('.chosen').chosen("destroy");
         $j('.chosen').chosen();
       }
@@ -369,10 +306,10 @@ if ( currentView != 'none' && currentView != 'login' ) {
       var mfbflip = $j("#mfbflip");
       if ( mfbflip.html() == 'keyboard_arrow_up' ) {
         mfbflip.html('keyboard_arrow_down');
-        Cookie.write('zmMonitorFilterBarFlip', 'up', {duration: 10*365} );
+        setCookie('zmMonitorFilterBarFlip', 'up', 3600);
       } else {
         mfbflip.html('keyboard_arrow_up');
-        Cookie.write('zmMonitorFilterBarFlip', 'down', {duration: 10*365} );
+        setCookie('zmMonitorFilterBarFlip', 'down', 3600);
         $j('.chosen').chosen("destroy");
         $j('.chosen').chosen();
       }
@@ -389,20 +326,24 @@ if ( currentView != 'none' && currentView != 'login' ) {
     $j(".optionhelp").click(function(evt) {
       $j.getJSON(thisUrl + '?request=modal&modal=optionhelp&ohndx=' + evt.target.id)
           .done(optionhelpModal)
-          .fail(function(jqxhr, textStatus, error) {
-            console.log("Request Failed: " + textStatus + ", " + error);
-            console.log("Response Text: " + jqxhr.responseText);
-          });
+          .fail(logAjaxFail);
     });
   });
 
+  // After retieving modal html via Ajax, this will insert it into the DOM
+  function insertModalHtml(name, html) {
+    var modal = $j('#' + name);
+
+    if ( modal.length ) {
+      modal.replaceWith(html);
+    } else {
+      $j("body").append(html);
+    }
+  }
+
   // Manage the modal html we received after user clicks help link
   function optionhelpModal(data) {
-    if ( $j('#optionhelp').length ) {
-      $j('#optionhelp').replaceWith(data.html);
-    } else {
-      $j("body").append(data.html);
-    }
+    insertModalHtml('optionhelp', data.html);
     $j('#optionhelp').modal('show');
 
     // Manage the CLOSE optionhelp modal button
@@ -412,11 +353,16 @@ if ( currentView != 'none' && currentView != 'login' ) {
   }
 
   function getNavBar() {
-    $j.getJSON(thisUrl + '?view=request&request=status&entity=navBar')
+    $j.getJSON(thisUrl + '?view=request&request=status&entity=navBar' + (auth_relay?'&'+auth_relay:''))
         .done(setNavBar)
         .fail(function(jqxhr, textStatus, error) {
           console.log("Request Failed: " + textStatus + ", " + error);
-          console.log("Response Text: " + jqxhr.responseText);
+          if ( ! jqxhr.responseText ) {
+            console.log("No responseText in jqxhr");
+            console.log(jqxhr);
+            return;
+          }
+          console.log("Response Text: " + jqxhr.responseText.replace(/(<([^>]+)>)/gi, ''));
           if ( textStatus != "timeout" ) {
           // The idea is that this should only fail due to auth, so reload the page
           // which should go to login if it can't stay logged in.
@@ -432,10 +378,14 @@ if ( currentView != 'none' && currentView != 'login' ) {
     }
     if ( data.auth ) {
       if ( data.auth != auth_hash ) {
+        console.log("Update auth_hash to "+data.auth);
         // Update authentication token.
         auth_hash = data.auth;
       }
     }
+    if ( data.auth_relay ) {
+      auth_relay = data.auth_relay;
+    }
     // iterate through all the keys then update each element id with the same name
     for (var key of Object.keys(data)) {
       if ( key == "auth" ) continue;
@@ -447,13 +397,13 @@ if ( currentView != 'none' && currentView != 'login' ) {
 }
 
 //Shows a message if there is an error in the streamObj or the stream doesn't exist.  Returns true if error, false otherwise.
-function checkStreamForErrors( funcName, streamObj ) {
+function checkStreamForErrors(funcName, streamObj) {
   if ( !streamObj ) {
-    Error( funcName+": stream object was null" );
+    Error(funcName+': stream object was null');
     return true;
   }
   if ( streamObj.result == "Error" ) {
-    Error( funcName+" stream error: "+streamObj.message );
+    Error(funcName+' stream error: '+streamObj.message);
     return true;
   }
   return false;
@@ -493,9 +443,9 @@ function secsToTime( seconds ) {
 
 function submitTab(evt) {
   var tab = this.getAttribute("data-tab-name");
-  var form = $('contentForm');
-  form.action.value = "";
-  form.tab.value = tab;
+  var form = $j('#contentForm');
+  form.attr('action', '');
+  form.attr('tab', tab);
   form.submit();
   evt.preventDefault();
 }
@@ -544,17 +494,6 @@ function confirmDelete( message ) {
   return ( confirm( message?message:'Are you sure you wish to delete?' ) );
 }
 
-if ( refreshParent ) {
-  refreshParentWindow();
-}
-
-if ( focusWindow ) {
-  windowToFront();
-}
-if ( closePopup ) {
-  closeWindow();
-}
-
 window.addEventListener( 'DOMContentLoaded', checkSize );
 
 function convertLabelFormat(LabelFormat, monitorName) {
@@ -666,11 +605,11 @@ function scaleToFit(baseWidth, baseHeight, scaleEl, bottomEl) {
   return {width: Math.floor(newWidth), height: Math.floor(newHeight), autoScale: autoScale};
 }
 
-function setButtonState(element_id, butClass) {
-  var element = $(element_id);
+function setButtonState(element_id, btnClass) {
+  var element = document.getElementById(element_id);
   if ( element ) {
-    element.className = butClass;
-    if (butClass == 'unavail' || (butClass == 'active' && (element.id == 'pauseBtn' || element.id == 'playBtn'))) {
+    element.className = btnClass;
+    if (btnClass == 'unavail' || (btnClass == 'active' && (element.id == 'pauseBtn' || element.id == 'playBtn'))) {
       element.disabled = true;
     } else {
       element.disabled = false;
@@ -687,7 +626,7 @@ function setCookie(name, value, days) {
     date.setTime(date.getTime() + (days*24*60*60*1000));
     expires = "; expires=" + date.toUTCString();
   }
-  document.cookie = name + "=" + (value || "") + expires + "; path=/";
+  document.cookie = name + "=" + (value || "") + expires + "; path=/; samesite=strict";
 }
 
 function getCookie(name) {
@@ -706,7 +645,7 @@ function delCookie(name) {
 }
 
 function bwClickFunction() {
-  $j("#dropdown_bandwidth a").click(function() {
+  $j('.bwselect').click(function() {
     var bwval = $j(this).data('pdsa-dropdown-val');
     setCookie("zmBandwidth", bwval, 3600);
     getNavBar();
@@ -718,10 +657,7 @@ function reminderClickFunction() {
     var option = $j(this).data('pdsa-dropdown-val');
     $j.getJSON(thisUrl + '?view=version&action=version&option=' + option)
         .done(window.location.reload(true)) //Do a full refresh to update ZM_DYN_LAST_VERSION
-        .fail(function(jqxhr, textStatus, error) {
-          console.log("Request Failed: " + textStatus + ", " + error);
-          console.log("Response Text: " + jqxhr.responseText);
-        });
+        .fail(logAjaxFail);
   });
 }
 
@@ -729,11 +665,7 @@ function reminderClickFunction() {
 function enoperm() {
   $j.getJSON(thisUrl + '?request=modal&modal=enoperm')
       .done(function(data) {
-        if ( $j('#ENoPerm').length ) {
-          $j('#ENoPerm').replaceWith(data.html);
-        } else {
-          $j("body").append(data.html);
-        }
+        insertModalHtml('ENoPerm', data.html);
         $j('#ENoPerm').modal('show');
 
         // Manage the CLOSE optionhelp modal button
@@ -741,8 +673,266 @@ function enoperm() {
           $j('#ENoPerm').modal('hide');
         });
       })
-      .fail(function(jqxhr, textStatus, error) {
-        console.log("Request Failed: " + textStatus + ", " + error);
-        console.log("Response Text: " + jqxhr.responseText);
-      });
+      .fail(logAjaxFail);
+}
+
+function getLogoutModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=logout')
+      .done(function(data) {
+        insertModalHtml('modalLogout', data.html);
+        manageModalBtns('modalLogout');
+        clickLogout();
+      })
+      .fail(logAjaxFail);
+}
+function clickLogout() {
+  if ( ! $j('#modalLogout').length ) {
+    getLogoutModal();
+    return;
+  }
+  $j('#modalLogout').modal('show');
+}
+
+function getStateModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=state')
+      .done(function(data) {
+        insertModalHtml('modalState', data.html);
+        $j('#modalState').modal('show');
+        manageStateModalBtns();
+      })
+      .fail(logAjaxFail);
+}
+
+function manageStateModalBtns() {
+  // Enable or disable the Delete button depending on the selected run state
+  $j("#runState").change(function() {
+    runstate = $j(this).val();
+
+    if ( (runstate == 'stop') || (runstate == 'restart') || (runstate == 'start') || (runstate == 'default') ) {
+      $j("#btnDelete").prop("disabled", true);
+    } else {
+      $j("#btnDelete").prop("disabled", false);
+    }
+  });
+
+  // Enable or disable the Save button when entering a new state
+  $j("#newState").keyup(function() {
+    length = $j(this).val().length;
+    if ( length < 1 ) {
+      $j("#btnSave").prop("disabled", true);
+    } else {
+      $j("#btnSave").prop("disabled", false);
+    }
+  });
+
+
+  // Delete a state
+  $j("#btnDelete").click(function() {
+    stateStuff('delete', $j("#runState").val());
+  });
+
+
+  // Save a new state
+  $j("#btnSave").click(function() {
+    stateStuff('save', undefined, $j("#newState").val());
+  });
+
+  // Change state
+  $j("#btnApply").click(function() {
+    stateStuff('state', $j("#runState").val());
+  });
+}
+
+function stateStuff(action, runState, newState) {
+  // the state action will redirect to console
+  var formData = {
+    'view': 'state',
+    'action': action,
+    'apply': 1,
+    'runState': runState,
+    'newState': newState
+  };
+
+  $j("#pleasewait").toggleClass("hidden");
+
+  $j.ajax({
+    type: 'POST',
+    url: thisUrl,
+    data: formData,
+    dataType: 'html',
+    timeout: 0
+  }).done(function(data) {
+    location.reload();
+  });
+}
+
+function logAjaxFail(jqxhr, textStatus, error) {
+  console.log("Request Failed: " + textStatus + ", " + error);
+  if ( ! jqxhr.responseText ) {
+    console.log("Ajax request failed.  No responseText.  jqxhr follows:");
+    console.log(jqxhr);
+    return;
+  }
+  var responseText = jqxhr.responseText.replace(/(<([^>]+)>)/gi, '').trim(); // strip any html or whitespace from the response
+  if ( responseText ) console.log("Response Text: " + responseText);
+}
+
+// Load the Modal HTML via Ajax call
+function getModal(id, parameters) {
+  $j.getJSON(thisUrl + '?request=modal&modal='+id+'&'+parameters)
+      .done(function(data) {
+        if ( !data ) {
+          console.error("Get modal returned no data");
+          return;
+        }
+
+        insertModalHtml(id, data.html);
+        manageModalBtns(id);
+        modal = $j('#'+id+'Modal');
+        if ( ! modal.length ) {
+          console.log('No modal found');
+        }
+        $j('#'+id+'Modal').modal('show');
+      })
+      .fail(logAjaxFail);
+}
+
+function manageModalBtns(id) {
+  // Manage the CANCEL modal button, note data-dismiss="modal" would work better
+  var cancelBtn = document.getElementById(id+"CancelBtn");
+  if ( cancelBtn ) {
+    document.getElementById(id+"CancelBtn").addEventListener('click', function onCancelClick(evt) {
+      $j('#'+id).modal('hide');
+    });
+  }
+
+  // 'data-on-click-this' calls the global function in the attribute value with the element when a click happens.
+  document.querySelectorAll('#'+id+'Modal button[data-on-click]').forEach(function attachOnClick(el) {
+    var fnName = el.getAttribute('data-on-click');
+    if ( !window[fnName] ) {
+      console.error('Nothing found to bind to ' + fnName + ' on element ' + el.name);
+      return;
+    } else {
+      console.log("Setting onclick for " + el.name);
+    }
+    el.onclick = window[fnName].bind(el, el);
+  });
+}
+
+function bindButton(selector, action, data, func) {
+  var elements = $j(selector);
+  if ( !elements.length ) {
+    console.log("Nothing found for " + selector);
+    return;
+  }
+  elements.on(action, data, func);
+}
+
+
+function human_filesize(size, precision = 2) {
+  var units = Array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+  var step = 1024;
+  var i = 0;
+  while ((size / step) > 0.9) {
+    size = size / step;
+    i++;
+  }
+  return (Math.round(size*(10^precision))/(10^precision))+units[i];
+}
+
+function startDownload( exportFile ) {
+  console.log("Starting download from " + exportFile);
+  window.location.replace( exportFile );
+}
+
+function exportResponse(data, responseText) {
+  console.log('exportResponse data: ' + JSON.stringify(data));
+
+  var generated = (data.result=='Ok') ? 1 : 0;
+  //var exportFile = '?view=archive&type='+data.exportFormat+'&connkey='+data.connkey;
+  var exportFile = data.exportFile;
+
+  $j('#exportProgress').removeClass( 'text-warning' );
+  if ( generated ) {
+    $j('#downloadLink').text('Download');
+    $j('#downloadLink').attr("href", thisUrl + exportFile);
+    $j('#exportProgress').addClass( 'text-success' );
+    $j('#exportProgress').text(exportSucceededString);
+    setTimeout(startDownload, 1500, exportFile);
+  } else {
+    $j('#exportProgress').addClass( 'text-danger' );
+    $j('#exportProgress').text(exportFailedString);
+  }
+}
+
+function exportEvent() {
+  var form = $j('#downloadForm').serialize();
+  $j.getJSON(thisUrl + '?view=request&request=event&action=download', form)
+      .done(exportResponse)
+      .fail(logAjaxFail);
+  $j('#exportProgress').removeClass( 'invisible' );
+}
+
+// Loads the shutdown modal
+function getShutdownModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=shutdown')
+      .done(function(data) {
+        insertModalHtml('shutdownModal', data.html);
+        dataOnClickThis();
+        $j('#shutdownModal').modal('show');
+      })
+      .fail(logAjaxFail);
+}
+
+function manageShutdownBtns(element) {
+  var cmd = element.getAttribute('data-command');
+  var when = $j('#when1min').is(':checked') ? '1min' : 'now';
+  var respText = $j('#respText');
+
+  $j.getJSON(thisUrl + '?request=shutdown&when=' + when + '&command=' + cmd)
+      .done(function(data) {
+        respText.removeClass('invisible');
+        if ( data.rc ) {
+          respText.html('<h2>Error</h2>' + data.output);
+        } else {
+          $j('#cancelBtn').prop('disabled', false);
+          if ( cmd == 'cancel' ) {
+            respText.html('<h2>Success</h2>Event has been cancelled');
+          } else {
+            respText.html('<h2>Success</h2>You may cancel this shutdown by clicking ' + cancelString);
+          }
+        }
+      })
+      .fail(logAjaxFail);
+}
+
+var thumbnail_timeout;
+function thumbnail_onmouseover(event) {
+  thumbnail_timeout = setTimeout(function() {
+    var img = event.target;
+    var imgClass = ( currentView == 'console' ) ? 'zoom-console' : 'zoom';
+    var imgAttr = ( currentView == 'frames' ) ? 'full_img_src' : 'stream_src';
+    img.src = '';
+    img.src = img.getAttribute(imgAttr);
+    img.classList.add(imgClass);
+  }, 350);
+}
+
+function thumbnail_onmouseout(event) {
+  clearTimeout(thumbnail_timeout);
+  var img = event.target;
+  var imgClass = ( currentView == 'console' ) ? 'zoom-console' : 'zoom';
+  var imgAttr = ( currentView == 'frames' ) ? 'img_src' : 'still_src';
+  img.src = '';
+  img.src = img.getAttribute(imgAttr);
+  img.classList.remove(imgClass);
+}
+
+function initThumbAnimation() {
+  if ( ANIMATE_THUMBS ) {
+    $j('.colThumbnail img').each(function() {
+      this.addEventListener('mouseover', thumbnail_onmouseover, false);
+      this.addEventListener('mouseout', thumbnail_onmouseout, false);
+    });
+  }
 }
diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index 2855b404d..802a21095 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -23,12 +23,16 @@
 // Static JavaScript should go in skin.js
 //
 
+global $user;
 ?>
 var AJAX_TIMEOUT = <?php echo ZM_WEB_AJAX_TIMEOUT ?>;
-
 var navBarRefresh = <?php echo 1000*ZM_WEB_REFRESH_NAVBAR ?>;
-
 var currentView = '<?php echo $view ?>';
+
+var exportProgressString = '<?php echo addslashes(translate('Exporting')) ?>';
+var exportFailedString = '<?php echo translate('ExportFailed') ?>';
+var exportSucceededString = '<?php echo translate('ExportSucceeded') ?>';
+var cancelString = '<?php echo translate('Cancel') ?>';
 <?php
 /* We can't trust PHP_SELF on a path like /index.php/"%3E%3Cimg src=x onerror=prompt('1');%3E which
    will still load index.php but will include the arbitrary payload after `.php/`. To mitigate this,
@@ -37,12 +41,19 @@ var thisUrl = '<?php echo ZM_BASE_URL.preg_replace('/\.php.*$/i', '.php', $_SERV
 var skinPath = '<?php echo ZM_SKIN_PATH ?>';
 var serverId = '<?php echo defined('ZM_SERVER_ID') ? ZM_SERVER_ID : '' ?>';
 
-var canEditSystem = <?php echo canEdit('System')?'true':'false' ?>;
-var canViewSystem = <?php echo canView('System')?'true':'false' ?>;
-var canEditEvents = <?php echo canEdit('Events')?'true':'false' ?>;
-var canViewEvents = <?php echo canView('Events')?'true':'false' ?>;
+var canView = {};
+var canEdit = {};
+<?php
+$perms = array('Stream', 'Events', 'Control', 'Monitors', 'Groups', 'Snapshots', 'System', 'Devices');
+foreach ( $perms as $perm ) {
+?>
+  canView["<?php echo $perm ?>"] = <?php echo canView($perm)?'true':'false' ?>;
+  canEdit["<?php echo $perm ?>"] = <?php echo canEdit($perm)?'true':'false' ?>;
+<?php
+}
+?>
 
-var canEditGroups = <?php echo canEdit('Groups')?'true':'false' ?>;
+var ANIMATE_THUMBS = <?php echo ZM_WEB_ANIMATE_THUMBS?'true':'false' ?>;
 
 var refreshParent = <?php
 if ( ! empty($refreshParent) ) {
@@ -50,7 +61,7 @@ if ( ! empty($refreshParent) ) {
     echo 'true';
   } else if ( $refreshParent ) {
     # This is to tell the parent to refresh to a specific URL
-    echo "'$refreshParent'";
+    echo '\''.$refreshParent.'\'';
   } else {
     echo 'false';
   }
@@ -72,3 +83,9 @@ var imagePrefix = "<?php echo '?view=image&eid=' ?>";
 
 var auth_hash = '<?php echo generateAuthHash(ZM_AUTH_HASH_IPS) ?>';
 var auth_relay = '<?php echo get_auth_relay() ?>';
+var user = <?php
+$user_without_password = $user;
+unset($user_without_password['Password']);
+echo json_encode($user_without_password);
+?>;
+var running = <?php echo daemonCheck()?'true':'false' ?>;
diff --git a/web/skins/classic/js/tableExport.min.js b/web/skins/classic/js/tableExport.min.js
index f79cf5f40..3304d4448 100644
--- a/web/skins/classic/js/tableExport.min.js
+++ b/web/skins/classic/js/tableExport.min.js
@@ -1,7 +1,7 @@
 /*
  tableExport.jquery.plugin
 
- Version 1.10.20
+ Version 1.10.21
 
  Copyright (c) 2015-2020 hhurz, https://github.com/hhurz/tableExport.jquery.plugin
 
@@ -9,85 +9,86 @@
 
  Licensed under the MIT License
 */
-var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(c,k,y){c instanceof String&&(c=String(c));for(var v=c.length,A=0;A<v;A++){var S=c[A];if(k.call(y,S,A,c))return{i:A,v:S}}return{i:-1,v:void 0}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(c,k,y){c!=Array.prototype&&c!=Object.prototype&&(c[k]=y.value)};
-$jscomp.getGlobal=function(c){return"undefined"!=typeof window&&window===c?c:"undefined"!=typeof global&&null!=global?global:c};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(c,k,y,v){if(k){y=$jscomp.global;c=c.split(".");for(v=0;v<c.length-1;v++){var A=c[v];A in y||(y[A]={});y=y[A]}c=c[c.length-1];v=y[c];k=k(v);k!=v&&null!=k&&$jscomp.defineProperty(y,c,{configurable:!0,writable:!0,value:k})}};
-$jscomp.polyfill("Array.prototype.find",function(c){return c?c:function(c,y){return $jscomp.findInternal(this,c,y).v}},"es6","es3");
-(function(c){c.fn.tableExport=function(k){function y(b){var d=[];A(b,"thead").each(function(){d.push.apply(d,A(c(this),a.theadSelector).toArray())});return d}function v(b){var d=[];A(b,"tbody").each(function(){d.push.apply(d,A(c(this),a.tbodySelector).toArray())});a.tfootSelector.length&&A(b,"tfoot").each(function(){d.push.apply(d,A(c(this),a.tfootSelector).toArray())});return d}function A(b,a){var d=b[0].tagName,p=b.parents(d).length;return b.find(a).filter(function(){return p===c(this).closest(d).parents(d).length})}
-function S(b){var a=[];c(b).find("thead").first().find("th").each(function(b,d){void 0!==c(d).attr("data-field")?a[b]=c(d).attr("data-field"):a[b]=b.toString()});return a}function I(b){var a="undefined"!==typeof b[0].rowIndex,e=!1===a&&"undefined"!==typeof b[0].cellIndex,p=e||a?Ja(b):b.is(":visible"),f=b.attr("data-tableexport-display");e&&"none"!==f&&"always"!==f&&(b=c(b[0].parentNode),a="undefined"!==typeof b[0].rowIndex,f=b.attr("data-tableexport-display"));a&&"none"!==f&&"always"!==f&&(f=b.closest("table").attr("data-tableexport-display"));
-return"none"!==f&&(!0===p||"always"===f)}function Ja(b){var a=[];V&&(a=J.filter(function(){var a=!1;this.nodeType===b[0].nodeType&&("undefined"!==typeof this.rowIndex&&this.rowIndex===b[0].rowIndex?a=!0:"undefined"!==typeof this.cellIndex&&this.cellIndex===b[0].cellIndex&&"undefined"!==typeof this.parentNode.rowIndex&&"undefined"!==typeof b[0].parentNode.rowIndex&&this.parentNode.rowIndex===b[0].parentNode.rowIndex&&(a=!0));return a}));return!1===V||0===a.length}function sa(b,d,e){var p=!1;I(b)?0<
-a.ignoreColumn.length&&(-1!==c.inArray(e,a.ignoreColumn)||-1!==c.inArray(e-d,a.ignoreColumn)||T.length>e&&"undefined"!==typeof T[e]&&-1!==c.inArray(T[e],a.ignoreColumn))&&(p=!0):p=!0;return p}function B(b,d,e,p,f){if("function"===typeof f){var l=!1;"function"===typeof a.onIgnoreRow&&(l=a.onIgnoreRow(c(b),e));if(!1===l&&(0===a.ignoreRow.length||-1===c.inArray(e,a.ignoreRow)&&-1===c.inArray(e-p,a.ignoreRow))&&I(c(b))){var q=A(c(b),d),h=0;q.each(function(b){var a=c(this),d,l=O(this),p=U(this);c.each(G,
-function(){if(e>=this.s.r&&e<=this.e.r&&h>=this.s.c&&h<=this.e.c)for(d=0;d<=this.e.c-this.s.c;++d)f(null,e,h++)});if(!1===sa(a,q.length,b)){if(p||l)l=l||1,G.push({s:{r:e,c:h},e:{r:e+(p||1)-1,c:h+l-1}});f(this,e,h++)}if(l)for(d=0;d<l-1;++d)f(null,e,h++)});c.each(G,function(){if(e>=this.s.r&&e<=this.e.r&&h>=this.s.c&&h<=this.e.c)for(da=0;da<=this.e.c-this.s.c;++da)f(null,e,h++)})}}}function ta(b,a,e,c){if("undefined"!==typeof c.images&&(e=c.images[e],"undefined"!==typeof e)){a=a.getBoundingClientRect();
-var d=b.width/b.height,l=a.width/a.height,p=b.width,h=b.height,z=19.049976/25.4,g=0;l<=d?(h=Math.min(b.height,a.height),p=a.width*h/a.height):l>d&&(p=Math.min(b.width,a.width),h=a.height*p/a.width);p*=z;h*=z;h<b.height&&(g=(b.height-h)/2);try{c.doc.addImage(e.src,b.textPos.x,b.y+g,p,h)}catch(Pa){}b.textPos.x+=p}}function ua(b,d){if("string"===a.outputMode)return b.output();if("base64"===a.outputMode)return K(b.output());if("window"===a.outputMode)window.URL=window.URL||window.webkitURL,window.open(window.URL.createObjectURL(b.output("blob")));
-else try{var e=b.output("blob");saveAs(e,a.fileName+".pdf")}catch(p){ja(a.fileName+".pdf","data:application/pdf"+(d?"":";base64")+",",d?b.output("blob"):b.output())}}function va(b,a,e){var d=0;"undefined"!==typeof e&&(d=e.colspan);if(0<=d){for(var c=b.width,l=b.textPos.x,q=a.table.columns.indexOf(a.column),h=1;h<d;h++)c+=a.table.columns[q+h].width;1<d&&("right"===b.styles.halign?l=b.textPos.x+c-b.width:"center"===b.styles.halign&&(l=b.textPos.x+(c-b.width)/2));b.width=c;b.textPos.x=l;"undefined"!==
-typeof e&&1<e.rowspan&&(b.height*=e.rowspan);if("middle"===b.styles.valign||"bottom"===b.styles.valign)e=("string"===typeof b.text?b.text.split(/\r\n|\r|\n/g):b.text).length||1,2<e&&(b.textPos.y-=(2-1.15)/2*a.row.styles.fontSize*(e-2)/3);return!0}return!1}function wa(b,a,e){"undefined"!==typeof b&&null!==b&&(b.hasAttribute("data-tableexport-canvas")?(a=(new Date).getTime(),c(b).attr("data-tableexport-canvas",a),e.images[a]={url:'[data-tableexport-canvas="'+a+'"]',src:null}):"undefined"!==a&&null!=
-a&&a.each(function(){if(c(this).is("img")){var a=xa(this.src);e.images[a]={url:this.src,src:this.src}}wa(b,c(this).children(),e)}))}function Ka(b,a){function d(b){if(b.url)if(b.src){var d=new Image;p=++f;d.crossOrigin="Anonymous";d.onerror=d.onload=function(){if(d.complete&&(0===d.src.indexOf("data:image/")&&(d.width=b.width||d.width||0,d.height=b.height||d.height||0),d.width+d.height)){var e=document.createElement("canvas"),c=e.getContext("2d");e.width=d.width;e.height=d.height;c.drawImage(d,0,0);
-b.src=e.toDataURL("image/png")}--f||a(p)};d.src=b.url}else{var e=c(b.url);e.length&&(p=++f,html2canvas(e[0]).then(function(d){b.src=d.toDataURL("image/png");--f||a(p)}))}}var p=0,f=0;if("undefined"!==typeof b.images)for(var l in b.images)b.images.hasOwnProperty(l)&&d(b.images[l]);(b=f)||(a(p),b=void 0);return b}function ya(b,d,e){d.each(function(){if(c(this).is("div")){var d=ea(L(this,"background-color"),[255,255,255]),f=ea(L(this,"border-top-color"),[0,0,0]),l=fa(this,"border-top-width",a.jspdf.unit),
-q=this.getBoundingClientRect(),h=this.offsetLeft*e.wScaleFactor,z=this.offsetTop*e.hScaleFactor,g=q.width*e.wScaleFactor;q=q.height*e.hScaleFactor;e.doc.setDrawColor.apply(void 0,f);e.doc.setFillColor.apply(void 0,d);e.doc.setLineWidth(l);e.doc.rect(b.x+h,b.y+z,g,q,l?"FD":"F")}else c(this).is("img")&&(d=xa(this.src),ta(b,this,d,e));ya(b,c(this).children(),e)})}function za(b,d,e){if("function"===typeof e.onAutotableText)e.onAutotableText(e.doc,b,d);else{var p=b.textPos.x,f=b.textPos.y,l={halign:b.styles.halign,
-valign:b.styles.valign};if(d.length){for(d=d[0];d.previousSibling;)d=d.previousSibling;for(var q=!1,h=!1;d;){var z=d.innerText||d.textContent||"",g=z.length&&" "===z[0]?" ":"",k=1<z.length&&" "===z[z.length-1]?" ":"";!0!==a.preserve.leadingWS&&(z=g+ka(z));!0!==a.preserve.trailingWS&&(z=la(z)+k);c(d).is("br")&&(p=b.textPos.x,f+=e.doc.internal.getFontSize());c(d).is("b")?q=!0:c(d).is("i")&&(h=!0);(q||h)&&e.doc.setFontType(q&&h?"bolditalic":q?"bold":"italic");if(g=e.doc.getStringUnitWidth(z)*e.doc.internal.getFontSize()){"linebreak"===
-b.styles.overflow&&p>b.textPos.x&&p+g>b.textPos.x+b.width&&(0<=".,!%*;:=-".indexOf(z.charAt(0))&&(k=z.charAt(0),g=e.doc.getStringUnitWidth(k)*e.doc.internal.getFontSize(),p+g<=b.textPos.x+b.width&&(e.doc.autoTableText(k,p,f,l),z=z.substring(1,z.length)),g=e.doc.getStringUnitWidth(z)*e.doc.internal.getFontSize()),p=b.textPos.x,f+=e.doc.internal.getFontSize());if("visible"!==b.styles.overflow)for(;z.length&&p+g>b.textPos.x+b.width;)z=z.substring(0,z.length-1),g=e.doc.getStringUnitWidth(z)*e.doc.internal.getFontSize();
-e.doc.autoTableText(z,p,f,l);p+=g}if(q||h)c(d).is("b")?q=!1:c(d).is("i")&&(h=!1),e.doc.setFontType(q||h?q?"bold":"italic":"normal");d=d.nextSibling}b.textPos.x=p;b.textPos.y=f}else e.doc.autoTableText(b.text,b.textPos.x,b.textPos.y,l)}}function W(b,a,e){return null==b?"":b.toString().replace(new RegExp(null==a?"":a.toString().replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),"g"),e)}function ka(b){return null==b?"":b.toString().replace(/^\s+/,"")}function la(b){return null==b?"":b.toString().replace(/\s+$/,
-"")}function La(b){if(0===a.date.html.length)return!1;a.date.pattern.lastIndex=0;var d=a.date.pattern.exec(b);if(null==d)return!1;b=+d[a.date.match_y];if(0>b||8099<b)return!1;var e=1*d[a.date.match_m];d=1*d[a.date.match_d];if(!isFinite(d))return!1;var c=new Date(b,e-1,d,0,0,0);return c.getFullYear()===b&&c.getMonth()===e-1&&c.getDate()===d?new Date(Date.UTC(b,e-1,d,0,0,0)):!1}function ma(b){b=b||"0";""!==a.numbers.html.thousandsSeparator&&(b=W(b,a.numbers.html.thousandsSeparator,""));"."!==a.numbers.html.decimalMark&&
-(b=W(b,a.numbers.html.decimalMark,"."));return"number"===typeof b||!1!==jQuery.isNumeric(b)?b:!1}function Ma(b){-1<b.indexOf("%")?(b=ma(b.replace(/%/g,"")),!1!==b&&(b/=100)):b=!1;return b}function E(b,d,e,p){var f="",l="text";if(null!==b){var q=c(b);q.removeData("teUserDefText");if(q[0].hasAttribute("data-tableexport-canvas"))var h="";else if(q[0].hasAttribute("data-tableexport-value"))h=(h=q.attr("data-tableexport-value"))?h+"":"",q.data("teUserDefText",1);else if(h=q.html(),"function"===typeof a.onCellHtmlData)h=
-a.onCellHtmlData(q,d,e,h),q.data("teUserDefText",1);else if(""!==h){b=c.parseHTML(h);var g=0,k=0;h="";c.each(b,function(){if(c(this).is("input"))h+=q.find("input").eq(g++).val();else if(c(this).is("select"))h+=q.find("select option:selected").eq(k++).text();else if(c(this).is("br"))h+="<br>";else{if("undefined"===typeof c(this).html())h+=c(this).text();else if(void 0===jQuery().bootstrapTable||!1===c(this).hasClass("fht-cell")&&!1===c(this).hasClass("filterControl")&&0===q.parents(".detail-view").length)h+=
-c(this).html();if(c(this).is("a")){var b=q.find("a").attr("href")||"";f="function"===typeof a.onCellHtmlHyperlink?f+a.onCellHtmlHyperlink(q,d,e,b,h):"href"===a.htmlHyperlink?f+b:f+h;h=""}}})}if(h&&""!==h&&!0===a.htmlContent)f=c.trim(h);else if(h&&""!==h)if(""!==q.attr("data-tableexport-cellformat")){var m=h.replace(/\n/g,"\u2028").replace(/(<\s*br([^>]*)>)/gi,"\u2060"),n=c("<div/>").html(m).contents();b=!1;m="";c.each(n.text().split("\u2028"),function(b,d){0<b&&(m+=" ");!0!==a.preserve.leadingWS&&
-(d=ka(d));m+=!0!==a.preserve.trailingWS?la(d):d});c.each(m.split("\u2060"),function(b,d){0<b&&(f+="\n");!0!==a.preserve.leadingWS&&(d=ka(d));!0!==a.preserve.trailingWS&&(d=la(d));f+=d.replace(/\u00AD/g,"")});f=f.replace(/\u00A0/g," ");if("json"===a.type||"excel"===a.type&&"xmlss"===a.mso.fileFormat||!1===a.numbers.output)b=ma(f),!1!==b&&(l="number",f=Number(b));else if(a.numbers.html.decimalMark!==a.numbers.output.decimalMark||a.numbers.html.thousandsSeparator!==a.numbers.output.thousandsSeparator)if(b=
-ma(f),!1!==b){n=(""+b.substr(0>b?1:0)).split(".");1===n.length&&(n[1]="");var t=3<n[0].length?n[0].length%3:0;l="number";f=(0>b?"-":"")+(a.numbers.output.thousandsSeparator?(t?n[0].substr(0,t)+a.numbers.output.thousandsSeparator:"")+n[0].substr(t).replace(/(\d{3})(?=\d)/g,"$1"+a.numbers.output.thousandsSeparator):n[0])+(n[1].length?a.numbers.output.decimalMark+n[1]:"")}}else f=h;!0===a.escape&&(f=escape(f));"function"===typeof a.onCellData&&(f=a.onCellData(q,d,e,f,l),q.data("teUserDefText",1))}void 0!==
-p&&(p.type=l);return f}function Aa(b){return 0<b.length&&!0===a.preventInjection&&0<="=+-@".indexOf(b.charAt(0))?"'"+b:b}function Na(b,a,e){return a+"-"+e.toLowerCase()}function ea(b,a){(b=/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/.exec(b))&&(a=[parseInt(b[1]),parseInt(b[2]),parseInt(b[3])]);return a}function Ba(b){var a=L(b,"text-align"),e=L(b,"font-weight"),c=L(b,"font-style"),f="";"start"===a&&(a="rtl"===L(b,"direction")?"right":"left");700<=e&&(f="bold");"italic"===c&&(f+=c);""===f&&(f="normal");
-a={style:{align:a,bcolor:ea(L(b,"background-color"),[255,255,255]),color:ea(L(b,"color"),[0,0,0]),fstyle:f},colspan:O(b),rowspan:U(b)};null!==b&&(b=b.getBoundingClientRect(),a.rect={width:b.width,height:b.height});return a}function O(b){var a=c(b).attr("data-tableexport-colspan");"undefined"===typeof a&&c(b).is("[colspan]")&&(a=c(b).attr("colspan"));return parseInt(a)||0}function U(b){var a=c(b).attr("data-tableexport-rowspan");"undefined"===typeof a&&c(b).is("[rowspan]")&&(a=c(b).attr("rowspan"));
-return parseInt(a)||0}function L(b,a){try{return window.getComputedStyle?(a=a.replace(/([a-z])([A-Z])/,Na),window.getComputedStyle(b,null).getPropertyValue(a)):b.currentStyle?b.currentStyle[a]:b.style[a]}catch(e){}return""}function fa(a,d,e){d=L(a,d).match(/\d+/);if(null!==d){d=d[0];a=a.parentElement;var b=document.createElement("div");b.style.overflow="hidden";b.style.visibility="hidden";a.appendChild(b);b.style.width=100+e;e=100/b.offsetWidth;a.removeChild(b);return d*e}return 0}function Oa(a){for(var b=
-new ArrayBuffer(a.length),e=new Uint8Array(b),c=0;c!==a.length;++c)e[c]=a.charCodeAt(c)&255;return b}function na(a){var b=a.c,c="";for(++b;b;b=Math.floor((b-1)/26))c=String.fromCharCode((b-1)%26+65)+c;return c+(""+(a.r+1))}function oa(a,d){if("undefined"===typeof d||"number"===typeof d)return oa(a.s,a.e);"string"!==typeof a&&(a=na(a));"string"!==typeof d&&(d=na(d));return a===d?a:a+":"+d}function Ca(a,d){var b=Number(a);if(isFinite(b))return b;var c=1;""!==d.thousandsSeparator&&(a=a.replace(new RegExp("([\\d])"+
-d.thousandsSeparator+"([\\d])","g"),"$1$2"));"."!==d.decimalMark&&(a=a.replace(new RegExp("([\\d])"+d.decimalMark+"([\\d])","g"),"$1.$2"));a=a.replace(/[$]/g,"").replace(/[%]/g,function(){c*=100;return""});if(isFinite(b=Number(a)))return b/c;a=a.replace(/[(](.*)[)]/,function(a,b){c=-c;return b});return isFinite(b=Number(a))?b/c:b}function xa(a){var b=0,c;if(0===a.length)return b;var p=0;for(c=a.length;p<c;p++){var f=a.charCodeAt(p);b=(b<<5)-b+f;b|=0}return b}function M(b,d,c,p,f,l){var e=!0;"function"===
-typeof a.onBeforeSaveToFile&&(e=a.onBeforeSaveToFile(b,d,c,p,f),"boolean"!==typeof e&&(e=!0));if(e)try{if(Da=new Blob([b],{type:c+";charset="+p}),saveAs(Da,d,!1===l),"function"===typeof a.onAfterSaveToFile)a.onAfterSaveToFile(b,d)}catch(h){ja(d,"data:"+c+(p.length?";charset="+p:"")+(f.length?";"+f:"")+",",l?"\ufeff"+b:b)}}function ja(b,d,c){var e=window.navigator.userAgent;if(!1!==b&&window.navigator.msSaveOrOpenBlob)window.navigator.msSaveOrOpenBlob(new Blob([c]),b);else if(!1!==b&&(0<e.indexOf("MSIE ")||
-e.match(/Trident.*rv\:11\./))){if(d=document.createElement("iframe")){document.body.appendChild(d);d.setAttribute("style","display:none");d.contentDocument.open("txt/plain","replace");d.contentDocument.write(c);d.contentDocument.close();d.contentWindow.focus();switch(b.substr(b.lastIndexOf(".")+1)){case "doc":case "json":case "png":case "pdf":case "xls":case "xlsx":b+=".txt"}d.contentDocument.execCommand("SaveAs",!0,b);document.body.removeChild(d)}}else{var f=document.createElement("a");if(f){var l=
-null;f.style.display="none";!1!==b?f.download=b:f.target="_blank";"object"===typeof c?(window.URL=window.URL||window.webkitURL,e=[],e.push(c),l=window.URL.createObjectURL(new Blob(e,{type:d})),f.href=l):0<=d.toLowerCase().indexOf("base64,")?f.href=d+K(c):f.href=d+encodeURIComponent(c);document.body.appendChild(f);if(document.createEvent)null===ha&&(ha=document.createEvent("MouseEvents")),ha.initEvent("click",!0,!1),f.dispatchEvent(ha);else if(document.createEventObject)f.fireEvent("onclick");else if("function"===
-typeof f.onclick)f.onclick();setTimeout(function(){l&&window.URL.revokeObjectURL(l);document.body.removeChild(f);if("function"===typeof a.onAfterSaveToFile)a.onAfterSaveToFile(c,b)},100)}}}function K(a){var b,c="",p=0;if("string"===typeof a){a=a.replace(/\x0d\x0a/g,"\n");var f="";for(b=0;b<a.length;b++){var l=a.charCodeAt(b);128>l?f+=String.fromCharCode(l):(127<l&&2048>l?f+=String.fromCharCode(l>>6|192):(f+=String.fromCharCode(l>>12|224),f+=String.fromCharCode(l>>6&63|128)),f+=String.fromCharCode(l&
-63|128))}a=f}for(;p<a.length;){var q=a.charCodeAt(p++);f=a.charCodeAt(p++);b=a.charCodeAt(p++);l=q>>2;q=(q&3)<<4|f>>4;var h=(f&15)<<2|b>>6;var g=b&63;isNaN(f)?h=g=64:isNaN(b)&&(g=64);c=c+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(l)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(q)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(h)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(g)}return c}
-var a={csvEnclosure:'"',csvSeparator:",",csvUseBOM:!0,date:{html:"dd/mm/yyyy"},displayTableName:!1,escape:!1,exportHiddenCells:!1,fileName:"tableExport",htmlContent:!1,htmlHyperlink:"content",ignoreColumn:[],ignoreRow:[],jsonScope:"all",jspdf:{orientation:"p",unit:"pt",format:"a4",margins:{left:20,right:10,top:10,bottom:10},onDocCreated:null,autotable:{styles:{cellPadding:2,rowHeight:12,fontSize:8,fillColor:255,textColor:50,fontStyle:"normal",overflow:"ellipsize",halign:"inherit",valign:"middle"},
-headerStyles:{fillColor:[52,73,94],textColor:255,fontStyle:"bold",halign:"inherit",valign:"middle"},alternateRowStyles:{fillColor:245},tableExport:{doc:null,onAfterAutotable:null,onBeforeAutotable:null,onAutotableText:null,onTable:null,outputImages:!0}}},mso:{fileFormat:"xlshtml",onMsoNumberFormat:null,pageFormat:"a4",pageOrientation:"portrait",rtl:!1,styles:[],worksheetName:"",xslx:{formatId:{date:14,numbers:2}}},numbers:{html:{decimalMark:".",thousandsSeparator:","},output:{decimalMark:".",thousandsSeparator:","}},
-onAfterSaveToFile:null,onBeforeSaveToFile:null,onCellData:null,onCellHtmlData:null,onCellHtmlHyperlink:null,onIgnoreRow:null,onTableExportBegin:null,onTableExportEnd:null,outputMode:"file",pdfmake:{enabled:!1,docDefinition:{pageOrientation:"portrait",defaultStyle:{font:"Roboto"}},fonts:{}},preserve:{leadingWS:!1,trailingWS:!1},preventInjection:!0,sql:{tableEnclosure:"`",columnEnclosure:"`"},tbodySelector:"tr",tfootSelector:"tr",theadSelector:"tr",tableName:"Table",type:"csv"},N={a0:[2383.94,3370.39],
-a1:[1683.78,2383.94],a2:[1190.55,1683.78],a3:[841.89,1190.55],a4:[595.28,841.89],a5:[419.53,595.28],a6:[297.64,419.53],a7:[209.76,297.64],a8:[147.4,209.76],a9:[104.88,147.4],a10:[73.7,104.88],b0:[2834.65,4008.19],b1:[2004.09,2834.65],b2:[1417.32,2004.09],b3:[1000.63,1417.32],b4:[708.66,1000.63],b5:[498.9,708.66],b6:[354.33,498.9],b7:[249.45,354.33],b8:[175.75,249.45],b9:[124.72,175.75],b10:[87.87,124.72],c0:[2599.37,3676.54],c1:[1836.85,2599.37],c2:[1298.27,1836.85],c3:[918.43,1298.27],c4:[649.13,
-918.43],c5:[459.21,649.13],c6:[323.15,459.21],c7:[229.61,323.15],c8:[161.57,229.61],c9:[113.39,161.57],c10:[79.37,113.39],dl:[311.81,623.62],letter:[612,792],"government-letter":[576,756],legal:[612,1008],"junior-legal":[576,360],ledger:[1224,792],tabloid:[792,1224],"credit-card":[153,243]},C=this,ha=null,u=[],w=[],n=0,t="",T=[],G=[],Da,J=[],V=!1;c.extend(!0,a,k);"xlsx"===a.type&&(a.mso.fileFormat=a.type,a.type="excel");"undefined"!==typeof a.excelFileFormat&&"undefined"===a.mso.fileFormat&&(a.mso.fileFormat=
-a.excelFileFormat);"undefined"!==typeof a.excelPageFormat&&"undefined"===a.mso.pageFormat&&(a.mso.pageFormat=a.excelPageFormat);"undefined"!==typeof a.excelPageOrientation&&"undefined"===a.mso.pageOrientation&&(a.mso.pageOrientation=a.excelPageOrientation);"undefined"!==typeof a.excelRTL&&"undefined"===a.mso.rtl&&(a.mso.rtl=a.excelRTL);"undefined"!==typeof a.excelstyles&&"undefined"===a.mso.styles&&(a.mso.styles=a.excelstyles);"undefined"!==typeof a.onMsoNumberFormat&&"undefined"===a.mso.onMsoNumberFormat&&
-(a.mso.onMsoNumberFormat=a.onMsoNumberFormat);"undefined"!==typeof a.worksheetName&&"undefined"===a.mso.worksheetName&&(a.mso.worksheetName=a.worksheetName);a.mso.pageOrientation="l"===a.mso.pageOrientation.substr(0,1)?"landscape":"portrait";a.date.html=a.date.html||"";if(a.date.html.length){k=[];k.dd="(3[01]|[12][0-9]|0?[1-9])";k.mm="(1[012]|0?[1-9])";k.yyyy="((?:1[6-9]|2[0-2])\\d{2})";k.yy="(\\d{2})";var r=a.date.html.match(/[^a-zA-Z0-9]/)[0];r=a.date.html.toLowerCase().split(r);a.date.regex="^\\s*";
-a.date.regex+=k[r[0]];a.date.regex+="(.)";a.date.regex+=k[r[1]];a.date.regex+="\\2";a.date.regex+=k[r[2]];a.date.regex+="\\s*$";a.date.pattern=new RegExp(a.date.regex,"g");k=r.indexOf("dd")+1;a.date.match_d=k+(1<k?1:0);k=r.indexOf("mm")+1;a.date.match_m=k+(1<k?1:0);k=(0<=r.indexOf("yyyy")?r.indexOf("yyyy"):r.indexOf("yy"))+1;a.date.match_y=k+(1<k?1:0)}T=S(C);if("function"===typeof a.onTableExportBegin)a.onTableExportBegin();if("csv"===a.type||"tsv"===a.type||"txt"===a.type){var P="",Z=0;G=[];n=0;
-var pa=function(b,d,e){b.each(function(){t="";B(this,d,n,e+b.length,function(b,c,d){var e=t,f="";if(null!==b)if(b=E(b,c,d),c=null===b||""===b?"":b.toString(),"tsv"===a.type)b instanceof Date&&b.toLocaleString(),f=W(c,"\t"," ");else if(b instanceof Date)f=a.csvEnclosure+b.toLocaleString()+a.csvEnclosure;else if(f=Aa(c),f=W(f,a.csvEnclosure,a.csvEnclosure+a.csvEnclosure),0<=f.indexOf(a.csvSeparator)||/[\r\n ]/g.test(f))f=a.csvEnclosure+f+a.csvEnclosure;t=e+(f+("tsv"===a.type?"\t":a.csvSeparator))});
-t=c.trim(t).substring(0,t.length-1);0<t.length&&(0<P.length&&(P+="\n"),P+=t);n++});return b.length};Z+=pa(c(C).find("thead").first().find(a.theadSelector),"th,td",Z);A(c(C),"tbody").each(function(){Z+=pa(A(c(this),a.tbodySelector),"td,th",Z)});a.tfootSelector.length&&pa(c(C).find("tfoot").first().find(a.tfootSelector),"td,th",Z);P+="\n";if("string"===a.outputMode)return P;if("base64"===a.outputMode)return K(P);if("window"===a.outputMode){ja(!1,"data:text/"+("csv"===a.type?"csv":"plain")+";charset=utf-8,",
-P);return}M(P,a.fileName+"."+a.type,"text/"+("csv"===a.type?"csv":"plain"),"utf-8","","csv"===a.type&&a.csvUseBOM)}else if("sql"===a.type){n=0;G=[];var D="INSERT INTO "+a.sql.tableEnclosure+a.tableName+a.sql.tableEnclosure+" (";u=y(c(C));c(u).each(function(){B(this,"th,td",n,u.length,function(b,c,e){b=E(b,c,e)||"";-1<b.indexOf(a.sql.columnEnclosure)&&(b=W(b.toString(),a.sql.columnEnclosure,a.sql.columnEnclosure+a.sql.columnEnclosure));D+=a.sql.columnEnclosure+b+a.sql.columnEnclosure+","});n++;D=c.trim(D).substring(0,
-D.length-1)});D+=") VALUES ";w=v(c(C));c(w).each(function(){t="";B(this,"td,th",n,u.length+w.length,function(a,c,e){a=E(a,c,e)||"";-1<a.indexOf("'")&&(a=W(a.toString(),"'","''"));t+="'"+a+"',"});3<t.length&&(D+="("+t,D=c.trim(D).substring(0,D.length-1),D+="),");n++});D=c.trim(D).substring(0,D.length-1);D+=";";if("string"===a.outputMode)return D;if("base64"===a.outputMode)return K(D);M(D,a.fileName+".sql","application/sql","utf-8","",!1)}else if("json"===a.type){var X=[];G=[];u=y(c(C));c(u).each(function(){var a=
-[];B(this,"th,td",n,u.length,function(b,c,g){a.push(E(b,c,g))});X.push(a)});var qa=[];w=v(c(C));c(w).each(function(){var a={},d=0;B(this,"td,th",n,u.length+w.length,function(b,c,f){X.length?a[X[X.length-1][d]]=E(b,c,f):a[d]=E(b,c,f);d++});!1===c.isEmptyObject(a)&&qa.push(a);n++});k="head"===a.jsonScope?JSON.stringify(X):"data"===a.jsonScope?JSON.stringify(qa):JSON.stringify({header:X,data:qa});if("string"===a.outputMode)return k;if("base64"===a.outputMode)return K(k);M(k,a.fileName+".json","application/json",
-"utf-8","base64",!1)}else if("xml"===a.type){n=0;G=[];var Q='<?xml version="1.0" encoding="utf-8"?>';Q+="<tabledata><fields>";u=y(c(C));c(u).each(function(){B(this,"th,td",n,u.length,function(a,c,e){Q+="<field>"+E(a,c,e)+"</field>"});n++});Q+="</fields><data>";var Ea=1;w=v(c(C));c(w).each(function(){var a=1;t="";B(this,"td,th",n,u.length+w.length,function(b,c,g){t+="<column-"+a+">"+E(b,c,g)+"</column-"+a+">";a++});0<t.length&&"<column-1></column-1>"!==t&&(Q+='<row id="'+Ea+'">'+t+"</row>",Ea++);n++});
-Q+="</data></tabledata>";if("string"===a.outputMode)return Q;if("base64"===a.outputMode)return K(Q);M(Q,a.fileName+".xml","application/xml","utf-8","base64",!1)}else if("excel"===a.type&&"xmlss"===a.mso.fileFormat){var ra=[],F=[];c(C).filter(function(){return I(c(this))}).each(function(){function b(a,b,d){var f=[];c(a).each(function(){var b=0,e=0;t="";B(this,"td,th",n,d+a.length,function(a,d,l){if(null!==a){var h="";d=E(a,d,l);l="String";if(!1!==jQuery.isNumeric(d))l="Number";else{var g=Ma(d);!1!==
-g&&(d=g,l="Number",h+=' ss:StyleID="pct1"')}"Number"!==l&&(d=d.replace(/\n/g,"<br>"));g=O(a);a=U(a);c.each(f,function(){if(n>=this.s.r&&n<=this.e.r&&e>=this.s.c&&e<=this.e.c)for(var a=0;a<=this.e.c-this.s.c;++a)e++,b++});if(a||g)a=a||1,g=g||1,f.push({s:{r:n,c:e},e:{r:n+a-1,c:e+g-1}});1<g&&(h+=' ss:MergeAcross="'+(g-1)+'"',e+=g-1);1<a&&(h+=' ss:MergeDown="'+(a-1)+'" ss:StyleID="rsp1"');0<b&&(h+=' ss:Index="'+(e+1)+'"',b=0);t+="<Cell"+h+'><Data ss:Type="'+l+'">'+c("<div />").text(d).html()+"</Data></Cell>\r";
-e++}});0<t.length&&(H+='<Row ss:AutoFitHeight="0">\r'+t+"</Row>\r");n++});return a.length}var d=c(this),e="";"string"===typeof a.mso.worksheetName&&a.mso.worksheetName.length?e=a.mso.worksheetName+" "+(F.length+1):"undefined"!==typeof a.mso.worksheetName[F.length]&&(e=a.mso.worksheetName[F.length]);e.length||(e=d.find("caption").text()||"");e.length||(e="Table "+(F.length+1));e=c.trim(e.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31));F.push(c("<div />").text(e).html());!1===a.exportHiddenCells&&(J=
-d.find("tr, th, td").filter(":hidden"),V=0<J.length);n=0;T=S(this);H="<Table>\r";e=b(y(d),"th,td",0);b(v(d),"td,th",e);H+="</Table>\r";ra.push(H)});k={};r={};for(var m,R,Y=0,da=F.length;Y<da;Y++)m=F[Y],R=k[m],R=k[m]=null==R?1:R+1,2===R&&(F[r[m]]=F[r[m]].substring(0,29)+"-1"),1<k[m]?F[Y]=F[Y].substring(0,29)+"-"+k[m]:r[m]=Y;k='<?xml version="1.0" encoding="UTF-8"?>\r<?mso-application progid="Excel.Sheet"?>\r<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:o="urn:schemas-microsoft-com:office:office"\r xmlns:x="urn:schemas-microsoft-com:office:excel"\r xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:html="http://www.w3.org/TR/REC-html40">\r<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">\r  <Created>'+
-(new Date).toISOString()+'</Created>\r</DocumentProperties>\r<OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">\r  <AllowPNG/>\r</OfficeDocumentSettings>\r<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">\r  <WindowHeight>9000</WindowHeight>\r  <WindowWidth>13860</WindowWidth>\r  <WindowTopX>0</WindowTopX>\r  <WindowTopY>0</WindowTopY>\r  <ProtectStructure>False</ProtectStructure>\r  <ProtectWindows>False</ProtectWindows>\r</ExcelWorkbook>\r<Styles>\r  <Style ss:ID="Default" ss:Name="Normal">\r    <Alignment ss:Vertical="Bottom"/>\r    <Borders/>\r    <Font/>\r    <Interior/>\r    <NumberFormat/>\r    <Protection/>\r  </Style>\r  <Style ss:ID="rsp1">\r    <Alignment ss:Vertical="Center"/>\r  </Style>\r  <Style ss:ID="pct1">\r    <NumberFormat ss:Format="Percent"/>\r  </Style>\r</Styles>\r';
-for(r=0;r<ra.length;r++)k+='<Worksheet ss:Name="'+F[r]+'" ss:RightToLeft="'+(a.mso.rtl?"1":"0")+'">\r'+ra[r],k=a.mso.rtl?k+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">\r<DisplayRightToLeft/>\r</WorksheetOptions>\r':k+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"/>\r',k+="</Worksheet>\r";k+="</Workbook>\r";if("string"===a.outputMode)return k;if("base64"===a.outputMode)return K(k);M(k,a.fileName+".xml","application/xml","utf-8","base64",!1)}else if("excel"===
-a.type&&"xlsx"===a.mso.fileFormat){var aa=[],Fa=XLSX.utils.book_new();c(C).filter(function(){return I(c(this))}).each(function(){for(var b=c(this),d={},e=this.getElementsByTagName("tr"),g={s:{r:0,c:0},e:{r:0,c:0}},f=[],l,q=[],h=0,k=0,m,n,t,u,r,w=XLSX.SSF.get_table();h<e.length&&1E7>k;++h)if(m=e[h],n=!1,"function"===typeof a.onIgnoreRow&&(n=a.onIgnoreRow(c(m),h)),!0!==n&&(0===a.ignoreRow.length||-1===c.inArray(h,a.ignoreRow)&&-1===c.inArray(h-e.length,a.ignoreRow))&&!1!==I(c(m))){var y=m.children,
-C=0;for(m=0;m<y.length;++m)r=y[m],u=+O(r)||1,C+=u;var A=0;for(m=n=0;m<y.length;++m)if(r=y[m],u=+O(r)||1,l=m+A,!sa(c(r),C,l+(l<n?n-l:0))){A+=u-1;for(l=0;l<f.length;++l){var v=f[l];v.s.c==n&&v.s.r<=k&&k<=v.e.r&&(n=v.e.c+1,l=-1)}(0<(t=+U(r))||1<u)&&f.push({s:{r:k,c:n},e:{r:k+(t||1)-1,c:n+u-1}});var D={type:""};l=E(r,h,m+A,D);v={t:"s",v:l};var B="";if(""!==c(r).attr("data-tableexport-cellformat")){var x=parseInt(c(r).attr("data-tableexport-xlsxformatid")||0);0===x&&"function"===typeof a.mso.xslx.formatId.numbers&&
-(x=a.mso.xslx.formatId.numbers(c(r),h,m+A));0===x&&"function"===typeof a.mso.xslx.formatId.date&&(x=a.mso.xslx.formatId.date(c(r),h,m+A));if(49===x||"@"===x)B="s";else if("number"===D.type||0<x&&14>x||36<x&&41>x||48===x)B="n";else if("date"===D.type||13<x&&37>x||44<x&&48>x||56===x)B="d"}else B="s";if(null!=l)if(0===l.length)v.t="z";else if(0!==l.trim().length&&"s"!==B)if("function"===D.type)v={f:l};else if("TRUE"===l)v={t:"b",v:!0};else if("FALSE"===l)v={t:"b",v:!1};else if(""===B&&c(r).find("a").length)l=
-"href"!==a.htmlHyperlink?l:"",v={f:'=HYPERLINK("'+c(r).find("a").attr("href")+(l.length?'","'+l:"")+'")'};else if("n"===B||isFinite(Ca(l,a.numbers.output))){if(r=Ca(l,a.numbers.output),0===x&&"function"!==typeof a.mso.xslx.formatId.numbers&&(x=a.mso.xslx.formatId.numbers),isFinite(r)||isFinite(l))v={t:"n",v:isFinite(r)?r:l,z:"string"===typeof x?x:x in w?w[x]:"0.00"}}else if(!1!==(r=La(l))||"d"===B)0===x&&"function"!==typeof a.mso.xslx.formatId.date&&(x=a.mso.xslx.formatId.date),v={t:"d",v:!1!==r?
-r:l,z:"string"===typeof x?x:x in w?w[x]:"m/d/yy"};d[na({c:n,r:k})]=v;g.e.c<n&&(g.e.c=n);n+=u}++k}f.length&&(d["!merges"]=f);q.length&&(d["!rows"]=q);g.e.r=k-1;d["!ref"]=oa(g);1E7<=k&&(d["!fullref"]=oa((g.e.r=e.length-h+k-1,g)));e="";"string"===typeof a.mso.worksheetName&&a.mso.worksheetName.length?e=a.mso.worksheetName+" "+(aa.length+1):"undefined"!==typeof a.mso.worksheetName[aa.length]&&(e=a.mso.worksheetName[aa.length]);e.length||(e=b.find("caption").text()||"");e.length||(e="Table "+(aa.length+
-1));e=c.trim(e.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31));aa.push(e);XLSX.utils.book_append_sheet(Fa,d,e)});k=XLSX.write(Fa,{type:"binary",bookType:a.mso.fileFormat,bookSST:!1});M(Oa(k),a.fileName+"."+a.mso.fileFormat,"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","UTF-8","",!1)}else if("excel"===a.type||"xls"===a.type||"word"===a.type||"doc"===a.type){k="excel"===a.type||"xls"===a.type?"excel":"word";r="excel"===k?"xls":"doc";m='xmlns:x="urn:schemas-microsoft-com:office:'+
-k+'"';var H="",ba="";c(C).filter(function(){return I(c(this))}).each(function(){var b=c(this);""===ba&&(ba=a.mso.worksheetName||b.find("caption").text()||"Table",ba=c.trim(ba.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31)));!1===a.exportHiddenCells&&(J=b.find("tr, th, td").filter(":hidden"),V=0<J.length);n=0;G=[];T=S(this);H+="<table><thead>";u=y(b);c(u).each(function(){var b=c(this);t="";B(this,"th,td",n,u.length,function(c,d,f){if(null!==c){var e="";t+="<th";if(a.mso.styles.length){var g=document.defaultView.getComputedStyle(c,
-null),h=document.defaultView.getComputedStyle(b[0],null),k;for(k in a.mso.styles){var m=g[a.mso.styles[k]];""===m&&(m=h[a.mso.styles[k]]);""!==m&&"0px none rgb(0, 0, 0)"!==m&&"rgba(0, 0, 0, 0)"!==m&&(e+=""===e?'style="':";",e+=a.mso.styles[k]+":"+m)}}""!==e&&(t+=" "+e+'"');e=O(c);0<e&&(t+=' colspan="'+e+'"');e=U(c);0<e&&(t+=' rowspan="'+e+'"');t+=">"+E(c,d,f)+"</th>"}});0<t.length&&(H+="<tr>"+t+"</tr>");n++});H+="</thead><tbody>";w=v(b);c(w).each(function(){var b=c(this);t="";B(this,"td,th",n,u.length+
-w.length,function(d,g,f){if(null!==d){var e=E(d,g,f),q="",h=c(d).attr("data-tableexport-msonumberformat");"undefined"===typeof h&&"function"===typeof a.mso.onMsoNumberFormat&&(h=a.mso.onMsoNumberFormat(d,g,f));"undefined"!==typeof h&&""!==h&&(q="style=\"mso-number-format:'"+h+"'");if(a.mso.styles.length){g=document.defaultView.getComputedStyle(d,null);f=document.defaultView.getComputedStyle(b[0],null);for(var k in a.mso.styles)h=g[a.mso.styles[k]],""===h&&(h=f[a.mso.styles[k]]),""!==h&&"0px none rgb(0, 0, 0)"!==
-h&&"rgba(0, 0, 0, 0)"!==h&&(q+=""===q?'style="':";",q+=a.mso.styles[k]+":"+h)}t+="<td";""!==q&&(t+=" "+q+'"');q=O(d);0<q&&(t+=' colspan="'+q+'"');d=U(d);0<d&&(t+=' rowspan="'+d+'"');"string"===typeof e&&""!==e&&(e=Aa(e),e=e.replace(/\n/g,"<br>"));t+=">"+e+"</td>"}});0<t.length&&(H+="<tr>"+t+"</tr>");n++});a.displayTableName&&(H+="<tr><td></td></tr><tr><td></td></tr><tr><td>"+E(c("<p>"+a.tableName+"</p>"))+"</td></tr>");H+="</tbody></table>"});m='<html xmlns:o="urn:schemas-microsoft-com:office:office" '+
-m+' xmlns="http://www.w3.org/TR/REC-html40">'+('<meta http-equiv="content-type" content="application/vnd.ms-'+k+'; charset=UTF-8">');m+="<head>";"excel"===k&&(m+="\x3c!--[if gte mso 9]>",m+="<xml>",m+="<x:ExcelWorkbook>",m+="<x:ExcelWorksheets>",m+="<x:ExcelWorksheet>",m+="<x:Name>",m+=ba,m+="</x:Name>",m+="<x:WorksheetOptions>",m+="<x:DisplayGridlines/>",a.mso.rtl&&(m+="<x:DisplayRightToLeft/>"),m+="</x:WorksheetOptions>",m+="</x:ExcelWorksheet>",m+="</x:ExcelWorksheets>",m+="</x:ExcelWorkbook>",
-m+="</xml>",m+="<![endif]--\x3e");m+="<style>";m+="@page { size:"+a.mso.pageOrientation+"; mso-page-orientation:"+a.mso.pageOrientation+"; }";m+="@page Section1 {size:"+N[a.mso.pageFormat][0]+"pt "+N[a.mso.pageFormat][1]+"pt";m+="; margin:1.0in 1.25in 1.0in 1.25in;mso-header-margin:.5in;mso-footer-margin:.5in;mso-paper-source:0;}";m+="div.Section1 {page:Section1;}";m+="@page Section2 {size:"+N[a.mso.pageFormat][1]+"pt "+N[a.mso.pageFormat][0]+"pt";m+=";mso-page-orientation:"+a.mso.pageOrientation+
-";margin:1.25in 1.0in 1.25in 1.0in;mso-header-margin:.5in;mso-footer-margin:.5in;mso-paper-source:0;}";m+="div.Section2 {page:Section2;}";m+="br {mso-data-placement:same-cell;}";m+="</style>";m+="</head>";m+="<body>";m+='<div class="Section'+("landscape"===a.mso.pageOrientation?"2":"1")+'">';m+=H;m+="</div>";m+="</body>";m+="</html>";if("string"===a.outputMode)return m;if("base64"===a.outputMode)return K(m);M(m,a.fileName+"."+r,"application/vnd.ms-"+k,"","base64",!1)}else if("png"===a.type)html2canvas(c(C)[0]).then(function(b){b=
-b.toDataURL();for(var c=atob(b.substring(22)),e=new ArrayBuffer(c.length),g=new Uint8Array(e),f=0;f<c.length;f++)g[f]=c.charCodeAt(f);if("string"===a.outputMode)return c;if("base64"===a.outputMode)return K(b);"window"===a.outputMode?window.open(b):M(e,a.fileName+".png","image/png","","",!1)});else if("pdf"===a.type)if(!0===a.pdfmake.enabled){k=[];var Ga=[];n=0;G=[];r=function(a,d,e){var b=0;c(a).each(function(){var a=[];B(this,d,n,e,function(b,c,d){if("undefined"!==typeof b&&null!==b){var e=O(b),
-f=U(b);b=E(b,c,d)||" ";1<e||1<f?a.push({colSpan:e||1,rowSpan:f||1,text:b}):a.push(b)}else a.push(" ")});a.length&&Ga.push(a);b<a.length&&(b=a.length);n++});return b};u=y(c(this));m=r(u,"th,td",u.length);for(R=k.length;R<m;R++)k.push("*");w=v(c(this));r(w,"th,td",u.length+w.length);k={content:[{table:{headerRows:u.length,widths:k,body:Ga}}]};"undefined"!==typeof pdfMake&&(pdfMake.fonts={Roboto:{normal:"Roboto-Regular.ttf",bold:"Roboto-Medium.ttf",italics:"Roboto-Italic.ttf",bolditalics:"Roboto-MediumItalic.ttf"}},
-pdfMake.vfs.hasOwnProperty("Mirza-Regular.ttf")?(a.pdfmake.docDefinition.defaultStyle.font="Mirza",c.extend(!0,pdfMake.fonts,{Mirza:{normal:"Mirza-Regular.ttf",bold:"Mirza-Bold.ttf",italics:"Mirza-Medium.ttf",bolditalics:"Mirza-SemiBold.ttf"}})):pdfMake.vfs.hasOwnProperty("gbsn00lp.ttf")?(a.pdfmake.docDefinition.defaultStyle.font="gbsn00lp",c.extend(!0,pdfMake.fonts,{gbsn00lp:{normal:"gbsn00lp.ttf",bold:"gbsn00lp.ttf",italics:"gbsn00lp.ttf",bolditalics:"gbsn00lp.ttf"}})):pdfMake.vfs.hasOwnProperty("ZCOOLXiaoWei-Regular.ttf")&&
-(a.pdfmake.docDefinition.defaultStyle.font="ZCOOLXiaoWei",c.extend(!0,pdfMake.fonts,{ZCOOLXiaoWei:{normal:"ZCOOLXiaoWei-Regular.ttf",bold:"ZCOOLXiaoWei-Regular.ttf",italics:"ZCOOLXiaoWei-Regular.ttf",bolditalics:"ZCOOLXiaoWei-Regular.ttf"}})),c.extend(!0,k,a.pdfmake.docDefinition),c.extend(!0,pdfMake.fonts,a.pdfmake.fonts),"undefined"!==typeof pdfMake.createPdf&&pdfMake.createPdf(k).getBuffer(function(b){M(b,a.fileName+".pdf","application/pdf","","",!1)}))}else if(!1===a.jspdf.autotable){k={dim:{w:fa(c(C).first().get(0),
-"width","mm"),h:fa(c(C).first().get(0),"height","mm")},pagesplit:!1};var Ha=new jsPDF(a.jspdf.orientation,a.jspdf.unit,a.jspdf.format);Ha.addHTML(c(C).first(),a.jspdf.margins.left,a.jspdf.margins.top,k,function(){ua(Ha,!1)})}else{var g=a.jspdf.autotable.tableExport;if("string"===typeof a.jspdf.format&&"bestfit"===a.jspdf.format.toLowerCase()){var ia="",ca="",Ia=0;c(C).each(function(){if(I(c(this))){var a=fa(c(this).get(0),"width","pt");if(a>Ia){a>N.a0[0]&&(ia="a0",ca="l");for(var d in N)N.hasOwnProperty(d)&&
-N[d][1]>a&&(ia=d,ca="l",N[d][0]>a&&(ca="p"));Ia=a}}});a.jspdf.format=""===ia?"a4":ia;a.jspdf.orientation=""===ca?"w":ca}if(null==g.doc&&(g.doc=new jsPDF(a.jspdf.orientation,a.jspdf.unit,a.jspdf.format),g.wScaleFactor=1,g.hScaleFactor=1,"function"===typeof a.jspdf.onDocCreated))a.jspdf.onDocCreated(g.doc);!0===g.outputImages&&(g.images={});"undefined"!==typeof g.images&&(c(C).filter(function(){return I(c(this))}).each(function(){var b=0;G=[];!1===a.exportHiddenCells&&(J=c(this).find("tr, th, td").filter(":hidden"),
-V=0<J.length);u=y(c(this));w=v(c(this));c(w).each(function(){B(this,"td,th",u.length+b,u.length+w.length,function(a){wa(a,c(a).children(),g)});b++})}),u=[],w=[]);Ka(g,function(){c(C).filter(function(){return I(c(this))}).each(function(){var b;n=0;G=[];!1===a.exportHiddenCells&&(J=c(this).find("tr, th, td").filter(":hidden"),V=0<J.length);T=S(this);g.columns=[];g.rows=[];g.teCells={};if("function"===typeof g.onTable&&!1===g.onTable(c(this),a))return!0;a.jspdf.autotable.tableExport=null;var d=c.extend(!0,
-{},a.jspdf.autotable);a.jspdf.autotable.tableExport=g;d.margin={};c.extend(!0,d.margin,a.jspdf.margins);d.tableExport=g;"function"!==typeof d.beforePageContent&&(d.beforePageContent=function(a){if(1===a.pageCount){var b=a.table.rows.concat(a.table.headerRow);c.each(b,function(){0<this.height&&(this.height+=(2-1.15)/2*this.styles.fontSize,a.table.height+=(2-1.15)/2*this.styles.fontSize)})}});"function"!==typeof d.createdHeaderCell&&(d.createdHeaderCell=function(a,b){a.styles=c.extend({},b.row.styles);
-if("undefined"!==typeof g.columns[b.column.dataKey]){var e=g.columns[b.column.dataKey];if("undefined"!==typeof e.rect){a.contentWidth=e.rect.width;if("undefined"===typeof g.heightRatio||0===g.heightRatio){var f=b.row.raw[b.column.dataKey].rowspan?b.row.raw[b.column.dataKey].rect.height/b.row.raw[b.column.dataKey].rowspan:b.row.raw[b.column.dataKey].rect.height;g.heightRatio=a.styles.rowHeight/f}f=b.row.raw[b.column.dataKey].rect.height*g.heightRatio;f>a.styles.rowHeight&&(a.styles.rowHeight=f)}a.styles.halign=
-"inherit"===d.headerStyles.halign?"center":d.headerStyles.halign;a.styles.valign=d.headerStyles.valign;"undefined"!==typeof e.style&&!0!==e.style.hidden&&("inherit"===d.headerStyles.halign&&(a.styles.halign=e.style.align),"inherit"===d.styles.fillColor&&(a.styles.fillColor=e.style.bcolor),"inherit"===d.styles.textColor&&(a.styles.textColor=e.style.color),"inherit"===d.styles.fontStyle&&(a.styles.fontStyle=e.style.fstyle))}});"function"!==typeof d.createdCell&&(d.createdCell=function(a,b){b=g.teCells[b.row.index+
-":"+b.column.dataKey];a.styles.halign="inherit"===d.styles.halign?"center":d.styles.halign;a.styles.valign=d.styles.valign;"undefined"!==typeof b&&"undefined"!==typeof b.style&&!0!==b.style.hidden&&("inherit"===d.styles.halign&&(a.styles.halign=b.style.align),"inherit"===d.styles.fillColor&&(a.styles.fillColor=b.style.bcolor),"inherit"===d.styles.textColor&&(a.styles.textColor=b.style.color),"inherit"===d.styles.fontStyle&&(a.styles.fontStyle=b.style.fstyle))});"function"!==typeof d.drawHeaderCell&&
-(d.drawHeaderCell=function(a,b){var c=g.columns[b.column.dataKey];return(!0!==c.style.hasOwnProperty("hidden")||!0!==c.style.hidden)&&0<=c.rowIndex?va(a,b,c):!1});"function"!==typeof d.drawCell&&(d.drawCell=function(a,b){var d=g.teCells[b.row.index+":"+b.column.dataKey];if(!0!==("undefined"!==typeof d&&d.isCanvas))va(a,b,d)&&(g.doc.rect(a.x,a.y,a.width,a.height,a.styles.fillStyle),"undefined"===typeof d||"undefined"!==typeof d.hasUserDefText&&!0===d.hasUserDefText||"undefined"===typeof d.elements||
-!d.elements.length?za(a,{},g):(b=a.height/d.rect.height,b>g.hScaleFactor&&(g.hScaleFactor=b),g.wScaleFactor=a.width/d.rect.width,b=a.textPos.y,ya(a,d.elements,g),a.textPos.y=b,za(a,d.elements,g)));else{d=d.elements[0];var e=c(d).attr("data-tableexport-canvas"),f=d.getBoundingClientRect();a.width=f.width*g.wScaleFactor;a.height=f.height*g.hScaleFactor;b.row.height=a.height;ta(a,d,e,g)}return!1});g.headerrows=[];u=y(c(this));c(u).each(function(){b=0;g.headerrows[n]=[];B(this,"th,td",n,u.length,function(a,
-c,d){var e=Ba(a);e.title=E(a,c,d);e.key=b++;e.rowIndex=n;g.headerrows[n].push(e)});n++});if(0<n)for(var e=n-1;0<=e;)c.each(g.headerrows[e],function(){var a=this;0<e&&null===this.rect&&(a=g.headerrows[e-1][this.key]);null!==a&&0<=a.rowIndex&&(!0!==a.style.hasOwnProperty("hidden")||!0!==a.style.hidden)&&g.columns.push(a)}),e=0<g.columns.length?-1:e-1;var k=0;w=[];w=v(c(this));c(w).each(function(){var a=[];b=0;B(this,"td,th",n,u.length+w.length,function(d,e,f){if("undefined"===typeof g.columns[b]){var h=
-{title:"",key:b,style:{hidden:!0}};g.columns.push(h)}a.push(E(d,e,f));"undefined"!==typeof d&&null!==d?(h=Ba(d),h.isCanvas=d.hasAttribute("data-tableexport-canvas"),h.elements=h.isCanvas?c(d):c(d).children(),"undefined"!==typeof c(d).data("teUserDefText")&&(h.hasUserDefText=!0)):(h=c.extend(!0,{},g.teCells[k+":"+(b-1)]),h.colspan=-1);g.teCells[k+":"+b++]=h});a.length&&(g.rows.push(a),k++);n++});if("function"===typeof g.onBeforeAutotable)g.onBeforeAutotable(c(this),g.columns,g.rows,d);g.doc.autoTable(g.columns,
-g.rows,d);if("function"===typeof g.onAfterAutotable)g.onAfterAutotable(c(this),d);a.jspdf.autotable.startY=g.doc.autoTableEndPosY()+d.margin.top});ua(g.doc,"undefined"!==typeof g.images&&!1===jQuery.isEmptyObject(g.images));"undefined"!==typeof g.headerrows&&(g.headerrows.length=0);"undefined"!==typeof g.columns&&(g.columns.length=0);"undefined"!==typeof g.rows&&(g.rows.length=0);delete g.doc;g.doc=null})}if("function"===typeof a.onTableExportEnd)a.onTableExportEnd();return this}})(jQuery);
+var $jscomp=$jscomp||{};$jscomp.scope={};$jscomp.findInternal=function(d,k,y){d instanceof String&&(d=String(d));for(var C=d.length,v=0;v<C;v++){var R=d[v];if(k.call(y,R,v,d))return{i:v,v:R}}return{i:-1,v:void 0}};$jscomp.ASSUME_ES5=!1;$jscomp.ASSUME_NO_NATIVE_MAP=!1;$jscomp.ASSUME_NO_NATIVE_SET=!1;$jscomp.defineProperty=$jscomp.ASSUME_ES5||"function"==typeof Object.defineProperties?Object.defineProperty:function(d,k,y){d!=Array.prototype&&d!=Object.prototype&&(d[k]=y.value)};
+$jscomp.getGlobal=function(d){return"undefined"!=typeof window&&window===d?d:"undefined"!=typeof global&&null!=global?global:d};$jscomp.global=$jscomp.getGlobal(this);$jscomp.polyfill=function(d,k,y,C){if(k){y=$jscomp.global;d=d.split(".");for(C=0;C<d.length-1;C++){var v=d[C];v in y||(y[v]={});y=y[v]}d=d[d.length-1];C=y[d];k=k(C);k!=C&&null!=k&&$jscomp.defineProperty(y,d,{configurable:!0,writable:!0,value:k})}};
+$jscomp.polyfill("Array.prototype.find",function(d){return d?d:function(d,y){return $jscomp.findInternal(this,d,y).v}},"es6","es3");
+(function(d){d.fn.tableExport=function(k){function y(b){var c=[];v(b,"thead").each(function(){c.push.apply(c,v(d(this),a.theadSelector).toArray())});return c}function C(b){var c=[];v(b,"tbody").each(function(){c.push.apply(c,v(d(this),a.tbodySelector).toArray())});a.tfootSelector.length&&v(b,"tfoot").each(function(){c.push.apply(c,v(d(this),a.tfootSelector).toArray())});return c}function v(b,a){var c=b[0].tagName,p=b.parents(c).length;return b.find(a).filter(function(){return p===d(this).closest(c).parents(c).length})}
+function R(b){var a=[],e=0,p=0,f=0;d(b).find("thead").first().find("th").each(function(b,c){b=void 0!==d(c).attr("data-field");"undefined"!==typeof c.parentNode.rowIndex&&p!==c.parentNode.rowIndex&&(p=c.parentNode.rowIndex,e=f=0);var l=J(c);for(e+=l?l:1;f<e;)a[f]=b?d(c).attr("data-field"):f.toString(),f++});return a}function I(b){var a="undefined"!==typeof b[0].rowIndex,e=!1===a&&"undefined"!==typeof b[0].cellIndex,p=e||a?Ja(b):b.is(":visible"),f=b.attr("data-tableexport-display");e&&"none"!==f&&
+"always"!==f&&(b=d(b[0].parentNode),a="undefined"!==typeof b[0].rowIndex,f=b.attr("data-tableexport-display"));a&&"none"!==f&&"always"!==f&&(f=b.closest("table").attr("data-tableexport-display"));return"none"!==f&&(!0===p||"always"===f)}function Ja(b){var a=[];U&&(a=K.filter(function(){var a=!1;this.nodeType===b[0].nodeType&&("undefined"!==typeof this.rowIndex&&this.rowIndex===b[0].rowIndex?a=!0:"undefined"!==typeof this.cellIndex&&this.cellIndex===b[0].cellIndex&&"undefined"!==typeof this.parentNode.rowIndex&&
+"undefined"!==typeof b[0].parentNode.rowIndex&&this.parentNode.rowIndex===b[0].parentNode.rowIndex&&(a=!0));return a}));return!1===U||0===a.length}function ta(b,c,e){var p=!1;I(b)?0<a.ignoreColumn.length&&(-1!==d.inArray(e,a.ignoreColumn)||-1!==d.inArray(e-c,a.ignoreColumn)||S.length>e&&"undefined"!==typeof S[e]&&-1!==d.inArray(S[e],a.ignoreColumn))&&(p=!0):p=!0;return p}function E(b,c,e,p,f){if("function"===typeof f){var l=!1;"function"===typeof a.onIgnoreRow&&(l=a.onIgnoreRow(d(b),e));if(!1===l&&
+(0===a.ignoreRow.length||-1===d.inArray(e,a.ignoreRow)&&-1===d.inArray(e-p,a.ignoreRow))&&I(d(b))){b=v(d(b),c);var q=b.length,h=0,u=0;b.each(function(){var b=d(this),a=J(this),c=T(this),l;d.each(G,function(){if(e>this.s.r&&e<=this.e.r&&h>=this.s.c&&h<=this.e.c)for(l=0;l<=this.e.c-this.s.c;++l)q++,u++,f(null,e,h++)});if(c||a)a=a||1,G.push({s:{r:e,c:h},e:{r:e+(c||1)-1,c:h+a-1}});!1===ta(b,q,u++)&&f(this,e,h++);if(1<a)for(l=0;l<a-1;++l)u++,f(null,e,h++)});d.each(G,function(){if(e>=this.s.r&&e<=this.e.r&&
+h>=this.s.c&&h<=this.e.c)for(da=0;da<=this.e.c-this.s.c;++da)f(null,e,h++)})}}}function ua(b,a,e,d){if("undefined"!==typeof d.images&&(e=d.images[e],"undefined"!==typeof e)){a=a.getBoundingClientRect();var c=b.width/b.height,l=a.width/a.height,p=b.width,h=b.height,u=19.049976/25.4,g=0;l<=c?(h=Math.min(b.height,a.height),p=a.width*h/a.height):l>c&&(p=Math.min(b.width,a.width),h=a.height*p/a.width);p*=u;h*=u;h<b.height&&(g=(b.height-h)/2);try{d.doc.addImage(e.src,b.textPos.x,b.y+g,p,h)}catch(Pa){}b.textPos.x+=
+p}}function va(b,c){if("string"===a.outputMode)return b.output();if("base64"===a.outputMode)return L(b.output());if("window"===a.outputMode)window.URL=window.URL||window.webkitURL,window.open(window.URL.createObjectURL(b.output("blob")));else try{var e=b.output("blob");saveAs(e,a.fileName+".pdf")}catch(p){ka(a.fileName+".pdf","data:application/pdf"+(c?"":";base64")+",",c?b.output("blob"):b.output())}}function wa(b,a,e){var c=0;"undefined"!==typeof e&&(c=e.colspan);if(0<=c){for(var d=b.width,l=b.textPos.x,
+q=a.table.columns.indexOf(a.column),h=1;h<c;h++)d+=a.table.columns[q+h].width;1<c&&("right"===b.styles.halign?l=b.textPos.x+d-b.width:"center"===b.styles.halign&&(l=b.textPos.x+(d-b.width)/2));b.width=d;b.textPos.x=l;"undefined"!==typeof e&&1<e.rowspan&&(b.height*=e.rowspan);if("middle"===b.styles.valign||"bottom"===b.styles.valign)e=("string"===typeof b.text?b.text.split(/\r\n|\r|\n/g):b.text).length||1,2<e&&(b.textPos.y-=(2-1.15)/2*a.row.styles.fontSize*(e-2)/3);return!0}return!1}function xa(b,
+a,e){"undefined"!==typeof b&&null!==b&&(b.hasAttribute("data-tableexport-canvas")?(a=(new Date).getTime(),d(b).attr("data-tableexport-canvas",a),e.images[a]={url:'[data-tableexport-canvas="'+a+'"]',src:null}):"undefined"!==a&&null!=a&&a.each(function(){if(d(this).is("img")){var a=ya(this.src);e.images[a]={url:this.src,src:this.src}}xa(b,d(this).children(),e)}))}function Ka(b,a){function c(b){if(b.url)if(b.src){var c=new Image;p=++f;c.crossOrigin="Anonymous";c.onerror=c.onload=function(){if(c.complete&&
+(0===c.src.indexOf("data:image/")&&(c.width=b.width||c.width||0,c.height=b.height||c.height||0),c.width+c.height)){var e=document.createElement("canvas"),d=e.getContext("2d");e.width=c.width;e.height=c.height;d.drawImage(c,0,0);b.src=e.toDataURL("image/png")}--f||a(p)};c.src=b.url}else{var e=d(b.url);e.length&&(p=++f,html2canvas(e[0]).then(function(c){b.src=c.toDataURL("image/png");--f||a(p)}))}}var p=0,f=0;if("undefined"!==typeof b.images)for(var l in b.images)b.images.hasOwnProperty(l)&&c(b.images[l]);
+(b=f)||(a(p),b=void 0);return b}function za(b,c,e){c.each(function(){if(d(this).is("div")){var c=ea(M(this,"background-color"),[255,255,255]),f=ea(M(this,"border-top-color"),[0,0,0]),l=fa(this,"border-top-width",a.jspdf.unit),q=this.getBoundingClientRect(),h=this.offsetLeft*e.wScaleFactor,u=this.offsetTop*e.hScaleFactor,g=q.width*e.wScaleFactor;q=q.height*e.hScaleFactor;e.doc.setDrawColor.apply(void 0,f);e.doc.setFillColor.apply(void 0,c);e.doc.setLineWidth(l);e.doc.rect(b.x+h,b.y+u,g,q,l?"FD":"F")}else d(this).is("img")&&
+(c=ya(this.src),ua(b,this,c,e));za(b,d(this).children(),e)})}function Aa(b,c,e){if("function"===typeof e.onAutotableText)e.onAutotableText(e.doc,b,c);else{var p=b.textPos.x,f=b.textPos.y,l={halign:b.styles.halign,valign:b.styles.valign};if(c.length){for(c=c[0];c.previousSibling;)c=c.previousSibling;for(var q=!1,h=!1;c;){var u=c.innerText||c.textContent||"",g=u.length&&" "===u[0]?" ":"",k=1<u.length&&" "===u[u.length-1]?" ":"";!0!==a.preserve.leadingWS&&(u=g+la(u));!0!==a.preserve.trailingWS&&(u=ma(u)+
+k);d(c).is("br")&&(p=b.textPos.x,f+=e.doc.internal.getFontSize());d(c).is("b")?q=!0:d(c).is("i")&&(h=!0);(q||h)&&e.doc.setFontType(q&&h?"bolditalic":q?"bold":"italic");if(g=e.doc.getStringUnitWidth(u)*e.doc.internal.getFontSize()){"linebreak"===b.styles.overflow&&p>b.textPos.x&&p+g>b.textPos.x+b.width&&(0<=".,!%*;:=-".indexOf(u.charAt(0))&&(k=u.charAt(0),g=e.doc.getStringUnitWidth(k)*e.doc.internal.getFontSize(),p+g<=b.textPos.x+b.width&&(e.doc.autoTableText(k,p,f,l),u=u.substring(1,u.length)),g=
+e.doc.getStringUnitWidth(u)*e.doc.internal.getFontSize()),p=b.textPos.x,f+=e.doc.internal.getFontSize());if("visible"!==b.styles.overflow)for(;u.length&&p+g>b.textPos.x+b.width;)u=u.substring(0,u.length-1),g=e.doc.getStringUnitWidth(u)*e.doc.internal.getFontSize();e.doc.autoTableText(u,p,f,l);p+=g}if(q||h)d(c).is("b")?q=!1:d(c).is("i")&&(h=!1),e.doc.setFontType(q||h?q?"bold":"italic":"normal");c=c.nextSibling}b.textPos.x=p;b.textPos.y=f}else e.doc.autoTableText(b.text,b.textPos.x,b.textPos.y,l)}}
+function V(b,a,e){return null==b?"":b.toString().replace(new RegExp(null==a?"":a.toString().replace(/([.*+?^=!:${}()|\[\]\/\\])/g,"\\$1"),"g"),e)}function la(b){return null==b?"":b.toString().replace(/^\s+/,"")}function ma(b){return null==b?"":b.toString().replace(/\s+$/,"")}function La(b){if(0===a.date.html.length)return!1;a.date.pattern.lastIndex=0;var c=a.date.pattern.exec(b);if(null==c)return!1;b=+c[a.date.match_y];if(0>b||8099<b)return!1;var e=1*c[a.date.match_m];c=1*c[a.date.match_d];if(!isFinite(c))return!1;
+var d=new Date(b,e-1,c,0,0,0);return d.getFullYear()===b&&d.getMonth()===e-1&&d.getDate()===c?new Date(Date.UTC(b,e-1,c,0,0,0)):!1}function na(b){b=b||"0";""!==a.numbers.html.thousandsSeparator&&(b=V(b,a.numbers.html.thousandsSeparator,""));"."!==a.numbers.html.decimalMark&&(b=V(b,a.numbers.html.decimalMark,"."));return"number"===typeof b||!1!==jQuery.isNumeric(b)?b:!1}function Ma(b){-1<b.indexOf("%")?(b=na(b.replace(/%/g,"")),!1!==b&&(b/=100)):b=!1;return b}function D(b,c,e,p){var f="",l="text";
+if(null!==b){var q=d(b);q.removeData("teUserDefText");if(q[0].hasAttribute("data-tableexport-canvas"))var h="";else if(q[0].hasAttribute("data-tableexport-value"))h=(h=q.attr("data-tableexport-value"))?h+"":"",q.data("teUserDefText",1);else if(h=q.html(),"function"===typeof a.onCellHtmlData)h=a.onCellHtmlData(q,c,e,h),q.data("teUserDefText",1);else if(""!==h){b=d.parseHTML(h);var g=0,k=0;h="";d.each(b,function(){if(d(this).is("input"))h+=q.find("input").eq(g++).val();else if(d(this).is("select"))h+=
+q.find("select option:selected").eq(k++).text();else if(d(this).is("br"))h+="<br>";else{if("undefined"===typeof d(this).html())h+=d(this).text();else if(void 0===jQuery().bootstrapTable||!1===d(this).hasClass("fht-cell")&&!1===d(this).hasClass("filterControl")&&0===q.parents(".detail-view").length)h+=d(this).html();if(d(this).is("a")){var b=q.find("a").attr("href")||"";f="function"===typeof a.onCellHtmlHyperlink?f+a.onCellHtmlHyperlink(q,c,e,b,h):"href"===a.htmlHyperlink?f+b:f+h;h=""}}})}if(h&&""!==
+h&&!0===a.htmlContent)f=d.trim(h);else if(h&&""!==h)if(""!==q.attr("data-tableexport-cellformat")){var m=h.replace(/\n/g,"\u2028").replace(/(<\s*br([^>]*)>)/gi,"\u2060"),n=d("<div/>").html(m).contents();b=!1;m="";d.each(n.text().split("\u2028"),function(b,c){0<b&&(m+=" ");!0!==a.preserve.leadingWS&&(c=la(c));m+=!0!==a.preserve.trailingWS?ma(c):c});d.each(m.split("\u2060"),function(b,c){0<b&&(f+="\n");!0!==a.preserve.leadingWS&&(c=la(c));!0!==a.preserve.trailingWS&&(c=ma(c));f+=c.replace(/\u00AD/g,
+"")});f=f.replace(/\u00A0/g," ");if("json"===a.type||"excel"===a.type&&"xmlss"===a.mso.fileFormat||!1===a.numbers.output)b=na(f),!1!==b&&(l="number",f=Number(b));else if(a.numbers.html.decimalMark!==a.numbers.output.decimalMark||a.numbers.html.thousandsSeparator!==a.numbers.output.thousandsSeparator)if(b=na(f),!1!==b){n=(""+b.substr(0>b?1:0)).split(".");1===n.length&&(n[1]="");var t=3<n[0].length?n[0].length%3:0;l="number";f=(0>b?"-":"")+(a.numbers.output.thousandsSeparator?(t?n[0].substr(0,t)+a.numbers.output.thousandsSeparator:
+"")+n[0].substr(t).replace(/(\d{3})(?=\d)/g,"$1"+a.numbers.output.thousandsSeparator):n[0])+(n[1].length?a.numbers.output.decimalMark+n[1]:"")}}else f=h;!0===a.escape&&(f=escape(f));"function"===typeof a.onCellData&&(f=a.onCellData(q,c,e,f,l),q.data("teUserDefText",1))}void 0!==p&&(p.type=l);return f}function Ba(b){return 0<b.length&&!0===a.preventInjection&&0<="=+-@".indexOf(b.charAt(0))?"'"+b:b}function Na(b,a,e){return a+"-"+e.toLowerCase()}function ea(b,a){(b=/^rgb\((\d{1,3}),\s*(\d{1,3}),\s*(\d{1,3})\)$/.exec(b))&&
+(a=[parseInt(b[1]),parseInt(b[2]),parseInt(b[3])]);return a}function Ca(b){var a=M(b,"text-align"),e=M(b,"font-weight"),d=M(b,"font-style"),f="";"start"===a&&(a="rtl"===M(b,"direction")?"right":"left");700<=e&&(f="bold");"italic"===d&&(f+=d);""===f&&(f="normal");a={style:{align:a,bcolor:ea(M(b,"background-color"),[255,255,255]),color:ea(M(b,"color"),[0,0,0]),fstyle:f},colspan:J(b),rowspan:T(b)};null!==b&&(b=b.getBoundingClientRect(),a.rect={width:b.width,height:b.height});return a}function J(b){var a=
+d(b).attr("data-tableexport-colspan");"undefined"===typeof a&&d(b).is("[colspan]")&&(a=d(b).attr("colspan"));return parseInt(a)||0}function T(b){var a=d(b).attr("data-tableexport-rowspan");"undefined"===typeof a&&d(b).is("[rowspan]")&&(a=d(b).attr("rowspan"));return parseInt(a)||0}function M(a,c){try{return window.getComputedStyle?(c=c.replace(/([a-z])([A-Z])/,Na),window.getComputedStyle(a,null).getPropertyValue(c)):a.currentStyle?a.currentStyle[c]:a.style[c]}catch(e){}return""}function fa(a,c,e){c=
+M(a,c).match(/\d+/);if(null!==c){c=c[0];a=a.parentElement;var b=document.createElement("div");b.style.overflow="hidden";b.style.visibility="hidden";a.appendChild(b);b.style.width=100+e;e=100/b.offsetWidth;a.removeChild(b);return c*e}return 0}function Oa(a){for(var b=new ArrayBuffer(a.length),e=new Uint8Array(b),d=0;d!==a.length;++d)e[d]=a.charCodeAt(d)&255;return b}function oa(a){var b=a.c,e="";for(++b;b;b=Math.floor((b-1)/26))e=String.fromCharCode((b-1)%26+65)+e;return e+(""+(a.r+1))}function pa(a,
+c){if("undefined"===typeof c||"number"===typeof c)return pa(a.s,a.e);"string"!==typeof a&&(a=oa(a));"string"!==typeof c&&(c=oa(c));return a===c?a:a+":"+c}function Da(a,c){var b=Number(a);if(isFinite(b))return b;var d=1;""!==c.thousandsSeparator&&(a=a.replace(new RegExp("([\\d])"+c.thousandsSeparator+"([\\d])","g"),"$1$2"));"."!==c.decimalMark&&(a=a.replace(new RegExp("([\\d])"+c.decimalMark+"([\\d])","g"),"$1.$2"));a=a.replace(/[$]/g,"").replace(/[%]/g,function(){d*=100;return""});if(isFinite(b=Number(a)))return b/
+d;a=a.replace(/[(](.*)[)]/,function(a,b){d=-d;return b});return isFinite(b=Number(a))?b/d:b}function ya(a){var b=0,d;if(0===a.length)return b;var p=0;for(d=a.length;p<d;p++){var f=a.charCodeAt(p);b=(b<<5)-b+f;b|=0}return b}function N(b,c,d,p,f,l){var e=!0;"function"===typeof a.onBeforeSaveToFile&&(e=a.onBeforeSaveToFile(b,c,d,p,f),"boolean"!==typeof e&&(e=!0));if(e)try{if(Ea=new Blob([b],{type:d+";charset="+p}),saveAs(Ea,c,!1===l),"function"===typeof a.onAfterSaveToFile)a.onAfterSaveToFile(b,c)}catch(h){ka(c,
+"data:"+d+(p.length?";charset="+p:"")+(f.length?";"+f:"")+",",l?"\ufeff"+b:b)}}function ka(b,c,d){var e=window.navigator.userAgent;if(!1!==b&&window.navigator.msSaveOrOpenBlob)window.navigator.msSaveOrOpenBlob(new Blob([d]),b);else if(!1!==b&&(0<e.indexOf("MSIE ")||e.match(/Trident.*rv\:11\./))){if(c=document.createElement("iframe")){document.body.appendChild(c);c.setAttribute("style","display:none");c.contentDocument.open("txt/plain","replace");c.contentDocument.write(d);c.contentDocument.close();
+c.contentWindow.focus();switch(b.substr(b.lastIndexOf(".")+1)){case "doc":case "json":case "png":case "pdf":case "xls":case "xlsx":b+=".txt"}c.contentDocument.execCommand("SaveAs",!0,b);document.body.removeChild(c)}}else{var f=document.createElement("a");if(f){var l=null;f.style.display="none";!1!==b?f.download=b:f.target="_blank";"object"===typeof d?(window.URL=window.URL||window.webkitURL,e=[],e.push(d),l=window.URL.createObjectURL(new Blob(e,{type:c})),f.href=l):0<=c.toLowerCase().indexOf("base64,")?
+f.href=c+L(d):f.href=c+encodeURIComponent(d);document.body.appendChild(f);if(document.createEvent)null===ha&&(ha=document.createEvent("MouseEvents")),ha.initEvent("click",!0,!1),f.dispatchEvent(ha);else if(document.createEventObject)f.fireEvent("onclick");else if("function"===typeof f.onclick)f.onclick();setTimeout(function(){l&&window.URL.revokeObjectURL(l);document.body.removeChild(f);if("function"===typeof a.onAfterSaveToFile)a.onAfterSaveToFile(d,b)},100)}}}function L(a){var b,d="",p=0;if("string"===
+typeof a){a=a.replace(/\x0d\x0a/g,"\n");var f="";for(b=0;b<a.length;b++){var l=a.charCodeAt(b);128>l?f+=String.fromCharCode(l):(127<l&&2048>l?f+=String.fromCharCode(l>>6|192):(f+=String.fromCharCode(l>>12|224),f+=String.fromCharCode(l>>6&63|128)),f+=String.fromCharCode(l&63|128))}a=f}for(;p<a.length;){var q=a.charCodeAt(p++);f=a.charCodeAt(p++);b=a.charCodeAt(p++);l=q>>2;q=(q&3)<<4|f>>4;var h=(f&15)<<2|b>>6;var g=b&63;isNaN(f)?h=g=64:isNaN(b)&&(g=64);d=d+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(l)+
+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(q)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(h)+"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=".charAt(g)}return d}var a={csvEnclosure:'"',csvSeparator:",",csvUseBOM:!0,date:{html:"dd/mm/yyyy"},displayTableName:!1,escape:!1,exportHiddenCells:!1,fileName:"tableExport",htmlContent:!1,htmlHyperlink:"content",ignoreColumn:[],ignoreRow:[],jsonScope:"all",jspdf:{orientation:"p",
+unit:"pt",format:"a4",margins:{left:20,right:10,top:10,bottom:10},onDocCreated:null,autotable:{styles:{cellPadding:2,rowHeight:12,fontSize:8,fillColor:255,textColor:50,fontStyle:"normal",overflow:"ellipsize",halign:"inherit",valign:"middle"},headerStyles:{fillColor:[52,73,94],textColor:255,fontStyle:"bold",halign:"inherit",valign:"middle"},alternateRowStyles:{fillColor:245},tableExport:{doc:null,onAfterAutotable:null,onBeforeAutotable:null,onAutotableText:null,onTable:null,outputImages:!0}}},mso:{fileFormat:"xlshtml",
+onMsoNumberFormat:null,pageFormat:"a4",pageOrientation:"portrait",rtl:!1,styles:[],worksheetName:"",xslx:{formatId:{date:14,numbers:2}}},numbers:{html:{decimalMark:".",thousandsSeparator:","},output:{decimalMark:".",thousandsSeparator:","}},onAfterSaveToFile:null,onBeforeSaveToFile:null,onCellData:null,onCellHtmlData:null,onCellHtmlHyperlink:null,onIgnoreRow:null,onTableExportBegin:null,onTableExportEnd:null,outputMode:"file",pdfmake:{enabled:!1,docDefinition:{pageOrientation:"portrait",defaultStyle:{font:"Roboto"}},
+fonts:{}},preserve:{leadingWS:!1,trailingWS:!1},preventInjection:!0,sql:{tableEnclosure:"`",columnEnclosure:"`"},tbodySelector:"tr",tfootSelector:"tr",theadSelector:"tr",tableName:"Table",type:"csv"},O={a0:[2383.94,3370.39],a1:[1683.78,2383.94],a2:[1190.55,1683.78],a3:[841.89,1190.55],a4:[595.28,841.89],a5:[419.53,595.28],a6:[297.64,419.53],a7:[209.76,297.64],a8:[147.4,209.76],a9:[104.88,147.4],a10:[73.7,104.88],b0:[2834.65,4008.19],b1:[2004.09,2834.65],b2:[1417.32,2004.09],b3:[1000.63,1417.32],b4:[708.66,
+1000.63],b5:[498.9,708.66],b6:[354.33,498.9],b7:[249.45,354.33],b8:[175.75,249.45],b9:[124.72,175.75],b10:[87.87,124.72],c0:[2599.37,3676.54],c1:[1836.85,2599.37],c2:[1298.27,1836.85],c3:[918.43,1298.27],c4:[649.13,918.43],c5:[459.21,649.13],c6:[323.15,459.21],c7:[229.61,323.15],c8:[161.57,229.61],c9:[113.39,161.57],c10:[79.37,113.39],dl:[311.81,623.62],letter:[612,792],"government-letter":[576,756],legal:[612,1008],"junior-legal":[576,360],ledger:[1224,792],tabloid:[792,1224],"credit-card":[153,
+243]},B=this,ha=null,r=[],w=[],n=0,t="",S=[],G=[],Ea,K=[],U=!1;d.extend(!0,a,k);"xlsx"===a.type&&(a.mso.fileFormat=a.type,a.type="excel");"undefined"!==typeof a.excelFileFormat&&"undefined"===a.mso.fileFormat&&(a.mso.fileFormat=a.excelFileFormat);"undefined"!==typeof a.excelPageFormat&&"undefined"===a.mso.pageFormat&&(a.mso.pageFormat=a.excelPageFormat);"undefined"!==typeof a.excelPageOrientation&&"undefined"===a.mso.pageOrientation&&(a.mso.pageOrientation=a.excelPageOrientation);"undefined"!==typeof a.excelRTL&&
+"undefined"===a.mso.rtl&&(a.mso.rtl=a.excelRTL);"undefined"!==typeof a.excelstyles&&"undefined"===a.mso.styles&&(a.mso.styles=a.excelstyles);"undefined"!==typeof a.onMsoNumberFormat&&"undefined"===a.mso.onMsoNumberFormat&&(a.mso.onMsoNumberFormat=a.onMsoNumberFormat);"undefined"!==typeof a.worksheetName&&"undefined"===a.mso.worksheetName&&(a.mso.worksheetName=a.worksheetName);a.mso.pageOrientation="l"===a.mso.pageOrientation.substr(0,1)?"landscape":"portrait";a.date.html=a.date.html||"";if(a.date.html.length){k=
+[];k.dd="(3[01]|[12][0-9]|0?[1-9])";k.mm="(1[012]|0?[1-9])";k.yyyy="((?:1[6-9]|2[0-2])\\d{2})";k.yy="(\\d{2})";var z=a.date.html.match(/[^a-zA-Z0-9]/)[0];z=a.date.html.toLowerCase().split(z);a.date.regex="^\\s*";a.date.regex+=k[z[0]];a.date.regex+="(.)";a.date.regex+=k[z[1]];a.date.regex+="\\2";a.date.regex+=k[z[2]];a.date.regex+="\\s*$";a.date.pattern=new RegExp(a.date.regex,"g");k=z.indexOf("dd")+1;a.date.match_d=k+(1<k?1:0);k=z.indexOf("mm")+1;a.date.match_m=k+(1<k?1:0);k=(0<=z.indexOf("yyyy")?
+z.indexOf("yyyy"):z.indexOf("yy"))+1;a.date.match_y=k+(1<k?1:0)}S=R(B);if("function"===typeof a.onTableExportBegin)a.onTableExportBegin();if("csv"===a.type||"tsv"===a.type||"txt"===a.type){var P="",Y=0;G=[];n=0;var qa=function(b,c,e){b.each(function(){t="";E(this,c,n,e+b.length,function(b,c,d){var e=t,f="";if(null!==b)if(b=D(b,c,d),c=null===b||""===b?"":b.toString(),"tsv"===a.type)b instanceof Date&&b.toLocaleString(),f=V(c,"\t"," ");else if(b instanceof Date)f=a.csvEnclosure+b.toLocaleString()+a.csvEnclosure;
+else if(f=Ba(c),f=V(f,a.csvEnclosure,a.csvEnclosure+a.csvEnclosure),0<=f.indexOf(a.csvSeparator)||/[\r\n ]/g.test(f))f=a.csvEnclosure+f+a.csvEnclosure;t=e+(f+("tsv"===a.type?"\t":a.csvSeparator))});t=d.trim(t).substring(0,t.length-1);0<t.length&&(0<P.length&&(P+="\n"),P+=t);n++});return b.length};Y+=qa(d(B).find("thead").first().find(a.theadSelector),"th,td",Y);v(d(B),"tbody").each(function(){Y+=qa(v(d(this),a.tbodySelector),"td,th",Y)});a.tfootSelector.length&&qa(d(B).find("tfoot").first().find(a.tfootSelector),
+"td,th",Y);P+="\n";if("string"===a.outputMode)return P;if("base64"===a.outputMode)return L(P);if("window"===a.outputMode){ka(!1,"data:text/"+("csv"===a.type?"csv":"plain")+";charset=utf-8,",P);return}N(P,a.fileName+"."+a.type,"text/"+("csv"===a.type?"csv":"plain"),"utf-8","","csv"===a.type&&a.csvUseBOM)}else if("sql"===a.type){n=0;G=[];var A="INSERT INTO "+a.sql.tableEnclosure+a.tableName+a.sql.tableEnclosure+" (";r=y(d(B));d(r).each(function(){E(this,"th,td",n,r.length,function(b,c,d){b=D(b,c,d)||
+"";-1<b.indexOf(a.sql.columnEnclosure)&&(b=V(b.toString(),a.sql.columnEnclosure,a.sql.columnEnclosure+a.sql.columnEnclosure));A+=a.sql.columnEnclosure+b+a.sql.columnEnclosure+","});n++;A=d.trim(A).substring(0,A.length-1)});A+=") VALUES ";w=C(d(B));d(w).each(function(){t="";E(this,"td,th",n,r.length+w.length,function(a,c,d){a=D(a,c,d)||"";-1<a.indexOf("'")&&(a=V(a.toString(),"'","''"));t+="'"+a+"',"});3<t.length&&(A+="("+t,A=d.trim(A).substring(0,A.length-1),A+="),");n++});A=d.trim(A).substring(0,
+A.length-1);A+=";";if("string"===a.outputMode)return A;if("base64"===a.outputMode)return L(A);N(A,a.fileName+".sql","application/sql","utf-8","",!1)}else if("json"===a.type){var W=[];G=[];r=y(d(B));d(r).each(function(){var a=[];E(this,"th,td",n,r.length,function(b,d,g){a.push(D(b,d,g))});W.push(a)});var ra=[];w=C(d(B));d(w).each(function(){var a={},c=0;E(this,"td,th",n,r.length+w.length,function(b,d,f){W.length?a[W[W.length-1][c]]=D(b,d,f):a[c]=D(b,d,f);c++});!1===d.isEmptyObject(a)&&ra.push(a);n++});
+k="head"===a.jsonScope?JSON.stringify(W):"data"===a.jsonScope?JSON.stringify(ra):JSON.stringify({header:W,data:ra});if("string"===a.outputMode)return k;if("base64"===a.outputMode)return L(k);N(k,a.fileName+".json","application/json","utf-8","base64",!1)}else if("xml"===a.type){n=0;G=[];var Q='<?xml version="1.0" encoding="utf-8"?>';Q+="<tabledata><fields>";r=y(d(B));d(r).each(function(){E(this,"th,td",n,r.length,function(a,d,e){Q+="<field>"+D(a,d,e)+"</field>"});n++});Q+="</fields><data>";var Fa=
+1;w=C(d(B));d(w).each(function(){var a=1;t="";E(this,"td,th",n,r.length+w.length,function(b,d,g){t+="<column-"+a+">"+D(b,d,g)+"</column-"+a+">";a++});0<t.length&&"<column-1></column-1>"!==t&&(Q+='<row id="'+Fa+'">'+t+"</row>",Fa++);n++});Q+="</data></tabledata>";if("string"===a.outputMode)return Q;if("base64"===a.outputMode)return L(Q);N(Q,a.fileName+".xml","application/xml","utf-8","base64",!1)}else if("excel"===a.type&&"xmlss"===a.mso.fileFormat){var sa=[],F=[];d(B).filter(function(){return I(d(this))}).each(function(){function b(a,
+b,c){var e=[];d(a).each(function(){var b=0,f=0;t="";E(this,"td,th",n,c+a.length,function(a,c,l){if(null!==a){var h="";c=D(a,c,l);l="String";if(!1!==jQuery.isNumeric(c))l="Number";else{var g=Ma(c);!1!==g&&(c=g,l="Number",h+=' ss:StyleID="pct1"')}"Number"!==l&&(c=c.replace(/\n/g,"<br>"));g=J(a);a=T(a);d.each(e,function(){if(n>=this.s.r&&n<=this.e.r&&f>=this.s.c&&f<=this.e.c)for(var a=0;a<=this.e.c-this.s.c;++a)f++,b++});if(a||g)a=a||1,g=g||1,e.push({s:{r:n,c:f},e:{r:n+a-1,c:f+g-1}});1<g&&(h+=' ss:MergeAcross="'+
+(g-1)+'"',f+=g-1);1<a&&(h+=' ss:MergeDown="'+(a-1)+'" ss:StyleID="rsp1"');0<b&&(h+=' ss:Index="'+(f+1)+'"',b=0);t+="<Cell"+h+'><Data ss:Type="'+l+'">'+d("<div />").text(c).html()+"</Data></Cell>\r";f++}});0<t.length&&(H+='<Row ss:AutoFitHeight="0">\r'+t+"</Row>\r");n++});return a.length}var c=d(this),e="";"string"===typeof a.mso.worksheetName&&a.mso.worksheetName.length?e=a.mso.worksheetName+" "+(F.length+1):"undefined"!==typeof a.mso.worksheetName[F.length]&&(e=a.mso.worksheetName[F.length]);e.length||
+(e=c.find("caption").text()||"");e.length||(e="Table "+(F.length+1));e=d.trim(e.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31));F.push(d("<div />").text(e).html());!1===a.exportHiddenCells&&(K=c.find("tr, th, td").filter(":hidden"),U=0<K.length);n=0;S=R(this);H="<Table>\r";e=b(y(c),"th,td",0);b(C(c),"td,th",e);H+="</Table>\r";sa.push(H)});k={};z={};for(var m,Z,X=0,da=F.length;X<da;X++)m=F[X],Z=k[m],Z=k[m]=null==Z?1:Z+1,2===Z&&(F[z[m]]=F[z[m]].substring(0,29)+"-1"),1<k[m]?F[X]=F[X].substring(0,29)+
+"-"+k[m]:z[m]=X;k='<?xml version="1.0" encoding="UTF-8"?>\r<?mso-application progid="Excel.Sheet"?>\r<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:o="urn:schemas-microsoft-com:office:office"\r xmlns:x="urn:schemas-microsoft-com:office:excel"\r xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"\r xmlns:html="http://www.w3.org/TR/REC-html40">\r<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">\r  <Created>'+(new Date).toISOString()+'</Created>\r</DocumentProperties>\r<OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">\r  <AllowPNG/>\r</OfficeDocumentSettings>\r<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">\r  <WindowHeight>9000</WindowHeight>\r  <WindowWidth>13860</WindowWidth>\r  <WindowTopX>0</WindowTopX>\r  <WindowTopY>0</WindowTopY>\r  <ProtectStructure>False</ProtectStructure>\r  <ProtectWindows>False</ProtectWindows>\r</ExcelWorkbook>\r<Styles>\r  <Style ss:ID="Default" ss:Name="Normal">\r    <Alignment ss:Vertical="Bottom"/>\r    <Borders/>\r    <Font/>\r    <Interior/>\r    <NumberFormat/>\r    <Protection/>\r  </Style>\r  <Style ss:ID="rsp1">\r    <Alignment ss:Vertical="Center"/>\r  </Style>\r  <Style ss:ID="pct1">\r    <NumberFormat ss:Format="Percent"/>\r  </Style>\r</Styles>\r';
+for(z=0;z<sa.length;z++)k+='<Worksheet ss:Name="'+F[z]+'" ss:RightToLeft="'+(a.mso.rtl?"1":"0")+'">\r'+sa[z],k=a.mso.rtl?k+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">\r<DisplayRightToLeft/>\r</WorksheetOptions>\r':k+'<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel"/>\r',k+="</Worksheet>\r";k+="</Workbook>\r";if("string"===a.outputMode)return k;if("base64"===a.outputMode)return L(k);N(k,a.fileName+".xml","application/xml","utf-8","base64",!1)}else if("excel"===
+a.type&&"xlsx"===a.mso.fileFormat){var aa=[],Ga=XLSX.utils.book_new();d(B).filter(function(){return I(d(this))}).each(function(){for(var b=d(this),c={},e=this.getElementsByTagName("tr"),g={s:{r:0,c:0},e:{r:0,c:0}},f=[],l,q=[],h=0,u=0,k,m,n,t,r,w=XLSX.SSF.get_table();h<e.length&&1E7>u;++h)if(k=e[h],m=!1,"function"===typeof a.onIgnoreRow&&(m=a.onIgnoreRow(d(k),h)),!0!==m&&(0===a.ignoreRow.length||-1===d.inArray(h,a.ignoreRow)&&-1===d.inArray(h-e.length,a.ignoreRow))&&!1!==I(d(k))){var y=k.children,
+B=0;for(k=0;k<y.length;++k)r=y[k],t=+J(r)||1,B+=t;var z=0;for(k=m=0;k<y.length;++k)if(r=y[k],t=+J(r)||1,l=k+z,!ta(d(r),B,l+(l<m?m-l:0))){z+=t-1;for(l=0;l<f.length;++l){var v=f[l];v.s.c==m&&v.s.r<=u&&u<=v.e.r&&(m=v.e.c+1,l=-1)}(0<(n=+T(r))||1<t)&&f.push({s:{r:u,c:m},e:{r:u+(n||1)-1,c:m+t-1}});var C={type:""};l=D(r,h,k+z,C);v={t:"s",v:l};var A="";if(""!==d(r).attr("data-tableexport-cellformat")){var x=parseInt(d(r).attr("data-tableexport-xlsxformatid")||0);0===x&&"function"===typeof a.mso.xslx.formatId.numbers&&
+(x=a.mso.xslx.formatId.numbers(d(r),h,k+z));0===x&&"function"===typeof a.mso.xslx.formatId.date&&(x=a.mso.xslx.formatId.date(d(r),h,k+z));if(49===x||"@"===x)A="s";else if("number"===C.type||0<x&&14>x||36<x&&41>x||48===x)A="n";else if("date"===C.type||13<x&&37>x||44<x&&48>x||56===x)A="d"}else A="s";if(null!=l)if(0===l.length)v.t="z";else if(0!==l.trim().length&&"s"!==A)if("function"===C.type)v={f:l};else if("TRUE"===l)v={t:"b",v:!0};else if("FALSE"===l)v={t:"b",v:!1};else if(""===A&&d(r).find("a").length)l=
+"href"!==a.htmlHyperlink?l:"",v={f:'=HYPERLINK("'+d(r).find("a").attr("href")+(l.length?'","'+l:"")+'")'};else if("n"===A||isFinite(Da(l,a.numbers.output))){if(r=Da(l,a.numbers.output),0===x&&"function"!==typeof a.mso.xslx.formatId.numbers&&(x=a.mso.xslx.formatId.numbers),isFinite(r)||isFinite(l))v={t:"n",v:isFinite(r)?r:l,z:"string"===typeof x?x:x in w?w[x]:"0.00"}}else if(!1!==(r=La(l))||"d"===A)0===x&&"function"!==typeof a.mso.xslx.formatId.date&&(x=a.mso.xslx.formatId.date),v={t:"d",v:!1!==r?
+r:l,z:"string"===typeof x?x:x in w?w[x]:"m/d/yy"};c[oa({c:m,r:u})]=v;g.e.c<m&&(g.e.c=m);m+=t}++u}f.length&&(c["!merges"]=f);q.length&&(c["!rows"]=q);g.e.r=u-1;c["!ref"]=pa(g);1E7<=u&&(c["!fullref"]=pa((g.e.r=e.length-h+u-1,g)));e="";"string"===typeof a.mso.worksheetName&&a.mso.worksheetName.length?e=a.mso.worksheetName+" "+(aa.length+1):"undefined"!==typeof a.mso.worksheetName[aa.length]&&(e=a.mso.worksheetName[aa.length]);e.length||(e=b.find("caption").text()||"");e.length||(e="Table "+(aa.length+
+1));e=d.trim(e.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31));aa.push(e);XLSX.utils.book_append_sheet(Ga,c,e)});k=XLSX.write(Ga,{type:"binary",bookType:a.mso.fileFormat,bookSST:!1});N(Oa(k),a.fileName+"."+a.mso.fileFormat,"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet","UTF-8","",!1)}else if("excel"===a.type||"xls"===a.type||"word"===a.type||"doc"===a.type){k="excel"===a.type||"xls"===a.type?"excel":"word";z="excel"===k?"xls":"doc";m='xmlns:x="urn:schemas-microsoft-com:office:'+
+k+'"';var H="",ba="";d(B).filter(function(){return I(d(this))}).each(function(){var b=d(this);""===ba&&(ba=a.mso.worksheetName||b.find("caption").text()||"Table",ba=d.trim(ba.replace(/[\\\/[\]*:?'"]/g,"").substring(0,31)));!1===a.exportHiddenCells&&(K=b.find("tr, th, td").filter(":hidden"),U=0<K.length);n=0;G=[];S=R(this);H+="<table><thead>";r=y(b);d(r).each(function(){var b=d(this);t="";E(this,"th,td",n,r.length,function(d,c,f){if(null!==d){var e="";t+="<th";if(a.mso.styles.length){var g=document.defaultView.getComputedStyle(d,
+null),h=document.defaultView.getComputedStyle(b[0],null),k;for(k in a.mso.styles){var m=g[a.mso.styles[k]];""===m&&(m=h[a.mso.styles[k]]);""!==m&&"0px none rgb(0, 0, 0)"!==m&&"rgba(0, 0, 0, 0)"!==m&&(e+=""===e?'style="':";",e+=a.mso.styles[k]+":"+m)}}""!==e&&(t+=" "+e+'"');e=J(d);0<e&&(t+=' colspan="'+e+'"');e=T(d);0<e&&(t+=' rowspan="'+e+'"');t+=">"+D(d,c,f)+"</th>"}});0<t.length&&(H+="<tr>"+t+"</tr>");n++});H+="</thead><tbody>";w=C(b);d(w).each(function(){var b=d(this);t="";E(this,"td,th",n,r.length+
+w.length,function(c,g,f){if(null!==c){var e=D(c,g,f),q="",h=d(c).attr("data-tableexport-msonumberformat");"undefined"===typeof h&&"function"===typeof a.mso.onMsoNumberFormat&&(h=a.mso.onMsoNumberFormat(c,g,f));"undefined"!==typeof h&&""!==h&&(q="style=\"mso-number-format:'"+h+"'");if(a.mso.styles.length){g=document.defaultView.getComputedStyle(c,null);f=document.defaultView.getComputedStyle(b[0],null);for(var k in a.mso.styles)h=g[a.mso.styles[k]],""===h&&(h=f[a.mso.styles[k]]),""!==h&&"0px none rgb(0, 0, 0)"!==
+h&&"rgba(0, 0, 0, 0)"!==h&&(q+=""===q?'style="':";",q+=a.mso.styles[k]+":"+h)}t+="<td";""!==q&&(t+=" "+q+'"');q=J(c);0<q&&(t+=' colspan="'+q+'"');c=T(c);0<c&&(t+=' rowspan="'+c+'"');"string"===typeof e&&""!==e&&(e=Ba(e),e=e.replace(/\n/g,"<br>"));t+=">"+e+"</td>"}});0<t.length&&(H+="<tr>"+t+"</tr>");n++});a.displayTableName&&(H+="<tr><td></td></tr><tr><td></td></tr><tr><td>"+D(d("<p>"+a.tableName+"</p>"))+"</td></tr>");H+="</tbody></table>"});m='<html xmlns:o="urn:schemas-microsoft-com:office:office" '+
+m+' xmlns="http://www.w3.org/TR/REC-html40">'+('<meta http-equiv="content-type" content="application/vnd.ms-'+k+'; charset=UTF-8">')+"<head>";"excel"===k&&(m+="\x3c!--[if gte mso 9]>",m+="<xml>",m+="<x:ExcelWorkbook>",m+="<x:ExcelWorksheets>",m+="<x:ExcelWorksheet>",m+="<x:Name>",m+=ba,m+="</x:Name>",m+="<x:WorksheetOptions>",m+="<x:DisplayGridlines/>",a.mso.rtl&&(m+="<x:DisplayRightToLeft/>"),m+="</x:WorksheetOptions>",m+="</x:ExcelWorksheet>",m+="</x:ExcelWorksheets>",m+="</x:ExcelWorkbook>",m+=
+"</xml>",m+="<![endif]--\x3e");m+="<style>";m+="@page { size:"+a.mso.pageOrientation+"; mso-page-orientation:"+a.mso.pageOrientation+"; }";m+="@page Section1 {size:"+O[a.mso.pageFormat][0]+"pt "+O[a.mso.pageFormat][1]+"pt";m+="; margin:1.0in 1.25in 1.0in 1.25in;mso-header-margin:.5in;mso-footer-margin:.5in;mso-paper-source:0;}";m+="div.Section1 {page:Section1;}";m+="@page Section2 {size:"+O[a.mso.pageFormat][1]+"pt "+O[a.mso.pageFormat][0]+"pt";m+=";mso-page-orientation:"+a.mso.pageOrientation+";margin:1.25in 1.0in 1.25in 1.0in;mso-header-margin:.5in;mso-footer-margin:.5in;mso-paper-source:0;}";
+m+="div.Section2 {page:Section2;}";m+="br {mso-data-placement:same-cell;}";m+="</style>";m+="</head>";m+="<body>";m+='<div class="Section'+("landscape"===a.mso.pageOrientation?"2":"1")+'">';m+=H;m+="</div>";m+="</body>";m+="</html>";if("string"===a.outputMode)return m;if("base64"===a.outputMode)return L(m);N(m,a.fileName+"."+z,"application/vnd.ms-"+k,"","base64",!1)}else if("png"===a.type)html2canvas(d(B)[0]).then(function(b){b=b.toDataURL();for(var c=atob(b.substring(22)),d=new ArrayBuffer(c.length),
+g=new Uint8Array(d),f=0;f<c.length;f++)g[f]=c.charCodeAt(f);if("string"===a.outputMode)return c;if("base64"===a.outputMode)return L(b);"window"===a.outputMode?window.open(b):N(d,a.fileName+".png","image/png","","",!1)});else if("pdf"===a.type)if(!0===a.pdfmake.enabled){var ia={content:[]};d.extend(!0,ia,a.pdfmake.docDefinition);G=[];d(B).filter(function(){return I(d(this))}).each(function(){var a=d(this),c=[],e=[];n=0;var g=function(a,b,c){var f=0;d(a).each(function(){var a=[];E(this,b,n,c,function(b,
+d,c){if("undefined"!==typeof b&&null!==b){var f=J(b),e=T(b);b=D(b,d,c)||" ";1<f||1<e?a.push({colSpan:f||1,rowSpan:e||1,text:b}):a.push(b)}else a.push(" ")});a.length&&e.push(a);f<a.length&&(f=a.length);n++});return f};r=y(a);for(var f=g(r,"th,td",r.length),l=c.length;l<f;l++)c.push("*");w=C(a);g(w,"th,td",r.length+w.length);ia.content.push({table:{headerRows:r.length,widths:c,body:e},pageBreak:ia.content.length?"before":void 0})});"undefined"!==typeof pdfMake&&"undefined"!==typeof pdfMake.createPdf&&
+(pdfMake.fonts={Roboto:{normal:"Roboto-Regular.ttf",bold:"Roboto-Medium.ttf",italics:"Roboto-Italic.ttf",bolditalics:"Roboto-MediumItalic.ttf"}},pdfMake.vfs.hasOwnProperty("Mirza-Regular.ttf")?(a.pdfmake.docDefinition.defaultStyle.font="Mirza",d.extend(!0,pdfMake.fonts,{Mirza:{normal:"Mirza-Regular.ttf",bold:"Mirza-Bold.ttf",italics:"Mirza-Medium.ttf",bolditalics:"Mirza-SemiBold.ttf"}})):pdfMake.vfs.hasOwnProperty("gbsn00lp.ttf")?(a.pdfmake.docDefinition.defaultStyle.font="gbsn00lp",d.extend(!0,pdfMake.fonts,
+{gbsn00lp:{normal:"gbsn00lp.ttf",bold:"gbsn00lp.ttf",italics:"gbsn00lp.ttf",bolditalics:"gbsn00lp.ttf"}})):pdfMake.vfs.hasOwnProperty("ZCOOLXiaoWei-Regular.ttf")&&(a.pdfmake.docDefinition.defaultStyle.font="ZCOOLXiaoWei",d.extend(!0,pdfMake.fonts,{ZCOOLXiaoWei:{normal:"ZCOOLXiaoWei-Regular.ttf",bold:"ZCOOLXiaoWei-Regular.ttf",italics:"ZCOOLXiaoWei-Regular.ttf",bolditalics:"ZCOOLXiaoWei-Regular.ttf"}})),d.extend(!0,pdfMake.fonts,a.pdfmake.fonts),pdfMake.createPdf(ia).getBuffer(function(b){N(b,a.fileName+
+".pdf","application/pdf","","",!1)}))}else if(!1===a.jspdf.autotable){k={dim:{w:fa(d(B).first().get(0),"width","mm"),h:fa(d(B).first().get(0),"height","mm")},pagesplit:!1};var Ha=new jsPDF(a.jspdf.orientation,a.jspdf.unit,a.jspdf.format);Ha.addHTML(d(B).first(),a.jspdf.margins.left,a.jspdf.margins.top,k,function(){va(Ha,!1)})}else{var g=a.jspdf.autotable.tableExport;if("string"===typeof a.jspdf.format&&"bestfit"===a.jspdf.format.toLowerCase()){var ja="",ca="",Ia=0;d(B).each(function(){if(I(d(this))){var a=
+fa(d(this).get(0),"width","pt");if(a>Ia){a>O.a0[0]&&(ja="a0",ca="l");for(var c in O)O.hasOwnProperty(c)&&O[c][1]>a&&(ja=c,ca="l",O[c][0]>a&&(ca="p"));Ia=a}}});a.jspdf.format=""===ja?"a4":ja;a.jspdf.orientation=""===ca?"w":ca}if(null==g.doc&&(g.doc=new jsPDF(a.jspdf.orientation,a.jspdf.unit,a.jspdf.format),g.wScaleFactor=1,g.hScaleFactor=1,"function"===typeof a.jspdf.onDocCreated))a.jspdf.onDocCreated(g.doc);!0===g.outputImages&&(g.images={});"undefined"!==typeof g.images&&(d(B).filter(function(){return I(d(this))}).each(function(){var b=
+0;G=[];!1===a.exportHiddenCells&&(K=d(this).find("tr, th, td").filter(":hidden"),U=0<K.length);r=y(d(this));w=C(d(this));d(w).each(function(){E(this,"td,th",r.length+b,r.length+w.length,function(a){xa(a,d(a).children(),g)});b++})}),r=[],w=[]);Ka(g,function(){d(B).filter(function(){return I(d(this))}).each(function(){var b;n=0;G=[];!1===a.exportHiddenCells&&(K=d(this).find("tr, th, td").filter(":hidden"),U=0<K.length);S=R(this);g.columns=[];g.rows=[];g.teCells={};if("function"===typeof g.onTable&&
+!1===g.onTable(d(this),a))return!0;a.jspdf.autotable.tableExport=null;var c=d.extend(!0,{},a.jspdf.autotable);a.jspdf.autotable.tableExport=g;c.margin={};d.extend(!0,c.margin,a.jspdf.margins);c.tableExport=g;"function"!==typeof c.beforePageContent&&(c.beforePageContent=function(a){if(1===a.pageCount){var b=a.table.rows.concat(a.table.headerRow);d.each(b,function(){0<this.height&&(this.height+=(2-1.15)/2*this.styles.fontSize,a.table.height+=(2-1.15)/2*this.styles.fontSize)})}});"function"!==typeof c.createdHeaderCell&&
+(c.createdHeaderCell=function(a,b){a.styles=d.extend({},b.row.styles);if("undefined"!==typeof g.columns[b.column.dataKey]){var e=g.columns[b.column.dataKey];if("undefined"!==typeof e.rect){a.contentWidth=e.rect.width;if("undefined"===typeof g.heightRatio||0===g.heightRatio){var f=b.row.raw[b.column.dataKey].rowspan?b.row.raw[b.column.dataKey].rect.height/b.row.raw[b.column.dataKey].rowspan:b.row.raw[b.column.dataKey].rect.height;g.heightRatio=a.styles.rowHeight/f}f=b.row.raw[b.column.dataKey].rect.height*
+g.heightRatio;f>a.styles.rowHeight&&(a.styles.rowHeight=f)}a.styles.halign="inherit"===c.headerStyles.halign?"center":c.headerStyles.halign;a.styles.valign=c.headerStyles.valign;"undefined"!==typeof e.style&&!0!==e.style.hidden&&("inherit"===c.headerStyles.halign&&(a.styles.halign=e.style.align),"inherit"===c.styles.fillColor&&(a.styles.fillColor=e.style.bcolor),"inherit"===c.styles.textColor&&(a.styles.textColor=e.style.color),"inherit"===c.styles.fontStyle&&(a.styles.fontStyle=e.style.fstyle))}});
+"function"!==typeof c.createdCell&&(c.createdCell=function(a,b){b=g.teCells[b.row.index+":"+b.column.dataKey];a.styles.halign="inherit"===c.styles.halign?"center":c.styles.halign;a.styles.valign=c.styles.valign;"undefined"!==typeof b&&"undefined"!==typeof b.style&&!0!==b.style.hidden&&("inherit"===c.styles.halign&&(a.styles.halign=b.style.align),"inherit"===c.styles.fillColor&&(a.styles.fillColor=b.style.bcolor),"inherit"===c.styles.textColor&&(a.styles.textColor=b.style.color),"inherit"===c.styles.fontStyle&&
+(a.styles.fontStyle=b.style.fstyle))});"function"!==typeof c.drawHeaderCell&&(c.drawHeaderCell=function(a,b){var d=g.columns[b.column.dataKey];return(!0!==d.style.hasOwnProperty("hidden")||!0!==d.style.hidden)&&0<=d.rowIndex?wa(a,b,d):!1});"function"!==typeof c.drawCell&&(c.drawCell=function(a,b){var c=g.teCells[b.row.index+":"+b.column.dataKey];if(!0!==("undefined"!==typeof c&&c.isCanvas))wa(a,b,c)&&(g.doc.rect(a.x,a.y,a.width,a.height,a.styles.fillStyle),"undefined"===typeof c||"undefined"!==typeof c.hasUserDefText&&
+!0===c.hasUserDefText||"undefined"===typeof c.elements||!c.elements.length?Aa(a,{},g):(b=a.height/c.rect.height,b>g.hScaleFactor&&(g.hScaleFactor=b),g.wScaleFactor=a.width/c.rect.width,b=a.textPos.y,za(a,c.elements,g),a.textPos.y=b,Aa(a,c.elements,g)));else{c=c.elements[0];var e=d(c).attr("data-tableexport-canvas"),f=c.getBoundingClientRect();a.width=f.width*g.wScaleFactor;a.height=f.height*g.hScaleFactor;b.row.height=a.height;ua(a,c,e,g)}return!1});g.headerrows=[];r=y(d(this));d(r).each(function(){b=
+0;g.headerrows[n]=[];E(this,"th,td",n,r.length,function(a,c,d){var e=Ca(a);e.title=D(a,c,d);e.key=b++;e.rowIndex=n;g.headerrows[n].push(e)});n++});if(0<n)for(var e=n-1;0<=e;)d.each(g.headerrows[e],function(){var a=this;0<e&&null===this.rect&&(a=g.headerrows[e-1][this.key]);null!==a&&0<=a.rowIndex&&(!0!==a.style.hasOwnProperty("hidden")||!0!==a.style.hidden)&&g.columns.push(a)}),e=0<g.columns.length?-1:e-1;var k=0;w=[];w=C(d(this));d(w).each(function(){var a=[];b=0;E(this,"td,th",n,r.length+w.length,
+function(c,e,f){if("undefined"===typeof g.columns[b]){var h={title:"",key:b,style:{hidden:!0}};g.columns.push(h)}a.push(D(c,e,f));"undefined"!==typeof c&&null!==c?(h=Ca(c),h.isCanvas=c.hasAttribute("data-tableexport-canvas"),h.elements=h.isCanvas?d(c):d(c).children(),"undefined"!==typeof d(c).data("teUserDefText")&&(h.hasUserDefText=!0)):(h=d.extend(!0,{},g.teCells[k+":"+(b-1)]),h.colspan=-1);g.teCells[k+":"+b++]=h});a.length&&(g.rows.push(a),k++);n++});if("function"===typeof g.onBeforeAutotable)g.onBeforeAutotable(d(this),
+g.columns,g.rows,c);g.doc.autoTable(g.columns,g.rows,c);if("function"===typeof g.onAfterAutotable)g.onAfterAutotable(d(this),c);a.jspdf.autotable.startY=g.doc.autoTableEndPosY()+c.margin.top});va(g.doc,"undefined"!==typeof g.images&&!1===jQuery.isEmptyObject(g.images));"undefined"!==typeof g.headerrows&&(g.headerrows.length=0);"undefined"!==typeof g.columns&&(g.columns.length=0);"undefined"!==typeof g.rows&&(g.rows.length=0);delete g.doc;g.doc=null})}if("function"===typeof a.onTableExportEnd)a.onTableExportEnd();
+return this}})(jQuery);
diff --git a/web/skins/classic/views/_monitor_filters.php b/web/skins/classic/views/_monitor_filters.php
index 1531237b0..f80bd1f5b 100644
--- a/web/skins/classic/views/_monitor_filters.php
+++ b/web/skins/classic/views/_monitor_filters.php
@@ -53,20 +53,22 @@ $html =
   <input type="submit" class="d-none"/>
   <input type="hidden" name="filtering" value=""/>
 ';
-$GroupsById = array();
-foreach ( ZM\Group::find() as $G ) {
-  $GroupsById[$G->Id()] = $G;
-}
-
 $groupSql = '';
-if ( count($GroupsById) ) {
-  $html .= '<span id="groupControl"><label>'. translate('Group') .'</label>';
-  # This will end up with the group_id of the deepest selection
-  $group_id = isset($_SESSION['GroupId']) ? $_SESSION['GroupId'] : null;
-  $html .= ZM\Group::get_group_dropdown();
-  $groupSql = ZM\Group::get_group_sql($group_id);
-  $html .= '</span>
-';
+if ( canView('Groups') ) {
+  $GroupsById = array();
+  foreach ( ZM\Group::find() as $G ) {
+    $GroupsById[$G->Id()] = $G;
+  }
+
+  if ( count($GroupsById) ) {
+    $html .= '<span id="groupControl"><label>'. translate('Group') .'</label>';
+    # This will end up with the group_id of the deepest selection
+    $group_id = isset($_SESSION['GroupId']) ? $_SESSION['GroupId'] : null;
+    $html .= ZM\Group::get_group_dropdown();
+    $groupSql = ZM\Group::get_group_sql($group_id);
+    $html .= '</span>
+  ';
+  }
 }
 
 $selected_monitor_ids = isset($_SESSION['MonitorId']) ? $_SESSION['MonitorId'] : array();
@@ -82,10 +84,10 @@ if ( $groupSql )
 foreach ( array('ServerId','StorageId','Status','Function') as $filter ) {
   if ( isset($_SESSION[$filter]) ) {
     if ( is_array($_SESSION[$filter]) ) {
-      $conditions[] = $filter . ' IN ('.implode(',', array_map(function(){return '?';}, $_SESSION[$filter])). ')';
+      $conditions[] = '`'.$filter . '` IN ('.implode(',', array_map(function(){return '?';}, $_SESSION[$filter])). ')';
       $values = array_merge($values, $_SESSION[$filter]);
     } else {
-      $conditions[] = $filter . '=?';
+      $conditions[] = '`'.$filter . '`=?';
       $values[] = $_SESSION[$filter];
     }
   }
@@ -169,10 +171,14 @@ $html .= '</span>
   $html .= '</span>
 ';
 
-  $sql = 'SELECT *,S.Status AS Status, S.CaptureFPS AS CaptureFPS, S.AnalysisFPS AS AnalysisFPS, S.CaptureBandwidth AS CaptureBandwidth
-  FROM Monitors AS M LEFT JOIN Monitor_Status AS S ON MonitorId=Id ' .
+  $sql = 'SELECT M.*, S.*, E.*
+  FROM Monitors AS M
+ LEFT JOIN Monitor_Status AS S ON S.MonitorId=M.Id 
+ LEFT JOIN Event_Summaries AS E ON E.MonitorId=M.Id 
+' .
   ( count($conditions) ? ' WHERE ' . implode(' AND ', $conditions) : '' ).' ORDER BY Sequence ASC';
   $monitors = dbFetchAll($sql, null, $values);
+  ZM\Debug(print_r($monitors, true));
   $displayMonitors = array();
   $monitors_dropdown = array();
 
@@ -248,9 +254,9 @@ $html .= '</span>
       'multiple'=>'multiple',
       'data-placeholder'=>'All',
     ) );
-# Repurpose this variable to be the list of MonitorIds as a result of all the filtering
-$selected_monitor_ids = array_map(function($monitor_row){return $monitor_row['Id'];}, $displayMonitors);
-$html .= '</span>
+  # Repurpose this variable to be the list of MonitorIds as a result of all the filtering
+  $selected_monitor_ids = array_map(function($monitor_row){return $monitor_row['Id'];}, $displayMonitors);
+  $html .= '</span>
 ';
   echo $html;
 ?>
diff --git a/web/skins/classic/views/bandwidth.php b/web/skins/classic/views/bandwidth.php
index 36769e961..438c99dd9 100644
--- a/web/skins/classic/views/bandwidth.php
+++ b/web/skins/classic/views/bandwidth.php
@@ -47,7 +47,7 @@ xhtmlHeaders(__FILE__, translate('Bandwidth'));
         <p><?php echo buildSelect('newBandwidth', $bandwidth_options) ?></p>
         <div id="contentButtons">
           <button type="submit" value="Save"><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+          <button type="button" data-on-click="backWindow"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 43523568c..9d51ff824 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -134,8 +134,6 @@ for ( $i = 0; $i < count($displayMonitors); $i++ ) {
     if ( $maxWidth < $scaleWidth ) $maxWidth = $scaleWidth;
     if ( $maxHeight < $scaleHeight ) $maxHeight = $scaleHeight;
   }
-  #$monitor['zmc'] = zmcStatus( $monitor );
-  #$monitor['zma'] = zmaStatus( $monitor );
   $zoneCount += $monitor['ZoneCount'];
 
   $counts = array();
@@ -240,7 +238,7 @@ ob_start();
 ?>
             <th class="colZones"><a href="?view=zones"><?php echo translate('Zones') ?></a></th>
 <?php if ( canEdit('Monitors') ) { ?>
-            <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" data-checkbox-name="markMids[]" data-on-click-this="updateFormCheckboxesByName"/> <?php echo translate('All') ?></th>
+            <th class="colMark"><input type="checkbox" name="toggleCheck" value="1" data-checkbox-name="markMids[]" data-on-click-this="updateFormCheckboxesByName"/></th>
 <?php } ?>
           </tr>
         </thead>
@@ -294,8 +292,9 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
 <?php
   }
   $imgHTML='';
-  if ( ZM_WEB_LIST_THUMBS && ($monitor['Status'] == 'Connected') && $running ) {
+  if (ZM_WEB_LIST_THUMBS && ($monitor['Status'] == 'Connected') && $running && canView('Stream')) {
     $options = array();
+
     $ratio_factor = $Monitor->ViewHeight() / $Monitor->ViewWidth();
     $options['width'] = ZM_WEB_LIST_THUMB_WIDTH;
     $options['height'] = ZM_WEB_LIST_THUMB_HEIGHT ? ZM_WEB_LIST_THUMB_HEIGHT : ZM_WEB_LIST_THUMB_WIDTH*$ratio_factor;
@@ -308,7 +307,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
     $thmbWidth = ( $options['width'] ) ? 'width:'.$options['width'].'px;' : '';
     $thmbHeight = ( $options['height'] ) ? 'height:'.$options['height'].'px;' : '';
     
-    $imgHTML = '<div class="colThumbnail zoom-right"><a';
+    $imgHTML = '<div class="colThumbnail"><a';
     $imgHTML .= $stream_available ? ' href="?view=watch&amp;mid='.$monitor['Id'].'">' : '>';
     $imgHTML .= '<img id="thumbnail' .$Monitor->Id(). '" src="' .$stillSrc. '" style="'
       .$thmbWidth.$thmbHeight. '" stream_src="' .$streamSrc. '" still_src="' .$stillSrc. '"'.
@@ -323,15 +322,24 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
               <?php echo $imgHTML ?>
               <div class="small text-nowrap text-muted">
 
-              <?php echo implode('<br/>',
+<?php 
+  if (canView('Groups')) {
+    echo implode('<br/>',
                   array_map(function($group_id){
                     $Group = ZM\Group::find_one(array('Id'=>$group_id));
                     if ( $Group ) {
                       $Groups = $Group->Parents();
                       array_push( $Groups, $Group );
                     }
-                    return implode(' &gt; ', array_map(function($Group){ return '<a href="?view=montagereview&amp;GroupId='.$Group->Id().'">'.validHtmlStr($Group->Name()).'</a>'; }, $Groups ));
-                    }, $Monitor->GroupIds() ) ); 
+                    return implode(' &gt; ', array_map(function($Group){
+                      if (canView('Stream')) {
+                        return '<a href="?view=montagereview&amp;GroupId='.$Group->Id().'">'.validHtmlStr($Group->Name()).'</a>';
+                      } else {
+                        return validHtmlStr($Group->Name());
+                      }
+                    }, $Groups ));
+                  }, $Monitor->GroupIds()));
+  }
 ?>
             </div></td>
             <td class="colFunction">
@@ -372,7 +380,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
 <?php
   }
 ?>
-            <td class="colZones"><?php echo makePopupLink('?view=zones&amp;mid='.$monitor['Id'], 'zmZones', array('zones', $monitor['Width'], $monitor['Height']), $monitor['ZoneCount'], canView('Monitors')) ?></td>
+            <td class="colZones"><?php echo makeLink('?view=zones&amp;mid='.$monitor['Id'], $monitor['ZoneCount'], canView('Monitors')) ?></td>
 <?php
   if ( canEdit('Monitors') ) {
 ?>
@@ -437,8 +445,5 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
     </div>
   </form>
 <?php
-  include('function.php');
-  // Include Donate Modal
-  include('donate.php');
   xhtmlFooter();
 ?>
diff --git a/web/skins/classic/views/control.php b/web/skins/classic/views/control.php
index 9fad31c41..f94aaf3e1 100644
--- a/web/skins/classic/views/control.php
+++ b/web/skins/classic/views/control.php
@@ -56,13 +56,13 @@ xhtmlHeaders(__FILE__, translate('Control'));
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a>
+        <a href="#" data-on-click="backWindow"><?php echo translate('Close') ?></a>
       </div>
       <h2><?php echo translate('Control') ?></h2>
       <div id="headerControl">
-        <form name="contentForm" id="contentForm" method="get" action="?">
+        <form name="contentForm" id="controlForm" method="get" action="?">
           <input type="hidden" name="view" value="<?php echo $view ?>"/>
-          <?php echo buildSelect('mid', $mids, 'this.form.submit();'); ?>
+          <?php echo buildSelect('mid', $mids); ?>
         </form>
       </div>
     </div>
diff --git a/web/skins/classic/views/controlcap.php b/web/skins/classic/views/controlcap.php
index d7d57b284..194c351c5 100644
--- a/web/skins/classic/views/controlcap.php
+++ b/web/skins/classic/views/controlcap.php
@@ -37,453 +37,620 @@ $tabs['presets'] = translate('Presets');
 
 $tab = isset($_REQUEST['tab']) ? validHtmlStr($_REQUEST['tab']) :'main';
 
-if ( isset($_REQUEST['newControl']) ) {
-    $newControl = $_REQUEST['newControl'];
+if ( isset($_REQUEST['Control']) ) {
+  $Control = $_REQUEST['Control'];
 } else {
-    if ( !empty($_REQUEST['cid']) ) {
-        $control = dbFetchOne('SELECT * FROM Controls WHERE Id = ?', NULL, array($_REQUEST['cid']));
-    } else {
-        $control = array(
-            'Name' => translate('New'),
-            'Type' => "Local",
-            'Protocol' => "",
-            'CanWake' => "",
-            'CanSleep' => "",
-            'CanReset' => "",
-            'CanReboot' => "",
-            'CanMove' => "",
-            'CanMoveDiag' => "",
-            'CanMoveMap' => "",
-            'CanMoveAbs' => "",
-            'CanMoveRel' => "",
-            'CanMoveCon' => "",
-            'CanPan' => "",
-            'MinPanRange' => "",
-            'MaxPanRange' => "",
-            'MinPanStep' => "",
-            'MaxPanStep' => "",
-            'HasPanSpeed' => "",
-            'MinPanSpeed' => "",
-            'MaxPanSpeed' => "",
-            'HasTurboPan' => "",
-            'TurboPanSpeed' => "",
-            'CanTilt' => "",
-            'MinTiltRange' => "",
-            'MaxTiltRange' => "",
-            'MinTiltStep' => "",
-            'MaxTiltStep' => "",
-            'HasTiltSpeed' => "",
-            'MinTiltSpeed' => "",
-            'MaxTiltSpeed' => "",
-            'HasTurboTilt' => "",
-            'TurboTiltSpeed' => "",
-            'CanZoom' => "",
-            'CanZoomAbs' => "",
-            'CanZoomRel' => "",
-            'CanZoomCon' => "",
-            'MinZoomRange' => "",
-            'MaxZoomRange' => "",
-            'MinZoomStep' => "",
-            'MaxZoomStep' => "",
-            'HasZoomSpeed' => "",
-            'MinZoomSpeed' => "",
-            'MaxZoomSpeed' => "",
-            'CanFocus' => "",
-            'CanAutoFocus' => "",
-            'CanFocusAbs' => "",
-            'CanFocusRel' => "",
-            'CanFocusCon' => "",
-            'MinFocusRange' => "",
-            'MaxFocusRange' => "",
-            'MinFocusStep' => "",
-            'MaxFocusStep' => "",
-            'HasFocusSpeed' => "",
-            'MinFocusSpeed' => "",
-            'MaxFocusSpeed' => "",
-            'CanIris' => "",
-            'CanAutoIris' => "",
-            'CanIrisAbs' => "",
-            'CanIrisRel' => "",
-            'CanIrisCon' => "",
-            'MinIrisRange' => "",
-            'MaxIrisRange' => "",
-            'MinIrisStep' => "",
-            'MaxIrisStep' => "",
-            'HasIrisSpeed' => "",
-            'MinIrisSpeed' => "",
-            'MaxIrisSpeed' => "",
-            'CanGain' => "",
-            'CanAutoGain' => "",
-            'CanGainAbs' => "",
-            'CanGainRel' => "",
-            'CanGainCon' => "",
-            'MinGainRange' => "",
-            'MaxGainRange' => "",
-            'MinGainStep' => "",
-            'MaxGainStep' => "",
-            'HasGainSpeed' => "",
-            'MinGainSpeed' => "",
-            'MaxGainSpeed' => "",
-            'CanWhite' => "",
-            'CanAutoWhite' => "",
-            'CanWhiteAbs' => "",
-            'CanWhiteRel' => "",
-            'CanWhiteCon' => "",
-            'MinWhiteRange' => "",
-            'MaxWhiteRange' => "",
-            'MinWhiteStep' => "",
-            'MaxWhiteStep' => "",
-            'HasWhiteSpeed' => "",
-            'MinWhiteSpeed' => "",
-            'MaxWhiteSpeed' => "",
-            'HasPresets' => "",
-            'NumPresets' => "",
-            'HasHomePreset' => "",
-            'CanSetPresets' => "",
-        );
-    }
-    $newControl = $control;
+  if ( !empty($_REQUEST['cid']) ) {
+    $Control = dbFetchOne('SELECT * FROM Controls WHERE Id = ?', NULL, array($_REQUEST['cid']));
+  } else {
+    $Control = array(
+      'Name' => translate('New'),
+      'Type' => 'Local',
+      'Protocol' => '',
+      'CanWake' => '',
+      'CanSleep' => '',
+      'CanReset' => '',
+      'CanReboot' => '',
+      'CanMove' => '',
+      'CanMoveDiag' => '',
+      'CanMoveMap' => '',
+      'CanMoveAbs' => '',
+      'CanMoveRel' => '',
+      'CanMoveCon' => '',
+      'CanPan' => '',
+      'MinPanRange' => '',
+      'MaxPanRange' => '',
+      'MinPanStep' => '',
+      'MaxPanStep' => '',
+      'HasPanSpeed' => '',
+      'MinPanSpeed' => '',
+      'MaxPanSpeed' => '',
+      'HasTurboPan' => '',
+      'TurboPanSpeed' => '',
+      'CanTilt' => '',
+      'MinTiltRange' => '',
+      'MaxTiltRange' => '',
+      'MinTiltStep' => '',
+      'MaxTiltStep' => '',
+      'HasTiltSpeed' => '',
+      'MinTiltSpeed' => '',
+      'MaxTiltSpeed' => '',
+      'HasTurboTilt' => '',
+      'TurboTiltSpeed' => '',
+      'CanZoom' => '',
+      'CanZoomAbs' => '',
+      'CanZoomRel' => '',
+      'CanZoomCon' => '',
+      'MinZoomRange' => '',
+      'MaxZoomRange' => '',
+      'MinZoomStep' => '',
+      'MaxZoomStep' => '',
+      'HasZoomSpeed' => '',
+      'MinZoomSpeed' => '',
+      'MaxZoomSpeed' => '',
+      'CanFocus' => '',
+      'CanAutoFocus' => '',
+      'CanFocusAbs' => '',
+      'CanFocusRel' => '',
+      'CanFocusCon' => '',
+      'MinFocusRange' => '',
+      'MaxFocusRange' => '',
+      'MinFocusStep' => '',
+      'MaxFocusStep' => '',
+      'HasFocusSpeed' => '',
+      'MinFocusSpeed' => '',
+      'MaxFocusSpeed' => '',
+      'CanIris' => '',
+      'CanAutoIris' => '',
+      'CanIrisAbs' => '',
+      'CanIrisRel' => '',
+      'CanIrisCon' => '',
+      'MinIrisRange' => '',
+      'MaxIrisRange' => '',
+      'MinIrisStep' => '',
+      'MaxIrisStep' => '',
+      'HasIrisSpeed' => '',
+      'MinIrisSpeed' => '',
+      'MaxIrisSpeed' => '',
+      'CanGain' => '',
+      'CanAutoGain' => '',
+      'CanGainAbs' => '',
+      'CanGainRel' => '',
+      'CanGainCon' => '',
+      'MinGainRange' => '',
+      'MaxGainRange' => '',
+      'MinGainStep' => '',
+      'MaxGainStep' => '',
+      'HasGainSpeed' => '',
+      'MinGainSpeed' => '',
+      'MaxGainSpeed' => '',
+      'CanWhite' => '',
+      'CanAutoWhite' => '',
+      'CanWhiteAbs' => '',
+      'CanWhiteRel' => '',
+      'CanWhiteCon' => '',
+      'MinWhiteRange' => '',
+      'MaxWhiteRange' => '',
+      'MinWhiteStep' => '',
+      'MaxWhiteStep' => '',
+      'HasWhiteSpeed' => '',
+      'MinWhiteSpeed' => '',
+      'MaxWhiteSpeed' => '',
+      'HasPresets' => '',
+      'NumPresets' => '',
+      'HasHomePreset' => '',
+      'CanSetPresets' => '',
+    );
+  }
 }
 
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, translate('ControlCap').' - '.$newControl['Name']);
+xhtmlHeaders(__FILE__, translate('ControlCap').' - '.$Control['Name']);
 ?>
 <body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('ControlCap') ?> - <?php echo validHtmlStr($newControl['Name']) ?></h2>
-    </div>
-    <div id="content">
-      <ul class="tabList">
+  <?php echo getNavBarHTML() ?>
+  <div id="page" class="container-fluid">
+    <div class="row flex-nowrap">
+      <nav> <!-- BEGIN PILL LIST -->
+        <ul class="nav nav-pills flex-column h-100" id="pills-tab" role="tabList" aria-orientation="vertical">
 <?php
 foreach ( $tabs as $name=>$value ) {
-    if ( $tab == $name ) {
 ?>
-        <li class="active"><?php echo $value ?></li>
-<?php
-    } else {
-?>
-        <li><a href="#" data-tab-name="<?php echo $name ?>"><?php echo $value ?></a></li>
-<?php
-    }
-}
-?>
-      </ul>
-      <div class="clear"></div>
-      <form name="contentForm" id="contentForm" method="post" action="?" class="validateFormOnSubmit">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
-        <input type="hidden" name="action" value="controlcap"/>
-        <input type="hidden" name="cid" value="<?php echo requestVar('cid') ?>"/>
-<?php
-if ( $tab != 'main' ) {
-?>
-        <input type="hidden" name="newControl[Name]" value="<?php echo validHtmlStr($newControl['Name']) ?>"/>
-        <input type="hidden" name="newControl[Type]" value="<?php echo validHtmlStr($newControl['Type']) ?>"/>
-        <input type="hidden" name="newControl[Protocol]" value="<?php echo validHtmlStr($newControl['Protocol']) ?>"/>
-        <input type="hidden" name="newControl[CanWake]" value="<?php echo !empty($newControl['CanWake']) ?>"/>
-        <input type="hidden" name="newControl[CanSleep]" value="<?php echo !empty($newControl['CanSleep']) ?>"/>
-        <input type="hidden" name="newControl[CanReset]" value="<?php echo !empty($newControl['CanReset']) ?>"/>
-<?php
-}
-if ( $tab != 'move' ) {
-?>
-        <input type="hidden" name="newControl[CanMove]" value="<?php echo !empty($newControl['CanMove']) ?>"/>
-        <input type="hidden" name="newControl[CanMoveDiag]" value="<?php echo !empty($newControl['CanMoveDiag']) ?>"/>
-        <input type="hidden" name="newControl[CanMoveMap]" value="<?php echo !empty($newControl['CanMoveMap']) ?>"/>
-        <input type="hidden" name="newControl[CanMoveAbs]" value="<?php echo !empty($newControl['CanMoveAbs']) ?>"/>
-        <input type="hidden" name="newControl[CanMoveRel]" value="<?php echo !empty($newControl['CanMoveRel']) ?>"/>
-        <input type="hidden" name="newControl[CanMoveCon]" value="<?php echo !empty($newControl['CanMoveCon']) ?>"/>
-<?php
-}
-if ( $tab != 'pan' ) {
-?>
-        <input type="hidden" name="newControl[CanPan]" value="<?php echo !empty($newControl['CanPan']) ?>"/>
-        <input type="hidden" name="newControl[MinPanRange]" value="<?php echo validHtmlStr($newControl['MinPanRange']) ?>"/>
-        <input type="hidden" name="newControl[MaxPanRange]" value="<?php echo validHtmlStr($newControl['MaxPanRange']) ?>"/>
-        <input type="hidden" name="newControl[MinPanStep]" value="<?php echo validHtmlStr($newControl['MinPanStep']) ?>"/>
-        <input type="hidden" name="newControl[MaxPanStep]" value="<?php echo validHtmlStr($newControl['MaxPanStep']) ?>"/>
-        <input type="hidden" name="newControl[HasPanSpeed]" value="<?php echo !empty($newControl['HasPanSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MinPanSpeed]" value="<?php echo validHtmlStr($newControl['MinPanSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MaxPanSpeed]" value="<?php echo validHtmlStr($newControl['MaxPanSpeed']) ?>"/>
-        <input type="hidden" name="newControl[HasTurboPan]" value="<?php echo !empty($newControl['HasTurboPan']) ?>"/>
-        <input type="hidden" name="newControl[TurboPanSpeed]" value="<?php echo validHtmlStr($newControl['TurboPanSpeed']) ?>"/>
-<?php
-}
-if ( $tab != 'tilt' ) {
-?>
-        <input type="hidden" name="newControl[CanTilt]" value="<?php echo !empty($newControl['CanTilt']) ?>"/>
-        <input type="hidden" name="newControl[MinTiltRange]" value="<?php echo validHtmlStr($newControl['MinTiltRange']) ?>"/>
-        <input type="hidden" name="newControl[MaxTiltRange]" value="<?php echo validHtmlStr($newControl['MaxTiltRange']) ?>"/>
-        <input type="hidden" name="newControl[MinTiltStep]" value="<?php echo validHtmlStr($newControl['MinTiltStep']) ?>"/>
-        <input type="hidden" name="newControl[MaxTiltStep]" value="<?php echo validHtmlStr($newControl['MaxTiltStep']) ?>"/>
-        <input type="hidden" name="newControl[HasTiltSpeed]" value="<?php echo !empty($newControl['HasTiltSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MinTiltSpeed]" value="<?php echo validHtmlStr($newControl['MinTiltSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MaxTiltSpeed]" value="<?php echo validHtmlStr($newControl['MaxTiltSpeed']) ?>"/>
-        <input type="hidden" name="newControl[HasTurboTilt]" value="<?php echo !empty($newControl['HasTurboTilt']) ?>"/>
-        <input type="hidden" name="newControl[TurboTiltSpeed]" value="<?php echo validHtmlStr($newControl['TurboTiltSpeed']) ?>"/>
-<?php
-}
-if ( $tab != 'zoom' ) {
-?>
-        <input type="hidden" name="newControl[CanZoom]" value="<?php echo !empty($newControl['CanZoom']) ?>"/>
-        <input type="hidden" name="newControl[CanZoomAbs]" value="<?php echo !empty($newControl['CanZoomAbs']) ?>"/>
-        <input type="hidden" name="newControl[CanZoomRel]" value="<?php echo !empty($newControl['CanZoomRel']) ?>"/>
-        <input type="hidden" name="newControl[CanZoomCon]" value="<?php echo !empty($newControl['CanZoomCon']) ?>"/>
-        <input type="hidden" name="newControl[MinZoomRange]" value="<?php echo validHtmlStr($newControl['MinZoomRange']) ?>"/>
-        <input type="hidden" name="newControl[MaxZoomRange]" value="<?php echo validHtmlStr($newControl['MaxZoomRange']) ?>"/>
-        <input type="hidden" name="newControl[MinZoomStep]" value="<?php echo validHtmlStr($newControl['MinZoomStep']) ?>"/>
-        <input type="hidden" name="newControl[MaxZoomStep]" value="<?php echo validHtmlStr($newControl['MaxZoomStep']) ?>"/>
-        <input type="hidden" name="newControl[HasZoomSpeed]" value="<?php echo !empty($newControl['HasZoomSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MinZoomSpeed]" value="<?php echo validHtmlStr($newControl['MinZoomSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MaxZoomSpeed]" value="<?php echo validHtmlStr($newControl['MaxZoomSpeed']) ?>"/>
-<?php
-}
-if ( $tab != 'focus' ) {
-?>
-        <input type="hidden" name="newControl[CanFocus]" value="<?php echo !empty($newControl['CanFocus']) ?>"/>
-        <input type="hidden" name="newControl[CanAutoFocus]" value="<?php echo !empty($newControl['CanAutoFocus']) ?>"/>
-        <input type="hidden" name="newControl[CanFocusAbs]" value="<?php echo !empty($newControl['CanFocusAbs']) ?>"/>
-        <input type="hidden" name="newControl[CanFocusRel]" value="<?php echo !empty($newControl['CanFocusRel']) ?>"/>
-        <input type="hidden" name="newControl[CanFocusCon]" value="<?php echo !empty($newControl['CanFocusCon']) ?>"/>
-        <input type="hidden" name="newControl[MinFocusRange]" value="<?php echo validHtmlStr($newControl['MinFocusRange']) ?>"/>
-        <input type="hidden" name="newControl[MaxFocusRange]" value="<?php echo validHtmlStr($newControl['MaxFocusRange']) ?>"/>
-        <input type="hidden" name="newControl[MinFocusStep]" value="<?php echo validHtmlStr($newControl['MinFocusStep']) ?>"/>
-        <input type="hidden" name="newControl[MaxFocusStep]" value="<?php echo validHtmlStr($newControl['MaxFocusStep']) ?>"/>
-        <input type="hidden" name="newControl[HasFocusSpeed]" value="<?php echo !empty($newControl['HasFocusSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MinFocusSpeed]" value="<?php echo validHtmlStr($newControl['MinFocusSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MaxFocusSpeed]" value="<?php echo validHtmlStr($newControl['MaxFocusSpeed']) ?>"/>
-<?php
-}
-if ( $tab != 'iris' ) {
-?>
-        <input type="hidden" name="newControl[CanIris]" value="<?php echo !empty($newControl['CanIris']) ?>"/>
-        <input type="hidden" name="newControl[CanAutoIris]" value="<?php echo !empty($newControl['CanAutoIris']) ?>"/>
-        <input type="hidden" name="newControl[CanIrisAbs]" value="<?php echo !empty($newControl['CanIrisAbs']) ?>"/>
-        <input type="hidden" name="newControl[CanIrisRel]" value="<?php echo !empty($newControl['CanIrisRel']) ?>"/>
-        <input type="hidden" name="newControl[CanIrisCon]" value="<?php echo !empty($newControl['CanIrisCon']) ?>"/>
-        <input type="hidden" name="newControl[MinIrisRange]" value="<?php echo validHtmlStr($newControl['MinIrisRange']) ?>"/>
-        <input type="hidden" name="newControl[MaxIrisRange]" value="<?php echo validHtmlStr($newControl['MaxIrisRange']) ?>"/>
-        <input type="hidden" name="newControl[MinIrisStep]" value="<?php echo validHtmlStr($newControl['MinIrisStep']) ?>"/>
-        <input type="hidden" name="newControl[MaxIrisStep]" value="<?php echo validHtmlStr($newControl['MaxIrisStep']) ?>"/>
-        <input type="hidden" name="newControl[HasIrisSpeed]" value="<?php echo !empty($newControl['HasIrisSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MinIrisSpeed]" value="<?php echo validHtmlStr($newControl['MinIrisSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MaxIrisSpeed]" value="<?php echo validHtmlStr($newControl['MaxIrisSpeed']) ?>"/>
-<?php
-}
-if ( $tab != 'gain' ) {
-?>
-        <input type="hidden" name="newControl[CanGain]" value="<?php echo !empty($newControl['CanGain']) ?>"/>
-        <input type="hidden" name="newControl[CanAutoGain]" value="<?php echo !empty($newControl['CanAutoGain']) ?>"/>
-        <input type="hidden" name="newControl[CanGainAbs]" value="<?php echo !empty($newControl['CanGainAbs']) ?>"/>
-        <input type="hidden" name="newControl[CanGainRel]" value="<?php echo !empty($newControl['CanGainRel']) ?>"/>
-        <input type="hidden" name="newControl[CanGainCon]" value="<?php echo !empty($newControl['CanGainCon']) ?>"/>
-        <input type="hidden" name="newControl[MinGainRange]" value="<?php echo validHtmlStr($newControl['MinGainRange']) ?>"/>
-        <input type="hidden" name="newControl[MaxGainRange]" value="<?php echo validHtmlStr($newControl['MaxGainRange']) ?>"/>
-        <input type="hidden" name="newControl[MinGainStep]" value="<?php echo validHtmlStr($newControl['MinGainStep']) ?>"/>
-        <input type="hidden" name="newControl[MaxGainStep]" value="<?php echo validHtmlStr($newControl['MaxGainStep']) ?>"/>
-        <input type="hidden" name="newControl[HasGainSpeed]" value="<?php echo !empty($newControl['HasGainSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MinGainSpeed]" value="<?php echo validHtmlStr($newControl['MinGainSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MaxGainSpeed]" value="<?php echo validHtmlStr($newControl['MaxGainSpeed']) ?>"/>
-<?php
-}
-if ( $tab != 'white' ) {
-?>
-        <input type="hidden" name="newControl[CanWhite]" value="<?php echo !empty($newControl['CanWhite']) ?>"/>
-        <input type="hidden" name="newControl[CanAutoWhite]" value="<?php echo !empty($newControl['CanAutoWhite']) ?>"/>
-        <input type="hidden" name="newControl[CanWhiteAbs]" value="<?php echo !empty($newControl['CanWhiteAbs']) ?>"/>
-        <input type="hidden" name="newControl[CanWhiteRel]" value="<?php echo !empty($newControl['CanWhiteRel']) ?>"/>
-        <input type="hidden" name="newControl[CanWhiteCon]" value="<?php echo !empty($newControl['CanWhiteCon']) ?>"/>
-        <input type="hidden" name="newControl[MinWhiteRange]" value="<?php echo validHtmlStr($newControl['MinWhiteRange']) ?>"/>
-        <input type="hidden" name="newControl[MaxWhiteRange]" value="<?php echo validHtmlStr($newControl['MaxWhiteRange']) ?>"/>
-        <input type="hidden" name="newControl[MinWhiteStep]" value="<?php echo validHtmlStr($newControl['MinWhiteStep']) ?>"/>
-        <input type="hidden" name="newControl[MaxWhiteStep]" value="<?php echo validHtmlStr($newControl['MaxWhiteStep']) ?>"/>
-        <input type="hidden" name="newControl[HasWhiteSpeed]" value="<?php echo !empty($newControl['HasWhiteSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MinWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MinWhiteSpeed']) ?>"/>
-        <input type="hidden" name="newControl[MaxWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MaxWhiteSpeed']) ?>"/>
-<?php
-}
-if ( $tab != 'presets' ) {
-?>
-        <input type="hidden" name="newControl[HasPresets]" value="<?php echo !empty($newControl['HasPresets']) ?>"/>
-        <input type="hidden" name="newControl[NumPresets]" value="<?php echo validHtmlStr($newControl['NumPresets']) ?>"/>
-        <input type="hidden" name="newControl[HasHomePreset]" value="<?php echo !empty($newControl['HasHomePreset']) ?>"/>
-        <input type="hidden" name="newControl[CanSetPresets]" value="<?php echo !empty($newControl['CanSetPresets']) ?>"/>
+    <li class="nav-item form-control-sm my-1">
+      <a
+        id="<?php echo $name ?>-tab"
+        data-toggle="pill"
+        class="nav-link<?php echo $tab == $name ? ' active' : '' ?>"
+        href="#pills-<?php echo $name?>"
+        role="tab"
+        aria-controls="pills-<?php echo $name?>"
+        aria-selected="<?php echo $tab == $name ? 'true':'false'?>"
+      ><?php echo $value ?></a>
+    </li>
 <?php
 }
 ?>
-        <table id="contentTable" class="major">
+        </ul>
+      </nav> <!-- END PILL LIST -->
+
+      <div class="d-flex flex-column col-sm-offset-2 container-fluid">
+        <!-- BEGIN MINI HEADER -->
+        <div class="w-100 py-1">
+          <div class="float-left pl-3">
+            <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+            <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+          </div>
+          <div class="w-100 pt-2">
+            <h2><?php echo translate('ControlCap') ?> - <?php echo validHtmlStr($Control['Name']) ?></h2>
+          </div>
+        </div>
+
+        <!-- BEGIN ITEM LIST -->
+        <div class="d-flex flex-row container-fluid pr-0">
+          <form name="contentForm" id="contentForm" method="post" action="?" class="validateFormOnSubmit">
+            <input type="hidden" name="view" value="<?php echo $view ?>"/>
+            <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
+            <input type="hidden" name="cid" value="<?php echo requestVar('cid') ?>"/>
+
+            <div class="tab-content" id="pills-tabContent">
+<?php
+foreach ( $tabs as $name=>$value ) {
+  echo '<div id="pills-'.$name.'" class="tab-pane fade'.($name==$tab ? ' show active' : '').'" role="tabpanel" aria-labelledby="'.$name.'-tab">'.PHP_EOL;
+?>
+        <table class="major">
           <tbody>
 <?php
-switch ( $tab ) {
+switch ( $name ) {
   case 'main' :
-  {
 ?>
-            <tr><th scope="row"><?php echo translate('Name') ?></th><td><input type="text" name="newControl[Name]" value="<?php echo validHtmlStr($newControl['Name']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('Type') ?></th><td><?php 
-            $types = array( 'Local'=>translate('Local'), 'Remote'=>translate('Remote'), 'Ffmpeg'=>translate('Ffmpeg'), 'Libvlc'=>translate('Libvlc'), 'cURL'=>'cURL');
-            echo buildSelect('newControl[Type]', $types); ?></td></tr>
-            <tr><th scope="row"><?php echo translate('Protocol') ?></th><td><input type="text" name="newControl[Protocol]" value="<?php echo validHtmlStr($newControl['Protocol']) ?>" size="24"/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanWake') ?></th><td><input type="checkbox" name="newControl[CanWake]" value="1"<?php if ( !empty($newControl['CanWake']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanSleep') ?></th><td><input type="checkbox" name="newControl[CanSleep]" value="1"<?php if ( !empty($newControl['CanSleep']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanReset') ?></th><td><input type="checkbox" name="newControl[CanReset]" value="1"<?php if ( !empty($newControl['CanReset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanReboot') ?></th><td><input type="checkbox" name="newControl[CanReboot]" value="1"<?php if ( !empty($newControl['CanReboot']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Name') ?></th>
+              <td><input type="text" name="Control[Name]" value="<?php echo validHtmlStr($Control['Name']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Type') ?></th>
+              <td>
+<?php 
+    $types = array(
+      'Local'=>translate('Local'),
+      'Remote'=>translate('Remote'),
+      'Ffmpeg'=>translate('Ffmpeg'),
+      'Libvlc'=>translate('Libvlc'),
+      'cURL'=>'cURL'
+    );
+    echo buildSelect('Control[Type]', $types);
+?>
+              </td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Protocol') ?></th>
+              <td><input type="text" name="Control[Protocol]" value="<?php echo validHtmlStr($Control['Protocol']) ?>" size="24"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanWake') ?></th>
+              <td><input type="checkbox" name="Control[CanWake]" value="1"<?php if ( !empty($Control['CanWake']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanSleep') ?></th>
+              <td><input type="checkbox" name="Control[CanSleep]" value="1"<?php if ( !empty($Control['CanSleep']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanReset') ?></th>
+              <td><input type="checkbox" name="Control[CanReset]" value="1"<?php if ( !empty($Control['CanReset']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanReboot') ?></th>
+              <td><input type="checkbox" name="Control[CanReboot]" value="1"<?php if ( !empty($Control['CanReboot']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
 <?php
         break;
-    }
     case 'move' :
-    {
 ?>
-            <tr><th scope="row"><?php echo translate('CanMove') ?></th><td><input type="checkbox" name="newControl[CanMove]" value="1"<?php if ( !empty($newControl['CanMove']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanMoveDiag') ?></th><td><input type="checkbox" name="newControl[CanMoveDiag]" value="1"<?php if ( !empty($newControl['CanMoveDiag']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanMoveMap') ?></th><td><input type="checkbox" name="newControl[CanMoveMap]" value="1"<?php if ( !empty($newControl['CanMoveMap']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanMoveAbs') ?></th><td><input type="checkbox" name="newControl[CanMoveAbs]" value="1"<?php if ( !empty($newControl['CanMoveAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanMoveRel') ?></th><td><input type="checkbox" name="newControl[CanMoveRel]" value="1"<?php if ( !empty($newControl['CanMoveRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanMoveCon') ?></th><td><input type="checkbox" name="newControl[CanMoveCon]" value="1"<?php if ( !empty($newControl['CanMoveCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanMove') ?></th>
+              <td><input type="checkbox" name="Control[CanMove]" value="1"<?php if ( !empty($Control['CanMove']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanMoveDiag') ?></th>
+              <td><input type="checkbox" name="Control[CanMoveDiag]" value="1"<?php if ( !empty($Control['CanMoveDiag']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanMoveMap') ?></th>
+              <td><input type="checkbox" name="Control[CanMoveMap]" value="1"<?php if ( !empty($Control['CanMoveMap']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanMoveAbs') ?></th>
+              <td><input type="checkbox" name="Control[CanMoveAbs]" value="1"<?php if ( !empty($Control['CanMoveAbs']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanMoveRel') ?></th>
+              <td><input type="checkbox" name="Control[CanMoveRel]" value="1"<?php if ( !empty($Control['CanMoveRel']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanMoveCon') ?></th>
+              <td><input type="checkbox" name="Control[CanMoveCon]" value="1"<?php if ( !empty($Control['CanMoveCon']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
 <?php
         break;
-    }
     case 'pan' :
-    {
 ?>
-            <tr><th scope="row"><?php echo translate('CanPan') ?></th><td><input type="checkbox" name="newControl[CanPan]" value="1"<?php if ( !empty($newControl['CanPan']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo translate('MinPanRange') ?></th><td><input type="number" name="newControl[MinPanRange]" value="<?php echo validHtmlStr($newControl['MinPanRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxPanRange') ?></th><td><input type="number" name="newControl[MaxPanRange]" value="<?php echo validHtmlStr($newControl['MaxPanRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinPanStep') ?></th><td><input type="number" name="newControl[MinPanStep]" value="<?php echo validHtmlStr($newControl['MinPanStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxPanStep') ?></th><td><input type="number" name="newControl[MaxPanStep]" value="<?php echo validHtmlStr($newControl['MaxPanStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasPanSpeed') ?></th><td><input type="checkbox" name="newControl[HasPanSpeed]" value="1"<?php if ( !empty($newControl['HasPanSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinPanSpeed') ?></th><td><input type="number" name="newControl[MinPanSpeed]" value="<?php echo validHtmlStr($newControl['MinPanSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxPanSpeed') ?></th><td><input type="number" name="newControl[MaxPanSpeed]" value="<?php echo validHtmlStr($newControl['MaxPanSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasTurboPan') ?></th><td><input type="checkbox" name="newControl[HasTurboPan]" value="1"<?php if ( !empty($newControl['HasTurboPan']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('TurboPanSpeed') ?></th><td><input type="number" name="newControl[TurboPanSpeed]" value="<?php echo validHtmlStr($newControl['TurboPanSpeed']) ?>"/></td></tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanPan') ?></th>
+              <td><input type="checkbox" name="Control[CanPan]" value="1"<?php if ( !empty($Control['CanPan']) ) { ?> checked="checked"<?php } ?>></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinPanRange') ?></th>
+              <td><input type="number" name="Control[MinPanRange]" value="<?php echo validHtmlStr($Control['MinPanRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxPanRange') ?></th>
+              <td><input type="number" name="Control[MaxPanRange]" value="<?php echo validHtmlStr($Control['MaxPanRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinPanStep') ?></th>
+              <td><input type="number" name="Control[MinPanStep]" value="<?php echo validHtmlStr($Control['MinPanStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxPanStep') ?></th>
+              <td><input type="number" name="Control[MaxPanStep]" value="<?php echo validHtmlStr($Control['MaxPanStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasPanSpeed') ?></th>
+              <td><input type="checkbox" name="Control[HasPanSpeed]" value="1"<?php if ( !empty($Control['HasPanSpeed']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinPanSpeed') ?></th>
+              <td><input type="number" name="Control[MinPanSpeed]" value="<?php echo validHtmlStr($Control['MinPanSpeed']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxPanSpeed') ?></th>
+              <td><input type="number" name="Control[MaxPanSpeed]" value="<?php echo validHtmlStr($Control['MaxPanSpeed']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasTurboPan') ?></th>
+              <td><input type="checkbox" name="Control[HasTurboPan]" value="1"<?php if ( !empty($Control['HasTurboPan']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('TurboPanSpeed') ?></th>
+              <td><input type="number" name="Control[TurboPanSpeed]" value="<?php echo validHtmlStr($Control['TurboPanSpeed']) ?>"/></td>
+            </tr>
 <?php
         break;
-    }
     case 'tilt' :
-    {
 ?>
-            <tr><th scope="row"><?php echo translate('CanTilt') ?></th><td><input type="checkbox" name="newControl[CanTilt]" value="1"<?php if ( !empty($newControl['CanTilt']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo translate('MinTiltRange') ?></th><td><input type="number" name="newControl[MinTiltRange]" value="<?php echo validHtmlStr($newControl['MinTiltRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxTiltRange') ?></th><td><input type="number" name="newControl[MaxTiltRange]" value="<?php echo validHtmlStr($newControl['MaxTiltRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinTiltStep') ?></th><td><input type="number" name="newControl[MinTiltStep]" value="<?php echo validHtmlStr($newControl['MinTiltStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxTiltStep') ?></th><td><input type="number" name="newControl[MaxTiltStep]" value="<?php echo validHtmlStr($newControl['MaxTiltStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasTiltSpeed') ?></th><td><input type="checkbox" name="newControl[HasTiltSpeed]" value="1"<?php if ( !empty($newControl['HasTiltSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinTiltSpeed') ?></th><td><input type="number" name="newControl[MinTiltSpeed]" value="<?php echo validHtmlStr($newControl['MinTiltSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxTiltSpeed') ?></th><td><input type="number" name="newControl[MaxTiltSpeed]" value="<?php echo validHtmlStr($newControl['MaxTiltSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasTurboTilt') ?></th><td><input type="checkbox" name="newControl[HasTurboTilt]" value="1"<?php if ( !empty($newControl['HasTurboTilt']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('TurboTiltSpeed') ?></th><td><input type="number" name="newControl[TurboTiltSpeed]" value="<?php echo validHtmlStr($newControl['TurboTiltSpeed']) ?>"/></td></tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanTilt') ?></th>
+              <td><input type="checkbox" name="Control[CanTilt]" value="1"<?php if ( !empty($Control['CanTilt']) ) { ?> checked="checked"<?php } ?>></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinTiltRange') ?></th>
+              <td><input type="number" name="Control[MinTiltRange]" value="<?php echo validHtmlStr($Control['MinTiltRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxTiltRange') ?></th>
+              <td><input type="number" name="Control[MaxTiltRange]" value="<?php echo validHtmlStr($Control['MaxTiltRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinTiltStep') ?></th>
+              <td><input type="number" name="Control[MinTiltStep]" value="<?php echo validHtmlStr($Control['MinTiltStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxTiltStep') ?></th>
+              <td><input type="number" name="Control[MaxTiltStep]" value="<?php echo validHtmlStr($Control['MaxTiltStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasTiltSpeed') ?></th>
+              <td><input type="checkbox" name="Control[HasTiltSpeed]" value="1"<?php if ( !empty($Control['HasTiltSpeed']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinTiltSpeed') ?></th>
+              <td><input type="number" name="Control[MinTiltSpeed]" value="<?php echo validHtmlStr($Control['MinTiltSpeed']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxTiltSpeed') ?></th>
+              <td><input type="number" name="Control[MaxTiltSpeed]" value="<?php echo validHtmlStr($Control['MaxTiltSpeed']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasTurboTilt') ?></th>
+              <td><input type="checkbox" name="Control[HasTurboTilt]" value="1"<?php if ( !empty($Control['HasTurboTilt']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('TurboTiltSpeed') ?></th>
+              <td><input type="number" name="Control[TurboTiltSpeed]" value="<?php echo validHtmlStr($Control['TurboTiltSpeed']) ?>"/></td>
+            </tr>
 <?php
         break;
-    }
     case 'zoom' :
-    {
 ?>
-            <tr><th scope="row"><?php echo translate('CanZoom') ?></th><td><input type="checkbox" name="newControl[CanZoom]" value="1"<?php if ( !empty($newControl['CanZoom']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo translate('CanZoomAbs') ?></th><td><input type="checkbox" name="newControl[CanZoomAbs]" value="1"<?php if ( !empty($newControl['CanZoomAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanZoomRel') ?></th><td><input type="checkbox" name="newControl[CanZoomRel]" value="1"<?php if ( !empty($newControl['CanZoomRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanZoomCon') ?></th><td><input type="checkbox" name="newControl[CanZoomCon]" value="1"<?php if ( !empty($newControl['CanZoomCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinZoomRange') ?></th><td><input type="number" name="newControl[MinZoomRange]" value="<?php echo validHtmlStr($newControl['MinZoomRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxZoomRange') ?></th><td><input type="number" name="newControl[MaxZoomRange]" value="<?php echo validHtmlStr($newControl['MaxZoomRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinZoomStep') ?></th><td><input type="number" name="newControl[MinZoomStep]" value="<?php echo validHtmlStr($newControl['MinZoomStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxZoomStep') ?></th><td><input type="number" name="newControl[MaxZoomStep]" value="<?php echo validHtmlStr($newControl['MaxZoomStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasZoomSpeed') ?></th><td><input type="checkbox" name="newControl[HasZoomSpeed]" value="1"<?php if ( !empty($newControl['HasZoomSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinZoomSpeed') ?></th><td><input type="number" name="newControl[MinZoomSpeed]" value="<?php echo validHtmlStr($newControl['MinZoomSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxZoomSpeed') ?></th><td><input type="number" name="newControl[MaxZoomSpeed]" value="<?php echo validHtmlStr($newControl['MaxZoomSpeed']) ?>"/></td></tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanZoom') ?></th>
+              <td><input type="checkbox" name="Control[CanZoom]" value="1"<?php if ( !empty($Control['CanZoom']) ) { ?> checked="checked"<?php } ?>></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanZoomAbs') ?></th>
+              <td><input type="checkbox" name="Control[CanZoomAbs]" value="1"<?php if ( !empty($Control['CanZoomAbs']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanZoomRel') ?></th>
+              <td><input type="checkbox" name="Control[CanZoomRel]" value="1"<?php if ( !empty($Control['CanZoomRel']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanZoomCon') ?></th>
+              <td><input type="checkbox" name="Control[CanZoomCon]" value="1"<?php if ( !empty($Control['CanZoomCon']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinZoomRange') ?></th>
+              <td><input type="number" name="Control[MinZoomRange]" value="<?php echo validHtmlStr($Control['MinZoomRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxZoomRange') ?></th>
+              <td><input type="number" name="Control[MaxZoomRange]" value="<?php echo validHtmlStr($Control['MaxZoomRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinZoomStep') ?></th>
+              <td><input type="number" name="Control[MinZoomStep]" value="<?php echo validHtmlStr($Control['MinZoomStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxZoomStep') ?></th>
+              <td><input type="number" name="Control[MaxZoomStep]" value="<?php echo validHtmlStr($Control['MaxZoomStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasZoomSpeed') ?></th>
+              <td><input type="checkbox" name="Control[HasZoomSpeed]" value="1"<?php if ( !empty($Control['HasZoomSpeed']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinZoomSpeed') ?></th>
+              <td><input type="number" name="Control[MinZoomSpeed]" value="<?php echo validHtmlStr($Control['MinZoomSpeed']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxZoomSpeed') ?></th>
+              <td><input type="number" name="Control[MaxZoomSpeed]" value="<?php echo validHtmlStr($Control['MaxZoomSpeed']) ?>"/></td>
+            </tr>
 <?php
         break;
-    }
     case 'focus' :
-    {
 ?>
-            <tr><th scope="row"><?php echo translate('CanFocus') ?></th><td><input type="checkbox" name="newControl[CanFocus]" value="1"<?php if ( !empty($newControl['CanFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanAutoFocus') ?></th><td><input type="checkbox" name="newControl[CanAutoFocus]" value="1"<?php if ( !empty($newControl['CanAutoFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanFocusAbs') ?></th><td><input type="checkbox" name="newControl[CanFocusAbs]" value="1"<?php if ( !empty($newControl['CanFocusAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanFocusRel') ?></th><td><input type="checkbox" name="newControl[CanFocusRel]" value="1"<?php if ( !empty($newControl['CanFocusRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanFocusCon') ?></th><td><input type="checkbox" name="newControl[CanFocusCon]" value="1"<?php if ( !empty($newControl['CanFocusCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinFocusRange') ?></th><td><input type="number" name="newControl[MinFocusRange]" value="<?php echo validHtmlStr($newControl['MinFocusRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxFocusRange') ?></th><td><input type="number" name="newControl[MaxFocusRange]" value="<?php echo validHtmlStr($newControl['MaxFocusRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinFocusStep') ?></th><td><input type="number" name="newControl[MinFocusStep]" value="<?php echo validHtmlStr($newControl['MinFocusStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxFocusStep') ?></th><td><input type="number" name="newControl[MaxFocusStep]" value="<?php echo validHtmlStr($newControl['MaxFocusStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasFocusSpeed') ?></th><td><input type="checkbox" name="newControl[HasFocusSpeed]" value="1"<?php if ( !empty($newControl['HasFocusSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinFocusSpeed') ?></th><td><input type="number" name="newControl[MinFocusSpeed]" value="<?php echo validHtmlStr($newControl['MinFocusSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxFocusSpeed') ?></th><td><input type="number" name="newControl[MaxFocusSpeed]" value="<?php echo validHtmlStr($newControl['MaxFocusSpeed']) ?>"/></td></tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanFocus') ?></th>
+              <td><input type="checkbox" name="Control[CanFocus]" value="1"<?php if ( !empty($Control['CanFocus']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanAutoFocus') ?></th>
+              <td><input type="checkbox" name="Control[CanAutoFocus]" value="1"<?php if ( !empty($Control['CanAutoFocus']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanFocusAbs') ?></th>
+              <td><input type="checkbox" name="Control[CanFocusAbs]" value="1"<?php if ( !empty($Control['CanFocusAbs']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanFocusRel') ?></th>
+              <td><input type="checkbox" name="Control[CanFocusRel]" value="1"<?php if ( !empty($Control['CanFocusRel']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanFocusCon') ?></th>
+              <td><input type="checkbox" name="Control[CanFocusCon]" value="1"<?php if ( !empty($Control['CanFocusCon']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinFocusRange') ?></th>
+              <td><input type="number" name="Control[MinFocusRange]" value="<?php echo validHtmlStr($Control['MinFocusRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxFocusRange') ?></th>
+              <td><input type="number" name="Control[MaxFocusRange]" value="<?php echo validHtmlStr($Control['MaxFocusRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinFocusStep') ?></th>
+              <td><input type="number" name="Control[MinFocusStep]" value="<?php echo validHtmlStr($Control['MinFocusStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxFocusStep') ?></th>
+              <td><input type="number" name="Control[MaxFocusStep]" value="<?php echo validHtmlStr($Control['MaxFocusStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasFocusSpeed') ?></th>
+              <td><input type="checkbox" name="Control[HasFocusSpeed]" value="1"<?php if ( !empty($Control['HasFocusSpeed']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinFocusSpeed') ?></th>
+              <td><input type="number" name="Control[MinFocusSpeed]" value="<?php echo validHtmlStr($Control['MinFocusSpeed']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxFocusSpeed') ?></th>
+              <td><input type="number" name="Control[MaxFocusSpeed]" value="<?php echo validHtmlStr($Control['MaxFocusSpeed']) ?>"/></td>
+            </tr>
 <?php
         break;
-    }
     case 'iris' :
-    {
 ?>
-            <tr><th scope="row"><?php echo translate('CanIris') ?></th><td><input type="checkbox" name="newControl[CanIris]" value="1"<?php if ( !empty($newControl['CanIris']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo translate('CanAutoIris') ?></th><td><input type="checkbox" name="newControl[CanAutoIris]" value="1"<?php if ( !empty($newControl['CanAutoIris']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanIrisAbs') ?></th><td><input type="checkbox" name="newControl[CanIrisAbs]" value="1"<?php if ( !empty($newControl['CanIrisAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanIrisRel') ?></th><td><input type="checkbox" name="newControl[CanIrisRel]" value="1"<?php if ( !empty($newControl['CanIrisRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanIrisCon') ?></th><td><input type="checkbox" name="newControl[CanIrisCon]" value="1"<?php if ( !empty($newControl['CanIrisCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinIrisRange') ?></th><td><input type="number" name="newControl[MinIrisRange]" value="<?php echo validHtmlStr($newControl['MinIrisRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxIrisRange') ?></th><td><input type="number" name="newControl[MaxIrisRange]" value="<?php echo validHtmlStr($newControl['MaxIrisRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinIrisStep') ?></th><td><input type="number" name="newControl[MinIrisStep]" value="<?php echo validHtmlStr($newControl['MinIrisStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxIrisStep') ?></th><td><input type="number" name="newControl[MaxIrisStep]" value="<?php echo validHtmlStr($newControl['MaxIrisStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasIrisSpeed') ?></th><td><input type="checkbox" name="newControl[HasIrisSpeed]" value="1"<?php if ( !empty($newControl['HasIrisSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinIrisSpeed') ?></th><td><input type="number" name="newControl[MinIrisSpeed]" value="<?php echo validHtmlStr($newControl['MinIrisSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxIrisSpeed') ?></th><td><input type="number" name="newControl[MaxIrisSpeed]" value="<?php echo validHtmlStr($newControl['MaxIrisSpeed']) ?>"/></td></tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanIris') ?></th>
+              <td><input type="checkbox" name="Control[CanIris]" value="1"<?php if ( !empty($Control['CanIris']) ) { ?> checked="checked"<?php } ?>></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanAutoIris') ?></th>
+              <td><input type="checkbox" name="Control[CanAutoIris]" value="1"<?php if ( !empty($Control['CanAutoIris']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanIrisAbs') ?></th>
+              <td><input type="checkbox" name="Control[CanIrisAbs]" value="1"<?php if ( !empty($Control['CanIrisAbs']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanIrisRel') ?></th>
+              <td><input type="checkbox" name="Control[CanIrisRel]" value="1"<?php if ( !empty($Control['CanIrisRel']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanIrisCon') ?></th>
+              <td><input type="checkbox" name="Control[CanIrisCon]" value="1"<?php if ( !empty($Control['CanIrisCon']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinIrisRange') ?></th>
+              <td><input type="number" name="Control[MinIrisRange]" value="<?php echo validHtmlStr($Control['MinIrisRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxIrisRange') ?></th>
+              <td><input type="number" name="Control[MaxIrisRange]" value="<?php echo validHtmlStr($Control['MaxIrisRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinIrisStep') ?></th>
+              <td><input type="number" name="Control[MinIrisStep]" value="<?php echo validHtmlStr($Control['MinIrisStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxIrisStep') ?></th>
+              <td><input type="number" name="Control[MaxIrisStep]" value="<?php echo validHtmlStr($Control['MaxIrisStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasIrisSpeed') ?></th>
+              <td><input type="checkbox" name="Control[HasIrisSpeed]" value="1"<?php if ( !empty($Control['HasIrisSpeed']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinIrisSpeed') ?></th>
+              <td><input type="number" name="Control[MinIrisSpeed]" value="<?php echo validHtmlStr($Control['MinIrisSpeed']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxIrisSpeed') ?></th>
+              <td><input type="number" name="Control[MaxIrisSpeed]" value="<?php echo validHtmlStr($Control['MaxIrisSpeed']) ?>"/></td>
+            </tr>
 <?php
         break;
-    }
     case 'gain' :
-    {
 ?>
-            <tr><th scope="row"><?php echo translate('CanGain') ?></th><td><input type="checkbox" name="newControl[CanGain]" value="1"<?php if ( !empty($newControl['CanGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanAutoGain') ?></th><td><input type="checkbox" name="newControl[CanAutoGain]" value="1"<?php if ( !empty($newControl['CanAutoGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanGainAbs') ?></th><td><input type="checkbox" name="newControl[CanGainAbs]" value="1"<?php if ( !empty($newControl['CanGainAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanGainRel') ?></th><td><input type="checkbox" name="newControl[CanGainRel]" value="1"<?php if ( !empty($newControl['CanGainRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanGainCon') ?></th><td><input type="checkbox" name="newControl[CanGainCon]" value="1"<?php if ( !empty($newControl['CanGainCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinGainRange') ?></th><td><input type="number" name="newControl[MinGainRange]" value="<?php echo validHtmlStr($newControl['MinGainRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxGainRange') ?></th><td><input type="number" name="newControl[MaxGainRange]" value="<?php echo validHtmlStr($newControl['MaxGainRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinGainStep') ?></th><td><input type="number" name="newControl[MinGainStep]" value="<?php echo validHtmlStr($newControl['MinGainStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxGainStep') ?></th><td><input type="number" name="newControl[MaxGainStep]" value="<?php echo validHtmlStr($newControl['MaxGainStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasGainSpeed') ?></th><td><input type="checkbox" name="newControl[HasGainSpeed]" value="1"<?php if ( !empty($newControl['HasGainSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinGainSpeed') ?></th><td><input type="number" name="newControl[MinGainSpeed]" value="<?php echo validHtmlStr($newControl['MinGainSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxGainSpeed') ?></th><td><input type="number" name="newControl[MaxGainSpeed]" value="<?php echo validHtmlStr($newControl['MaxGainSpeed']) ?>"/></td></tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanGain') ?></th>
+              <td><input type="checkbox" name="Control[CanGain]" value="1"<?php if ( !empty($Control['CanGain']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanAutoGain') ?></th>
+              <td><input type="checkbox" name="Control[CanAutoGain]" value="1"<?php if ( !empty($Control['CanAutoGain']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanGainAbs') ?></th>
+              <td><input type="checkbox" name="Control[CanGainAbs]" value="1"<?php if ( !empty($Control['CanGainAbs']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanGainRel') ?></th>
+              <td><input type="checkbox" name="Control[CanGainRel]" value="1"<?php if ( !empty($Control['CanGainRel']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanGainCon') ?></th>
+              <td><input type="checkbox" name="Control[CanGainCon]" value="1"<?php if ( !empty($Control['CanGainCon']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinGainRange') ?></th>
+              <td><input type="number" name="Control[MinGainRange]" value="<?php echo validHtmlStr($Control['MinGainRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxGainRange') ?></th>
+              <td><input type="number" name="Control[MaxGainRange]" value="<?php echo validHtmlStr($Control['MaxGainRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinGainStep') ?></th>
+              <td><input type="number" name="Control[MinGainStep]" value="<?php echo validHtmlStr($Control['MinGainStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxGainStep') ?></th>
+              <td><input type="number" name="Control[MaxGainStep]" value="<?php echo validHtmlStr($Control['MaxGainStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasGainSpeed') ?></th>
+              <td><input type="checkbox" name="Control[HasGainSpeed]" value="1"<?php if ( !empty($Control['HasGainSpeed']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinGainSpeed') ?></th>
+              <td><input type="number" name="Control[MinGainSpeed]" value="<?php echo validHtmlStr($Control['MinGainSpeed']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxGainSpeed') ?></th>
+              <td><input type="number" name="Control[MaxGainSpeed]" value="<?php echo validHtmlStr($Control['MaxGainSpeed']) ?>"/></td>
+            </tr>
 <?php
         break;
-    }
     case 'white' :
-    {
 ?>
-            <tr><th scope="row"><?php echo translate('CanWhite') ?></th><td><input type="checkbox" name="newControl[CanWhite]" value="1"<?php if ( !empty($newControl['CanWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanAutoWhite') ?></th><td><input type="checkbox" name="newControl[CanAutoWhite]" value="1"<?php if ( !empty($newControl['CanAutoWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanWhiteAbs') ?></th><td><input type="checkbox" name="newControl[CanWhiteAbs]" value="1"<?php if ( !empty($newControl['CanWhiteAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanWhiteRel') ?></th><td><input type="checkbox" name="newControl[CanWhiteRel]" value="1"<?php if ( !empty($newControl['CanWhiteRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanWhiteCon') ?></th><td><input type="checkbox" name="newControl[CanWhiteCon]" value="1"<?php if ( !empty($newControl['CanWhiteCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinWhiteRange') ?></th><td><input type="number" name="newControl[MinWhiteRange]" value="<?php echo validHtmlStr($newControl['MinWhiteRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxWhiteRange') ?></th><td><input type="number" name="newControl[MaxWhiteRange]" value="<?php echo validHtmlStr($newControl['MaxWhiteRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinWhiteStep') ?></th><td><input type="number" name="newControl[MinWhiteStep]" value="<?php echo validHtmlStr($newControl['MinWhiteStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxWhiteStep') ?></th><td><input type="number" name="newControl[MaxWhiteStep]" value="<?php echo validHtmlStr($newControl['MaxWhiteStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasWhiteSpeed') ?></th><td><input type="checkbox" name="newControl[HasWhiteSpeed]" value="1"<?php if ( !empty($newControl['HasWhiteSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinWhiteSpeed') ?></th><td><input type="number" name="newControl[MinWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MinWhiteSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxWhiteSpeed') ?></th><td><input type="number" name="newControl[MaxWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MaxWhiteSpeed']) ?>"/></td></tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanWhite') ?></th>
+              <td><input type="checkbox" name="Control[CanWhite]" value="1"<?php if ( !empty($Control['CanWhite']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanAutoWhite') ?></th>
+              <td><input type="checkbox" name="Control[CanAutoWhite]" value="1"<?php if ( !empty($Control['CanAutoWhite']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanWhiteAbs') ?></th>
+              <td><input type="checkbox" name="Control[CanWhiteAbs]" value="1"<?php if ( !empty($Control['CanWhiteAbs']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanWhiteRel') ?></th>
+              <td><input type="checkbox" name="Control[CanWhiteRel]" value="1"<?php if ( !empty($Control['CanWhiteRel']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanWhiteCon') ?></th>
+              <td><input type="checkbox" name="Control[CanWhiteCon]" value="1"<?php if ( !empty($Control['CanWhiteCon']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinWhiteRange') ?></th>
+              <td><input type="number" name="Control[MinWhiteRange]" value="<?php echo validHtmlStr($Control['MinWhiteRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxWhiteRange') ?></th>
+              <td><input type="number" name="Control[MaxWhiteRange]" value="<?php echo validHtmlStr($Control['MaxWhiteRange']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinWhiteStep') ?></th>
+              <td><input type="number" name="Control[MinWhiteStep]" value="<?php echo validHtmlStr($Control['MinWhiteStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxWhiteStep') ?></th>
+              <td><input type="number" name="Control[MaxWhiteStep]" value="<?php echo validHtmlStr($Control['MaxWhiteStep']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasWhiteSpeed') ?></th>
+              <td><input type="checkbox" name="Control[HasWhiteSpeed]" value="1"<?php if ( !empty($Control['HasWhiteSpeed']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MinWhiteSpeed') ?></th>
+              <td><input type="number" name="Control[MinWhiteSpeed]" value="<?php echo validHtmlStr($Control['MinWhiteSpeed']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('MaxWhiteSpeed') ?></th>
+              <td><input type="number" name="Control[MaxWhiteSpeed]" value="<?php echo validHtmlStr($Control['MaxWhiteSpeed']) ?>"/></td>
+            </tr>
 <?php
         break;
-    }
     case 'presets' :
-    {
 ?>
-            <tr><th scope="row"><?php echo translate('HasPresets') ?></th><td><input type="checkbox" name="newControl[HasPresets]" value="1"<?php if ( !empty($newControl['HasPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('NumPresets') ?></th><td><input type="number" name="newControl[NumPresets]" value="<?php echo validHtmlStr($newControl['NumPresets']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasHomePreset') ?></th><td><input type="checkbox" name="newControl[HasHomePreset]" value="1"<?php if ( !empty($newControl['HasHomePreset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanSetPresets') ?></th><td><input type="checkbox" name="newControl[CanSetPresets]" value="1"<?php if ( !empty($newControl['CanSetPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasPresets') ?></th>
+              <td><input type="checkbox" name="Control[HasPresets]" value="1"<?php if ( !empty($Control['HasPresets']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('NumPresets') ?></th>
+              <td><input type="number" name="Control[NumPresets]" value="<?php echo validHtmlStr($Control['NumPresets']) ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('HasHomePreset') ?></th>
+              <td><input type="checkbox" name="Control[HasHomePreset]" value="1"<?php if ( !empty($Control['HasHomePreset']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('CanSetPresets') ?></th>
+              <td><input type="checkbox" name="Control[CanSetPresets]" value="1"<?php if ( !empty($Control['CanSetPresets']) ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
 <?php
         break;
-    }
-}
+} # end switch tab
 ?>
           </tbody>
         </table>
+      </div>
+<?php
+} # end foreach tab
+?>
+        </div><!--tab-content-->
         <div id="contentButtons">
-          <button type="submit" value="Save"<?php if ( !canEdit( 'Control' ) ) { ?> disabled="disabled"<?php } ?>><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+          <button type="submit" name="action" value="Save"<?php if ( !canEdit( 'Control' ) ) { ?> disabled="disabled"<?php } ?>><?php echo translate('Save') ?></button>
+          <button type="button" id="cancelBtn"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
+    </div>
   </div>
+</div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/controlcaps.php b/web/skins/classic/views/controlcaps.php
index 58bca5dbd..a19f0e781 100644
--- a/web/skins/classic/views/controlcaps.php
+++ b/web/skins/classic/views/controlcaps.php
@@ -30,30 +30,47 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('ControlCaps'));
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <div id="headerButtons">
-        <a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a>
-      </div>
-      <h2><?php echo translate('ControlCaps') ?></h2>
+
+    <!-- Toolbar button placement and styling handled by bootstrap-tables -->
+    <div id="toolbar">
+      <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+      <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      <button id="addNewBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('AddNewControl') ?>" data-on-click-this="addNewControl" data-url="?view=controlcap"><i class="fa fa-plus"></i></button>
+      <button id="editBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('EditControl') ?>" data-on-click-this="editControl" data-url="?view=controlcap&cid=" disabled><i class="fa fa-pencil"></i></button>
+      <button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>" disabled><i class="fa fa-trash"></i></button>
     </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="get" action="?" onsubmit="return( confirmDelete( 'Warning, deleting a control will reset all monitors that use it to be uncontrollable.\nAre you sure you wish to delete?' ) );">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="action" value="delete"/>
-        <table id="contentTable" class="major">
+
+    <div id="content" class="table-responsive-sm">
+        <table
+          id="controlTable"
+          data-locale="<?php echo i18n() ?>"
+          class="table-sm table-borderless"
+          data-search="true"
+          data-cookie="true"
+          data-cookie-id-table="zmControlTable"
+          data-cookie-expire="2y"
+          data-remember-order="true"
+          data-click-to-select="true"
+          data-maintain-meta-data="true"
+          data-buttons-class="btn btn-normal"
+          data-toolbar="#toolbar"
+          data-show-columns="true"
+        >
           <thead>
             <tr>
-              <th class="colName"><?php echo translate('Name') ?></th>
-              <th class="colType"><?php echo translate('Type') ?></th>
-              <th class="colProtocol"><?php echo translate('Protocol') ?></th>
-              <th class="colCanMove"><?php echo translate('CanMove') ?></th>
-              <th class="colCanZoom"><?php echo translate('CanZoom') ?></th>
-              <th class="colCanFocus"><?php echo translate('CanFocus') ?></th>
-              <th class="colCanIris"><?php echo translate('CanIris') ?></th>
-              <th class="colCanWhiteBal"><?php echo translate('CanWhiteBal') ?></th>
-              <th class="colHasPresets"><?php echo translate('HasPresets') ?></th>
-              <th class="colMark"><?php echo translate('Mark') ?></th>
+              <th data-sortable="false" data-field="toggleCheck" data-checkbox="true"></th>
+              <th class="colId" data-sortable="true" data-field="Id"><?php echo translate('Id') ?></th>
+              <th class="colName" data-sortable="true" data-field="Name"><?php echo translate('Name') ?></th>
+              <th class="colType" data-sortable="true" data-field="Type"><?php echo translate('Type') ?></th>
+              <th class="colProtocol" data-sortable="true" data-field="Protocol"><?php echo translate('Protocol') ?></th>
+              <th class="colCanMove" data-sortable="true" data-field="CanMove"><?php echo translate('CanMove') ?></th>
+              <th class="colCanZoom" data-sortable="true" data-field="CanZoom"><?php echo translate('CanZoom') ?></th>
+              <th class="colCanFocus" data-sortable="true" data-field="CanFocus"><?php echo translate('CanFocus') ?></th>
+              <th class="colCanIris" data-sortable="true" data-field="CanIris"><?php echo translate('CanIris') ?></th>
+              <th class="colCanWhiteBal" data-sortable="true" data-field="CanWhiteBal"><?php echo translate('CanWhiteBal') ?></th>
+              <th class="colHasPresets" data-sortable="true" data-field="HasPresets"><?php echo translate('HasPresets') ?></th>
             </tr>
           </thead>
           <tbody>
@@ -61,7 +78,9 @@ xhtmlHeaders(__FILE__, translate('ControlCaps'));
 foreach( $controls as $control ) {
 ?>
             <tr>
-              <td class="colName"><?php echo makePopupLink( '?view=controlcap&cid='.$control['Id'], 'zmControlCap', 'controlcap', validHtmlStr($control['Name']), canView( 'Control' ) ) ?></td>
+              <td class="colMark" data-checkbox="true"></td>
+              <td class="colId"><?php echo $control['Id'] ?></td>
+              <td class="colName"><?php echo $control['Name'] ?></td>
               <td class="colType"><?php echo $control['Type'] ?></td>
               <td class="colProtocol"><?php echo validHtmlStr($control['Protocol']) ?></td>
               <td class="colCanMove"><?php echo $control['CanMove']?translate('Yes'):translate('No') ?></td>
@@ -70,18 +89,12 @@ foreach( $controls as $control ) {
               <td class="colCanIris"><?php echo $control['CanIris']?translate('Yes'):translate('No') ?></td>
               <td class="colCanWhiteBal"><?php echo $control['CanWhite']?translate('Yes'):translate('No') ?></td>
               <td class="colHasPresets"><?php echo $control['HasHomePreset']?'H':'' ?><?php echo $control['HasPresets']?$control['NumPresets']:'0' ?></td>
-              <td class="colMark"><input type="checkbox" name="markCids[]" value="<?php echo $control['Id'] ?>" data-on-click-this="configureDeleteButton"<?php if ( !canEdit( 'Control' ) ) {?> disabled="disabled"<?php } ?>/></td>
             </tr>
 <?php
 }
 ?>
           </tbody>
         </table>
-        <div id="contentButtons">
-          <?php echo makePopupButton('?view=controlcap', 'zmControlCap', 'controlcap', translate('AddNewControl'), canEdit( 'Control' )); ?>
-          <input type="submit" name="deleteBtn" value="<?php echo translate('Delete') ?>" disabled="disabled"/>
-        </div>
-      </form>
     </div>
   </div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/controlpreset.php b/web/skins/classic/views/controlpreset.php
deleted file mode 100644
index 6d67c5424..000000000
--- a/web/skins/classic/views/controlpreset.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-//
-// ZoneMinder web run state view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canEdit('Monitors') ) {
-  $view = 'error';
-  return;
-}
-
-$monitor = dbFetchOne('SELECT C.*,M.* FROM Monitors AS M INNER JOIN Controls AS C ON (M.ControlId = C.Id ) WHERE M.Id = ?', NULL, array( $_REQUEST['mid']) );
-
-$labels = array();
-foreach( dbFetchAll( 'SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, array( $monitor['Id'] ) ) as $row ) {
-  $labels[$row['Preset']] = $row['Label'];
-}
-
-$presets = array();
-for ( $i = 1; $i <= $monitor['NumPresets']; $i++ ) {
-  $presets[$i] = translate('Preset').' '.$i;
-  if ( !empty($labels[$i]) ) {
-    $presets[$i] .= ' ('.validHtmlStr($labels[$i]).')';
-  }
-}
-
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, translate('SetPreset') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('SetPreset') ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="view" value="control"/>
-        <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
-        <input type="hidden" name="action" value="control"/>
-        <input type="hidden" name="control" value="presetSet"/>
-        <input type="hidden" name="showControls" value="1"/>
-        <p><?php echo buildSelect('preset', $presets, 'updateLabel()' ) ?></p>
-        <p>
-          <label for="newLabel"><?php echo translate('NewLabel') ?></label>
-          <input type="text" name="newLabel" id="newLabel" value=""/>
-        </p>
-        <div id="contentButtons">
-          <button type="submit" value="Save"><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index 7e974cd4e..b9f779c50 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -122,7 +122,7 @@ if ( isset($_COOKIE['zmCycleHeight']) and $_COOKIE['zmCycleHeight'] ) {
 
 session_write_close();
 
-ZM\Logger::Debug(print_r($options,true));
+ZM\Debug(print_r($options,true));
 
 noCacheHeaders();
 xhtmlHeaders(__FILE__, translate('CycleWatch'));
@@ -182,7 +182,7 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
           ?>
           </div>
 
-          <div class="buttons">
+          <div id="buttons" class="buttons">
             <button type="button" value="&lt;" id="prevBtn" title="<?php echo translate('PreviousMonitor') ?>" class="active" data-on-click-true="cyclePrev">&lt;&lt;</button>
             <button type="button" value="||" id="pauseBtn" title="<?php echo translate('PauseCycle') ?>" class="active" data-on-click-true="cyclePause">||</button>
             <button type="button" value="|&gt;" id="playBtn" title="<?php echo translate('PlayCycle') ?>" class="inactive" disabled="disabled" data-on-click-true="cycleStart">|&gt;</button>
diff --git a/web/skins/classic/views/device.php b/web/skins/classic/views/device.php
deleted file mode 100644
index fa1a6a9d4..000000000
--- a/web/skins/classic/views/device.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-//
-// ZoneMinder web device detail view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canEdit( 'Devices' ) )
-{
-    $view = "error";
-    return;
-}
-if ( !empty($_REQUEST['did']) ) {
-    $newDevice = dbFetchOne( 'SELECT * FROM Devices WHERE Id = ?', NULL, array($_REQUEST['did']) );
-} else {
-    $newDevice = array(
-        "Id" => "",
-        "Name" => "New Device",
-        "KeyString" => ""
-    );
-}
-
-xhtmlHeaders( __FILE__, translate('Device')." - ".$newDevice['Name'] );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Device')." - ".validHtmlStr($newDevice['Name']) ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" method="get" action="?">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="action" value="device"/>
-        <input type="hidden" name="did" value="<?php echo $newDevice['Id'] ?>"/>
-        <table id="contentTable" class="major" cellspacing="0">
-          <tbody>
-            <tr>
-              <th scope="row"><?php echo translate('Name') ?></th>
-              <td><input type="text" name="newDevice[Name]" value="<?php echo validHtmlStr($newDevice['Name']) ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('KeyString') ?></th>
-              <td><input type="text" name="newDevice[KeyString]" value="<?php echo validHtmlStr($newDevice['KeyString']) ?>"/></td>
-            </tr>
-          </tbody>
-        </table>
-        <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Devices' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="closeWindow"/>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/classic/views/devices.php b/web/skins/classic/views/devices.php
index 783d7775a..5ed5a3e37 100644
--- a/web/skins/classic/views/devices.php
+++ b/web/skins/classic/views/devices.php
@@ -35,52 +35,73 @@ foreach( dbFetchAll( $sql ) as $row )
 xhtmlHeaders(__FILE__, translate('Devices') );
 ?>
 <body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Devices') ?></h2>
+  <?php echo getNavBarHTML(); ?>
+  <div id="page" class="container-fluid">
+    <h2>X10 <?php echo translate('Devices') ?></h2>
+
+    <div id="toolbar">
+      <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+      <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      <button id="newDeviceBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('New') ?>"><i class="fa fa-plus"></i></button>
+      <button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>" disabled><i class="fa fa-trash"></i></button>
     </div>
-    <div id="content">
-      <form name="contentForm" method="get" action="?">
-        <input type="hidden" name="view" value="none"/>
-        <input type="hidden" name="action" value="device"/>
-        <input type="hidden" name="key" value=""/>
-        <input type="hidden" name="command" value=""/>
-        <table id="contentTable" class="major" cellspacing="0">
+
+    <div id="content" class="row justify-content-center table-responsive-sm">
+        <table
+          id="devicesTable"
+          data-locale="<?php echo i18n() ?>"
+          class="table-sm table-borderless"
+          data-search="true"
+          data-cookie="true"
+          data-cookie-id-table="zmDevicesTable"
+          data-cookie-expire="2y"
+          data-cookie-expire="2y"
+          data-remember-order="true"
+          data-click-to-select="true"
+          data-maintain-meta-data="true"
+          data-buttons-class="btn btn-normal"
+          data-toolbar="#toolbar"
+          data-show-columns="true"
+        >
+
+          <thead>
+            <tr>
+              <th data-sortable="true" data-field="Id"><?php echo translate('Id') ?></th>
+              <th data-sortable="true" data-field="Name"><?php echo translate('Name') ?></th>
+              <th data-sortable="true" data-field="KeyString"><?php echo translate('KeyString') ?></th>
+              <th data-sortable="false" data-field="On"><?php echo translate('On') ?></th>
+              <th data-sortable="false" data-field="Off"><?php echo translate('Off') ?></th>
+              <th data-sortable="false" data-field="toggleCheck" data-checkbox="true"></th>
+            </tr>
+          </thead>
+
           <tbody>
 <?php
-foreach( $devices as $device )
-{
-    if ( $device['Status'] == 'ON' )
-    {
-        $fclass = "infoText";
-    }
-    elseif ( $device['Status'] == 'OFF' )
-    {
-        $fclass = "warnText";
-    }
-    else
-    {
-        $fclass = "errorText";
-    }
+foreach( $devices as $device ) {
+
+  if ( $device['Status'] == 'ON' ) {
+    $fclass = "infoText";
+  } else if ( $device['Status'] == 'OFF' ) {
+    $fclass = "warnText";
+  } else {
+    $fclass = "errorText";
+  }
+  
+  $str_opt = 'class="deviceCol" data-did="'.$device['Id'].'"';
 ?>
             <tr>
-              <td><?php echo makePopupLink( '?view=device&amp;did='.$device['Id'], 'zmDevice', 'device', '<span class="'.$fclass.'">'.validHtmlStr($device['Name']).' ('.validHtmlStr($device['KeyString']).')</span>', canEdit( 'Devices' ) ) ?></td>
-              <td><input type="button" value="<?php echo translate('On') ?>"<?php echo ($device['Status'] != 'ON')?' class="set"':'' ?> onclick="switchDeviceOn( this, '<?php echo validHtmlStr($device['KeyString']) ?>' )"<?php echo canEdit( 'Devices' )?"":' disabled="disabled"' ?>/></td>
-              <td><input type="button" value="<?php echo translate('Off') ?>"<?php echo ($device['Status'] != 'OFF')?' class="set"':'' ?> onclick="switchDeviceOff( this, '<?php echo validHtmlStr($device['KeyString']) ?>' )"<?php echo canEdit( 'Devices' )?"":' disabled="disabled"' ?>/></td>
-              <td><input type="checkbox" name="markDids[]" value="<?php echo $device['Id'] ?>" onclick="configureButtons( this, 'markDids' );"<?php if ( !canEdit( 'Devices' ) ) {?> disabled="disabled"<?php } ?>/></td>
+              <td><?php echo $device['Id'] ?></td>
+              <td><?php echo makeLink( '#', '<span class="'.$fclass.'">'.validHtmlStr($device['Name']).'</span>', canEdit( 'Devices' ), $str_opt ) ?></td>
+              <td><?php echo makeLink( '#', '<span class="'.$fclass.'">'.validHtmlStr($device['KeyString']).'</span>', canEdit( 'Devices' ), $str_opt ) ?></td>
+              <td><button class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('On') ?>"><i class="fa fa-toggle-on"></i></button></td>
+              <td><button class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Off') ?>"><i class="fa fa-toggle-off"></i></button></td>
+              <td data-checkbox="true"></td>
             </tr>
 <?php
 }
 ?>
           </tbody>
         </table>
-        <div id="contentButtons">
-          <?php echo makePopupButton('?view=device&did=0', 'zmDevice', 'device', translate('New'), canEdit( 'Devices' )); ?>
-          <input type="button" name="deleteBtn" value="<?php echo translate('Delete') ?>" data-on-click-this="deleteDevice" disabled="disabled"/>
-          <input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="closeWindow"/>
-        </div>
-      </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/download.php b/web/skins/classic/views/download.php
deleted file mode 100644
index 703a22e0e..000000000
--- a/web/skins/classic/views/download.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-//
-// ZoneMinder web export view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canView('Events') ) {
-  $view = 'error';
-  return;
-}
-
-$total_size = 0;
-if ( isset($_SESSION['montageReviewFilter']) and !isset($_REQUEST['eids']) ) {
-  # Handles montageReview filter
-  $eventsSql = 'SELECT E.Id, E.DiskSpace FROM Events AS E WHERE 1';
-  $eventsSql .= $_SESSION['montageReviewFilter']['sql'];
-  $results = dbQuery($eventsSql);
-  $eids = [];
-  while ( $event_row = dbFetchNext( $results ) ) {
-    array_push($eids, $event_row['Id']);
-    $total_size += $event_row['DiskSpace'];
-  }
-  $_REQUEST['eids'] = $eids;
-  if ( ! count($eids) ) {
-    ZM\Error("No events found for download using $eventsSql");
-  } 
-  #session_start();
-  #unset($_SESSION['montageReviewFilter']);
-  #session_write_close();
-#} else {
-#Logger::Debug("NO montageReviewFilter");
-}
-
-$exportFormat = '';
-if ( isset($_REQUEST['exportFormat']) ) {
-  if ( !in_array($_REQUEST['exportFormat'], array('zip', 'tar')) ) {
-    ZM\Error('Invalid exportFormat: '.$_REQUEST['exportFormat']);
-  } else {
-    $exportFormat = $_REQUEST['exportFormat'];
-  }
-}
-
-if ( !empty($_REQUEST['eid']) ) {
-  $Event = new ZM\Event($_REQUEST['eid']);
-  if ( !$Event->Id ) {
-    Error('Invalid event id');
-  }
-}
-
-$focusWindow = true;
-$connkey = isset($_REQUEST['connkey']) ? $_REQUEST['connkey'] : generateConnKey();
-
-xhtmlHeaders(__FILE__, translate('Download'));
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <div id="headerButtons">
-        <a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a>
-      </div>
-      <h2><?php echo translate('Download') ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <input type="hidden" name="connkey" value="<?php echo $connkey; ?>"/>
-<?php
-if ( !empty($_REQUEST['eid']) ) {
-?>
-        <input type="hidden" name="id" value="<?php echo validInt($_REQUEST['eid']) ?>"/>
-    <?php
-    $Event = new ZM\Event($_REQUEST['eid']);
-    echo 'Downloading event ' . $Event->Id . '. Resulting file should be approximately ' . human_filesize( $Event->DiskSpace() );
-} else if ( !empty($_REQUEST['eids']) ) {
-    $total_size = 0;
-    foreach ( $_REQUEST['eids'] as $eid ) {
-      if ( ! validInt($eid) ) {
-        ZM\Warning("Invalid event id in eids[] $eid");
-        continue;
-      }
-      $Event = new ZM\Event($eid);
-      $total_size += $Event->DiskSpace();
-?>
-        <input type="hidden" name="eids[]" value="<?php echo validInt($eid) ?>"/>
-<?php
-    }
-    unset($eid);
-    echo "Downloading " . count($_REQUEST['eids']) . ' events.  Resulting file should be approximately ' . human_filesize($total_size);
-} else {
-    echo '<div class="warning">There are no events found.  Resulting download will be empty.</div>';
-}
-?>
-        <table id="contentTable" class="minor">
-          <tbody>
-            <tr>
-              <td><input type="hidden" name="exportVideo" value="1"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('ExportFormat') ?></th>
-              <td>
-                <input type="radio" id="exportFormatTar" name="exportFormat" value="tar"/>
-                <label for="exportFormatTar"><?php echo translate('ExportFormatTar') ?></label>
-                <input type="radio" id="exportFormatZip" name="exportFormat" value="zip" checked="checked"/>
-                <label for="exportFormatZip"><?php echo translate('ExportFormatZip') ?></label>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <button type="button" id="exportButton" name="exportButton" value="GenerateDownload">
- <!--data-on-click-this="exportEvent">-->
-        <?php echo translate('GenerateDownload') ?>
-        </button>
-      </form>
-    </div>
-<?php
-    if ( isset($_REQUEST['generated']) ) {
-?>
-      <h2 id="exportProgress" class="<?php echo $_REQUEST['generated']?'infoText':'errorText' ?>">
-        <span id="exportProgressText"><?php echo $_REQUEST['generated']?translate('ExportSucceeded'):translate('ExportFailed') ?></span>
-        <span id="exportProgressTicker"></span>
-      </h2>
-<?php
-    } else {
-?>
-      <h2 id="exportProgress" class="hidden warnText">
-        <span id="exportProgressText"><?php echo translate('Exporting') ?></span>
-        <span id="exportProgressTicker"></span>
-      </h2>
-<?php
-    }
-    if ( !empty($_REQUEST['generated']) ) {
-?>
-      <h3 id="downloadLink"><a href="?view=archive&amp;type=<?php echo $exportFormat; ?>"><?php echo translate('Download') ?></a></h3>
-<?php
-    }
-?>
-  </div>
-<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/error.php b/web/skins/classic/views/error.php
index 545c734ef..2fdc3b6d0 100644
--- a/web/skins/classic/views/error.php
+++ b/web/skins/classic/views/error.php
@@ -23,6 +23,7 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('Error') );
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
     <div id="header">
       <h1>ZoneMinder <?php echo translate('Error') ?></h1>
@@ -34,9 +35,6 @@ xhtmlHeaders(__FILE__, translate('Error') );
       <p>
         <?php echo translate('ContactAdmin') ?>
       </p>
-      <p>
-        <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-      </p>
     </div>
   </div>
 </body>
diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index 6fb058cc5..7828d2888 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -49,13 +49,10 @@ if ( isset($_REQUEST['rate']) ) {
 
 if ( isset($_REQUEST['scale']) ) {
   $scale = validInt($_REQUEST['scale']);
-} else if ( isset($_COOKIE['zmEventScaleAuto']) ) {
-  // If we're using scale to fit use it on all monitors
-  $scale = '0';
 } else if ( isset($_COOKIE['zmEventScale'.$Event->MonitorId()]) ) {
   $scale = $_COOKIE['zmEventScale'.$Event->MonitorId()];
 } else {
-  $scale = reScale(SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE);
+  $scale = $Monitor->DefaultScale();
 }
 
 $codec = 'auto';
@@ -93,10 +90,14 @@ if ( isset($_REQUEST['replayMode']) )
 if ( isset($_COOKIE['replayMode']) && preg_match('#^[a-z]+$#', $_COOKIE['replayMode']) )
   $replayMode = validHtmlStr($_COOKIE['replayMode']);
 
-if ( ( ! $replayMode ) or ( ! $replayModes[$replayMode] ) ) {
+if ( ( !$replayMode ) or ( !$replayModes[$replayMode] ) ) {
   $replayMode = 'none';
 }
 
+$video_tag = false;
+if ( $Event->DefaultVideo() and ( $codec == 'MP4' or $codec == 'auto' ) ) {
+  $video_tag = true;
+}
 // videojs zoomrotate only when direct recording
 $Zoom = 1;
 $Rotation = 0;
@@ -123,70 +124,47 @@ $filterQuery = $filter->querystring();
 
 $connkey = generateConnKey();
 
-$focusWindow = true;
-
-$popup = (isset($_REQUEST['popup']) && ($_REQUEST['popup'] == 1));
-
-xhtmlHeaders(__FILE__, translate('Event'));
+xhtmlHeaders(__FILE__, translate('Event').' '.$Event->Id());
 ?>
 <body>
   <div id="page">
-    <?php if ( !$popup ) echo getNavBarHTML() ?>
-    <div id="header">
+    <?php echo getNavBarHTML() ?>
 <?php 
 if ( !$Event->Id() ) {
-  echo 'Event was not found.';
-} else {
-  if ( !file_exists($Event->Path()) ) {
-    echo '<div class="error">Event was not found at '.$Event->Path().'.  It is unlikely that playback will be possible.</div>';
-  }
+  echo '<div class="error">Event was not found.</div>';
+}
+
+if ( $Event->Id() and !file_exists($Event->Path()) )
+  echo '<div class="error">Event was not found at '.$Event->Path().'.  It is unlikely that playback will be possible.</div>';
 ?>
-      <div id="dataBar">
-        <span id="dataId" title="<?php echo translate('Id') ?>"><?php echo $Event->Id() ?></span>
-        <span id="dataMonitor" title="<?php echo translate('Monitor') ?>"><?php echo $Monitor->Id().' '.validHtmlStr($Monitor->Name()) ?></span>
-        <span id="dataCause" title="<?php echo $Event->Notes()?validHtmlStr($Event->Notes()):translate('AttrCause') ?>"><?php echo validHtmlStr($Event->Cause()) ?></span>
-        <span id="dataTime" title="<?php echo translate('Time') ?>"><?php echo strftime(STRF_FMT_DATETIME_SHORT, strtotime($Event->StartTime())) ?></span>
-        <span id="dataDuration" title="<?php echo translate('Duration') ?>"><?php echo $Event->Length().'s' ?></span>
-        <span id="dataFrames" title="<?php echo translate('AttrFrames').'/'.translate('AttrAlarmFrames') ?>"><?php echo $Event->Frames() ?>/<?php echo $Event->AlarmFrames() ?></span>
-        <span id="dataScore" title="<?php echo translate('AttrTotalScore').'/'.translate('AttrAvgScore').'/'.translate('AttrMaxScore') ?>"><?php echo $Event->TotScore() ?>/<?php echo $Event->AvgScore() ?>/<?php echo $Event->MaxScore() ?></span>
-        <span id="Storage">
-<?php echo 
-  human_filesize($Event->DiskSpace(null)) . ' on ' . validHtmlStr($Event->Storage()->Name()).
-  ( $Event->SecondaryStorageId() ? ', '.validHtmlStr($Event->SecondaryStorage()->Name()) : '' )
-?></span>
-        <div id="closeWindow"><a href="#" data-on-click="<?php echo $popup ? 'closeWindow' : 'backWindow' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div>
+
+<!-- BEGIN HEADER -->
+    <div class="d-flex flex-row justify-content-between px-3 py-1">
+      <div id="toolbar" >
+        <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+<?php if ( $Event->Id() ) { ?>
+        <button id="renameBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Rename') ?>" disabled><i class="fa fa-font"></i></button>
+        <button id="archiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Archive') ?>" disabled><i class="fa fa-archive"></i></button>
+        <button id="unarchiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Unarchive') ?>" disabled><i class="fa fa-file-archive-o"></i></button>
+        <button id="editBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Edit') ?>" disabled><i class="fa fa-pencil"></i></button>
+        <button id="exportBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Export') ?>"><i class="fa fa-external-link"></i></button>
+<?php
+  if ( $Event->DefaultVideo() ) {
+?>
+        <a class="btn btn-normal" href="<?php echo $Event->getStreamSrc(array('mode'=>'mp4'),'&amp;')?>" download><i class="fa fa-download"></i></a>
+<?php
+  } 
+?>
+        <button id="statsBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Stats') ?>" ><i class="fa fa-info"></i></button>
+        <button id="framesBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Frames') ?>" ><i class="fa fa-picture-o"></i></button>
+        <button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>"><i class="fa fa-trash"></i></button>
+<?php } // end if Event->Id ?>
       </div>
-      <div id="menuBar1">
-        <div id="nameControl">
-          <input type="text" id="eventName" name="eventName" value="<?php echo validHtmlStr($Event->Name()) ?>" />
-          <button value="Rename" type="button" data-on-click="renameEvent"<?php if ( !canEdit('Events') ) { ?> disabled="disabled"<?php } ?>>
-<?php echo translate('Rename') ?></button>
-        </div>
-<?php
-if ( canEdit('Events') ) {
-?>
-        <div id="deleteEvent"><button type="button" data-on-click="deleteEvent" <?php echo $Event->can_delete() ? '' : ' disabled="disabled" title="'.$Event->cant_delete_reason().'"' ?>><?php echo translate('Delete') ?></button></div>
-        <div id="editEvent"><button type="button" data-on-click="editEvent"><?php echo translate('Edit') ?></button></div>
-        <div id="archiveEvent"<?php echo $Event->Archived() == 1 ? ' class="hidden"' : ''  ?>><button type="button" data-on-click="archiveEvent"><?php echo translate('Archive') ?></button></div>
-        <div id="unarchiveEvent"<?php echo $Event->Archived() == 0 ? ' class="hidden"' : '' ?>><button type="button" data-on-click="unarchiveEvent"><?php echo translate('Unarchive') ?></button></div>
-<?php
-} // end if can edit Events
-?>
-        <div id="framesEvent"><button type="button" data-on-click="showEventFrames"><?php echo translate('Frames') ?></button></div>
-        <div id="streamEvent" class="hidden"><button data-on-click="showStream"><?php echo translate('Stream') ?></button></div>
-        <div id="stillsEvent"><button type="button" data-on-click="showStills"><?php echo translate('Stills') ?></button></div>
-<?php
-  if ( $Event->DefaultVideo() ) { 
-?>
-        <div id="downloadEventFile"><a class="btn-primary" href="<?php echo $Event->getStreamSrc(array('mode'=>'mp4'),'&amp;')?>" download>Download MP4</a></div>
-<?php
-  } else {
-?>
-        <div id="videoEvent"><button type="button" data-on-click="videoEvent"><?php echo translate('Video') ?></button></div>
-<?php
-  } // end if Event->DefaultVideo
-?>
-        <div id="exportEvent"><button type="button" data-on-click="exportEvent"><?php echo translate('Export') ?></button></div>
+      
+      <h2><?php echo translate('Event').' '.$Event->Id() ?></h2>
+      
+      <div class="d-flex flex-row">
         <div id="replayControl">
           <label for="replayMode"><?php echo translate('Replay') ?></label>
           <?php echo htmlSelect('replayMode', $replayModes, $replayMode, array('data-on-change'=>'changeReplayMode','id'=>'replayMode')); ?>
@@ -201,17 +179,32 @@ if ( canEdit('Events') ) {
         </div>
       </div>
     </div>
-    <div id="content">
+<?php if ( $Event->Id() ) { ?>
+<!-- BEGIN VIDEO CONTENT ROW -->
+    <div id="content" class="d-flex flex-row justify-content-center">
+      <div class="">
+        <!-- VIDEO STATISTICS TABLE -->
+        <table id="eventStatsTable" class="table-sm table-borderless">
+          <!-- EVENT STATISTICS POPULATED BY JAVASCRIPT -->
+        </table>
+      </div>
+      <div class="">
       <div id="eventVideo">
+      <!-- VIDEO CONTENT -->
 <?php
-if ( ($codec == 'MP4' || $codec == 'auto' ) && $Event->DefaultVideo() ) {
+if ( $video_tag ) {
 ?>
         <div id="videoFeed">
           <video id="videoobj" class="video-js vjs-default-skin"
             style="transform: matrix(1, 0, 0, 1, 0, 0);"
            <?php echo $scale ? 'width="'.reScale($Event->Width(), $scale).'"' : '' ?>
            <?php echo $scale ? 'height="'.reScale($Event->Height(), $scale).'"' : '' ?>
-            data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'
+            data-setup='{ "controls": true, "autoplay": true, "preload": "auto", "playbackRates": [ <?php echo implode(',',
+              array_map(function($r){return $r/100;},
+                array_filter(
+                  array_keys($rates),
+                  function($r){return $r >= 0 ? true : false;}
+                ))) ?>], "plugins": { "zoomrotate": { "zoom": "<?php echo $Zoom ?>"}}}'
           >
           <source src="<?php echo $Event->getStreamSrc(array('mode'=>'mpeg','format'=>'h264'),'&amp;'); ?>" type="video/mp4">
           <track id="monitorCaption" kind="captions" label="English" srclang="en" src='data:plain/text;charset=utf-8,"WEBVTT\n\n 00:00:00.000 --> 00:00:01.000 ZoneMinder"' default/>
@@ -240,7 +233,9 @@ if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
           <div class="progressBox" id="progressBox" title="" style="width: 0%;"></div>
         </div><!--progressBar-->
       </div><!--imageFeed-->
-<?php } /*end if !DefaultVideo*/ ?>
+<?php
+} /*end if !DefaultVideo*/
+?>
         <p id="dvrControls">
           <button type="button" id="prevBtn" title="<?php echo translate('Prev') ?>" class="inactive" data-on-click-true="streamPrev">
           <i class="material-icons md-18">skip_previous</i>
@@ -274,7 +269,7 @@ if ( (ZM_WEB_STREAM_METHOD == 'mpeg') && ZM_MPEG_LIVE_FORMAT ) {
           <span id="mode"><?php echo translate('Mode') ?>: <span id="modeValue">Replay</span></span>
           <span id="rate"><?php echo translate('Rate') ?>: 
 <?php 
-$rates = array( -800=>'-8x', -400=>'-4x', -200=>'-2x', -100=>'-1x', 0=>translate('Stop'), 100 => '1x', 200=>'2x', 400=>'4x', 800=>'8x' );
+#rates are defined in skins/classic/includes/config.php
 echo htmlSelect('rate', $rates, intval($rate), array('id'=>'rateValue'));
 ?>
 <!--<span id="rateValue"><?php echo $rate/100 ?></span>x</span>-->
@@ -282,44 +277,11 @@ echo htmlSelect('rate', $rates, intval($rate), array('id'=>'rateValue'));
           <span id="zoom"><?php echo translate('Zoom') ?>: <span id="zoomValue">1</span>x</span>
         </div>
       </div><!--eventVideo-->
-      <div id="eventStills" class="hidden">
-        <div id="eventThumbsPanel">
-          <div id="eventThumbs">
-          </div>
-        </div>
-        <div id="eventImagePanel">
-          <div id="eventImageFrame">
-            <img id="eventImage" src="graphics/transparent.png" alt=""/>
-            <div id="eventImageBar">
-              <div id="eventImageClose"><button type="button" data-on-click="hideEventImage"><?php echo translate('Close') ?></button></div>
-              <div id="eventImageStats" class="hidden"><button type="button" data-on-click="showFrameStats"><?php echo translate('Stats') ?></button></div>
-              <div id="eventImageData"><?php echo translate('Frame') ?> <span id="eventImageNo"></span></div>
-            </div>
-          </div>
-        </div>
-        <div id="eventImageNav">
-          <div id="thumbsSliderPanel">
-            <div id="alarmCue" class="alarmCue"></div>
-            <div id="thumbsSlider">
-              <div id="thumbsKnob">
-              </div>
-            </div>
-          </div>
-          <div id="eventImageButtons">
-            <div id="prevButtonsPanel">
-              <button id="prevEventBtn" type="button" data-on-click="prevEvent" disabled="disabled">&lt;E</button>
-              <button id="prevThumbsBtn" type="button" data-on-click="prevThumbs" disabled="disabled">&lt;&lt;</button>
-              <button id="prevImageBtn" type="button" data-on-click="prevImage" disabled="disabled">&lt;</button>
-              <button id="nextImageBtn" type="button" data-on-click="nextImage" disabled="disabled">&gt;</button>
-              <button id="nextThumbsBtn" type="button" data-on-click="nextThumbs" disabled="disabled">&gt;&gt;</button>
-              <button id="nextEventBtn" type="button" data-on-click="nextEvent" disabled="disabled">E&gt;</button>
-            </div>
-          </div>
-        </div>
-      </div>
 <?php
 } // end if Event exists
 ?>
+  </div>
     </div><!--content-->
+    
   </div><!--page-->
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php
index 584dae8d6..52cb5c3f0 100644
--- a/web/skins/classic/views/events.php
+++ b/web/skins/classic/views/events.php
@@ -42,73 +42,6 @@ if ( isset($_REQUEST['filter'])) {
 parseSort();
 
 $filterQuery = $filter->querystring();
-ZM\Logger::Debug('Filter '.print_r($filter, true));
-
-if ( $filter->sql() ) {
-  $eventsSql .= ' AND ('.$filter->sql().')';
-} else {
-  ZM\Warning('No filters');
-  exit;
-}
-$eventsSql .= ' ORDER BY '.$sortColumn.' '.$sortOrder;
-if ( $sortColumn != 'E.Id' ) $eventsSql .= ',E.Id '.$sortOrder;
-
-$page = isset($_REQUEST['page']) ? validInt($_REQUEST['page']) : 0;
-$limit = isset($_REQUEST['limit']) ? validInt($_REQUEST['limit']) : $filter['limit'];
-
-if ( $_POST ) {
-  // I think this is basically so that a refresh doesn't repost
-  ZM\Logger::Debug('Redirecting to ' . $_SERVER['REQUEST_URI']);
-  header('Location: ?view=' . $view.htmlspecialchars_decode($filterQuery).htmlspecialchars_decode($sortQuery).$limitQuery.'&page='.$page);
-  exit();
-}
-
-$failed = !$filter->test_pre_sql_conditions();
-if ( $failed ) {
-  ZM\Logger::Debug('Pre conditions failed, not doing sql');
-}
-
-$results = $failed ? null : dbQuery($eventsSql);
-
-$nEvents = $results ? $results->rowCount() : 0;
-if ( ! $results ) {
-  global $error_message;
-  $error_message = dbError($eventsSql);
-} 
-ZM\Logger::Debug("Pre conditions succeeded sql return $nEvents events");
-
-if ( !empty($limit) && ($nEvents > $limit) ) {
-  $nEvents = $limit;
-}
-$pages = (int)ceil($nEvents/ZM_WEB_EVENTS_PER_PAGE);
-#Logger::Debug("Page $page Limit $limit #vents: $nEvents pages: $pages ");
-if ( !empty($page) ) {
-  if ( $page < 0 )
-    $page = 1;
-  else if ( $pages and ( $page > $pages ) )
-    $page = $pages;
-
-  $limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);
-  if ( empty($limit) ) {
-    $limitAmount = ZM_WEB_EVENTS_PER_PAGE;
-  } else {
-    $limitLeft = $limit - $limitStart;
-    $limitAmount = ($limitLeft>ZM_WEB_EVENTS_PER_PAGE)?ZM_WEB_EVENTS_PER_PAGE:$limitLeft;
-  }
-  $eventsSql .= ' LIMIT '.$limitStart.', '.$limitAmount;
-} else if ( !empty($limit) ) {
-  $eventsSql .= ' LIMIT 0, '.$limit;
-}
-
-$maxShortcuts = 5;
-
-$focusWindow = true;
-
-$storage_areas = ZM\Storage::find();
-$StorageById = array();
-foreach ( $storage_areas as $S ) {
-  $StorageById[$S->Id()] = $S;
-}
 
 xhtmlHeaders(__FILE__, translate('Events'));
 getBodyTopHTML();
@@ -121,6 +54,7 @@ getBodyTopHTML();
       <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
       <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
       <button id="tlineBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('ShowTimeline') ?>" ><i class="fa fa-history"></i></button>
+      <button id="filterBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Filter') ?>"><i class="fa fa-filter"></i></button>
       <button id="viewBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('View') ?>" disabled><i class="fa fa-binoculars"></i></button>
       <button id="archiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Archive') ?>" disabled><i class="fa fa-archive"></i></button>
       <button id="unarchiveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Unarchive') ?>" disabled><i class="fa fa-file-archive-o"></i></button>
@@ -131,10 +65,12 @@ getBodyTopHTML();
     </div>
 
     <!-- Table styling handled by bootstrap-tables -->
-    <div class="row justify-content-center">
+    <div class="row justify-content-center table-responsive-sm">
       <table
         id="eventTable"
-        data-toggle="table"
+        data-locale="<?php echo i18n() ?>"
+        data-side-pagination="server"
+        data-ajax="ajaxRequest"
         data-pagination="true"
         data-show-pagination-switch="true"
         data-page-list="[10, 25, 50, 100, 200, All]"
@@ -151,9 +87,9 @@ getBodyTopHTML();
         data-show-fullscreen="true"
         data-click-to-select="true"
         data-maintain-meta-data="true"
-        data-mobile-responsive="true"
         data-buttons-class="btn btn-normal"
         data-show-jump-to="true"
+        data-show-refresh="true"
         class="table-sm table-borderless"
         style="display:none;"
       >
@@ -166,164 +102,25 @@ getBodyTopHTML();
               <th data-sortable="true" data-field="Archived"><?php echo translate('Archived') ?></th>
               <th data-sortable="true" data-field="Emailed"><?php echo translate('Emailed') ?></th>
               <th data-sortable="true" data-field="Monitor"><?php echo translate('Monitor') ?></th>
-              <th data-sortable="true" data-field="Cause"><?php echo translate('Cause') ?></th>
-              <th data-sortable="true" data-field="AttrStartTime"><?php echo translate('AttrStartTime') ?></th>
-              <th data-sortable="true" data-field="AttrEndTime"><?php echo translate('AttrEndTime') ?></th>
-              <th data-sortable="true" data-field="Duration"><?php echo translate('Duration') ?></th>
+              <th data-sortable="true" data-field="Cause" data-click-to-select="false"><?php echo translate('Cause') ?></th>
+              <th data-sortable="true" data-field="StartDateTime"><?php echo translate('AttrStartTime') ?></th>
+              <th data-sortable="true" data-field="EndDateTime"><?php echo translate('AttrEndTime') ?></th>
+              <th data-sortable="true" data-field="Length"><?php echo translate('Duration') ?></th>
               <th data-sortable="true" data-field="Frames"><?php echo translate('Frames') ?></th>
-              <th data-sortable="true" data-field="AlarmBrFrames"><?php echo translate('AlarmBrFrames') ?></th>
-              <th data-sortable="true" data-field="TotalBrScore"><?php echo translate('TotalBrScore') ?></th>
-              <th data-sortable="true" data-field="AvgBrScore"><?php echo translate('AvgBrScore') ?></th>
-              <th data-sortable="true" data-field="MaxBrScore"><?php echo translate('MaxBrScore') ?></th>
-<?php
-    if ( count($storage_areas) > 1 ) { 
-?>
-              <th data-sortable="true" data-field="Storage"><?php echo translate('Storage') ?></th>
-<?php
-    }
-    if ( ZM_WEB_EVENT_DISK_SPACE ) {
-?>
+              <th data-sortable="true" data-field="AlarmFrames"><?php echo translate('AlarmBrFrames') ?></th>
+              <th data-sortable="true" data-field="TotScore"><?php echo translate('TotalBrScore') ?></th>
+              <th data-sortable="true" data-field="AvgScore"><?php echo translate('AvgBrScore') ?></th>
+              <th data-sortable="true" data-field="MaxScore"><?php echo translate('MaxBrScore') ?></th>
+              <th data-sortable="false" data-field="Storage"><?php echo translate('Storage') ?></th>
               <th data-sortable="true" data-field="DiskSpace"><?php echo translate('DiskSpace') ?></th>
-<?php
-    }
-    if ( ZM_WEB_LIST_THUMBS ) {
-?>
               <th data-sortable="false" data-field="Thumbnail"><?php echo translate('Thumbnail') ?></th>
-<?php
-    }
-?>
             </tr>
-           </thead>
-           <tbody>
-<?php
-$count = 0;
-$disk_space_total = 0;
-if ( $results ) {
-  $events = array();
+          </thead>
 
-  while ( $event_row = dbFetchNext($results) ) {
-    $event = new ZM\Event($event_row);
-
-    if ( !$filter->test_post_sql_conditions($event) ) {
-      $event->remove_from_cache();
-      continue;
-    }
-    $events[] = $event;
-    if ( $limit and (count($events) >= $limit) ) {
-      break;
-    }
-    ZM\Logger::Debug("Have " . count($events) . " events, limit $limit");
-  }
-  foreach ( $events as $event ) {
-
-    $scale = max(reScale(SCALE_BASE, $event->DefaultScale(), ZM_WEB_DEFAULT_SCALE), SCALE_BASE);
-?>
-            <tr<?php echo $event->Archived() ? ' class="archived"' : '' ?>>
-              <td data-checkbox="true"></td>            
-              <td><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.$event->Id() ?></a></td>
-
-              <td><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.validHtmlStr($event->Name())?></a>
-              <?php 
-              $archived = $event->Archived() ? translate('Archived') : '';
-              $emailed = $event->Emailed() ? ' '.translate('Emailed') : '';
-              echo '<br/><div class="small text-nowrap text-muted">'.$archived.$emailed.'</div>';
-              ?>
-              </td>
-
-              <td class="text-center"><?php echo ( $event->Archived() ) ? 'Yes' : 'No' ?></td>
-              <td class="text-center"><?php echo ( $event->Emailed() ) ? 'Yes' : 'No' ?></td>
-              <td><?php echo makeLink( '?view=monitor&amp;mid='.$event->MonitorId(), $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
-              <td><?php echo makeLink( '#', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid=' .$event->Id(). '"') ?>
-              <?php
-              # display notes as small text
-              if ( $event->Notes() ) {
-                # if notes include detection objects, then link it to objdetect.jpg
-                if ( strpos($event->Notes(), 'detected:') !== false ) {
-                  # make a link
-                  echo makeLink( '?view=image&amp;eid='.$event->Id().'&amp;fid=objdetect', '<div class="small text-nowrap text-muted"><u>'.$event->Notes().'</u></div>');
-                } else if ( $event->Notes() != 'Forced Web: ' ) {
-                  echo '<br/><div class="small text-nowrap text-muted">'.$event->Notes().'</div>';
-                }
-              }
-              ?>
-              </td>
-              
-              <td><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime())) ?></td>
-              <td><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndTime())) ?></td>
-              <td><?php echo gmdate('H:i:s', $event->Length() ) ?></td>
-              <td><a href="?view=frames&amp;eid=<?php echo $event->Id() ?>"><?php echo $event->Frames() ?></a></td>
-              <td><a href="?view=frames&amp;eid=<?php echo $event->Id() ?>"><?php echo $event->AlarmFrames() ?></a></td>
-              <td><?php echo $event->TotScore() ?></td>
-              <td><?php echo $event->AvgScore() ?></td>
-              <td><?php echo makeLink('?view=frame&amp;eid='.$event->Id().'&amp;fid=0', $event->MaxScore()); ?></td>
-<?php
-  if ( count($storage_areas) > 1 ) { 
-?>
-              <td>
-<?php
-    if ( $event->StorageId() ) {
-      echo isset($StorageById[$event->StorageId()]) ? $StorageById[$event->StorageId()]->Name() : 'Unknown Storage Id: '.$event->StorageId();
-    } else {
-      echo 'Default';
-    }
-    if ( $event->SecondaryStorageId() ) {
-      echo '<br/>'.(isset($StorageById[$event->SecondaryStorageId()]) ? $StorageById[$event->SecondaryStorageId()]->Name() : 'Unknown Storage Id '.$event->SecondaryStorageId());
-    }
- ?>
-</td>
-          
-<?php
-  }
-  if ( ZM_WEB_EVENT_DISK_SPACE ) {
-    $disk_space_total += $event->DiskSpace();
-?>
-              <td class="colDiskSpace"><?php echo human_filesize($event->DiskSpace()) ?></td>
-<?php
-  }
-  if ( ZM_WEB_LIST_THUMBS ) {
-      echo '<td class="colThumbnail zoom">';
-      $imgSrc = $event->getThumbnailSrc(array(),'&amp;');
-      $streamSrc = $event->getStreamSrc(array(
-        'mode'=>'jpeg', 'scale'=>$scale, 'maxfps'=>ZM_WEB_VIDEO_MAXFPS, 'replay'=>'single', 'rate'=>'400'), '&amp;');
-
-      $imgHtml = '<img id="thumbnail'.$event->Id().'" src="'.$imgSrc.'" alt="'. validHtmlStr('Event '.$event->Id()) .'" style="width:'. validInt($event->ThumbnailWidth()) .'px;height:'. validInt($event->ThumbnailHeight()).'px;" stream_src="'.$streamSrc.'" still_src="'.$imgSrc.'"/>';
-      echo '<a href="?view=event&amp;eid='. $event->Id().$filterQuery.$sortQuery.'&amp;page=1">'.$imgHtml.'</a>';
-      echo '</td>';
-  } // end if ZM_WEB_LIST_THUMBS
-?>
-            </tr>
-<?php
-} # end foreach row
-?>
+          <tbody>
+          <!-- Row data populated via Ajax -->
           </tbody>
-<?php
-} # end if $results
-  if ( ZM_WEB_EVENT_DISK_SPACE ) {
-?>
-          <tfoot>
-            <tr>
-              <td colspan="11">Totals:</td>
-<?php
-  if ( count($storage_areas)>1 ) {
-?>
-              <td class="colStorage"></td>
-<?php
-}
-?>
-              <td class="colDiskSpace"><?php echo human_filesize($disk_space_total) ?></td>
-<?php
-  if ( ZM_WEB_LIST_THUMBS ) {
-?>
-              <td></td>
-<?php
-}
-?>
-              <td></td>
-            </tr>
-          </tfoot>
-<?php
-  }
-?>
+
         </table>
       </div>       
   </div>
diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php
index 6fdf0ebe2..cddd8cb29 100644
--- a/web/skins/classic/views/export.php
+++ b/web/skins/classic/views/export.php
@@ -56,17 +56,22 @@ if (isset($_REQUEST['exportFormat'])) {
 }
 
 $focusWindow = true;
-$connkey = isset($_REQUEST['connkey']) ? $_REQUEST['connkey'] : generateConnKey();
+$connkey = isset($_REQUEST['connkey']) ? validInt($_REQUEST['connkey']) : generateConnKey();
 
 xhtmlHeaders(__FILE__, translate('Export'));
 ?>
 <body>
   <div id="page">
     <?php echo getNavBarHTML() ?>
-    <div id="header">
-      <h2><?php echo translate('ExportOptions') ?></h2>
-    </div>
-    <div id="content">
+      <div class="w-100 py-1">
+        <div class="float-left pl-3">
+          <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+          <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+        </div>
+        <div class="w-100 pt-2">
+          <h2><?php echo translate('ExportOptions') ?></h2>
+        </div>
+      </div>    <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?view=export">
         <input type="hidden" name="connkey" value="<?php echo $connkey; ?>"/>
 <?php
@@ -138,21 +143,21 @@ $event_count = 0;
 while ( $event_row = dbFetchNext($results) ) {
   $event = new ZM\Event($event_row);
   $scale = max(reScale(SCALE_BASE, $event->Monitor()->DefaultScale(), ZM_WEB_DEFAULT_SCALE), SCALE_BASE);
+  $event_link = '?view=event&amp;eid='.$event->Id().$filterQuery.$sortQuery.'&amp;page=1';
 ?>
           <tr<?php echo $event->Archived() ? ' class="archived"' : '' ?>>
               <td class="colId">
                 <input type="hidden" name="eids[]" value="<?php echo $event->Id()?>"/>
-                <a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery ?>&amp;page=1"><?php echo $event->Id().($event->Archived()?'*':'') ?></a>
+                <a href="<?php echo $event_link ?>"><?php echo $event->Id().($event->Archived()?'*':'') ?></a>
               </td>
-              <td class="colName"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery ?>&amp;page=1"><?php echo validHtmlStr($event->Name()).($event->Archived()?'*':'') ?></a></td>
-              <td class="colMonitorName"><?php echo makeLink( '?view=monitor&amp;mid='.$event->MonitorId(), $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
-              <td class="colCause"><?php echo makeLink( '#', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid=' .$event->Id(). '"') ?></td>
-              <td class="colTime"><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime())) .
-( $event->EndTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndTime()) ) : '' ) ?>
-              </td>
-              <td class="colDuration"><?php echo gmdate("H:i:s", $event->Length() ) ?></td>
-              <td class="colFrames"><?php echo makeLink( '?view=frames&amp;eid='.$event->Id(), $event->Frames() ) ?></td>
-              <td class="colAlarmFrames"><?php echo makeLink( '?view=frames&amp;eid='.$event->Id(), $event->AlarmFrames() ) ?></td>
+              <td class="colName"><a href="<?php echo $event_link ?>"><?php echo validHtmlStr($event->Name()).($event->Archived()?'*':'') ?></a></td>
+              <td class="colMonitorName"><?php echo makeLink('?view=monitor&amp;mid='.$event->MonitorId(), $event->MonitorName(), canEdit('Monitors')) ?></td>
+              <td class="colCause"><?php echo makeLink($event_link, validHtmlStr($event->Cause()), canView('Events'), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid="'.$event->Id().'"') ?></td>
+              <td class="colTime"><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartDateTime())) .
+( $event->EndDateTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndDateTime())) : '' ) ?></td>
+              <td class="colDuration"><?php echo gmdate('H:i:s', $event->Length()) ?></td>
+              <td class="colFrames"><?php echo makeLink('?view=frames&amp;eid='.$event->Id(), $event->Frames()) ?></td>
+              <td class="colAlarmFrames"><?php echo makeLink('?view=frames&amp;eid='.$event->Id(), $event->AlarmFrames()) ?></td>
               <td class="colTotScore"><?php echo $event->TotScore() ?></td>
               <td class="colAvgScore"><?php echo $event->AvgScore() ?></td>
               <td class="colMaxScore"><?php echo $event->MaxScore() ?></td>
@@ -163,9 +168,7 @@ while ( $event_row = dbFetchNext($results) ) {
     echo '<td class="colDiskSpace">'.human_filesize($event->DiskSpace()).'</td>';
   }
   unset($event);
-  echo '
-</tr>
-';
+  echo PHP_EOL.'</tr>'.PHP_EOL;
 } # end foreach event
 ?>
         </tbody>
@@ -174,9 +177,7 @@ while ( $event_row = dbFetchNext($results) ) {
             <td colspan="11"><?php echo $event_count ?> events</td>
 <?php
   if ( ZM_WEB_EVENT_DISK_SPACE ) {
-?>
-            <td class="colDiskSpace"><?php echo human_filesize($disk_space_total);?></td>
-<?php
+    echo '<td class="colDiskSpace">'.human_filesize($disk_space_total).'</td>'.PHP_EOL;
   }
 ?>
           </tr>
diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 38ad3e88c..d16ebdef3 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -34,6 +34,13 @@ parseSort();
 $filterNames = array(''=>translate('ChooseFilter'));
 $filter = NULL;
 
+$fid = 0;
+if ( isset($_REQUEST['Id']) and $_REQUEST['Id'] ) {
+  $fid = validInt($_REQUEST['Id']);
+} else if ( isset($_REQUEST['filter']) and isset($_REQUEST['filter']['Id']) ) {
+  $fid = validInt($_REQUEST['filter']['Id']);
+}
+$filter = null;
 foreach ( ZM\Filter::find(null,array('order'=>'lower(Name)')) as $Filter ) {
   $filterNames[$Filter->Id()] = $Filter->Id() . ' ' . $Filter->Name();
   if ( $Filter->Background() )
@@ -41,19 +48,22 @@ foreach ( ZM\Filter::find(null,array('order'=>'lower(Name)')) as $Filter ) {
   if ( $Filter->Concurrent() )
     $filterNames[$Filter->Id()] .= '&';
 
-  if ( isset($_REQUEST['Id']) && ($_REQUEST['Id'] == $Filter->Id()) ) {
+  if ( $fid == $Filter->Id() ) {
     $filter = $Filter;
   }
 }
-if ( !$filter ) {
+if ( !$filter )  {
   $filter = new ZM\Filter();
-
-  if ( isset($_REQUEST['filter']) ) {
-    # Update our filter object with whatever changes we have made before saving
-    $filter->set($_REQUEST['filter']);
-  }
 }
 
+ZM\Debug('filter: ' . print_r($filter,true));
+if ( isset($_REQUEST['filter']) ) {
+  # Update our filter object with whatever changes we have made before saving
+  $filter->set($_REQUEST['filter']);
+  ZM\Debug("Setting filter from " . print_r($_REQUEST['filter'], true));
+}
+ZM\Debug('filter: ' . print_r($filter,true));
+
 $conjunctionTypes = ZM\getFilterQueryConjunctionTypes();
 $obracketTypes = array();
 $cbracketTypes = array();
@@ -79,8 +89,8 @@ $attrTypes = array(
     'Cause'       => translate('AttrCause'),
     'DiskBlocks'  => translate('AttrDiskBlocks'),
     'DiskPercent' => translate('AttrDiskPercent'),
-    'DiskSpace'   => translate('AttrDiskSpace'),
-    'EventDiskSpace'   => translate('AttrEventDiskSpace'),
+    #'StorageDiskSpace'   => translate('AttrStorageDiskSpace'),
+    'DiskSpace'   => translate('AttrEventDiskSpace'),
     'EndDateTime'    => translate('AttrEndDateTime'),
     'EndDate'        => translate('AttrEndDate'),
     'EndTime'        => translate('AttrEndTime'),
@@ -177,10 +187,10 @@ foreach ( dbFetchAll('SELECT Id, Name, MonitorId FROM Zones ORDER BY lower(`Name
 }
 
 xhtmlHeaders(__FILE__, translate('EventFilter'));
+echo getBodyTopHTML();
+echo $navbar = getNavBarHTML();
 ?>
-<body>
   <div id="page">
-<?php echo $navbar = getNavBarHTML(); ?>
     <div id="content">
       <form name="selectForm" id="selectForm" method="get" action="?">
         <input type="hidden" name="view" value="filter"/>
@@ -215,13 +225,13 @@ if ( (null !== $filter->Concurrent()) and $filter->Concurrent() )
         </p>
 <?php if ( ZM_OPT_USE_AUTH ) { ?>
         <p><label><?php echo translate('FilterUser') ?></label>
-          <?php 
+<?php 
             global $user;
-echo htmlSelect('filter[UserId]',
-  ZM\User::Indexed_By_Id(),
-  //ZM\User::find(),
-  $filter->UserId() ? $filter->UserId() : $user['Id']
-); ?>
+  echo htmlSelect('filter[UserId]',
+    ZM\User::Indexed_By_Id(),
+    $filter->UserId() ? $filter->UserId() : $user['Id']
+  );
+?>
         </p>
 <?php } ?>
         <p>
@@ -233,7 +243,7 @@ for ( $i=0; $i < count($terms); $i++ ) {
   if ( ! isset( $term['op'] ) )
     $term['op'] = '=';
   if ( ! isset( $term['attr'] ) )
-    $term['attr'] = '';
+    $term['attr'] = 'Id';
   if ( ! isset( $term['val'] ) )
     $term['val'] = '';
   if ( ! isset( $term['cnj'] ) )
@@ -345,7 +355,7 @@ for ( $i=0; $i < count($terms); $i++ ) {
               </td>
             </tr>
 <?php
-} # end foreach filter
+} # end foreach term
 ?>
           </tbody>
         </table>
@@ -356,6 +366,7 @@ for ( $i=0; $i < count($terms); $i++ ) {
               <td>
                 <label for="filter[Query][sort_field]"><?php echo translate('SortBy') ?></label>
                 <?php
+# Note: The keys need to be actual column names
 $sort_fields = array(
     'Id'            => translate('AttrId'),
     'Name'          => translate('AttrName'),
@@ -363,7 +374,7 @@ $sort_fields = array(
     'DiskSpace'     => translate('AttrDiskSpace'),
     'Notes'         => translate('AttrNotes'),
     'MonitorName'   => translate('AttrMonitorName'),
-    'StartDateTime' => translate('AttrStartDateTime'),
+    'StartTime'     => translate('AttrStartDateTime'),
     'Length'        => translate('AttrDuration'),
     'Frames'        => translate('AttrFrames'),
     'AlarmFrames'   => translate('AttrAlarmFrames'),
@@ -371,7 +382,7 @@ $sort_fields = array(
     'AvgScore'      => translate('AttrAvgScore'),
     'MaxScore'      => translate('AttrMaxScore'),
     );
-echo htmlSelect( 'filter[Query][sort_field]', $sort_fields, $filter->sort_field() );
+echo htmlSelect('filter[Query][sort_field]', $sort_fields, $filter->sort_field());
 $sort_dirns = array(
     '1' => translate('SortAsc'),
     '0'  => translate('SortDesc')
@@ -388,10 +399,15 @@ echo htmlSelect( 'filter[Query][sort_asc]', $sort_dirns, $filter->sort_asc() );
         </table>
         <hr/>
         <div id="actionsTable" class="filterTable">
+          <fieldset><legend><?php echo translate('Actions') ?></legend>
             <p>
               <label><?php echo translate('FilterArchiveEvents') ?></label>
               <input type="checkbox" name="filter[AutoArchive]" value="1"<?php if ( $filter->AutoArchive() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
+            <p>
+              <label><?php echo translate('FilterUnarchiveEvents') ?></label>
+              <input type="checkbox" name="filter[AutoUnarchive]" value="1"<?php if ( $filter->AutoUnarchive() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
+            </p>
             <p><label><?php echo translate('FilterUpdateDiskSpace') ?></label>
               <input type="checkbox" name="filter[UpdateDiskSpace]" value="1"<?php echo !$filter->UpdateDiskSpace() ? '' : ' checked="checked"' ?> data-on-click-this="updateButtons"/>
             </p>
@@ -418,20 +434,6 @@ if ( ZM_OPT_EMAIL ) {
               <label><?php echo translate('FilterEmailEvents') ?></label>
               <input type="checkbox" name="filter[AutoEmail]" value="1"<?php if ( $filter->AutoEmail() ) { ?> checked="checked"<?php } ?> data-on-click-this="click_AutoEmail"/>
             </p>
-						<div id="EmailOptions"<?php echo $filter->AutoEmail() ? '' : ' style="display:none;"' ?>>
-							<p>
-								<label><?php echo translate('FilterEmailTo') ?></label>
-								<input type="email" name="filter[EmailTo]" value="<?php echo validHtmlStr($filter->EmailTo()) ?>" multiple/>
-							</p>
-							<p>
-								<label><?php echo translate('FilterEmailSubject') ?></label>
-								<input type="text" name="filter[EmailSubject]" value="<?php echo validHtmlStr($filter->EmailSubject()) ?>"/>
-							</p>
-							<p>
-								<label><?php echo translate('FilterEmailBody') ?></label>
-								<textarea name="filter[EmailBody]"><?php echo validHtmlStr($filter->EmailBody()) ?></textarea>
-							</p>
-						</div>
 <?php
 }
 if ( ZM_OPT_MESSAGE ) {
@@ -462,6 +464,10 @@ if ( ZM_OPT_MESSAGE ) {
               <input type="checkbox" name="filter[AutoMove]" value="1"<?php if ( $filter->AutoMove() ) { ?> checked="checked"<?php } ?> data-on-click-this="click_automove"/>
               <?php echo htmlSelect('filter[AutoMoveTo]', $storageareas, $filter->AutoMoveTo(), $filter->AutoMove() ? null : array('style'=>'display:none;')); ?>
             </p>
+          </fieldset>
+        </div>
+        <div id="optionsTable" class="filterTable">
+          <fieldset><legend><?php echo translate('Options') ?></legend>
             <p>
               <label for="background"><?php echo translate('BackgroundFilter') ?></label>
               <input type="checkbox" id="filter[Background]" name="filter[Background]" value="1"<?php if ( $filter->Background() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
@@ -470,6 +476,31 @@ if ( ZM_OPT_MESSAGE ) {
               <label for="Concurrent"><?php echo translate('ConcurrentFilter') ?></label>
               <input type="checkbox" id="filter[Concurrent]" name="filter[Concurrent]" value="1"<?php if ( $filter->Concurrent() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
             </p>
+            <p>
+              <label for="LockRows"><?php echo translate('FilterLockRows') ?></label>
+              <input type="checkbox" id="filter[LockRows]" name="filter[LockRows]" value="1"<?php if ( $filter->LockRows() ) { ?> checked="checked"<?php } ?> data-on-click-this="updateButtons"/>
+            </p>
+<?php
+if ( ZM_OPT_EMAIL ) {
+?>
+            <div id="EmailOptions"<?php echo $filter->AutoEmail() ? '' : ' style="display:none;"' ?>>
+              <p>
+                <label><?php echo translate('FilterEmailTo') ?></label>
+                <input type="email" name="filter[EmailTo]" value="<?php echo validHtmlStr($filter->EmailTo()) ?>" multiple/>
+              </p>
+              <p>
+                <label><?php echo translate('FilterEmailSubject') ?></label>
+                <input type="text" name="filter[EmailSubject]" value="<?php echo validHtmlStr($filter->EmailSubject()) ?>"/>
+              </p>
+              <p>
+                <label><?php echo translate('FilterEmailBody') ?></label>
+                <textarea name="filter[EmailBody]"><?php echo validHtmlStr($filter->EmailBody()) ?></textarea>
+              </p>
+            </div>
+<?php
+}
+?>
+          </fieldset>
         </div>
         <hr/>
         <div id="contentButtons">
diff --git a/web/skins/classic/views/frame.php b/web/skins/classic/views/frame.php
index dc9ef9c4f..bdd2e1071 100644
--- a/web/skins/classic/views/frame.php
+++ b/web/skins/classic/views/frame.php
@@ -49,7 +49,7 @@ $prevFid = $fid-1;
 $nextFid = $fid+1;
 $lastFid = $maxFid;
 
-$alarmFrame = $Frame->Type() == 'Alarm';
+$alarmFrame = ( $Frame->Type() == 'Alarm' ) ? 1 : 0;
 
 if ( isset($_REQUEST['scale']) ) {
   $scale = validNum($_REQUEST['scale']);
@@ -71,7 +71,10 @@ if ( !$imageData ) {
 $show = 'capt';
 if (isset($_REQUEST['show']) && in_array($_REQUEST['show'], array('capt', 'anal'))) {
   $show = $_REQUEST['show'];
-} else if ( $imageData['hasAnalImage'] ) {
+  if ($show == 'anal' and ! $imageData['hasAnalImage']) {
+    $show = 'capt';
+  }
+} else if ($imageData['hasAnalImage']) {
   $show = 'anal';
 }
 
@@ -92,18 +95,26 @@ xhtmlHeaders(__FILE__, translate('Frame').' - '.$Event->Id().' - '.$Frame->Frame
         <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
         <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
         <button id="statsBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Stats') ?>" ><i class="fa fa-info"></i></button>
+        <button id="statsViewBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Stats').' '.translate('View') ?>" ><i class="fa fa-table"></i></button>
       </div>
       
       <h2><?php echo translate('Frame') ?> <?php echo $Event->Id().'-'.$Frame->FrameId().' ('.$Frame->Score().')' ?></h2>
       
       <form>
-        <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo htmlSelect('scale', $scales, $scale); ?></div>        
+        <div id="scaleControl"><label for="scale"><?php echo translate('Scale') ?></label><?php echo htmlSelect('scale', $scales, $scale, array('data-on-change'=>'changeScale','id'=>'scale')); ?></div>        
         <input type="hidden" name="base_width" id="base_width" value="<?php echo $Event->Width(); ?>"/>
         <input type="hidden" name="base_height" id="base_height" value="<?php echo $Event->Height(); ?>"/>
       </form>
     </div>
     
-  <div id="content">
+  <div id="content" class="d-flex flex-row justify-content-center">
+  
+
+  <table id="frameStatsTable" class="table-sm table-borderless pr-3">
+  <!-- FRAME STATISTICS POPULATED BY AJAX -->
+  </table>
+  
+  <div>
     <p id="image">
 <?php if ( $imageData['hasAnalImage'] ) {
  echo sprintf('<a href="?view=frame&amp;eid=%d&amp;fid=%d&scale=%d&amp;show=%s">', $Event->Id(), $Frame->FrameId(), $scale, ( $show=='anal'?'capt':'anal' ) );
@@ -152,6 +163,7 @@ if ( file_exists($rImagePath) ) {
           class="<?php echo $imageData['imageClass'] ?>"
         />
       </p>
+    </div>
 <?php } ?>
     </div>
   </div>
diff --git a/web/skins/classic/views/frames.php b/web/skins/classic/views/frames.php
index 3c2ad9277..4c902c739 100644
--- a/web/skins/classic/views/frames.php
+++ b/web/skins/classic/views/frames.php
@@ -28,87 +28,6 @@ require_once('includes/Filter.php');
 
 $eid = validInt($_REQUEST['eid']);
 $Event = new ZM\Event($eid);
-$Monitor = $Event->Monitor();
-
-$countSql = 'SELECT COUNT(*) AS FrameCount FROM Frames AS F WHERE 1 ';
-$frameSql = 'SELECT *, unix_timestamp(TimeStamp) AS UnixTimeStamp FROM Frames AS F WHERE 1 ';
-
-// override the sort_field handling in parseSort for frames
-if ( empty($_REQUEST['sort_field']) )
-  $_REQUEST['sort_field'] = 'FramesTimeStamp';
-
-if ( !isset($_REQUEST['sort_asc']) )
-  $_REQUEST['sort_asc'] = true;
-
-if ( !isset($_REQUEST['filter']) ) {
-  // generate a dummy filter from the eid for pagination
-  $_REQUEST['filter'] = array('Query' => array('terms' => array()));
-  $_REQUEST['filter'] = addFilterTerm(
-    $_REQUEST['filter'],
-    0,
-    array( 'cnj' => 'and', 'attr' => 'FramesEventId', 'op' => '=', 'val' => $eid )
-  );
-}
-
-parseSort();
-$filter = ZM\Filter::parse($_REQUEST['filter']);
-$filterQuery = $filter->querystring();
-
-if ( $filter->sql() ) {
-  $countSql .= ' AND ('.$filter->sql().')';
-  $frameSql .= ' AND ('.$filter->sql().')';
-}
-
-$frameSql .= " ORDER BY $sortColumn $sortOrder";
-if ( $sortColumn != 'Id' )
-  $frameSql .= ',Id '.$sortOrder;
-
-if ( isset($_REQUEST['scale']) ) {
-  $scale = validNum($_REQUEST['scale']);
-} else if ( isset($_COOKIE['zmWatchScale'.$Monitor->Id()]) ) {
-  $scale = validNum($_COOKIE['zmWatchScale'.$Monitor->Id()]);
-} else if ( isset($_COOKIE['zmWatchScale']) ) {
-  $scale = validNum($_COOKIE['zmWatchScale']);
-} else {
-  $scale = max(reScale(SCALE_BASE, $Monitor->DefaultScale(), ZM_WEB_DEFAULT_SCALE), SCALE_BASE);
-}
-
-$page = isset($_REQUEST['page']) ? validInt($_REQUEST['page']) : 1;
-$limit = isset($_REQUEST['limit']) ? validInt($_REQUEST['limit']) : 0;
-
-$nFrames = dbFetchOne($countSql, 'FrameCount');
-
-if ( !empty($limit) && ($nFrames > $limit) ) {
-  $nFrames = $limit;
-}
-
-$pages = (int)ceil($nFrames/ZM_WEB_EVENTS_PER_PAGE);
-
-if ( !empty($page) ) {
-  if ( $page <= 0 )
-    $page = 1;
-  else if ( $pages and ( $page > $pages ) )
-    $page = $pages;
-
-  $limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);
-  if ( empty($limit) ) {
-    $limitAmount = ZM_WEB_EVENTS_PER_PAGE;
-  } else {
-    $limitLeft = $limit - $limitStart;
-    $limitAmount = ($limitLeft>ZM_WEB_EVENTS_PER_PAGE)?ZM_WEB_EVENTS_PER_PAGE:$limitLeft;
-  }
-  $frameSql .= " LIMIT $limitStart, $limitAmount";
-} else if ( !empty($limit) ) {
-  $frameSql .= ' LIMIT 0, '.$limit;
-}
-
-$maxShortcuts = 5;
-$totalQuery = $sortQuery.'&amp;eid='.$eid.$limitQuery.$filterQuery;
-$pagination = getPagination($pages, $page, $maxShortcuts, $totalQuery);
-
-$frames = dbFetchAll($frameSql);
-
-$focusWindow = true;
 
 xhtmlHeaders(__FILE__, translate('Frames').' - '.$Event->Id());
 ?>
@@ -122,10 +41,12 @@ xhtmlHeaders(__FILE__, translate('Frames').' - '.$Event->Id());
     </div>
 
     <!-- Table styling handled by bootstrap-tables -->
-    <div class="row justify-content-center">      
+    <div class="row justify-content-center table-responsive-sm">      
       <table
         id="framesTable"
-        data-toggle="table"
+        data-locale="<?php echo i18n() ?>"
+        data-side-pagination="server"
+        data-ajax="ajaxRequest"
         data-pagination="true"
         data-show-pagination-switch="true"
         data-page-list="[10, 25, 50, 100, 200, All]"
@@ -139,12 +60,12 @@ xhtmlHeaders(__FILE__, translate('Frames').' - '.$Event->Id());
         data-toolbar="#toolbar"
         data-show-fullscreen="true"
         data-maintain-meta-data="true"
-        data-mobile-responsive="true"
         data-buttons-class="btn btn-normal"
         data-detail-view="true"
         data-detail-formatter="detailFormatter"
         data-show-toggle="true"
         data-show-jump-to="true"
+        data-show-refresh="true"
         class="table-sm table-borderless">
 
         <thead>
@@ -152,57 +73,16 @@ xhtmlHeaders(__FILE__, translate('Frames').' - '.$Event->Id());
           <tr>
             <th class="px-3" data-align="center" data-sortable="false" data-field="EventId"><?php echo translate('EventId') ?></th>
             <th class="px-3" data-align="center" data-sortable="true" data-field="FrameId"><?php echo translate('FrameId') ?></th>
-            <th class="px-3" data-align="center" data-sortable="true" data-field="FrameType"><?php echo translate('Type') ?></th>
-            <th class="px-3" data-align="center" data-sortable="true" data-field="FrameTimeStamp"><?php echo translate('TimeStamp') ?></th>
-            <th class="px-3" data-align="center" data-sortable="true" data-field="FrameDelta"><?php echo translate('TimeDelta') ?></th>
-            <th class="px-3" data-align="center" data-sortable="true" data-field="FrameScore"><?php echo translate('Score') ?></th>
-<?php
-        if ( ZM_WEB_LIST_THUMBS ) {
-?>
+            <th class="px-3" data-align="center" data-sortable="true" data-field="Type"><?php echo translate('Type') ?></th>
+            <th class="px-3" data-align="center" data-sortable="true" data-field="TimeStamp"><?php echo translate('TimeStamp') ?></th>
+            <th class="px-3" data-align="center" data-sortable="true" data-field="Delta"><?php echo translate('TimeDelta') ?></th>
+            <th class="px-3" data-align="center" data-sortable="true" data-field="Score"><?php echo translate('Score') ?></th>
             <th class="px-3" data-align="center" data-sortable="false" data-field="Thumbnail"><?php echo translate('Thumbnail') ?></th>
-<?php
-        }
-?>
           </tr>
         </thead>
         <tbody>
-<?php
-if ( count($frames) ) {
-  foreach ( $frames as $frame ) {
-    $Frame = new ZM\Frame($frame);
-?>
-            <tr class="<?php echo strtolower($frame['Type']) ?>">
-              <td><?php echo $frame['EventId'] ?></td>
-              <td><?php echo $frame['FrameId'] ?></td>
-              <td><?php echo $frame['Type'] ?></td>
-              <td><?php echo strftime(STRF_FMT_TIME, $frame['UnixTimeStamp']) ?></td>
-              <td><?php echo number_format( $frame['Delta'], 2 ) ?></td>
-              <td><?php echo $frame['Score'] ?></td>
-<?php
-    if ( ZM_WEB_LIST_THUMBS ) {
-      $base_img_src = '?view=image&amp;fid=' .$Frame->Id();
-      $thmb_width = ZM_WEB_LIST_THUMB_WIDTH ? 'width='.ZM_WEB_LIST_THUMB_WIDTH : '';
-      $thmb_height = ZM_WEB_LIST_THUMB_HEIGHT ? 'height='.ZM_WEB_LIST_THUMB_HEIGHT : '';
-      $thmb_fn = 'filename=' .$Event->MonitorId(). '_' .$frame['EventId']. '_' .$frame['FrameId']. '.jpg';
-      $img_src = join('&amp;', array_filter(array($base_img_src, $thmb_width, $thmb_height, $thmb_fn)));
-      $full_img_src = join('&amp;', array_filter(array($base_img_src, $thmb_fn)));
-      $frame_src = '?view=frame&amp;eid=' .$Event->Id(). '&amp;fid=' .$frame['FrameId'];
-      
-      echo '<td class="colThumbnail zoom"><img src="' .$img_src. '" '.$thmb_width. ' ' .$thmb_height. 'img_src="' .$img_src. '" full_img_src="' .$full_img_src. '"></td>'.PHP_EOL;
-		}
-?>
-            </tr>
-<?php
-  } // end foreach frame
-} else {
-?>
-            <tr>
-              <td colspan="5"><?php echo translate('NoFramesRecorded') ?></td>
-            </tr>
-<?php
-}
-?>
-          </tbody>
+          <!-- Row data populated via Ajax -->
+        </tbody>
         </table>
       </div>
   </div>
diff --git a/web/skins/classic/views/group.php b/web/skins/classic/views/group.php
deleted file mode 100644
index 4b9ca6152..000000000
--- a/web/skins/classic/views/group.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-//
-// ZoneMinder web group detail view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canEdit('Groups') ) {
-  $view = 'error';
-  return;
-}
-
-if ( !empty($_REQUEST['gid']) ) {
-  $newGroup = new ZM\Group($_REQUEST['gid']);
-} else {
-  $newGroup = new ZM\Group();
-}
-
-xhtmlHeaders(__FILE__, translate('Group').' - '.$newGroup->Name());
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Group') ?> - <?php echo validHtmlStr($newGroup->Name()); ?></h2>
-    </div>
-    <div id="content">
-      <form id="groupForm" name="groupForm" method="post" action="?">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="gid" value="<?php echo $newGroup->Id() ?>"/>
-        <table id="contentTable" class="major">
-          <tbody>
-            <tr>
-              <th scope="row"><?php echo translate('Name') ?></th>
-              <td><input type="text" name="newGroup[Name]" value="<?php echo validHtmlStr($newGroup->Name()) ?>" data-on-input="configureButtons"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('ParentGroup') ?></th>
-              <td>
-<?php
-$Groups = array();
-foreach ( ZM\Group::find() as $Group ) {
-  $Groups[$Group->Id()] = $Group;
-}
-
-# This  array is indexed by parent_id
-$children = array();
-
-foreach ( $Groups as $id=>$Group ) {
-  if ( $Group->ParentId() != null ) {
-    if ( ! isset( $children[$Group->ParentId()] ) )
-      $children[$Group->ParentId()] = array();
-    $children[$Group->ParentId()][] = $Group;
-  }
-}
-
-function get_Id( $G ) {
-  return $G->Id();
-}
-
-function get_children($Group) {
-  global $children;
-
-  $kids = array();
-  if ( isset( $children[$Group->Id()] ) ) {
-    $kids += array_map('get_Id', $children[$Group->Id()]);
-    foreach ( $children[$Group->Id()] as $G ) {
-      foreach ( get_children($G) as $id ) {
-        $kids[] = $id;
-      }
-    }
-  }
-  return $kids;
-}
-
-$kids = get_children($newGroup);
-if ( $newGroup->Id() )
-  $kids[] = $newGroup->Id();
-$sql = 'SELECT Id,Name FROM `Groups`'.(count($kids)?' WHERE Id NOT IN ('.implode(',',array_map(function(){return '?';}, $kids)).')' : '').' ORDER BY Name';
-$options = array(''=>'None');
-foreach ( dbFetchAll($sql, null, $kids) as $option ) {
-  $options[$option['Id']] = str_repeat('&nbsp;&nbsp;', $Groups[$option['Id']]->depth()) . $option['Name'];
-}
-echo htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('data-on-change'=>'configureButtons'));
-?>
-              </td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Monitor') ?></th>
-              <td>
-                <select name="newGroup[MonitorIds][]" class="chosen" multiple="multiple" data-on-change="configureButtons">
-<?php
-  $monitors = dbFetchAll('SELECT Id,Name FROM Monitors ORDER BY Sequence ASC');
-  $monitorIds = $newGroup->MonitorIds();
-  foreach ( $monitors as $monitor ) {
-    if ( visibleMonitor($monitor['Id']) ) {
-?>
-                  <option value="<?php echo $monitor['Id'] ?>"<?php if ( in_array( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($monitor['Name']) ?></option>
-<?php
-    }
-  }
-?>
-                </select>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <div id="contentButtons">
-          <button type="submit" name="action" value="Save"<?php $newGroup->Id() ? '' : ' disabled="disabled"'?>>
-          <?php echo translate('Save') ?>
-          </button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-  <script nonce="<?php echo $cspNonce;?>">$j('.chosen').chosen();</script>
-<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/js/add_monitors.js b/web/skins/classic/views/js/add_monitors.js
index be46dc3c2..fcf45ca37 100644
--- a/web/skins/classic/views/js/add_monitors.js
+++ b/web/skins/classic/views/js/add_monitors.js
@@ -1,15 +1,13 @@
-
-var probeReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getProbeResponse} );
+var ProbeResults;
 
 function probe( url_e ) {
-  probeReq.send( "request=add_monitors&action=probe&url="+url_e.value );
+  $j.getJSON(thisUrl + '?view=request&request=add_monitors&action=probe&url=' + url_e.value)
+      .done(getProbeResponse)
+      .fail(logAjaxFail);
 }
 
-var ProbeResults;
-
 function getProbeResponse( respObj, respText ) {
   if ( checkStreamForErrors( "getProbeResponse", respObj ) ) {
-    console.log(respText);
     return;
   }
 
@@ -66,7 +64,7 @@ function addMonitor(url) {
   var Monitor = Stream.Monitor;
 
   var mid = Monitor.Id ? Monitor.Id : '';
-  popup_url = '?view=monitor&mid='+mid+'&newMonitor[Path]='+url;
+  urlString = '?view=monitor&mid='+mid+'&newMonitor[Path]='+url;
   keys = Object.keys( Monitor );
   for ( i in Monitor ) {
     if ( ! Monitor[i] ) {
@@ -75,15 +73,14 @@ function addMonitor(url) {
     if ( Monitor[i] == 'null' ) {
       Monitor[i]='';
     }
-    popup_url += '&newMonitor['+i+']='+Monitor[i];
+    urlString += '&newMonitor['+i+']='+Monitor[i];
   }
-  createPopup( popup_url, 'zmMonitor'+mid, 'monitor' );
+  window.location.assign( urlString );
 }
 
 function import_csv( form ) {
   var formData = new FormData( form );
   console.log(formData);
-  //formData.append('file', $('#file')[0].files[0]);
 
   $j.ajax({
     url: thisUrl+"?request=add_monitors&action=import",
@@ -91,16 +88,19 @@ function import_csv( form ) {
     data: formData,
     processData: false, // tell jQuery not to process the data
     contentType: false, // tell jQuery not to set contentType
-    success: function(data) {
+    done: function(data) {
       var json = JSON.parse(data);
       parseStreams( json.Streams );
     }
   });
 }
+
 function initPage() {
-  url = $j('#Url')[0];
+  var url = $j('#Url')[0];
+
   if ( url.value ) {
     probe(url);
   }
 }
-window.addEventListener( 'DOMContentLoaded', initPage );
+
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js
index 522a6910e..a24cdbc22 100644
--- a/web/skins/classic/views/js/console.js
+++ b/web/skins/classic/views/js/console.js
@@ -1,29 +1,10 @@
-function thumbnail_onmouseover(event) {
-  var img = event.target;
-  img.src = '';
-  img.src = img.getAttribute('stream_src');
-}
-
-function thumbnail_onmouseout(event) {
-  var img = event.target;
-  img.src = '';
-  img.src = img.getAttribute('still_src');
-}
-
-function initThumbAnimation() {
-  $j('.colThumbnail img').each(function() {
-    this.addEventListener('mouseover', thumbnail_onmouseover, false);
-    this.addEventListener('mouseout', thumbnail_onmouseout, false);
-  });
-}
-
-function setButtonStates( element ) {
+function setButtonStates(element) {
   var form = element.form;
   var checked = 0;
   for ( var i=0; i < form.elements.length; i++ ) {
     if (
-      form.elements[i].type=="checkbox" &&
-      form.elements[i].name=="markMids[]"
+      form.elements[i].type == "checkbox" &&
+      form.elements[i].name == "markMids[]"
     ) {
       var tr = $j(form.elements[i]).closest("tr");
       if ( form.elements[i].checked ) {
@@ -41,10 +22,10 @@ function setButtonStates( element ) {
     if ( checked == 1 ) {
       $j(form.cloneBtn).css('display', 'inline');
     } else {
-      form.cloneBtn.hide();
+      $j(form.cloneBtn).hide();
     }
   } else {
-    form.cloneBtn.hide();
+    $j(form.cloneBtn).hide();
     form.editBtn.disabled = true;
     form.deleteBtn.disabled = true;
     form.selectBtn.disabled = true;
@@ -85,10 +66,6 @@ function editMonitor( element ) {
       form.elements[i].checked
     ) {
       monitorIds.push( form.elements[i].value );
-      //form.elements[i].checked = false;
-      //setButtonStates( form.elements[i] );
-      //$(form.elements[i]).getParent( 'tr' ).removeClass( 'highlight' );
-      //break;
     }
   } // end foreach checkboxes
   if ( monitorIds.length == 1 ) {
@@ -127,13 +104,88 @@ function reloadWindow() {
   window.location.replace( thisUrl );
 }
 
-function initPage() {
-  reloadWindow.periodical(consoleRefreshTimeout);
-  if ( showVersionPopup ) {
-    window.location.assign('?view=version');
+// Manage the the Function modal and its buttons
+function manageFunctionModal(evt) {
+  evt.preventDefault();
+
+  if ( !canEdit.Events ) {
+    enoperm();
+    return;
   }
+
+  if ( ! $j('#modalFunction').length ) {
+    // Load the Function modal on page load
+    $j.getJSON(thisUrl + '?request=modal&modal=function')
+        .done(function(data) {
+          insertModalHtml('modalFunction', data.html);
+          // Manage the CANCEL modal buttons
+          $j('.funcCancelBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#modalFunction').modal('hide');
+          });
+          // Manage the SAVE modal buttons
+          $j('.funcSaveBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#function_form').submit();
+          });
+
+          manageFunctionModal(evt);
+        })
+        .fail(logAjaxFail);
+    return;
+  }
+
+  var mid = evt.currentTarget.getAttribute('data-mid');
+  monitor = monitors[mid];
+  if ( !monitor ) {
+    console.error("No monitor found for mid " + mid);
+    return;
+  }
+
+  var function_form = document.getElementById('function_form');
+  if ( !function_form ) {
+    console.error("Unable to find form with id function_form");
+    return;
+  }
+  function_form.elements['newFunction'].onchange=function() {
+    $j('#function_help div').hide();
+    $j('#'+this.value+'Help').show();
+    if ( this.value == 'Monitor' || this.value == 'None' ) {
+      $j('#FunctionAnalysisEnabled').hide();
+    } else {
+      $j('#FunctionAnalysisEnabled').show();
+    }
+    if ( this.value == 'Record' || this.value == 'Nodect' ) {
+      $j('#FunctionDecodingEnabled').show();
+    } else {
+      $j('#FunctionDecodingEnabled').hide();
+    }
+  };
+  function_form.elements['newFunction'].value = monitor.Function;
+  function_form.elements['newFunction'].onchange();
+
+  function_form.elements['newEnabled'].checked = monitor.Enabled == '1';
+  function_form.elements['newDecodingEnabled'].checked = monitor.DecodingEnabled == '1';
+  function_form.elements['mid'].value = mid;
+  document.getElementById('function_monitor_name').innerHTML = monitor.Name;
+
+  $j('#modalFunction').modal('show');
+} // end function manageFunctionModal
+
+function initPage() {
+  setInterval(reloadWindow, consoleRefreshTimeout);
   if ( showDonatePopup ) {
-    $j('#donate').modal('show');
+    $j.getJSON(thisUrl + '?request=modal&modal=donate')
+        .done(function(data) {
+          insertModalHtml('donate', data.html);
+          $j('#donate').modal('show');
+          // Manage the Apply button
+          $j('#donateApplyBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#donateForm').submit();
+          });
+        })
+        .fail(logAjaxFail);
   }
 
   // Makes table sortable
@@ -148,62 +200,15 @@ function initPage() {
   // Setup the thumbnail video animation
   initThumbAnimation();
 
-  $j('.functionLnk').click(function(evt) {
-    evt.preventDefault();
-    if ( !canEditEvents ) {
-      enoperm();
-      return;
-    }
-    var mid = evt.currentTarget.getAttribute('data-mid');
-    monitor = monitors[mid];
-    if ( !monitor ) {
-      console.error("No monitor found for mid " + mid);
-      return;
-    }
-
-    var function_form = document.getElementById('function_form');
-    if ( !function_form ) {
-      console.error("Unable to find form with id function_form");
-      return;
-    }
-    function_form.elements['newFunction'].value = monitor.Function;
-    function_form.elements['newEnabled'].checked = monitor.Enabled == '1';
-    function_form.elements['mid'].value = mid;
-    document.getElementById('function_monitor_name').innerHTML = monitor.Name;
-
-    $j('#modalFunction').modal('show');
-  });
-  // Manage the CANCEL modal buttons
-  $j('.funcCancelBtn').click(function(evt) {
-    evt.preventDefault();
-    $j('#modalFunction').modal('hide');
-  });
-
-  // Manage the SAVE modal buttons
-  $j('.funcSaveBtn').click(function(evt) {
-    evt.preventDefault();
-    var form = evt.currentTarget.form;
-    var mid = form.elements['mid'].value;
-    var newFunc = $j('#newFunction').val();
-    var newEnabled = $j('#newEnabled').is(':checked') ? 1 : 0;
-    $j.getJSON(thisUrl + '?view=function&action=function&mid='+mid+'&newFunction='+newFunc+'&newEnabled='+newEnabled)
-        .done(window.location.reload(true))
-        .fail(function(jqxhr, textStatus, error) {
-          console.log("Request Failed: " + textStatus + ", " + error);
-          console.log("Response Text: " + jqxhr.responseText);
-        });
-  });
-}
+  $j('.functionLnk').click(manageFunctionModal);
+} // end function initPage
 
 function applySort(event, ui) {
   var monitor_ids = $j(this).sortable('toArray');
-  var ajax = new Request.JSON( {
-    url: 'index.php?request=console',
-    data: {monitor_ids: monitor_ids, action: 'sort'},
-    method: 'post',
-    timeout: AJAX_TIMEOUT
-  } );
-  ajax.send();
+  var data = {monitor_ids: monitor_ids, action: 'sort'};
+
+  $j.post(thisUrl + '?request=console', data)
+      .fail(logAjaxFail);
 } // end function applySort(event,ui)
 
-window.addEventListener( 'DOMContentLoaded', initPage );
+$j(document).ready(initPage );
diff --git a/web/skins/classic/views/js/console.js.php b/web/skins/classic/views/js/console.js.php
index 6ef6c199c..736d1611f 100644
--- a/web/skins/classic/views/js/console.js.php
+++ b/web/skins/classic/views/js/console.js.php
@@ -1,26 +1,15 @@
 var consoleRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_MAIN ?>;
 
 <?php
-if ( canEdit('System') ) {
-  if ( ZM_CHECK_FOR_UPDATES && ZM_DYN_LAST_VERSION && ( verNum(ZM_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( verNum(ZM_DYN_CURR_VERSION) < verNum(ZM_DYN_LAST_VERSION) ) && ( ZM_DYN_NEXT_REMINDER < time() ) ) {
-    $showVersionPopup = true;
-    $nextReminder = time() + 60*60;
-    // limit popups to one per hour instead of on every console refresh.
-    dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_NEXT_REMINDER'");
-
-  } else if ( ZM_DYN_SHOW_DONATE_REMINDER ) {
-    if ( ZM_DYN_DONATE_REMINDER_TIME > 0 ) {
-      if ( ZM_DYN_DONATE_REMINDER_TIME < time() ) {
-        $showDonatePopup = true;
-      }
-    } else {
-      $nextReminder = time() + 30*24*60*60;
-      dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'");
-    }
+if ( canEdit('System') && ZM_DYN_SHOW_DONATE_REMINDER ) {
+  if ( ZM_DYN_DONATE_REMINDER_TIME > 0 ) {
+    if ( ZM_DYN_DONATE_REMINDER_TIME < time() ) $showDonatePopup = true;
+  } else {
+    $nextReminder = time() + 30*24*60*60;
+    dbQuery("UPDATE Config SET Value = '".$nextReminder."' WHERE Name = 'ZM_DYN_DONATE_REMINDER_TIME'");
   }
-} // end if canEdit('System')
+}
 ?>
-var showVersionPopup = <?php echo isset($showVersionPopup )?'true':'false' ?>;
 var showDonatePopup = <?php echo isset($showDonatePopup )?'true':'false' ?>;
 var monitors = new Array();
 <?php
@@ -35,7 +24,8 @@ var monitors = new Array();
   'Url': '<?php echo $monitor->UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
   'Type': '<?php echo $monitor->Type() ?>',
   'Function': '<?php echo $monitor->Function() ?>',
-  'Enabled': '<?php echo $monitor->Enabled() ?>'
+  'Enabled': '<?php echo $monitor->Enabled() ?>',
+  'DecodingEnabled': '<?php echo $monitor->DecodingEnabled() ?>'
 };
 <?php
   }
diff --git a/web/skins/classic/views/js/control.js b/web/skins/classic/views/js/control.js
index 35082bc43..e3f73a8af 100644
--- a/web/skins/classic/views/js/control.js
+++ b/web/skins/classic/views/js/control.js
@@ -1,43 +1,62 @@
-var controlParms = "view=request&request=control";
-var controlReq = new Request.JSON( {url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, onSuccess: getControlResponse} );
+var form = $j('#controlForm');
 
-function getControlResponse( respObj, respText ) {
+function controlReq(data) {
+  $j.getJSON(thisUrl + '?view=request&request=control', data)
+      .done(getControlResponse)
+      .fail(logAjaxFail);
+}
+
+function getControlResponse(respObj, respText) {
   if ( !respObj ) {
     return;
   }
   //console.log( respText );
   if ( respObj.result != 'Ok' ) {
-    alert( "Control response was status = "+respObj.status+"\nmessage = "+respObj.message );
+    alert("Control response was status = "+respObj.status+"\nmessage = "+respObj.message);
   }
 }
 
 function controlCmd( control, event, xtell, ytell ) {
-  var locParms = "&id="+$('mid').get('value');
-  if ( event && (xtell || ytell) ) {
-    var target = event.target;
-    var coords = $(target).getCoordinates();
+  var mid = $j('#mid').getAttribute('value');
 
-    var x = event.pageX - coords.left;
-    var y = event.pageY - coords.top;
+  if ( event && (xtell || ytell) ) {
+    var data = {};
+    var target = $j(event.target);
+    var offset = target.offset();
+    var width = target.width();
+    var height = target.height();
+
+    var x = event.pageX - offset.left;
+    var y = event.pageY - offset.top;
 
     if ( xtell ) {
-      var xge = parseInt( (x*100)/coords.width );
+      var xge = parseInt( (x*100)/width );
       if ( xtell == -1 ) {
         xge = 100 - xge;
       } else if ( xtell == 2 ) {
         xge = 2*(50 - xge);
       }
-      locParms += "&xge="+xge;
+      data.xge = xge;
     }
     if ( ytell ) {
-      var yge = parseInt( (y*100)/coords.height );
+      var yge = parseInt( (y*100)/height );
       if ( ytell == -1 ) {
         yge = 100 - yge;
       } else if ( ytell == 2 ) {
         yge = 2*(50 - yge);
       }
-      locParms += "&yge="+yge;
+      data.yge = yge;
     }
   }
-  controlReq.send( controlParms+"&control="+control+locParms );
+  data.id = mid;
+  data.control = control;
+  controlReq(data);
 }
+
+function initPage() {
+  $j('#mid').change(function() {
+    form.submit();
+  });
+}
+
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/controlcap.js b/web/skins/classic/views/js/controlcap.js
index ff21286c2..52c428e28 100644
--- a/web/skins/classic/views/js/controlcap.js
+++ b/web/skins/classic/views/js/controlcap.js
@@ -108,3 +108,29 @@ function validateForm( form ) {
   return true;
 }
 
+function initPage() {
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the CANCEL Button
+  document.getElementById("cancelBtn").addEventListener("click", function onCancelClick(evt) {
+    evt.preventDefault();
+    window.location.assign('?view=controlcaps');
+  });
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/controlcaps.js b/web/skins/classic/views/js/controlcaps.js
new file mode 100644
index 000000000..ff1b3af30
--- /dev/null
+++ b/web/skins/classic/views/js/controlcaps.js
@@ -0,0 +1,115 @@
+var table = $j('#controlTable');
+var addNewBtn = $j('#addNewBtn');
+var editBtn = $j('#editBtn');
+var deleteBtn = $j('#deleteBtn');
+
+// Manage the Add New Control button
+function AddNewControl(el) {
+  url = el.getAttribute('data-url');
+  window.location.assign(url);
+}
+
+// Manage the Add New Control button
+function addNewControl(el) {
+  url = el.getAttribute('data-url');
+  window.location.assign(url);
+}
+
+// Manage the Edit Control button
+function editControl(el) {
+  var selection = getIdSelections();
+
+  url = el.getAttribute('data-url');
+  window.location.assign(url+selection);
+}
+
+// Returns the event id's of the selected rows
+function getIdSelections() {
+  return $j.map(table.bootstrapTable('getSelections'), function(row) {
+    return row.Id.replace(/(<([^>]+)>)/gi, ''); // strip the html from the element before sending
+  });
+}
+
+// Load the Delete Confirmation Modal HTML via Ajax call
+function getDelConfirmModal(key) {
+  $j.getJSON(thisUrl + '?request=modal&modal=delconfirm&key=' + key)
+      .done(function(data) {
+        insertModalHtml('deleteConfirm', data.html);
+        manageDelConfirmModalBtns();
+      })
+      .fail(logAjaxFail);
+}
+
+// Manage the DELETE CONFIRMATION modal button
+function manageDelConfirmModalBtns() {
+  document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) {
+    if ( ! canEdit.Control ) {
+      enoperm();
+      return;
+    }
+
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=controlcaps&action=delete&cids[]='+selections.join('&cids[]='))
+        .done( function(data) {
+          $j('#eventTable').bootstrapTable('refresh');
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
+  });
+}
+
+function initPage() {
+  // enable or disable buttons based on current selection and user rights
+  table.on('check.bs.table uncheck.bs.table ' +
+  'check-all.bs.table uncheck-all.bs.table',
+  function() {
+    selections = table.bootstrapTable('getSelections');
+
+    addNewBtn.prop('disabled', (selections.length || !canEdit.Control));
+    editBtn.prop('disabled', !((selections.length == 1) && canEdit.Control));
+    deleteBtn.prop('disabled', !(selections.length && canEdit.Control));
+  });
+
+  // Init the bootstrap-table
+  table.bootstrapTable({icons: icons});
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the DELETE button
+  document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) {
+    if ( ! canEdit.Control ) {
+      enoperm();
+      return;
+    }
+
+    evt.preventDefault();
+    $j('#deleteConfirm').modal('show');
+  });
+
+  // Load the delete confirmation modal into the DOM
+  getDelConfirmModal('ConfirmDeleteControl');
+
+  // Hide these columns on first run when no cookie is saved
+  if ( !getCookie("zmControlTable.bs.table.columns") ) {
+    table.bootstrapTable('hideColumn', 'Id');
+  }
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/controlpreset.js b/web/skins/classic/views/js/controlpreset.js
deleted file mode 100644
index f9683030a..000000000
--- a/web/skins/classic/views/js/controlpreset.js
+++ /dev/null
@@ -1,12 +0,0 @@
-function updateLabel() {
-  var form = $('contentForm');
-  var preset_ddm = form.elements['preset'];
-
-  var presetIndex = preset_ddm[preset_ddm.selectedIndex].value;
-  if ( labels[presetIndex] ) {
-    form.newLabel.value = labels[presetIndex];
-  } else {
-    form.newLabel.value = '';
-  }
-}
-window.addEventListener('DOMContentLoaded', updateLabel);
diff --git a/web/skins/classic/views/js/controlpreset.js.php b/web/skins/classic/views/js/controlpreset.js.php
deleted file mode 100644
index 9bd8155f1..000000000
--- a/web/skins/classic/views/js/controlpreset.js.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-  global $labels;
-?>
-var labels = new Array();
-<?php
-foreach ( $labels as $index=>$label ) {
-?>
-labels[<?php echo validInt($index) ?>] = '<?php echo validJsStr($label) ?>';
-<?php
-}
-?>
diff --git a/web/skins/classic/views/js/cycle.js b/web/skins/classic/views/js/cycle.js
index 6d2c3bdd4..767fad475 100644
--- a/web/skins/classic/views/js/cycle.js
+++ b/web/skins/classic/views/js/cycle.js
@@ -1,19 +1,21 @@
-var periodical_id;
+var intervalId;
+var pauseBtn = $j('#pauseBtn');
+var playBtn = $j('#playBtn');
 
 function nextCycleView() {
   window.location.replace('?view=cycle&mid='+nextMid+'&mode='+mode, cycleRefreshTimeout);
 }
 
 function cyclePause() {
-  $clear(periodical_id);
-  $('pauseBtn').disabled = true;
-  $('playBtn').disabled = false;
+  clearInterval(intervalId);
+  pauseBtn.prop('disabled', true);
+  playBtn.prop('disabled', false);
 }
 
 function cycleStart() {
-  periodical_id = nextCycleView.periodical(cycleRefreshTimeout);
-  $('pauseBtn').disabled = false;
-  $('playBtn').disabled = true;
+  intervalId = setInterval(nextCycleView, cycleRefreshTimeout);
+  pauseBtn.prop('disabled', false);
+  playBtn.prop('disabled', true);
 }
 
 function cycleNext() {
@@ -29,22 +31,26 @@ function cycleNext() {
 }
 
 function cyclePrev() {
-  if ( monIdx ) {
-    monIdx -= 1;
-  } else {
+  monIdx --;
+  if ( monIdx < 0 ) {
     monIdx = monitorData.length - 1;
   }
+  if ( !monitorData[monIdx] ) {
+    console.log('No monitorData for ' + monIdx);
+  }
 
   window.location.replace('?view=cycle&mid='+monitorData[monIdx].id+'&mode='+mode, cycleRefreshTimeout);
 }
 
 function initCycle() {
-  periodical_id = nextCycleView.periodical(cycleRefreshTimeout);
+  intervalId = setInterval(nextCycleView, cycleRefreshTimeout);
+  var scale = $j('#scale').val();
+  if ( scale == '0' || scale == 'auto' ) changeScale();
 }
 
 function changeSize() {
-  var width = $('width').get('value');
-  var height = $('height').get('value');
+  var width = $j('#width').val();
+  var height = $j('#height').val();
 
   // Scale the frame
   monitor_frame = $j('#imageFeed');
@@ -60,7 +66,7 @@ function changeSize() {
   }
 
   /* Stream could be an applet so can't use moo tools */
-  var streamImg = $('liveStream'+monitorData[monIdx].id);
+  var streamImg = document.getElementById('liveStream'+monitorData[monIdx].id);
   if ( streamImg ) {
     if ( streamImg.nodeName == 'IMG' ) {
       var src = streamImg.src;
@@ -76,19 +82,19 @@ function changeSize() {
   } else {
     console.log('Did not find liveStream'+monitorData[monIdx].id);
   }
-  $('scale').set('value', '');
-  Cookie.write('zmCycleScale', '', {duration: 10*365});
-  Cookie.write('zmCycleWidth', width, {duration: 10*365});
-  Cookie.write('zmCycleHeight', height, {duration: 10*365});
+  $j('#scale').val('');
+  setCookie('zmCycleScale', '', 3600);
+  setCookie('zmCycleWidth', width, 3600);
+  setCookie('zmCycleHeight', height, 3600);
 } // end function changeSize()
 
 function changeScale() {
-  var scale = $('scale').get('value');
-  $('width').set('value', 'auto');
-  $('height').set('value', 'auto');
-  Cookie.write('zmCycleScale', scale, {duration: 10*365});
-  Cookie.write('zmCycleWidth', 'auto', {duration: 10*365});
-  Cookie.write('zmCycleHeight', 'auto', {duration: 10*365});
+  var scale = $j('#scale').val();
+  $j('#width').val('auto');
+  $j('#height').val('auto');
+  setCookie('zmCycleScale', scale, 3600);
+  setCookie('zmCycleWidth', 'auto', 3600);
+  setCookie('zmCycleHeight', 'auto', 3600);
   var newWidth = ( monitorData[monIdx].width * scale ) / SCALE_BASE;
   var newHeight = ( monitorData[monIdx].height * scale ) / SCALE_BASE;
 
@@ -100,6 +106,8 @@ function changeScale() {
   }
 
   if ( scale != '0' && scale != '' && scale != 'auto' ) {
+    var newWidth = ( monitorData[monIdx].width * scale ) / SCALE_BASE;
+    var newHeight = ( monitorData[monIdx].height * scale ) / SCALE_BASE;
     if ( newWidth ) {
       monitor_frame.css('width', newWidth+'px');
     }
@@ -107,8 +115,13 @@ function changeScale() {
       monitor_frame.css('height', newHeight+'px');
     }
   } else {
-    monitor_frame.css('width', '100%');
-    monitor_frame.css('height', 'auto');
+    //var bottomEl = streamMode == 'stills' ? $j('#eventImageNav') : $j('#replayStatus');
+    var newSize = scaleToFit(monitorData[monIdx].width, monitorData[monIdx].height, monitor_frame, $j('#buttons'));
+    newWidth = newSize.width;
+    newHeight = newSize.height;
+    autoScale = newSize.autoScale;
+    monitor_frame.width(newWidth);
+    monitor_frame.height(newHeight);
   }
 
   /*Stream could be an applet so can't use moo tools*/
@@ -124,6 +137,7 @@ function changeScale() {
 
     //src = src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
     src = src.replace(/scale=[\.\d]+/i, 'scale='+scale);
+    // zms doesn't actually use width&height
     if ( scale != '0' && scale != '' && scale != 'auto' ) {
       src = src.replace(/width=[\.\d]+/i, 'width='+newWidth);
       src = src.replace(/height=[\.\d]+/i, 'height='+newHeight);
@@ -143,4 +157,4 @@ function changeScale() {
   }
 } // end function changeScale()
 
-window.addEventListener('DOMContentLoaded', initCycle);
+$j(document).ready(initCycle);
diff --git a/web/skins/classic/views/js/cycle.js.php b/web/skins/classic/views/js/cycle.js.php
index f53ab006d..7bcd4497c 100644
--- a/web/skins/classic/views/js/cycle.js.php
+++ b/web/skins/classic/views/js/cycle.js.php
@@ -18,7 +18,7 @@ monitorData[monitorData.length] = {
   'width': <?php echo $monitor->ViewWidth() ?>,
   'height':<?php echo $monitor->ViewHeight() ?>,
   'url': '<?php echo $monitor->UrlToIndex() ?>',
-  'onclick': function(){createPopup( '?view=watch&mid=<?php echo $monitor->Id() ?>', 'zmWatch<?php echo $monitor->Id() ?>', 'watch', <?php echo reScale( $monitor->ViewWidth(), $monitor->PopupScale() ); ?>, <?php echo reScale( $monitor->ViewHeight(), $monitor->PopupScale() ); ?> );},
+  'onclick': function(){window.location.assign( '?view=watch&mid=<?php echo $monitor->Id() ?>' );},
   'type': '<?php echo $monitor->Type() ?>',
   'refresh': '<?php echo $monitor->Refresh() ?>'
 };
diff --git a/web/skins/classic/views/js/devices.js b/web/skins/classic/views/js/devices.js
index 703384ad2..5167b2018 100644
--- a/web/skins/classic/views/js/devices.js
+++ b/web/skins/classic/views/js/devices.js
@@ -1,40 +1,140 @@
-function switchDeviceOn( element, key ) {
-  var form = element.form;
-  form.view.value = currentView;
-  form.action.value = 'device';
-  form.command.value = 'on';
-  form.key.value = key;
-  form.submit();
+var newDeviceBtn = $j('#newDeviceBtn');
+var table = $j('#devicesTable');
+var deleteBtn = $j('#deleteBtn');
+
+// Load the Device Modal HTML via Ajax call
+function getDeviceModal(did) {
+  $j.getJSON(thisUrl + '?request=modal&modal=device&did=' + did)
+      .done(function(data) {
+        insertModalHtml('deviceModal', data.html);
+        $j('#deviceModal').modal('show');
+        // Manage the Save button
+        $j('#deviceSaveBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#deviceModalForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
 }
 
-function switchDeviceOff( element, key ) {
-  var form = element.form;
-  form.view.value = currentView;
-  form.action.value = 'device';
-  form.command.value = 'off';
-  form.key.value = key;
-  form.submit();
+function enableDeviceModal() {
+  $j(".deviceCol").click(function(evt) {
+    evt.preventDefault();
+    var did = $j(this).data('did');
+    getDeviceModal(did);
+  });
+  newDeviceBtn.click(function(evt) {
+    evt.preventDefault();
+    getDeviceModal(0);
+  });
 }
 
-function deleteDevice( element ) {
-  var form = element.form;
-  form.view.value = currentView;
-  form.action.value = 'delete';
-  form.submit();
+// Load the Delete Confirmation Modal HTML via Ajax call
+function getDelConfirmModal(key) {
+  $j.getJSON(thisUrl + '?request=modal&modal=delconfirm&key=' + key)
+      .done(function(data) {
+        insertModalHtml('deleteConfirm', data.html);
+        manageDelConfirmModalBtns();
+      })
+      .fail(logAjaxFail);
 }
 
-function configureButtons( element, name ) {
-  var form = element.form;
-  var checked = false;
-  for (var i = 0; i < form.elements.length; i++) {
-    if ( form.elements[i].name.indexOf(name) == 0) {
-      if ( form.elements[i].checked ) {
-        checked = true;
-        break;
-      }
+// Manage the DELETE CONFIRMATION modal button
+function manageDelConfirmModalBtns() {
+  document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) {
+    if ( ! canEdit.Device ) {
+      enoperm();
+      return;
     }
-  }
-  form.deleteBtn.disabled = !checked;
+
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=devices&action=delete&markDids[]='+selections.join('&markDids[]='))
+        .done( function(data) {
+          $j('#devicesTable').bootstrapTable('refresh');
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the CANCEL modal button
+  document.getElementById("delCancelBtn").addEventListener("click", function onDelCancelClick(evt) {
+    $j('#deleteConfirm').modal('hide');
+  });
 }
 
-window.focus();
+// Returns the event id's of the selected rows
+function getIdSelections() {
+  return $j.map(table.bootstrapTable('getSelections'), function(row) {
+    return row.Id.replace(/(<([^>]+)>)/gi, ''); // strip the html from the element before sending
+  });
+}
+
+// Take the appropriate action when the user clicks on cells in the table
+function processClicks(event, field, value, row, $element) {
+  if ( field == 'On' || field == 'Off' ) {
+    var key = row.KeyString.replace(/(<([^>]+)>)/gi, '');
+    var url = '?request=device&action=device&command=' + field + '&key=' + key;
+    console.log('Url sent to device: ' + url);
+    $j.getJSON(thisUrl + url)
+        .done(function(data) {
+          // TODO - verify if either of these are needed
+          $j('#devicesTable').bootstrapTable('refresh');
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
+  }
+}
+
+function initPage() {
+  // Init the bootstrap-table
+  table.bootstrapTable({icons: icons});
+
+  if ( canEdit.Device ) enableDeviceModal();
+
+  newDeviceBtn.prop('disabled', !canEdit.Device);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the DELETE button
+  document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) {
+    if ( ! canEdit.Device ) {
+      enoperm();
+      return;
+    }
+
+    evt.preventDefault();
+    $j('#deleteConfirm').modal('show');
+  });
+
+  // Load the delete confirmation modal into the DOM
+  getDelConfirmModal('ConfirmDeleteDevices');
+
+  // enable or disable buttons based on current selection and user rights
+  table.on('check.bs.table uncheck.bs.table ' +
+  'check-all.bs.table uncheck-all.bs.table',
+  function() {
+    selections = table.bootstrapTable('getSelections');
+
+    deleteBtn.prop('disabled', !(selections.length && canEdit.Device));
+  });
+
+  // Process mouse clicks on the table cells
+  table.on('click-cell.bs.table', processClicks);
+}
+
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/donate.js b/web/skins/classic/views/js/donate.js
deleted file mode 100644
index eb3c25f50..000000000
--- a/web/skins/classic/views/js/donate.js
+++ /dev/null
@@ -1,3 +0,0 @@
-if ( action == 'donate' && option == 'go' ) {
-  zmWindow('/donate/');
-}
diff --git a/web/skins/classic/views/js/donate.js.php b/web/skins/classic/views/js/donate.js.php
deleted file mode 100644
index 4fc36d5bb..000000000
--- a/web/skins/classic/views/js/donate.js.php
+++ /dev/null
@@ -1,2 +0,0 @@
-var action = '<?php echo isset($_REQUEST['action'])?validJsStr($_REQUEST['action']):'' ?>';
-var option = '<?php echo isset($_REQUEST['option'])?validJsStr($_REQUEST['option']):'' ?>';
diff --git a/web/skins/classic/views/js/download.js b/web/skins/classic/views/js/download.js
deleted file mode 100644
index 16b47c8b4..000000000
--- a/web/skins/classic/views/js/download.js
+++ /dev/null
@@ -1,63 +0,0 @@
-function configureExportButton( element ) {
-  var form = element.form;
-
-  var radioCount = 0;
-  for ( var i = 0, len=form.elements.length; i < len; i++ ) {
-    if ( form.elements[i].type == "radio" && form.elements[i].checked ) {
-      radioCount++;
-    }
-  }
-  form.elements['exportButton'].disabled = (radioCount == 0);
-}
-
-function startDownload( exportFile ) {
-  console.log("Starting download from " + exportFile);
-  window.location.replace( exportFile );
-}
-
-var exportTimer = null;
-
-function exportProgress() {
-  var tickerText = $('exportProgressTicker').get('text');
-  if ( tickerText.length < 1 || tickerText.length > 4 ) {
-    $('exportProgressTicker').set( 'text', '.' );
-  } else {
-    $('exportProgressTicker').appendText( '.' );
-  }
-}
-
-function exportResponse(respObj, respText) {
-  console.log(respObj);
-  window.location.replace(
-      thisUrl+'?view='+currentView+'&'+eidParm+
-      '&exportFormat='+respObj.exportFormat+
-      '&exportFile='+respObj.exportFile+
-      '&generated='+((respObj.result=='Ok')?1:0)+
-      '&connkey='+connkey
-  );
-}
-
-function exportEvent( element ) {
-  var form = element.form;
-  var parms = 'view=request&request=event&action=download';
-  parms += '&'+$(form).toQueryString();
-  console.log(parms);
-  var query = new Request.JSON( {url: thisUrl, method: 'post', data: parms, onSuccess: exportResponse} );
-  query.send();
-  $('exportProgress').removeClass( 'hidden' );
-  $('exportProgress').setProperty( 'class', 'warnText' );
-  $('exportProgressText').set( 'text', exportProgressString );
-  exportProgress();
-  exportTimer = exportProgress.periodical( 500 );
-}
-
-function initPage() {
-  if ( exportReady ) {
-    startDownload.pass( exportFile ).delay( 1500 );
-  }
-  document.getElementById('exportButton').addEventListener("click", function onClick(evt) {
-    exportEvent(this);
-  });
-}
-
-window.addEventListener( 'DOMContentLoaded', initPage );
diff --git a/web/skins/classic/views/js/download.js.php b/web/skins/classic/views/js/download.js.php
deleted file mode 100644
index 390c9d17f..000000000
--- a/web/skins/classic/views/js/download.js.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-  global $connkey;
-  global $exportFormat;
-
-  if ( isset($_REQUEST['eids']) ) {
-    $eidParms = array();
-    foreach ( $_REQUEST['eids'] as $eid )
-      $eidParms[] = 'eids[]='.validInt($eid);
-?>
-var eidParm = '<?php echo join('&', $eidParms) ?>';
-<?php
-  } else if (isset($_REQUEST['eid'])) {
-?>
-var eidParm = 'eid=<?php echo validInt($_REQUEST['eid']) ?>';
-<?php
- }
-?>
-
-var exportReady = <?php echo !empty($_REQUEST['generated'])?'true':'false' ?>;
-var exportFile = '?view=archive&type=<?php echo $exportFormat; ?>&connkey=<?php echo $connkey; ?>';
-var connkey = '<?php echo $connkey ?>';
-
-var exportProgressString = '<?php echo addslashes(translate('Exporting')) ?>';
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 6781949d1..b3819cf30 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -1,7 +1,43 @@
+var table = $j('#eventStatsTable');
+var backBtn = $j('#backBtn');
+var renameBtn = $j('#renameBtn');
+var archiveBtn = $j('#archiveBtn');
+var unarchiveBtn = $j('#unarchiveBtn');
+var editBtn = $j('#editBtn');
+var exportBtn = $j('#exportBtn');
+var downloadBtn = $j('#downloadBtn');
+var statsBtn = $j('#statsBtn');
+var deleteBtn = $j('#deleteBtn');
+var prevEventId = 0;
+var nextEventId = 0;
+var prevEventStartTime = 0;
+var nextEventStartTime = 0;
+var PrevEventDefVideoPath = "";
+var NextEventDefVideoPath = "";
+var currEventId = null;
+var CurEventDefVideoPath = null;
 var vid = null;
 var spf = Math.round((eventData.Length / eventData.Frames)*1000000 )/1000000;//Seconds per frame for videojs frame by frame.
 var intervalRewind;
 var revSpeed = .5;
+var cueFrames = null; //make cueFrames available even if we don't send another ajax query
+var streamCmdTimer = null;
+var streamStatus = null;
+var lastEventId = 0;
+var zmsBroke = false; //Use alternate navigation if zms has crashed
+var auth_hash;
+var wasHidden = false;
+
+function streamReq(data) {
+  if ( auth_hash ) data.auth = auth_hash;
+  data.connkey = connKey;
+  data.view = 'request';
+  data.request = 'stream';
+
+  $j.getJSON(thisUrl, data)
+      .done(getCmdResponse)
+      .fail(logAjaxFail);
+}
 
 // Function called when video.js hits the end of the video
 function vjsReplay() {
@@ -16,7 +52,7 @@ function vjsReplay() {
         var overLaid = $j("#videoobj");
         overLaid.append('<p class="vjsMessage" style="height: '+overLaid.height()+'px; line-height: '+overLaid.height()+'px;">No more events</p>');
       } else {
-        var endTime = (Date.parse(eventData.EndTime)).getTime();
+        var endTime = (Date.parse(eventData.EndDateTime)).getTime();
         var nextStartTime = nextEventStartTime.getTime(); //nextEventStartTime.getTime() is a mootools workaround, highjacks Date.parse
         if ( nextStartTime <= endTime ) {
           streamNext(true);
@@ -44,16 +80,11 @@ function vjsReplay() {
   }
 } // end function vjsReplay
 
-$j.ajaxSetup({timeout: AJAX_TIMEOUT}); //sets timeout for all getJSON.
-
-var cueFrames = null; //make cueFrames available even if we don't send another ajax query
-
 function initialAlarmCues(eventId) {
-  $j.getJSON(thisUrl + '?view=request&request=status&entity=frames&id=' + eventId, setAlarmCues) //get frames data for alarmCues and inserts into html
-      .fail(function(jqxhr, textStatus, error) {
-        console.log("Request Failed: " + textStatus + ", " + error);
-        console.log("Response Text: " + jqxhr.responseText);
-      });
+  //get frames data for alarmCues and inserts into html
+  $j.getJSON(thisUrl + '?view=request&request=status&entity=frames&id=' + eventId)
+      .done(setAlarmCues)
+      .fail(logAjaxFail);
 }
 
 function setAlarmCues(data) {
@@ -137,7 +168,6 @@ function renderAlarmCues(containerEl) {
   return alarmHtml;
 }
 
-
 function changeCodec() {
   location.replace(thisUrl + '?view=event&eid=' + eventData.Id + filterQuery + sortQuery+'&codec='+$j('#codec').val());
 }
@@ -147,14 +177,10 @@ function changeScale() {
   var newWidth;
   var newHeight;
   var autoScale;
-  var eventViewer;
+  var eventViewer= $j(vid ? '#videoobj' : '#evtStream');
   var alarmCue = $j('div.alarmCue');
-  var bottomEl = streamMode == 'stills' ? $j('#eventImageNav') : $j('#replayStatus');
-  if ( streamMode == 'stills' ) {
-    eventViewer = $j('#eventThumbs');
-  } else {
-    eventViewer = $j(vid ? '#videoobj' : '#evtStream');
-  }
+  var bottomEl = $j('#replayStatus');
+
   if ( scale == '0' || scale == 'auto' ) {
     var newSize = scaleToFit(eventData.Width, eventData.Height, eventViewer, bottomEl);
     newWidth = newSize.width;
@@ -165,38 +191,30 @@ function changeScale() {
     newWidth = eventData.Width * scale / SCALE_BASE;
     newHeight = eventData.Height * scale / SCALE_BASE;
   }
-  if ( streamMode != 'stills' ) {
-    eventViewer.width(newWidth);
-  } // stills handles its own width
+  eventViewer.width(newWidth);
   eventViewer.height(newHeight);
   if ( !vid ) { // zms needs extra sizing
     streamScale(scale == '0' ? autoScale : scale);
     drawProgressBar();
   }
-  if ( streamMode == 'stills' ) {
-    slider.autosize();
-    alarmCue.html(renderAlarmCues($j('#thumbsSliderPanel')));
-  } else {
-    alarmCue.html(renderAlarmCues(eventViewer));//just re-render alarmCues.  skip ajax call
-  }
-  if ( scale == '0' ) {
-    Cookie.write('zmEventScaleAuto', 'auto', {duration: 10*365});
-  } else {
-    Cookie.write('zmEventScale'+eventData.MonitorId, scale, {duration: 10*365});
-    Cookie.dispose('zmEventScaleAuto');
-  }
+  alarmCue.html(renderAlarmCues(eventViewer));//just re-render alarmCues.  skip ajax call
+  setCookie('zmEventScale'+eventData.MonitorId, scale, 3600);
+
+  // After a resize, check if we still have room to display the event stats table
+  onStatsResize(newWidth);
 } // end function changeScale
 
 function changeReplayMode() {
-  var replayMode = $('replayMode').get('value');
+  var replayMode = $j('#replayMode').val();
 
-  Cookie.write('replayMode', replayMode, {duration: 10*365});
+  setCookie('replayMode', replayMode, 3600);
 
   refreshWindow();
 }
 
 function changeRate() {
   var rate = parseInt($j('select[name="rate"]').val());
+
   if ( ! rate ) {
     pauseClicked();
   } else if ( rate < 0 ) {
@@ -212,26 +230,20 @@ function changeRate() {
           vid.currentTime(vid.currentTime() - (revSpeed/2)); //Half of reverse speed because our interval is 500ms.
         }
       }, 500); //500ms is a compromise between smooth reverse and realistic performance
+    } else {
+      streamReq({command: CMD_VARPLAY, rate: rate});
     } // end if vid
   } else { // Forward rate
     if ( vid ) {
       vid.playbackRate(rate/100);
+    } else {
+      streamReq({command: CMD_VARPLAY, rate: rate});
     }
   }
-  Cookie.write('zmEventRate', rate, {duration: 10*365});
+  setCookie('zmEventRate', rate, 3600);
 } // end function changeRate
 
-var streamParms = "view=request&request=stream&connkey="+connKey;
-if ( auth_hash ) {
-  streamParms += '&auth='+auth_hash;
-}
-var streamCmdTimer = null;
-
-var streamStatus = null;
-var lastEventId = 0;
-var zmsBroke = false; //Use alternate navigation if zms has crashed
-
-function getCmdResponse( respObj, respText ) {
+function getCmdResponse(respObj, respText) {
   if ( checkStreamForErrors('getCmdResponse', respObj) ) {
     console.log('Got an error from getCmdResponse');
     console.log(respObj);
@@ -247,7 +259,15 @@ function getCmdResponse( respObj, respText ) {
   }
 
   streamStatus = respObj.status;
-  if ( streamStatus.progress >= Math.round(parseFloat(eventData.Length)) ) {
+  if (!streamStatus) {
+    console.log('No status in respObj');
+    console.log(respObj);
+    return;
+  } else if ( streamStatus.duration && ( streamStatus.duration != parseFloat(eventData.Length) ) ) {
+    eventData.Length = streamStatus.duration;
+  }
+  if ( streamStatus.progress > parseFloat(eventData.Length) ) {
+    console.log("Limiting progress to " + streamStatus.progress + ' >= ' + parseFloat(eventData.Length) );
     streamStatus.progress = parseFloat(eventData.Length);
   } //Limit progress to reality
 
@@ -266,17 +286,16 @@ function getCmdResponse( respObj, respText ) {
   if ( streamStatus.paused == true ) {
     streamPause( );
   } else {
-    console.log('streamStatus.rate: ' + streamStatus.rate);
     $j('select[name="rate"]').val(streamStatus.rate*100);
-    Cookie.write('zmEventRate', streamStatus.rate*100, {duration: 10*365});
+    setCookie('zmEventRate', streamStatus.rate*100, 3600);
     streamPlay( );
   }
   $j('#progressValue').html(secsToTime(parseInt(streamStatus.progress)));
   $j('#zoomValue').html(streamStatus.zoom);
   if ( streamStatus.zoom == "1.0" ) {
-    setButtonState( $('zoomOutBtn'), 'unavail' );
+    setButtonState( 'zoomOutBtn', 'unavail' );
   } else {
-    setButtonState( $('zoomOutBtn'), 'inactive' );
+    setButtonState( 'zoomOutBtn', 'inactive' );
   }
 
   updateProgressBar();
@@ -289,16 +308,8 @@ function getCmdResponse( respObj, respText ) {
     }
   } // end if haev a new auth hash
 
-  streamCmdTimer = streamQuery.delay(streamTimeout); //Timeout is refresh rate for progressBox and time display
-}
-
-var streamReq = new Request.JSON( {
-  url: monitorUrl,
-  method: 'get',
-  timeout: AJAX_TIMEOUT,
-  link: 'chain',
-  onSuccess: getCmdResponse
-} );
+  streamCmdTimer = setTimeout(streamQuery, streamTimeout); //Timeout is refresh rate for progressBox and time display
+} // end function getCmdResponse( respObj, respText )
 
 function pauseClicked() {
   if ( vid ) {
@@ -307,23 +318,24 @@ function pauseClicked() {
     }
     vid.pause();
   } else {
-    streamReq.send(streamParms+"&command="+CMD_PAUSE);
+    streamReq({command: CMD_PAUSE});
   }
   streamPause();
 }
 
 function streamPause() {
   $j('#modeValue').html('Paused');
-  setButtonState( $('pauseBtn'), 'active' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'unavail' );
-  setButtonState( $('slowFwdBtn'), 'inactive' );
-  setButtonState( $('slowRevBtn'), 'inactive' );
-  setButtonState( $('fastRevBtn'), 'unavail' );
+  setButtonState( 'pauseBtn', 'active' );
+  setButtonState( 'playBtn', 'inactive' );
+  setButtonState( 'fastFwdBtn', 'unavail' );
+  setButtonState( 'slowFwdBtn', 'inactive' );
+  setButtonState( 'slowRevBtn', 'inactive' );
+  setButtonState( 'fastRevBtn', 'unavail' );
 }
 
 function playClicked( ) {
   var rate_select = $j('select[name="rate"]');
+
   if ( ! rate_select.val() ) {
     $j('select[name="rate"]').val(100);
   }
@@ -334,7 +346,7 @@ function playClicked( ) {
       vjsPlay(); //handles fast forward and rewind
     }
   } else {
-    streamReq.send(streamParms+"&command="+CMD_PLAY);
+    streamReq({command: CMD_PLAY});
   }
   streamPlay();
 }
@@ -344,36 +356,36 @@ function vjsPlay() { //catches if we change mode programatically
     stopFastRev();
   }
   $j('select[name="rate"]').val(vid.playbackRate()*100);
-  Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
+  setCookie('zmEventRate', vid.playbackRate()*100, 3600);
   streamPlay();
 }
 
 function streamPlay( ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'active' );
-  setButtonState( $('fastFwdBtn'), 'inactive' );
-  setButtonState( $('slowFwdBtn'), 'unavail' );
-  setButtonState( $('slowRevBtn'), 'unavail' );
-  setButtonState( $('fastRevBtn'), 'inactive' );
+  setButtonState( 'pauseBtn', 'inactive' );
+  setButtonState( 'playBtn', 'active' );
+  setButtonState( 'fastFwdBtn', 'inactive' );
+  setButtonState( 'slowFwdBtn', 'unavail' );
+  setButtonState( 'slowRevBtn', 'unavail' );
+  setButtonState( 'fastRevBtn', 'inactive' );
 }
 
 function streamFastFwd( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'active' );
-  setButtonState( $('slowFwdBtn'), 'unavail' );
-  setButtonState( $('slowRevBtn'), 'unavail' );
-  setButtonState( $('fastRevBtn'), 'inactive' );
+  setButtonState( 'pauseBtn', 'inactive' );
+  setButtonState( 'playBtn', 'inactive' );
+  setButtonState( 'fastFwdBtn', 'active' );
+  setButtonState( 'slowFwdBtn', 'unavail' );
+  setButtonState( 'slowRevBtn', 'unavail' );
+  setButtonState( 'fastRevBtn', 'inactive' );
   if ( vid ) {
     if ( revSpeed != .5 ) stopFastRev();
     vid.playbackRate(rates[rates.indexOf(vid.playbackRate()*100)-1]/100);
     if ( rates.indexOf(vid.playbackRate()*100)-1 == -1 ) {
-      setButtonState($('fastFwdBtn'), 'unavail');
+      setButtonState('fastFwdBtn', 'unavail');
     }
     $j('select[name="rate"]').val(vid.playbackRate()*100);
-    Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
+    setCookie('zmEventRate', vid.playbackRate()*100, 3600);
   } else {
-    streamReq.send(streamParms+"&command="+CMD_FASTFWD);
+    streamReq({command: CMD_FASTFWD});
   }
 }
 
@@ -382,7 +394,7 @@ function streamSlowFwd( action ) {
   if ( vid ) {
     vid.currentTime(vid.currentTime() + spf);
   } else {
-    streamReq.send(streamParms+"&command="+CMD_SLOWFWD);
+    streamReq({command: CMD_SLOWFWD});
   }
 }
 
@@ -390,7 +402,7 @@ function streamSlowRev( action ) {
   if ( vid ) {
     vid.currentTime(vid.currentTime() - spf);
   } else {
-    streamReq.send(streamParms+"&command="+CMD_SLOWREV);
+    streamReq({command: CMD_SLOWREV});
   }
 }
 
@@ -398,25 +410,25 @@ function stopFastRev() {
   clearInterval(intervalRewind);
   vid.playbackRate(1);
   $j('select[name="rate"]').val(vid.playbackRate()*100);
-  Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
+  setCookie('zmEventRate', vid.playbackRate()*100, 3600);
   revSpeed = .5;
 }
 
 function streamFastRev( action ) {
-  setButtonState( $('pauseBtn'), 'inactive' );
-  setButtonState( $('playBtn'), 'inactive' );
-  setButtonState( $('fastFwdBtn'), 'inactive' );
-  setButtonState( $('slowFwdBtn'), 'unavail' );
-  setButtonState( $('slowRevBtn'), 'unavail' );
-  setButtonState( $('fastRevBtn'), 'active' );
+  setButtonState( 'pauseBtn', 'inactive' );
+  setButtonState( 'playBtn', 'inactive' );
+  setButtonState( 'fastFwdBtn', 'inactive' );
+  setButtonState( 'slowFwdBtn', 'unavail' );
+  setButtonState( 'slowRevBtn', 'unavail' );
+  setButtonState( 'fastRevBtn', 'active' );
   if ( vid ) { //There is no reverse play with mp4.  Set the speed to 0 and manually set the time back.
     revSpeed = rates[rates.indexOf(revSpeed*100)-1]/100;
     if ( rates.indexOf(revSpeed*100) == 0 ) {
-      setButtonState( $('fastRevBtn'), 'unavail' );
+      setButtonState( 'fastRevBtn', 'unavail' );
     }
     clearInterval(intervalRewind);
     $j('select[name="rate"]').val(-revSpeed*100);
-    Cookie.write('zmEventRate', vid.playbackRate()*100, {duration: 10*365});
+    setCookie('zmEventRate', vid.playbackRate()*100, 3600);
     intervalRewind = setInterval(function() {
       if (vid.currentTime() <= 0) {
         clearInterval(intervalRewind);
@@ -427,23 +439,23 @@ function streamFastRev( action ) {
       }
     }, 500); //500ms is a compromise between smooth reverse and realistic performance
   } else {
-    streamReq.send(streamParms+"&command="+CMD_FASTREV);
+    streamReq({command: CMD_FASTREV});
   }
 }
 
 function streamPrev(action) {
   if ( action ) {
     $j(".vjsMessage").remove();
-    location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery + '&popup='+popup);
+    location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery);
     return;
 
     if ( vid && PrevEventDefVideoPath.indexOf("view_video") > 0 ) {
       CurEventDefVideoPath = PrevEventDefVideoPath;
       eventQuery(prevEventId);
     } else if (zmsBroke || (vid && PrevEventDefVideoPath.indexOf("view_video") < 0) || $j("#vjsMessage").length || PrevEventDefVideoPath.indexOf("view_video") > 0) {//zms broke, leaving videojs, last event, moving to videojs
-      location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery + '&popup='+popup);
+      location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery);
     } else {
-      streamReq.send(streamParms+"&command="+CMD_PREV);
+      streamReq({command: CMD_PREV});
       streamPlay();
     }
   }
@@ -463,15 +475,15 @@ function streamNext(action) {
     // We used to try to dynamically update all the bits in the page, which is really complex
     // How about we just reload the page?
     //
-    location.replace(thisUrl + '?view=event&eid=' + nextEventId + filterQuery + sortQuery + '&popup='+popup);
+    location.replace(thisUrl + '?view=event&eid=' + nextEventId + filterQuery + sortQuery);
     return;
-    if ( vid && ( NextEventDefVideoPath.indexOf("view_video") > 0 ) ) { //on and staying with videojs
+    if ( vid && ( NextEventDefVideoPath.indexOf('view_video') > 0 ) ) { //on and staying with videojs
       CurEventDefVideoPath = NextEventDefVideoPath;
       eventQuery(nextEventId);
     } else if ( zmsBroke || (vid && NextEventDefVideoPath.indexOf("view_video") < 0) || NextEventDefVideoPath.indexOf("view_video") > 0) {//reload zms, leaving vjs, moving to vjs
-      location.replace(thisUrl + '?view=event&eid=' + nextEventId + filterQuery + sortQuery + '&popup='+popup);
+      location.replace(thisUrl + '?view=event&eid=' + nextEventId + filterQuery + sortQuery);
     } else {
-      streamReq.send(streamParms+"&command="+CMD_NEXT);
+      streamReq({command: CMD_NEXT});
       streamPlay();
     }
   }
@@ -522,7 +534,7 @@ function streamZoomIn( x, y ) {
   if (vid) {
     vjsPanZoom('zoom', x, y);
   } else {
-    streamReq.send( streamParms+"&command="+CMD_ZOOMIN+"&x="+x+"&y="+y );
+    streamReq({command: CMD_ZOOMIN, x: x, y: y});
   }
 }
 
@@ -530,35 +542,30 @@ function streamZoomOut() {
   if (vid) {
     vjsPanZoom('zoomOut');
   } else {
-    streamReq.send( streamParms+"&command="+CMD_ZOOMOUT );
+    streamReq({command: CMD_ZOOMOUT});
   }
 }
 
 function streamScale( scale ) {
-  streamReq.send( streamParms+"&command="+CMD_SCALE+"&scale="+scale );
+  streamReq({command: CMD_SCALE, scale: scale});
 }
 
 function streamPan( x, y ) {
   if (vid) {
     vjsPanZoom('pan', x, y);
   } else {
-    streamReq.send( streamParms+"&command="+CMD_PAN+"&x="+x+"&y="+y );
+    streamReq({command: CMD_PAN, x: x, y: y});
   }
 }
 
 function streamSeek( offset ) {
-  streamReq.send( streamParms+"&command="+CMD_SEEK+"&offset="+offset );
+  streamReq({command: CMD_SEEK, offset: offset});
 }
 
 function streamQuery() {
-  streamReq.send( streamParms+"&command="+CMD_QUERY );
+  streamReq({command: CMD_QUERY});
 }
 
-var slider = null;
-var scroll = null;
-var currEventId = null;
-var CurEventDefVideoPath = null;
-
 function getEventResponse(respObj, respText) {
   if ( checkStreamForErrors('getEventResponse', respObj) ) {
     console.log('getEventResponse: errors');
@@ -566,43 +573,38 @@ function getEventResponse(respObj, respText) {
   }
 
   eventData = respObj.event;
-  var eventStills = $('eventStills');
-
-  if ( eventStills && !$('eventStills').hasClass( 'hidden' ) && currEventId != eventData.Id ) {
-    resetEventStills();
-  }
   currEventId = eventData.Id;
 
-  $('dataId').set( 'text', eventData.Id );
+  $j('#dataEventId').text( eventData.Id );
+  $j('#dataEventName').text( eventData.Name );
+  $j('#dataMonitorId').text('<a href="?video=monitor&mid='+eventData.MonitorId+'">'+eventData.MonitorId+'</a>');
+  $j('#dataMonitorName').text('<a href="?video=monitor&mid='+eventData.MonitorId+'">'+eventData.MonitorName+'</a>');
+  $j('#dataCause').text( eventData.Cause );
   if ( eventData.Notes ) {
-    $('dataCause').setProperty( 'title', eventData.Notes );
+    $j('#dataCause').prop( 'title', eventData.Notes );
   } else {
-    $('dataCause').setProperty( 'title', causeString );
+    $j('#dataCause').prop( 'title', causeString );
   }
-  $('dataCause').set( 'text', eventData.Cause );
-  $('dataTime').set( 'text', eventData.StartTime );
-  $('dataDuration').set( 'text', eventData.Length );
-  $('dataFrames').set( 'text', eventData.Frames+"/"+eventData.AlarmFrames );
-  $('dataScore').set( 'text', eventData.TotScore+"/"+eventData.AvgScore+"/"+eventData.MaxScore );
-  $('eventName').setProperty( 'value', eventData.Name );
-  history.replaceState(null, null, '?view=event&eid=' + eventData.Id + filterQuery + sortQuery);//if popup removed, check if this allows forward
-  if ( canEditEvents ) {
-    if ( parseInt(eventData.Archived) ) {
-      $('archiveEvent').addClass( 'hidden' );
-      $('unarchiveEvent').removeClass( 'hidden' );
-    } else {
-      $('archiveEvent').removeClass( 'hidden' );
-      $('unarchiveEvent').addClass( 'hidden' );
-    }
-  }
-  // Technically, events can be different sizes, so may need to update the size of the image, but it might be better to have it stay scaled...
-  //var eventImg = $('eventImage');
-  //eventImg.setStyles( { 'width': eventData.width, 'height': eventData.height } );
+  $j('#dataStartTime').text( eventData.StartDateTime );
+  $j('#dataDuration').text( eventData.Length );
+  $j('#dataFrames').text( eventData.Frames );
+  $j('#dataAlarmFrames').text( eventData.AlarmFrames );
+  $j('dataTotalScore').text( eventData.TotScore );
+  $j('dataAvgScore').text( eventData.AvgScore );
+  $j('dataMaxScore').text( eventData.MaxScore );
+  $j('dataDiskSpace').text( eventData.DiskSpace );
+  $j('dataStorage').text( eventData.Storage );
+
+  // Refresh the status of the archive buttons
+  archiveBtn.prop('disabled', !(!eventData.Archived && canEdit.Events));
+  unarchiveBtn.prop('disabled', !(eventData.Archived && canEdit.Events));
+
+  history.replaceState(null, null, '?view=event&eid=' + eventData.Id + filterQuery + sortQuery); //if popup removed, check if this allows forward
   if ( vid && CurEventDefVideoPath ) {
     vid.src({type: 'video/mp4', src: CurEventDefVideoPath}); //Currently mp4 is all we use
     console.log('getEventResponse');
     initialAlarmCues(eventData.Id);//ajax and render, new event
-    addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartTime);
+    addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartDateTime);
     CurEventDefVideoPath = null;
     $j('#modeValue').html('Replay');
     $j('#zoomValue').html('1');
@@ -611,30 +613,24 @@ function getEventResponse(respObj, respText) {
   } else {
     drawProgressBar();
   }
-  nearEventsQuery( eventData.Id );
+  nearEventsQuery(eventData.Id);
 } // end function getEventResponse
 
-var eventReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getEventResponse} );
+function eventQuery(eventId) {
+  var data = {};
+  data.id = eventId;
+  if ( auth_hash ) data.auth = auth_hash;
 
-function eventQuery( eventId ) {
-  var eventParms = "view=request&request=status&entity=event&id="+eventId;
-  if ( auth_hash ) {
-    eventParms += '&auth='+auth_hash;
-  }
-  eventReq.send( eventParms );
+  $j.getJSON(thisUrl + '?view=request&request=status&entity=event', data)
+      .done(getEventResponse)
+      .fail(logAjaxFail);
 }
 
-var prevEventId = 0;
-var nextEventId = 0;
-var prevEventStartTime = 0;
-var nextEventStartTime = 0;
-var PrevEventDefVideoPath = "";
-var NextEventDefVideoPath = "";
-
-function getNearEventsResponse( respObj, respText ) {
-  if ( checkStreamForErrors( "getNearEventsResponse", respObj ) ) {
+function getNearEventsResponse(respObj, respText) {
+  if ( checkStreamForErrors('getNearEventsResponse', respObj) ) {
     return;
   }
+  console.log(respObj);
   prevEventId = respObj.nearevents.PrevEventId;
   nextEventId = respObj.nearevents.NextEventId;
   prevEventStartTime = Date.parse(respObj.nearevents.PrevEventStartTime);
@@ -642,131 +638,14 @@ function getNearEventsResponse( respObj, respText ) {
   PrevEventDefVideoPath = respObj.nearevents.PrevEventDefVideoPath;
   NextEventDefVideoPath = respObj.nearevents.NextEventDefVideoPath;
 
-  var prevEventBtn = $('prevEventBtn');
-  if ( prevEventBtn ) prevEventBtn.disabled = !prevEventId;
-  var nextEventBtn = $('nextEventBtn');
-  if ( nextEventBtn ) nextEventBtn.disabled = !nextEventId;
   $j('#prevBtn').prop('disabled', prevEventId == 0 ? true : false).attr('class', prevEventId == 0 ? 'unavail' : 'inactive');
   $j('#nextBtn').prop('disabled', nextEventId == 0 ? true : false).attr('class', nextEventId == 0 ? 'unavail' : 'inactive');
 }
 
-var nearEventsReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getNearEventsResponse} );
-
-function nearEventsQuery( eventId ) {
-  var parms = "view=request&request=status&entity=nearevents&id="+eventId+filterQuery+sortQuery;
-  nearEventsReq.send( parms );
-}
-
-var frameBatch = 40;
-
-function loadEventThumb( event, frame, loadImage ) {
-  var thumbImg = $('eventThumb'+frame.FrameId);
-  if ( !thumbImg ) {
-    console.error('No holder found for frame '+frame.FrameId);
-    return;
-  }
-  var img = new Asset.image( imagePrefix+frame.EventId+"&fid="+frame.FrameId,
-      {
-        'onload': ( function( loadImage ) {
-          thumbImg.setProperty( 'src', img.getProperty( 'src' ) );
-          thumbImg.removeClass( 'placeholder' );
-          thumbImg.setProperty( 'class', frame.Type=='Alarm'?'alarm':'normal' );
-          thumbImg.setProperty( 'title', frame.FrameId+' / '+((frame.Type=='Alarm')?frame.Score:0) );
-          thumbImg.removeEvents( 'click' );
-          thumbImg.addEvent( 'click', function() {
-            locateImage( frame.FrameId, true );
-          } );
-          if ( loadImage ) {
-            loadEventImage( event, frame );
-          }
-        } ).pass( loadImage )
-      }
-  );
-}
-
-function loadEventImage(event, frame) {
-  console.debug('Loading '+event.Id+'/'+frame.FrameId);
-  var eventImg = $('eventImage');
-  var thumbImg = $('eventThumb'+frame.FrameId);
-  if ( eventImg.getProperty('src') != thumbImg.getProperty('src') ) {
-    var eventImagePanel = $('eventImagePanel');
-
-    if ( eventImagePanel.getStyle('display') != 'none' ) {
-      var lastThumbImg = $('eventThumb'+eventImg.getProperty('alt'));
-      lastThumbImg.removeClass('selected');
-      lastThumbImg.setOpacity(1.0);
-    }
-
-    $('eventImageBar').setStyle('width', event.Width);
-    if ( frame.Type == 'Alarm' ) {
-      $('eventImageStats').removeClass('hidden');
-    } else {
-      $('eventImageStats').addClass('hidden');
-    }
-    thumbImg.addClass('selected');
-    thumbImg.setOpacity(0.5);
-
-    if ( eventImagePanel.getStyle('display') == 'none' ) {
-      eventImagePanel.setOpacity(0);
-      eventImagePanel.setStyle('display', 'inline-block');
-      new Fx.Tween( eventImagePanel, {duration: 500, transition: Fx.Transitions.Sine} ).start( 'opacity', 0, 1 );
-    }
-
-    eventImg.setProperties( {
-      'class': frame.Type=='Alarm'?'alarm':'normal',
-      'src': thumbImg.getProperty( 'src' ),
-      'title': thumbImg.getProperty( 'title' ),
-      'alt': thumbImg.getProperty( 'alt' ),
-      'height': $j('#eventThumbs').height() - $j('#eventImageBar').outerHeight(true)-10
-    } );
-
-    $('eventImageNo').set('text', frame.FrameId);
-    $('prevImageBtn').disabled = (frame.FrameId==1);
-    $('nextImageBtn').disabled = (frame.FrameId==event.Frames);
-  }
-}
-
-function hideEventImageComplete() {
-  var thumbImg = $('eventThumb'+$('eventImage').getProperty('alt'));
-  if ( thumbImg ) {
-    thumbImg.removeClass('selected');
-    thumbImg.setOpacity(1.0);
-  } else {
-    console.log('Unable to find eventThumb at eventThumb'+$('eventImage').getProperty('alt'));
-  }
-  $('prevImageBtn').disabled = true;
-  $('nextImageBtn').disabled = true;
-  $('eventImagePanel').setStyle('display', 'none');
-  $('eventImageStats').addClass('hidden');
-}
-
-function hideEventImage() {
-  if ( $('eventImagePanel').getStyle('display') != 'none' ) {
-    new Fx.Tween( $('eventImagePanel'), {duration: 500, transition: Fx.Transitions.Sine, onComplete: hideEventImageComplete} ).start('opacity', 1, 0);
-  }
-}
-
-function resetEventStills() {
-  hideEventImage();
-  $('eventThumbs').empty();
-  if ( true || !slider ) {
-    slider = new Slider( $('thumbsSlider'), $('thumbsKnob'), {
-      /*steps: eventData.Frames,*/
-      onChange: function( step ) {
-        if ( !step ) {
-          step = 0;
-        }
-        var fid = parseInt((step * eventData.Frames)/this.options.steps);
-        if ( fid < 1 ) {
-          fid = 1;
-        } else if ( fid > eventData.Frames ) {
-          fid = eventData.Frames;
-        }
-        checkFrames( eventData.Id, fid, ($j('#eventImagePanel').css('display')=='none'?'':'true'));
-        scroll.toElement( 'eventThumb'+fid );
-      }
-    } ).set( 0 );
-  }
+function nearEventsQuery(eventId) {
+  $j.getJSON(thisUrl + '?view=request&request=status&entity=nearevents&id='+eventId+filterQuery+sortQuery)
+      .done(getNearEventsResponse)
+      .fail(logAjaxFail);
 }
 
 function getFrameResponse(respObj, respText) {
@@ -786,112 +665,16 @@ function getFrameResponse(respObj, respText) {
   }
 
   eventData['frames'][frame.FrameId] = frame;
-
-  loadEventThumb(eventData, frame, respObj.loopback=="true");
 }
 
-var frameReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'chain', onSuccess: getFrameResponse} );
-
 function frameQuery( eventId, frameId, loadImage ) {
-  var parms = "view=request&request=status&entity=frameimage&id[0]="+eventId+"&id[1]="+frameId+"&loopback="+loadImage;
-  frameReq.send(parms);
-}
+  var data = {};
+  data.loopback = loadImage;
+  data.id = {eventId, frameId};
 
-var currFrameId = null;
-
-function checkFrames( eventId, frameId, loadImage ) {
-  if ( !eventData ) {
-    console.error("No event "+eventId+" found");
-    return;
-  }
-
-  if ( !eventData['frames'] ) {
-    eventData['frames'] = {};
-  }
-
-  currFrameId = frameId;
-
-  var loFid = frameId - frameBatch/2;
-  if ( loFid < 1 ) {
-    loFid = 1;
-  }
-  var hiFid = loFid + (frameBatch-1);
-  if ( hiFid > eventData.Frames ) {
-    hiFid = eventData.Frames;
-  }
-
-  for ( var fid = loFid; fid <= hiFid; fid++ ) {
-    if ( !$('eventThumb'+fid) ) {
-      var img = new Element('img', {'id': 'eventThumb'+fid, 'src': 'graphics/transparent.png', 'alt': fid, 'class': 'placeholder'});
-      img.addEvent('click', function() {
-        eventData['frames'][fid] = null;
-        checkFrames(eventId, fid);
-      });
-      frameQuery(eventId, fid, loadImage && (fid == frameId));
-      var imgs = $('eventThumbs').getElements('img');
-      var injected = false;
-      if ( fid < imgs.length ) {
-        img.inject(imgs[fid-1], 'before');
-        injected = true;
-      } else {
-        injected = imgs.some(
-            function( thumbImg, index ) {
-              if ( parseInt(img.getProperty('alt')) < parseInt(thumbImg.getProperty('alt')) ) {
-                img.inject(thumbImg, 'before');
-                return true;
-              }
-              return false;
-            }
-        );
-      }
-      if ( !injected ) {
-        img.inject($('eventThumbs'));
-      }
-      var scale = parseInt(img.getStyle('height'));
-      img.setStyles( {
-        'width': parseInt((eventData.Width*scale)/100),
-        'height': parseInt((eventData.Height*scale)/100)
-      } );
-    } else if ( eventData['frames'][fid] ) {
-      if ( loadImage && (fid == frameId) ) {
-        loadEventImage( eventData, eventData['frames'][fid], loadImage );
-      }
-    }
-  }
-  $('prevThumbsBtn').disabled = (frameId==1);
-  $('nextThumbsBtn').disabled = (frameId==eventData.Frames);
-}
-
-function locateImage( frameId, loadImage ) {
-  if ( slider ) {
-    slider.fireEvent( 'tick', slider.toPosition( parseInt((frameId-1)*slider.options.steps/eventData.Frames) ));
-  }
-  checkFrames( eventData.Id, frameId, loadImage );
-  scroll.toElement( 'eventThumb'+frameId );
-}
-
-function prevImage() {
-  if ( currFrameId > 1 ) {
-    locateImage( parseInt(currFrameId)-1, true );
-  }
-}
-
-function nextImage() {
-  if ( currFrameId < eventData.Frames ) {
-    locateImage( parseInt(currFrameId)+1, true );
-  }
-}
-
-function prevThumbs() {
-  if ( currFrameId > 1 ) {
-    locateImage( parseInt(currFrameId)>10?(parseInt(currFrameId)-10):1, $('eventImagePanel').getStyle('display')!="none" );
-  }
-}
-
-function nextThumbs() {
-  if ( currFrameId < eventData.Frames ) {
-    locateImage( parseInt(currFrameId)<(eventData.Frames-10)?(parseInt(currFrameId)+10):eventData.Frames, $('eventImagePanel').getStyle('display')!="none" );
-  }
+  $j.getJSON(thisUrl + '?view=request&request=status&entity=frameimage', data)
+      .done(getFrameResponse)
+      .fail(logAjaxFail);
 }
 
 function prevEvent() {
@@ -918,111 +701,35 @@ function getActResponse( respObj, respText ) {
   }
 }
 
-var actReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getActResponse} );
-
 function actQuery(action, parms) {
-  var actParms = "view=request&request=event&id="+eventData.Id+"&action="+action;
-  if ( auth_hash ) {
-    actParms += '&auth='+auth_hash;
-  }
-  if ( parms != null ) {
-    actParms += "&"+Object.toQueryString(parms);
-  }
-  actReq.send(actParms);
-}
+  var data = {};
+  if ( parms ) data = parms;
+  if ( auth_hash ) data.auth = auth_hash;
+  data.id = eventData.Id;
+  data.action = action;
 
-function deleteEvent() {
-  pauseClicked(); //Provides visual feedback that your click happened.
-
-  var deleteReq = new Request.JSON({
-    url: thisUrl,
-    method: 'post',
-    timeout: AJAX_TIMEOUT,
-    onSuccess: function onDeleteSuccess(respObj, respText) {
-      getActResponse(respObj, respText);
-      // We must wait for the deletion to happen before navigating to the next
-      // event or this request will be cancelled.
-      streamNext(true);
-    },
-  });
-  deleteReq.send("view=request&request=event&id="+eventData.Id+"&action=delete");
+  $j.getJSON(thisUrl + '?view=request&request=event', data)
+      .done(getActResponse)
+      .fail(logAjaxFail);
 }
 
 function renameEvent() {
-  var newName = $('eventName').get('value');
+  var newName = $j('input').val();
   actQuery('rename', {eventName: newName});
-}
-
-function editEvent() {
-  createPopup('?view=eventdetail&eid='+eventData.Id, 'zmEventDetail', 'eventdetail');
+  //FIXME: update the value of the event name rather than reload the whole page
+  window.location.reload(true);
 }
 
 function exportEvent() {
-  createPopup('?view=export&eid='+eventData.Id, 'zmExport', 'export');
-}
-
-function archiveEvent() {
-  actQuery('archive');
-}
-
-function unarchiveEvent() {
-  actQuery('unarchive');
+  window.location.assign('?view=export&eid='+eventData.Id);
 }
 
 function showEventFrames() {
-  createPopup('?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT);
-}
-
-function showStream() {
-  $('eventStills').addClass('hidden');
-  $('eventVideo').removeClass('hidden');
-
-  $('stillsEvent').removeClass('hidden');
-  $('streamEvent').addClass('hidden');
-
-  streamMode = 'video';
-  if (scale == 'auto') changeScale();
-}
-
-function showStills() {
-  $('eventStills').removeClass('hidden');
-  $('eventVideo').addClass('hidden');
-
-  if (vid && ( vid.paused != true ) ) {
-    // Pause the video
-    vid.pause();
-
-    // Update the button text to 'Play'
-    //if ( playButton )
-    //playButton.innerHTML = "Play";
-  }
-
-  $('stillsEvent').addClass('hidden');
-  $('streamEvent').removeClass('hidden');
-
-  streamMode = 'stills';
-
-  pauseClicked();
-  if ( !scroll ) {
-    scroll = new Fx.Scroll('eventThumbs', {
-      wait: false,
-      duration: 500,
-      offset: {'x': 0, 'y': 0},
-      transition: Fx.Transitions.Quad.easeInOut
-    }
-    );
-  }
-  resetEventStills();
-  if (scale == 'auto') changeScale();
-}
-
-function showFrameStats() {
-  var fid = $('eventImageNo').get('text');
-  createPopup('?view=stats&eid='+eventData.Id+'&fid='+fid, 'zmStats', 'stats', eventData.Width, eventData.Height);
+  window.location.assign('?view=frames&eid='+eventData.Id);
 }
 
 function videoEvent() {
-  createPopup('?view=video&eid='+eventData.Id, 'zmVideo', 'video', eventData.Width, eventData.Height);
+  window.location.assign('?view=video&eid='+eventData.Id);
 }
 
 // Called on each event load because each event can be a different width
@@ -1051,13 +758,14 @@ function progressBarNav() {
 
 function handleClick( event ) {
   var target = event.target;
+  var rect = target.getBoundingClientRect();
   if ( vid ) {
     if (target.id != 'videoobj') return; // ignore clicks on control bar
     var x = event.offsetX;
     var y = event.offsetY;
   } else {
-    var x = event.page.x - $(target).getLeft();
-    var y = event.page.y - $(target).getTop();
+    var x = event.page.x - rect.left;
+    var y = event.page.y - rect.top;
   }
 
   if ( event.shift || event.shiftKey ) { // handle both jquery and mootools
@@ -1069,11 +777,112 @@ function handleClick( event ) {
   }
 }
 
+// Manage the DELETE CONFIRMATION modal button
+function manageDelConfirmModalBtns() {
+  document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) {
+    if ( !canEdit.Events ) {
+      enoperm();
+      return;
+    }
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&task=delete&eids[]='+eventData.Id)
+        .done(function(data) {
+          streamNext(true);
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the CANCEL modal button
+  document.getElementById("delCancelBtn").addEventListener("click", function onDelCancelClick(evt) {
+    $j('#deleteConfirm').modal('hide');
+  });
+}
+
+function getEvtStatsCookie() {
+  var cookie = 'zmEventStats';
+  var stats = getCookie(cookie);
+
+  if ( !stats ) {
+    stats = 'on';
+    setCookie(cookie, stats, 10*365);
+  }
+  return stats;
+}
+
+function getStat() {
+  table.empty().append('<tbody>');
+  $j.each(eventDataStrings, function(key) {
+    var th = $j('<th>').addClass('text-right').text(eventDataStrings[key]);
+    var tdString;
+
+    switch ( ( eventData[key] && eventData[key].length ) ? key : 'n/a') {
+      case 'Frames':
+        tdString = '<a href="?view=frames&amp;eid=' + eventData.Id + '">' + eventData[key] + '</a>';
+        break;
+      case 'AlarmFrames':
+        tdString = '<a href="?view=frames&amp;eid=' + eventData.Id + '">' + eventData[key] + '</a>';
+        break;
+      case 'MaxScore':
+        tdString = '<a href="?view=frame&amp;eid=' + eventData.Id + '&amp;fid=0">' + eventData[key] + '</a>';
+        break;
+      case 'n/a':
+        tdString = 'n/a';
+        break;
+      default:
+        tdString = eventData[key];
+    }
+
+    var td = $j('<td>').html(tdString);
+    var row = $j('<tr>').append(th, td);
+
+    $j('#eventStatsTable tbody').append(row);
+  });
+}
+
+function onStatsResize(vidWidth) {
+  if (!vidWidth) return;
+  var minWidth = 300; // An arbitrary value in pixels used to hide the stats table
+  var scale = $j('#scale').val();
+
+  if ( parseInt(scale) ) {
+    vidWidth = vidWidth * (scale/100);
+  }
+
+  var width = $j(window).width() - vidWidth;
+  //console.log("Width: " + width + " = window.width " + $j(window).width() + "- vidWidth" + vidWidth);
+
+  // Hide the stats table if we have run out of room to show it properly
+  if ( width < minWidth ) {
+    statsBtn.prop('disabled', true);
+    if ( table.is(':visible') ) {
+      table.toggle(false);
+      wasHidden = true;
+    }
+  // Show the stats table if we hid it previously and sufficient room becomes available
+  } else if ( width >= minWidth ) {
+    statsBtn.prop('disabled', false);
+    if ( !table.is(':visible') && wasHidden ) {
+      table.toggle(true);
+      wasHidden = false;
+    }
+  }
+}
+
 function initPage() {
+  // Load the event stats
+  getStat();
+
+  if ( getEvtStatsCookie() != 'on' ) {
+    table.toggle(false);
+  } else {
+    onStatsResize(eventData.Width);
+  }
+
   //FIXME prevent blocking...not sure what is happening or best way to unblock
   if ( $j('#videoobj').length ) {
     vid = videojs('videoobj');
-    addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartTime);
+    addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartDateTime);
     $j('.vjs-progress-control').append('<div class="alarmCue"></div>');//add a place for videojs only on first load
     vid.on('ended', vjsReplay);
     vid.on('play', vjsPlay);
@@ -1082,11 +891,11 @@ function initPage() {
       handleClick(event);
     });
     vid.on('volumechange', function() {
-      Cookie.write('volume', vid.volume(), {duration: 10*365});
+      setCookie('volume', vid.volume(), 3600);
     });
-    if ( Cookie.read('volume') != null ) {
-      vid.volume(Cookie.read('volume'));
-    }
+    var cookie = getCookie('volume');
+    if ( cookie ) vid.volume(cookie);
+
     vid.on('timeupdate', function() {
       $j('#progressValue').html(secsToTime(Math.floor(vid.currentTime())));
     });
@@ -1098,17 +907,16 @@ function initPage() {
     }
   } else {
     progressBarNav();
-    streamCmdTimer = streamQuery.delay(250);
+    streamCmdTimer = setTimeout(streamQuery, 500);
     if ( canStreamNative ) {
-      var imageFeed = $('imageFeed');
-      if ( !imageFeed ) {
+      if ( !$j('#imageFeed') ) {
         console.log('No element with id tag imageFeed found.');
       } else {
-        var streamImg = imageFeed.getElement('img');
+        var streamImg = $j('#imageFeed img');
         if ( !streamImg ) {
-          streamImg = imageFeed.getElement('object');
+          streamImg = $j('#imageFeed object');
         }
-        $(streamImg).addEvent('click', function(event) {
+        $j(streamImg).click(function(event) {
           handleClick(event);
         });
       }
@@ -1120,7 +928,153 @@ function initPage() {
   document.querySelectorAll('select[name="rate"]').forEach(function(el) {
     el.onchange = window['changeRate'];
   });
-}
+
+  // enable or disable buttons based on current selection and user rights
+  renameBtn.prop('disabled', !canEdit.Events);
+  archiveBtn.prop('disabled', !(!eventData.Archived && canEdit.Events));
+  unarchiveBtn.prop('disabled', !(eventData.Archived && canEdit.Events));
+  editBtn.prop('disabled', !canEdit.Events);
+  exportBtn.prop('disabled', !canView.Events);
+  downloadBtn.prop('disabled', !canView.Events);
+  deleteBtn.prop('disabled', !canEdit.Events);
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the BACK button
+  bindButton('#backBtn', 'click', null, function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  bindButton('#refreshBtn', 'click', null, function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the Event RENAME button
+  bindButton('#renameBtn', 'click', null, function onRenameClick(evt) {
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=modal&modal=eventrename&eid='+eventData.Id)
+        .done(function(data) {
+          insertModalHtml('eventRenameModal', data.html);
+          $j('#eventRenameModal').modal('show');
+          // Manage the SAVE button
+          $j('#eventRenameBtn').click(renameEvent);
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the ARCHIVE button
+  bindButton('#archiveBtn', 'click', null, function onArchiveClick(evt) {
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&task=archive&eids[]='+eventData.Id)
+        .done( function(data) {
+          //FIXME: update the status of the archive button reather than reload the whole page
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the UNARCHIVE button
+  bindButton('#unarchiveBtn', 'click', null, function onUnarchiveClick(evt) {
+    if ( ! canEdit.Events ) {
+      enoperm();
+      return;
+    }
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&task=unarchive&eids[]='+eventData.Id)
+        .done( function(data) {
+          //FIXME: update the status of the unarchive button reather than reload the whole page
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the EDIT button
+  bindButton('#editBtn', 'click', null, function onEditClick(evt) {
+    if ( ! canEdit.Events ) {
+      enoperm();
+      return;
+    }
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]='+eventData.Id)
+        .done(function(data) {
+          insertModalHtml('eventDetailModal', data.html);
+          $j('#eventDetailModal').modal('show');
+          // Manage the Save button
+          $j('#eventDetailSaveBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#eventDetailForm').submit();
+          });
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the EXPORT button
+  bindButton('#exportBtn', 'click', null, function onExportClick(evt) {
+    evt.preventDefault();
+    window.location.assign('?view=export&eids[]='+eventData.Id);
+  });
+
+  // Manage the DOWNLOAD VIDEO button
+  bindButton('#downloadBtn', 'click', null, function onDownloadClick(evt) {
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=modal&modal=download&eids[]='+eventData.Id)
+        .done(function(data) {
+          insertModalHtml('downloadModal', data.html);
+          $j('#downloadModal').modal('show');
+          // Manage the GENERATE DOWNLOAD button
+          $j('#exportButton').click(exportEvent);
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the Event STATISTICS Button
+  bindButton('#statsBtn', 'click', null, function onStatsClick(evt) {
+    evt.preventDefault();
+    var cookie = 'zmEventStats';
+
+    // Toggle the visiblity of the stats table and write an appropriate cookie
+    if ( table.is(':visible') ) {
+      setCookie(cookie, 'off', 10*365);
+      table.toggle(false);
+    } else {
+      setCookie(cookie, 'on', 10*365);
+      table.toggle(true);
+    }
+  });
+
+  // Manage the FRAMES Button
+  bindButton('#framesBtn', 'click', null, function onFramesClick(evt) {
+    evt.preventDefault();
+    window.location.assign('?view=frames&eid='+eventData.Id);
+  });
+
+  // Manage the DELETE button
+  bindButton('#deleteBtn', 'click', null, function onDeleteClick(evt) {
+    if ( !canEdit.Events ) {
+      enoperm();
+      return;
+    }
+
+    evt.preventDefault();
+    if ( ! $j('#deleteConfirm').length ) {
+      // Load the delete confirmation modal into the DOM
+      $j.getJSON(thisUrl + '?request=modal&modal=delconfirm')
+          .done(function(data) {
+            insertModalHtml('deleteConfirm', data.html);
+            manageDelConfirmModalBtns();
+            $j('#deleteConfirm').modal('show');
+          })
+          .fail(logAjaxFail);
+      return;
+    }
+    $j('#deleteConfirm').modal('show');
+  });
+} // end initPage
 
 // Kick everything off
-window.addEventListener('DOMContentLoaded', initPage);
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/event.js.php b/web/skins/classic/views/js/event.js.php
index b3f746e07..a07f4a3b2 100644
--- a/web/skins/classic/views/js/event.js.php
+++ b/web/skins/classic/views/js/event.js.php
@@ -16,6 +16,7 @@
 var CMD_NONE = <?php echo CMD_NONE ?>;
 var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
 var CMD_PLAY = <?php echo CMD_PLAY ?>;
+var CMD_VARPLAY = <?php echo CMD_VARPLAY ?>;
 var CMD_STOP = <?php echo CMD_STOP ?>;
 var CMD_FASTFWD = <?php echo CMD_FASTFWD ?>;
 var CMD_SLOWFWD = <?php echo CMD_SLOWFWD ?>;
@@ -38,16 +39,51 @@ var SCALE_BASE = <?php echo SCALE_BASE ?>;
 var connKey = '<?php echo $connkey ?>';
 
 var eventData = {
+<?php if ( $Event->Id() ) { ?>
     Id: '<?php echo $Event->Id() ?>',
+    Name: '<?php echo $Event->Name() ?>',
     MonitorId: '<?php echo $Event->MonitorId() ?>',
+    MonitorName: '<?php echo validJsStr($Monitor->Name()) ?>',
+    Cause: '<?php echo validHtmlStr($Event->Cause()) ?>',
     Width: '<?php echo $Event->Width() ?>',
     Height: '<?php echo $Event->Height() ?>',
     Length: '<?php echo $Event->Length() ?>',
-    StartTime: '<?php echo $Event->StartTime() ?>',
-    EndTime: '<?php echo $Event->EndTime() ?>',
+    StartDateTime: '<?php echo $Event->StartDateTime() ?>',
+    StartDateTimeFmt: '<?php echo strftime(STRF_FMT_DATETIME_SHORT, strtotime($Event->StartDateTime())) ?>',
+    EndDateTime: '<?php echo $Event->EndDateTime() ?>',
     Frames: '<?php echo $Event->Frames() ?>',
-    MonitorName: '<?php echo validJsStr($Monitor->Name()) ?>'
+    AlarmFrames: '<?php echo $Event->AlarmFrames() ?>',
+    TotScore: '<?php echo $Event->TotScore() ?>',
+    AvgScore: '<?php echo $Event->AvgScore() ?>',
+    MaxScore: '<?php echo $Event->MaxScore() ?>',
+    DiskSpace: '<?php echo human_filesize($Event->DiskSpace(null)) ?>',
+    Storage: '<?php echo validHtmlStr($Event->Storage()->Name()).( $Event->SecondaryStorageId() ? ', '.validHtmlStr($Event->SecondaryStorage()->Name()) : '' ) ?>',
+    ArchivedStr: '<?php echo $Event->Archived ? translate('Yes') : translate('No') ?>',
+    EmailedStr: '<?php echo $Event->Emailed ? translate('Yes') : translate('No') ?>',
+    Archived: <?php echo $Event->Archived?'true':'false' ?>,
+    Emailed: <?php echo $Event->Emailed?'true':'false' ?>
+<?php } ?>
 };
+
+var eventDataStrings = {
+    Id: '<?php echo translate('EventId') ?>',
+    Name: '<?php echo translate('EventName') ?>',
+    MonitorId: '<?php echo translate('AttrMonitorId') ?>',
+    MonitorName: '<?php echo translate('AttrMonitorName') ?>',
+    Cause: '<?php echo translate('Cause') ?>',
+    StartDateTimeFmt: '<?php echo translate('AttrStartTime') ?>',
+    Length: '<?php echo translate('Duration') ?>',
+    Frames: '<?php echo translate('AttrFrames') ?>',
+    AlarmFrames: '<?php echo translate('AttrAlarmFrames') ?>',
+    TotScore: '<?php echo translate('AttrTotalScore') ?>',
+    AvgScore: '<?php echo translate('AttrAvgScore') ?>',
+    MaxScore: '<?php echo translate('AttrMaxScore') ?>',
+    DiskSpace: '<?php echo translate('DiskSpace') ?>',
+    Storage: '<?php echo translate('Storage') ?>',
+    ArchivedStr: '<?php echo translate('Archived') ?>',
+    EmailedStr: '<?php echo translate('Emailed') ?>'
+};
+
 var monitorUrl = '<?php echo $Event->Storage()->Server()->UrlToIndex(); ?>';
 
 var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>';
@@ -58,7 +94,6 @@ var rate = '<?php echo $rate ?>'; // really only used when setting up initial pl
 var scale = "<?php echo $scale ?>";
 var LabelFormat = "<?php echo validJsStr($Monitor->LabelFormat())?>";
 
-var canEditEvents = <?php echo canEdit('Events')?'true':'false' ?>;
 var streamTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
 
 var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js
index 572fd6e29..9f6d34f75 100644
--- a/web/skins/classic/views/js/events.js
+++ b/web/skins/classic/views/js/events.js
@@ -1,20 +1,79 @@
-function thumbnail_onmouseover(event) {
-  var img = event.target;
-  img.src = '';
-  img.src = img.getAttribute('stream_src');
+var backBtn = $j('#backBtn');
+var viewBtn = $j('#viewBtn');
+var archiveBtn = $j('#archiveBtn');
+var unarchiveBtn = $j('#unarchiveBtn');
+var editBtn = $j('#editBtn');
+var exportBtn = $j('#exportBtn');
+var downloadBtn = $j('#downloadBtn');
+var deleteBtn = $j('#deleteBtn');
+var table = $j('#eventTable');
+
+/*
+This is the format of the json object sent by bootstrap-table
+
+var params =
+{
+"type":"get",
+"data":
+  {
+  "search":"some search text",
+  "sort":"StartDateTime",
+  "order":"asc",
+  "offset":0,
+  "limit":25
+  "filter":
+    {
+    "Name":"some advanced search text"
+    "StartDateTime":"some more advanced search text"
+    }
+  },
+"cache":true,
+"contentType":"application/json",
+"dataType":"json"
+};
+*/
+
+// Called by bootstrap-table to retrieve zm event data
+function ajaxRequest(params) {
+  if ( params.data && params.data.filter ) {
+    params.data.advsearch = params.data.filter;
+    delete params.data.filter;
+  }
+  $j.getJSON(thisUrl + '?view=request&request=events&task=query'+filterQuery, params.data)
+      .done(function(data) {
+        var rows = processRows(data.rows);
+        // rearrange the result into what bootstrap-table expects
+        params.success({total: data.total, totalNotFiltered: data.totalNotFiltered, rows: rows});
+      })
+      .fail(function(jqXHR) {
+        logAjaxFail(jqXHR);
+        $j('#eventTable').bootstrapTable('refresh');
+      });
 }
 
-function thumbnail_onmouseout(event) {
-  var img = event.target;
-  img.src = '';
-  img.src = img.getAttribute('still_src');
-}
+function processRows(rows) {
+  $j.each(rows, function(ndx, row) {
+    var eid = row.Id;
+    var archived = row.Archived == yesString ? archivedString : '';
+    var emailed = row.Emailed == yesString ? emailedString : '';
 
-function initThumbAnimation() {
-  $j('.colThumbnail img').each(function() {
-    this.addEventListener('mouseover', thumbnail_onmouseover, false);
-    this.addEventListener('mouseout', thumbnail_onmouseout, false);
+    row.Id = '<a href="?view=event&amp;eid=' + eid + filterQuery + sortQuery + '&amp;page=1">' + eid + '</a>';
+    row.Name = '<a href="?view=event&amp;eid=' + eid + filterQuery + sortQuery + '&amp;page=1">' + row.Name + '</a>' +
+        '<br/><div class="small text-nowrap text-muted">' + archived + emailed + '</div>';
+    if ( canEdit.Monitors ) row.Monitor = '<a href="?view=event&amp;eid=' + eid + '">' + row.Monitor + '</a>';
+    if ( canEdit.Events ) row.Cause = '<a href="#" title="' + row.Notes + '" class="eDetailLink" data-eid="' + eid + '">' + row.Cause + '</a>';
+    if ( row.Notes.indexOf('detected:') >= 0 ) {
+      row.Cause = row.Cause + '<a href="#" class="objDetectLink" data-eid=' +eid+ '><div class="small text-nowrap text-muted"><u>' + row.Notes + '</u></div></div></a>';
+    } else if ( row.Notes != 'Forced Web: ' ) {
+      row.Cause = row.Cause + '<br/><div class="small text-nowrap text-muted">' + row.Notes + '</div>';
+    }
+    row.Frames = '<a href="?view=frames&amp;eid=' + eid + '">' + row.Frames + '</a>';
+    row.AlarmFrames = '<a href="?view=frames&amp;eid=' + eid + '">' + row.AlarmFrames + '</a>';
+    row.MaxScore = '<a href="?view=frame&amp;eid=' + eid + '&amp;fid=0">' + row.MaxScore + '</a>';
+    if ( WEB_LIST_THUMBS ) row.Thumbnail = '<a href="?view=event&amp;eid=' + eid + filterQuery + sortQuery + '&amp;page=1">' + row.imgHtml + '</a>';
   });
+
+  return rows;
 }
 
 // Returns the event id's of the selected rows
@@ -39,23 +98,16 @@ function getArchivedSelections() {
 function getDelConfirmModal() {
   $j.getJSON(thisUrl + '?request=modal&modal=delconfirm')
       .done(function(data) {
-        if ( $j('#deleteConfirm').length ) {
-          $j('#deleteConfirm').replaceWith(data.html);
-        } else {
-          $j("body").append(data.html);
-        }
+        insertModalHtml('deleteConfirm', data.html);
         manageDelConfirmModalBtns();
       })
-      .fail(function(jqxhr, textStatus, error) {
-        console.log("Request Failed: " + textStatus + ", " + error);
-        console.log("Response Text: " + jqxhr.responseText);
-      });
+      .fail(logAjaxFail);
 }
 
 // Manage the DELETE CONFIRMATION modal button
 function manageDelConfirmModalBtns() {
   document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) {
-    if ( ! canEditEvents ) {
+    if ( ! canEdit.Events ) {
       enoperm();
       return;
     }
@@ -63,14 +115,15 @@ function manageDelConfirmModalBtns() {
     var selections = getIdSelections();
 
     evt.preventDefault();
-    $j.getJSON(thisUrl + '?request=events&action=delete&eids[]='+selections.join('&eids[]='))
+    $j.getJSON(thisUrl + '?request=events&task=delete&eids[]='+selections.join('&eids[]='))
         .done( function(data) {
           $j('#eventTable').bootstrapTable('refresh');
-          window.location.reload(true);
+          $j('#deleteConfirm').modal('hide');
         })
-        .fail(function(jqxhr, textStatus, error) {
-          console.log("Request Failed: " + textStatus + ", " + error);
-          console.log("Response Text: " + jqxhr.responseText);
+        .fail( function(jqxhr) {
+          logAjaxFail(jqxhr);
+          $j('#eventTable').bootstrapTable('refresh');
+          $j('#deleteConfirm').modal('hide');
         });
   });
 
@@ -83,11 +136,7 @@ function manageDelConfirmModalBtns() {
 function getEventDetailModal(eid) {
   $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]=' + eid)
       .done(function(data) {
-        if ( $j('#eventDetailModal').length ) {
-          $j('#eventDetailModal').replaceWith(data.html);
-        } else {
-          $j("body").append(data.html);
-        }
+        insertModalHtml('eventDetailModal', data.html);
         $j('#eventDetailModal').modal('show');
         // Manage the Save button
         $j('#eventDetailSaveBtn').click(function(evt) {
@@ -95,42 +144,27 @@ function getEventDetailModal(eid) {
           $j('#eventDetailForm').submit();
         });
       })
-      .fail(function(jqxhr, textStatus, error) {
-        console.log("Request Failed: " + textStatus + ", " + error);
-        console.log("Response Text: " + jqxhr.responseText);
-      });
+      .fail(logAjaxFail);
+}
+
+function getObjdetectModal(eid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=objdetect&eid=' + eid)
+      .done(function(data) {
+        insertModalHtml('objdetectModal', data.html);
+        $j('#objdetectModal').modal('show');
+      })
+      .fail(logAjaxFail);
 }
 
 function initPage() {
-  var backBtn = $j('#backBtn');
-  var viewBtn = $j('#viewBtn');
-  var archiveBtn = $j('#archiveBtn');
-  var unarchiveBtn = $j('#unarchiveBtn');
-  var editBtn = $j('#editBtn');
-  var exportBtn = $j('#exportBtn');
-  var downloadBtn = $j('#downloadBtn');
-  var deleteBtn = $j('#deleteBtn');
-  var table = $j('#eventTable');
+  // Remove the thumbnail column from the DOM if thumbnails are off globally
+  if ( !WEB_LIST_THUMBS ) $j('th[data-field="Thumbnail"]').remove();
 
   // Load the delete confirmation modal into the DOM
   getDelConfirmModal();
 
-  // Define the icons used in the bootstrap-table top-right toolbar
-  var icons = {
-    paginationSwitchDown: 'fa-caret-square-o-down',
-    paginationSwitchUp: 'fa-caret-square-o-up',
-    export: 'fa-download',
-    refresh: 'fa-sync',
-    toggleOff: 'fa-toggle-off',
-    toggleOn: 'fa-toggle-on',
-    columns: 'fa-th-list',
-    fullscreen: 'fa-arrows-alt',
-    detailOpen: 'fa-plus',
-    detailClose: 'fa-minus'
-  };
-
   // Init the bootstrap-table
-  table.bootstrapTable('destroy').bootstrapTable({icons: icons});
+  table.bootstrapTable({icons: icons});
 
   // Hide these columns on first run when no cookie is saved
   if ( !getCookie("zmEventsTable.bs.table.columns") ) {
@@ -144,13 +178,13 @@ function initPage() {
   function() {
     selections = table.bootstrapTable('getSelections');
 
-    viewBtn.prop('disabled', !(selections.length && canViewEvents));
-    archiveBtn.prop('disabled', !(selections.length && canEditEvents));
-    unarchiveBtn.prop('disabled', !(getArchivedSelections()) && canEditEvents);
-    editBtn.prop('disabled', !(selections.length && canEditEvents));
-    exportBtn.prop('disabled', !(selections.length && canViewEvents));
-    downloadBtn.prop('disabled', !(selections.length && canViewEvents));
-    deleteBtn.prop('disabled', !(selections.length && canEditEvents));
+    viewBtn.prop('disabled', !(selections.length && canView.Events));
+    archiveBtn.prop('disabled', !(selections.length && canEdit.Events));
+    unarchiveBtn.prop('disabled', !(getArchivedSelections()) && canEdit.Events);
+    editBtn.prop('disabled', !(selections.length && canEdit.Events));
+    exportBtn.prop('disabled', !(selections.length && canView.Events));
+    downloadBtn.prop('disabled', !(selections.length && canView.Events));
+    deleteBtn.prop('disabled', !(selections.length && canEdit.Events));
   });
 
   // Don't enable the back button if there is no previous zm page to go back to
@@ -180,6 +214,12 @@ function initPage() {
     window.location.assign('?view=timeline'+filterQuery);
   });
 
+  // Manage the FILTER Button
+  document.getElementById("filterBtn").addEventListener("click", function onFilterClick(evt) {
+    evt.preventDefault();
+    window.location.assign('?view=filter'+filterQuery);
+  });
+
   // Manage the VIEW button
   document.getElementById("viewBtn").addEventListener("click", function onViewClick(evt) {
     var selections = getIdSelections();
@@ -194,50 +234,34 @@ function initPage() {
     var selections = getIdSelections();
 
     evt.preventDefault();
-    $j.getJSON(thisUrl + '?request=events&action=archive&eids[]='+selections.join('&eids[]='))
+    $j.getJSON(thisUrl + '?request=events&task=archive&eids[]='+selections.join('&eids[]='))
         .done( function(data) {
           $j('#eventTable').bootstrapTable('refresh');
-          window.location.reload(true);
         })
-        .fail(function(jqxhr, textStatus, error) {
-          console.log("Request Failed: " + textStatus + ", " + error);
-          console.log("Response Text: " + jqxhr.responseText);
-        });
+        .fail(logAjaxFail);
   });
 
   // Manage the UNARCHIVE button
   document.getElementById("unarchiveBtn").addEventListener("click", function onUnarchiveClick(evt) {
-    if ( ! canEditEvents ) {
+    if ( ! canEdit.Events ) {
       enoperm();
       return;
     }
 
     var selections = getIdSelections();
-    console.log(selections);
+    //console.log(selections);
 
     evt.preventDefault();
-    $j.getJSON(thisUrl + '?request=events&action=unarchive&eids[]='+selections.join('&eids[]='))
+    $j.getJSON(thisUrl + '?request=events&task=unarchive&eids[]='+selections.join('&eids[]='))
         .done( function(data) {
           $j('#eventTable').bootstrapTable('refresh');
-          window.location.reload(true);
         })
-        .fail(function(jqxhr, textStatus, error) {
-          console.log("Request Failed: " + textStatus + ", " + error);
-          console.log("Response Text: " + jqxhr.responseText);
-        });
-
-    if ( openFilterWindow ) {
-      //opener.location.reload(true);
-      createPopup( '?view=filter&page='+thisPage+filterQuery, 'zmFilter', 'filter' );
-      location.replace( '?view='+currentView+'&page='+thisPage+filterQuery );
-    } else {
-      window.location.reload(true);
-    }
+        .fail(logAjaxFail);
   });
 
   // Manage the EDIT button
   document.getElementById("editBtn").addEventListener("click", function onEditClick(evt) {
-    if ( ! canEditEvents ) {
+    if ( ! canEdit.Events ) {
       enoperm();
       return;
     }
@@ -247,11 +271,7 @@ function initPage() {
     evt.preventDefault();
     $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]='+selections.join('&eids[]='))
         .done(function(data) {
-          if ( $j('#eventDetailModal').length ) {
-            $j('#eventDetailModal').replaceWith(data.html);
-          } else {
-            $j("body").append(data.html);
-          }
+          insertModalHtml('eventDetailModal', data.html);
           $j('#eventDetailModal').modal('show');
           // Manage the Save button
           $j('#eventDetailSaveBtn').click(function(evt) {
@@ -259,10 +279,7 @@ function initPage() {
             $j('#eventDetailForm').submit();
           });
         })
-        .fail(function(jqxhr, textStatus, error) {
-          console.log("Request Failed: " + textStatus + ", " + error);
-          console.log("Response Text: " + jqxhr.responseText);
-        });
+        .fail(logAjaxFail);
   });
 
   // Manage the EXPORT button
@@ -278,12 +295,19 @@ function initPage() {
     var selections = getIdSelections();
 
     evt.preventDefault();
-    createPopup('?view=download&eids[]='+selections.join('&eids[]='), 'zmDownload', 'download');
+    $j.getJSON(thisUrl + '?request=modal&modal=download&eids[]='+selections.join('&eids[]='))
+        .done(function(data) {
+          insertModalHtml('downloadModal', data.html);
+          $j('#downloadModal').modal('show');
+          // Manage the GENERATE DOWNLOAD button
+          $j('#exportButton').click(exportEvent);
+        })
+        .fail(logAjaxFail);
   });
 
   // Manage the DELETE button
   document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) {
-    if ( ! canEditEvents ) {
+    if ( ! canEdit.Events ) {
       enoperm();
       return;
     }
@@ -292,13 +316,29 @@ function initPage() {
     $j('#deleteConfirm').modal('show');
   });
 
-  // Manage the eventdetail links in the events list
-  $j(".eDetailLink").click(function(evt) {
-    evt.preventDefault();
-    var eid = $j(this).data('eid');
-    getEventDetailModal(eid);
+  // Update table links each time after new data is loaded
+  table.on('post-body.bs.table', function(data) {
+    // Manage the Object Detection links in the events list
+    $j(".objDetectLink").click(function(evt) {
+      evt.preventDefault();
+      var eid = $j(this).data('eid');
+      getObjdetectModal(eid);
+    });
+
+    // Manage the eventdetail links in the events list
+    $j(".eDetailLink").click(function(evt) {
+      evt.preventDefault();
+      var eid = $j(this).data('eid');
+      getEventDetailModal(eid);
+    });
+
+    var thumb_ndx = $j('#eventTable tr th').filter(function() {
+      return $j(this).text().trim() == 'Thumbnail';
+    }).index();
+    table.find("tr td:nth-child(" + (thumb_ndx+1) + ")").addClass('colThumbnail');
   });
 
+  table.bootstrapTable('resetSearch');
   // The table is initially given a hidden style, so now that we are done rendering, show it
   table.show();
 }
diff --git a/web/skins/classic/views/js/events.js.php b/web/skins/classic/views/js/events.js.php
index 0b96f12c5..207a6745e 100644
--- a/web/skins/classic/views/js/events.js.php
+++ b/web/skins/classic/views/js/events.js.php
@@ -2,10 +2,13 @@
   global $filterQuery;
   global $sortQuery;
 ?>
-//var openFilterWindow = <?php echo $_REQUEST['filter']?'true':'false' ?>;
-var openFilterWindow = false;
 
 var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>';
 var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>';
 
 var confirmDeleteEventsString = "<?php echo addslashes(translate('ConfirmDeleteEvents')) ?>";
+var archivedString = "<?php echo translate('Archived') ?>";
+var emailedString = "<?php echo translate('Emailed') ?>";
+var yesString = "<?php echo translate('Yes') ?>";
+var noString = "<?php echo translate('No') ?>";
+var WEB_LIST_THUMBS = <?php echo ZM_WEB_LIST_THUMBS?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/export.js b/web/skins/classic/views/js/export.js
index e5c932122..5cad88629 100644
--- a/web/skins/classic/views/js/export.js
+++ b/web/skins/classic/views/js/export.js
@@ -31,11 +31,11 @@ function startDownload(file) {
 
 function exportProgress() {
   if ( exportTimer ) {
-    var tickerText = $('exportProgressTicker').get('text');
+    var tickerText = $j('#exportProgressTicker').text();
     if ( tickerText.length < 1 || tickerText.length > 4 ) {
-      $('exportProgressTicker').set('text', '.');
+      $j('#exportProgressTicker').text('.');
     } else {
-      $('exportProgressTicker').appendText('.');
+      $j('#exportProgressTicker').append('.');
     }
   }
 }
@@ -43,10 +43,10 @@ function exportProgress() {
 function exportResponse(respObj, respText) {
   clearInterval(exportTimer);
   if ( respObj.result != 'Ok' ) {
-    $('exportProgressTicker').set('text', respObj.message);
+    $j('#exportProgressTicker').text(respObj.message);
   } else {
-    $('exportProgressTicker').set('text', exportSucceededString);
-    startDownload.pass(decodeURIComponent(respObj.exportFile)).delay(1500);
+    $j('#exportProgressTicker').text(exportSucceededString);
+    setTimeout(startDownload, 1500, decodeURIComponent(respObj.exportFile));
   }
   return;
 
@@ -64,30 +64,24 @@ function exportResponse(respObj, respText) {
 }
 
 function exportEvents( ) {
-  var parms = 'view=event&request=event&action=export';
-  parms += '&'+$('contentForm').toQueryString();
-  var query = new Request.JSON( {
-    url: thisUrl,
-    method: 'post',
-    data: parms,
-    onSuccess: exportResponse
-  } );
-  query.send();
-  $('exportProgress').removeClass('hidden');
-  $('exportProgress').setProperty('class', 'warnText');
-  $('exportProgressText').set('text', exportProgressString);
+  var formData = $j('#contentForm').serialize();
+
+  $j.getJSON(thisUrl + '?view=event&request=event&action=export', formData)
+      .done(exportResponse)
+      .fail(logAjaxFail);
+
+  $j('#exportProgress').removeClass('hidden');
+  $j('#exportProgress').addClass('warnText');
+  $j('#exportProgress').text(exportProgressString);
+
   //exportProgress();
-  exportTimer = exportProgress.periodical( 500 );
+  exportTimer = setInterval(exportProgress, 500);
 }
 
 function getEventDetailModal(eid) {
   $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]=' + eid)
       .done(function(data) {
-        if ( $j('#eventDetailModal').length ) {
-          $j('#eventDetailModal').replaceWith(data.html);
-        } else {
-          $j("body").append(data.html);
-        }
+        insertModalHtml('eventDetailModal', data.html);
         $j('#eventDetailModal').modal('show');
         // Manage the Save button
         $j('#eventDetailSaveBtn').click(function(evt) {
@@ -95,24 +89,37 @@ function getEventDetailModal(eid) {
           $j('#eventDetailForm').submit();
         });
       })
-      .fail(function(jqxhr, textStatus, error) {
-        console.log("Request Failed: " + textStatus + ", " + error);
-        console.log("Response Text: " + jqxhr.responseText);
-      });
+      .fail(logAjaxFail);
 }
 
 function initPage() {
-  configureExportButton( $('exportButton') );
+  configureExportButton(this);
   if ( exportReady ) {
-    startDownload.pass(exportFile).delay(1500);
+    setTimeout(startDownload, 1500, exportFile);
   }
   document.getElementById('exportButton').addEventListener('click', exportEvents);
+
   // Manage the eventdetail link in the export list
   $j(".eDetailLink").click(function(evt) {
     evt.preventDefault();
     var eid = $j(this).data('eid');
     getEventDetailModal(eid);
   });
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
 }
 
 window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js
index 993d66670..2c3a4d59b 100644
--- a/web/skins/classic/views/js/filter.js
+++ b/web/skins/classic/views/js/filter.js
@@ -40,10 +40,8 @@ function validateForm(form) {
     var have_endtime_term = false;
     for ( var i = 0; i < rows.length; i++ ) {
       if (
-        ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndDateTime' )
-        ||
-        ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndTime' )
-        ||
+        ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndDateTime' ) ||
+        ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndTime' ) ||
         ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndDate' )
       ) {
         have_endtime_term = true;
@@ -56,6 +54,7 @@ function validateForm(form) {
   } else if ( form.elements['filter[Background]'].checked ) {
     if ( ! (
       form.elements['filter[AutoArchive]'].checked ||
+      form.elements['filter[AutoUnarchive]'].checked ||
       form.elements['filter[UpdateDiskSpace]'].checked ||
       form.elements['filter[AutoVideo]'].checked ||
       form.elements['filter[AutoEmail]'].checked ||
@@ -73,33 +72,32 @@ function validateForm(form) {
 
 function updateButtons(element) {
   var form = element.form;
-  if ( element.type == 'checkbox' && element.checked ) {
-    form.elements['executeButton'].disabled = false;
-  } else {
-    var canExecute = false;
-    if ( form.elements['filter[AutoArchive]'] && form.elements['filter[AutoArchive]'].checked ) {
-      canExecute = true;
-    } else if ( form.elements['filter[AutoCopy]'] && form.elements['filter[AutoCopy]'].checked ) {
-      canExecute = true;
-    } else if ( form.elements['filter[AutoMove]'] && form.elements['filter[AutoMove]'].checked ) {
-      canExecute = true;
-    } else if ( form.elements['filter[AutoVideo]'] && form.elements['filter[AutoVideo]'].checked ) {
-      canExecute = true;
-    } else if ( form.elements['filter[AutoUpload]'] && form.elements['filter[AutoUpload]'].checked ) {
-      canExecute = true;
-    } else if ( form.elements['filter[AutoEmail]'] && form.elements['filter[AutoEmail]'].checked ) {
-      canExecute = true;
-    } else if ( form.elements['filter[AutoMessage]'] && form.elements['filter[AutoMessage]'].checked ) {
-      canExecute = true;
-    } else if ( form.elements['filter[AutoExecute]'].checked && form.elements['filter[AutoExecuteCmd]'].value != '' ) {
-      canExecute = true;
-    } else if ( form.elements['filter[AutoDelete]'].checked ) {
-      canExecute = true;
-    } else if ( form.elements['filter[UpdateDiskSpace]'].checked ) {
-      canExecute = true;
-    }
-    form.elements['executeButton'].disabled = !canExecute;
+
+  var canExecute = false;
+  if ( form.elements['filter[AutoArchive]'] && form.elements['filter[AutoArchive]'].checked ) {
+    canExecute = true;
+  } else if ( form.elements['filter[AutoUnarchive]'] && form.elements['filter[AutoUnarchive]'].checked ) {
+    canExecute = true;
+  } else if ( form.elements['filter[AutoCopy]'] && form.elements['filter[AutoCopy]'].checked ) {
+    canExecute = true;
+  } else if ( form.elements['filter[AutoMove]'] && form.elements['filter[AutoMove]'].checked ) {
+    canExecute = true;
+  } else if ( form.elements['filter[AutoVideo]'] && form.elements['filter[AutoVideo]'].checked ) {
+    canExecute = true;
+  } else if ( form.elements['filter[AutoUpload]'] && form.elements['filter[AutoUpload]'].checked ) {
+    canExecute = true;
+  } else if ( form.elements['filter[AutoEmail]'] && form.elements['filter[AutoEmail]'].checked ) {
+    canExecute = true;
+  } else if ( form.elements['filter[AutoMessage]'] && form.elements['filter[AutoMessage]'].checked ) {
+    canExecute = true;
+  } else if ( form.elements['filter[AutoExecute]'].checked && form.elements['filter[AutoExecuteCmd]'].value != '' ) {
+    canExecute = true;
+  } else if ( form.elements['filter[AutoDelete]'].checked ) {
+    canExecute = true;
+  } else if ( form.elements['filter[UpdateDiskSpace]'].checked ) {
+    canExecute = true;
   }
+  form.elements['executeButton'].disabled = !canExecute;
   if ( form.elements['filter[Name]'].value ) {
     form.elements['Save'].disabled = false;
     form.elements['SaveAs'].disabled = false;
@@ -171,7 +169,6 @@ function submitToMontageReview(element) {
 function submitToExport(element) {
   var form = element.form;
   window.location.assign('?view=export&'+$j(form).serialize());
-  //createPopup('?view=export&filter_id='+form.elements['Id'].value, 'zmExport', 'export' );
 }
 
 function executeFilter( element ) {
@@ -296,11 +293,11 @@ function parseRows(rows) {
       inputTds.eq(4).html(storageSelect).children().val(storageVal).chosen({width: "101%"});
     } else if ( attr == 'MonitorName' ) { //Monitor names
       var monitorSelect = $j('<select></select>').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]');
-      for ( var monitor_id in monitors ) {
+      sorted_monitor_ids.forEach(function(monitor_id) {
         monitorSelect.append('<option value="' + monitors[monitor_id].Name + '">' + escapeHTML(monitors[monitor_id].Name) + '</option>');
-      }
+      });
       var monitorVal = inputTds.eq(4).children().val();
-      inputTds.eq(4).html(monitorSelect).children().val(monitorVal);
+      inputTds.eq(4).html(monitorSelect).children().val(monitorVal).chosen({width: '101%'});
     } else if ( attr == 'ExistsInFileSystem' ) {
       var select = $j('<select></select>').attr('name', queryPrefix + rowNum + '][val]').attr('id', queryPrefix + rowNum + '][val]');
       for ( var booleanVal in booleanValues ) {
@@ -396,36 +393,7 @@ function delTerm( element ) {
 }
 
 function debugFilter() {
-  getModal('filterdebug');
-}
-
-// Load the Delete Confirmation Modal HTML via Ajax call
-function getModal(id) {
-  $j.getJSON(thisUrl + '?request=modal&modal='+id+'&fid='+filterid)
-      .done(function(data) {
-        if ( !data ) {
-          console.error("Get modal returned no data");
-          return;
-        }
-
-        if ( $j('#'+id).length ) {
-          console.log("replacing");
-          $j('#'+id).replaceWith(data.html);
-        } else {
-          console.log("Adding to body"+data.html);
-          $j('body').append(data.html);
-        }
-        manageModalBtns(id);
-        modal = $j('#'+id+'Modal');
-        if ( ! modal.length ) {
-          console.log("No modal found");
-        }
-        $j('#'+id+'Modal').modal('show');
-      })
-      .fail(function(jqxhr, textStatus, error) {
-        console.log("Request Failed: " + textStatus + ", " + error);
-        console.log("Response Text: " + jqxhr.responseText);
-      });
+  getModal('filterdebug', 'fid='+filterid);
 }
 
 function manageModalBtns(id) {
@@ -439,12 +407,12 @@ function manageModalBtns(id) {
   }
 }
 
-function init() {
-  updateButtons( $('executeButton') );
+function initPage() {
+  updateButtons($j('#executeButton')[0]);
   $j('#Id').chosen();
   $j('#fieldsTable select').not("[name$='br\\]'], [name$='cnj\\]']").chosen({width: '101%'}); //Every select except brackets/and
   $j("#sortTable [name$='sort_field\\]']").chosen();
   parseRows($j('#fieldsTable tbody').children());
 }
 
-window.addEventListener( 'DOMContentLoaded', init );
+$j(document).ready(initPage );
diff --git a/web/skins/classic/views/js/filter.js.php b/web/skins/classic/views/js/filter.js.php
index f7f7547f2..318af8567 100644
--- a/web/skins/classic/views/js/filter.js.php
+++ b/web/skins/classic/views/js/filter.js.php
@@ -22,11 +22,12 @@ var opTypes = <?php echo isset($opTypes) ? json_encode($opTypes) : '' ?>;
 
 var archiveTypes = <?php echo isset($archiveTypes) ? json_encode($archiveTypes) : '' ?>;
 var weekdays = <?php echo isset($weekdays) ? json_encode($weekdays) : '' ?>;
-var states = <?php echo isset($states) ? json_encode($states) : '' ?>;
-var servers = <?php echo isset($servers) ? json_encode($servers) : '' ?>;
-var storageareas = <?php echo isset($storageareas) ? json_encode($storageareas) : '' ?>;
-var monitors = <?php echo isset($monitors) ? json_encode($monitors) : '' ?>;
-var zones = <?php echo isset($zones) ? json_encode($zones) : '' ?>;
+var states = <?php echo isset($states) ? json_encode($states) : '{}' ?>;
+var servers = <?php echo isset($servers) ? json_encode($servers) : '{}' ?>;
+var storageareas = <?php echo isset($storageareas) ? json_encode($storageareas) : '{}' ?>;
+var monitors = <?php echo isset($monitors) ? json_encode($monitors) : '{}' ?>;
+var sorted_monitor_ids = <?php echo isset($monitors) ? json_encode(array_keys($monitors)) : '[]' ?>;
+var zones = <?php echo isset($zones) ? json_encode($zones) : '{}' ?>;
 var booleanValues = <?php echo json_encode($booleanValues) ?>;
 
 var errorBrackets = '<?php echo translate('ErrorBrackets') ?>';
diff --git a/web/skins/classic/views/js/frame.js b/web/skins/classic/views/js/frame.js
index d40fb10a5..c10b6e87a 100644
--- a/web/skins/classic/views/js/frame.js
+++ b/web/skins/classic/views/js/frame.js
@@ -1,3 +1,7 @@
+var table = $j('#frameStatsTable');
+var backBtn = $j('#backBtn');
+var statsBtn = $j('#statsBtn');
+
 function changeScale() {
   var scale = $j('#scale').val();
   var img = $j('#frameImg');
@@ -24,25 +28,80 @@ function changeScale() {
     img.css('width', newWidth + 'px');
     img.css('height', newHeight + 'px');
   }
-  Cookie.write('zmWatchScale', scale, {duration: 10*365});
+  setCookie('zmWatchScale', scale, 3600);
   $j.each(controlsLinks, function(k, anchor) { //Make frames respect scale choices
     if ( anchor ) {
       anchor.prop('href', anchor.prop('href').replace(/scale=.*&/, 'scale=' + scale + '&'));
     }
   });
+
+  // After a resize, check if we still have room to display the event stats table
+  onStatsResize(newWidth);
 }
 
-if ( !scale ) {
-  $j(document).ready(changeScale);
+function getFrmStatsCookie() {
+  var cookie = 'zmFrameStats';
+  var stats = getCookie(cookie);
+
+  if ( !stats ) {
+    stats = 'on';
+    setCookie(cookie, stats, 10*365);
+  }
+  return stats;
 }
 
-document.addEventListener('DOMContentLoaded', function onDCL() {
-  document.getElementById('scale').addEventListener('change', changeScale);
-});
+function getStat(params) {
+  $j.getJSON(thisUrl + '?view=request&request=stats&raw=true', params)
+      .done(function(data) {
+        var stat = data.raw;
+
+        $j('#frameStatsTable').empty().append('<tbody>');
+        $j.each( statHeaderStrings, function( key ) {
+          var th = $j('<th>').addClass('text-right').text(statHeaderStrings[key]);
+          var tdString;
+
+          switch (stat ? key : 'n/a') {
+            case 'FrameId':
+              tdString = '<a href="?view=stats&amp;eid=' + params.eid + '&amp;fid=' + params.fid + '">' + stat[key] + '</a>';
+              break;
+            case 'n/a':
+              tdString = 'n/a';
+              break;
+            default:
+              tdString = stat[key];
+          }
+
+          var td = $j('<td>').html(tdString);
+          var row = $j('<tr>').append(th, td);
+
+          $j('#frameStatsTable tbody').append(row);
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function onStatsResize(vidwidth) {
+  var minWidth = 300; // An arbitrary value in pixels used to hide the stats table
+  var width = $j(window).width() - vidwidth;
+
+  // Hide the stats table if we have run out of room to show it properly
+  if ( width < minWidth ) {
+    statsBtn.prop('disabled', true);
+    if ( table.is(':visible') ) {
+      table.toggle(false);
+      wasHidden = true;
+    }
+  // Show the stats table if we hid it previously and sufficient room becomes available
+  } else if ( width >= minWidth ) {
+    statsBtn.prop('disabled', false);
+    if ( !table.is(':visible') && wasHidden ) {
+      table.toggle(true);
+      wasHidden = false;
+    }
+  }
+}
 
 function initPage() {
-  var backBtn = $j('#backBtn');
-
   if ( scale == '0' || scale == 'auto' ) changeScale();
 
   // Don't enable the back button if there is no previous zm page to go back to
@@ -60,13 +119,36 @@ function initPage() {
     window.location.reload(true);
   });
 
-  // Manage the STATS button
-  document.getElementById("statsBtn").addEventListener("click", function onViewClick(evt) {
+  // Manage the Frame STATISTICS Button
+  document.getElementById("statsBtn").addEventListener("click", function onStatsClick(evt) {
+    evt.preventDefault();
+    var cookie = 'zmFrameStats';
+
+    // Toggle the visiblity of the stats table and write an appropriate cookie
+    if ( table.is(':visible') ) {
+      setCookie(cookie, 'off', 10*365);
+      table.toggle(false);
+    } else {
+      setCookie(cookie, 'on', 10*365);
+      table.toggle(true);
+    }
+  });
+
+  // Manage the Frame STATISTICS VIEW button
+  document.getElementById("statsViewBtn").addEventListener("click", function onViewClick(evt) {
     evt.preventDefault();
     window.location.href = thisUrl+'?view=stats&eid='+eid+'&fid='+fid;
   });
+
+  // Load the frame stats
+  getStat({eid: eid, fid: fid});
+
+  if ( getFrmStatsCookie() != 'on' ) {
+    table.toggle(false);
+  } else {
+    onStatsResize($j('#base_width').val() * scale / SCALE_BASE);
+  }
 }
 
-$j(document).ready(function() {
-  initPage();
-});
+// Kick everything off
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/frame.js.php b/web/skins/classic/views/js/frame.js.php
index 9bd2f4236..9e705d188 100644
--- a/web/skins/classic/views/js/frame.js.php
+++ b/web/skins/classic/views/js/frame.js.php
@@ -13,3 +13,17 @@ var eid = <?php echo $eid ?>;
 var fid = <?php echo $fid ?>;
 var record_event_stats = <?php echo ZM_RECORD_EVENT_STATS ?>;
 var alarmFrame = <?php echo $alarmFrame ?>;
+
+var statHeaderStrings = {
+    Id: '<?php echo translate('EventId') ?>',
+    FrameId: '<?php echo translate('FrameId') ?>',
+    ZoneName: '<?php echo translate('Zone') ?>',
+    PixelDiff: '<?php echo translate('PixelDiff') ?>',
+    AlarmPixels: '<?php echo translate('AlarmPx') ?>',
+    FilterPixels: '<?php echo translate('FilterPx') ?>',
+    BlobPixels: '<?php echo translate('BlobPx') ?>',
+    Blobs: '<?php echo translate('Blobs') ?>',
+    BlobSizes: '<?php echo translate('BlobSizes') ?>',
+    AlarmLimits: '<?php echo translate('AlarmLimits') ?>',
+    Score: '<?php echo translate('Score') ?>'
+};
diff --git a/web/skins/classic/views/js/frames.js b/web/skins/classic/views/js/frames.js
index a94e76c71..3e8517fd9 100644
--- a/web/skins/classic/views/js/frames.js
+++ b/web/skins/classic/views/js/frames.js
@@ -1,24 +1,33 @@
-function thumbnail_onmouseover(event) {
-  var img = event.target;
-  img.src = '';
-  img.src = img.getAttribute('full_img_src');
+var backBtn = $j('#backBtn');
+var table = $j('#framesTable');
+
+// Called by bootstrap-table to retrieve zm frame data
+function ajaxRequest(params) {
+  if ( params.data && params.data.filter ) {
+    params.data.advsearch = params.data.filter;
+    delete params.data.filter;
+  }
+  $j.getJSON(thisUrl + '?view=request&request=frames&task=query&eid='+eid, params.data)
+      .done(function(data) {
+        var rows = processRows(data.rows);
+        // rearrange the result into what bootstrap-table expects
+        console.log('Total: '+data.total);
+        console.log('TotalnotFiltered: '+data.totalNotFiltered);
+        params.success({total: data.total, totalNotFiltered: data.totalNotFiltered, rows: rows});
+      })
+      .fail(logAjaxFail);
 }
 
-function thumbnail_onmouseout(event) {
-  var img = event.target;
-  img.src = '';
-  img.src = img.getAttribute('img_src');
-}
-
-function initThumbAnimation() {
-  $j('.colThumbnail img').each(function() {
-    this.addEventListener('mouseover', thumbnail_onmouseover, false);
-    this.addEventListener('mouseout', thumbnail_onmouseout, false);
+function processRows(rows) {
+  $j.each(rows, function(ndx, row) {
+    // WIP: process each row here
+    // VERIFY: Might not need to do anything here for the frames table
   });
+  return rows;
 }
 
 function processClicks(event, field, value, row, $element) {
-  if ( field == 'FrameScore' ) {
+  if ( field == 'Score' ) {
     window.location.assign('?view=stats&eid='+row.EventId+'&fid='+row.FrameId);
   } else {
     window.location.assign('?view=frame&eid='+row.EventId+'&fid='+row.FrameId);
@@ -32,31 +41,15 @@ function detailFormatter(index, row, $detail) {
       .done(function(data) {
         $detail.html(data.html);
       })
-      .fail(function(jqxhr, textStatus, error) {
-        console.log("Request Failed: " + textStatus + ", " + error);
-        console.log("Response Text: " + jqxhr.responseText);
-      });
+      .fail(logAjaxFail);
 }
-function initPage() {
-  var backBtn = $j('#backBtn');
-  var table = $j('#framesTable');
 
-  // Define the icons used in the bootstrap-table top-right toolbar
-  var icons = {
-    paginationSwitchDown: 'fa-caret-square-o-down',
-    paginationSwitchUp: 'fa-caret-square-o-up',
-    export: 'fa-download',
-    refresh: 'fa-sync',
-    toggleOff: 'fa-toggle-off',
-    toggleOn: 'fa-toggle-on',
-    columns: 'fa-th-list',
-    fullscreen: 'fa-arrows-alt',
-    detailOpen: 'fa-plus',
-    detailClose: 'fa-minus'
-  };
+function initPage() {
+  // Remove the thumbnail column from the DOM if thumbnails are off globally
+  if ( !WEB_LIST_THUMBS ) $j('th[data-field="Thumbnail"]').remove();
 
   // Init the bootstrap-table
-  table.bootstrapTable('destroy').bootstrapTable({icons: icons});
+  table.bootstrapTable({icons: icons});
 
   // Hide these columns on first run when no cookie is saved
   if ( !getCookie("zmFramesTable.bs.table.columns") ) {
@@ -88,6 +81,24 @@ function initPage() {
     evt.preventDefault();
     window.location.reload(true);
   });
+
+  // Update table links each time after new data is loaded
+  table.on('post-body.bs.table', function(data) {
+    var type_ndx = $j('#framesTable tr th').filter(function() {
+      return $j(this).text().trim() == 'Type';
+    }).index();
+
+    $j('#framesTable tr').each(function(ndx, row) {
+      var row = $j(row);
+      var type = row.find('td').eq(type_ndx).text().trim();
+      row.addClass(type.toLowerCase());
+    });
+
+    var thumb_ndx = $j('#framesTable tr th').filter(function() {
+      return $j(this).text().trim() == 'Thumbnail';
+    }).index();
+    table.find("tr td:nth-child(" + (thumb_ndx+1) + ")").addClass('colThumbnail');
+  });
 }
 
 $j(document).ready(function() {
diff --git a/web/skins/classic/views/js/frames.js.php b/web/skins/classic/views/js/frames.js.php
new file mode 100644
index 000000000..b27e1e5ec
--- /dev/null
+++ b/web/skins/classic/views/js/frames.js.php
@@ -0,0 +1,3 @@
+var eid = <?php echo validInt($_REQUEST['eid']) ?>;
+var WEB_LIST_THUMBS = <?php echo ZM_WEB_LIST_THUMBS?'true':'false' ?>;
+var WEB_ANIMATE_THUMBS = <?php echo ZM_WEB_ANIMATE_THUMBS?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/group.js b/web/skins/classic/views/js/group.js
deleted file mode 100644
index 26aa9cae6..000000000
--- a/web/skins/classic/views/js/group.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function configureButtons() {
-  var form = $j('#groupForm')[0];
-  if ( !form ) {
-    console.log("No groupForm found");
-    return;
-  }
-  if ( !canEditGroups ) {
-    console.log("Cannot edit groups");
-    form.elements['action'].disabled = disabled;
-    return;
-  }
-  var disabled = false;
-
-  if ( form.elements['newGroup[Name]'].value == '' ) {
-    disabled = true;
-  }
-  form.elements['action'].disabled = disabled;
-}
-
-window.focus();
diff --git a/web/skins/classic/views/js/groups.js b/web/skins/classic/views/js/groups.js
index 8ff1b61ff..571269ea4 100644
--- a/web/skins/classic/views/js/groups.js
+++ b/web/skins/classic/views/js/groups.js
@@ -1,5 +1,18 @@
+// Manage the NEW Group button
 function newGroup() {
-  createPopup( '?view=group', 'zmGroup', 'group' );
+  $j.getJSON(thisUrl + '?request=modal&modal=group')
+      .done(function(data) {
+        insertModalHtml('groupdModal', data.html);
+        $j('#groupModal').modal('show');
+        $j('.chosen').chosen("destroy");
+        $j('.chosen').chosen();
+        // Manage the Save button
+        $j('#grpModalSaveBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#groupForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
 }
 
 function setGroup( element ) {
@@ -13,7 +26,19 @@ function editGroup( element ) {
   if ( !gid ) {
     console.log('No group id found in editGroup');
   } else {
-    createPopup('?view=group&gid='+gid, 'zmGroup'+gid, 'group');
+    $j.getJSON(thisUrl + '?request=modal&modal=group&gid=' + gid)
+        .done(function(data) {
+          insertModalHtml('groupModal', data.html);
+          $j('#groupModal').modal('show');
+          $j('.chosen').chosen("destroy");
+          $j('.chosen').chosen();
+          // Manage the Save button
+          $j('#grpModalSaveBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#groupForm').submit();
+          });
+        })
+        .fail(logAjaxFail);
   }
 }
 
@@ -25,7 +50,7 @@ function deleteGroup( element ) {
 }
 
 function configureButtons( element ) {
-  if ( canEditGroups ) {
+  if ( canEdit.Groups ) {
     var form = element.form;
     if ( element.checked ) {
       form.deleteBtn.disabled = (element.value == 0);
@@ -33,4 +58,21 @@ function configureButtons( element ) {
   }
 }
 
-window.focus();
+function configModalBtns() {
+  var form = $j('#groupForm')[0];
+  if ( !form ) {
+    console.log("No groupForm found");
+    return;
+  }
+  if ( !canEdit.Groups ) {
+    console.log("Cannot edit groups");
+    form.elements['action'].disabled = disabled;
+    return;
+  }
+  var disabled = false;
+
+  if ( form.elements['newGroup[Name]'].value == '' ) {
+    disabled = true;
+  }
+  form.elements['action'].disabled = disabled;
+}
diff --git a/web/skins/classic/views/js/log.js b/web/skins/classic/views/js/log.js
index c6d8b0731..8bad64bf1 100644
--- a/web/skins/classic/views/js/log.js
+++ b/web/skins/classic/views/js/log.js
@@ -1,346 +1,115 @@
-var logParms = 'view=request&request=log&task=query';
-var logReq = new Request.JSON( {url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: logResponse} );
-var logTimer = undefined;
-var logTable = undefined;
+var table = $j('#logTable');
 
-var logCodes = {
-  '0': 'INF',
-  '-1': 'WAR',
-  '-2': 'ERR',
-  '-3': 'FAT',
-  '-4': 'PNC',
+/*
+This is the format of the json object sent by bootstrap-table
+
+var params =
+{
+"type":"get",
+"data":
+  {
+  "search":"some search text",
+  "sort":"DateTime",
+  "order":"asc",
+  "offset":0,
+  "limit":25
+  "filter":
+    {
+    "message":"some advanced search text"
+    "level":"some more advanced search text"
+    }
+  },
+"cache":true,
+"contentType":"application/json",
+"dataType":"json"
 };
+*/
 
-var minSampleTime = 2000;
-var maxSampleTime = 16000;
-var minLogTime = 0;
-var maxLogTime = 0;
-var logCount = 0;
-var maxLogFetch = 100;
-var filter = {};
-var logTimeout = maxSampleTime;
-var firstLoad = true;
-var initialDisplayLimit = 200;
-var sortReversed = false;
-var filterFields = ['Component', 'ServerId', 'Pid', 'Level', 'File', 'Line'];
-var options = {};
-
-function escapeHtml(unsafe) {
-  return unsafe
-      .replace(/&/g, "&amp;")
-      .replace(/</g, "&lt;")
-      .replace(/>/g, "&gt;")
-      .replace(/"/g, "&quot;")
-      .replace(/'/g, "&#039;");
+// Called by bootstrap-table to retrieve zm log data
+function ajaxRequest(params) {
+  $j.getJSON(thisUrl + '?view=request&request=log&task=query', params.data)
+      .done(function(data) {
+        //console.log('Ajax parameters: ' + JSON.stringify(params));
+        // rearrange the result into what bootstrap-table expects
+        params.success({
+          total: data.total,
+          totalNotFiltered: data.totalNotFiltered,
+          rows: processRows(data.rows)
+        });
+        updateHeaderStats(data);
+      })
+      .fail(logAjaxFail);
+}
+function processRows(rows) {
+  $j.each(rows, function(ndx, row) {
+    row.Message = decodeURIComponent(row.Message);
+  });
+  return rows;
 }
 
-function buildFetchParms( parms ) {
-  var fetchParms = logParms+'&limit='+maxLogFetch;
-  if ( parms ) {
-    fetchParms += '&'+parms;
-  }
-  Object.each(filter,
-      function( value, key ) {
-        fetchParms += '&filter['+key+']='+value;
-      }
-  );
-  return fetchParms;
-}
+function updateHeaderStats(data) {
+  var pageNum = table.bootstrapTable('getOptions').pageNumber;
+  var pageSize = table.bootstrapTable('getOptions').pageSize;
+  var startRow = ( (pageNum - 1 ) * pageSize ) + 1;
+  var stopRow = pageNum * pageSize;
+  var newClass = (data.logstate == 'ok') ? 'text-success' : (data.logstate == 'alert' ? 'text-warning' : ((data.logstate == 'alarm' ? 'text-danger' : '')));
 
-function fetchNextLogs() {
-  logReq.send( buildFetchParms( 'minTime='+maxLogTime ) );
-}
+  $j('#logState').text(data.logstate);
+  $j('#logState').removeClass('text-success');
+  $j('#logState').removeClass('text-warning');
+  $j('#logState').removeClass('text-danger');
+  $j('#logState').addClass(newClass);
 
-function fetchPrevLogs() {
-  logReq.send( buildFetchParms( 'maxTime='+minLogTime ) );
-}
-
-function logResponse( respObj ) {
-  if ( logTimer ) {
-    logTimer = clearTimeout( logTimer );
-  }
-
-  if ( respObj.result == 'Ok' ) {
-    if ( respObj.logs.length > 0 ) {
-      logTimeout = minSampleTime;
-      logCount += respObj.logs.length;
-      try {
-        respObj.logs.each(
-            function( log ) {
-              if ( ( !maxLogTime ) || ( log.TimeKey > maxLogTime ) ) {
-                maxLogTime = log.TimeKey;
-              }
-              if ( ( !minLogTime ) || ( log.TimeKey < minLogTime ) ) {
-                minLogTime = log.TimeKey;
-              }
-
-              var row = logTable.push([
-                {content: log.DateTime, properties: {style: 'white-space: nowrap'}},
-                log.Component, log.Server, log.Pid, log.Code,
-                escapeHtml(log.Message),
-                escapeHtml(log.File),
-                log.Line
-              ]);
-
-              delete log.Message;
-              row.tr.store( 'log', log );
-              if ( log.Level <= -3 ) {
-                row.tr.addClass( 'log-fat' );
-              } else if ( log.Level <= -2 ) {
-                row.tr.addClass( 'log-err' );
-              } else if ( log.Level <= -1 ) {
-                row.tr.addClass( 'log-war' );
-              } else if ( log.Level > 0 ) {
-                row.tr.addClass( 'log-dbg' );
-              }
-              if ( !firstLoad ) {
-                var color = document.defaultView.getComputedStyle(row.tr, null).getPropertyValue('color');
-                var colorParts = color.match(/^rgb.*\((\d+),\s*(\d+),\s*(\d+)/);
-                rowOrigColor = '#' + parseInt(colorParts[1]).toString(16) + parseInt(colorParts[2]).toString(16) + parseInt(colorParts[3]).toString(16);
-                //new Fx.Tween( row.tr, { duration: 10000, transition: Fx.Transitions.Sine } ).start( 'color', '#6495ED', rowOrigColor );
-              }
-            }
-        );
-        if ( typeof(respObj.options) == 'object' ) {
-          $j.each( respObj.options,
-              function( field ) {
-                if ( options[field] ) {
-                  options[field] = Object.assign(options[field], respObj.options[field]);
-                } else {
-                  options[field] = respObj.options[field];
-                }
-              }
-          );
-        }
-        updateFilterSelectors();
-        $('lastUpdate').set('text', respObj.updated);
-        $('logState').set('text', respObj.state);
-        $('logState').removeClass('ok');
-        $('logState').removeClass('alert');
-        $('logState').removeClass('alarm');
-        $('logState').addClass(respObj.state);
-        $('totalLogs').set('text', respObj.total);
-        $('availLogs').set('text', respObj.available);
-        $('displayLogs').set('text', logCount);
-        if ( firstLoad ) {
-          if ( logCount < displayLimit ) {
-            fetchPrevLogs();
-          }
-        }
-        logTable.reSort();
-      } catch ( e ) {
-        console.error( e );
-      }
-      logTimeout /= 2;
-      if ( logTimeout < minSampleTime ) {
-        logTimeout = minSampleTime;
-      }
-    } else {
-      firstLoad = false;
-      logTimeout *= 2;
-      if ( logTimeout > maxSampleTime ) {
-        logTimeout = maxSampleTime;
-      }
-    } // end logs.length > 0
-  } // end if result == Ok
-  logTimer = fetchNextLogs.delay( logTimeout );
-}
-
-function refreshLog() {
-  options = {};
-  $j('#logTable tbody').empty();
-  firstLoad = true;
-  maxLogTime = 0;
-  minLogTime = 0;
-  logCount = 0;
-  logTimeout = maxSampleTime;
-  displayLimit = initialDisplayLimit;
-  fetchNextLogs();
-}
-
-function expandLog() {
-  displayLimit += maxLogFetch;
-  fetchPrevLogs();
-}
-
-function clearResponse() {
-  refreshLog();
-}
-function clearError() {
-}
-function clearLog() {
-  logReq.cancel();
-
-  var clearParms = 'view=request&request=log&task=delete';
-  var clearReq = new Request.JSON({url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: clearResponse});
-  var tbody = $(logTable).getElement('tbody');
-  var rows = tbody.getElements('tr');
-  if ( rows && rows.length ) {
-    var minTime = rows[0].getElement('td').get('text');
-    clearParms += "&minTime="+encodeURIComponent(minTime);
-    var maxTime = rows[rows.length-1].getElement('td').get('text');
-    clearParms += "&maxTime="+encodeURIComponent(maxTime);
-  }
-  var form = $('logForm');
-  clearReq.send(clearParms+"&"+form.toQueryString());
-}
-
-function filterLog() {
-  filter = {};
-  filterFields.each(
-      function( field ) {
-        var selector = $('filter['+field+']');
-        if ( !selector ) {
-          if ( window.console && window.console.log ) {
-            window.console.log('No selector found for ' + field);
-          }
-          return;
-        }
-        var value = selector.get('value');
-        if ( value ) {
-          filter[field] = value;
-        }
-      }
-  );
-  refreshLog();
-}
-
-function resetLog() {
-  filter = {};
-  refreshLog();
-}
-
-var exportFormValidator;
-
-function exportLog() {
-  exportFormValidator.reset();
-  $('exportLog').overlayShow();
-}
-
-function exportResponse( response ) {
-  $('exportLog').unspin();
-  if ( response.result == 'Ok' ) {
-    window.location.replace( thisUrl+'?view=request&request=log&task=download&key='+response.key+'&format='+response.format );
-  }
-}
-
-function exportFail( request ) {
-  $('exportLog').unspin();
-  $('exportErrorText').set('text', request.status+' / '+request.statusText);
-  $('exportError').show();
-  Error('Export request failed: '+request.status+' / '+request.statusText);
-}
-
-function exportRequest() {
-  var form = $('exportForm');
-  $('exportErrorText').set('text', '');
-  $('exportError').hide();
-  if ( form.validate() ) {
-    var exportParms = "view=request&request=log&task=export";
-    var exportReq = new Request.JSON({url: thisUrl, method: 'post', link: 'cancel', onSuccess: exportResponse, onFailure: exportFail});
-    var selection = form.getElement('input[name=selector]:checked').get('value');
-    if ( selection == 'filter' || selection == 'current' ) {
-      $$('#filters select').each(
-          function( select ) {
-            exportParms += "&"+select.get('id')+"="+select.get('value');
-          }
-      );
-    }
-    if ( selection == 'current' ) {
-      var tbody = $(logTable).getElement( 'tbody' );
-      var rows = tbody.getElements( 'tr' );
-      if ( rows ) {
-        var minTime = rows[0].getElement('td').get('text');
-        exportParms += "&minTime="+encodeURIComponent(minTime);
-        var maxTime = rows[rows.length-1].getElement('td').get('text');
-        exportParms += "&maxTime="+encodeURIComponent(maxTime);
-      }
-    }
-    exportReq.send(exportParms+"&"+form.toQueryString());
-    $('exportLog').spin();
-  }
-}
-
-function updateFilterSelectors() {
-  Object.each(options,
-      function( values, key ) {
-        var selector = $('filter['+key+']');
-        if ( !selector ) {
-          if ( window.console && window.console.log ) {
-            window.console.log('No selector found for ' + key);
-          }
-          return;
-        }
-        selector.options.length = 1;
-        if ( key == 'Level' ) {
-          Object.each(values,
-              function( value, label ) {
-                selector.options[selector.options.length] = new Option(value, label);
-              }
-          );
-        } else if ( key == 'ServerId' ) {
-          Object.each(values,
-              function( value, label ) {
-                selector.options[selector.options.length] = new Option(value, label);
-              }
-          );
-        } else {
-          Object.each(values,
-              function( value, label ) {
-                selector.options[selector.options.length] = new Option(value, label);
-              }
-          );
-        }
-        if ( filter[key] ) {
-          selector.set('value', filter[key]);
-        }
-        $j(selector).chosen('destroy');
-        $j(selector).chosen();
-      }
-  );
+  $j('#totalLogs').text(data.total);
+  $j('#availLogs').text(data.totalNotFiltered);
+  $j('#lastUpdate').text(data.updated);
+  $j('#displayLogs').text(startRow + ' to ' + stopRow);
 }
 
 function initPage() {
-  displayLimit = initialDisplayLimit;
-  for ( var i = 1; i <= 9; i++ ) {
-    logCodes[''+i] = 'DB'+i;
-  }
-  logTable = new HtmlTable( $('logTable'),
-      {
-        zebra: true,
-        sortable: true,
-        sortReverse: true
+  var backBtn = $j('#backBtn');
+
+  // Init the bootstrap-table with custom icons
+  table.bootstrapTable({icons: icons});
+
+  // Assign inf, err, fat, dbg color classes to the rows in the table
+  table.on('post-body.bs.table', function(data) {
+    var lvl_ndx = $j('#logTable tr th').filter(function() {
+      return $j(this).text().trim() == 'Level';
+    }).index();
+
+    $j('#logTable tr').each(function(ndx, row) {
+      var row = $j(row);
+      var level = row.find('td').eq(lvl_ndx).text().trim();
+
+      if (( level == 'FAT' ) || ( level == 'PNC' )) {
+        row.addClass('log-fat');
+      } else if ( level == 'ERR' ) {
+        row.addClass('log-err');
+      } else if ( level == 'WAR' ) {
+        row.addClass('log-war');
+      } else if ( level == 'DBG' ) {
+        row.addClass('log-dbg');
       }
-  );
-  logTable.addEvent( 'sort', function( tbody, index ) {
-    var header = tbody.getParent('table').getElement('thead');
-    var columns = header.getElement('tr').getElements('th');
-    var column = columns[index];
-    sortReversed = column.hasClass('table-th-sort-rev');
-    if ( logCount > displayLimit ) {
-      var rows = tbody.getElements('tr');
-      var startIndex;
-      if ( sortReversed ) {
-        startIndex = displayLimit;
-      } else {
-        startIndex = 0;
-      }
-      for ( var i = startIndex; logCount > displayLimit; i++ ) {
-        rows[i].destroy();
-        logCount--;
-      }
-      $('displayLogs').set('text', logCount);
-    } // end if loCount > displayLimit
-  }
-  );
-  exportFormValidator = new Form.Validator.Inline($('exportForm'), {
-    useTitles: true,
-    warningPrefix: '',
-    errorPrefix: ''
+    });
+  });
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
   });
-  new Asset.css('css/spinner.css');
-  fetchNextLogs();
 }
 
-// Kick everything off
-window.addEventListener('DOMContentLoaded', initPage);
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/login.js b/web/skins/classic/views/js/login.js
index 5142ce310..ec6a8302a 100644
--- a/web/skins/classic/views/js/login.js
+++ b/web/skins/classic/views/js/login.js
@@ -1,5 +1,5 @@
 window.addEventListener( 'DOMContentLoaded', function() {
-  if ( failed == true ) {
+  if ( failed == true && $j('#loginError').length ) {
     $j('#loginError').show();
   }
 } );
diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index b9f37c090..4b41d8dd2 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -48,8 +48,9 @@ function updateMonitorDimensions(element) {
       form.elements['newMonitor[Height]'].value = dimensions[1];
     }
   }
+  update_estimated_ram_use();
   return false;
-}
+} // function updateMonitorDimensions(element)
 
 function loadLocations( element ) {
   var form = element.form;
@@ -71,9 +72,6 @@ function initPage() {
   var backBtn = $j('#backBtn');
   var onvifBtn = $j('#onvifBtn');
 
-  //var protocolSelector = $('contentForm').elements['newMonitor[Protocol]'];
-  //if ( $(protocolSelector).getTag() == 'select' )
-  //updateMethods( $(protocolSelector) );
   document.querySelectorAll('input[name="newMonitor[SignalCheckColour]"]').forEach(function(el) {
     el.oninput = function(event) {
       $j('#SignalCheckSwatch').css('background-color', event.target.value);
@@ -105,7 +103,6 @@ function initPage() {
   document.querySelectorAll('input[name="newMonitor[MaxFPS]"]').forEach(function(el) {
     el.oninput = el.onclick = function(e) {
       if ( e.target.value ) {
-        console.log('showing');
         $j('#newMonitor\\[MaxFPS\\]').show();
       } else {
         $j('#newMonitor\\[MaxFPS\\]').hide();
@@ -115,7 +112,6 @@ function initPage() {
   document.querySelectorAll('input[name="newMonitor[AlarmMaxFPS]"]').forEach(function(el) {
     el.oninput = el.onclick = function(e) {
       if ( e.target.value ) {
-        console.log('showing');
         $j('#newMonitor\\[AlarmMaxFPS\\]').show();
       } else {
         $j('#newMonitor\\[AlarmMaxFPS\\]').hide();
@@ -137,6 +133,76 @@ function initPage() {
   document.querySelectorAll('input[name="newMonitor[WebColour]"]').forEach(function(el) {
     el.onchange = window['change_WebColour'].bind(el);
   });
+  document.querySelectorAll('select[name="newMonitor[Type]"]').forEach(function(el) {
+    el.onchange = function() {
+      var form = document.getElementById('contentForm');
+      form.tab.value = 'general';
+      form.submit();
+    };
+  });
+  document.querySelectorAll('input[name="newMonitor[ImageBufferCount]"],input[name="newMonitor[MaxImageBufferCount]"],input[name="newMonitor[Width]"],input[name="newMonitor[Height]"]').forEach(function(el) {
+    el.oninput = window['update_estimated_ram_use'].bind(el);
+  });
+  update_estimated_ram_use();
+
+  document.querySelectorAll('select[name="newMonitor[Function]"]').forEach(function(el) {
+    el.onchange = function() {
+      $j('#function_help div').hide();
+      $j('#'+this.value+'Help').show();
+      if ( this.value == 'Monitor' || this.value == 'None' ) {
+        $j('#FunctionEnabled').hide();
+      } else {
+        $j('#FunctionEnabled').show();
+      }
+      if ( this.value == 'Record' || this.value == 'Nodect' ) {
+        $j('#FunctionDecodingEnabled').show();
+      } else {
+        $j('#FunctionDecodingEnabled').hide();
+      }
+    };
+    el.onchange();
+  });
+
+  document.querySelectorAll('select[name="newMonitor[VideoWriter]"]').forEach(function(el) {
+    el.onchange = function() {
+      if ( this.value == 1 /* Encode */ ) {
+        $j('.OutputCodec').show();
+        $j('.Encoder').show();
+      } else {
+        $j('.OutputCodec').hide();
+        $j('.Encoder').hide();
+      }
+    };
+    el.onchange();
+  });
+  document.querySelectorAll('select[name="newMonitor[OutputCodec]"]').forEach(function(el) {
+    el.onchange = function() {
+      var encoder_dropdown = $j('select[name="newMonitor[Encoder]"]');
+      if (encoder_dropdown) {
+        for (i=0; i<encoder_dropdown[0].options.length; i++) {
+          option = encoder_dropdown[0].options[i];
+          if ( this.value == 27 ) {
+            option.disabled = !option.value.includes('264');
+            if ( option.disabled && option.selected ) {
+              encoder_dropdown[0].options[0].selected = 1;
+              option.selected = false;
+            }
+          } else if ( this.value == 173 /* hevc */ ) {
+            option.disabled = !(option.value.includes('hevc') || option.value.includes('265') );
+            if ( option.disabled && option.selected ) {
+              encoder_dropdown[0].options[0].selected = 1;
+              option.selected = false;
+            }
+          } else {
+            option.disabled = false;
+          }
+        }
+      } else {
+        console.log('No encoder');
+      }
+    };
+    el.onchange();
+  });
 
   $j('.chosen').chosen();
 
@@ -193,6 +259,32 @@ function initPage() {
     evt.preventDefault();
     window.location.assign('?view=console');
   });
+
+  if ( ZM_OPT_USE_GEOLOCATION ) {
+    if ( window.L ) {
+      var form = document.getElementById('contentForm');
+      var latitude = form.elements['newMonitor[Latitude]'].value;
+      var longitude = form.elements['newMonitor[Longitude]'].value;
+      map = L.map('LocationMap', {
+        center: L.latLng(latitude, longitude),
+        zoom: 13,
+        onclick: function() {
+          alert('click');
+        }
+      });
+      L.tileLayer(ZM_OPT_GEOLOCATION_TILE_PROVIDER, {
+        attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
+        maxZoom: 18,
+        id: 'mapbox/streets-v11',
+        tileSize: 512,
+        zoomOffset: -1,
+        accessToken: ZM_OPT_GEOLOCATION_ACCESS_TOKEN,
+      }).addTo(map);
+      L.marker([latitude, longitude]).addTo(map);
+    } else {
+      console.log('Location turned on but leaflet not installed.');
+    }
+  } // end if ZM_OPT_USE_GEOLOCATION
 } // end function initPage()
 
 function change_WebColour() {
@@ -219,4 +311,38 @@ function random_WebColour() {
   );
 }
 
+function update_estimated_ram_use() {
+  var width = document.querySelectorAll('input[name="newMonitor[Width]"]')[0].value;
+  var height = document.querySelectorAll('input[name="newMonitor[Height]"]')[0].value;
+  var colours = document.querySelectorAll('select[name="newMonitor[Colours]"]')[0].value;
+
+  var min_buffer_count = parseInt(document.querySelectorAll('input[name="newMonitor[ImageBufferCount]"]')[0].value);
+  var min_buffer_size = min_buffer_count * width * height * colours;
+  document.getElementById('estimated_ram_use').innerHTML = 'Min: ' + human_filesize(min_buffer_size);
+
+  var max_buffer_count = parseInt(document.querySelectorAll('input[name="newMonitor[MaxImageBufferCount]"]')[0].value);
+  if (max_buffer_count) {
+    var max_buffer_size = (min_buffer_count + max_buffer_count) * width * height * colours;
+    console.log(max_buffer_size);
+    document.getElementById('estimated_ram_use').innerHTML += ' Max: ' + human_filesize(max_buffer_size);
+  } else {
+    document.getElementById('estimated_ram_use').innerHTML += ' Max: Unlimited';
+  }
+}
+
+function updateLatitudeAndLongitude(latitude, longitude) {
+  var form = document.getElementById('contentForm');
+  form.elements['newMonitor[Latitude]'].value = latitude;
+  form.elements['newMonitor[Longitude]'].value = longitude;
+}
+function getLocation() {
+  if ('geolocation' in navigator) {
+    navigator.geolocation.getCurrentPosition((position) => {
+      updateLatitudeAndLongitude(position.coords.latitude, position.coords.longitude);
+    });
+  } else {
+    console.log("Geolocation not available");
+  }
+}
+
 window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index b59049f12..6b0ac3b87 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -1,3 +1,10 @@
+var ZM_OPT_USE_GEOLOCATION = '<?php echo ZM_OPT_USE_GEOLOCATION ?>' == '1' ? true : false;
+<?php
+if ( ZM_OPT_USE_GEOLOCATION ) { 
+  echo 'var ZM_OPT_GEOLOCATION_TILE_PROVIDER=\''.ZM_OPT_GEOLOCATION_TILE_PROVIDER.'\''.PHP_EOL;
+  echo 'var ZM_OPT_GEOLOCATION_ACCESS_TOKEN=\''.ZM_OPT_GEOLOCATION_ACCESS_TOKEN.'\''.PHP_EOL;
+}
+?>
 var optControl = <?php echo ZM_OPT_CONTROL ?>;
 var hasOnvif = <?php echo ZM_HAS_ONVIF ?>;
 var defaultAspectRatio = '<?php echo ZM_DEFAULT_ASPECT_RATIO ?>';
@@ -21,12 +28,16 @@ controlOptions['.$control->Id().'][0] = '.
 ?>
 
 var monitorNames = new Object();
+var rtspStreamNames = new Object();
 <?php
-$query = empty($_REQUEST['mid']) ? dbQuery('SELECT Name FROM Monitors') : dbQuery('SELECT Name FROM Monitors WHERE Id != ?', array($_REQUEST['mid']) );
-if ( $query ) {
-  while ( $name = dbFetchNext($query, 'Name') ) {
+$query = empty($_REQUEST['mid']) ?
+  dbQuery('SELECT Name,RTSPStreamName FROM Monitors') :
+  dbQuery('SELECT Name,RTSPStreamName FROM Monitors WHERE Id != ?', array($_REQUEST['mid']) );
+if ($query) {
+  while ($row = dbFetchNext($query)) {
     echo '
-monitorNames[\''.validJsStr($name).'\'] = true;
+monitorNames[\''.validJsStr($row['Name']).'\'] = true;
+rtspStreamNames[\''.validJsStr($row['RTSPStreamName']).'\'] = true;
 ';
   } // end foreach
 } # end if query
@@ -49,6 +60,8 @@ function validateForm( form ) {
       errors[errors.length] = "<?php echo translate('BadChannel') ?>";
     if ( !form.elements['newMonitor[Format]'].value || !form.elements['newMonitor[Format]'].value.match( /^\d+$/ ) )
       errors[errors.length] = "<?php echo translate('BadFormat') ?>";
+    if ( form.elements['newMonitor[VideoWriter]'].value == 2 /* Passthrough */ )
+      errors[errors.length] = "<?php echo translate('BadPassthrough') ?>";
   } else if ( form.elements['newMonitor[Type]'].value == 'Remote' ) {
     //if ( !form.elements['newMonitor[Host]'].value || !form.elements['newMonitor[Host]'].value.match( /^[0-9a-zA-Z_.:@-]+$/ ) )
       //errors[errors.length] = "<?php echo translate('BadHost') ?>";
@@ -56,14 +69,20 @@ function validateForm( form ) {
       errors[errors.length] = "<?php echo translate('BadPort') ?>";
     //if ( !form.elements['newMonitor[Path]'].value )
       //errors[errors.length] = "<?php echo translate('BadPath') ?>";
+    if ( form.elements['newMonitor[VideoWriter]'].value == 2 /* Passthrough */ )
+      errors[errors.length] = "<?php echo translate('BadPassthrough') ?>";
   } else if ( form.elements['newMonitor[Type]'].value == 'Ffmpeg' ) {
-    if ( !form.elements['newMonitor[Path]'].value )
-//|| !form.elements['newMonitor[Path]'].value.match( /^\d+$/ ) ) // valid url
+    if ( !form.elements['newMonitor[Path]'].value ) {
       errors[errors.length] = "<?php echo translate('BadPath') ?>";
+    } else if ( form.elements['newMonitor[Path]'].value.match( /[\!\*'\(\)\$ ,#\[\]]/) ) {
+      warnings[warnings.length] = "<?php echo translate('BadPathNotEncoded') ?>";
+    }
 
   } else if ( form.elements['newMonitor[Type]'].value == 'File' ) {
     if ( !form.elements['newMonitor[Path]'].value )
       errors[errors.length] = "<?php echo translate('BadPath') ?>";
+    if ( form.elements['newMonitor[VideoWriter]'].value == 2 /* Passthrough */ )
+      errors[errors.length] = "<?php echo translate('BadPassthrough') ?>";
   } else if ( form.elements['newMonitor[Type]'].value == 'WebSite' ) {
     if ( form.elements['newMonitor[Function]'].value != 'Monitor' && form.elements['newMonitor[Function]'].value != 'None')
       errors[errors.length] = "<?php echo translate('BadSourceType') ?>";
@@ -71,6 +90,13 @@ function validateForm( form ) {
       errors[errors.length] = "<?php echo translate('BadWebSitePath') ?>";
   }
 
+  if (form.elements['newMonitor[VideoWriter]'].value == '1' /* Encode */) {
+    var parameters = form.elements['newMonitor[EncoderParameters]'].value.replace(/[^#a-zA-Z]/g, "");
+    if (parameters == '' || parameters == '#Linesbeginningwith#areacomment#Forchangingqualityusethecrfoption#isbestisworstquality#crf' ) {
+      warnings[warnings.length] = '<?php echo translate('BadEncoderParameters') ?>';
+    }
+  }
+
   if ( form.elements['newMonitor[Type]'].value != 'WebSite' ) {
 
     if ( form.elements['newMonitor[AnalysisFPSLimit]'].value && !(parseFloat(form.elements['newMonitor[AnalysisFPSLimit]'].value) > 0 ) )
@@ -92,11 +118,15 @@ function validateForm( form ) {
       errors[errors.length] = "<?php echo translate('BadLabelX') ?>";
     if ( !form.elements['newMonitor[LabelY]'].value || !(parseInt(form.elements['newMonitor[LabelY]'].value) >= 0 ) )
       errors[errors.length] = "<?php echo translate('BadLabelY') ?>";
-    if ( !form.elements['newMonitor[ImageBufferCount]'].value || !(parseInt(form.elements['newMonitor[ImageBufferCount]'].value) >= 10 ) )
+    if ( !form.elements['newMonitor[ImageBufferCount]'].value || !(parseInt(form.elements['newMonitor[ImageBufferCount]'].value) >= 2 ) )
       errors[errors.length] = "<?php echo translate('BadImageBufferCount') ?>";
     if ( !form.elements['newMonitor[WarmupCount]'].value || !(parseInt(form.elements['newMonitor[WarmupCount]'].value) >= 0 ) )
       errors[errors.length] = "<?php echo translate('BadWarmupCount') ?>";
-    if ( !form.elements['newMonitor[PreEventCount]'].value || !(parseInt(form.elements['newMonitor[PreEventCount]'].value) >= 0 ) || (parseInt(form.elements['newMonitor[PreEventCount]'].value) > parseInt(form.elements['newMonitor[ImageBufferCount]'].value)) )
+    if ( 
+      !form.elements['newMonitor[PreEventCount]'].value
+      ||
+      !(parseInt(form.elements['newMonitor[PreEventCount]'].value) >= 0)
+      )
       errors[errors.length] = "<?php echo translate('BadPreEventCount') ?>";
     if ( !form.elements['newMonitor[PostEventCount]'].value || !(parseInt(form.elements['newMonitor[PostEventCount]'].value) >= 0 ) )
       errors[errors.length] = "<?php echo translate('BadPostEventCount') ?>";
@@ -119,9 +149,14 @@ function validateForm( form ) {
         errors[errors.length] = "<?php echo translate('BadSignalCheckColour') ?>";
     if ( !form.elements['newMonitor[WebColour]'].value || !form.elements['newMonitor[WebColour]'].value.match( /^[#0-9a-zA-Z]+$/ ) )
       errors[errors.length] = "<?php echo translate('BadWebColour') ?>";
-
   }
 
+  if ( form.elements['newMonitor[RTSPStreamName]'].value
+      &&
+      rtspStreamNames[form.elements['newMonitor[RTSPStreamName]'].value]
+    )
+    errors[errors.length] = "<?php echo translate('DuplicateRTSPStreamName') ?>";
+
   if ( errors.length ) {
     alert(errors.join("\n"));
     return false;
diff --git a/web/skins/classic/views/js/monitorpreset.js b/web/skins/classic/views/js/monitorpreset.js
index 57b9e343b..1b8fa5e58 100644
--- a/web/skins/classic/views/js/monitorpreset.js
+++ b/web/skins/classic/views/js/monitorpreset.js
@@ -1,12 +1,17 @@
+var form = $j('#monitorPresetForm');
+
 function submitPreset( element ) {
-  var form = element.form;
   form.target = opener.name;
   form.view.value = 'monitor';
   form.submit();
-  closeWindow.delay( 250 );
 }
 
-function configureButtons( element ) {
-  var form = element.form;
+function configureButtons() {
   form.saveBtn.disabled = (form.preset.selectedIndex==0);
 }
+
+function initPage() {
+  $j('#preset').change(configureButtons);
+}
+
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/monitorprobe.js b/web/skins/classic/views/js/monitorprobe.js
index cc507b8d9..1b628ed69 100644
--- a/web/skins/classic/views/js/monitorprobe.js
+++ b/web/skins/classic/views/js/monitorprobe.js
@@ -3,7 +3,6 @@ function submitCamera( element ) {
   form.target = opener.name;
   form.view.value = 'monitor';
   form.submit();
-  closeWindow.delay( 250 );
 }
 
 function configureButtons( element ) {
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index 03fc5c3f8..a1260effc 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -1,7 +1,3 @@
-var requestQueue = new Request.Queue({
-  concurrent: monitorData.length,
-  stopOnFailure: false
-});
 /**
  * called when the layoutControl select element is changed, or the page
  * is rendered
@@ -48,17 +44,17 @@ function selectLayout(element) {
   if ( ! layout ) {
     return;
   }
-  Cookie.write('zmMontageLayout', layout_id, {duration: 10*365});
+  setCookie('zmMontageLayout', layout_id, 3600);
   if ( layouts[layout_id].Name != 'Freeform' ) { // 'montage_freeform.css' ) {
-    Cookie.write('zmMontageScale', '', {duration: 10*365});
-    $('scale').set('value', '');
-    $('width').set('value', '0');
+    setCookie('zmMontageScale', '', 3600);
+    $j('#scale').val('');
+    $j('#width').val('0');
   } else {
     // Is freeform, we don't touch the width/height/scale settings, but we may need to update sizing and scales
   }
-  var width = parseInt($('width').get('value'));
-  var height = parseInt($('height').get('value'));
-  var scale = $('scale').get('value');
+  var width = parseInt($j('#width').val());
+  var height = parseInt($j('#height').val());
+  var scale = $j('#scale').val();
 
   for ( var i = 0, length = monitors.length; i < length; i++ ) {
     var monitor = monitors[i];
@@ -70,7 +66,7 @@ function selectLayout(element) {
     } else if ( height ) {
       stream_scale = parseInt(100*height/monitor.height);
     }
-    var streamImg = $('liveStream'+monitor.id);
+    var streamImg = document.getElementById('liveStream'+monitor.id);
     if ( streamImg ) {
       if ( streamImg.nodeName == 'IMG' ) {
         var src = streamImg.src;
@@ -94,8 +90,8 @@ function selectLayout(element) {
  * called when the widthControl|heightControl select elements are changed
  */
 function changeSize() {
-  var width = parseInt($('width').get('value'));
-  var height = parseInt($('height').get('value'));
+  var width = parseInt($j('#width').val());
+  var height = parseInt($j('#height').val());
 
   for ( var i = 0, length = monitors.length; i < length; i++ ) {
     var monitor = monitors[i];
@@ -110,7 +106,7 @@ function changeSize() {
     monitor_frame.css('height', ( height ? height+'px' : 'auto'));
 
     /*Stream could be an applet so can't use moo tools*/
-    var streamImg = $('liveStream'+monitor.id);
+    var streamImg = document.getElementById('liveStream'+monitor.id);
     if ( streamImg ) {
       if ( streamImg.nodeName == 'IMG' ) {
         var src = streamImg.src;
@@ -132,11 +128,11 @@ function changeSize() {
       //streamImg.style.height = '';
     }
   }
-  $('scale').set('value', '');
-  Cookie.write('zmMontageScale', '', {duration: 10*365});
-  Cookie.write('zmMontageWidth', width, {duration: 10*365});
-  Cookie.write('zmMontageHeight', height, {duration: 10*365});
-  jQuery("#zmMontageLayout option:selected").removeAttr("selected");
+  $j('#scale').val('');
+  setCookie('zmMontageScale', '', 3600);
+  setCookie('zmMontageWidth', width, 3600);
+  setCookie('zmMontageHeight', height, 3600);
+  $j("#zmMontageLayout option:selected").removeAttr("selected");
   //selectLayout('#zmMontageLayout');
 } // end function changeSize()
 
@@ -144,12 +140,12 @@ function changeSize() {
  * called when the scaleControl select element is changed
  */
 function changeScale() {
-  var scale = $('scale').get('value');
-  $('width').set('value', '0'); //auto
-  $('height').set('value', '0'); //auto
-  Cookie.write('zmMontageScale', scale, {duration: 10*365});
-  Cookie.write('zmMontageWidth', '', {duration: 10*365});
-  Cookie.write('zmMontageHeight', '', {duration: 10*365});
+  var scale = $j('#scale').val();
+  $j('#width').val('0'); //auto
+  $j('#height').val('0'); //auto
+  setCookie('zmMontageScale', scale, 3600);
+  setCookie('zmMontageWidth', '', 3600);
+  setCookie('zmMontageHeight', '', 3600);
   if ( scale == '' ) {
     selectLayout('#zmMontageLayout');
     return;
@@ -274,19 +270,24 @@ function reloadWebSite(ndx) {
   document.getElementById('imageFeed'+ndx).innerHTML = document.getElementById('imageFeed'+ndx).innerHTML;
 }
 
+function takeSnapshot() {
+  monitor_ids = monitorData.map((monitor)=>{
+    return 'monitor_ids[]='+monitor.id;
+  });
+  window.location = '?view=snapshot&action=create&'+monitor_ids.join('&');
+}
+
 var monitors = new Array();
 function initPage() {
-  jQuery(document).ready(function() {
-    jQuery("#hdrbutton").click(function() {
-      jQuery("#flipMontageHeader").slideToggle("slow");
-      jQuery("#hdrbutton").toggleClass('glyphicon-menu-down').toggleClass('glyphicon-menu-up');
-      Cookie.write( 'zmMontageHeaderFlip', jQuery('#hdrbutton').hasClass('glyphicon-menu-up') ? 'up' : 'down', {duration: 10*365} );
-    });
+  $j("#hdrbutton").click(function() {
+    $j("#flipMontageHeader").slideToggle("slow");
+    $j("#hdrbutton").toggleClass('glyphicon-menu-down').toggleClass('glyphicon-menu-up');
+    setCookie( 'zmMontageHeaderFlip', $j('#hdrbutton').hasClass('glyphicon-menu-up') ? 'up' : 'down', 3600);
   });
-  if ( Cookie.read('zmMontageHeaderFlip') == 'down' ) {
+  if ( getCookie('zmMontageHeaderFlip') == 'down' ) {
     // The chosen dropdowns require the selects to be visible, so once chosen has initialized, we can hide the header
-    jQuery("#flipMontageHeader").slideToggle("fast");
-    jQuery("#hdrbutton").toggleClass('glyphicon-menu-down').toggleClass('glyphicon-menu-up');
+    $j("#flipMontageHeader").slideToggle("fast");
+    $j("#hdrbutton").toggleClass('glyphicon-menu-down').toggleClass('glyphicon-menu-up');
   }
 
   for ( var i = 0, length = monitorData.length; i < length; i++ ) {
@@ -306,4 +307,4 @@ function initPage() {
   selectLayout('#zmMontageLayout');
 }
 // Kick everything off
-window.addEventListener('DOMContentLoaded', initPage);
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/montage.js.php b/web/skins/classic/views/js/montage.js.php
index 5a2aef2ed..9b6962119 100644
--- a/web/skins/classic/views/js/montage.js.php
+++ b/web/skins/classic/views/js/montage.js.php
@@ -37,7 +37,7 @@ monitorData[monitorData.length] = {
   'width': <?php echo $monitor->ViewWidth() ?>,
   'height':<?php echo $monitor->ViewHeight() ?>,
   'url': '<?php echo $monitor->UrlToIndex( ZM_MIN_STREAMING_PORT ? ($monitor->Id() + ZM_MIN_STREAMING_PORT) : '') ?>',
-  'onclick': function(){createPopup( '?view=watch&mid=<?php echo $monitor->Id() ?>', 'zmWatch<?php echo $monitor->Id() ?>', 'watch', <?php echo reScale( $monitor->ViewWidth(), $monitor->PopupScale() ); ?>, <?php echo reScale( $monitor->ViewHeight(), $monitor->PopupScale() ); ?> );},
+  'onclick': function(){window.location.assign( '?view=watch&mid=<?php echo $monitor->Id() ?>' );},
   'type': '<?php echo $monitor->Type() ?>',
   'refresh': '<?php echo $monitor->Refresh() ?>'
 };
diff --git a/web/skins/classic/views/js/montagereview.js b/web/skins/classic/views/js/montagereview.js
index 5207f24d5..e4fcc3816 100644
--- a/web/skins/classic/views/js/montagereview.js
+++ b/web/skins/classic/views/js/montagereview.js
@@ -42,7 +42,7 @@ function evaluateLoadTimes() {
   currentDisplayInterval = Math.min(Math.max(currentDisplayInterval, 40), 10000);
   imageLoadTimesEvaluated=0;
   setSpeed(speedIndex);
-  $('fps').innerHTML="Display refresh rate is " + (1000 / currentDisplayInterval).toFixed(1) + " per second, avgFrac=" + avgFrac.toFixed(3) + ".";
+  $j('#fps').text("Display refresh rate is " + (1000 / currentDisplayInterval).toFixed(1) + " per second, avgFrac=" + avgFrac.toFixed(3) + ".");
 } // end evaluateLoadTimes()
 
 function getFrame(monId, time, last_Frame) {
@@ -337,7 +337,7 @@ function drawSliderOnGraph(val) {
       ctx.strokeRect(sliderX+sliderLineWidth, sliderLineWidth, sliderWidth - 2*sliderLineWidth, sliderHeight - 2*sliderLineWidth);
       underSliderX = sliderX;
     }
-    var o = $('scruboutput');
+    var o = document.getElementById('scruboutput');
     if ( liveMode == 1 ) {
       o.innerHTML = "Live Feed @ " + (1000 / currentDisplayInterval).toFixed(1) + " fps";
       o.style.color = "red";
@@ -363,41 +363,41 @@ function drawSliderOnGraph(val) {
   // Because these change widths if the slider is too close, use the slider width as an estimate for the left/right label length (i.e. don't recalculate len from above)
   // If this starts to collide increase some of the extra space
 
-  var o = $('scrubleft');
-  o.innerHTML=secs2dbstr(minTimeSecs);
-  o.style.position="absolute";
-  o.style.bottom=labbottom;
-  o.style.font=labfont;
-  o.style.left="5px";
+  var o = document.getElementById('scrubleft');
+  o.innerHTML = secs2dbstr(minTimeSecs);
+  o.style.position = "absolute";
+  o.style.bottom = labbottom;
+  o.style.font = labfont;
+  o.style.left = "5px";
   if ( numMonitors == 0 ) { // we need a len calculation if we skipped the slider
     len = o.offsetWidth;
   }
   // If the slider will overlay part of this suppress (this is the left side)
   if ( len + 10 > sliderX || cWidth < len * 4 ) {
     // that last check is for very narrow browsers
-    o.style.display="none";
+    o.style.display = "none";
   } else {
-    o.style.display="inline";
-    o.style.display="inline-flex"; // safari won't take this but will just ignore
+    o.style.display = "inline";
+    o.style.display = "inline-flex"; // safari won't take this but will just ignore
   }
 
-  var o = $('scrubright');
-  o.innerHTML=secs2dbstr(maxTimeSecs);
-  o.style.position="absolute";
-  o.style.bottom=labbottom;
-  o.style.font=labfont;
+  var o = document.getElementById('scrubright');
+  o.innerHTML = secs2dbstr(maxTimeSecs);
+  o.style.position = "absolute";
+  o.style.bottom = labbottom;
+  o.style.font = labfont;
   // If the slider will overlay part of this suppress (this is the right side)
   o.style.left=(cWidth - len - 15).toString() + "px";
   if ( sliderX > cWidth - len - 20 || cWidth < len * 4 ) {
-    o.style.display="none";
+    o.style.display = "none";
   } else {
-    o.style.display="inline";
-    o.style.display="inline-flex";
+    o.style.display = "inline";
+    o.style.display = "inline-flex";
   }
 }
 
 function drawGraph() {
-  var divWidth = $('timelinediv').clientWidth;
+  var divWidth = document.getElementById('timelinediv').clientWidth;
   canvas.width = cWidth = divWidth; // Let it float and determine width (it should be sized a bit smaller percentage of window)
   cHeight = parseInt(window.innerHeight * 0.10);
   if ( cHeight < numMonitors * 20 ) {
@@ -461,46 +461,54 @@ function drawGraph() {
 } // end function drawGraph
 
 function redrawScreen() {
+  var dateTimeDiv = $j('#DateTimeDiv');
+  var speedDiv = $j('#SpeedDiv');
+  var timeLineDiv = $j('#timelinediv');
+  var liveButton = $j('#liveButton');
+  var zoomIn = $j('#zoomin');
+  var zoomOut = $j('#zoomout');
+  var panLeft = $j('#panleft');
+  var panRight = $j('#panright');
+  var downloadVideo = $j('#downloadVideo');
+  var scaleDiv = $j('#ScaleDiv');
+  var fit = $j('#fit');
+
   if ( liveMode == 1 ) {
     // if we are not in live view switch to history -- this has to come before fit in case we re-establish the timeline
-    $('DateTimeDiv').style.display="none";
-    $('SpeedDiv').style.display="none";
-    var timelinediv= $('timelinediv');
-    if ( timelinediv ) timelinediv.style.display="none";
-    $('liveButton').innerHTML="History";
-    $('zoomin').style.display="none";
-    $('zoomout').style.display="none";
-    $('panleft').style.display="none";
-    $('panright').style.display="none";
-    if ($('downloadVideo')) $('downloadVideo').style.display="none";
+    dateTimeDiv.hide();
+    speedDiv.hide();
+    timeLineDiv.hide();
+    liveButton.text('History');
+    zoomIn.hide();
+    zoomOut.hide();
+    panLeft.hide();
+    panRight.hide();
+    downloadVideo.hide();
   } else {
     // switch out of liveview mode
-    $('DateTimeDiv').style.display="inline";
-    $('DateTimeDiv').style.display="inline-flex";
-    $('SpeedDiv').style.display="inline";
-    $('SpeedDiv').style.display="inline-flex";
-    $('timelinediv').style.display=null;
-    $('liveButton').innerHTML="Live";
-    $('zoomin').style.display="inline";
-    $('zoomin').style.display="inline-flex";
-    $('zoomout').style.display="inline";
-    $('zoomout').style.display="inline-flex";
-    $('panleft').style.display="inline";
-    $('panleft').style.display="inline-flex";
-    $('panright').style.display="inline";
-    $('panright').style.display="inline-flex";
-    if ($('downloadVideo')) $('downloadVideo').style.display="inline";
+    dateTimeDiv.show();
+    speedDiv.show();
+    timeLineDiv.show();
+    liveButton.text('Live');
+    zoomIn.show();
+    zoomOut.show();
+    panLeft.show();
+    panRight.show();
+    downloadVideo.show();
+
     drawGraph();
   }
 
   if ( fitMode == 1 ) {
-    $('ScaleDiv').style.display="none";
-    $('fit').innerHTML="Scale";
-    var vh=window.innerHeight;
-    var pos=$('monitors').getPosition();
-    var mh=(vh - pos.y - $('fps').getSize().y);
-    $('monitors').setStyle('height', mh.toString() + "px"); // leave a small gap at bottom
-    if (maxfit2($('monitors').getSize().x, $('monitors').getSize().y) == 0) { /// if we fail to fix we back out of fit mode -- ??? This may need some better handling
+    var monitors = $j('#monitors');
+    var fps = $j('#fps');
+    var vh = window.innerHeight;
+    var mh = (vh - monitors.position().top - fps.outerHeight());
+
+    scaleDiv.hide();
+    fit.text('Scale');
+    monitors.height(mh.toString() + "px"); // leave a small gap at bottom
+    if (maxfit2(monitors.outerWidth(), monitors.outerHeight()) == 0) { /// if we fail to fix we back out of fit mode -- ??? This may need some better handling
       fitMode=1-fitMode;
     }
   } else {
@@ -509,10 +517,9 @@ function redrawScreen() {
     for ( var i=0; i<numMonitors; i++ ) {
       monitorCanvasObj[monitorPtr[i]].style.position="";
     }
-    $('monitors').setStyle('height', "auto");
-    $('ScaleDiv').style.display="inline";
-    $('ScaleDiv').style.display="inline-flex";
-    $('fit').innerHTML="Fit";
+    monitors.height('auto');
+    scaleDiv.show();
+    fit.text('fit');
     setScale(currentScale);
   }
   outputUpdate(currentTimeSecs);
@@ -609,7 +616,7 @@ function setFit(value) {
 
 function showScale(newscale) {
   // updates slider only
-  $('scaleslideroutput').innerHTML = parseFloat(newscale).toFixed(2).toString() + " x";
+  $j('#scaleslideroutput').text(parseFloat(newscale).toFixed(2).toString() + " x");
   return;
 }
 
@@ -625,7 +632,7 @@ function setScale(newscale) {
 
 function showSpeed(val) {
   // updates slider only
-  $('speedslideroutput').innerHTML = parseFloat(speeds[val]).toFixed(2).toString() + " x";
+  $j('#speedslideroutput').text(parseFloat(speeds[val]).toFixed(2).toString() + " x");
 }
 
 function setSpeed(speed_index) {
@@ -666,10 +673,10 @@ function clicknav(minSecs, maxSecs, live) {// we use the current time if we can
       maxSecs = parseInt(now);
     }
     maxStr = "&maxTime=" + secs2inputstr(maxSecs);
-    $('maxTime').value = secs2inputstr(maxSecs);
+    $j('#maxTime').val(secs2inputstr(maxSecs));
   }
   if ( minSecs > 0 ) {
-    $('minTime').value = secs2inputstr(minSecs);
+    $j('#minTime').val(secs2inputstr(minSecs));
     minStr = "&minTime=" + secs2inputstr(minSecs);
   }
   if ( maxSecs == 0 && minSecs == 0 ) {
@@ -735,8 +742,16 @@ function click_panright() {
   maxTimeSecs = minTimeSecs + rangeTimeSecs - 1;
   clicknav(minTimeSecs, maxTimeSecs, 0);
 }
+// Manage the DOWNLOAD VIDEO button
 function click_download() {
-  createPopup('?view=download', 'zmDownload', 'download');
+  $j.getJSON(thisUrl + '?request=modal&modal=download')
+      .done(function(data) {
+        insertModalHtml('downloadModal', data.html);
+        $j('#downloadModal').modal('show');
+        // Manage the GENERATE DOWNLOAD button
+        $j('#exportButton').click(exportEvent);
+      })
+      .fail(logAjaxFail);
 }
 function click_all_events() {
   clicknav(0, 0, 0);
@@ -793,7 +808,7 @@ function maxfit2(divW, divH) {
       }
 
       if ( borders <= 0 ) {
-        borders=$("Monitor"+monId).getStyle("border").toInt() * 2;
+        borders = parseInt($j('#Monitor'+monId).css('border')) * 2;
       } // assume fixed size border, and added to both sides and top/bottom
       // try fitting over first, then down.  Each new one must land at either upper right or lower left corner of last (try in that order)
       // Pick the one with the smallest Y, then smallest X if Y equal
@@ -848,12 +863,12 @@ function maxfit2(divW, divH) {
   }
   if ( bestFitArea > 0 ) { // only rearrange if we could fit -- otherwise just do nothing, let them start coming out, whatever
     for ( m = 0; m < numMonitors; m++ ) {
-      c = $("Monitor" + monitorPtr[m]);
-      c.style.position="absolute";
-      c.style.left=bestFitX[m].toString() + "px";
-      c.style.top=bestFitY[m].toString() + "px";
+      c = document.getElementById('Monitor' + monitorPtr[m]);
+      c.style.position = "absolute";
+      c.style.left = bestFitX[m].toString() + "px";
+      c.style.top = bestFitY[m].toString() + "px";
       c.width = bestFitX2[m] - bestFitX[m] + 1 - borders;
-      c.height= bestFitY2[m] - bestFitY[m] + 1 - borders;
+      c.height = bestFitY2[m] - bestFitY[m] + 1 - borders;
     }
     return 1;
   } else {
@@ -869,15 +884,15 @@ function showOneMonitor(monId) {
   var url;
   if ( liveMode != 0 ) {
     url = '?view=watch&mid=' + monId.toString();
-    createPopup(url, 'zmWatch', 'watch', monitorWidth[monId], monitorHeight[monId]);
+    window.location.assign(url);
   } else {
     var Frame = getFrame(monId, currentTimeSecs);
     if ( Frame ) {
       url = '?view=event&eid=' + Frame.EventId + '&fid=' + Frame.FrameId;
-      createPopup(url, 'zmEvent', 'event', monitorWidth[monId], monitorHeight[monId]);
+      window.location.assign(url);
     } else {
       url = '?view=watch&mid=' + monId.toString();
-      createPopup(url, 'zmWatch', 'watch', monitorWidth[monId], monitorHeight[monId]);
+      window.location.assign(url);
     }
   } // end if live/events
 }
@@ -894,7 +909,7 @@ function zoom(monId, scale) {
 
 function clickMonitor(event) {
   var element = event.target;
-  //var monitor_element = $("Monitor"+monId.toString());
+  //var monitor_element = document.getElementById('Monitor'+monId.toString());
   var monId = element.getAttribute('monitor_id');
   var pos_x = event.offsetX ? (event.offsetX) : event.pageX - element.offsetLeft;
   var pos_y = event.offsetY ? (event.offsetY) : event.pageY - element.offsetTop;
@@ -955,7 +970,7 @@ function initPage() {
   for ( var i = 0, len = monitorPtr.length; i < len; i += 1 ) {
     var monId = monitorPtr[i];
     if ( !monId ) continue;
-    monitorCanvasObj[monId] = $('Monitor'+monId);
+    monitorCanvasObj[monId] = document.getElementById('Monitor'+monId);
     if ( !monitorCanvasObj[monId] ) {
       alert("Couldn't find DOM element for Monitor" + monId + "monitorPtr.length=" + len);
     } else {
@@ -974,7 +989,7 @@ function initPage() {
   } // end foreach monitor
 
   if ( !liveMode ) {
-    canvas = $("timeline");
+    canvas = document.getElementById('timeline');
 
     canvas.addEventListener('mousemove', mmove, false);
     canvas.addEventListener('touchmove', tmove, false);
diff --git a/web/skins/classic/views/js/montagereview.js.php b/web/skins/classic/views/js/montagereview.js.php
index d2277b507..291bb99e8 100644
--- a/web/skins/classic/views/js/montagereview.js.php
+++ b/web/skins/classic/views/js/montagereview.js.php
@@ -76,7 +76,7 @@ if ( !$liveMode ) {
       if ( !isset($event['FramesById']) ) {
         // Please note that this is the last frame as we sort DESC
         $event['FramesById'] = array();
-        $frame['NextTimeStampSecs'] = $event['EndTime'];
+        $frame['NextTimeStampSecs'] = $event['EndTimeSecs'];
       } else {
         $frame['NextTimeStampSecs'] = $next_frames[$frame['EventId']]['TimeStampSecs'];
         $frame['NextFrameId'] = $next_frames[$frame['EventId']]['Id'];
@@ -230,7 +230,6 @@ for ( $i=0; $i < count($speeds); $i++ )
 echo "];\n";
 ?>
 
-var scrubAsObject=$('scrub');
 var cWidth;   // save canvas width
 var cHeight;  // save canvas height
 var canvas;   // global canvas definition so we don't have to keep looking it up
diff --git a/web/skins/classic/views/js/onvifprobe.js b/web/skins/classic/views/js/onvifprobe.js
index 4f10e5c29..28faa3175 100644
--- a/web/skins/classic/views/js/onvifprobe.js
+++ b/web/skins/classic/views/js/onvifprobe.js
@@ -3,7 +3,6 @@ function submitCamera( element ) {
   form.target = self.name;
   form.view.value = 'monitor';
   form.submit();
-  closeWindow.delay( 250 );
 }
 
 function gotoStep1( element ) {
diff --git a/web/skins/classic/views/js/options.js b/web/skins/classic/views/js/options.js
index 2629f33fe..2566e2ab7 100644
--- a/web/skins/classic/views/js/options.js
+++ b/web/skins/classic/views/js/options.js
@@ -2,11 +2,7 @@
 function getServerModal(sid) {
   $j.getJSON(thisUrl + '?request=modal&modal=server&id=' + sid)
       .done(function(data) {
-        if ( $j('#ServerModal').length ) {
-          $j('#ServerModal').replaceWith(data.html);
-        } else {
-          $j("body").append(data.html);
-        }
+        insertModalHtml('ServerModal', data.html);
         $j('#ServerModal').modal('show');
         // Manage the Save button
         $j('#serverSubmitBtn').click(function(evt) {
@@ -14,10 +10,7 @@ function getServerModal(sid) {
           $j('#serverModalForm').submit();
         });
       })
-      .fail(function(jqxhr, textStatus, error) {
-        console.log("Request Failed: " + textStatus + ", " + error);
-        console.log("Response Text: " + jqxhr.responseText);
-      });
+      .fail(logAjaxFail);
 }
 
 function enableServerModal() {
@@ -36,11 +29,7 @@ function enableServerModal() {
 function getStorageModal(sid) {
   $j.getJSON(thisUrl + '?request=modal&modal=storage&id=' + sid)
       .done(function(data) {
-        if ( $j('#storageModal').length ) {
-          $j('#storageModal').replaceWith(data.html);
-        } else {
-          $j("body").append(data.html);
-        }
+        insertModalHtml('storageModal', data.html);
         $j('#storageModal').modal('show');
         // Manage the Save button
         $j('#storageSubmitBtn').click(function(evt) {
@@ -48,10 +37,7 @@ function getStorageModal(sid) {
           $j('#storageModalForm').submit();
         });
       })
-      .fail(function(jqxhr, textStatus, error) {
-        console.log("Request Failed: " + textStatus + ", " + error);
-        console.log("Response Text: " + jqxhr.responseText);
-      });
+      .fail(logAjaxFail);
 }
 
 function enableStorageModal() {
@@ -66,15 +52,21 @@ function enableStorageModal() {
   });
 }
 
+// Manage the Add New User button
+function AddNewUser(el) {
+  url = el.getAttribute('data-url');
+  window.location.assign(url);
+}
+
 function initPage() {
   var NewStorageBtn = $j('#NewStorageBtn');
   var NewServerBtn = $j('#NewServerBtn');
 
-  if ( canEditSystem ) enableStorageModal();
-  if ( canEditSystem ) enableServerModal();
+  if ( canEdit.System ) enableStorageModal();
+  if ( canEdit.System ) enableServerModal();
 
-  NewStorageBtn.prop('disabled', !canEditSystem);
-  NewServerBtn.prop('disabled', !canEditSystem);
+  NewStorageBtn.prop('disabled', !canEdit.System);
+  NewServerBtn.prop('disabled', !canEdit.System);
 }
 
 $j(document).ready(function() {
diff --git a/web/skins/classic/views/js/options.js.php b/web/skins/classic/views/js/options.js.php
index 5281cde8c..49a4e94d3 100644
--- a/web/skins/classic/views/js/options.js.php
+++ b/web/skins/classic/views/js/options.js.php
@@ -4,4 +4,3 @@ if ( restartWarning ) {
   alert( "<?php echo translate('OptionRestartWarning') ?>" );
 }
 
-var canEditSystem = <?php echo canEdit('System') ? 'true' : 'false' ?>;
diff --git a/web/skins/classic/views/js/postlogin.js b/web/skins/classic/views/js/postlogin.js
new file mode 100644
index 000000000..959e54929
--- /dev/null
+++ b/web/skins/classic/views/js/postlogin.js
@@ -0,0 +1,13 @@
+// Redirect to the requested ZoneMinder url after the user logs in
+function postLoginRedirect() {
+  console.log('Current location: ' + window.location);
+  console.log('Redirecting to (' + redirectSuffix + ') from :' + thisUrl);
+  window.location.replace(redirectSuffix);
+}
+
+function initPage() {
+  setTimeout(postLoginRedirect, 500);
+}
+
+// Kick everything off
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/postlogin.js.php b/web/skins/classic/views/js/postlogin.js.php
index b5d712477..27e1679ef 100644
--- a/web/skins/classic/views/js/postlogin.js.php
+++ b/web/skins/classic/views/js/postlogin.js.php
@@ -1,5 +1,4 @@
 <?php
-// $thisUrl is the base URL used to access ZoneMinder.
 //
 // If the user attempts to access a privileged view but is not logged in, then he may
 // be given the opportunity to log in via the login view.  In that case, the login view
@@ -7,28 +6,18 @@
 // view receives the postLoginQuery via the login form submission, and we can then
 // redirect the user to his original intended destination by appending it to the URL.
 //
+
+$redirectSuffix = $user['HomeView'] != '' ? $user['HomeView'] : '?view=console';
+if ( !empty($_SESSION['postLoginQuery']) ) {
+  parse_str($_SESSION['postLoginQuery'], $queryParams);
+  $redirectSuffix = '?' . http_build_query($queryParams);
+  zm_session_start();
+  unset($_SESSION['postLoginQuery']);
+  session_write_close();
+}
+
+// If we didn't redirect elsewhere, then don't show login page, go to console
+if ( $redirectSuffix == '?view=login' ) $redirectSuffix = '?view=console';
 ?>
 
-$j(
-	function () {
-		// Append '?(GET query)' to URL if the GET query is not empty.
-		var querySuffix = '<?php
-			if ( !empty($_SESSION['postLoginQuery']) ) {
-        parse_str($_SESSION['postLoginQuery'], $queryParams);
-        echo '?' . http_build_query($queryParams);
-        zm_session_start();
-        unset($_SESSION['postLoginQuery']);
-        session_write_close();
-      }
-			?>';
-
-    if ( querySuffix == '?view=login' || querySuffix == '' ) {
-      // If we didn't redirect elsewhere, then don't show login page, go to console
-      querySuffix = '?view=console';
-    }
-    var newUrl = querySuffix;
-console.log("Current location: " + window.location);
-console.log("Redirecting to (" + newUrl + ') from :' + thisUrl);
-		window.location.replace(newUrl);
-	}
-).delay( 500 );
+var redirectSuffix = '<?php echo $redirectSuffix ?>';
diff --git a/web/skins/classic/views/js/report_event_audit.js b/web/skins/classic/views/js/report_event_audit.js
index d2224366a..755d80172 100644
--- a/web/skins/classic/views/js/report_event_audit.js
+++ b/web/skins/classic/views/js/report_event_audit.js
@@ -30,29 +30,28 @@ function changeDateTime(e) {
   window.location = uri;
 }
 
+function datetime_change(newDate, oldData) {
+  if (newDate !== oldData.lastVal) {
+    changeDateTime();
+  }
+}
+
 function initPage() {
   $j('#minTime').datetimepicker({
     timeFormat: "HH:mm:ss",
     dateFormat: "yy-mm-dd",
     maxDate: +0,
     constrainInput: false,
-    onClose: function(newDate, oldData) {
-      if (newDate !== oldData.lastVal) {
-        changeDateTime();
-      }
-    }
+    onClose: datetime_change
   });
+
   $j('#maxTime').datetimepicker({
     timeFormat: "HH:mm:ss",
     dateFormat: "yy-mm-dd",
     minDate: $j('#minTime').val(),
     maxDate: +0,
     constrainInput: false,
-    onClose: function(newDate, oldData) {
-      if (newDate !== oldData.lastVal) {
-        changeDateTime();
-      }
-    }
+    onClose: datetime_change
   });
 }
 // Kick everything off
diff --git a/web/skins/classic/views/js/snapshot.js b/web/skins/classic/views/js/snapshot.js
new file mode 100644
index 000000000..9ddefe0f7
--- /dev/null
+++ b/web/skins/classic/views/js/snapshot.js
@@ -0,0 +1,114 @@
+var backBtn = $j('#backBtn');
+var saveBtn = $j('#saveBtn');
+var deleteBtn = $j('#deleteBtn');
+
+// Manage the DELETE CONFIRMATION modal button
+function manageDelConfirmModalBtns() {
+  document.getElementById('delConfirmBtn').addEventListener('click', function onDelConfirmClick(evt) {
+    if ( !canEdit.Events ) {
+      enoperm();
+      return;
+    }
+
+    evt.preventDefault();
+    /*
+    $j.getJSON(thisUrl + '?request=events&task=delete&eids[]='+eventData.Id)
+        .done(function(data) {
+          streamNext(true);
+        })
+        .fail(logAjaxFail);
+        */
+  });
+
+  // Manage the CANCEL modal button
+  document.getElementById("delCancelBtn").addEventListener("click", function onDelCancelClick(evt) {
+    $j('#deleteConfirm').modal('hide');
+  });
+}
+
+function initPage() {
+  // enable or disable buttons based on current selection and user rights
+  /*
+  renameBtn.prop('disabled', !canEdit.Events);
+  archiveBtn.prop('disabled', !(!eventData.Archived && canEdit.Events));
+  unarchiveBtn.prop('disabled', !(eventData.Archived && canEdit.Events));
+  */
+  saveBtn.prop('disabled', !(canEdit.Events || (snapshot.CreatedBy == user.Id) ));
+  /*
+  exportBtn.prop('disabled', !canView.Events);
+  downloadBtn.prop('disabled', !canView.Events);
+  */
+  deleteBtn.prop('disabled', !canEdit.Events);
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the BACK button
+  bindButton('#backBtn', 'click', null, function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  bindButton('#refreshBtn', 'click', null, function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the EDIT button
+  bindButton('#saveBtn', 'click', null, function onSaveClick(evt) {
+    /*
+    if ( ! canEdit.Events ) {
+      enoperm();
+      return;
+    }
+    */
+    console.log(evt);
+    evt.target.form.submit();
+  });
+
+  /*
+  // Manage the EXPORT button
+  bindButton('#exportBtn', 'click', null, function onExportClick(evt) {
+    evt.preventDefault();
+    window.location.assign('?view=export&eids[]='+eventData.Id);
+  });
+
+  // Manage the DOWNLOAD VIDEO button
+  bindButton('#downloadBtn', 'click', null, function onDownloadClick(evt) {
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=modal&modal=download&eids[]='+eventData.Id)
+        .done(function(data) {
+          insertModalHtml('downloadModal', data.html);
+          $j('#downloadModal').modal('show');
+          // Manage the GENERATE DOWNLOAD button
+          $j('#exportButton').click(exportEvent);
+        })
+        .fail(logAjaxFail);
+  });
+*/
+  // Manage the DELETE button
+  bindButton('#deleteBtn', 'click', null, function onDeleteClick(evt) {
+    if ( !canEdit.Events ) {
+      enoperm();
+      return;
+    }
+
+    evt.preventDefault();
+    if ( ! $j('#deleteConfirm').length ) {
+      // Load the delete confirmation modal into the DOM
+      $j.getJSON(thisUrl + '?request=modal&modal=delconfirm')
+          .done(function(data) {
+            insertModalHtml('deleteConfirm', data.html);
+            manageDelConfirmModalBtns();
+            $j('#deleteConfirm').modal('show');
+          })
+          .fail(logAjaxFail);
+      return;
+    }
+    $j('#deleteConfirm').modal('show');
+  });
+} // end initPage
+
+// Kick everything off
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/snapshot.js.php b/web/skins/classic/views/js/snapshot.js.php
new file mode 100644
index 000000000..fd97be727
--- /dev/null
+++ b/web/skins/classic/views/js/snapshot.js.php
@@ -0,0 +1,30 @@
+<?php
+  global $snapshot;
+?>
+var snapshot = <?php echo json_encode($snapshot); ?>;
+
+var eventDataStrings = {
+    Id: '<?php echo translate('EventId') ?>',
+    Name: '<?php echo translate('EventName') ?>',
+    MonitorId: '<?php echo translate('AttrMonitorId') ?>',
+    MonitorName: '<?php echo translate('AttrMonitorName') ?>',
+    Cause: '<?php echo translate('Cause') ?>',
+    StartDateTimeFmt: '<?php echo translate('AttrStartTime') ?>',
+    Length: '<?php echo translate('Duration') ?>',
+    Frames: '<?php echo translate('AttrFrames') ?>',
+    AlarmFrames: '<?php echo translate('AttrAlarmFrames') ?>',
+    TotScore: '<?php echo translate('AttrTotalScore') ?>',
+    AvgScore: '<?php echo translate('AttrAvgScore') ?>',
+    MaxScore: '<?php echo translate('AttrMaxScore') ?>',
+    DiskSpace: '<?php echo translate('DiskSpace') ?>',
+    Storage: '<?php echo translate('Storage') ?>',
+    ArchivedStr: '<?php echo translate('Archived') ?>',
+    EmailedStr: '<?php echo translate('Emailed') ?>'
+};
+
+// Strings
+//
+var deleteString = "<?php echo validJsStr(translate('Delete')) ?>";
+var causeString = "<?php echo validJsStr(translate('AttrCause')) ?>";
+var WEB_LIST_THUMB_WIDTH = '<?php echo ZM_WEB_LIST_THUMB_WIDTH ?>';
+var WEB_LIST_THUMB_HEIGHT = '<?php echo ZM_WEB_LIST_THUMB_HEIGHT ?>';
diff --git a/web/skins/classic/views/js/snapshots.js b/web/skins/classic/views/js/snapshots.js
new file mode 100644
index 000000000..4aba92b85
--- /dev/null
+++ b/web/skins/classic/views/js/snapshots.js
@@ -0,0 +1,287 @@
+var backBtn = $j('#backBtn');
+var exportBtn = $j('#exportBtn');
+var deleteBtn = $j('#deleteBtn');
+var table = $j('#snapshotTable');
+
+/*
+This is the format of the json object sent by bootstrap-table
+
+var params =
+{
+"type":"get",
+"data":
+  {
+  "search":"some search text",
+  "sort":"StartDateTime",
+  "order":"asc",
+  "offset":0,
+  "limit":25
+  "filter":
+    {
+    "Name":"some advanced search text"
+    "StartDateTime":"some more advanced search text"
+    }
+  },
+"cache":true,
+"contentType":"application/json",
+"dataType":"json"
+};
+*/
+
+// Called by bootstrap-table to retrieve zm event data
+function ajaxRequest(params) {
+  if ( params.data && params.data.filter ) {
+    params.data.advsearch = params.data.filter;
+    delete params.data.filter;
+  }
+  $j.getJSON(thisUrl + '?view=request&request=snapshots&task=query', params.data)
+      .done(function(data) {
+        var rows = processRows(data.rows);
+        // rearrange the result into what bootstrap-table expects
+        params.success({total: data.total, totalNotFiltered: data.totalNotFiltered, rows: rows});
+      })
+      .fail(function(jqXHR) {
+        logAjaxFail(jqXHR);
+        table.bootstrapTable('refresh');
+      });
+}
+
+function processRows(rows) {
+  $j.each(rows, function(ndx, row) {
+    var id = row.Id;
+    row.Id = '<a href="?view=snapshot&amp;id=' + id + '">' + id + '</a>';
+    row.Name = '<a href="?view=snapshot&amp;id=' + id + '">' + row.Name + '</a>';
+    row.Description = '<a href="?view=snapshot&amp;id=' + id + '">' + row.Description + '</a>';
+
+    if (WEB_LIST_THUMBS) row.Thumbnail = '<a href="?view=snapshot&amp;id=' + id +'">' + row.imgHtml + '</a>';
+  });
+
+  return rows;
+}
+
+// Returns the event id's of the selected rows
+function getIdSelections() {
+  var table = $j('#snapshotTable');
+
+  return $j.map(table.bootstrapTable('getSelections'), function(row) {
+    return row.Id.replace(/(<([^>]+)>)/gi, ''); // strip the html from the element before sending
+  });
+}
+
+// Returns a boolen to indicate at least one selected row is archived
+function getArchivedSelections() {
+  var table = $j('#snapshotTable');
+  var selection = $j.map(table.bootstrapTable('getSelections'), function(row) {
+    return row.Archived;
+  });
+  return selection.includes("Yes");
+}
+
+// Load the Delete Confirmation Modal HTML via Ajax call
+function getDelConfirmModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=delconfirm')
+      .done(function(data) {
+        insertModalHtml('deleteConfirm', data.html);
+        manageDelConfirmModalBtns();
+      })
+      .fail(logAjaxFail);
+}
+
+// Manage the DELETE CONFIRMATION modal button
+function manageDelConfirmModalBtns() {
+  document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) {
+    if ( ! canEdit.Events ) {
+      enoperm();
+      return;
+    }
+
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&task=delete&eids[]='+selections.join('&eids[]='))
+        .done( function(data) {
+          $j('#snapshotTable').bootstrapTable('refresh');
+          $j('#deleteConfirm').modal('hide');
+        })
+        .fail( function(jqxhr) {
+          logAjaxFail(jqxhr);
+          $j('#snapshotTable').bootstrapTable('refresh');
+          $j('#deleteConfirm').modal('hide');
+        });
+  });
+
+  // Manage the CANCEL modal button
+  document.getElementById("delCancelBtn").addEventListener("click", function onDelCancelClick(evt) {
+    $j('#deleteConfirm').modal('hide');
+  });
+}
+
+function getEventDetailModal(eid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]=' + eid)
+      .done(function(data) {
+        insertModalHtml('eventDetailModal', data.html);
+        $j('#eventDetailModal').modal('show');
+        // Manage the Save button
+        $j('#eventDetailSaveBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#eventDetailForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function getObjdetectModal(eid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=objdetect&eid=' + eid)
+      .done(function(data) {
+        insertModalHtml('objdetectModal', data.html);
+        $j('#objdetectModal').modal('show');
+      })
+      .fail(logAjaxFail);
+}
+
+function initPage() {
+  // Remove the thumbnail column from the DOM if thumbnails are off globally
+  if ( !WEB_LIST_THUMBS ) $j('th[data-field="Thumbnail"]').remove();
+
+  // Load the delete confirmation modal into the DOM
+  getDelConfirmModal();
+
+  // Init the bootstrap-table
+  table.bootstrapTable({icons: icons});
+
+  // enable or disable buttons based on current selection and user rights
+  table.on('check.bs.table uncheck.bs.table ' +
+  'check-all.bs.table uncheck-all.bs.table',
+  function() {
+    selections = table.bootstrapTable('getSelections');
+
+    //exportBtn.prop('disabled', !(selections.length && canView.Events));
+    //downloadBtn.prop('disabled', !(selections.length && canView.Events));
+    deleteBtn.prop('disabled', !(selections.length && canEdit.Events));
+  });
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Setup the thumbnail video animation
+  //initThumbAnimation();
+
+  // Some toolbar events break the thumbnail animation, so re-init eventlistener
+  //table.on('all.bs.table', initThumbAnimation);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  /*
+  // Manage the ARCHIVE button
+  document.getElementById("archiveBtn").addEventListener("click", function onArchiveClick(evt) {
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&task=archive&eids[]='+selections.join('&eids[]='))
+        .done( function(data) {
+          $j('#snapshotTable').bootstrapTable('refresh');
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the UNARCHIVE button
+  document.getElementById("unarchiveBtn").addEventListener("click", function onUnarchiveClick(evt) {
+    if ( ! canEdit.Events ) {
+      enoperm();
+      return;
+    }
+
+    var selections = getIdSelections();
+    //console.log(selections);
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&task=unarchive&eids[]='+selections.join('&eids[]='))
+        .done( function(data) {
+          $j('#snapshotTable').bootstrapTable('refresh');
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the EDIT button
+  document.getElementById("editBtn").addEventListener("click", function onEditClick(evt) {
+    if ( ! canEdit.Events ) {
+      enoperm();
+      return;
+    }
+
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]='+selections.join('&eids[]='))
+        .done(function(data) {
+          insertModalHtml('eventDetailModal', data.html);
+          $j('#eventDetailModal').modal('show');
+          // Manage the Save button
+          $j('#eventDetailSaveBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#eventDetailForm').submit();
+          });
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the EXPORT button
+  document.getElementById("exportBtn").addEventListener("click", function onExportClick(evt) {
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    window.location.assign('?view=export&eids[]='+selections.join('&eids[]='));
+  });
+
+  // Manage the DOWNLOAD VIDEO button
+  document.getElementById("downloadBtn").addEventListener("click", function onDownloadClick(evt) {
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=modal&modal=download&eids[]='+selections.join('&eids[]='))
+        .done(function(data) {
+          insertModalHtml('downloadModal', data.html);
+          $j('#downloadModal').modal('show');
+          // Manage the GENERATE DOWNLOAD button
+          $j('#exportButton').click(exportEvent);
+        })
+        .fail(logAjaxFail);
+  });
+  */
+  // Manage the DELETE button
+  document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) {
+    if ( ! canEdit.Events ) {
+      enoperm();
+      return;
+    }
+
+    evt.preventDefault();
+    $j('#deleteConfirm').modal('show');
+  });
+
+  // Update table links each time after new data is loaded
+  table.on('post-body.bs.table', function(data) {
+    var thumb_ndx = $j('#snapshotTable tr th').filter(function() {
+      return $j(this).text().trim() == 'Thumbnail';
+    }).index();
+    table.find("tr td:nth-child(" + (thumb_ndx+1) + ")").addClass('colThumbnail');
+  });
+
+  table.bootstrapTable('resetSearch');
+  // The table is initially given a hidden style, so now that we are done rendering, show it
+  table.show();
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/snapshots.js.php b/web/skins/classic/views/js/snapshots.js.php
new file mode 100644
index 000000000..487d9cd5d
--- /dev/null
+++ b/web/skins/classic/views/js/snapshots.js.php
@@ -0,0 +1,6 @@
+var confirmDeleteEventsString = "<?php echo addslashes(translate('ConfirmDeleteEvents')) ?>";
+var archivedString = "<?php echo translate('Archived') ?>";
+var emailedString = "<?php echo translate('Emailed') ?>";
+var yesString = "<?php echo translate('Yes') ?>";
+var noString = "<?php echo translate('No') ?>";
+var WEB_LIST_THUMBS = <?php echo ZM_WEB_LIST_THUMBS?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/state.js b/web/skins/classic/views/js/state.js
deleted file mode 100644
index e8b4db36d..000000000
--- a/web/skins/classic/views/js/state.js
+++ /dev/null
@@ -1,62 +0,0 @@
-$j(document).ready(function() {
-  // Enable or disable the Delete button depending on the selected run state
-  $j("#runState").change(function() {
-    runstate = $j(this).val();
-
-    if ( (runstate == 'stop') || (runstate == 'restart') || (runstate == 'start') || (runstate == 'default') ) {
-      $j("#btnDelete").prop("disabled", true);
-    } else {
-      $j("#btnDelete").prop("disabled", false);
-    }
-  });
-
-  // Enable or disable the Save button when entering a new state
-  $j("#newState").keyup(function() {
-    length = $j(this).val().length;
-    if ( length < 1 ) {
-      $j("#btnSave").prop("disabled", true);
-    } else {
-      $j("#btnSave").prop("disabled", false);
-    }
-  });
-
-
-  // Delete a state
-  $j("#btnDelete").click(function() {
-    stateStuff('delete', $j("#runState").val());
-  });
-
-
-  // Save a new state
-  $j("#btnSave").click(function() {
-    stateStuff('save', undefined, $j("#newState").val());
-  });
-
-  // Change state
-  $j("#btnApply").click(function() {
-    stateStuff('state', $j("#runState").val());
-  });
-
-  function stateStuff(action, runState, newState) {
-    // the state action will redirect to console
-    var formData = {
-      'view': 'state',
-      'action': action,
-      'apply': 1,
-      'runState': runState,
-      'newState': newState
-    };
-
-    $j("#pleasewait").toggleClass("hidden");
-
-    $j.ajax({
-      type: 'POST',
-      url: thisUrl,
-      data: formData,
-      dataType: 'html',
-      timeout: 0
-    }).done(function(data) {
-      location.reload();
-    });
-  }
-});
diff --git a/web/skins/classic/views/js/state.js.php b/web/skins/classic/views/js/state.js.php
deleted file mode 100644
index a7c14a0dc..000000000
--- a/web/skins/classic/views/js/state.js.php
+++ /dev/null
@@ -1,2 +0,0 @@
-var running = <?php echo daemonCheck()?'true':'false' ?>;
-var applying = <?php echo !empty($_REQUEST['apply'])?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/timeline.js b/web/skins/classic/views/js/timeline.js
index 85c73baa6..9e2548b23 100644
--- a/web/skins/classic/views/js/timeline.js
+++ b/web/skins/classic/views/js/timeline.js
@@ -1,50 +1,38 @@
 var events = {};
 
 function showEvent(e) {
-  eid = e.getAttribute('data-event-id');
-  fid = e.getAttribute('data-frame-id');
-  var url = '?view=event&eid='+eid+'&fid='+fid;
-  url += filterQuery;
-  window.location.href = url;
+  var eid = e.getAttribute('data-event-id');
+  var fid = e.getAttribute('data-frame-id');
+  var url = '?view=event&eid='+eid+'&fid='+fid+filterQuery;
 
-  //video element is blocking video elements elsewhere in chrome possible interaction with mouseover event?
-  //FIXME unless an exact cause can be determined should store all video controls and do something to the other controls when we want to load a new video seek etc or whatever may block
-  /*var vid= $('preview');
-    vid.oncanplay=null;
-  //    vid.currentTime=vid.currentTime-0.1;
-  vid.pause();*/
+  window.location.href = url;
 }
 
 function createEventHtml(zm_event, frame) {
-  var eventHtml = new Element('div');
+  var div = $j('<div>');
 
-  if ( zm_event.Archived > 0 ) {
-    eventHtml.addClass('archived');
-  }
+  if ( zm_event.Archived ) div.addClass('archived');
 
-  new Element('p').inject(eventHtml).set('text', monitors[zm_event.MonitorId].Name);
-  new Element('p').inject(eventHtml).set('text', zm_event.Name+(frame?('('+frame.FrameId+')'):''));
-  new Element('p').inject(eventHtml).set('text', zm_event.StartTime+' - '+zm_event.Length+'s');
-  new Element('p').inject(eventHtml).set('text', zm_event.Cause);
-  if ( zm_event.Notes ) {
-    new Element('p').inject(eventHtml).set('text', zm_event.Notes);
-  }
-  if ( zm_event.Archived > 0 ) {
-    new Element('p').inject(eventHtml).set( 'text', archivedString);
-  }
+  var mName = $j('<p>').text(monitors[zm_event.MonitorId].Name);
+  var mEvent = $j('<p>').text(zm_event.Name+(frame?('('+frame.FrameId+')'):''));
+  var mDateTime = $j('<p>').text(zm_event.StartDateTime+' - '+zm_event.Length+'s');
+  var mCause = $j('<p>').text(zm_event.Cause);
+  var mNotes = zm_event.Notes ? $j('<p>').text(zm_event.Notes) : '';
+  var mArchived = zm_event.Archived ? $j('<p>').text(archivedString) : '';
 
-  return eventHtml;
+  var data = div.append(mName, mEvent, mDateTime, mCause, mNotes, mArchived);
+
+  return data;
 }
 
 function showEventDetail(eventHtml) {
-  $('instruction').addClass('hidden');
-  $('eventData').empty();
-  $('eventData').adopt(eventHtml);
-  $('eventData').removeClass('hidden');
+  $j('#instruction').addClass('hidden');
+  $j('#eventData').empty().append(eventHtml).removeClass('hidden');
 }
 
 function eventDataResponse(respObj, respText) {
   var zm_event = respObj.event;
+
   if ( !zm_event ) {
     console.log('Null event');
     return;
@@ -70,7 +58,7 @@ function frameDataResponse( respObj, respText ) {
   }
 
   if ( !zm_event['frames'] ) {
-    console.log("No frames data in event response");
+    console.log('No frames data in event response');
     console.log(zm_event);
     console.log(respObj);
     zm_event['frames'] = {};
@@ -89,8 +77,7 @@ function showEventData(eventId, frameId) {
       if ( zm_event['frames'][frameId] ) {
         showEventDetail( zm_event['frames'][frameId]['html'] );
         var imagePath = 'index.php?view=image&eid='+eventId+'&fid='+frameId;
-        var videoName = zm_event.DefaultVideo;
-        loadEventImage( imagePath, eventId, frameId, zm_event.Width, zm_event.Height, zm_event.Frames/zm_event.Length, videoName, zm_event.Length, zm_event.StartTime, monitors[zm_event.MonitorId]);
+        loadEventImage(imagePath, eventId, frameId);
         return;
       } else {
         console.log('No frames for ' + frameId);
@@ -103,80 +90,60 @@ function showEventData(eventId, frameId) {
   }
 }
 
-var eventQuery = new Request.JSON({
-  url: thisUrl,
-  method: 'get',
-  timeout: AJAX_TIMEOUT,
-  link: 'cancel',
-  onSuccess: eventDataResponse
-});
+function eventQuery(data) {
+  $j.getJSON(thisUrl + '?view=request&request=status&entity=event', data)
+      .done(eventDataResponse)
+      .fail(logAjaxFail);
+}
 
-var frameQuery = new Request.JSON({
-  url: thisUrl,
-  method: 'get',
-  timeout: AJAX_TIMEOUT,
-  link: 'cancel',
-  onSuccess: frameDataResponse
-});
+function frameQuery(data) {
+  $j.getJSON(thisUrl + '?view=request&request=status&entity=frameimage', data)
+      .done(frameDataResponse)
+      .fail(logAjaxFail);
+}
 
 function requestFrameData( eventId, frameId ) {
+  var data = {};
+
   if ( !events[eventId] ) {
-    eventQuery.options.data = "view=request&request=status&entity=event&id="+eventId+"&loopback="+frameId;
-    eventQuery.send();
+    data.id = eventId;
+    data.loopback = frameId;
+    eventQuery(data);
   } else {
-    frameQuery.options.data = "view=request&request=status&entity=frameimage&id[0]="+eventId+"&id[1]="+frameId;
-    frameQuery.send();
+    data.id = [eventId, frameId];
+    frameQuery(data);
   }
 }
 
 function previewEvent(slot) {
   eventId = slot.getAttribute('data-event-id');
   frameId = slot.getAttribute('data-frame-id');
-  if ( events[eventId] ) {
+  if ( events[eventId] && events[eventId]['frames'] && events[eventId]['frames'][frameId] ) {
     showEventData(eventId, frameId);
   } else {
     requestFrameData(eventId, frameId);
   }
 }
 
-function loadEventImage( imagePath, eid, fid, width, height, fps, videoName, duration, startTime, Monitor ) {
-  var vid = $('preview');
-  var imageSrc = $('imageSrc');
-  if ( videoName && vid ) {
-    vid.show();
-    imageSrc.hide();
-    var newsource=imagePath.slice(0, imagePath.lastIndexOf('/'))+'/'+videoName;
-    //console.log(newsource);
-    //console.log(sources[0].src.slice(-newsource.length));
-    if ( newsource != vid.currentSrc.slice(-newsource.length) || vid.readyState == 0 ) {
-      //console.log("loading new");
-      //it is possible to set a long source list here will that be unworkable?
-      var sources = vid.getElementsByTagName('source');
-      sources[0].src = newsource;
-      var tracks = vid.getElementsByTagName('track');
-      if (tracks.length) {
-        tracks[0].parentNode.removeChild(tracks[0]);
-      }
-      vid.load();
-      addVideoTimingTrack(vid, Monitor.LabelFormat, Monitor.Name, duration, startTime);
-      vid.currentTime = fid/fps;
-    } else {
-      if ( ! vid.seeking ) {
-        vid.currentTime=fid/fps;
-      }
-    }
-  } else {
-    if ( vid ) vid.hide();
-    imageSrc.show();
-    imageSrc.setProperty('src', imagePath);
-    imageSrc.setAttribute('data-event-id', eid);
-    imageSrc.setAttribute('data-frame-id', fid);
-    imageSrc.onclick=window['showEvent'].bind(imageSrc, imageSrc);
-  }
+function loadEventImage( imagePath, eid, fid ) {
+  var eventData = $j('#eventData');
+  var imageSrc = $j('#imageSrc');
 
-  var eventData = $('eventData');
-  eventData.removeEvent('click');
-  eventData.addEvent('click', showEvent.pass());
+  imageSrc.show();
+  imageSrc.attr('src', imagePath);
+  imageSrc.attr('data-event-id', eid);
+  imageSrc.attr('data-frame-id', fid);
+  imageSrc.off('click');
+  imageSrc.click(function() {
+    showEvent(this);
+  });
+
+  eventData.attr('data-event-id', eid);
+  eventData.attr('data-frame-id', fid);
+  eventData.off('click');
+  eventData.click(function() {
+    showEvent(this);
+  });
 }
 
 function tlZoomBounds(event) {
@@ -197,7 +164,7 @@ function tlPanRight() {
   location.replace('?view='+currentView+filterQuery+'&midTime='+maxTime+'&range='+range);
 }
 
-window.addEventListener('DOMContentLoaded', function() {
+function divDataOnClick() {
   // These look like the code in skin.js, but that code doesn't select for divs.
   document.querySelectorAll('div.event').forEach(function(el) {
     el.onclick = window[el.getAttribute('data-on-click-this')].bind(el, el);
@@ -207,12 +174,12 @@ window.addEventListener('DOMContentLoaded', function() {
     el.onclick = window[el.getAttribute('data-on-click-this')].bind(el, el);
     el.onmouseover = window[el.getAttribute('data-on-mouseover-this')].bind(el, el);
   });
-  document.querySelectorAll('div.zoom').forEach(function(el) {
+  document.querySelectorAll('div.tlzoom').forEach(function(el) {
     el.onclick = function(ev) {
       window[el.getAttribute('data-on-click')](ev);
     };
   });
-});
+}
 
 function initPage() {
   var backBtn = $j('#backBtn');
@@ -236,6 +203,9 @@ function initPage() {
     evt.preventDefault();
     window.location.assign('?view=events'+filterQuery);
   });
+
+  // Bind the data-on-click attributes associated with a div
+  divDataOnClick();
 }
 
 $j(document).ready(function() {
diff --git a/web/skins/classic/views/js/user.js b/web/skins/classic/views/js/user.js
index d491514e3..248de8fc5 100644
--- a/web/skins/classic/views/js/user.js
+++ b/web/skins/classic/views/js/user.js
@@ -28,6 +28,21 @@ function initPage() {
       return false;
     };
   });
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
 } // end function initPage
 
 window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/version.js b/web/skins/classic/views/js/version.js
deleted file mode 100644
index adec52bfb..000000000
--- a/web/skins/classic/views/js/version.js
+++ /dev/null
@@ -1,13 +0,0 @@
-function submitForm( element ) {
-  var form = element.form;
-  if ( form.option.selectedIndex == 0 ) {
-    form.view.value = currentView;
-  } else {
-    form.view.value = 'none';
-  }
-}
-
-if ( openZmWindow ) {
-  zmWindow();
-}
-
diff --git a/web/skins/classic/views/js/version.js.php b/web/skins/classic/views/js/version.js.php
deleted file mode 100644
index 80b1ca521..000000000
--- a/web/skins/classic/views/js/version.js.php
+++ /dev/null
@@ -1 +0,0 @@
-var openZmWindow = <?php echo (isset($_REQUEST['action']) && $_REQUEST['action'] == "version" && $_REQUEST['option'] == "go")?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/video.js b/web/skins/classic/views/js/video.js
index 5f2df6ee3..970119f4f 100644
--- a/web/skins/classic/views/js/video.js
+++ b/web/skins/classic/views/js/video.js
@@ -1,37 +1,48 @@
-function deleteVideo(e) {
-  index = e.getAttribute('data-file-index');
-  window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&deleteIndex='+index);
-}
+function generateVideoResponse( data, responseText ) {
+  console.log(data);
 
-function downloadVideo(e) {
-  index = e.getAttribute('data-file-index');
-  window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&downloadIndex='+index);
-}
+  var generated = (data.result=='Ok') ? 1 : 0;
+  var fullUrl = thisUrl + '?view=' + currentView + '&eid=' + eventId + '&generated=' + generated;
 
-var generateVideoTimer = null;
-
-function generateVideoProgress() {
-  var tickerText = $('videoProgressTicker').get('text');
-  if ( tickerText.length < 1 || tickerText.length > 4 ) {
-    $('videoProgressTicker').set('text', '.');
+  $j('#videoProgress').removeClass( 'text-warning' );
+  if ( generated ) {
+    $j('#videoProgress').addClass( 'text-success' );
+    $j('#videoProgress').text(exportSucceededString);
+    $j( "#videoTable" ).load( fullUrl+ ' #videoTable' );
   } else {
-    $('videoProgressTicker').appendText('.');
+    $j('#videoProgress').addClass( 'text-danger' );
+    $j('#videoProgress').text(exportFailedString);
   }
 }
 
-function generateVideoResponse( respObj, respText ) {
-  window.location.replace(thisUrl+'?view='+currentView+'&eid='+eventId+'&generated='+((respObj.result=='Ok')?1:0));
+function generateVideo() {
+  var form = $j('#videoForm').serialize();
+  $j.getJSON(thisUrl + '?view=request&request=event&action=video', form)
+      .done(generateVideoResponse)
+      .fail(logAjaxFail);
+  $j('#videoProgress').removeClass('invisible');
 }
 
-function generateVideo() {
-  form = $j('#contentForm')[0];
-  var parms = 'view=request&request=event&action=video';
-  parms += '&'+$(form).toQueryString();
-  var query = new Request.JSON({url: thisUrl, method: 'post', data: parms, onSuccess: generateVideoResponse});
-  query.send();
-  $('videoProgress').removeClass('hidden');
-  $('videoProgress').setProperty('class', 'warnText');
-  $('videoProgressText').set('text', videoGenProgressString);
-  generateVideoProgress();
-  generateVideoTimer = generateVideoProgress.periodical(500);
+function initPage() {
+  var backBtn = $j('#backBtn');
+  var videoBtn = $j('#videoBtn');
+
+  videoBtn.prop('disabled', !opt_ffmpeg);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
 }
+
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/video.js.php b/web/skins/classic/views/js/video.js.php
index e9bb78878..2936502fa 100644
--- a/web/skins/classic/views/js/video.js.php
+++ b/web/skins/classic/views/js/video.js.php
@@ -6,3 +6,4 @@ var eventId = '<?php echo $event->Id() ?>';
 var videoGenSuccessString = '<?php echo addslashes(translate('VideoGenSucceeded')) ?>';
 var videoGenFailedString = '<?php echo addslashes(translate('VideoGenFailed')) ?>';
 var videoGenProgressString = '<?php echo addslashes(translate('GeneratingVideo')) ?>';
+var opt_ffmpeg = <?php echo ZM_OPT_FFMPEG ? 'true' : 'false' ?>;
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 7fb92fed5..9a5a4500b 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -1,61 +1,134 @@
+var streamCmdTimer = null;
+var streamStatus;
+var alarmState = STATE_IDLE;
+var lastAlarmState = STATE_IDLE;
+var backBtn = $j('#backBtn');
+var settingsBtn = $j('#settingsBtn');
+var enableAlmBtn = $j('#enableAlmBtn');
+var forceAlmBtn = $j('#forceAlmBtn');
+var table = $j('#eventList');
+var filterQuery = '&filter[Query][terms][0][attr]=MonitorId&filter[Query][terms][0][op]=%3d&filter[Query][terms][0][val]='+monitorId;
+
+/*
+This is the format of the json object sent by bootstrap-table
+
+var params =
+{
+"type":"get",
+"data":
+  {
+  "search":"some search text",
+  "sort":"StartDateTime",
+  "order":"asc",
+  "offset":0,
+  "limit":25
+  "filter":
+    {
+    "Name":"some advanced search text"
+    "StartDateTime":"some more advanced search text"
+    }
+  },
+"cache":true,
+"contentType":"application/json",
+"dataType":"json"
+};
+*/
+
+// Called by bootstrap-table to retrieve zm event data
+function ajaxRequest(params) {
+  // Maintain legacy behavior by statically setting these parameters
+  var data = params.data;
+  data.order = 'desc';
+  data.limit = maxDisplayEvents;
+  data.sort = 'Id';
+  data.view = 'request';
+  data.request = 'watch';
+  data.mid = monitorId;
+  if ( auth_hash ) data.auth = auth_hash;
+
+  $j.getJSON(thisUrl, data)
+      .done(function(data) {
+        var rows = processRows(data.rows);
+        params.success(rows);
+      })
+      .fail(logAjaxFail);
+}
+
+function processRows(rows) {
+  $j.each(rows, function(ndx, row) {
+    var eid = row.Id;
+
+    row.Delete = '<i class="fa fa-trash text-danger"></i>';
+    row.Id = '<a href="?view=event&amp;eid=' + eid + filterQuery + '">' + eid + '</a>';
+    row.Name = '<a href="?view=event&amp;eid=' + eid + filterQuery + '">' + row.Name + '</a>';
+    row.Frames = '<a href="?view=frames&amp;eid=' + eid + '">' + row.Frames + '</a>';
+    row.AlarmFrames = '<a href="?view=frames&amp;eid=' + eid + '">' + row.AlarmFrames + '</a>';
+    row.MaxScore = '<a href="?view=frame&amp;eid=' + eid + '&amp;fid=0">' + row.MaxScore + '</a>';
+    if ( LIST_THUMBS ) row.Thumbnail = '<a href="?view=event&amp;eid=' + eid + filterQuery + '&amp;page=1">' + row.imgHtml + '</a>';
+  });
+
+  return rows;
+}
 
 function showEvents() {
-  $('ptzControls').addClass('hidden');
-  $('events').removeClass('hidden');
-  if ( $('eventsControl') ) {
-    $('eventsControl').addClass('hidden');
+  $j('#ptzControls').addClass('hidden');
+  $j('#events').removeClass('hidden');
+  if ( $j('#eventsControl') ) {
+    $j('#eventsControl').addClass('hidden');
   }
-  if ( $('controlControl') ) {
-    $('controlControl').removeClass('hidden');
+  if ( $j('#controlControl') ) {
+    $j('#controlControl').removeClass('hidden');
   }
   showMode = 'events';
 }
 
 function showPtzControls() {
-  $('events').addClass('hidden');
-  $('ptzControls').removeClass('hidden');
-  if ( $('eventsControl') ) {
-    $('eventsControl').removeClass('hidden');
+  $j('#events').addClass('hidden');
+  $j('#ptzControls').removeClass('hidden');
+  if ( $j('#eventsControl') ) {
+    $j('#eventsControl').removeClass('hidden');
   }
-  if ( $('controlControl') ) {
-    $('controlControl').addClass('hidden');
+  if ( $j('#controlControl') ) {
+    $j('#controlControl').addClass('hidden');
   }
   showMode = 'control';
 }
 
 function changeScale() {
-  var scale = $('scale').get('value');
+  var scale = $j('#scale').val();
   var newWidth;
   var newHeight;
+
+  // Always turn it off, we will re-add it below. I don't know if you can add a callback multiple
+  // times and what the consequences would be
+  $j(window).off('resize', endOfResize); //remove resize handler when Scale to Fit is not active
   if ( scale == '0' || scale == 'auto' ) {
     var newSize = scaleToFit(monitorWidth, monitorHeight, $j('#liveStream'+monitorId), $j('#replayStatus'));
     newWidth = newSize.width;
     newHeight = newSize.height;
     autoScale = newSize.autoScale;
+    $j(window).on('resize', endOfResize); //remove resize handler when Scale to Fit is not active
   } else {
-    $j(window).off('resize', endOfResize); //remove resize handler when Scale to Fit is not active
     newWidth = monitorWidth * scale / SCALE_BASE;
     newHeight = monitorHeight * scale / SCALE_BASE;
   }
 
-  Cookie.write('zmWatchScale'+monitorId, scale, {duration: 10*365});
+  setCookie('zmWatchScale'+monitorId, scale, 3600);
 
-  /*Stream could be an applet so can't use moo tools*/
-  var streamImg = $('liveStream'+monitorId);
+  var streamImg = $j('#liveStream'+monitorId);
   if ( streamImg ) {
-    streamImg.style.width = newWidth + 'px';
-    streamImg.style.height = newHeight + 'px';
+    var oldSrc = streamImg.attr('src');
+    var newSrc = oldSrc.replace(/scale=\d+/i, 'scale='+(scale == 'auto' ? autoScale : scale));
 
-    streamImg.src = streamImg.src.replace(/scale=\d+/i, 'scale='+(scale== 'auto' ? autoScale : scale));
+    streamImg.width(newWidth);
+    streamImg.height(newHeight);
+    streamImg.attr('src', newSrc);
   } else {
     console.error('No element found for liveStream'+monitorId);
   }
-}
+} // end function changeScale
 
-var alarmState = STATE_IDLE;
-var lastAlarmState = STATE_IDLE;
-
-function setAlarmState( currentAlarmState ) {
+function setAlarmState(currentAlarmState) {
   alarmState = currentAlarmState;
 
   var stateClass = '';
@@ -64,11 +137,11 @@ function setAlarmState( currentAlarmState ) {
   } else if ( alarmState == STATE_ALERT ) {
     stateClass = 'alert';
   }
-  $('stateValue').set('text', stateStrings[alarmState]);
+  $j('#stateValue').text(stateStrings[alarmState]);
   if ( stateClass ) {
-    $('stateValue').setProperty('class', stateClass);
+    $j('#stateValue').addClass(stateClass);
   } else {
-    $('stateValue').removeProperty('class');
+    $j('#stateValue').removeClass();
   }
 
   var isAlarmed = ( alarmState == STATE_ALARM || alarmState == STATE_ALERT );
@@ -78,12 +151,13 @@ function setAlarmState( currentAlarmState ) {
   var oldAlarm = ( !isAlarmed && wasAlarmed );
 
   if ( newAlarm ) {
+    table.bootstrapTable('refresh');
     if ( SOUND_ON_ALARM ) {
       // Enable the alarm sound
-      if ( !canPlayPauseAudio ) {
-        $('alarmSound').removeClass('hidden');
+      if ( !msieVer ) {
+        $j('#alarmSound').removeClass('hidden');
       } else {
-        $('MediaPlayer').Play();
+        $j('#MediaPlayer').trigger('play');
       }
     }
     if ( POPUP_ON_ALARM ) {
@@ -91,47 +165,27 @@ function setAlarmState( currentAlarmState ) {
     }
   }
   if ( oldAlarm ) { // done with an event do a refresh
+    table.bootstrapTable('refresh');
     if ( SOUND_ON_ALARM ) {
       // Disable alarm sound
-      if ( !canPlayPauseAudio ) {
-        $('alarmSound').addClass('hidden');
+      if ( !msieVer ) {
+        $j('#alarmSound').addClass('hidden');
       } else {
-        $('MediaPlayer').Stop();
+        $j('#MediaPlayer').trigger('pause');
       }
     }
-    eventCmdQuery();
   }
 
   lastAlarmState = alarmState;
 } // end function setAlarmState( currentAlarmState )
 
-if ( monitorType != 'WebSite' ) {
-  var streamCmdParms = 'view=request&request=stream&connkey='+connKey;
-  if ( auth_hash ) {
-    streamCmdParms += '&auth='+auth_hash;
-  }
-  var streamCmdReq = new Request.JSON( {
-    url: monitorUrl,
-    method: 'get',
-    timeout: AJAX_TIMEOUT,
-    link: 'chain',
-    onError: getStreamCmdError,
-    onSuccess: getStreamCmdResponse,
-    onFailure: getStreamCmdFailure
-  } );
-  var streamCmdTimer = null;
-}
-
-var streamStatus;
-
 function getStreamCmdError(text, error) {
   console.log(error);
   // Error are normally due to failed auth. reload the page.
-  window.location.reload();
-}
-function getStreamCmdFailure(xhr) {
-  console.log(xhr);
+
+  //window.location.reload();
 }
+
 function getStreamCmdResponse(respObj, respText) {
   watchdogOk('stream');
   if ( streamCmdTimer ) {
@@ -141,35 +195,38 @@ function getStreamCmdResponse(respObj, respText) {
     // The get status command can get backed up, in which case we won't be able to get the semaphore and will exit.
     if ( respObj.status ) {
       streamStatus = respObj.status;
-      $('fpsValue').set('text', streamStatus.fps);
+      $j('#fpsValue').text(streamStatus.fps);
+      $j('#capturefpsValue').text(streamStatus.capturefps);
+      $j('#analysisfpsValue').text(streamStatus.analysisfps);
 
       setAlarmState(streamStatus.state);
 
-      $('levelValue').set('text', streamStatus.level);
+      $j('#levelValue').text(streamStatus.level);
+      var newClass = 'ok';
       if ( streamStatus.level > 95 ) {
-        $('levelValue').className = 'alarm';
+        newClass = 'alarm';
       } else if ( streamStatus.level > 80 ) {
-        $('levelValue').className = 'alert';
-      } else {
-        $('levelValue').className = 'ok';
+        newClass = 'alert';
       }
+      $j('#levelValue').removeClass();
+      $j('#levelValue').addClass(newClass);
 
       var delayString = secsToTime(streamStatus.delay);
 
       if ( streamStatus.paused == true ) {
-        $('modeValue').set('text', 'Paused');
-        $('rate').addClass('hidden');
-        $('delayValue').set('text', delayString);
-        $('delay').removeClass('hidden');
-        $('level').removeClass('hidden');
+        $j('#modeValue').text('Paused');
+        $j('#rate').addClass('hidden');
+        $j('#delayValue').text(delayString);
+        $j('#delay').removeClass('hidden');
+        $j('#level').removeClass('hidden');
         streamCmdPause(false);
       } else if ( streamStatus.delayed == true ) {
-        $('modeValue').set('text', 'Replay');
-        $('rateValue').set('text', streamStatus.rate);
-        $('rate').removeClass('hidden');
-        $('delayValue').set('text', delayString);
-        $('delay').removeClass('hidden');
-        $('level').removeClass('hidden');
+        $j('#modeValue').text('Replay');
+        $j('#rateValue').text(streamStatus.rate);
+        $j('#rate').removeClass('hidden');
+        $j('#delayValue').text(delayString);
+        $j('#delay').removeClass('hidden');
+        $j('#level').removeClass('hidden');
         if ( streamStatus.rate == 1 ) {
           streamCmdPlay(false);
         } else if ( streamStatus.rate > 0 ) {
@@ -186,63 +243,66 @@ function getStreamCmdResponse(respObj, respText) {
           }
         } // rate
       } else {
-        $('modeValue').set( 'text', 'Live' );
-        $('rate').addClass( 'hidden' );
-        $('delay').addClass( 'hidden' );
-        $('level').addClass( 'hidden' );
+        $j('#modeValue').text('Live');
+        $j('#rate').addClass('hidden');
+        $j('#delay').addClass('hidden');
+        $j('#level').addClass('hidden');
         streamCmdPlay(false);
       } // end if paused or delayed
 
-      $('zoomValue').set('text', streamStatus.zoom);
+      $j('#zoomValue').text(streamStatus.zoom);
       if ( streamStatus.zoom == '1.0' ) {
         setButtonState('zoomOutBtn', 'unavail');
       } else {
         setButtonState('zoomOutBtn', 'inactive');
       }
 
-      if ( canEditMonitors ) {
+      if ( canEdit.Monitors ) {
         if ( streamStatus.enabled ) {
-          $('enableAlarmsLink').addClass('hidden');
-          $('disableAlarmsLink').removeClass('hidden');
+          enableAlmBtn.addClass('disabled');
+          enableAlmBtn.prop('title', disableAlarmsStr);
           if ( streamStatus.forced ) {
-            $('forceAlarmLink').addClass('hidden');
-            $('cancelAlarmLink').removeClass('hidden');
+            forceAlmBtn.addClass('disabled');
+            forceAlmBtn.prop('title', cancelForcedAlarmStr);
           } else {
-            $('forceAlarmLink').removeClass('hidden');
-            $('cancelAlarmLink').addClass('hidden');
+            forceAlmBtn.removeClass('disabled');
+            forceAlmBtn.prop('title', forceAlarmStr);
           }
-          $('forceCancelAlarm').removeClass('hidden');
+          forceAlmBtn.prop('disabled', false);
         } else {
-          $('enableAlarmsLink').removeClass('hidden');
-          $('disableAlarmsLink').addClass('hidden');
-          $('forceCancelAlarm').addClass('hidden');
+          enableAlmBtn.removeClass('disabled');
+          enableAlmBtn.prop('title', enableAlarmsStr);
+          forceAlmBtn.prop('disabled', true);
         }
-        $('enableDisableAlarms').removeClass('hidden');
-      } // end if canEditMonitors
+        enableAlmBtn.prop('disabled', false);
+      } // end if canEdit.Monitors
 
       if ( streamStatus.auth ) {
         auth_hash = streamStatus.auth;
         // Try to reload the image stream.
-        var streamImg = $('liveStream');
+        var streamImg = $j('#liveStream'+monitorId);
         if ( streamImg ) {
-          streamImg.src = streamImg.src.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
+          var oldSrc = streamImg.attr('src');
+          var newSrc = oldSrc.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
+          streamImg.attr('src', newSrc);
         }
-        streamCmdParms = streamCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
-        statusCmdParms = statusCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
-        eventCmdParms = eventCmdParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
-        controlParms = controlParms.replace(/auth=\w+/i, 'auth='+streamStatus.auth);
+        table.bootstrapTable('refresh');
       } // end if have a new auth hash
     } // end if respObj.status
   } else {
     checkStreamForErrors('getStreamCmdResponse', respObj);//log them
     // Try to reload the image stream.
     // If it's an auth error, we should reload the whole page.
-    window.location.reload();
-    if ( 0 ) {
-      var streamImg = $('liveStream'+monitorId);
+    console.log("have error");
+    //window.location.reload();
+    if ( 1 ) {
+      var streamImg = $j('#liveStream'+monitorId);
       if ( streamImg ) {
-        streamImg.src = streamImg.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
-        console.log('Changing livestream src to ' + streamImg.src);
+        var oldSrc = streamImg.attr('src');
+        var newSrc = oldSrc.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
+
+        streamImg.attr('src', newSrc);
+        console.log('Changing livestream src to ' + newSrc);
       } else {
         console.log('Unable to find streamImg liveStream');
       }
@@ -253,10 +313,10 @@ function getStreamCmdResponse(respObj, respText) {
   if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
     streamCmdTimeout = streamCmdTimeout/5;
   }
-  streamCmdTimer = streamCmdQuery.delay(streamCmdTimeout);
+  streamCmdTimer = setTimeout(streamCmdQuery, streamCmdTimeout);
 }
 
-function streamCmdPause( action ) {
+function streamCmdPause(action) {
   setButtonState('pauseBtn', 'active');
   setButtonState('playBtn', 'inactive');
   setButtonState('stopBtn', 'inactive');
@@ -267,11 +327,14 @@ function streamCmdPause( action ) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if ( action ) {
-    streamCmdReq.send(streamCmdParms+"&command="+CMD_PAUSE);
+    var data = {};
+    if ( auth_hash ) data.auth = auth_hash;
+    data.command = CMD_PAUSE;
+    streamCmdReq(data);
   }
 }
 
-function streamCmdPlay( action ) {
+function streamCmdPlay(action) {
   setButtonState('pauseBtn', 'inactive');
   setButtonState('playBtn', 'active');
   if ( streamStatus.delayed == true ) {
@@ -292,11 +355,22 @@ function streamCmdPlay( action ) {
     }
   }
   if ( action ) {
-    streamCmdReq.send(streamCmdParms+"&command="+CMD_PLAY);
+    var data = {};
+    if ( auth_hash ) data.auth = auth_hash;
+    data.command = CMD_PLAY;
+    streamCmdReq(data);
   }
 }
 
-function streamCmdStop( action ) {
+function streamCmdReq(data) {
+  $j.getJSON(monitorUrl + '?view=request&request=stream&connkey='+connKey, data)
+      .done(getStreamCmdResponse)
+      .fail(getStreamCmdError);
+
+  streamCmdTimer = null;
+}
+
+function streamCmdStop(action) {
   setButtonState('pauseBtn', 'inactive');
   setButtonState('playBtn', 'unavail');
   setButtonState('stopBtn', 'active');
@@ -307,13 +381,16 @@ function streamCmdStop( action ) {
     setButtonState('fastRevBtn', 'unavail');
   }
   if ( action ) {
-    streamCmdReq.send(streamCmdParms+"&command="+CMD_STOP);
+    var data = {};
+    if ( auth_hash ) data.auth = auth_hash;
+    data.command = CMD_STOP;
+    streamCmdReq(data);
   }
   setButtonState('stopBtn', 'unavail');
   setButtonState('playBtn', 'active');
 }
 
-function streamCmdFastFwd( action ) {
+function streamCmdFastFwd(action) {
   setButtonState('pauseBtn', 'inactive');
   setButtonState('playBtn', 'inactive');
   setButtonState('stopBtn', 'inactive');
@@ -324,11 +401,14 @@ function streamCmdFastFwd( action ) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if ( action ) {
-    streamCmdReq.send(streamCmdParms+"&command="+CMD_FASTFWD);
+    var data = {};
+    if ( auth_hash ) data.auth = auth_hash;
+    data.command = CMD_FASTFWD;
+    streamCmdReq(data);
   }
 }
 
-function streamCmdSlowFwd( action ) {
+function streamCmdSlowFwd(action) {
   setButtonState('pauseBtn', 'inactive');
   setButtonState('playBtn', 'inactive');
   setButtonState('stopBtn', 'inactive');
@@ -339,7 +419,10 @@ function streamCmdSlowFwd( action ) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if ( action ) {
-    streamCmdReq.send(streamCmdParms+"&command="+CMD_SLOWFWD);
+    var data = {};
+    if ( auth_hash ) data.auth = auth_hash;
+    data.command = CMD_SLOWFWD;
+    streamCmdReq(data);
   }
   setButtonState('pauseBtn', 'active');
   if ( monitorStreamReplayBuffer ) {
@@ -347,7 +430,7 @@ function streamCmdSlowFwd( action ) {
   }
 }
 
-function streamCmdSlowRev( action ) {
+function streamCmdSlowRev(action) {
   setButtonState('pauseBtn', 'inactive');
   setButtonState('playBtn', 'inactive');
   setButtonState('stopBtn', 'inactive');
@@ -358,7 +441,10 @@ function streamCmdSlowRev( action ) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if ( action ) {
-    streamCmdReq.send(streamCmdParms+"&command="+CMD_SLOWREV);
+    var data = {};
+    if ( auth_hash ) data.auth = auth_hash;
+    data.command = CMD_SLOWREV;
+    streamCmdReq(data);
   }
   setButtonState('pauseBtn', 'active');
   if ( monitorStreamReplayBuffer ) {
@@ -366,7 +452,7 @@ function streamCmdSlowRev( action ) {
   }
 }
 
-function streamCmdFastRev( action ) {
+function streamCmdFastRev(action) {
   setButtonState('pauseBtn', 'inactive');
   setButtonState('playBtn', 'inactive');
   setButtonState('stopBtn', 'inactive');
@@ -377,43 +463,51 @@ function streamCmdFastRev( action ) {
     setButtonState('fastRevBtn', 'inactive');
   }
   if ( action ) {
-    streamCmdReq.send(streamCmdParms+"&command="+CMD_FASTREV);
+    var data = {};
+    if ( auth_hash ) data.auth = auth_hash;
+    data.command = CMD_FASTREV;
+    streamCmdReq(data);
   }
 }
 
 function streamCmdZoomIn( x, y ) {
-  streamCmdReq.send(streamCmdParms+"&command="+CMD_ZOOMIN+"&x="+x+"&y="+y);
+  var data = {};
+  if ( auth_hash ) data.auth = auth_hash;
+  data.x = x;
+  data.y = y;
+  data.command = CMD_ZOOMIN;
+  streamCmdReq(data);
 }
 
 function streamCmdZoomOut() {
-  streamCmdReq.send(streamCmdParms+"&command="+CMD_ZOOMOUT);
+  var data = {};
+  if ( auth_hash ) data.auth = auth_hash;
+  data.command = CMD_ZOOMOUT;
+  streamCmdReq(data);
 }
 
 function streamCmdScale( scale ) {
-  streamCmdReq.send(streamCmdParms+"&command="+CMD_SCALE+"&scale="+scale);
+  var data = {};
+  if ( auth_hash ) data.auth = auth_hash;
+  data.command = CMD_SCALE;
+  data.scale = scale;
+  streamCmdReq(data);
 }
 
 function streamCmdPan( x, y ) {
-  streamCmdReq.send(streamCmdParms+"&command="+CMD_PAN+"&x="+x+"&y="+y);
+  var data = {};
+  if ( auth_hash ) data.auth = auth_hash;
+  data.x = x;
+  data.y = y;
+  data.command = CMD_PAN;
+  streamCmdReq(data);
 }
 
 function streamCmdQuery() {
-  streamCmdReq.send(streamCmdParms+"&command="+CMD_QUERY);
-}
-
-if ( monitorType != 'WebSite' ) {
-  var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
-  if ( auth_hash ) {
-    statusCmdParms += '&auth='+auth_hash;
-  }
-  var statusCmdReq = new Request.JSON( {
-    url: monitorUrl,
-    method: 'get',
-    timeout: AJAX_TIMEOUT,
-    link: 'cancel',
-    onSuccess: getStatusCmdResponse
-  } );
-  var statusCmdTimer = null;
+  var data = {};
+  if ( auth_hash ) data.auth = auth_hash;
+  data.command = CMD_QUERY;
+  streamCmdReq(data);
 }
 
 function getStatusCmdResponse(respObj, respText) {
@@ -423,7 +517,7 @@ function getStatusCmdResponse(respObj, respText) {
   }
 
   if ( respObj.result == 'Ok' ) {
-    $('fpsValue').set('text', respObj.monitor.FrameRate);
+    $j('#fpsValue').text(respObj.monitor.FrameRate);
     setAlarmState(respObj.monitor.Status);
   } else {
     checkStreamForErrors('getStatusCmdResponse', respObj);
@@ -433,27 +527,27 @@ function getStatusCmdResponse(respObj, respText) {
   if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
     statusCmdTimeout = statusCmdTimeout/5;
   }
-  statusCmdTimer = statusCmdQuery.delay(statusCmdTimeout);
+  statusCmdTimer = setTimeout(statusCmdQuery, statusCmdTimeout);
 }
 
 function statusCmdQuery() {
-  statusCmdReq.send(statusCmdParms);
+  $j.getJSON(monitorUrl + '?view=request&request=status&entity=monitor&element[]=Status&element[]=FrameRate&id='+monitorId)
+      .done(getStatusCmdResponse)
+      .fail(logAjaxFail);
+
+  streamCmdTimer = null;
 }
 
-if ( monitorType != 'WebSite' ) {
-  var alarmCmdParms = 'view=request&request=alarm&id='+monitorId;
-  if ( auth_hash ) {
-    alarmCmdParms += '&auth='+auth_hash;
-  }
-  var alarmCmdReq = new Request.JSON( {
-    url: monitorUrl,
-    method: 'get',
-    timeout: AJAX_TIMEOUT,
-    link: 'cancel',
-    onSuccess: getAlarmCmdResponse,
-    onTimeout: streamCmdQuery
-  } );
-  var alarmCmdFirst = true;
+function alarmCmdReq(data) {
+  $j.getJSON(monitorUrl + '?view=request&request=alarm&id='+monitorId, data)
+      .done(getAlarmCmdResponse)
+      .fail(function(jqxhr, textStatus, error) {
+        if ( textStatus === "timeout" ) {
+          streamCmdQuery();
+        } else {
+          logAjaxFail(jqxhr, textStatus, error);
+        }
+      });
 }
 
 function getAlarmCmdResponse(respObj, respText) {
@@ -461,225 +555,56 @@ function getAlarmCmdResponse(respObj, respText) {
 }
 
 function cmdDisableAlarms() {
-  alarmCmdReq.send(alarmCmdParms+"&command=disableAlarms");
+  var data = {};
+  if ( auth_hash ) data.auth = auth_hash;
+  data.command = 'disableAlarms';
+  alarmCmdReq(data);
 }
 
 function cmdEnableAlarms() {
-  alarmCmdReq.send(alarmCmdParms+"&command=enableAlarms");
+  var data = {};
+  if ( auth_hash ) data.auth = auth_hash;
+  data.command = 'enableAlarms';
+  alarmCmdReq(data);
+}
+
+function cmdAlarm() {
+  if ( enableAlmBtn.hasClass('disabled') ) {
+    cmdEnableAlarms();
+  } else {
+    cmdDisableAlarms();
+  }
 }
 
 function cmdForceAlarm() {
-  alarmCmdReq.send(alarmCmdParms+"&command=forceAlarm");
-  if ( window.event ) {
-    window.event.preventDefault();
-  }
+  var data = {};
+  if ( auth_hash ) data.auth = auth_hash;
+  data.command = 'forceAlarm';
+  alarmCmdReq(data);
+  if ( window.event ) window.event.preventDefault();
 }
 
 function cmdCancelForcedAlarm() {
-  alarmCmdReq.send(alarmCmdParms+"&command=cancelForcedAlarm");
-  if ( window.event ) {
-    window.event.preventDefault();
-  }
+  var data = {};
+  if ( auth_hash ) data.auth = auth_hash;
+  data.command = 'cancelForcedAlarm';
+  alarmCmdReq(data);
+  if ( window.event ) window.event.preventDefault();
   return false;
 }
 
-function getActResponse( respObj, respText ) {
-  if ( respObj.result == 'Ok' ) {
-    if ( respObj.refreshParent && window.opener ) {
-      console.log('refreshing parent');
-      window.opener.location.reload();
-    }
-  }
-  eventCmdQuery();
-}
-
-function deleteEvent(event, eventId) {
-  var actParms = 'view=request&request=event&action=delete&id='+eventId;
-  if ( auth_hash ) {
-    actParms += '&auth='+auth_hash;
-  }
-  var actReq = new Request.JSON( {
-    url: thisUrl,
-    method: 'post',
-    timeout: 3000,
-    onSuccess: getActResponse
-  } );
-  actReq.send(actParms);
-  event.stop();
-}
-
-if ( monitorType != 'WebSite' ) {
-  var eventCmdParms = "view=request&request=status&entity=events&id="+monitorId+"&count="+maxDisplayEvents+"&sort=Id%20desc";
-  if ( auth_hash ) {
-    eventCmdParms += '&auth='+auth_hash;
-  }
-  var eventCmdReq = new Request.JSON( {
-    url: monitorUrl,
-    method: 'get',
-    timeout: AJAX_TIMEOUT,
-    link: 'cancel',
-    onSuccess: getEventCmdResponse,
-    onTimeout: eventCmdQuery
-  } );
-  var eventCmdTimer = null;
-  var eventCmdFirst = true;
-}
-
-function highlightRow( row ) {
-  $(row).toggleClass('highlight');
-}
-
-function getEventCmdResponse( respObj, respText ) {
-  watchdogOk('event');
-  if ( eventCmdTimer ) {
-    eventCmdTimer = clearTimeout(eventCmdTimer);
-  }
-
-  if ( respObj.result == 'Ok' ) {
-    var dbEvents = respObj.events.reverse();
-    var eventList = $('eventList');
-    var eventListBody = $(eventList).getElement('tbody');
-    var eventListRows = $(eventListBody).getElements('tr');
-
-    eventListRows.each( function(row) {
-      row.removeClass('updated');
-    } );
-
-    for ( var i = 0; i < dbEvents.length; i++ ) {
-      var zm_event = dbEvents[i];
-      var row = $('event'+zm_event.Id);
-      var newEvent = (row == null ? true : false);
-      if ( newEvent ) {
-        row = new Element('tr', {'id': 'event'+zm_event.Id});
-        new Element('td', {'class': 'colId'}).inject(row);
-        new Element('td', {'class': 'colName'}).inject(row);
-        new Element('td', {'class': 'colTime'}).inject(row);
-        new Element('td', {'class': 'colSecs'}).inject(row);
-        new Element('td', {'class': 'colFrames'}).inject(row);
-        new Element('td', {'class': 'colScore'}).inject(row);
-        new Element('td', {'class': 'colDelete'}).inject(row);
-
-        var link = new Element('a', {
-          'href': '#',
-          'events': {
-            'click': createEventPopup.pass( [
-              zm_event.Id,
-              '&filter[Query][terms][0][attr]=MonitorId&filter[Query][terms][0][op]=%3d&filter[Query][terms][0][val]='+monitorId+'&page=1&popup=1',
-              zm_event.Width,
-              zm_event.Height
-            ] )
-          }
-        });
-        link.set('text', zm_event.Id);
-        link.inject(row.getElement('td.colId'));
-
-        link = new Element('a', {
-          'href': '#',
-          'events': {
-            'click': createEventPopup.pass( [
-              zm_event.Id,
-              '&filter[Query][terms][0][attr]=MonitorId&filter[Query][terms][0][op]=%3d&filter[Query][terms][0][val]='+monitorId+'&page=1&popup=1',
-              zm_event.Width,
-              zm_event.Height
-            ] )
-          }
-        });
-        link.set('text', zm_event.Name);
-        link.inject(row.getElement('td.colName'));
-
-        row.getElement('td.colTime').set('text', zm_event.StartTime);
-        row.getElement('td.colSecs').set('text', zm_event.Length);
-
-        link = new Element('a', {'href': '#', 'events': {'click': createFramesPopup.pass( [zm_event.Id, zm_event.Width, zm_event.Height] )}});
-        link.set('text', zm_event.Frames+'/'+zm_event.AlarmFrames);
-        link.inject(row.getElement('td.colFrames'));
-
-        link = new Element('a', {'href': '#', 'events': {'click': createFramePopup.pass( [zm_event.Id, '0', zm_event.Width, zm_event.Height] )}});
-        link.set('text', zm_event.AvgScore+'/'+zm_event.MaxScore);
-        link.inject(row.getElement('td.colScore'));
-
-        link = new Element('button', {
-          'type': 'button',
-          'title': deleteString,
-          'data-event-id': zm_event.Id,
-          'events': {
-            'click': function(e) {
-              var event_id = e.target.getAttribute('data-event-id');
-              if ( !event_id ) {
-                console.log('No event id in deleteEvent');
-                console.log(e);
-              } else {
-                deleteEvent(e, event_id);
-              }
-            },
-            'mouseover': highlightRow.pass(row),
-            'mouseout': highlightRow.pass(row)
-          }
-        });
-        link.set('text', 'X');
-        link.inject(row.getElement('td.colDelete'));
-
-        if ( i == 0 ) {
-          row.inject($(eventListBody));
-        } else {
-          row.inject($(eventListBody), 'top');
-          if ( !eventCmdFirst ) {
-            row.addClass('recent');
-          }
-        }
-      } else {
-        row.getElement('td.colName a').set('text', zm_event.Name);
-        row.getElement('td.colSecs').set('text', zm_event.Length);
-        row.getElement('td.colFrames a').set('text', zm_event.Frames+'/'+zm_event.AlarmFrames);
-        row.getElement('td.colScore a').set('text', zm_event.AvgScore+'/'+zm_event.MaxScore);
-        row.removeClass('recent');
-      }
-      row.addClass('updated');
-    } // end foreach event
-
-    var rows = $(eventListBody).getElements('tr');
-    for ( var i = 0; i < rows.length; i++ ) {
-      if ( !rows[i].hasClass('updated') ) {
-        rows[i].destroy();
-        rows.splice( i, 1 );
-        i--;
-      }
-    }
-    while ( rows.length > maxDisplayEvents ) {
-      rows[rows.length-1].destroy();
-      rows.length--;
-    }
+function cmdForce() {
+  if ( forceAlmBtn.hasClass('disabled') ) {
+    cmdCancelForcedAlarm();
   } else {
-    checkStreamForErrors('getEventCmdResponse', respObj);
-  } // end if objresult == ok
-
-  var eventCmdTimeout = eventsRefreshTimeout;
-  if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
-    eventCmdTimeout = eventCmdTimeout/5;
+    cmdForceAlarm();
   }
-  eventCmdTimer = eventCmdQuery.delay(eventCmdTimeout);
-  eventCmdFirst = false;
 }
 
-function eventCmdQuery() {
-  if ( eventCmdTimer ) { // avoid firing another if we are firing one
-    eventCmdTimer = clearTimeout(eventCmdTimer);
-  }
-  eventCmdReq.send(eventCmdParms);
-}
-
-if ( monitorType != 'WebSite' ) {
-  var controlParms = 'view=request&request=control&id='+monitorId;
-  if ( auth_hash ) {
-    controlParms += '&auth='+auth_hash;
-  }
-  var controlReq = new Request.JSON( {
-    url: monitorUrl,
-    method: 'post',
-    timeout: AJAX_TIMEOUT,
-    link: 'cancel',
-    onSuccess: getControlResponse
-  } );
+function controlReq(data) {
+  $j.getJSON(monitorUrl + '?view=request&request=control&id='+monitorId, data)
+      .done(getControlResponse)
+      .fail(logAjaxFail);
 }
 
 function getControlResponse(respObj, respText) {
@@ -694,69 +619,92 @@ function getControlResponse(respObj, respText) {
 
 function controlCmd(event) {
   button = event.target;
-  control = button.getAttribute('value');
+
+  console.log(event);
+  if (event.type !='mouseup') {
+    control = button.getAttribute('value');
+  } else {
+    console.log('stop');
+    console.log(event);
+    control = 'moveStop';
+  }
   xtell = button.getAttribute('data-xtell');
   ytell = button.getAttribute('data-ytell');
 
-  var locParms = '';
+  var data = {};
+
   if ( event && (xtell || ytell) ) {
     var target = event.target;
-    var coords = $(target).getCoordinates();
+    var offset = $j(target).offset();
+    var width = $j(target).width();
+    var height = $j(target).height();
 
-    var x = event.pageX - coords.left;
-    var y = event.pageY - coords.top;
+    var x = event.pageX - offset.left;
+    var y = event.pageY - offset.top;
 
     if ( xtell ) {
-      var xge = parseInt((x*100)/coords.width);
+      var xge = parseInt((x*100)/width);
       if ( xtell == -1 ) {
         xge = 100 - xge;
       } else if ( xtell == 2 ) {
         xge = 2*(50 - xge);
       }
-      locParms += '&xge='+xge;
+      data.xge = xge;
     }
     if ( ytell ) {
-      var yge = parseInt((y*100)/coords.height);
+      var yge = parseInt((y*100)/height);
       if ( ytell == -1 ) {
         yge = 100 - yge;
       } else if ( ytell == 2 ) {
         yge = 2*(50 - yge);
       }
-      locParms += '&yge='+yge;
+      data.yge = yge;
     }
   }
-  controlReq.send(controlParms+"&control="+control+locParms);
+
+  if ( auth_hash ) data.auth = auth_hash;
+  data.control = control;
+  controlReq(data);
+
   if ( streamMode == 'single' ) {
-    fetchImage.pass($('imageFeed').getElement('img')).delay(1000);
+    setTimeout(fetchImage, 1000, $j('#imageFeed img'));
   }
 }
 
 function controlCmdImage( x, y ) {
-  var imageControlParms = controlParms;
-  imageControlParms += '&scale='+scale;
-  imageControlParms += '&control='+imageControlMode;
+  var data = {};
+  if ( auth_hash ) data.auth = auth_hash;
+  data.scale = scale;
+  data.control = imageControlMode;
+  data.x = x;
+  data.y = y;
+  controlReq(data);
 
-  controlReq.send( imageControlParms+"&x="+x+"&y="+y );
   if ( streamMode == 'single' ) {
-    fetchImage.pass( $('imageFeed').getElement('img') ).delay( 1000 );
+    setTimeout(fetchImage, 1000, $j('#imageFeed img'));
   }
 }
 
-function fetchImage( streamImage ) {
-  streamImage.src = streamImage.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
+function fetchImage(streamImage) {
+  streamImage.attr('src', streamImage.attr('src').replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) )));
 }
 
-function handleClick( event ) {
-  var $target = $(event.target);
-  var scaleX = parseInt(monitorWidth / $target.getWidth());
-  var scaleY = parseInt(monitorHeight / $target.getHeight());
-  var x = (event.page.x - $target.getLeft()) * scaleX;
-  var y = (event.page.y - $target.getTop()) * scaleY;
+function handleClick(event) {
+  // target should be the img tag
+  var target = $j(event.target);
+  var width = target.width();
+  var height = target.height();
+
+  var scaleX = parseInt(monitorWidth / width);
+  var scaleY = parseInt(monitorHeight / height);
+  var pos = target.offset();
+  var x = parseInt((event.pageX - pos.left) * scaleX);
+  var y = parseInt((event.pageY - pos.top) * scaleY);
 
   if ( showMode == 'events' || !imageControlMode ) {
     if ( event.shift ) {
-      streamCmdPan( x, y );
-    } else if ( event.event.ctrlKey ) {
+      streamCmdPan(x, y);
+    } else if ( event.ctrlKey ) {
       streamCmdZoomOut();
     } else {
       streamCmdZoomIn(x, y);
@@ -768,32 +716,30 @@ function handleClick( event ) {
 
 function appletRefresh() {
   if ( streamStatus && (!streamStatus.paused && !streamStatus.delayed) ) {
-    var streamImg = $('liveStream'+monitorId);
+    var streamImg = $j('#liveStream'+monitorId);
     if ( streamImg ) {
-      var parent = streamImg.getParent();
-      streamImg.dispose();
-      streamImg.inject( parent );
+      var parent = streamImg.parent();
+      streamImg.remove();
+      streamImg.append(parent);
     } else {
       console.error("Nothing found for liveStream"+monitorId);
     }
     if ( appletRefreshTime ) {
-      appletRefresh.delay( appletRefreshTime*1000 );
+      setTimeout(appletRefresh, appletRefreshTime*1000);
     }
   } else {
-    appletRefresh.delay( 15*1000 ); //if we are paused or delayed check every 15 seconds if we are live yet...
+    setTimeout(appletRefresh, 15*1000); // if we are paused or delayed check every 15 seconds if we are live yet...
   }
 }
 
 var watchdogInactive = {
   'stream': false,
-  'status': false,
-  'event': false
+  'status': false
 };
 
 var watchdogFunctions = {
   'stream': streamCmdQuery,
   'status': statusCmdQuery,
-  'event': eventCmdQuery
 };
 
 //Make sure the various refreshes are still taking effect
@@ -815,32 +761,120 @@ function reloadWebSite() {
   document.getElementById('imageFeed').innerHTML = document.getElementById('imageFeed').innerHTML;
 }
 
-function initPage() {
-  if ( monitorType != 'WebSite' ) {
-    if ( streamMode == 'single' ) {
-      statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
-      watchdogCheck.pass('status').periodical(statusRefreshTimeout*2);
-    } else {
-      streamCmdTimer = streamCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
-      watchdogCheck.pass('stream').periodical(statusRefreshTimeout*2);
+function updatePresetLabels() {
+  var lblNdx = $j('#ctrlPresetForm option:selected').val();
+
+  $j('#newLabel').val(labels[lblNdx]);
+}
+
+function getCtrlPresetModal() {
+  $j.getJSON(monitorUrl + '?request=modal&modal=controlpreset&mid=' + monitorId)
+      .done(function(data) {
+        insertModalHtml('ctrlPresetModal', data.html);
+        updatePresetLabels();
+        // Manage the Preset Select box
+        $j('#preset').change(updatePresetLabels);
+        // Manage the Save button
+        $j('#cPresetSubmitModal').click(function(evt) {
+          evt.preventDefault();
+          $j('#ctrlPresetForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function getSettingsModal() {
+  $j.getJSON(monitorUrl + '?request=modal&modal=settings&mid=' + monitorId)
+      .done(function(data) {
+        insertModalHtml('settingsModal', data.html);
+        // Manage the Save button
+        $j('#settingsSubmitModal').click(function(evt) {
+          evt.preventDefault();
+          $j('#settingsForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function processClicks(event, field, value, row, $element) {
+  if ( field == 'Delete' ) {
+    $j.getJSON(monitorUrl + '?request=modal&modal=delconfirm')
+        .done(function(data) {
+          insertModalHtml('deleteConfirm', data.html);
+          manageDelConfirmModalBtns();
+          $j('#deleteConfirm').data('eid', row.Id.replace(/(<([^>]+)>)/gi, ''));
+          $j('#deleteConfirm').modal('show');
+        })
+        .fail(logAjaxFail);
+  }
+}
+
+// Manage the DELETE CONFIRMATION modal button
+function manageDelConfirmModalBtns() {
+  document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) {
+    if ( ! canEdit.Events ) {
+      enoperm();
+      return;
     }
 
-    eventCmdTimer = eventCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
-    watchdogCheck.pass('event').periodical(eventsRefreshTimeout*2);
+    var eid = $j('#deleteConfirm').data('eid');
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&task=delete&eids[]='+eid)
+        .done( function(data) {
+          table.bootstrapTable('refresh');
+          $j('#deleteConfirm').modal('hide');
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the CANCEL modal button
+  document.getElementById("delCancelBtn").addEventListener("click", function onDelCancelClick(evt) {
+    $j('#deleteConfirm').modal('hide');
+  });
+}
+
+function msieVer() {
+  var ua = window.navigator.userAgent;
+  var msie = ua.indexOf("MSIE ");
+
+  if ( msie >= 0 ) { // If Internet Explorer, return version number
+    return msie;
+  } else { // If another browser, return 0
+    return 0;
+  }
+}
+
+function initPage() {
+  if ( canView.Control ) {
+    // Load the PTZ Preset modal into the DOM
+    if ( monitorControllable ) getCtrlPresetModal();
+    // Load the settings modal into the DOM
+    if ( monitorType == "Local" ) getSettingsModal();
+  }
+
+  if ( monitorType != 'WebSite' ) {
+    if ( streamMode == 'single' ) {
+      statusCmdTimer = setTimeout(statusCmdQuery, (Math.random()+0.1)*statusRefreshTimeout );
+      setInterval(watchdogCheck, statusRefreshTimeout*2, 'status');
+    } else {
+      streamCmdTimer = setTimeout(streamCmdQuery, (Math.random()+0.1)*statusRefreshTimeout );
+      setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream');
+    }
 
     if ( canStreamNative || (streamMode == 'single') ) {
-      var streamImg = $('imageFeed').getElement('img');
+      var streamImg = $j('#imageFeed img');
       if ( !streamImg ) {
-        streamImg = $('imageFeed').getElement('object');
+        streamImg = $j('#imageFeed object');
       }
       if ( !streamImg ) {
         console.error('No streamImg found for imageFeed');
       } else {
         if ( streamMode == 'single' ) {
-          streamImg.addEvent('click', fetchImage.pass(streamImg));
-          fetchImage.pass(streamImg).periodical(imageRefreshTimeout);
+          streamImg.click(streamImg, fetchImage);
+          setInterval(fetchImage, imageRefreshTimeout, $j('#imageFeed img'));
         } else {
-          streamImg.addEvent('click', function(event) {
+          streamImg.click(function(event) {
             handleClick(event);
           });
         }
@@ -848,19 +882,65 @@ function initPage() {
     } // streamMode native or single
 
     if ( refreshApplet && appletRefreshTime ) {
-      appletRefresh.delay(appletRefreshTime*1000);
+      setTimeout(appletRefresh, appletRefreshTime*1000);
     }
-    if ( scale == '0' || scale == 'auto' ) changeScale();
     if ( window.history.length == 1 ) {
       $j('#closeControl').html('');
     }
     document.querySelectorAll('select[name="scale"]').forEach(function(el) {
       el.onchange = window['changeScale'];
     });
+    changeScale();
   } else if ( monitorRefresh > 0 ) {
     setInterval(reloadWebSite, monitorRefresh*1000);
   }
-}
+
+  // Manage the BACK button
+  bindButton('#backBtn', 'click', null, function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  bindButton('#refreshBtn', 'click', null, function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the SETTINGS button
+  bindButton('#settingsBtn', 'click', null, function onSettingsClick(evt) {
+    evt.preventDefault();
+    $j('#settingsModal').modal('show');
+  });
+
+  // Only enable the settings button for local cameras
+  settingsBtn.prop('disabled', !(canView.Control && monitorType == 'Local'));
+
+  // Init the bootstrap-table
+  if ( monitorType != 'WebSite' ) table.bootstrapTable({icons: icons});
+
+  // Update table rows each time after new data is loaded
+  table.on('post-body.bs.table', function(data) {
+    $j('#eventList tr:contains("New Event")').addClass('recent');
+  });
+
+  // Take appropriate action when the user clicks on a cell
+  table.on('click-cell.bs.table', processClicks);
+
+  // Some toolbar events break the thumbnail animation, so re-init eventlistener
+  table.on('all.bs.table', initThumbAnimation);
+
+  // Update table links each time after new data is loaded
+  table.on('post-body.bs.table', function(data) {
+    var thumb_ndx = $j('#eventList tr th').filter(function() {
+      return $j(this).text().trim() == 'Thumbnail';
+    }).index();
+    table.find("tr td:nth-child(" + (thumb_ndx+1) + ")").addClass('colThumbnail');
+  });
+} // initPage
 
 // Kick everything off
-window.addEventListener('DOMContentLoaded', initPage);
+$j(document).ready(initPage);
diff --git a/web/skins/classic/views/js/watch.js.php b/web/skins/classic/views/js/watch.js.php
index 365d62aed..258a1da73 100644
--- a/web/skins/classic/views/js/watch.js.php
+++ b/web/skins/classic/views/js/watch.js.php
@@ -4,6 +4,7 @@
   global $connkey;
   global $monitor;
   global $scale;
+  global $labels;
 ?>
 //
 // Import constants
@@ -23,6 +24,11 @@ stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
 
 var deleteString = "<?php echo translate('Delete') ?>";
 
+var enableAlarmsStr = "<?php echo translate('EnableAlarms') ?>";
+var disableAlarmsStr = "<?php echo translate('DisableAlarms') ?>";
+var forceAlarmStr = "<?php echo translate('ForceAlarm') ?>";
+var cancelForcedAlarmStr = "<?php echo translate('CancelForcedAlarm') ?>";
+
 var CMD_NONE = <?php echo CMD_NONE ?>;
 var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
 var CMD_PLAY = <?php echo CMD_PLAY ?>;
@@ -44,6 +50,7 @@ var SCALE_BASE = <?php echo SCALE_BASE ?>;
 
 var SOUND_ON_ALARM = <?php echo ZM_WEB_SOUND_ON_ALARM ?>;
 var POPUP_ON_ALARM = <?php echo ZM_WEB_POPUP_ON_ALARM ?>;
+var LIST_THUMBS = <?php echo ZM_WEB_LIST_THUMBS?'true':'false' ?>;
 
 var streamMode = "<?php echo $streamMode ?>";
 var showMode = "<?php echo ($showPtzControls && !empty($control))?"control":"events" ?>";
@@ -58,6 +65,7 @@ var monitorUrl = '<?php echo $monitor->UrlToIndex() ?>';
 var monitorType = '<?php echo $monitor->Type() ?>';
 var monitorRefresh = '<?php echo $monitor->Refresh() ?>';
 var monitorStreamReplayBuffer = <?php echo $monitor->StreamReplayBuffer() ?>;
+var monitorControllable = <?php echo $monitor->Controllable()?'true':'false' ?>;
 
 var scale = '<?php echo $scale ?>';
 
@@ -65,11 +73,8 @@ var statusRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
 var eventsRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_EVENTS ?>;
 var imageRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_IMAGE ?>;
 
-var canEditMonitors = <?php echo canEdit( 'Monitors' )?'true':'false' ?>;
 var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 
-var canPlayPauseAudio = Browser.ie;
-
 <?php 
   $control = $monitor->Control();
   if ( $control->CanMoveMap() ) { ?>
@@ -84,3 +89,17 @@ var imageControlMode = null;
 
 var refreshApplet = <?php echo (canStreamApplet() && $streamMode == "jpeg")?'true':'false' ?>;
 var appletRefreshTime = <?php echo ZM_RELOAD_CAMBOZOLA ?>;
+
+var labels = new Array();
+<?php
+$labels = array();
+foreach( dbFetchAll( 'SELECT * FROM ControlPresets WHERE MonitorId = ?', NULL, array( $monitor->Id() ) ) as $row ) {
+  $labels[$row['Preset']] = $row['Label'];
+}
+
+foreach ( $labels as $index=>$label ) {
+?>
+labels[<?php echo validInt($index) ?>] = '<?php echo validJsStr($label) ?>';
+<?php
+}
+?>
diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index c21e0bc65..6282cbf8a 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -1,9 +1,13 @@
-var requestQueue = new Request.Queue({
-  concurrent: monitorData.length,
-  stopOnFailure: false
-});
+var pauseBtn = $j('#pauseBtn');
+var playBtn = $j('#playBtn');
+var saveBtn = $j('#saveBtn');
+var cancelBtn = $j('#cancelBtn');
+var backBtn = $j('#backBtn');
+var refreshBtn = $j('#refreshBtn');
+var monitors = [];
+
 function validateForm( form ) {
-  var errors = new Array();
+  var errors = [];
   if ( selfIntersecting ) {
     errors[errors.length] = selfIntersectingString;
   }
@@ -152,7 +156,7 @@ function applyCheckMethod() {
 
 function applyPreset() {
   var form = document.zoneForm;
-  var presetId = $('presetSelector').get('value');
+  var presetId = $j('#presetSelector').val();
 
   if ( presets[presetId] ) {
     var preset = presets[presetId];
@@ -182,7 +186,9 @@ function applyPreset() {
 function toPixels(field, maxValue) {
   if ( field.value != '' ) {
     field.value = Math.round((field.value*maxValue)/100);
-    if ( field.value > maxValue ) field.value = maxValue;
+    if ( field.value > maxValue ) {
+      field.value = maxValue;
+    }
   }
   field.setAttribute('step', 1);
   field.setAttribute('max', maxValue);
@@ -196,7 +202,7 @@ function toPercent(field, maxValue) {
       field.value = 100;
     }
   }
-  field.setAttribute('step', 0.01);
+  field.setAttribute('step', 'any');
   field.setAttribute('max', 100);
 }
 
@@ -254,33 +260,33 @@ function limitArea(field) {
 }
 
 function highlightOn(index) {
-  $('row'+index).addClass('highlight');
-  $('point'+index).addClass('highlight');
+  $j('#row'+index).addClass('highlight');
+  $j('#point'+index).addClass('highlight');
 }
 
 function highlightOff(index) {
-  row = $('row'+index);
+  row = $j('#row'+index);
   if ( row ) {
     row.removeClass('highlight');
   } else {
     console.log("No row for index " + index);
   }
-  $('point'+index).removeClass('highlight');
+  $j('#point'+index).removeClass('highlight');
 }
 
 function setActivePoint(index) {
   highlightOff(index);
-  $('row'+index).addClass('active');
-  $('point'+index).addClass('active');
+  $j('#row'+index).addClass('active');
+  $j('#point'+index).addClass('active');
 }
 
 function unsetActivePoint(index) {
-  $('row'+index).removeClass('active');
-  $('point'+index).removeClass('active');
+  $j('#row'+index).removeClass('active');
+  $j('#point'+index).removeClass('active');
 }
 
 function getCoordString() {
-  var coords = new Array();
+  var coords = [];
   for ( var i = 0; i < zone['Points'].length; i++ ) {
     coords[coords.length] = zone['Points'][i].x+','+zone['Points'][i].y;
   }
@@ -288,18 +294,13 @@ function getCoordString() {
 }
 
 function updateZoneImage() {
-  var imageFrame = $('imageFrame');
-  var style = imageFrame.currentStyle || window.getComputedStyle(imageFrame);
-
-  scale = (imageFrame.clientWidth - ( style.paddingLeft.toInt() + style.paddingRight.toInt() )) / maxX;
-  var SVG = $('zoneSVG');
-  var Poly = $('zonePoly');
+  var SVG = document.getElementById('zoneSVG');
+  var Poly = document.getElementById('zonePoly');
   Poly.points.clear();
   for ( var i = 0; i < zone['Points'].length; i++ ) {
     var Point = SVG.createSVGPoint();
     Point.x = zone['Points'][i].x;
-    //+ 2*padding_left;
-    Point.y = zone['Points'][i].y;// + 2*padding_top;
+    Point.y = zone['Points'][i].y;
     Poly.points.appendItem(Point);
   }
 }
@@ -321,31 +322,31 @@ function constrainValue(value, loVal, hiVal) {
 }
 
 function updateActivePoint(index) {
-  var point = $('point'+index);
-  var imageFrame = $('imageFrame');
+  var point = $j('#point'+index);
+  var imageFrame = document.getElementById('imageFrame');
   var style = imageFrame.currentStyle || window.getComputedStyle(imageFrame);
-  var padding_left = style.paddingLeft.toInt();
-  var padding_top = style.paddingTop.toInt();
-
-  scale = (imageFrame.clientWidth - ( style.paddingLeft.toInt() + style.paddingRight.toInt() )) / maxX;
-  var left = point.getStyle('left').toInt();
+  var padding_left = parseInt(style.paddingLeft);
+  var padding_top = parseInt(style.paddingTop);
+  var padding_right = parseInt(style.paddingRight);
+  var scale = (imageFrame.clientWidth - ( padding_top + padding_right )) / maxX;
+  var left = parseInt(point.css('left'), 10);
 
   if ( left < padding_left ) {
-    point.setStyle('left', style.paddingLeft);
-    left = padding_left.toInt();
+    point.css('left', style.paddingLeft);
+    left = parseInt(padding_left);
   }
-  var top = point.getStyle('top').toInt();
+  var top = parseInt(point.css('top'));
   if ( top < padding_top ) {
-    point.setStyle('top', style.paddingTop);
-    top = padding_top;
+    point.css('top', style.paddingTop);
+    top = parseInt(padding_top);
   }
 
   var x = constrainValue(Math.ceil(left / scale)-Math.ceil(padding_left/scale), 0, maxX);
   var y = constrainValue(Math.ceil(top / scale)-Math.ceil(padding_top/scale), 0, maxY);
 
-  zone['Points'][index].x = $('newZone[Points]['+index+'][x]').value = x;
-  zone['Points'][index].y = $('newZone[Points]['+index+'][y]').value = y;
-  var Point = $('zonePoly').points.getItem(index);
+  zone['Points'][index].x = document.getElementById('newZone[Points]['+index+'][x]').value = x;
+  zone['Points'][index].y = document.getElementById('newZone[Points]['+index+'][y]').value = y;
+  var Point = document.getElementById('zonePoly').points.getItem(index);
   Point.x = x;
   Point.y = y;
   updateArea();
@@ -379,7 +380,7 @@ function limitPointValue(point, loVal, hiVal) {
 function updateArea( ) {
   area = Polygon_calcArea(zone['Points']);
   zone.Area = area;
-  var form = $('zoneForm');
+  var form = document.getElementById('zoneForm');
   form.elements['newZone[Area]'].value = area;
   if ( form.elements['newZone[Units]'].value == 'Percent' ) {
     form.elements['newZone[TempArea]'].value = Math.round( area/monitorArea*100 );
@@ -395,12 +396,12 @@ function updateX(input) {
 
   limitPointValue(input, 0, maxX);
 
-  var point = $('point'+index);
+  var point = $j('#point'+index);
   var x = input.value;
 
-  point.setStyle('left', x+'px');
+  point.css('left', x+'px');
   zone['Points'][index].x = x;
-  var Point = $('zonePoly').points.getItem(index);
+  var Point = document.getElementById('zonePoly').points.getItem(index);
   Point.x = x;
   updateArea();
 }
@@ -409,12 +410,12 @@ function updateY(input) {
   index = input.getAttribute('data-point-index');
   limitPointValue(input, 0, maxY);
 
-  var point = $('point'+index);
+  var point = $j('#point'+index);
   var y = input.value;
 
-  point.setStyle('top', y+'px');
+  point.css('top', y+'px');
   zone['Points'][index].y = y;
-  var Point = $('zonePoly').points.getItem(index);
+  var Point = document.getElementById('zonePoly').points.getItem(index);
   Point.y = y;
   updateArea();
 }
@@ -432,56 +433,55 @@ function saveChanges(element) {
 }
 
 function drawZonePoints() {
-  var imageFrame = $('imageFrame');
-  imageFrame.getElements('.zonePoint').each(
-      function(element) {
-        element.destroy();
-      });
+  var imageFrame = document.getElementById('imageFrame');
+  $j('.zonePoint').remove();
   var style = imageFrame.currentStyle || window.getComputedStyle(imageFrame);
-  scale = (imageFrame.clientWidth - ( style.paddingLeft.toInt() + style.paddingRight.toInt() )) / maxX;
-  console.log("Scale = width: " + imageFrame.clientWidth);
+  var padding_left = parseInt(style.paddingLeft);
+  var padding_right = parseInt(style.paddingRight);
+  var padding_top = parseInt(style.paddingTop);
+  var scale = (imageFrame.clientWidth - ( padding_left + padding_right )) / maxX;
 
-  for ( var i = 0; i < zone['Points'].length; i++ ) {
-    console.log("scale: " + scale + " x " + zone['Points'][i].x + " = " + Math.round(zone['Points'][i].x * scale));
-    var div = new Element('div', {
+  $j.each( zone['Points'], function(i, coord) {
+    var div = $j('<div>');
+    div.attr({
       'id': 'point'+i,
       'data-point-index': i,
       'class': 'zonePoint',
-      'title': 'Point '+(i+1),
-      'styles': {
-        'left': (Math.round(zone['Points'][i].x * scale) + style.paddingLeft.toInt())+"px",
-        'top': ((zone['Points'][i].y * scale).toInt() + style.paddingTop.toInt()) +"px"
-      }
+      'title': 'Point '+(i+1)
+    });
+    div.css({
+      left: (Math.round(coord.x * scale) + padding_left)+"px",
+      top: ((parseInt(coord.y * scale)) + padding_top) +"px"
     });
-    div.addEvent('mouseover', highlightOn.pass(i));
-    div.addEvent('mouseout', highlightOff.pass(i));
-    div.inject(imageFrame);
-    div.makeDraggable( {
-      'container': imageFrame,
-      'onStart': setActivePoint.pass(i),
-      'onComplete': fixActivePoint.pass(i),
-      'onDrag': updateActivePoint.pass(i)
-    } );
-  } // end foreach point
 
-  var tables = $('zonePoints').getElement('table').getElements('table');
-  tables.each( function(table) {
-    table.getElement('tbody').empty();
-  } );
+    div.mouseover(highlightOn.bind(i, i));
+    div.mouseout(highlightOff.bind(i, i));
+
+    $j('#imageFrame').append(div);
+
+    div.draggable({
+      'containment': imageFrame,
+      'start': setActivePoint.bind(i, i),
+      'stop': fixActivePoint.bind(i, i),
+      'drag': updateActivePoint.bind(i, i)
+    });
+  }); // end $j.each point
+
+  var tables = $j('#zonePoints table table');
+  tables.find('tbody').empty();
 
   for ( var i = 0; i < zone['Points'].length; i++ ) {
-    var row;
-    row = new Element('tr', {'id': 'row'+i});
-    row.addEvent('mouseover', highlightOn.pass(i));
-    row.addEvent('mouseout', highlightOff.pass(i));
-    //row.onmouseover = highlightOn.pass(i)
-    //row.onmouseout = window['highlightOff'].bind(div, div);
-    var cell = new Element('td');
-    cell.set('text', i+1);
-    cell.inject(row);
+    var row = document.createElement('tr');
+    row.id = 'row'+i;
+    $j(row).mouseover(highlightOn.bind(i, i));
+    $j(row).mouseout(highlightOn.bind(i, i));
 
-    cell = new Element('td');
-    var input = new Element('input', {
+    var cell = document.createElement('td');
+    $j(cell).text(i+1).appendTo(row);
+
+    cell = document.createElement('td');
+    var input = document.createElement('input');
+    $j(input).attr({
       'id': 'newZone[Points]['+i+'][x]',
       'name': 'newZone[Points]['+i+'][x]',
       'value': zone['Points'][i].x,
@@ -492,11 +492,12 @@ function drawZonePoints() {
       'data-point-index': i
     });
     input.oninput = window['updateX'].bind(input, input);
-    input.inject(cell);
-    cell.inject(row);
+    $j(input).appendTo(cell);
+    $j(cell).appendTo(row);
 
-    cell = new Element('td');
-    input = new Element('input', {
+    cell = document.createElement('td');
+    input = document.createElement('input');
+    $j(input).attr({
       'id': 'newZone[Points]['+i+'][y]',
       'name': 'newZone[Points]['+i+'][y]',
       'value': zone['Points'][i].y,
@@ -505,27 +506,32 @@ function drawZonePoints() {
       'min': '0',
       'max': maxY,
       'data-point-index': i
-    } );
+    });
     input.oninput = window['updateY'].bind(input, input);
-    input.inject(cell);
-    cell.inject(row);
+    $j(input).appendTo(cell);
+    $j(cell).appendTo(row);
+
+    cell = document.createElement('td');
+    var pbtn = document.createElement('button');
+    $j(pbtn)
+        .attr('type', 'button')
+        .text('+')
+        .click(addPoint.bind(i, i))
+        .appendTo(cell);
 
-    cell = new Element('td');
-    new Element('button', {
-      'type': 'button',
-      'events': {'click': addPoint.pass(i)}
-    }).set('text', '+').inject(cell);
     if ( zone['Points'].length > 3 ) {
-      cell.appendText(' ');
-      new Element('button', {
-        'id': 'delete'+i,
-        'type': 'button',
-        'events': {'click': delPoint.pass(i)}
-      }).set('text', '-').inject(cell);
+      var mbtn = document.createElement('button');
+      $j(mbtn)
+          .attr('id', 'delete'+i)
+          .attr('type', 'button')
+          .addClass('ml-1')
+          .text('-')
+          .click(delPoint.bind(i, i))
+          .appendTo(cell);
     }
-    cell.inject(row);
+    $j(cell).appendTo(row);
 
-    row.inject(tables[i%tables.length].getElement('tbody'));
+    $j(row).appendTo(tables.eq((i%tables.length)).find('tbody'));
   } // end foreach point
   // Sets up the SVG polygon
   updateZoneImage();
@@ -535,16 +541,16 @@ function streamCmdPause() {
   for ( var i = 0, length = monitors.length; i < length; i++ ) {
     monitors[i].pause();
   }
-  document.getElementById('pauseBtn').style.display = 'none';
-  document.getElementById('playBtn').style.display = 'inline';
+  pauseBtn.hide();
+  playBtn.show();
 }
 
 function streamCmdPlay() {
   for ( var i = 0, length = monitors.length; i < length; i++ ) {
     monitors[i].play();
   }
-  document.getElementById('playBtn').style.display = 'none';
-  document.getElementById('pauseBtn').style.display = 'inline';
+  pauseBtn.show();
+  playBtn.hide();
 }
 
 //Make sure the various refreshes are still taking effect
@@ -564,8 +570,6 @@ function presetSelectorBlur() {
   this.selectedIndex = 0;
 }
 
-var monitors = new Array();
-
 function initPage() {
   var form = document.zoneForm;
 
@@ -639,21 +643,16 @@ function initPage() {
 
   applyCheckMethod();
 
-  $('pauseBtn').onclick = function() {
-    streamCmdPause();
-  };
-  $('playBtn').style.display = 'none'; // hide pause initially
-  $('playBtn').onclick = function() {
-    streamCmdPlay();
-  };
+  pauseBtn.click(streamCmdPause);
+  playBtn.click(streamCmdPlay);
+  playBtn.hide(); // hide pause initially
 
-  if ( el = $('saveBtn') ) {
+  if ( el = saveBtn[0] ) {
     el.onclick = window['saveChanges'].bind(el, el);
   }
-  if ( el = $('cancelBtn') ) {
+  if ( el = cancelBtn[0] ) {
     el.onclick = function() {
-      refreshParentWindow();
-      closeWindow();
+      window.location.reload(true);
     };
   }
 
@@ -669,6 +668,23 @@ function initPage() {
     el.addEventListener("load", imageLoadEvent, {passive: true});
   });
   window.addEventListener("resize", drawZonePoints, {passive: true});
+  // if the image link is broken for some reason we won't draw the points, so do it manually
+  drawZonePoints();
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
 } // initPage
 
 function imageLoadEvent() {
diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php
index 9fadea32c..fc6616327 100644
--- a/web/skins/classic/views/js/zone.js.php
+++ b/web/skins/classic/views/js/zone.js.php
@@ -128,11 +128,8 @@ var streamSrc = "<?php echo preg_replace( '/&amp;/', '&', $streamSrc ) ?>";
 var statusRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
 var imageRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_IMAGE ?>;
 
-var canEditMonitors = <?php echo canEdit( 'Monitors' )?'true':'false' ?>;
 var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
 
-var canPlayPauseAudio = Browser.ie;
-
 var refreshApplet = <?php echo (canStreamApplet() && $streamMode == "jpeg")?'true':'false' ?>;
 var appletRefreshTime = <?php echo ZM_RELOAD_CAMBOZOLA ?>;
 
diff --git a/web/skins/classic/views/js/zones.js b/web/skins/classic/views/js/zones.js
index 634db6843..0ad91942d 100644
--- a/web/skins/classic/views/js/zones.js
+++ b/web/skins/classic/views/js/zones.js
@@ -1,12 +1,7 @@
-
-var requestQueue = new Request.Queue({
-  concurrent: monitorData.length,
-  stopOnFailure: false
-});
-function streamCmdQuit( ) {
-  if ( action ) {
-    streamCmdReq.send( streamCmdParms+"&command="+CMD_QUIT );
-  }
+// Manage the Add New Zone button
+function AddNewZone(el) {
+  url = el.getAttribute('data-url');
+  window.location.assign(url);
 }
 
 var monitors = new Array();
@@ -19,6 +14,21 @@ function initPage() {
     var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
     monitors[i].start(delay);
   }
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
 }
 
 window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php
index aeeeeaabf..88c3f0ccd 100644
--- a/web/skins/classic/views/log.php
+++ b/web/skins/classic/views/log.php
@@ -23,113 +23,69 @@ if ( !canView('System') ) {
   return;
 }
 
-$focusWindow = true;
-
 xhtmlHeaders(__FILE__, translate('SystemLog'));
 ?>
 <body>
-  <div id="page">
-    <div id="header">
-      <div id="logSummary" class="text-center">
-      <?php echo translate('State') ?>: <span id="logState"></span>/
-      <?php echo translate('Total') ?>: <span id="totalLogs"></span>/
-      <?php echo translate('Available') ?>: <span id="availLogs"></span>/
-      <?php echo translate('Displaying') ?>: <span id="displayLogs"></span>/
-      <?php echo translate('Updated') ?>: <span id="lastUpdate"></span>
-      </div>
-      <div class="btn-toolbar text-center">
-        <div class="btn-group">
-          <button type="button" data-on-click="expandLog"><?php echo translate('More') ?></button>
-          <button type="button" data-on-click="clearLog"><?php echo translate('Clear') ?></button>
-          <button type="button" data-on-click="refreshLog"><?php echo translate('Refresh') ?></button>
-          <button type="button" data-on-click="exportLog"><?php echo translate('Export') ?></button>
-          <button type="reset" data-on-click="resetLog"><?php echo translate('Reset') ?></button>
-        </div>
-        <div class="btn-group pull-right">
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-        </div>
-      </div> <!--btn-->
-    </div> <!--header-->
-    <div id="content">
-      <form id="logForm" name="logForm" method="post" action="?">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <div class="container" id="filters">
-          <div class="row">
-            <div class="col">
-              <label><?php echo translate('Component') ?></label>
-              <select class="form-control chosen" id="filter[Component]" data-on-change="filterLog"><option value="">-----</option></select>
-            </div>
-            <div class="col">
-              <label><?php echo translate('Server') ?></label>
-              <select class="form-control chosen" id="filter[ServerId]" data-on-change="filterLog"><option value="">-----</option></select>
-            </div>
-            <div class="col">
-              <label><?php echo translate('Pid') ?></label>
-              <select class="form-control chosen" id="filter[Pid]" data-on-change="filterLog"><option value="">-----</option></select>
-            </div>
-            <div class="col">
-              <label><?php echo translate('Level') ?></label>
-              <select class="form-control chosen" id="filter[Level]" data-on-change="filterLog"><option value="">---</option></select>
-            </div>
-            <div class="col">
-              <label><?php echo translate('File') ?></label>
-              <select class="form-control chosen" id="filter[File]" data-on-change="filterLog"><option value="">------</option></select>
-            </div>
-            <div class="col">
-              <label><?php echo translate('Line') ?></label>
-              <select class="form-control chosen" id="filter[Line]" data-on-change="filterLog"><option value="">----</option></select>
-            </div>
-          </div><!--row-->
-        </div><!--container-->
-        <table id="logTable" class="major">
-          <thead class="thead-highlight">
-            <tr>
-              <th><?php echo translate('DateTime') ?></th>
-              <th class="table-th-nosort"><?php echo translate('Component') ?></th>
-              <th class="table-th-nosort"><?php echo translate('Server') ?></th>
-              <th class="table-th-nosort"><?php echo translate('Pid') ?></th>
-              <th class="table-th-nosort"><?php echo translate('Level') ?></th>
-              <th class="table-th-nosort"><?php echo translate('Message') ?></th>
-              <th class="table-th-nosort"><?php echo translate('File') ?></th>
-              <th class="table-th-nosort"><?php echo translate('Line') ?></th>
-            </tr>
-          </thead>
-          <tbody>
-          </tbody>
-        </table>
-      </form>
-    </div><!--content-->
-  </div><!--page-->
-  <div id="exportLog" class="overlay">
-    <div class="overlayHeader">
-      <div class="overlayTitle"><?php echo translate('ExportLog') ?></div>
+  <?php echo getNavBarHTML() ?>
+  <div id="page" class="px-3 table-responsive-sm">
+
+    <div id="logSummary" class="text-center">
+      <?php echo translate('State') ?>:&nbsp;<span id="logState"></span>&nbsp;-&nbsp;
+      <?php echo translate('Total') ?>:&nbsp;<span id="totalLogs"></span>&nbsp;-&nbsp;
+      <?php echo translate('Available') ?>:&nbsp;<span id="availLogs"></span>&nbsp;-&nbsp;
+      <?php echo translate('Displaying') ?>:&nbsp;<span id="displayLogs"></span>&nbsp;-&nbsp;
+      <?php echo translate('Updated') ?>:&nbsp;<span id="lastUpdate"></span>
     </div>
-    <div class="overlayBody">
-      <div class="overlayContent">
-        <form id="exportForm" action="" method="post">
-          <fieldset>
-            <legend><?php echo translate('SelectLog') ?></legend>
-            <label for="selectorAll"><?php echo translate('All') ?></label>
-            <input type="radio" id="selectorAll" name="selector" value="all"/>
-            <label for="selectorFilter"><?php echo translate('Filter') ?></label>
-            <input type="radio" id="selectorFilter" name="selector" value="filter"/>
-            <label for="selectorCurrent"><?php echo translate('Current') ?></label>
-            <input type="radio" id="selectorCurrent" name="selector" value="current" title="<?php echo translate('ChooseLogSelection') ?>" data-validators="validate-one-required"/>
-          </fieldset>
-          <fieldset>
-            <legend><?php echo translate('SelectFormat') ?></legend>
-            <label for="formatText">TXT</label><input type="radio" id="formatText" name="format" value="text"/>
-            <label for="formatTSV">TSV</label><input type="radio" id="formatTSV" name="format" value="tsv"/>
-            <label for="formatXML">HTML</label><input type="radio" id="formatHTML" name="format" value="html"/>
-            <label for="formatXML">XML</label><input type="radio" id="formatXML" name="format" value="xml" title="<?php echo translate('ChooseLogFormat') ?>" class="validate-one-required"/>
-          </fieldset>
-          <div id="exportError">
-            <?php echo translate('ExportFailed') ?>: <span id="exportErrorText"></span>
-          </div>
-          <button type="button" id="exportButton" value="Export" data-on-click="exportRequest"><?php echo translate('Export') ?></button>
-          <button type="button" value="Cancel" class="overlayCloser"><?php echo translate('Cancel') ?></button>
-        </form>
-      </div><!--overlayContent-->
-    </div><!--overlaybody-->
-  </div><!-- exportLog-->
+
+    <div id="toolbar">
+      <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+      <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+    </div>
+
+    <table
+      id="logTable"
+      data-locale="<?php echo i18n() ?>"
+      class="table-sm table-borderless"
+      data-side-pagination="server"
+      data-ajax="ajaxRequest"
+      data-pagination="true"
+      data-page-list="[10, 25, 50, 100, 200, 300, 400, 500]"
+      data-search="true"
+      data-advanced-search="true"
+      data-id-table="advancedTable"
+      data-cookie="true"
+      data-cookie-id-table="zmLogsTable"
+      data-cookie-expire="2y"
+      data-remember-order="true"
+      data-show-columns="true"
+      data-show-export="true"
+      data-toolbar="#toolbar"
+      data-show-fullscreen="true"
+      data-maintain-meta-data="true"
+      data-buttons-class="btn btn-normal"
+      data-show-jump-to="true"
+      data-auto-refresh="true"
+      data-auto-refresh-silent="true"
+      data-show-refresh="true"
+      data-auto-refresh-interval="5"
+    >
+      <thead class="thead-highlight">
+        <tr>
+          <th data-sortable="true" data-field="DateTime"><?php echo translate('DateTime') ?></th>
+          <th data-sortable="true" data-field="Component"><?php echo translate('Component') ?></th>
+          <th data-sortable="false" data-field="Server"><?php echo translate('Server') ?></th>
+          <th data-sortable="true" data-field="Pid"><?php echo translate('Pid') ?></th>
+          <th data-sortable="true" data-field="Code"><?php echo translate('Level') ?></th>
+          <th data-sortable="true" data-field="Message"><?php echo translate('Message') ?></th>
+          <th data-sortable="true" data-field="File"><?php echo translate('File') ?></th>
+          <th data-sortable="true" data-field="Line"><?php echo translate('Line') ?></th>
+        </tr>
+      </thead>
+
+      <tbody>
+      <!-- Row data populated via Ajax -->
+      </tbody>
+
+    </table>
+  </div><!--page-->
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/login.php b/web/skins/classic/views/login.php
index e08bf91bc..415131be8 100644
--- a/web/skins/classic/views/login.php
+++ b/web/skins/classic/views/login.php
@@ -4,6 +4,9 @@ xhtmlHeaders(__FILE__, translate('Login'));
 <body>
 <?php echo getNavBarHTML(); ?>
 	<div class="container">
+<?php
+if ( defined('ZM_OPT_USE_AUTH') and ZM_OPT_USE_AUTH ) {
+?>
 		<form class="center-block" name="loginForm" id="loginForm" method="post" action="?">
 			<input type="hidden" name="action" value="login"/>
 			<input type="hidden" name="view" value="login"/>
@@ -34,6 +37,20 @@ if (
 } ?>
 				<button class="btn btn-lg btn-primary btn-block" type="submit"><?php echo translate('Login') ?></button>
 			</div>
+<?php 
+} else {
+?>
+<div class="error">
+User Authentication is not turned on. You cannot log in.
+<script nonce="<?php echo $cspNonce; ?>">
+  setTimeout(function() {
+    window.location.replace('?view=console');
+  }, 500);
+</script>
+</div>
+<?php
+} # end if ZM_OPT_AUTH
+?>
 		</form>
 	</div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 13ec55633..5e30db969 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -33,30 +33,31 @@ if ( defined('ZM_SERVER_ID') ) {
 if ( !$Server ) {
   $Server = array('Id' => '');
 }
-
+$mid = null;
 $monitor = null;
 if ( !empty($_REQUEST['mid']) ) {
-  $monitor = new ZM\Monitor($_REQUEST['mid']);
+  $mid = validInt($_REQUEST['mid']);
+  $monitor = new ZM\Monitor($mid);
   if ( $monitor and ZM_OPT_X10 )
-    $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['mid']));
+    $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($mid));
 }
 
 if ( !$monitor ) {
-  $nextId = getTableAutoInc('Monitors');
-  if ( isset($_REQUEST['dupId']) ) {
-    $monitor = new ZM\Monitor($_REQUEST['dupId']);
-    $monitor->GroupIds(); // have to load before we change the Id
-    if ( ZM_OPT_X10 )
-      $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['dupId']));
-    $clonedName = $monitor->Name();
-    $monitor->Id(0);
-  } else {
-    $monitor = new ZM\Monitor();
-  } # end if $_REQUEST['dupID']
-  $monitor->Name(translate('Monitor').'-'.$nextId);
+  $monitor = new ZM\Monitor();
+  $monitor->Name(translate('Monitor').'-'.getTableAutoInc('Monitors'));
   $monitor->WebColour(random_colour());
 } # end if $_REQUEST['mid']
 
+if ( isset($_REQUEST['dupId']) ) {
+  $monitor = new ZM\Monitor($_REQUEST['dupId']);
+  $monitor->GroupIds(); // have to load before we change the Id
+  if ( ZM_OPT_X10 )
+    $x10Monitor = dbFetchOne('SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['dupId']));
+  $clonedName = $monitor->Name();
+  $monitor->Name('Clone of '.$monitor->Name());
+  $monitor->Id($mid);
+}
+
 if ( ZM_OPT_X10 && empty($x10Monitor) ) {
   $x10Monitor = array(
       'Activation' => '',
@@ -369,8 +370,10 @@ $fastblendopts_alarm = array(
     );
 
 $label_size = array(
-    1 => translate('Default'),
-    2 => translate('Large'),
+    1 => translate('Small'),
+    2 => translate('Default'),
+    3 => translate('Large'),
+    4 => translate('Extra Large'),
     );
 
 $codecs = array(
@@ -389,7 +392,7 @@ echo getNavBarHTML();
 
   <div class="row flex-nowrap">
     <nav>  <!-- BEGIN PILL LIST -->
-    <ul class="pillList nav nav-pills flex-column h-100">
+    <ul class="nav nav-pills flex-column h-100" id="pills-tab" role="tablist" aria-orientation="vertical">
 <?php
 $tabs = array();
 $tabs['general'] = translate('General');
@@ -404,6 +407,7 @@ if ( $monitor->Type() != 'WebSite' ) {
   if ( ZM_OPT_X10 )
     $tabs['x10'] = translate('X10');
   $tabs['misc'] = translate('Misc');
+  $tabs['location'] = translate('Location');
 }
 
 if ( isset($_REQUEST['tab']) )
@@ -413,7 +417,16 @@ else
 
 foreach ( $tabs as $name=>$value ) {
 ?>
-    <li class="nav-item form-control-sm my-1"><a data-toggle="pill" data-tab-name="<?php echo $name ?>" class="nav-link<?php echo $tab == $name ? ' active' : '' ?>" href="#"><?php echo $value ?></a></li>
+    <li class="nav-item form-control-sm my-1">
+      <a 
+        id="<?php echo $name?>-tab"
+        role="tab"
+        data-toggle="pill"
+        class="nav-link<?php echo $tab == $name ? ' active' : '' ?>"
+          href="#pills-<?php echo $name?>"
+        aria-controls="pills-<?php echo $name?>"
+        aria-selected="<?php echo $tab == $name ? 'true':'false'?>"
+      ><?php echo $value ?></a></li>
 <?php
 }
   ?>
@@ -451,173 +464,19 @@ if ( canEdit('Monitors') ) {
 
     <!-- BEGIN ITEM LIST -->
     <div class="d-flex flex-row container-fluid pr-0">
-    <form name="contentForm" id="contentForm" method="post" action="?">
-      <input type="hidden" name="view" value="<?php echo $view ?>"/>
-      <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
-      <input type="hidden" name="action" value="monitor"/>
-      <input type="hidden" name="mid" value="<?php echo $monitor->Id()?>"/>
-      <input type="hidden" name="origMethod" value="<?php echo ( null !== $monitor->Method())?validHtmlStr($monitor->Method()):'' ?>"/>
+    <form name="contentForm" id="contentForm" method="post" action="?view=monitor">
+      <input type="hidden" name="tab" value="<?php echo $tab?>"/>
+      <input type="hidden" name="mid" value="<?php echo $monitor->Id() ? $monitor->Id() : $mid ?>"/>
+      <input type="hidden" name="origMethod" value="<?php echo (null !== $monitor->Method())?validHtmlStr($monitor->Method()):'' ?>"/>
+<div class="tab-content" id="pills-tabContent">
 <?php
-if ( $tab != 'general' ) {
+foreach ( $tabs as $name=>$value ) {
+  echo '<div id="pills-'.$name.'" class="tab-pane fade'.($name==$tab ? ' show active' : '').'" role="tabpanel" aria-labelledby="'.$name.'-tab">';
 ?>
-      <input type="hidden" name="newMonitor[Name]" value="<?php echo validHtmlStr($monitor->Name()) ?>"/>
-      <input type="hidden" name="newMonitor[Notes]" value="<?php echo validHtmlStr($monitor->Notes()) ?>"/>
-      <input type="hidden" name="newMonitor[ServerId]" value="<?php echo $monitor->ServerId() ?>"/>
-      <input type="hidden" name="newMonitor[ManufacturerId]" value="<?php echo $monitor->ManufacturerId() ?>"/>
-      <input type="hidden" name="newMonitor[ModelId]" value="<?php echo $monitor->ModelId() ?>"/>
-      <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?php echo (null !== $monitor->LinkedMonitors())?validHtmlStr($monitor->LinkedMonitors()):'' ?>"/>
-<?php
-foreach ( $monitor->GroupIds() as $group_id ) {
-echo '<input type="hidden" name="newMonitor[GroupIds][]" value="'.$group_id.'"/>';
-}
-?>
-      <input type="hidden" name="newMonitor[Type]" value="<?php echo validHtmlStr($monitor->Type()) ?>"/>
-      <input type="hidden" name="newMonitor[Function]" value="<?php echo validHtmlStr($monitor->Function()) ?>"/>
-      <input type="hidden" name="newMonitor[Enabled]" value="<?php echo validHtmlStr($monitor->Enabled()) ?>"/>
-      <input type="hidden" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($monitor->RefBlendPerc()) ?>"/>
-      <input type="hidden" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($monitor->AlarmRefBlendPerc()) ?>"/>
-      <input type="hidden" name="newMonitor[AnalysisFPSLimit]" value="<?php echo validHtmlStr($monitor->AnalysisFPSLimit()) ?>"/>
-      <input type="hidden" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS()) ?>"/>
-      <input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS()) ?>"/>
-<?php
-  if ( '' !== $monitor->Triggers() ) {
-    foreach ( explode(',', $monitor->Triggers()) as $newTrigger ) {
-?>
-      <input type="hidden" name="newMonitor[Triggers][]" value="<?php echo validHtmlStr($newTrigger) ?>"/>
-<?php
-    }
-  }
-}
-if ( ZM_HAS_V4L && ($tab != 'source' || $monitor->Type() != 'Local') ) {
-?>
-      <input type="hidden" name="newMonitor[Device]" value="<?php echo validHtmlStr($monitor->Device()) ?>"/>
-      <input type="hidden" name="newMonitor[Channel]" value="<?php echo validHtmlStr($monitor->Channel()) ?>"/>
-      <input type="hidden" name="newMonitor[Format]" value="<?php echo validHtmlStr($monitor->Format()) ?>"/>
-      <input type="hidden" name="newMonitor[Palette]" value="<?php echo validHtmlStr($monitor->Palette()) ?>"/>
-      <input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?php echo validHtmlStr($monitor->V4LMultiBuffer()) ?>"/>
-      <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($monitor->V4LCapturesPerFrame()) ?>"/>
-<?php
-}
-if ( $tab != 'onvif' ) {
-?>
-        <input type="hidden" name="newMonitor[ONVIF_URL]" value="<?php echo validHtmlStr($monitor->ONVIF_URL()) ?>"/>
-        <input type="hidden" name="newMonitor[ONVIF_Username]" value="<?php echo validHtmlStr($monitor->ONVIF_Username()) ?>"/>
-        <input type="hidden" name="newMonitor[ONVIF_Password]" value="<?php echo validHtmlStr($monitor->ONVIF_Password()) ?>"/>
-        <input type="hidden" name="newMonitor[ONVIF_Options]" value="<?php echo validHtmlStr($monitor->ONVIF_Options()) ?>"/>
-<?php
-}
-if ( $tab != 'source' || $monitor->Type()!= 'Remote' ) {
-?>
-      <input type="hidden" name="newMonitor[Protocol]" value="<?php echo validHtmlStr($monitor->Protocol()) ?>"/>
-      <input type="hidden" name="newMonitor[Host]" value="<?php echo validHtmlStr($monitor->Host()) ?>"/>
-      <input type="hidden" name="newMonitor[Port]" value="<?php echo validHtmlStr($monitor->Port()) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type()!= 'Local' && $monitor->Type()!= 'Remote' && $monitor->Type()!= 'Ffmpeg' && $monitor->Type()!= 'Libvlc') ) {
-?>
-      <input type="hidden" name="newMonitor[Method]" value="<?php echo validHtmlStr(null !== $monitor->Method() ? $monitor->Method() : 'rtpRtsp' ) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type()!= 'Ffmpeg' && $monitor->Type()!= 'Libvlc' )) {
-?>
-      <input type="hidden" name="newMonitor[Options]" value="<?php echo validHtmlStr($monitor->Options()) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type()!= 'Remote' && $monitor->Type()!= 'File' && $monitor->Type()!= 'Ffmpeg' && $monitor->Type()!= 'Libvlc' && $monitor->Type()!= 'cURL' && $monitor->Type() != 'WebSite') ) {
-?>
-      <input type="hidden" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>"/>
-      <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User()) ?>"/>
-      <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass()) ?>"/>
-<?php
-}
-if ( $tab != 'source' ) {
-?>
-      <input type="hidden" name="newMonitor[Colours]" value="<?php echo validHtmlStr($monitor->Colours()) ?>"/>
-      <input type="hidden" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>"/>
-      <input type="hidden" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>"/>
-      <input type="hidden" name="newMonitor[Orientation]" value="<?php echo validHtmlStr($monitor->Orientation()) ?>"/>
-      <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($monitor->Deinterlacing()) ?>"/>
-<?php
-}
-if ( $tab != 'storage' ) {
-?>
-      <input type="hidden" name="newMonitor[StorageId]" value="<?php echo validHtmlStr($monitor->StorageId()) ?>"/>
-      <input type="hidden" name="newMonitor[SaveJPEGs]" value="<?php echo validHtmlStr($monitor->SaveJPEGs()) ?>"/>
-      <input type="hidden" name="newMonitor[VideoWriter]" value="<?php echo validHtmlStr($monitor->VideoWriter()) ?>"/>
-      <input type="hidden" name="newMonitor[EncoderParameters]" value="<?php echo validHtmlStr($monitor->EncoderParameters()) ?>"/>
-      <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo validHtmlStr($monitor->RecordAudio()) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type() != 'Remote' && $monitor->Protocol()!= 'rtsp') ) {
-?>
-      <input type="hidden" name="newMonitor[RTSPDescribe]" value="<?php echo validHtmlStr($monitor->RTSPDescribe()) ?>"/>
-<?php
-}
-if ( $tab != 'timestamp' ) {
-?>
-      <input type="hidden" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($monitor->LabelFormat()) ?>"/>
-      <input type="hidden" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX()) ?>"/>
-      <input type="hidden" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY()) ?>"/>
-      <input type="hidden" name="newMonitor[LabelSize]" value="<?php echo validHtmlStr($monitor->LabelSize()) ?>"/>
-<?php
-}
-if ( $tab != 'buffers' ) {
-?>
-      <input type="hidden" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($monitor->ImageBufferCount()) ?>"/>
-      <input type="hidden" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($monitor->WarmupCount()) ?>"/>
-      <input type="hidden" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($monitor->PreEventCount()) ?>"/>
-      <input type="hidden" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($monitor->PostEventCount()) ?>"/>
-      <input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($monitor->StreamReplayBuffer()) ?>"/>
-      <input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($monitor->AlarmFrameCount()) ?>"/>
-<?php
-}
-if ( ZM_OPT_CONTROL && $tab != 'control' ) {
-?>
-      <input type="hidden" name="newMonitor[Controllable]" value="<?php echo validHtmlStr($monitor->Controllable()) ?>"/>
-      <input type="hidden" name="newMonitor[ControlId]" value="<?php echo validHtmlStr($monitor->ControlId()) ?>"/>
-      <input type="hidden" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($monitor->ControlDevice()) ?>"/>
-      <input type="hidden" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($monitor->ControlAddress()) ?>"/>
-      <input type="hidden" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($monitor->AutoStopTimeout()) ?>"/>
-      <input type="hidden" name="newMonitor[TrackMotion]" value="<?php echo validHtmlStr($monitor->TrackMotion()) ?>"/>
-      <input type="hidden" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($monitor->TrackDelay()) ?>"/>
-      <input type="hidden" name="newMonitor[ReturnLocation]" value="<?php echo validHtmlStr($monitor->ReturnLocation()) ?>"/>
-      <input type="hidden" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($monitor->ReturnDelay()) ?>"/>
-<?php
-}
-if ( ZM_OPT_X10 && $tab != 'x10' ) {
-?>
-      <input type="hidden" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>"/>
-      <input type="hidden" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>"/>
-      <input type="hidden" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>"/>
-<?php
-}
-if ( $tab != 'misc' ) {
-?>
-      <input type="hidden" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($monitor->EventPrefix()) ?>"/>
-      <input type="hidden" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($monitor->SectionLength()) ?>"/>
-      <input type="hidden" name="newMonitor[MinSectionLength]" value="<?php echo validHtmlStr($monitor->MinSectionLength()) ?>"/>
-      <input type="hidden" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($monitor->FrameSkip()) ?>"/>
-      <input type="hidden" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($monitor->MotionFrameSkip()) ?>"/>
-      <input type="hidden" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($monitor->AnalysisUpdateDelay()) ?>"/>
-      <input type="hidden" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval()) ?>"/>
-      <input type="hidden" name="newMonitor[DefaultRate]" value="<?php echo validHtmlStr($monitor->DefaultRate()) ?>"/>
-      <input type="hidden" name="newMonitor[DefaultScale]" value="<?php echo validHtmlStr($monitor->DefaultScale()) ?>"/>
-      <input type="hidden" name="newMonitor[DefaultCodec]" value="<?php echo validHtmlStr($monitor->DefaultCodec()) ?>"/>
-      <input type="hidden" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($monitor->WebColour()) ?>"/>
-      <input type="hidden" name="newMonitor[Exif]" value="<?php echo validHtmlStr($monitor->Exif()) ?>"/>
-<?php
-}
-if ( $tab != 'misc' ) {
-?>
-      <input type="hidden" name="newMonitor[SignalCheckPoints]" value="<?php echo validHtmlStr($monitor->SignalCheckPoints()) ?>"/>
-      <input type="hidden" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($monitor->SignalCheckColour()) ?>"/>
-<?php
-}
-?>
-      <table id="contentTable" class="major">
+      <table class="major">
         <tbody>
 <?php
-switch ( $tab ) {
+switch ( $name ) {
   case 'general' :
     {
 ?>
@@ -662,6 +521,9 @@ echo htmlSelect('newMonitor[ModelId]', $models, $monitor->ModelId(), array('clas
             <td class="text-right pr-3"><?php echo translate('SourceType') ?></td>
             <td><?php echo htmlSelect('newMonitor[Type]', $sourceTypes, $monitor->Type()); ?></td>
           </tr>
+<?php
+      if ( $monitor->Type() != 'WebSite' ) {
+?>
           <tr>
             <td class="text-right pr-3"><?php echo translate('Function') ?></td>
             <td>
@@ -672,20 +534,42 @@ echo htmlSelect('newMonitor[ModelId]', $models, $monitor->ModelId(), array('clas
       }
       echo htmlSelect('newMonitor[Function]', $function_options, $monitor->Function());
 ?>
+ <div id="function_help">
+<?php
+  foreach ( ZM\getMonitorFunctionTypes() as $fn => $translated ) {
+    if ( isset($OLANG['FUNCTION_'.strtoupper($fn)]) ) {
+      echo '<div class="form-text" id="'.$fn.'Help">'.$OLANG['FUNCTION_'.strtoupper($fn)]['Help'].'</div>';
+    }
+  }
+?>
+          </div>
           </td>
         </tr>
-        <tr>
-          <td class="text-right pr-3"><?php echo translate('Enabled') ?></td>
-          <td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php echo $monitor->Enabled() ? ' checked="checked"' : '' ?>/></td>
-        </tr>
+        <tr id="FunctionEnabled">
+          <td class="text-right pr-3"><?php echo translate('Analysis Enabled') ?></td>
+          <td><input type="checkbox" name="newMonitor[Enabled]" value="1"<?php echo $monitor->Enabled() ? ' checked="checked"' : '' ?>/>
 <?php
-      if ( $monitor->Type() != 'WebSite' ) {
+  if ( isset($OLANG['FUNCTION_ANALYSIS_ENABLED']) ) {
+    echo '<div class="form-text">'.$OLANG['FUNCTION_ANALYSIS_ENABLED']['Help'].'</div>';
+  }
 ?>
+          </td>
+        </tr>
+  <tr id="FunctionDecodingEnabled">
+          <td class="text-right pr-3"><?php echo translate('Decoding Enabled') ?></td>
+          <td><input type="checkbox" name="newMonitor[DecodingEnabled]" value="1"<?php echo $monitor->DecodingEnabled() ? ' checked="checked"' : '' ?>/>
+<?php
+  if ( isset($OLANG['FUNCTION_DECODING_ENABLED']) ) {
+    echo '<div class="form-text">'.$OLANG['FUNCTION_DECODING_ENABLED']['Help'].'</div>';
+  }
+?>
+          </td>
+        </tr>
         <tr>
           <td class="text-right pr-3"><?php echo translate('LinkedMonitors'); echo makeHelpLink('OPTIONS_LINKED_MONITORS') ?></td>
           <td>
 <?php
-      $monitors = dbFetchAll('SELECT Id, Name FROM Monitors ORDER BY Sequence ASC');
+      $monitors = dbFetchAll('SELECT Id, Name FROM Monitors ORDER BY Name,Sequence ASC');
       $monitor_options = array();
       foreach ( $monitors as $linked_monitor ) {
         if ( (!$monitor->Id() || ($monitor->Id()!= $linked_monitor['Id'])) && visibleMonitor($linked_monitor['Id']) ) {
@@ -810,7 +694,10 @@ echo htmlSelect('newMonitor[ModelId]', $models, $monitor->ModelId(), array('clas
     {
       if ( ZM_HAS_V4L && $monitor->Type() == 'Local' ) {
 ?>
-          <tr><td class="text-right pr-3"><?php echo translate('DevicePath') ?></td><td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($monitor->Device()) ?>"/></td></tr>
+          <tr>
+            <td class="text-right pr-3"><?php echo translate('DevicePath') ?></td>
+            <td><input type="text" name="newMonitor[Device]" value="<?php echo validHtmlStr($monitor->Device()) ?>"/></td>
+          </tr>
           <tr>
             <td><?php echo translate('CaptureMethod') ?></td>
             <td><?php echo htmlSelect('newMonitor[Method]', $localMethods, $monitor->Method(), array('onchange'=>'submitTab', 'data-tab-name'=>$tab) ); ?></td>
@@ -953,6 +840,10 @@ include('_monitor_source_nvsocket.php');
       }
       if ( $monitor->Type() == 'Ffmpeg' ) {
 ?>
+          <tr class="SourceSecondPath">
+            <td class="text-right pr-3"><?php echo translate('SourceSecondPath') ?></td>
+            <td><input type="text" name="newMonitor[SecondPath]" value="<?php echo validHtmlStr($monitor->SecondPath()) ?>" /></td>
+          </tr>
           <tr class="DecoderHWAccelName">
             <td class="text-right pr-3">
               <?php echo translate('DecoderHWAccelName'); echo makeHelpLink('OPTIONS_DECODERHWACCELNAME') ?>
@@ -978,29 +869,45 @@ include('_monitor_source_nvsocket.php');
           <td>
             <input type="number" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>" min="1"/>
             <input type="number" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>" min="1"/>
-<?php echo htmlselect('dimensions_select', array(
-  ''=>translate('Custom'),
-  '176x120'=>'176x120 QCIF',
-  '176x144'=>'176x14',
-  '320x240'=>'320x240',
-  '320x200'=>'320x200',
-  '352x240'=>'352x240 CIF',
-  '640x480'=>'640x480',
-  '640x400'=>'640x400',
-  '704x240'=>'704x240 2CIF',
-  '704x480'=>'704x480 4CIF',
-  '720x480'=>'720x480 D1',
-  '1280x720'=>'1280x720 720p',
-  '1280x800'=>'1280x800',
-  '1280x960'=>'1280x960 960p',
-  '1280x1024'=>'1280x1024 1MP',
-  '1600x1200'=>'1600x1200 2MP',
-  '1920x1080'=>'1920x1080 1080p',
-  '2048x1536'=>'2048x1536 3MP',
-  '2592x1944'=>'2592x1944 5MP',
-  '3840x2160'=>'3840x2160 4K UHD',
-), $monitor->Width().'x'.$monitor->Height()
-);
+<?php 
+        $resolutions =  
+          array(
+            ''=>translate('Custom'),
+            '176x120'=>'176x120 QCIF',
+            '176x144'=>'176x14',
+            '320x240'=>'320x240',
+            '320x200'=>'320x200',
+            '352x240'=>'352x240 CIF',
+            '352x480'=>'352x480',
+            '640x360'=>'640x360',
+            '640x400'=>'640x400',
+            '640x480'=>'640x480',
+            '704x240'=>'704x240 2CIF',
+            '704x480'=>'704x480 4CIF',
+            '704x576'=>'704x576 D1 PAL',
+            '720x480'=>'720x480 Full D1 NTSC',
+            '720x576'=>'720x576 Full D1 PAL',
+            '1280x720'=>'1280x720 720p',
+            '1280x800'=>'1280x800',
+            '1280x960'=>'1280x960 960p',
+            '1280x1024'=>'1280x1024 1MP',
+            '1600x1200'=>'1600x1200 2MP',
+            '1920x1080'=>'1920x1080 1080p',
+            '2048x1536'=>'2048x1536 3MP',
+            '2560x1440'=>'2560x1440 1440p QHD WQHD',
+            '2592x1944'=>'2592x1944 5MP',
+            '2688x1520'=>'2688x1520 4MP',
+            '3072x2048'=>'3072x2048 6MP',
+            '3840x2160'=>'3840x2160 4K UHD',
+          );
+        $selected = '';
+        if ( $monitor->Width() and $monitor->Height() ) {
+          $selected = $monitor->Width().'x'.$monitor->Height();
+          if ( ! isset($resolutions[$selected]) ) {
+            $resolutions[$selected] = $selected;
+          }
+        }
+        echo htmlselect('dimensions_select', $resolutions, $selected);
 ?>
           </td>
         </tr>
@@ -1073,16 +980,58 @@ include('_monitor_source_nvsocket.php');
 			0 => 'Disabled',
 			);
 
-  $videowriteropts[1] = 'X264 Encode';
+  $videowriteropts[1] = 'Encode';
 
   if ( $monitor->Type() == 'Ffmpeg' )
-    $videowriteropts[2] = 'H264 Camera Passthrough';
+    $videowriteropts[2] = 'Camera Passthrough';
   else
-    $videowriteropts[2] = array('text'=>'H264 Camera Passthrough - only for FFMPEG','disabled'=>1);
-
-  echo htmlselect('newMonitor[VideoWriter]', $videowriteropts, $monitor->VideoWriter());
+    $videowriteropts[2] = array('text'=>'Camera Passthrough - only for FFMPEG','disabled'=>1);
+	echo htmlSelect('newMonitor[VideoWriter]', $videowriteropts, $monitor->VideoWriter());
 ?>
-            </td></tr>
+              </td>
+            </tr>
+            <tr class="OutputCodec">
+              <td><?php echo translate('OutputCodec') ?></td>
+              <td>
+<?php
+$videowriter_codecs = array(
+  '0' => translate('Auto'),
+  '27' => 'h264',
+  '173' => 'h265/hevc',
+);
+echo htmlSelect('newMonitor[OutputCodec]', $videowriter_codecs, $monitor->OutputCodec());
+?>
+              </td>
+            </tr>
+            <tr class="Encoder">
+              <td><?php echo translate('Encoder') ?></td>
+              <td>
+<?php
+$videowriter_encoders = array(
+  'auto' => translate('Auto'),
+  'libx264' => 'libx264',
+  'h264' => 'h264',
+  'h264_nvenc' => 'h264_nvenc',
+  'h264_omx' => 'h264_omx',
+  'h264_vaapi' => 'h264_vaapi',
+  'libx265' => 'libx265',
+  'hevc_nvenc' => 'hevc_nvenc',
+  'hevc_vaapi' => 'hevc_vaapi',
+);
+ echo htmlSelect('newMonitor[Encoder]', $videowriter_encoders, $monitor->Encoder());?></td></tr>
+            <tr class="OutputContainer">
+              <td><?php echo translate('OutputContainer') ?></td>
+              <td>
+<?php
+$videowriter_containers = array(
+  '' => translate('Auto'),
+  'mp4' => 'mp4',
+  'mkv' => 'mkv',
+);
+echo htmlSelect('newMonitor[OutputContainer]', $videowriter_containers, $monitor->OutputContainer());
+?>
+              </td>
+            </tr>
             <tr>
               <td class="text-right pr-3"><?php echo translate('OptionalEncoderParam'); echo makeHelpLink('OPTIONS_ENCODER_PARAMETERS') ?></td>
               <td>
@@ -1093,7 +1042,7 @@ include('_monitor_source_nvsocket.php');
 <?php if ( $monitor->Type() == 'Ffmpeg' ) { ?>
               <input type="checkbox" name="newMonitor[RecordAudio]" value="1"<?php if ( $monitor->RecordAudio() ) { ?> checked="checked"<?php } ?>/>
 <?php } else { ?>
-              Audio recording only available with FFMPEG using H264 Passthrough
+              Audio recording only available with FFMPEG
               <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo $monitor->RecordAudio() ? 1 : 0 ?>"/>
 <?php } ?>
             </td></tr>
@@ -1109,11 +1058,11 @@ include('_monitor_source_nvsocket.php');
             </tr>
             <tr>
               <td class="text-right pr-3"><?php echo translate('TimestampLabelX') ?></td>
-              <td><input type="number" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX()) ?>" min="1"/></td>
+              <td><input type="number" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX()) ?>" min="0"/></td>
             </tr>
             <tr>
               <td class="text-right pr-3"><?php echo translate('TimestampLabelY') ?></td>
-              <td><input type="number" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY()) ?>" min="1"/></td>
+              <td><input type="number" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY()) ?>" min="0"/></td>
             </tr>
             <tr>
               <td class="text-right pr-3"><?php echo translate('TimestampLabelSize') ?></td>
@@ -1126,9 +1075,13 @@ include('_monitor_source_nvsocket.php');
     {
 ?>
             <tr>
-              <td class="text-right pr-3"><?php echo translate('ImageBufferSize') ?></td>
+              <td class="text-right pr-3"><?php echo translate('ImageBufferSize'); echo makeHelpLink('ImageBufferCount'); ?></td>
               <td><input type="number" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($monitor->ImageBufferCount()) ?>" min="1"/></td>
             </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('MaxImageBufferCount'); echo makeHelpLink('MaxImageBufferCount'); ?></td>
+              <td><input type="number" name="newMonitor[MaxImageBufferCount]" value="<?php echo validHtmlStr($monitor->MaxImageBufferCount()) ?>" min="0"/></td>
+            </tr>
             <tr>
               <td class="text-right pr-3"><?php echo translate('WarmupFrames') ?></td>
               <td><input type="number" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($monitor->WarmupCount()) ?>" min="0"/></td>
@@ -1149,6 +1102,10 @@ include('_monitor_source_nvsocket.php');
               <td class="text-right pr-3"><?php echo translate('AlarmFrameCount') ?></td>
               <td><input type="number" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($monitor->AlarmFrameCount()) ?>" min="1"/></td>
             </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('Estimated Ram Use') ?></td>
+              <td id="estimated_ram_use"></td>
+            </tr>
 <?php
       break;
     }
@@ -1170,7 +1127,7 @@ include('_monitor_source_nvsocket.php');
 
                   echo htmlSelect('newMonitor[ControlId]', $controlTypes, $monitor->ControlId());
                   if ( canEdit('Control') ) {
-                    echo '&nbsp;'.makePopupLink('?view=controlcaps', 'zmControlCaps', 'controlcaps', translate('Edit'));
+                    echo '&nbsp;'.makeLink('?view=controlcaps', translate('Edit'));
                   }
 ?>
               </td>
@@ -1183,6 +1140,10 @@ include('_monitor_source_nvsocket.php');
               <td class="text-right pr-3"><?php echo translate('ControlAddress') ?></td>
               <td><input type="text" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($monitor->ControlAddress()) ? : 'user:port@ip' ?>"/></td>
             </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('ModectDuringPTZ') ?></td>
+              <td><input type="checkbox" name="newMonitor[ModectDuringPTZ]" value="1"<?php if ( $monitor->ModectDuringPTZ() ) { ?> checked="checked"<?php } ?>/></td>
+            </tr>
             <tr>
               <td class="text-right pr-3"><?php echo translate('AutoStopTimeout') ?></td>
               <td><input type="number" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($monitor->AutoStopTimeout()) ?>" min="0" step="any"/></td>
@@ -1263,7 +1224,7 @@ echo htmlSelect('newMonitor[ReturnLocation]', $return_options, $monitor->ReturnL
             <?php echo translate('seconds')?>
           </td></tr>
         <tr>
-          <td class="text-right pr-3"<?php echo translate('FPSReportInterval') ?></td>
+          <td class="text-right pr-3"><?php echo translate('FPSReportInterval') ?></td>
           <td>
             <input type="number" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval()) ?>" min="0"/>
             <?php echo translate('frames')?>
@@ -1305,22 +1266,70 @@ echo htmlSelect('newMonitor[ReturnLocation]', $return_options, $monitor->ReturnL
         </tr>
         <tr>
           <td class="text-right pr-3"><?php echo translate('Exif'); echo makeHelpLink('OPTIONS_EXIF') ?></td>
-          <td><input type="checkbox" name="newMonitor[Exif]" value="1"<?php if ( $monitor->Exif() ) { ?> checked="checked"<?php } ?>/></td>
+          <td><input type="checkbox" name="newMonitor[Exif]" value="1"<?php echo $monitor->Exif() ? ' checked="checked"' : '' ?>/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('RTSPServer'); echo makeHelpLink('OPTIONS_RTSPSERVER') ?></td>
+          <td><input type="checkbox" name="newMonitor[RTSPServer]" value="1"<?php echo $monitor->RTSPServer() ? ' checked="checked"' : '' ?>/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('RTSPStreamName'); echo makeHelpLink('OPTIONS_RTSPSTREAMNAME') ?></td>
+          <td><input type="text" name="newMonitor[RTSPStreamName]" value="<?php echo validHtmlStr($monitor->RTSPStreamName()) ?>"/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Importance'); echo makeHelpLink('OPTIONS_IMPORTANCE') ?></td>
+          <td>
+<?php
+      echo htmlselect('newMonitor[Importance]',
+              array(
+                'Not'=>translate('Not important'),
+                'Less'=>translate('Less important'),
+                'Normal'=>translate('Normal')
+              ), $monitor->Importance());
+?>
+          </td>
         </tr>
 <?php
         break;
     }
+  case 'location':
+?>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Latitude') ?></td>
+          <td><input type="number" name="newMonitor[Latitude]" step="any" value="<?php echo $monitor->Latitude() ?>" min="-90" max="90"/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Longitude') ?></td>
+          <td><input type="number" name="newMonitor[Longitude]" step="any" value="<?php echo $monitor->Longitude() ?>" min="-180" max="180"/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"></td>
+          <td><button type="button" data-on-click="getLocation"><?php echo translate('GetCurrentLocation') ?></button></td>
+        </tr>
+        <tr>
+          <td colspan="2"><div id="LocationMap" style="height: 500px; width: 500px;"></div></td>
+        </tr>
+            
+<?php
+    break;
+  default :
+    ZM\Error("Unknown tab $tab");
 } // end switch tab
 ?>
           </tbody>
         </table>
+</div>
+<?php 
+} # end foreach tab
+?>
+</div><!--tab-content-->
         <div id="contentButtons" class="pr-3">
-          <button type="submit" value="Save"<?php echo canEdit('Monitors') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
+          <button type="submit" name="action" value="save"<?php echo canEdit('Monitors') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
           <button type="button" id="cancelBtn"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
     </div>
     </div>
-    </div>
+  </div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/monitorpreset.php b/web/skins/classic/views/monitorpreset.php
index 72419a599..645872943 100644
--- a/web/skins/classic/views/monitorpreset.php
+++ b/web/skins/classic/views/monitorpreset.php
@@ -36,23 +36,22 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('MonitorPreset') );
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
       <h2><?php echo translate('MonitorPreset') ?></h2>
-    </div>
     <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="?">
+      <form name="contentForm" id="monitorPresetForm" method="post" action="?">
         <input type="hidden" name="view" value="none"/>
         <input type="hidden" name="mid" value="<?php echo validNum($_REQUEST['mid']) ?>"/>
         <p>
           <?php echo translate('MonitorPresetIntro') ?>
         </p>
         <p>
-          <label for="preset"><?php echo translate('Preset') ?></label><?php echo buildSelect( "preset", $presets, 'configureButtons( this )' ); ?>
+          <label for="preset"><?php echo translate('Preset') ?></label><?php echo buildSelect( "preset", $presets ); ?>
         </p>
         <div id="contentButtons">
           <input type="submit" name="saveBtn" value="<?php echo translate('Save') ?>" data-on-click-this="submitPreset" disabled="disabled"/>
-          <input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="closeWindow"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="backWindow"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/monitorprobe.php b/web/skins/classic/views/monitorprobe.php
index 0b7098351..b02450384 100644
--- a/web/skins/classic/views/monitorprobe.php
+++ b/web/skins/classic/views/monitorprobe.php
@@ -321,10 +321,9 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('MonitorProbe') );
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('MonitorProbe') ?></h2>
-    </div>
+    <h2><?php echo translate('MonitorProbe') ?></h2>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="view" value="none"/>
@@ -339,7 +338,7 @@ xhtmlHeaders(__FILE__, translate('MonitorProbe') );
         <div id="contentButtons">
         <button type="button" name="saveBtn" value="Save" data-on-click-this="submitCamera" disabled="disabled">
         <?php echo translate('Save') ?></button>
-        <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+        <button type="button" data-on-click="backWindow"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/monitors.php b/web/skins/classic/views/monitors.php
index fe1130dfe..db02d92d5 100644
--- a/web/skins/classic/views/monitors.php
+++ b/web/skins/classic/views/monitors.php
@@ -1,6 +1,6 @@
 <?php
 //
-// ZoneMinder web function view file, $Date$, $Revision$
+// ZoneMinder web monitors view file, $Date$, $Revision$
 // Copyright (C) 2001-2008 Philip Coombes
 //
 // This program is free software; you can redistribute it and/or
@@ -39,12 +39,12 @@ foreach ( $storage_areas as $S ) {
 $focusWindow = true;
 
 xhtmlHeaders(__FILE__, translate('Function'));
+getBodyTopHTML();
+echo getNavBarHTML();
+
 ?>
-<body>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Function') ?></h2>
-    </div>
+    <h2 class="pt-2"><?php echo translate('Monitors') ?></h2>
     <div id="content">
 The following monitors will have these settings update when you click Save:<br/><br/>
       <?php echo implode('<br/>', array_map(function($m){return $m->Id().' ' .$m->Name();}, $monitors)); ?>
@@ -88,10 +88,9 @@ The following monitors will have these settings update when you click Save:<br/>
         </p>
         <div id="contentButtons">
           <button type="submit" value="Save"><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+          <button type="button" data-on-click="backWindow"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/montage.php b/web/skins/classic/views/montage.php
index 1c62fddf4..7d43eb1b2 100644
--- a/web/skins/classic/views/montage.php
+++ b/web/skins/classic/views/montage.php
@@ -79,7 +79,7 @@ if ( $layout_id and is_numeric($layout_id) and isset($layoutsById[$layout_id]) )
   $Layout = $layoutsById[$layout_id];
   $Positions = json_decode($Layout->Positions(), true);
 } else {
-  ZM\Logger::Debug('Layout not found');
+  ZM\Debug('Layout not found');
 }
 if ( $Layout and ( $Layout->Name() != 'Freeform' ) ) {
   // Use layout instead of other options
@@ -137,14 +137,14 @@ foreach ( $displayMonitors as &$row ) {
 } # end foreach Monitor
 
 xhtmlHeaders(__FILE__, translate('Montage'));
+getBodyTopHTML();
+echo getNavBarHTML();
 ?>
-<body>
   <div id="page">
-    <?php echo getNavBarHTML() ?>
     <div id="header">
 <?php
     $html = '';
-    $flip = ( (!isset($_COOKIE['zmMonitorFilterBarFlip'])) or ($_COOKIE['zmMonitorFilterBarFlip'] == 'up')) ? 'down' : 'up';
+    $flip = ( (!isset($_COOKIE['zmMonitorFilterBarFlip'])) or ($_COOKIE['zmMonitorFilterBarFlip'] == 'down')) ? 'up' : 'down';
     $html .= '<a class="flip" href="#"><i id="mfbflip" class="material-icons md-18">keyboard_arrow_' .$flip. '</i></a>'.PHP_EOL;
     $html .= '<div class="container-fluid" id="mfbpanel"'.( ( $flip == 'down' ) ? ' style="display:none;"' : '' ) .'>'.PHP_EOL;
     echo $html;
@@ -152,16 +152,18 @@ xhtmlHeaders(__FILE__, translate('Montage'));
         <div id="headerButtons">
 <?php
 if ( $showControl ) {
-  echo makePopupLink('?view=control', 'zmControl', 'control', translate('Control'));
+  echo makeLink('?view=control', translate('Control'));
 }
-if ( $showZones ) {
-?>
-  <a id="HideZones" href="?view=montage&amp;showZones=0"><?php echo translate('Hide Zones')?></a>
-<?php
-} else {
-?>
-  <a id="ShowZones" href="?view=montage&amp;showZones=1"><?php echo translate('Show Zones')?></a>
-<?php
+if ( canView('System') ) {
+  if ( $showZones ) {
+  ?>
+    <a id="HideZones" href="?view=montage&amp;showZones=0"><?php echo translate('Hide Zones')?></a>
+  <?php
+  } else {
+  ?>
+    <a id="ShowZones" href="?view=montage&amp;showZones=1"><?php echo translate('Show Zones')?></a>
+  <?php
+  }
 }
 ?>
       </div>
@@ -197,6 +199,13 @@ if ( $showZones ) {
             <button type="button" value="Save" data-on-click-this="save_layout"><?php echo translate('Save') ?></button>
             <button type="button" value="Cancel" data-on-click-this="cancel_layout"><?php echo translate('Cancel') ?></button>
           </span>
+
+<?php if (defined('ZM_FEATURES_SNAPSHOTS') and ZM_FEATURES_SNAPSHOTS) { ?>
+          <button type="button" name="snapshotBtn" data-on-click-this="takeSnapshot">
+            <i class="material-icons md-18">camera_enhance</i>
+            &nbsp;<?php echo translate('Snapshot') ?>
+          </button>
+<?php } ?>
         </form>
       </div>
     </div>
diff --git a/web/skins/classic/views/montagereview.php b/web/skins/classic/views/montagereview.php
index 615a04c0c..d34ee44b4 100644
--- a/web/skins/classic/views/montagereview.php
+++ b/web/skins/classic/views/montagereview.php
@@ -114,19 +114,19 @@ if ( count($filter) ) {
 
 $eventsSql = 'SELECT
     E.Id,E.Name,E.StorageId,
-    E.StartTime AS StartTime,UNIX_TIMESTAMP(E.StartTime) AS StartTimeSecs,
-    CASE WHEN E.EndTime IS NULL THEN (SELECT NOW()) ELSE E.EndTime END AS EndTime,
-    UNIX_TIMESTAMP(EndTime) AS EndTimeSecs,
+    E.StartDateTime AS StartDateTime,UNIX_TIMESTAMP(E.StartDateTime) AS StartTimeSecs,
+    CASE WHEN E.EndDateTime IS NULL THEN (SELECT NOW()) ELSE E.EndDateTime END AS EndDateTime,
+    UNIX_TIMESTAMP(EndDateTime) AS EndTimeSecs,
     E.Length, E.Frames, E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
   FROM Events AS E
   WHERE 1 > 0 
 ';
 
-//    select E.Id,E.Name,UNIX_TIMESTAMP(E.StartTime) as StartTimeSecs,UNIX_TIMESTAMP(max(DATE_ADD(E.StartTime, Interval Delta+0.5 Second))) as CalcEndTimeSecs, E.Length,max(F.FrameId) as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
+//    select E.Id,E.Name,UNIX_TIMESTAMP(E.StartDateTime) as StartTimeSecs,UNIX_TIMESTAMP(max(DATE_ADD(E.StartDateTime, Interval Delta+0.5 Second))) as CalcEndTimeSecs, E.Length,max(F.FrameId) as Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId
 //    from Events as E
 //    inner join Monitors as M on (E.MonitorId = M.Id)
 //    inner join Frames F on F.EventId=E.Id
-//    where not isnull(E.Frames) and not isnull(StartTime) ";
+//    where not isnull(E.Frames) and not isnull(StartDateTime) ";
 
 // Note that the delta value seems more accurate than the time stamp for some reason.
 $framesSql = '
@@ -219,14 +219,14 @@ $initialDisplayInterval = 1000;
 if ( isset($_REQUEST['displayinterval']) )
   $initialDisplayInterval = validHtmlStr($_REQUEST['displayinterval']);
 
-#$eventsSql .= ' GROUP BY E.Id,E.Name,E.StartTime,E.Length,E.Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId';
+#$eventsSql .= ' GROUP BY E.Id,E.Name,E.StartDateTime,E.Length,E.Frames,E.MaxScore,E.Cause,E.Notes,E.Archived,E.MonitorId';
 
 $minTimeSecs = $maxTimeSecs = 0;
 if ( isset($minTime) && isset($maxTime) ) {
   $minTimeSecs = strtotime($minTime);
   $maxTimeSecs = strtotime($maxTime);
-  $eventsSql .= " AND EndTime > '" . $minTime . "' AND StartTime < '" . $maxTime . "'";
-  $framesSql .= " AND EndTime > '" . $minTime . "' AND StartTime < '" . $maxTime . "'";
+  $eventsSql .= " AND EndDateTime > '" . $minTime . "' AND StartDateTime < '" . $maxTime . "'";
+  $framesSql .= " AND EndDateTime > '" . $minTime . "' AND StartDateTime < '" . $maxTime . "'";
   $framesSql .= ") AND TimeStamp > '" . $minTime . "' AND TimeStamp < '" . $maxTime . "'";
 } else {
   $framesSql .= ')';
diff --git a/web/skins/classic/views/onvifprobe.php b/web/skins/classic/views/onvifprobe.php
index a5c7ac330..70ad8ead9 100644
--- a/web/skins/classic/views/onvifprobe.php
+++ b/web/skins/classic/views/onvifprobe.php
@@ -42,7 +42,7 @@ function execONVIF($cmd) {
         $shell_command"
         );
   } else {
-    ZM\Logger::Debug('Results from probe: '.implode('<br/>', $output));
+    ZM\Debug('Results from probe: '.implode('<br/>', $output));
   }
 
   return $output;
@@ -80,7 +80,7 @@ function probeCameras($localIp) {
               $camera['monitor']['Notes'] .= $tokens[1].'='.$tokens[2]."\n";
               // $camera['location'] = $tokens[2];
             } else {
-              ZM\Logger::Debug('Unknown token '.$tokens[1].' = '.$tokens[2]);
+              ZM\Debug('Unknown token '.$tokens[1].' = '.$tokens[2]);
             }
           }
         } // end foreach token
@@ -119,7 +119,7 @@ function probeProfiles($device_ep, $soapversion, $username, $password) {
             );
         $profiles[] = $profile;
       } else {
-        ZM\Logger::Debug("Line did not match preg: $line");
+        ZM\Debug("Line did not match preg: $line");
       }
     } // end foreach line
   } // end if results from execONVIF
@@ -161,10 +161,9 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
     $cameras[0] = translate('NoDetectedCameras');
 
 ?>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('MonitorProbe') ?></h2>
-    </div>
+    <h2><?php echo translate('MonitorProbe') ?></h2>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="view" value="none"/>
@@ -188,7 +187,7 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
         if ( $matches[1] != 'lo' ) {
           $interfaces[$matches[1]] = $matches[1];
         } else {
-          ZM\Logger::Debug("No match for $line");
+          ZM\Debug("No match for $line");
         }
       }
     }
@@ -232,7 +231,7 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
         </p>
 </div>
         <div id="contentButtons">
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+          <button type="button" data-on-click="backWindow"><?php echo translate('Cancel') ?></button>
           <button type="button" name="nextBtn" data-on-click-this="gotoStep2" disabled="disabled"><?php echo translate('Next') ?></button>
         </div>
       </form>
@@ -248,7 +247,7 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
        #empty($_REQUEST['password']) )
     
   $probe = json_decode(base64_decode($_REQUEST['probe']));
-  ZM\Logger::Debug(print_r($probe, true));
+  ZM\Debug(print_r($probe, true));
   foreach ( $probe as $name=>$value ) {
     if ( isset($value) ) {
       $monitor[$name] = $value;
diff --git a/web/skins/classic/views/optionhelp.php b/web/skins/classic/views/optionhelp.php
index 513560cb6..01ac5a291 100644
--- a/web/skins/classic/views/optionhelp.php
+++ b/web/skins/classic/views/optionhelp.php
@@ -36,7 +36,7 @@ xhtmlHeaders(__FILE__, translate('OptionHelp'));
   <div id="page">
     <div id="header">
       <div id="headerButtons">
-        <a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a>
+        <a href="#" data-on-click="backWindow"><?php echo translate('Close') ?></a>
       </div>
       <h2><?php echo translate('OptionHelp') ?></h2>
     </div>
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 6dba8a3c9..22b164202 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -43,6 +43,7 @@ $tabs['highband'] = translate('HighBW');
 $tabs['medband'] = translate('MediumBW');
 $tabs['lowband'] = translate('LowBW');
 $tabs['users'] = translate('Users');
+$tabs['control'] = translate('Control');
 
 if ( isset($_REQUEST['tab']) )
   $tab = validHtmlStr($_REQUEST['tab']);
@@ -56,9 +57,9 @@ xhtmlHeaders(__FILE__, translate('Options'));
 ?>
 <body>
   <?php echo getNavBarHTML(); ?>
-  <div class="container-fluid h-100">
-    <div class="row flex-nowrap h-100">
-      <nav id="sidebar" class="h-100">
+  <div class="container-fluid">
+    <div class="row flex-nowrap">
+      <nav id="sidebar">
         <ul class="nav nav-pills flex-column h-100">
 <?php
 foreach ( $tabs as $name=>$value ) {
@@ -128,7 +129,9 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
               <th class="colControl"><?php echo translate('Control') ?></th>
               <th class="colMonitors"><?php echo translate('Monitors') ?></th>
               <th class="colGroups"><?php echo translate('Groups') ?></th>
+              <th class="colSnapshots"><?php echo translate('Snapshots') ?></th>
               <th class="colSystem"><?php echo translate('System') ?></th>
+              <th class="colDevices"><?php echo translate('Devices') ?></th>
               <th class="colBandwidth"><?php echo translate('Bandwidth') ?></th>
               <th class="colMonitor"><?php echo translate('Monitor') ?></th>
               <?php if ( ZM_OPT_USE_API ) { ?><th class="colAPIEnabled"><?php echo translate('APIEnabled') ?></th><?php } ?>
@@ -154,7 +157,6 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
           $userMonitors[] = $monitors[$monitorId]['Name'];
         }
       }
-      ZM\Logger::Debug("monitors: ".$user_row['Username'] . ' ' . $user_row['MonitorIds']. ' :' . print_r($userMonitors, true));
 ?>
             <tr>
               <td class="colUsername"><?php echo makeLink('?view=user&amp;uid='.$user_row['Id'], validHtmlStr($user_row['Username']).($user['Username']==$user_row['Username']?'*':''), $canEdit) ?></td>
@@ -165,7 +167,9 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
               <td class="colControl"><?php echo validHtmlStr($user_row['Control']) ?></td>
               <td class="colMonitors"><?php echo validHtmlStr($user_row['Monitors']) ?></td>
               <td class="colGroups"><?php echo validHtmlStr($user_row['Groups']) ?></td>
+              <td class="colSnapshots"><?php echo validHtmlStr($user_row['Snapshots']) ?></td>
               <td class="colSystem"><?php echo validHtmlStr($user_row['System']) ?></td>
+              <td class="colDevices"><?php echo validHtmlStr($user_row['Devices']) ?></td>
               <td class="colBandwidth"><?php echo $user_row['MaxBandwidth']?$bandwidth_options[$user_row['MaxBandwidth']]:'&nbsp;' ?></td>
               <td class="colMonitor"><?php echo count($userMonitors)?(join(', ', $userMonitors)):'&nbsp;' ?></td>
               <?php if ( ZM_OPT_USE_API ) { ?><td class="colAPIEnabled"><?php echo translate($user_row['APIEnabled']?'Yes':'No') ?></td><?php } ?>
@@ -177,11 +181,19 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
           </tbody>
         </table>
         <div id="contentButtons">
-        <?php echo makePopupButton('?view=user&uid=0', 'zmUser', 'user', translate("AddNewUser"), canEdit('System')); ?>
+          <?php echo makeButton('?view=user&uid=0', 'AddNewUser', canEdit('System')); ?>
           <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
         </div>
       </form>
       <?php
+} else if ( $tab == 'control' ) {
+      if ( canView('Control') ) {
+        $redirect = '?view=controlcaps';
+      } else {
+        $redirect = '?view=error';
+      }
+      // Have to do this 
+      header('Location: '.$redirect);
 } else if ( $tab == 'servers' ) {
       ?>
       <form name="serversForm" method="post" action="?">
@@ -220,6 +232,7 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
               <td class="colUrl"><?php echo makeLink('#', validHtmlStr($Server->Url()), $canEdit, $svr_opt ) ?></td>
               <td class="colPathToIndex"><?php echo makeLink('#', validHtmlStr($Server->PathToIndex()), $canEdit, $svr_opt ) ?></td>
               <td class="colPathToZMS"><?php echo makeLink('#', validHtmlStr($Server->PathToZMS()), $canEdit, $svr_opt ) ?></td>
+              <td class="colPathToAPI"><?php echo makeLink('#', validHtmlStr($Server->PathToAPI()), $canEdit, $svr_opt ) ?></td>
               <td class="colStatus <?php if ( $Server->Status() == 'NotRunning' ) { echo 'danger'; } ?>">
                   <?php echo makeLink('#', validHtmlStr($Server->Status()), $canEdit, $svr_opt) ?></td>
               <td class="colMonitorCount"><?php echo makeLink('#', validHtmlStr($monitor_counts[$Server->Id()]), $canEdit, $svr_opt) ?></td>
@@ -268,17 +281,23 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
           <tbody>
           <?php
           foreach( ZM\Storage::find( null, array('order'=>'lower(Name)') ) as $Storage ) { 
+            $filter = new ZM\Filter();
+            $filter->addTerm(array('attr'=>'StorageId','op'=>'=','val'=>$Storage->Id()));
+            if ( $user['MonitorIds'] ) {
+              $filter = $filter->addTerm(array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'IN', 'val'=>$user['MonitorIds']));
+            }
+
             $str_opt = 'class="storageCol" data-sid="'.$Storage->Id().'"';
             ?>
             <tr>
-              <td class="colId"><?php echo makeLink('#', validHtmlStr($Storage->Id()), $canEdit, $str_opt ) ?></td>
-              <td class="colName"><?php echo makeLink('#', validHtmlStr($Storage->Name()), $canEdit, $str_opt ) ?></td>
-              <td class="colPath"><?php echo makeLink('#', validHtmlStr($Storage->Path()), $canEdit, $str_opt ) ?></td>
-              <td class="colType"><?php echo makeLink('#', validHtmlStr($Storage->Type()), $canEdit, $str_opt ) ?></td>
-              <td class="colScheme"><?php echo makeLink('#', validHtmlStr($Storage->Scheme()), $canEdit, $str_opt ) ?></td>
-              <td class="colServer"><?php echo makeLink('#', validHtmlStr($Storage->Server()->Name()), $canEdit, $str_opt ) ?></td>
+              <td class="colId"><?php echo makeLink('#', validHtmlStr($Storage->Id()), $canEdit, $str_opt) ?></td>
+              <td class="colName"><?php echo makeLink('#', validHtmlStr($Storage->Name()), $canEdit, $str_opt) ?></td>
+              <td class="colPath"><?php echo makeLink('#', validHtmlStr($Storage->Path()), $canEdit, $str_opt) ?></td>
+              <td class="colType"><?php echo makeLink('#', validHtmlStr($Storage->Type()), $canEdit, $str_opt) ?></td>
+              <td class="colScheme"><?php echo makeLink('#', validHtmlStr($Storage->Scheme()), $canEdit, $str_opt) ?></td>
+              <td class="colServer"><?php echo makeLink('#', validHtmlStr($Storage->Server()->Name()), $canEdit, $str_opt) ?></td>
               <td class="colDiskSpace"><?php echo human_filesize($Storage->disk_used_space()) . ' of ' . human_filesize($Storage->disk_total_space()) ?></td>
-              <td class="ColEvents"><?php echo $Storage->EventCount().' using '.human_filesize($Storage->event_disk_space()) ?></td>
+              <td class="ColEvents"><?php echo makeLink('?view=events'.$filter->querystring(), $Storage->EventCount().' using '.human_filesize($Storage->event_disk_space()) ); ?></td>
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Storage->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( $Storage->EventCount() or !$canEdit ) { ?> disabled="disabled"<?php } ?><?php echo $Storage->EventCount() ? ' title="Can\'t delete as long as there are events stored here."' : ''?>/></td>
             </tr>
 <?php } #end foreach Server ?>
@@ -291,13 +310,12 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
       </form>
 
   <?php
-  } else if ($tab == 'API') {
+  } else if ( $tab == 'API' ) {
   
-    $apiEnabled = dbFetchOne("SELECT Value FROM Config WHERE Name='ZM_OPT_USE_API'");
-    if ($apiEnabled['Value']!='1') {
-      echo "<div class='errorText'>APIs are disabled. To enable, please turn on OPT_USE_API in Options->System</div>";
-    }
-    else {
+    $apiEnabled = dbFetchOne('SELECT Value FROM Config WHERE Name=\'ZM_OPT_USE_API\'');
+    if ( $apiEnabled['Value'] != '1' ) {
+      echo '<div class="errorText">APIs are disabled. To enable, please turn on OPT_USE_API in Options->System</div>';
+    } else {
   ?>
 
     <form name="userForm" method="post" action="?">
diff --git a/web/skins/classic/views/plugin.php b/web/skins/classic/views/plugin.php
index 4f41b3fbd..8c7356b8a 100644
--- a/web/skins/classic/views/plugin.php
+++ b/web/skins/classic/views/plugin.php
@@ -156,7 +156,7 @@ foreach($pluginOptions as $name => $popt) {
             </tbody>
           </table>
           <input type="submit" id="submitBtn" name="submitBtn" value="<?php echo translate('Save') ?>" <?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/>
-          <input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="closeWindow"/>
+          <input type="button" value="<?php echo translate('Cancel') ?>" data-on-click="backWindow"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/report_event_audit.php b/web/skins/classic/views/report_event_audit.php
index 6cafaf67e..be53c87b0 100644
--- a/web/skins/classic/views/report_event_audit.php
+++ b/web/skins/classic/views/report_event_audit.php
@@ -38,35 +38,29 @@ if ( isset($_REQUEST['maxTime']) ) {
   $maxTime = strftime('%FT%T',time() - 3600);
 }
 
-$filter = array(
-    'Query' => array(
-      'terms' => array(
-        array('attr'=>'StartDateTime', 'op'=>'>=', 'val'=>$minTime, 'obr'=>'1'),
-        array('attr'=>'StartDateTime', 'op'=>'<=', 'val'=>$maxTime, 'cnj'=>'and', 'cbr'=>'1'),
-      )
-    ),
-  );
+$filter = new ZM\Filter();
+$filter->addTerm(array('attr'=>'StartDateTime', 'op'=>'>=', 'val'=>$minTime, 'obr'=>'1'));
+$filter->addTerm(array('attr'=>'StartDateTime', 'op'=>'<=', 'val'=>$maxTime, 'cnj'=>'and', 'cbr'=>'1'));
 if ( count($selected_monitor_ids) ) {
-  $filter['Query']['terms'][] = (array('attr'=>'MonitorId', 'op'=>'IN', 'val'=>implode(',', $selected_monitor_ids), 'cnj'=>'and'));
+  $filter->addTerm(array('attr'=>'MonitorId', 'op'=>'IN', 'val'=>implode(',', $selected_monitor_ids), 'cnj'=>'and'));
 } else if ( ( $group_id != 0 || isset($_SESSION['ServerId']) || isset($_SESSION['StorageId']) || isset($_SESSION['Status']) ) ) {
 # this should be redundant
   for ( $i=0; $i < count($displayMonitors); $i++ ) {
     if ( $i == 0 ) {
-      $filter['Query']['terms'][] = array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'and', 'obr'=>'1');
+      $filter->addTerm(array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'and', 'obr'=>'1'));
     } else if ( $i == count($displayMonitors)-1 ) {
-      $filter['Query']['terms'][] = array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'or', 'cbr'=>'1');
+      $filter->addTerm(array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'or', 'cbr'=>'1'));
     } else {
-      $filter['Query']['terms'][] = array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'or');
+      $filter->addTerm(array('attr'=>'MonitorId', 'op'=>'=', 'val'=>$displayMonitors[$i]['Id'], 'cnj'=>'or'));
     }
   }
 }
-parseFilter($filter);
-$filterQuery = $filter['query'];
-ZM\Logger::Debug($filterQuery);
+$filterQuery = $filter->querystring();
+ZM\Debug($filterQuery);
 
 $eventsSql = 'SELECT *,
-    UNIX_TIMESTAMP(E.StartTime) AS StartTimeSecs,
-    UNIX_TIMESTAMP(EndTime) AS EndTimeSecs
+    UNIX_TIMESTAMP(E.StartDateTime) AS StartTimeSecs,
+    UNIX_TIMESTAMP(EndDateTime) AS EndTimeSecs
   FROM Events AS E
   WHERE 1 > 0 
 ';
@@ -77,7 +71,7 @@ if ( count($selected_monitor_ids) ) {
   $eventsSql .= ' AND MonitorId IN ('.implode(',', $selected_monitor_ids).')';
 }
 if ( isset($minTime) && isset($maxTime) ) {
-  $eventsSql .= " AND EndTime > '" . $minTime . "' AND StartTime < '" . $maxTime . "'";
+  $eventsSql .= " AND EndDateTime > '" . $minTime . "' AND StartDateTime < '" . $maxTime . "'";
 }
 $eventsSql .= ' ORDER BY Id ASC';
 
@@ -94,7 +88,7 @@ while ( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
 
   if ( count($EventsByMonitor[$event['MonitorId']]['Events']) ) {
     $last_event = end($EventsByMonitor[$event['MonitorId']]['Events']);
-#Logger::Debug(print_r($last_event,true));
+#Debug(print_r($last_event,true));
     $gap = $last_event->EndTimeSecs() - $event['StartTimeSecs'];
  
     if ( $gap < $EventsByMonitor[$event['MonitorId']]['MinGap'] )
@@ -113,17 +107,16 @@ while ( $event = $result->fetch(PDO::FETCH_ASSOC) ) {
 
 ?>
 <body>
+  <?php echo $navbar ?>
   <form name="monitorForm" method="get" action="?">
     <input type="hidden" name="view" value="<?php echo $view ?>"/>
     <input type="hidden" name="action" value=""/>
-
-    <?php echo $navbar ?>
     <div class="filterBar">
       <?php echo $filterbar ?>
       <div id="DateTimeDiv">
         <label>Event Start Time</label>
-        <input type="text" name="minTime" id="minTime" value="<?php echo preg_replace('/T/', ' ', $minTime) ?>" oninput="this.form.submit();"/> to 
-        <input type="text" name="maxTime" id="maxTime" value="<?php echo preg_replace('/T/', ' ', $maxTime) ?>" oninput="this.form.submit();"/>
+        <input type="text" name="minTime" id="minTime" value="<?php echo preg_replace('/T/', ' ', $minTime) ?>"/> to 
+        <input type="text" name="maxTime" id="maxTime" value="<?php echo preg_replace('/T/', ' ', $maxTime) ?>"/>
       </div>
     </div><!--FilterBar-->
 
@@ -150,12 +143,7 @@ for ( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
   $Monitor = new ZM\Monitor($monitor);
   $montagereview_link = '?view=montagereview&live=0&MonitorId='.$monitor['Id'].'&minTime='.$minTime.'&maxTime='.$maxTime;
 
-  $monitor_filter = addFilterTerm(
-      $filter,
-      count($filter['Query']['terms']),
-      array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'=', 'val'=>$monitor['Id'])
-    );
-  parseFilter($monitor_filter);
+  $monitor_filter = $filter->addTerm(array('cnj'=>'and', 'attr'=>'MonitorId', 'op'=>'=', 'val'=>$monitor['Id']));
 
   if ( isset($EventsByMonitor[$Monitor->Id()]) ) {
     $EventCounts = $EventsByMonitor[$Monitor->Id()];
@@ -175,24 +163,12 @@ for ( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
   }
 
   if ( count($FileMissing) ) {
-    $FileMissing_filter = array(
-        'Query' => array(
-          'terms' => array(
-            array('attr'=>'Id', 'op'=>'IN', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $FileMissing)))
-            )
-          )
-        );
-    parseFilter($FileMissing_filter);
+    $FileMissing_filter = new ZM\Filter();
+    $FileMissing_filter->addTerm(array('attr'=>'Id', 'op'=>'IN', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $FileMissing))));
   }
   if ( count($ZeroSize) ) {
-    $ZeroSize_filter = array(
-        'Query' => array(
-          'terms' => array(
-            array('attr'=>'Id', 'op'=>'IN', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $ZeroSize)))
-            )
-          )
-        );
-    parseFilter($ZeroSize_filter);
+    $ZeroSize_filter = new ZM\Filter();
+    $ZeroSize_filter->addTerm(array('attr'=>'Id', 'op'=>'IN', 'val'=>implode(',', array_map(function($Event){return $Event->Id();}, $ZeroSize))));
   }
 ?>
           <tr id="<?php echo 'monitor_id-'.$monitor['Id'] ?>" title="<?php echo $monitor['Id'] ?>">
@@ -202,24 +178,27 @@ for ( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
               <div class="small text-nowrap text-muted">
               <?php echo implode('<br/>',
                   array_map(function($group_id){
-                    $Group = new ZM\Group($group_id);
-                    $Groups = $Group->Parents();
-                    array_push($Groups, $Group);
-                    return implode(' &gt; ', array_map(function($Group){ return '<a href="?view=montagereview&GroupId='.$Group->Id().'">'.$Group->Name().'</a>'; }, $Groups ));
+                    $Group = ZM\Group::find_one(array('Id'=>$group_id));
+                    if ( $Group ) {
+                      $Groups = $Group->Parents();
+                      array_push( $Groups, $Group );
+                    }
+                    return implode(' &gt; ', array_map(function($Group){ return '<a href="?view=montagereview&amp;GroupId='.$Group->Id().'">'.validHtmlStr($Group->Name()).'</a>'; }, $Groups ));
                     }, $Monitor->GroupIds())); 
+
 ?>
             </div></td>
             <td class="colServer"><?php echo validHtmlStr($Monitor->Server()->Name())?></td>
-            <td class="colEvents"><a href="?view=<?php echo ZM_WEB_EVENTS_VIEW ?>&amp;page=1<?php echo $monitor_filter['query'] ?>"><?php echo isset($EventsByMonitor[$Monitor->Id()])?count($EventsByMonitor[$Monitor->Id()]['Events']):0 ?></a></td>
-            <td class="colFirstEvent"><?php echo $FirstEvent ? $FirstEvent->link_to($FirstEvent->Id().' at '.$FirstEvent->StartTime()) : 'none'?></td>
-            <td class="colLastEvent"><?php echo $LastEvent ? $LastEvent->link_to($LastEvent->Id().' at '.$LastEvent->StartTime()) : 'none'?></td>
+            <td class="colEvents"><a href="?view=<?php echo ZM_WEB_EVENTS_VIEW ?>&amp;page=1<?php echo $monitor_filter->querystring() ?>"><?php echo isset($EventsByMonitor[$Monitor->Id()])?count($EventsByMonitor[$Monitor->Id()]['Events']):0 ?></a></td>
+            <td class="colFirstEvent"><?php echo $FirstEvent ? $FirstEvent->link_to($FirstEvent->Id().' at '.$FirstEvent->StartDateTime()) : 'none'?></td>
+            <td class="colLastEvent"><?php echo $LastEvent ? $LastEvent->link_to($LastEvent->Id().' at '.$LastEvent->StartDateTime()) : 'none'?></td>
             <td class="colMinGap"><?php echo $MinGap ?></td>
             <td class="colMaxGap"><?php echo $MaxGap ?></td>
             <td class="colFileMissing<?php echo count($FileMissing) ? ' errorText' : ''?>">
-            <?php echo count($FileMissing) ? '<a href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$FileMissing_filter['query'].'">'.count($FileMissing).'</a>' : '0' ?>
+            <?php echo count($FileMissing) ? '<a href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$FileMissing_filter->querystring().'">'.count($FileMissing).'</a>' : '0' ?>
             </td>
             <td class="colZeroSize<?php echo count($ZeroSize) ? ' errorText' : ''?>">
-            <?php echo count($ZeroSize) ? '<a href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$ZeroSize_filter['query'].'">'.count($ZeroSize).'</a>' : '0' ?>
+            <?php echo count($ZeroSize) ? '<a href="?view='.ZM_WEB_EVENTS_VIEW.'&amp;page=1'.$ZeroSize_filter->querystring().'">'.count($ZeroSize).'</a>' : '0' ?>
             </td>
           </tr>
 <?php
diff --git a/web/skins/classic/views/shutdown.php b/web/skins/classic/views/shutdown.php
deleted file mode 100644
index 25d5d3d34..000000000
--- a/web/skins/classic/views/shutdown.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-//
-// ZoneMinder web shutdown view file
-// Copyright (C) 2019 ZoneMinder LLC
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
-
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, translate('Shutdown').' '.translate('Restart'));
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Shutdown').' '.translate('Restart') ?></h2>
-    </div>
-    <div id="content">
-<?php
-  if ( !defined('ZM_PATH_SHUTDOWN') or ZM_PATH_SHUTDOWN == '' ) {
-      echo '<div class="error">ZM_PATH_SHUTDOWN is not defined. This is normally configured in /etc/zm/conf.d/01-system-paths.conf</div>';
-  } else if ( !file_exists(ZM_PATH_SHUTDOWN) ) {
-      echo '<div class="error">Path does not exist for ZM_PATH_SHUTDOWN. Current value is '.ZM_PATH_SHUTDOWN.'</div>';
-  } else {
-?>
-  
-      <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="view" value="shutdown"/>
-<?php
-    if ( isset($output) ) {
-      echo '<p>'.implode('<br/>', $output).'</p>';
-    }
-    if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
-      echo '<p>You may cancel this shutdown by clicking '.translate('Cancel').'</p>';
-    }
-?>
-        <p class="warning"><h2>Warning</h2>
-          This command will either shutdown or restart all ZoneMinder Servers<br/>
-        </p>
-        <p>
-          <input type="radio" name="when" value="now" id="whennow"/><label for="whennow">Now</label>
-          <input type="radio" name="when" value="1min" id="when1min" checked="checked"/><label for="when1min">1 Minute</label>
-        </p>
-        <div id="contentButtons">
-<?php 
-    if ( isset($_POST['when']) and ($_POST['when'] != 'NOW') and ($action != 'cancel') ) {
-?>
-          <button type="submit" name="action" value="cancel"><?php echo translate('Cancel') ?></button>
-<?php 
-    }
-?>
-          <button type="submit" name="action" value="restart"><?php echo translate('Restart') ?></button>
-          <button type="submit" name="action" value="shutdown"><?php echo translate('Shutdown') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-        </div>
-      </form>
-<?php 
-  } # end if PATH_SHUTDOWN looks value
-?>
-    </div>
-  </div>
-<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/snapshot.php b/web/skins/classic/views/snapshot.php
new file mode 100644
index 000000000..123f1d085
--- /dev/null
+++ b/web/skins/classic/views/snapshot.php
@@ -0,0 +1,101 @@
+<?php
+//
+// ZoneMinder web snapshot view file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if (!canView('Snapshots')) {
+  $view = 'error';
+  return;
+} else if (!ZM_FEATURES_SNAPSHOTS) {
+  $view = 'console';
+  return;
+}
+
+require_once('includes/Event.php');
+require_once('includes/Filter.php');
+require_once('includes/Snapshot.php');
+
+$id = isset($_REQUEST['id']) ? validInt($_REQUEST['id']) : null;
+$snapshot = new ZM\Snapshot($id);
+
+$monitors = array();
+if ( $user['MonitorIds'] ) {
+  $monitor_ids = explode(',', $user['MonitorIds']);
+}
+xhtmlHeaders(__FILE__, translate('Snapshot').' '.$snapshot->Id());
+?>
+<body>
+  <div id="page">
+    <?php echo getNavBarHTML() ?>
+<?php 
+if ( !$snapshot->Id() ) {
+  echo '<div class="error">Snapshot was not found.</div>';
+}
+?>
+<!-- BEGIN HEADER -->
+  <form action="?view=snapshot&id=<?php echo $snapshot->Id() ?>" method="post">
+    <input type="hidden" name="action" value="save"/>
+    <div class="d-flex flex-row justify-content-between px-3 py-1">
+      <div id="toolbar">
+        <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+<?php if ( $snapshot->Id() ) { ?>
+<!--
+        <button id="editBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Edit') ?>" disabled><i class="fa fa-pencil"></i></button>
+-->
+        <button id="saveBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Save') ?>"><i class="fa fa-save"></i></button>
+<!--
+        <button id="exportBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Export') ?>"><i class="fa fa-external-link"></i></button>
+-->
+        <button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>"><i class="fa fa-trash"></i></button>
+<?php } // end if snapshot->Id ?>
+      </div>
+      
+      <h2><?php echo translate('Snapshot').' '.$snapshot->Id() ?></h2>
+    </div>
+    <div class="d-flex flex-row justify-content-between py-1">
+      <!--
+      <div class="form-group"><label><?php echo translate('Created By') ?></label>
+      -->
+      <div class="form-group CreatedOn"><label><?php echo translate('Created On') ?></label>
+        <?php echo $snapshot->CreatedOn() ?>
+      </div>
+      <div class="form-group Name"><label><?php echo translate('Reference') ?></label>
+        <input type="text" name="snapshot[Name]" value="<?php echo validHtmlStr($snapshot->Name()); ?>"/>
+      </div>
+      <div class="form-group Description"><label>
+        <?php echo translate('Notes') ?></label>
+        <textarea name="snapshot[Description]"><?php echo validHtmlStr($snapshot->Description()); ?></textarea>
+      </div>
+    </div>
+<?php if ( $snapshot->Id() ) { ?>
+<!-- BEGIN VIDEO CONTENT ROW -->
+    <div id="content" class="justify-content-center">
+<?php
+    $events = $snapshot->Events();
+    $width = 100 / ( count($events) < 2 ? 1 : ( ( count($events) < 4 ) ? count($events) : 4 ) )-1;
+    foreach ( $snapshot->Events() as $event ) {
+      $imgSrc = $event->getThumbnailSrc(array(), '&amp;');
+      echo '<img src="?view=image&eid='.$event->Id().'&fid=snapshot" width="'.$width.'%"/>';
+    }
+?>
+    </div><!--content-->
+<?php } // end if snapshot->Id() ?>
+      </form>
+  </div><!--page-->
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/snapshots.php b/web/skins/classic/views/snapshots.php
new file mode 100644
index 000000000..fe48e4345
--- /dev/null
+++ b/web/skins/classic/views/snapshots.php
@@ -0,0 +1,95 @@
+<?php
+//
+// ZoneMinder web snapshots view file
+// Copyright (C) 2021 Isaac Connor
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if (!canView('Snapshots')) {
+  $view = 'error';
+  return;
+} else if (!ZM_FEATURES_SNAPSHOTS) {
+  $view = 'console';
+  return;
+}
+
+require_once('includes/Event.php');
+require_once('includes/Snapshot.php');
+
+xhtmlHeaders(__FILE__, translate('Snapshots'));
+getBodyTopHTML();
+
+?>
+  <?php echo getNavBarHTML() ?>
+  <div id="page" class="container-fluid p-3">
+    <!-- Toolbar button placement and styling handled by bootstrap-tables -->
+    <div id="toolbar">
+      <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+      <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      <!--<button id="filterBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Filter') ?>"><i class="fa fa-filter"></i></button>-->
+      <!--<button id="exportBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Export') ?>" disabled><i class="fa fa-external-link"></i></button>-->
+      <button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>" disabled><i class="fa fa-trash"></i></button>
+    </div>
+
+      <!-- Table styling handled by bootstrap-tables -->
+      <div class="row justify-content-center table-responsive-sm">
+        <table
+          id="snapshotTable"
+          data-locale="<?php echo i18n() ?>"
+          data-side-pagination="server"
+          data-ajax="ajaxRequest"
+          data-pagination="true"
+          data-show-pagination-switch="true"
+          data-page-list="[10, 25, 50, 100, 200, All]"
+          data-search="true"
+          data-cookie="true"
+          data-cookie-id-table="zmSnapshotsTable"
+          data-cookie-expire="2y"
+          data-click-to-select="true"
+          data-remember-order="true"
+          data-show-columns="true"
+          data-show-export="true"
+          data-uncheckAll="true"
+          data-toolbar="#toolbar"
+          data-show-fullscreen="true"
+          data-click-to-select="true"
+          data-maintain-meta-data="true"
+          data-buttons-class="btn btn-normal"
+          data-show-jump-to="true"
+          data-show-refresh="true"
+          class="table-sm table-borderless"
+          style="display:none;"
+        >
+          <thead>
+            <!-- Row styling is handled by bootstrap-tables -->
+            <tr>
+              <th data-sortable="false" data-field="toggleCheck" data-checkbox="true"></th>
+              <th data-sortable="true" data-field="Id"><?php echo translate('Id') ?></th>
+              <th data-sortable="true" data-field="Name"><?php echo translate('Reference') ?></th>
+              <th data-sortable="false" data-field="Description"><?php echo translate('Notes') ?></th>
+              <th data-sortable="true" data-field="CreatedOn"><?php echo translate('When') ?></th>
+              <th data-sortable="false" data-field="Thumbnail"><?php echo translate('Thumbnail') ?></th>
+            </tr>
+          </thead>
+
+          <tbody>
+          <!-- Row data populated via Ajax -->
+          </tbody>
+
+        </table>
+      </div>       
+  </div>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/stats.php b/web/skins/classic/views/stats.php
index 2cd5c69e4..26911d690 100644
--- a/web/skins/classic/views/stats.php
+++ b/web/skins/classic/views/stats.php
@@ -18,10 +18,9 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canView( 'Events' ) )
-{
-    $view = "error";
-    return;
+if (!canView('Events')) {
+  $view = 'error';
+  return;
 }
 
 $eid = validInt($_REQUEST['eid']);
@@ -29,12 +28,11 @@ $fid = validInt($_REQUEST['fid']);
 
 $focusWindow = true;
 
-xhtmlHeaders(__FILE__, translate('Stats')." - ".$eid." - ".$fid );
+xhtmlHeaders(__FILE__, translate('Stats').' - '.$eid.' - '.$fid);
 ?>
 <body>
   <?php echo getNavBarHTML() ?>
   <div id="page">
-
     <!-- Toolbar button placement and styling handled by bootstrap-tables -->
     <div id="toolbar">
       <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
@@ -44,7 +42,9 @@ xhtmlHeaders(__FILE__, translate('Stats')." - ".$eid." - ".$fid );
     <div id="content" class="row justify-content-center">
       <form name="contentForm" id="contentForm" method="get" action="?">
         <input type="hidden" name="view" value="none"/>
-        <?php echo getStatsTableHTML($eid, $fid) ?>
+        <div class="table-responsive-sm">
+          <?php echo getStatsTableHTML($eid, $fid) ?>
+        </div>
       </form>
     </div>
   </div>
diff --git a/web/skins/classic/views/timeline.php b/web/skins/classic/views/timeline.php
index 98361907c..587517fe0 100644
--- a/web/skins/classic/views/timeline.php
+++ b/web/skins/classic/views/timeline.php
@@ -128,9 +128,9 @@ $chart = array(
 $monitors = array();
 
 # The as E, and joining with Monitors is required for the filterSQL filters.
-$rangeSql = 'SELECT min(E.StartTime) AS MinTime, max(E.EndTime) AS MaxTime FROM Events AS E INNER JOIN Monitors AS M ON (E.MonitorId = M.Id) WHERE NOT isnull(E.StartTime) AND NOT isnull(E.EndTime)';
-$eventsSql = 'SELECT E.* FROM Events AS E INNER JOIN Monitors AS M ON (E.MonitorId = M.Id) WHERE NOT isnull(StartTime)';
-$eventIdsSql = 'SELECT E.Id FROM Events AS E INNER JOIN Monitors AS M ON (E.MonitorId = M.Id) WHERE NOT isnull(StartTime)';
+$rangeSql = 'SELECT min(E.StartDateTime) AS MinTime, max(E.EndDateTime) AS MaxTime FROM Events AS E INNER JOIN Monitors AS M ON (E.MonitorId = M.Id) WHERE NOT isnull(E.StartDateTime) AND NOT isnull(E.EndDateTime)';
+$eventsSql = 'SELECT E.* FROM Events AS E INNER JOIN Monitors AS M ON (E.MonitorId = M.Id) WHERE NOT isnull(StartDateTime)';
+$eventIdsSql = 'SELECT E.Id FROM Events AS E INNER JOIN Monitors AS M ON (E.MonitorId = M.Id) WHERE NOT isnull(StartDateTime)';
 $eventsValues = array();
 
 if ( !empty($user['MonitorIds']) ) {
@@ -142,8 +142,10 @@ if ( !empty($user['MonitorIds']) ) {
 }
 
 $tree = false;
-if ( isset($_REQUEST['filter']) )
-  $tree = parseFilterToTree($_REQUEST['filter']['Query']);
+if ( isset($_REQUEST['filter']) ) {
+  $filter =  ZM\Filter::parse($_REQUEST['filter']);
+  $tree = $filter->tree();
+}
 
 if ( isset($_REQUEST['range']) )
   $range = validHtmlStr($_REQUEST['range']);
@@ -193,9 +195,8 @@ if ( isset($minTime) && isset($maxTime) ) {
   $filterSql = parseTreeToSQL($tree);
 
   if ( $filterSql ) {
-    $filterSql = " AND $filterSql";
-    $eventsSql .= $filterSql;
-    $eventIdsSql .= $filterSql;
+    $eventsSql .= ' AND '.$filterSql;
+    $eventIdsSql .= ' AND '.$filterSql;
   }
 } else {
   $filterSql = parseTreeToSQL($tree);
@@ -203,10 +204,9 @@ if ( isset($minTime) && isset($maxTime) ) {
   extractDatetimeRange($tree, $tempMinTime, $tempMaxTime, $tempExpandable);
 
   if ( $filterSql ) {
-    $filterSql = " AND $filterSql";
-    $rangeSql .= $filterSql;
-    $eventsSql .= $filterSql;
-    $eventIdsSql .= $filterSql;
+    $rangeSql .= ' AND '.$filterSql;
+    $eventsSql .= ' AND '.$filterSql;
+    $eventIdsSql .= ' AND '.$filterSql;
   }
 
   if ( !isset($minTime) || !isset($maxTime) ) {
@@ -217,8 +217,6 @@ if ( isset($minTime) && isset($maxTime) ) {
         $minTime = $row['MinTime'];
       if ( !isset($maxTime) )
         $maxTime = $row['MaxTime'];
-    } else {
-      # Errors will be reported by db functions
     }
   }
 
@@ -234,10 +232,9 @@ if ( isset($minTime) && isset($maxTime) ) {
   $range = ($maxTimeT - $minTimeT) + 1;
   $halfRange = (int)($range/2);
   $midTimeT = $minTimeT + $halfRange;
-  $midTime = strftime( STRF_FMT_DATETIME_DB, $midTimeT );
+  $midTime = strftime(STRF_FMT_DATETIME_DB, $midTimeT);
 }
 
-//echo "MnT: $tempMinTime, MxT: $tempMaxTime, ExP: $tempExpandable<br>";
 if ( $tree ) {
   appendDatetimeRange($tree, $minTime, $maxTime);
 
@@ -274,8 +271,8 @@ $midTimeT = $minTimeT + $halfRange;
 $midTime = strftime(STRF_FMT_DATETIME_DB, $midTimeT);
 
 if ( isset($minTime) && isset($maxTime) ) {
-  $eventsSql .= " AND EndTime >= '$minTime' AND StartTime <= '$maxTime'";
-  $eventIdsSql .= " AND EndTime >= '$minTime' AND StartTime <= '$maxTime'";
+  $eventsSql .= " AND EndDateTime >= '$minTime' AND StartDateTime <= '$maxTime'";
+  $eventIdsSql .= " AND EndDateTime >= '$minTime' AND StartDateTime <= '$maxTime'";
 }
 
 if ( 0 ) {
@@ -329,13 +326,13 @@ while( $event = $events_result->fetch(PDO::FETCH_ASSOC) ) {
   $currEventSlots = &$monEventSlots[$event['MonitorId']];
   $currFrameSlots = &$monFrameSlots[$event['MonitorId']];
 
-  $startTimeT = strtotime($event['StartTime']);
+  $startTimeT = strtotime($event['StartDateTime']);
   $startIndex = $rawStartIndex = (int)(($startTimeT - $chart['data']['x']['lo']) / $chart['data']['x']['density']);
   if ( $startIndex < 0 )
     $startIndex = 0;
 
-  if ( isset($event['EndTime']) )
-    $endTimeT = strtotime($event['EndTime']);
+  if ( isset($event['EndDateTime']) )
+    $endTimeT = strtotime($event['EndDateTime']);
   else
     $endTimeT = time();
   $endIndex = $rawEndIndex = (int)(($endTimeT - $chart['data']['x']['lo']) / $chart['data']['x']['density']);
@@ -497,7 +494,7 @@ for ( $i = 0; $i < $chart['graph']['width']; $i++ ) {
   } # end foreach MonitorId
 }  # end foreach x
 
-//ZM\Logger::Debug(print_r( $monEventSlots,true ));
+//ZM\Debug(print_r( $monEventSlots,true ));
 //print_r( $monFrameSlots );
 //print_r( $chart );
 
@@ -739,7 +736,7 @@ function drawSlot($slot,$index) {
 if ( $mode == 'overlay' ) {
   echo drawYGrid( $chart, $majYScale, 'majLabelY', 'majTickY', 'majGridY graphWidth' );
 }
-echo drawXGrid( $chart, $majXScale, 'majLabelX', 'majTickX', 'majGridX graphHeight', 'zoom graphHeight' );
+echo drawXGrid( $chart, $majXScale, 'majLabelX', 'majTickX', 'majGridX graphHeight', 'tlzoom graphHeight' );
 if ( $mode == 'overlay' ) {
 ?>
           <div id="activity" class="activitySize">
diff --git a/web/skins/classic/views/user.php b/web/skins/classic/views/user.php
index f8b000ebb..d170c26e6 100644
--- a/web/skins/classic/views/user.php
+++ b/web/skins/classic/views/user.php
@@ -25,7 +25,7 @@ if ( !canEdit('System') && !$selfEdit ) {
   return;
 }
 
-require('includes/User.php');
+require_once('includes/User.php');
 
 if ( $_REQUEST['uid'] ) {
 	if ( !($newUser = new ZM\User($_REQUEST['uid'])) ) {
@@ -37,8 +37,6 @@ if ( $_REQUEST['uid'] ) {
 	$newUser->Username(translate('NewUser'));
 }
 
-$monitorIds = array_flip(explode(',', $newUser->MonitorIds()));
-
 $yesno = array( 0=>translate('No'), 1=>translate('Yes') );
 $nv = array( 'None'=>translate('None'), 'View'=>translate('View') );
 $nve = array( 'None'=>translate('None'), 'View'=>translate('View'), 'Edit'=>translate('Edit') );
@@ -56,14 +54,25 @@ foreach ( dbFetchAll($sql) as $monitor ) {
 $focusWindow = true;
 
 xhtmlHeaders(__FILE__, translate('User').' - '.$newUser->Username());
+echo getBodyTopHTML();
+echo getNavBarHTML();
 ?>
-<body>
-<?php echo getNavBarHTML() ?>
   <div id="page">
-      <h2><?php echo translate('User').' - '.validHtmlStr($newUser->Username()); ?></h2>
+    <div class="w-100">
+      <div class="float-left pl-3 pt-1">
+        <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      </div>
+      <div class="w-100 pt-2">
+        <h2><?php echo translate('User').' - '.validHtmlStr($newUser->Username()); ?></h2>
+      </div>
+    </div>
     <div id="content" class="row justify-content-center">
       <form id="contentForm" name="contentForm" method="post" action="?view=user">
+        <input type="hidden" name="redirect" value="<?php echo isset($_REQUEST['prev']) ? $_REQUEST['prev'] : 'options&tab=users' ?>"/>
         <input type="hidden" name="uid" value="<?php echo validHtmlStr($_REQUEST['uid']) ?>"/>
+        <div class="BasicInformation">
+
         <table id="contentTable" class="table">
           <tbody>
 <?php
@@ -88,6 +97,10 @@ if ( canEdit('System') ) {
               <th class="text-right" scope="row"><?php echo translate('Language') ?></th>
               <td><?php echo htmlSelect('newUser[Language]', $langs, $newUser->Language()) ?></td>
             </tr>
+            <tr>
+              <th class="text-right" scope="row"><?php echo translate('Home View') ?></th>
+              <td><input type="text" name="newUser[HomeView]" value="<?php echo validHtmlStr($newUser->HomeView()); ?>"/></td>
+            </tr>
 <?php
 if ( canEdit('System') and ( $newUser->Username() != 'admin' ) ) {
 ?>
@@ -95,6 +108,22 @@ if ( canEdit('System') and ( $newUser->Username() != 'admin' ) ) {
               <th class="text-right" scope="row"><?php echo translate('Enabled') ?></th>
               <td><?php echo htmlSelect('newUser[Enabled]', $yesno, $newUser->Enabled()) ?></td>
             </tr>
+            <tr>
+              <th class="text-right" scope="row"><?php echo translate('MaxBandwidth') ?></th>
+              <td><?php echo htmlSelect('newUser[MaxBandwidth]', $bandwidths, $newUser->MaxBandwidth()) ?></td>
+            </tr>
+<?php
+}
+?>
+          </tbody>
+        </table>
+      </div><!--end basic information-->
+<?php
+if ( canEdit('System') and ( $newUser->Username() != 'admin' ) ) {
+?>
+      <div class="Permissions">
+        <table id="contentTable" class="table">
+          <tbody>
             <tr>
               <th class="text-right" scope="row"><?php echo translate('Stream') ?></th>
               <td><?php echo htmlSelect('newUser[Stream]', $nv, $newUser->Stream()) ?></td>
@@ -103,6 +132,10 @@ if ( canEdit('System') and ( $newUser->Username() != 'admin' ) ) {
               <th class="text-right" scope="row"><?php echo translate('Events') ?></th>
               <td><?php echo htmlSelect('newUser[Events]', $nve, $newUser->Events()) ?></td>
             </tr>
+            <tr>
+              <th class="text-right" scope="row"><?php echo translate('Snapshots') ?></th>
+              <td><?php echo htmlSelect('newUser[Snapshots]', $nve, $newUser->Snapshots()) ?></td>
+            </tr>
             <tr>
               <th class="text-right" scope="row"><?php echo translate('Control') ?></th>
               <td><?php echo htmlSelect('newUser[Control]', $nve, $newUser->Control()) ?></td>
@@ -120,13 +153,18 @@ if ( canEdit('System') and ( $newUser->Username() != 'admin' ) ) {
               <td><?php echo htmlSelect('newUser[System]', $nve, $newUser->System()) ?></td>
             </tr>
             <tr>
-              <th class="text-right" scope="row"><?php echo translate('MaxBandwidth') ?></th>
-              <td><?php echo htmlSelect('newUser[MaxBandwidth]', $bandwidths, $newUser->MaxBandwidth()) ?></td>
+              <th class="text-right" scope="row"><?php echo translate('Devices') ?></th>
+              <td><?php echo htmlSelect('newUser[Devices]', $nve, $newUser->Devices()) ?></td>
             </tr>
             <tr>
               <th class="text-right" scope="row"><?php echo translate('RestrictedMonitors') ?></th>
               <td>
-<?php echo htmlSelect('newUser[MonitorIds][]', $monitors, explode(',', $newUser->MonitorIds()), array('multiple'=>'multiple')); ?>
+<?php
+  // explode returns an array with an empty element, so test for a value first
+  echo htmlSelect('newUser[MonitorIds][]', $monitors,
+    ($newUser->MonitorIds() ? explode(',', $newUser->MonitorIds()) : array()),
+    array('multiple'=>'multiple'));
+?>
               </td>
             </tr>
 <?php if ( ZM_OPT_USE_API ) { ?>
@@ -137,13 +175,17 @@ if ( canEdit('System') and ( $newUser->Username() != 'admin' ) ) {
 
 <?php
       } // end if ZM_OPT_USE_API
-} // end if canEdit(System)
 ?>
+            
           </tbody>
         </table>
+        </div><!--Permissions-->
+<?php
+} // end if canEdit(System)
+?>
         <div id="contentButtons">
           <button type="submit" name="action" value="Save"><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+          <button type="button" data-on-click="backWindow"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/version.php b/web/skins/classic/views/version.php
deleted file mode 100644
index 6552c4cd5..000000000
--- a/web/skins/classic/views/version.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-//
-// ZoneMinder web version view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canView('System') ) {
-  $view = 'error';
-  return;
-}
-
-$options = array(
-  'go' => translate('GoToZoneMinder')
-);
-
-if ( verNum(ZM_DYN_CURR_VERSION) != verNum(ZM_DYN_LAST_VERSION) and canEdit('System') ) {
-  $options = array_merge( $options, array(
-    'ignore' => translate('VersionIgnore'),
-    'hour'   => translate('VersionRemindHour'),
-    'day'    => translate('VersionRemindDay'),
-    'week'   => translate('VersionRemindWeek'),
-    'month'  => translate('VersionRemindMonth'),
-    'never'  => translate('VersionRemindNever')
-  ) );
-}
-
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, translate('Version'));
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Version') ?></h2>
-    </div>
-    <div id="content">
-<?php
-if ( ZM_DYN_DB_VERSION && (ZM_DYN_DB_VERSION != ZM_VERSION) ) {
-?>
-      <p class="errorText"><?php echo sprintf( $CLANG['VersionMismatch'], ZM_VERSION, ZM_DYN_DB_VERSION ) ?></p>
-      <p><?php echo translate('RunLocalUpdate') ?></p>
-      <div id="contentButtons">
-<?php
-} else if ( verNum( ZM_DYN_LAST_VERSION ) <= verNum( ZM_VERSION ) ) {
-?>
-      <p><?php echo sprintf($CLANG['RunningRecentVer'], ZM_VERSION) ?></p>
-      <p><?php echo translate('UpdateNotNecessary') ?></p>
-      <div id="contentButtons">
-      <button type="button" data-on-click="zmWindow"><?php echo translate('GoToZoneMinder') ?></button>
-<?php
-} else {
-?>
-      <form name="contentForm" id="contentForm" method="get" action="?">
-        <input type="hidden" name="view" value="version"/>
-        <input type="hidden" name="action" value="version"/>
-        <p><?php echo translate('UpdateAvailable') ?></p>
-        <p><?php echo sprintf( $CLANG['LatestRelease'], ZM_DYN_LAST_VERSION, ZM_VERSION ) ?></p>
-        <p><?php echo buildSelect('option', $options); ?></p>
-        <div id="contentButtons">
-<?php
-  if ( canEdit('System') ) {
-?>
-          <button type="submit"><?php echo translate('Apply') ?></button>
-<?php
-  }
-}
-?>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/classic/views/video.php b/web/skins/classic/views/video.php
index f2099a445..a4c01273f 100644
--- a/web/skins/classic/views/video.php
+++ b/web/skins/classic/views/video.php
@@ -102,12 +102,17 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('Video'));
 ?>
 <body>
+  <?php if ( !$popup ) echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <div id="headerButtons">
-        <a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a>
+    <div class="w-100 py-1">
+      <div class="float-left pl-3">
+        <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+        <button type="button" id="videoBtn" class="btn btn-normal" data-on-click="generateVideo" data-toggle="tooltip" data-placement="top" title="<?php echo translate('GenerateVideo') ?>" disabled><i class="fa fa-file-video-o"></i></button>
+      </div>
+      <div class="w-100 pt-2">
+        <h2><?php echo translate('Video') ?></h2>
       </div>
-      <h2><?php echo translate('Video') ?></h2>
     </div>
     <div id="content">
 <?php
@@ -122,57 +127,35 @@ if ( isset($_REQUEST['showIndex']) ) {
 <?php
 } else {
 ?>
-      <form name="contentForm" id="contentForm" method="post" action="?">
+      <form name="contentForm" id="videoForm" method="post" action="?">
         <input type="hidden" name="id" value="<?php echo $event->Id() ?>"/>
         <table id="contentTable" class="minor">
           <tbody>
             <tr>
-              <th scope="row"><?php echo translate('VideoFormat') ?></th>
+              <th class="text-nowrap text-right pr-3" scope="row"><?php echo translate('VideoFormat') ?></th>
               <td><?php echo buildSelect('videoFormat', $videoFormats) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('FrameRate') ?></th>
+              <th class="text-nowrap text-right pr-3" scope="row"><?php echo translate('FrameRate') ?></th>
               <td><?php echo buildSelect('rate', $rates) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('VideoSize') ?></th>
+              <th class="text-nowrap text-right pr-3" scope="row"><?php echo translate('VideoSize') ?></th>
               <td><?php echo buildSelect('scale', $scales) ?></td>
             </tr>
             <tr>
-              <th scope="row"><?php echo translate('OverwriteExisting') ?></th>
+              <th class="text-nowrap text-right pr-3" scope="row"><?php echo translate('OverwriteExisting') ?></th>
               <td><input type="checkbox" name="overwrite" value="1"<?php if ( !empty($_REQUEST['overwrite']) ) { ?> checked="checked"<?php } ?>/></td>
             </tr>
           </tbody>
         </table>
-        <button type="button" data-on-click="generateVideo"<?php if ( !ZM_OPT_FFMPEG ) { ?> disabled="disabled"<?php } ?>>
-        <?php echo translate('GenerateVideo') ?>
-        </button>
       </form>
-<?php
-  if ( isset($_REQUEST['generated']) ) {
-?>
-      <h2 id="videoProgress" class="<?php echo $_REQUEST['generated']?'infoText':'errorText' ?>">
-        <span id="videoProgressText"><?php echo $_REQUEST['generated']?translate('VideoGenSucceeded'):translate('VideoGenFailed') ?></span>
-        <span id="videoProgressTicker"></span>
+      <h2 id="videoProgress" class="text-warning invisible"> 
+        <span class="spinner-grow" role="status" aria-hidden="true"></span> 
+        <?php echo translate('GeneratingVideo') ?>
       </h2>
-<?php
-  } else {
-?>
-      <h2 id="videoProgress" class="hidden warnText">
-        <span id="videoProgressText"><?php echo translate('GeneratingVideo') ?></span>
-        <span id="videoProgressTicker"></span>
-      </h2>
-<?php
-  }
-?>
       <h2 id="videoFilesHeader"><?php echo translate('VideoGenFiles') ?></h2>
-<?php
-  if ( count($videoFiles) == 0 ) {
-?>
-      <h3 id="videoNoFiles"><?php echo translate('VideoGenNoFiles') ?></h3>
-<?php
-  } else {
-?>
+
       <table id="videoTable" class="major">
         <thead>
           <tr>
@@ -185,6 +168,12 @@ if ( isset($_REQUEST['showIndex']) ) {
         </thead>
         <tbody>
 <?php
+
+  if ( count($videoFiles) == 0 ) {
+       ?>
+      <td>No Video Files Found</td>
+      <?php
+  } else {
     $index = 0;
     foreach ( $videoFiles as $file ) {
       if ( filesize($file) > 0 ) {
@@ -210,26 +199,22 @@ if ( isset($_REQUEST['showIndex']) ) {
           <td><?php echo $rateText ?></td>
           <td><?php echo $scaleText ?></td>
           <td>
-            <?php echo makePopupLink('?view='.$view.'&amp;eid='.$event->Id().'&amp;width='.$width.'&amp;height='.$height.'&amp;showIndex='.$index, 'zmVideo'.$event->Id().'-'.$scale, array('videoview', $width, $height), translate('View') ); ?>
-            &nbsp;/&nbsp;
-            <a href="#"
- data-on-click-this="downloadVideo" data-file-index="<?php echo $index ?>"><?php echo translate('Download') ?></a>
-            &nbsp;/&nbsp;
-            <a href="#" data-on-click-this="deleteVideo" data-file-index="<?php echo $index ?>"><?php echo translate('Delete') ?></a>
+            <a href="?view=video&eid=<?php echo $event->Id() ?>&downloadIndex=<?php echo $index ?>"><?php echo translate('Download') ?></a>
+               &nbsp;/&nbsp;
+            <a href="?view=video&eid=<?php echo $event->Id() ?>&deleteIndex=<?php echo $index ?>"><?php echo translate('Delete') ?></a>
           </td>
         </tr>
 <?php
         $index++;
       } # end if filesize
     } # end foreach videoFile
+  }
 ?>
         </tbody>
       </table>
 <?php
-  }
 }
 ?>
     </div>
   </div>
-</body>
-</html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/watch.php b/web/skins/classic/views/watch.php
index 1b9ca2994..e1e54c3c7 100644
--- a/web/skins/classic/views/watch.php
+++ b/web/skins/classic/views/watch.php
@@ -59,21 +59,23 @@ noCacheHeaders();
 xhtmlHeaders(__FILE__, $monitor->Name().' - '.translate('Feed'));
 ?>
 <body>
-  <div id="page">
-  <?php if ( !$popup ) echo getNavBarHTML() ?>
-    <div id="header">
-        <div id="monitorName"><?php echo validHtmlStr($monitor->Name()) ?></div>
-        <div id="menuControls">
-<?php
-if ( canView('Control') && $monitor->Type() == 'Local' ) {
-?>
-          <div id="settingsControl"><?php echo makePopupLink($monitor->UrlToIndex().'?view=settings&amp;mid='.$monitor->Id().'&amp;'.get_auth_relay(), 'zmSettings'.$monitor->Id(), 'settings', translate('Settings'), true, 'id="settingsLink"') ?></div>
-<?php
-}
-?>
-          <div id="scaleControl"><?php echo translate('Scale').': '.htmlSelect('scale', $scales, $scale, array('id'=>'scale')); ?></div>
-        </div>
-        <div id="closeControl"><a href="#" data-on-click="<?php echo $popup ? 'closeWindow' : 'backWindow' ?>"><?php echo $popup ? translate('Close') : translate('Back') ?></a></div>
+  <?php echo getNavBarHTML() ?>
+    <div class="d-flex flex-row justify-content-between px-3 py-1">
+      <div>
+        <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+        <button type="button" id="settingsBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Settings') ?>" disabled><i class="fa fa-sliders"></i></button>
+        <button type="button" id="enableAlmBtn" class="btn btn-normal" data-on-click="cmdAlarm" data-toggle="tooltip" data-placement="top" title="<?php echo translate('DisableAlarms') ?>" disabled><i class="fa fa-bell"></i></button>
+        <button type="button" id="forceAlmBtn" class="btn btn-danger" data-on-click="cmdForce" data-toggle="tooltip" data-placement="top" title="<?php echo translate('ForceAlarm') ?>" disabled><i class="fa fa-exclamation-circle"></i></button>
+      </div>
+
+      <div>
+        <h2><?php echo makeLink('?view=monitor&amp;mid='.$monitor->Id(), validHtmlStr($monitor->Name()), canEdit('Monitors')) ?></h2>
+      </div>
+
+      <div>
+        <?php echo translate('Scale').': '.htmlSelect('scale', $scales, $scale, array('id'=>'scale')); ?>
+      </div>
     </div>
 <?php
 if ( $monitor->Status() != 'Connected' and $monitor->Type() != 'WebSite' ) {
@@ -92,21 +94,15 @@ if ( $streamMode == 'jpeg' ) {
 
 <?php if ( $monitor->Type() != 'WebSite' ) { ?>
       <div id="monitorStatus">
-<?php if ( canEdit('Monitors') ) { ?>
-        <div id="enableDisableAlarms">
-          <button type="button" id="enableAlarmsLink" data-on-click="cmdEnableAlarms" class="hidden">
-          <?php echo translate('EnableAlarms') ?></button>
-          <button type="button" id="disableAlarmsLink" data-on-click="cmdDisableAlarms" class="hidden">
-          <?php echo translate('DisableAlarms') ?></button>
+        <div id="monitorState">
+          <?php echo translate('State') ?>:
+          <span id="stateValue"></span> -
+          <span title="<?php echo translate('Viewing FPS')?>"><span id="fpsValue"></span> fps</span>
+          <span title="<?php echo translate('Capturing FPS')?>"><span id="capturefpsValue"></span> fps</span>
+          <?php if ( $monitor->Function() == 'Modect' or $monitor->Function() == 'Mocord' ) { ?>
+          <span title="<?php echo translate('Analysis FPS')?>"><span id="analysisfpsValue"></span> fps</span>
+          <?php } ?>
         </div>
-        <div id="forceCancelAlarm">
-            <button type="button" id="forceAlarmLink" data-on-click="cmdForceAlarm"><?php echo translate('ForceAlarm') ?></button>
-            <button type="button" id="cancelAlarmLink" data-on-click="cmdCancelForcedAlarm" class="hidden"><?php echo translate('CancelForcedAlarm') ?></button>
-        </div>
-<?php
-}
-?>
-        <div id="monitorState"><?php echo translate('State') ?>:&nbsp;<span id="stateValue"></span>&nbsp;-&nbsp;<span id="fpsValue"></span>&nbsp;fps</div>
       </div>
       <div id="dvrControls">
 <?php
@@ -144,8 +140,7 @@ if ( $streamMode == 'jpeg' ) {
   }
 ?>
         <button type="button" id="zoomOutBtn" title="<?php echo translate('ZoomOut') ?>" class="avail" data-on-click="streamCmdZoomOut">
-<i class="material-icons md-18">zoom_out</i>
-
+        <i class="material-icons md-18">zoom_out</i>
         </button>
 <?php
 } // end if streamMode==jpeg
@@ -171,21 +166,43 @@ if ( $showPtzControls ) {
 }
 if ( canView('Events') && ($monitor->Type() != 'WebSite') ) {
 ?>
-      <div id="events">
-        <table id="eventList">
+      <!-- Table styling handled by bootstrap-tables -->
+      <div id="events" class="row justify-content-center table-responsive-sm">
+        <table 
+          id="eventList"
+          data-locale="<?php echo i18n() ?>"
+          data-side-pagination="server"
+          data-ajax="ajaxRequest"
+          data-cookie="true"
+          data-cookie-id-table="zmEventListTable"
+          data-cookie-expire="2y"
+          data-show-columns="true"
+          data-show-export="true"
+          data-uncheckAll="true"
+          data-buttons-class="btn btn-normal"
+          data-show-refresh="true"
+          class="table-sm table-borderless"
+        >
           <thead>
+            <!-- Row styling is handled by bootstrap-tables -->
             <tr>
-              <th class="colId"><?php echo translate('Id') ?></th>
-              <th class="colName"><?php echo translate('Name') ?></th>
-              <th class="colTime"><?php echo translate('Time') ?></th>
-              <th class="colSecs"><?php echo translate('Secs') ?></th>
-              <th class="colFrames"><?php echo translate('Frames') ?></th>
-              <th class="colScore"><?php echo translate('Score') ?></th>
-              <th class="colDelete">&nbsp;</th>
+              <th data-sortable="false" data-field="Delete"><?php echo translate('Delete') ?></th>
+              <th data-sortable="false" data-field="Id"><?php echo translate('Id') ?></th>
+              <th data-sortable="false" data-field="Name"><?php echo translate('Name') ?></th>
+              <th data-sortable="false" data-field="StartDateTime"><?php echo translate('AttrStartTime') ?></th>
+              <th data-sortable="false" data-field="Length"><?php echo translate('Duration') ?></th>
+              <th data-sortable="false" data-field="Frames"><?php echo translate('Frames') ?></th>
+              <th data-sortable="false" data-field="AlarmFrames"><?php echo translate('AlarmBrFrames') ?></th>
+              <th data-sortable="false" data-field="AvgScore"><?php echo translate('AvgBrScore') ?></th>
+              <th data-sortable="false" data-field="MaxScore"><?php echo translate('MaxBrScore') ?></th>
+              <th data-sortable="false" data-field="Thumbnail"><?php echo translate('Thumbnail') ?></th>
             </tr>
           </thead>
+
           <tbody>
+          <!-- Row data populated via Ajax -->
           </tbody>
+
         </table>
       </div>
 <?php
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index b4df1fce1..7a4761a50 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -118,12 +118,20 @@ $StreamHTML = getStreamHTML($monitor, array('mode'=>'single'));
 xhtmlHeaders(__FILE__, translate('Zone'));
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Monitor').' '.$monitor->Name().' - '.translate('Zone').' '.$newZone['Name'] ?></h2>
+    <div class="w-100">
+      <div class="float-left pl-3 pt-1">
+        <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      </div>
+      <div class="w-100 pt-2">
+        <h2><?php echo translate('Monitor').' '.$monitor->Name().' - '.translate('Zone').' '.$newZone['Name'] ?></h2>
+      </div>
     </div>
     <div id="content">
       <form name="zoneForm" id="zoneForm" method="post" action="?">
+        <input type="hidden" name="REFERER" value="<?php echo $_SERVER['HTTP_REFERER'] ?>"/> 
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="action" value="zone"/>
         <input type="hidden" name="mid" value="<?php echo $mid ?>"/>
@@ -198,7 +206,7 @@ if ( count($other_zones) ) {
                         array('data-on-change'=>'applyZoneUnits', 'id'=>'newZone[Units]')
                         );
                         # Used later for number inputs
-                        $step = $newZone['Units'] == 'Percent' ? ' step="0.01" max="100"' : '';
+                        $step = $newZone['Units'] == 'Percent' ? ' step="any" max="100"' : '';
 ?>
                   </td>
 								</tr>
diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index 138672a42..f457ad2fc 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -37,10 +37,16 @@ $monitors = ZM\ZM_Object::Objects_Indexed_By_Id('ZM\Monitor', array('Id'=>$mids)
 xhtmlHeaders(__FILE__, translate('Zones'));
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <div id="headerButtons"><a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a></div>
-      <h2><?php echo translate('Zones') ?></h2>
+    <div class="w-100 py-1">
+      <div class="float-left pl-3">
+        <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      </div>
+      <div class="w-100 pt-2">
+        <h2><?php echo translate('Zones') ?></h2>
+      </div>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="get" action="?">
@@ -76,18 +82,19 @@ xhtmlHeaders(__FILE__, translate('Zones'));
 <?php
       foreach( array_reverse($zones) as $zone ) {
 ?>
-            <polygon points="<?php echo $zone['AreaCoords'] ?>" class="popup-link <?php echo $zone['Type']?>" data-on-click-true="streamCmdQuit"
-                   data-url="?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>"
-                   data-window-name="zmZone<?php echo $zone['Id'] ?>"
-                   data-window-tag="zone"
-                   data-window-width="<?php echo $monitor->ViewWidth() ?>"
-                   data-window-height="<?php echo $monitor->ViewHeight() ?>"
-									 />
+            <polygon points="<?php echo $zone['AreaCoords'] ?>"
+                     class="zmlink <?php echo $zone['Type']?>"
+                     data-on-click-true="streamCmdQuit"
+                     data-url="?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>"
+            />
 <?php
       } // end foreach zone
 ?>
           Sorry, your browser does not support inline SVG
         </svg>
+        <div id="monitorState">
+          <?php echo translate('State') ?>:&nbsp;<span id="stateValue<?php echo $monitor->Id() ?>"></span>&nbsp;-&nbsp;<span id="fpsValue<?php echo $monitor->Id() ?>"></span>&nbsp;fps
+        </div>
         </div>
 				<div class="zones">
 					<table id="zonesTable" class="major">
@@ -104,7 +111,7 @@ xhtmlHeaders(__FILE__, translate('Zones'));
 	foreach( $zones as $zone ) {
 	?>
 							<tr>
-								<td class="colName"><?php echo makePopupLink('?view=zone&mid='.$mid.'&zid='.$zone['Id'], 'zmZone', array('zone', $monitor->ViewWidth(), $monitor->ViewHeight()), validHtmlStr($zone['Name']), true, 'data-on-click-true="streamCmdQuit"'); ?></td>
+								<td class="colName"><?php echo makeLink('?view=zone&mid='.$mid.'&zid='.$zone['Id'], validHtmlStr($zone['Name']), true, 'data-on-click-true="streamCmdQuit"'); ?></td>
 								<td class="colType"><?php echo validHtmlStr($zone['Type']) ?></td>
 								<td class="colUnits"><?php echo $zone['Area'] ?>&nbsp;/&nbsp;<?php echo sprintf('%.2f', ($zone['Area']*100)/($monitor->ViewWidth()*$monitor->ViewHeight()) ) ?></td>
 								<td class="colMark"><input type="checkbox" name="markZids[]" value="<?php echo $zone['Id'] ?>" data-on-click-this="configureDeleteButton"<?php if ( !canEdit('Monitors') ) { ?> disabled="disabled"<?php } ?>/></td>
@@ -114,10 +121,10 @@ xhtmlHeaders(__FILE__, translate('Zones'));
 	?>
 						</tbody>
 					</table>
-					<div id="contentButtons">
-						<?php echo makePopupButton('?view=zone&mid='.$mid.'&zid=0', 'zmZone', array('zone', $monitor->ViewWidth(), $monitor->ViewHeight()), translate('AddNewZone'), canEdit('Monitors')); ?>
-            <button type="submit" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
-					</div>
+                                     <div id="contentButtons">
+                                       <?php echo makeButton('?view=zone&mid='.$mid.'&zid=0', 'AddNewZone', canEdit('Monitors')); ?>
+                                       <button type="submit" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
+                                     </div>
 				</div><!--zones-->
 <br class="clear"/>
       </div><!--Monitor-->
diff --git a/web/tools/mootools/CMakeLists.txt b/web/tools/mootools/CMakeLists.txt
deleted file mode 100644
index e1e957913..000000000
--- a/web/tools/mootools/CMakeLists.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-# CMakeLists.txt for the Mootools
-# The only purpose of this file is to create the symlinks required.
-
-# Find the latest mootools-core version and create a symlink mootools-core.js to it
-file(GLOB mtcorelist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "mootools-core-*.js")
-if(NOT mtcorelist)
-	message(WARNING " Unable to find mootools-core files")
-else(NOT mtcorelist)
-	list(SORT mtcorelist)
-	list(LENGTH mtcorelist mtcorelistcount)
-	math(EXPR mtcoreindex "${mtcorelistcount} - 1")
-	list(GET mtcorelist ${mtcoreindex} mtcorelatest)
-	message(STATUS "Using mootools core file: ${mtcorelatest}")
-	execute_process(COMMAND ln -f -s "${mtcorelatest}" "${CMAKE_CURRENT_BINARY_DIR}/mootools-core.js" RESULT_VARIABLE mtcoreresult)
-	if(mtcoreresult)
-		message(WARNING " Failed creating the required symlinks for mootools-core. Exit code: ${mtcoreresult}")
-	endif(mtcoreresult)
-endif(NOT mtcorelist)
-
-# Find the latest mootools-more version and create a symlink mootools-more.js to it
-file(GLOB mtmorelist RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" "mootools-more-*.js")
-if(NOT mtmorelist)
-	message(WARNING " Unable to find mootools-more files")
-else(NOT mtmorelist)
-	list(SORT mtmorelist)
-	list(LENGTH mtmorelist mtmorelistcount)
-	math(EXPR mtmoreindex "${mtmorelistcount} - 1")
-	list(GET mtmorelist ${mtmoreindex} mtmorelatest)
-	message(STATUS "Using mootools more file: ${mtmorelatest}")
-	execute_process(COMMAND ln -f -s "${mtmorelatest}" "${CMAKE_CURRENT_BINARY_DIR}/mootools-more.js" RESULT_VARIABLE mtmoreresult)
-	if(mtmoreresult)
-		message(WARNING " Failed creating the required symlinks for mootools-more. Exit code: ${mtmoreresult}")
-	endif(mtmoreresult)
-endif(NOT mtmorelist)
-
-# If this is an out-of-source build, copy the mootools files we picked to the binary directory
-# This is required to fix a cmake bug regarding installing symlinks pointing to nonexistent files
-if(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${mtcorelatest}" "${CMAKE_CURRENT_BINARY_DIR}/${mtcorelatest}")
-	execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${CMAKE_CURRENT_SOURCE_DIR}/${mtmorelatest}" "${CMAKE_CURRENT_BINARY_DIR}/${mtmorelatest}")
-endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
-
diff --git a/web/tools/mootools/mootools-core-1.6.0-compat.js b/web/tools/mootools/mootools-core-1.6.0-compat.js
deleted file mode 100644
index 0de0d8e52..000000000
--- a/web/tools/mootools/mootools-core-1.6.0-compat.js
+++ /dev/null
@@ -1,6915 +0,0 @@
-/*
----
-
-name: Core
-
-description: The heart of MooTools.
-
-license: MIT-style license.
-
-copyright: Copyright (c) 2006-2015 [Valerio Proietti](http://mad4milk.net/).
-
-authors: The MooTools production team (http://mootools.net/developers/)
-
-inspiration:
-  - Class implementation inspired by [Base.js](http://dean.edwards.name/weblog/2006/03/base/) Copyright (c) 2006 Dean Edwards, [GNU Lesser General Public License](http://opensource.org/licenses/lgpl-license.php)
-  - Some functionality inspired by [Prototype.js](http://prototypejs.org) Copyright (c) 2005-2007 Sam Stephenson, [MIT License](http://opensource.org/licenses/mit-license.php)
-
-provides: [Core, MooTools, Type, typeOf, instanceOf, Native]
-
-...
-*/
-/*! MooTools: the javascript framework. license: MIT-style license. copyright: Copyright (c) 2006-2015 [Valerio Proietti](http://mad4milk.net/).*/
-(function(){
-
-this.MooTools = {
-	version: '1.6.0',
-	build: '529422872adfff401b901b8b6c7ca5114ee95e2b'
-};
-
-// typeOf, instanceOf
-
-var typeOf = this.typeOf = function(item){
-	if (item == null) return 'null';
-	if (item.$family != null) return item.$family();
-
-	if (item.nodeName){
-		if (item.nodeType == 1) return 'element';
-		if (item.nodeType == 3) return (/\S/).test(item.nodeValue) ? 'textnode' : 'whitespace';
-	} else if (typeof item.length == 'number'){
-		if ('callee' in item) return 'arguments';
-		if ('item' in item) return 'collection';
-	}
-
-	return typeof item;
-};
-
-var instanceOf = this.instanceOf = function(item, object){
-	if (item == null) return false;
-	var constructor = item.$constructor || item.constructor;
-	while (constructor){
-		if (constructor === object) return true;
-		constructor = constructor.parent;
-	}
-	/*<ltIE8>*/
-	if (!item.hasOwnProperty) return false;
-	/*</ltIE8>*/
-	return item instanceof object;
-};
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-/*<ltIE8>*/
-var enumerables = true;
-for (var i in {toString: 1}) enumerables = null;
-if (enumerables) enumerables = ['hasOwnProperty', 'valueOf', 'isPrototypeOf', 'propertyIsEnumerable', 'toLocaleString', 'toString', 'constructor'];
-function forEachObjectEnumberableKey(object, fn, bind){
-	if (enumerables) for (var i = enumerables.length; i--;){
-		var k = enumerables[i];
-		// signature has key-value, so overloadSetter can directly pass the
-		// method function, without swapping arguments.
-		if (hasOwnProperty.call(object, k)) fn.call(bind, k, object[k]);
-	}
-}
-/*</ltIE8>*/
-
-// Function overloading
-
-var Function = this.Function;
-
-Function.prototype.overloadSetter = function(usePlural){
-	var self = this;
-	return function(a, b){
-		if (a == null) return this;
-		if (usePlural || typeof a != 'string'){
-			for (var k in a) self.call(this, k, a[k]);
-			/*<ltIE8>*/
-			forEachObjectEnumberableKey(a, self, this);
-			/*</ltIE8>*/
-		} else {
-			self.call(this, a, b);
-		}
-		return this;
-	};
-};
-
-Function.prototype.overloadGetter = function(usePlural){
-	var self = this;
-	return function(a){
-		var args, result;
-		if (typeof a != 'string') args = a;
-		else if (arguments.length > 1) args = arguments;
-		else if (usePlural) args = [a];
-		if (args){
-			result = {};
-			for (var i = 0; i < args.length; i++) result[args[i]] = self.call(this, args[i]);
-		} else {
-			result = self.call(this, a);
-		}
-		return result;
-	};
-};
-
-Function.prototype.extend = function(key, value){
-	this[key] = value;
-}.overloadSetter();
-
-Function.prototype.implement = function(key, value){
-	this.prototype[key] = value;
-}.overloadSetter();
-
-// From
-
-var slice = Array.prototype.slice;
-
-Array.convert = function(item){
-	if (item == null) return [];
-	return (Type.isEnumerable(item) && typeof item != 'string') ? (typeOf(item) == 'array') ? item : slice.call(item) : [item];
-};
-
-Function.convert = function(item){
-	return (typeOf(item) == 'function') ? item : function(){
-		return item;
-	};
-};
-
-
-Number.convert = function(item){
-	var number = parseFloat(item);
-	return isFinite(number) ? number : null;
-};
-
-String.convert = function(item){
-	return item + '';
-};
-
-/*<1.5compat>*/
-Array.from = Array.convert;
-/*</1.5compat>*/
-
-Function.from = Function.convert;
-Number.from = Number.convert;
-String.from = String.convert;
-
-// hide, protect
-
-Function.implement({
-
-	hide: function(){
-		this.$hidden = true;
-		return this;
-	},
-
-	protect: function(){
-		this.$protected = true;
-		return this;
-	}
-
-});
-
-// Type
-
-var Type = this.Type = function(name, object){
-	if (name){
-		var lower = name.toLowerCase();
-		var typeCheck = function(item){
-			return (typeOf(item) == lower);
-		};
-
-		Type['is' + name] = typeCheck;
-		if (object != null){
-			object.prototype.$family = (function(){
-				return lower;
-			}).hide();
-			//<1.2compat>
-			object.type = typeCheck;
-			//</1.2compat>
-		}
-	}
-
-	if (object == null) return null;
-
-	object.extend(this);
-	object.$constructor = Type;
-	object.prototype.$constructor = object;
-
-	return object;
-};
-
-var toString = Object.prototype.toString;
-
-Type.isEnumerable = function(item){
-	return (item != null && typeof item.length == 'number' && toString.call(item) != '[object Function]' );
-};
-
-var hooks = {};
-
-var hooksOf = function(object){
-	var type = typeOf(object.prototype);
-	return hooks[type] || (hooks[type] = []);
-};
-
-var implement = function(name, method){
-	if (method && method.$hidden) return;
-
-	var hooks = hooksOf(this);
-
-	for (var i = 0; i < hooks.length; i++){
-		var hook = hooks[i];
-		if (typeOf(hook) == 'type') implement.call(hook, name, method);
-		else hook.call(this, name, method);
-	}
-
-	var previous = this.prototype[name];
-	if (previous == null || !previous.$protected) this.prototype[name] = method;
-
-	if (this[name] == null && typeOf(method) == 'function') extend.call(this, name, function(item){
-		return method.apply(item, slice.call(arguments, 1));
-	});
-};
-
-var extend = function(name, method){
-	if (method && method.$hidden) return;
-	var previous = this[name];
-	if (previous == null || !previous.$protected) this[name] = method;
-};
-
-Type.implement({
-
-	implement: implement.overloadSetter(),
-
-	extend: extend.overloadSetter(),
-
-	alias: function(name, existing){
-		implement.call(this, name, this.prototype[existing]);
-	}.overloadSetter(),
-
-	mirror: function(hook){
-		hooksOf(this).push(hook);
-		return this;
-	}
-
-});
-
-new Type('Type', Type);
-
-// Default Types
-
-var force = function(name, object, methods){
-	var isType = (object != Object),
-		prototype = object.prototype;
-
-	if (isType) object = new Type(name, object);
-
-	for (var i = 0, l = methods.length; i < l; i++){
-		var key = methods[i],
-			generic = object[key],
-			proto = prototype[key];
-
-		if (generic) generic.protect();
-		if (isType && proto) object.implement(key, proto.protect());
-	}
-
-	if (isType){
-		var methodsEnumerable = prototype.propertyIsEnumerable(methods[0]);
-		object.forEachMethod = function(fn){
-			if (!methodsEnumerable) for (var i = 0, l = methods.length; i < l; i++){
-				fn.call(prototype, prototype[methods[i]], methods[i]);
-			}
-			for (var key in prototype) fn.call(prototype, prototype[key], key);
-		};
-	}
-
-	return force;
-};
-
-force('String', String, [
-	'charAt', 'charCodeAt', 'concat', 'contains', 'indexOf', 'lastIndexOf', 'match', 'quote', 'replace', 'search',
-	'slice', 'split', 'substr', 'substring', 'trim', 'toLowerCase', 'toUpperCase'
-])('Array', Array, [
-	'pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift', 'concat', 'join', 'slice',
-	'indexOf', 'lastIndexOf', 'filter', 'forEach', 'every', 'map', 'some', 'reduce', 'reduceRight', 'contains'
-])('Number', Number, [
-	'toExponential', 'toFixed', 'toLocaleString', 'toPrecision'
-])('Function', Function, [
-	'apply', 'call', 'bind'
-])('RegExp', RegExp, [
-	'exec', 'test'
-])('Object', Object, [
-	'create', 'defineProperty', 'defineProperties', 'keys',
-	'getPrototypeOf', 'getOwnPropertyDescriptor', 'getOwnPropertyNames',
-	'preventExtensions', 'isExtensible', 'seal', 'isSealed', 'freeze', 'isFrozen'
-])('Date', Date, ['now']);
-
-Object.extend = extend.overloadSetter();
-
-Date.extend('now', function(){
-	return +(new Date);
-});
-
-new Type('Boolean', Boolean);
-
-// fixes NaN returning as Number
-
-Number.prototype.$family = function(){
-	return isFinite(this) ? 'number' : 'null';
-}.hide();
-
-// Number.random
-
-Number.extend('random', function(min, max){
-	return Math.floor(Math.random() * (max - min + 1) + min);
-});
-
-// forEach, each, keys
-
-Array.implement({
-
-	/*<!ES5>*/
-	forEach: function(fn, bind){
-		for (var i = 0, l = this.length; i < l; i++){
-			if (i in this) fn.call(bind, this[i], i, this);
-		}
-	},
-	/*</!ES5>*/
-
-	each: function(fn, bind){
-		Array.forEach(this, fn, bind);
-		return this;
-	}
-
-});
-
-Object.extend({
-
-	keys: function(object){
-		var keys = [];
-		for (var k in object){
-			if (hasOwnProperty.call(object, k)) keys.push(k);
-		}
-		/*<ltIE8>*/
-		forEachObjectEnumberableKey(object, function(k){
-			keys.push(k);
-		});
-		/*</ltIE8>*/
-		return keys;
-	},
-
-	forEach: function(object, fn, bind){
-		Object.keys(object).forEach(function(key){
-			fn.call(bind, object[key], key, object);
-		});
-	}
-
-});
-
-Object.each = Object.forEach;
-
-
-// Array & Object cloning, Object merging and appending
-
-var cloneOf = function(item){
-	switch (typeOf(item)){
-		case 'array': return item.clone();
-		case 'object': return Object.clone(item);
-		default: return item;
-	}
-};
-
-Array.implement('clone', function(){
-	var i = this.length, clone = new Array(i);
-	while (i--) clone[i] = cloneOf(this[i]);
-	return clone;
-});
-
-var mergeOne = function(source, key, current){
-	switch (typeOf(current)){
-		case 'object':
-			if (typeOf(source[key]) == 'object') Object.merge(source[key], current);
-			else source[key] = Object.clone(current);
-			break;
-		case 'array': source[key] = current.clone(); break;
-		default: source[key] = current;
-	}
-	return source;
-};
-
-Object.extend({
-
-	merge: function(source, k, v){
-		if (typeOf(k) == 'string') return mergeOne(source, k, v);
-		for (var i = 1, l = arguments.length; i < l; i++){
-			var object = arguments[i];
-			for (var key in object) mergeOne(source, key, object[key]);
-		}
-		return source;
-	},
-
-	clone: function(object){
-		var clone = {};
-		for (var key in object) clone[key] = cloneOf(object[key]);
-		return clone;
-	},
-
-	append: function(original){
-		for (var i = 1, l = arguments.length; i < l; i++){
-			var extended = arguments[i] || {};
-			for (var key in extended) original[key] = extended[key];
-		}
-		return original;
-	}
-
-});
-
-// Object-less types
-
-['Object', 'WhiteSpace', 'TextNode', 'Collection', 'Arguments'].each(function(name){
-	new Type(name);
-});
-
-// Unique ID
-
-var UID = Date.now();
-
-String.extend('uniqueID', function(){
-	return (UID++).toString(36);
-});
-
-//<1.2compat>
-
-var Hash = this.Hash = new Type('Hash', function(object){
-	if (typeOf(object) == 'hash') object = Object.clone(object.getClean());
-	for (var key in object) this[key] = object[key];
-	return this;
-});
-
-Hash.implement({
-
-	forEach: function(fn, bind){
-		Object.forEach(this, fn, bind);
-	},
-
-	getClean: function(){
-		var clean = {};
-		for (var key in this){
-			if (this.hasOwnProperty(key)) clean[key] = this[key];
-		}
-		return clean;
-	},
-
-	getLength: function(){
-		var length = 0;
-		for (var key in this){
-			if (this.hasOwnProperty(key)) length++;
-		}
-		return length;
-	}
-
-});
-
-Hash.alias('each', 'forEach');
-
-Object.type = Type.isObject;
-
-var Native = this.Native = function(properties){
-	return new Type(properties.name, properties.initialize);
-};
-
-Native.type = Type.type;
-
-Native.implement = function(objects, methods){
-	for (var i = 0; i < objects.length; i++) objects[i].implement(methods);
-	return Native;
-};
-
-var arrayType = Array.type;
-Array.type = function(item){
-	return instanceOf(item, Array) || arrayType(item);
-};
-
-this.$A = function(item){
-	return Array.convert(item).slice();
-};
-
-this.$arguments = function(i){
-	return function(){
-		return arguments[i];
-	};
-};
-
-this.$chk = function(obj){
-	return !!(obj || obj === 0);
-};
-
-this.$clear = function(timer){
-	clearTimeout(timer);
-	clearInterval(timer);
-	return null;
-};
-
-this.$defined = function(obj){
-	return (obj != null);
-};
-
-this.$each = function(iterable, fn, bind){
-	var type = typeOf(iterable);
-	((type == 'arguments' || type == 'collection' || type == 'array' || type == 'elements') ? Array : Object).each(iterable, fn, bind);
-};
-
-this.$empty = function(){};
-
-this.$extend = function(original, extended){
-	return Object.append(original, extended);
-};
-
-this.$H = function(object){
-	return new Hash(object);
-};
-
-this.$merge = function(){
-	var args = Array.slice(arguments);
-	args.unshift({});
-	return Object.merge.apply(null, args);
-};
-
-this.$lambda = Function.convert;
-this.$mixin = Object.merge;
-this.$random = Number.random;
-this.$splat = Array.convert;
-this.$time = Date.now;
-
-this.$type = function(object){
-	var type = typeOf(object);
-	if (type == 'elements') return 'array';
-	return (type == 'null') ? false : type;
-};
-
-this.$unlink = function(object){
-	switch (typeOf(object)){
-		case 'object': return Object.clone(object);
-		case 'array': return Array.clone(object);
-		case 'hash': return new Hash(object);
-		default: return object;
-	}
-};
-
-//</1.2compat>
-
-})();
-
-/*
----
-
-name: Array
-
-description: Contains Array Prototypes like each, contains, and erase.
-
-license: MIT-style license.
-
-requires: [Type]
-
-provides: Array
-
-...
-*/
-
-Array.implement({
-
-	/*<!ES5>*/
-	every: function(fn, bind){
-		for (var i = 0, l = this.length >>> 0; i < l; i++){
-			if ((i in this) && !fn.call(bind, this[i], i, this)) return false;
-		}
-		return true;
-	},
-
-	filter: function(fn, bind){
-		var results = [];
-		for (var value, i = 0, l = this.length >>> 0; i < l; i++) if (i in this){
-			value = this[i];
-			if (fn.call(bind, value, i, this)) results.push(value);
-		}
-		return results;
-	},
-
-	indexOf: function(item, from){
-		var length = this.length >>> 0;
-		for (var i = (from < 0) ? Math.max(0, length + from) : from || 0; i < length; i++){
-			if (this[i] === item) return i;
-		}
-		return -1;
-	},
-
-	map: function(fn, bind){
-		var length = this.length >>> 0, results = Array(length);
-		for (var i = 0; i < length; i++){
-			if (i in this) results[i] = fn.call(bind, this[i], i, this);
-		}
-		return results;
-	},
-
-	some: function(fn, bind){
-		for (var i = 0, l = this.length >>> 0; i < l; i++){
-			if ((i in this) && fn.call(bind, this[i], i, this)) return true;
-		}
-		return false;
-	},
-	/*</!ES5>*/
-
-	clean: function(){
-		return this.filter(function(item){
-			return item != null;
-		});
-	},
-
-	invoke: function(methodName){
-		var args = Array.slice(arguments, 1);
-		return this.map(function(item){
-			return item[methodName].apply(item, args);
-		});
-	},
-
-	associate: function(keys){
-		var obj = {}, length = Math.min(this.length, keys.length);
-		for (var i = 0; i < length; i++) obj[keys[i]] = this[i];
-		return obj;
-	},
-
-	link: function(object){
-		var result = {};
-		for (var i = 0, l = this.length; i < l; i++){
-			for (var key in object){
-				if (object[key](this[i])){
-					result[key] = this[i];
-					delete object[key];
-					break;
-				}
-			}
-		}
-		return result;
-	},
-
-	contains: function(item, from){
-		return this.indexOf(item, from) != -1;
-	},
-
-	append: function(array){
-		this.push.apply(this, array);
-		return this;
-	},
-
-	getLast: function(){
-		return (this.length) ? this[this.length - 1] : null;
-	},
-
-	getRandom: function(){
-		return (this.length) ? this[Number.random(0, this.length - 1)] : null;
-	},
-
-	include: function(item){
-		if (!this.contains(item)) this.push(item);
-		return this;
-	},
-
-	combine: function(array){
-		for (var i = 0, l = array.length; i < l; i++) this.include(array[i]);
-		return this;
-	},
-
-	erase: function(item){
-		for (var i = this.length; i--;){
-			if (this[i] === item) this.splice(i, 1);
-		}
-		return this;
-	},
-
-	empty: function(){
-		this.length = 0;
-		return this;
-	},
-
-	flatten: function(){
-		var array = [];
-		for (var i = 0, l = this.length; i < l; i++){
-			var type = typeOf(this[i]);
-			if (type == 'null') continue;
-			array = array.concat((type == 'array' || type == 'collection' || type == 'arguments' || instanceOf(this[i], Array)) ? Array.flatten(this[i]) : this[i]);
-		}
-		return array;
-	},
-
-	pick: function(){
-		for (var i = 0, l = this.length; i < l; i++){
-			if (this[i] != null) return this[i];
-		}
-		return null;
-	},
-
-	hexToRgb: function(array){
-		if (this.length != 3) return null;
-		var rgb = this.map(function(value){
-			if (value.length == 1) value += value;
-			return parseInt(value, 16);
-		});
-		return (array) ? rgb : 'rgb(' + rgb + ')';
-	},
-
-	rgbToHex: function(array){
-		if (this.length < 3) return null;
-		if (this.length == 4 && this[3] == 0 && !array) return 'transparent';
-		var hex = [];
-		for (var i = 0; i < 3; i++){
-			var bit = (this[i] - 0).toString(16);
-			hex.push((bit.length == 1) ? '0' + bit : bit);
-		}
-		return (array) ? hex : '#' + hex.join('');
-	}
-
-});
-
-//<1.2compat>
-
-Array.alias('extend', 'append');
-
-var $pick = this.$pick = function(){
-	return Array.convert(arguments).pick();
-};
-
-//</1.2compat>
-
-/*
----
-
-name: String
-
-description: Contains String Prototypes like camelCase, capitalize, test, and toInt.
-
-license: MIT-style license.
-
-requires: [Type, Array]
-
-provides: String
-
-...
-*/
-
-String.implement({
-
-	//<!ES6>
-	contains: function(string, index){
-		return (index ? String(this).slice(index) : String(this)).indexOf(string) > -1;
-	},
-	//</!ES6>
-
-	test: function(regex, params){
-		return ((typeOf(regex) == 'regexp') ? regex : new RegExp('' + regex, params)).test(this);
-	},
-
-	trim: function(){
-		return String(this).replace(/^\s+|\s+$/g, '');
-	},
-
-	clean: function(){
-		return String(this).replace(/\s+/g, ' ').trim();
-	},
-
-	camelCase: function(){
-		return String(this).replace(/-\D/g, function(match){
-			return match.charAt(1).toUpperCase();
-		});
-	},
-
-	hyphenate: function(){
-		return String(this).replace(/[A-Z]/g, function(match){
-			return ('-' + match.charAt(0).toLowerCase());
-		});
-	},
-
-	capitalize: function(){
-		return String(this).replace(/\b[a-z]/g, function(match){
-			return match.toUpperCase();
-		});
-	},
-
-	escapeRegExp: function(){
-		return String(this).replace(/([-.*+?^${}()|[\]\/\\])/g, '\\$1');
-	},
-
-	toInt: function(base){
-		return parseInt(this, base || 10);
-	},
-
-	toFloat: function(){
-		return parseFloat(this);
-	},
-
-	hexToRgb: function(array){
-		var hex = String(this).match(/^#?(\w{1,2})(\w{1,2})(\w{1,2})$/);
-		return (hex) ? hex.slice(1).hexToRgb(array) : null;
-	},
-
-	rgbToHex: function(array){
-		var rgb = String(this).match(/\d{1,3}/g);
-		return (rgb) ? rgb.rgbToHex(array) : null;
-	},
-
-	substitute: function(object, regexp){
-		return String(this).replace(regexp || (/\\?\{([^{}]+)\}/g), function(match, name){
-			if (match.charAt(0) == '\\') return match.slice(1);
-			return (object[name] != null) ? object[name] : '';
-		});
-	}
-
-});
-
-//<1.4compat>
-String.prototype.contains = function(string, separator){
-	return (separator) ? (separator + this + separator).indexOf(separator + string + separator) > -1 : String(this).indexOf(string) > -1;
-};
-//</1.4compat>
-
-/*
----
-
-name: Number
-
-description: Contains Number Prototypes like limit, round, times, and ceil.
-
-license: MIT-style license.
-
-requires: Type
-
-provides: Number
-
-...
-*/
-
-Number.implement({
-
-	limit: function(min, max){
-		return Math.min(max, Math.max(min, this));
-	},
-
-	round: function(precision){
-		precision = Math.pow(10, precision || 0).toFixed(precision < 0 ? -precision : 0);
-		return Math.round(this * precision) / precision;
-	},
-
-	times: function(fn, bind){
-		for (var i = 0; i < this; i++) fn.call(bind, i, this);
-	},
-
-	toFloat: function(){
-		return parseFloat(this);
-	},
-
-	toInt: function(base){
-		return parseInt(this, base || 10);
-	}
-
-});
-
-Number.alias('each', 'times');
-
-(function(math){
-
-var methods = {};
-
-math.each(function(name){
-	if (!Number[name]) methods[name] = function(){
-		return Math[name].apply(null, [this].concat(Array.convert(arguments)));
-	};
-});
-
-Number.implement(methods);
-
-})(['abs', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'exp', 'floor', 'log', 'max', 'min', 'pow', 'sin', 'sqrt', 'tan']);
-
-/*
----
-
-name: Function
-
-description: Contains Function Prototypes like create, bind, pass, and delay.
-
-license: MIT-style license.
-
-requires: Type
-
-provides: Function
-
-...
-*/
-
-Function.extend({
-
-	attempt: function(){
-		for (var i = 0, l = arguments.length; i < l; i++){
-			try {
-				return arguments[i]();
-			} catch (e){}
-		}
-		return null;
-	}
-
-});
-
-Function.implement({
-
-	attempt: function(args, bind){
-		try {
-			return this.apply(bind, Array.convert(args));
-		} catch (e){}
-
-		return null;
-	},
-
-	/*<!ES5-bind>*/
-	bind: function(that){
-		var self = this,
-			args = arguments.length > 1 ? Array.slice(arguments, 1) : null,
-			F = function(){};
-
-		var bound = function(){
-			var context = that, length = arguments.length;
-			if (this instanceof bound){
-				F.prototype = self.prototype;
-				context = new F;
-			}
-			var result = (!args && !length)
-				? self.call(context)
-				: self.apply(context, args && length ? args.concat(Array.slice(arguments)) : args || arguments);
-			return context == that ? result : context;
-		};
-		return bound;
-	},
-	/*</!ES5-bind>*/
-
-	pass: function(args, bind){
-		var self = this;
-		if (args != null) args = Array.convert(args);
-		return function(){
-			return self.apply(bind, args || arguments);
-		};
-	},
-
-	delay: function(delay, bind, args){
-		return setTimeout(this.pass((args == null ? [] : args), bind), delay);
-	},
-
-	periodical: function(periodical, bind, args){
-		return setInterval(this.pass((args == null ? [] : args), bind), periodical);
-	}
-
-});
-
-//<1.2compat>
-
-delete Function.prototype.bind;
-
-Function.implement({
-
-	create: function(options){
-		var self = this;
-		options = options || {};
-		return function(event){
-			var args = options.arguments;
-			args = (args != null) ? Array.convert(args) : Array.slice(arguments, (options.event) ? 1 : 0);
-			if (options.event) args.unshift(event || window.event);
-			var returns = function(){
-				return self.apply(options.bind || null, args);
-			};
-			if (options.delay) return setTimeout(returns, options.delay);
-			if (options.periodical) return setInterval(returns, options.periodical);
-			if (options.attempt) return Function.attempt(returns);
-			return returns();
-		};
-	},
-
-	bind: function(bind, args){
-		var self = this;
-		if (args != null) args = Array.convert(args);
-		return function(){
-			return self.apply(bind, args || arguments);
-		};
-	},
-
-	bindWithEvent: function(bind, args){
-		var self = this;
-		if (args != null) args = Array.convert(args);
-		return function(event){
-			return self.apply(bind, (args == null) ? arguments : [event].concat(args));
-		};
-	},
-
-	run: function(args, bind){
-		return this.apply(bind, Array.convert(args));
-	}
-
-});
-
-if (Object.create == Function.prototype.create) Object.create = null;
-
-var $try = Function.attempt;
-
-//</1.2compat>
-
-/*
----
-
-name: Object
-
-description: Object generic methods
-
-license: MIT-style license.
-
-requires: Type
-
-provides: [Object, Hash]
-
-...
-*/
-
-(function(){
-
-Object.extend({
-
-	subset: function(object, keys){
-		var results = {};
-		for (var i = 0, l = keys.length; i < l; i++){
-			var k = keys[i];
-			if (k in object) results[k] = object[k];
-		}
-		return results;
-	},
-
-	map: function(object, fn, bind){
-		var results = {};
-		var keys = Object.keys(object);
-		for (var i = 0; i < keys.length; i++){
-			var key = keys[i];
-			results[key] = fn.call(bind, object[key], key, object);
-		}
-		return results;
-	},
-
-	filter: function(object, fn, bind){
-		var results = {};
-		var keys = Object.keys(object);
-		for (var i = 0; i < keys.length; i++){
-			var key = keys[i], value = object[key];
-			if (fn.call(bind, value, key, object)) results[key] = value;
-		}
-		return results;
-	},
-
-	every: function(object, fn, bind){
-		var keys = Object.keys(object);
-		for (var i = 0; i < keys.length; i++){
-			var key = keys[i];
-			if (!fn.call(bind, object[key], key)) return false;
-		}
-		return true;
-	},
-
-	some: function(object, fn, bind){
-		var keys = Object.keys(object);
-		for (var i = 0; i < keys.length; i++){
-			var key = keys[i];
-			if (fn.call(bind, object[key], key)) return true;
-		}
-		return false;
-	},
-
-	values: function(object){
-		var values = [];
-		var keys = Object.keys(object);
-		for (var i = 0; i < keys.length; i++){
-			var k = keys[i];
-			values.push(object[k]);
-		}
-		return values;
-	},
-
-	getLength: function(object){
-		return Object.keys(object).length;
-	},
-
-	keyOf: function(object, value){
-		var keys = Object.keys(object);
-		for (var i = 0; i < keys.length; i++){
-			var key = keys[i];
-			if (object[key] === value) return key;
-		}
-		return null;
-	},
-
-	contains: function(object, value){
-		return Object.keyOf(object, value) != null;
-	},
-
-	toQueryString: function(object, base){
-		var queryString = [];
-
-		Object.each(object, function(value, key){
-			if (base) key = base + '[' + key + ']';
-			var result;
-			switch (typeOf(value)){
-				case 'object': result = Object.toQueryString(value, key); break;
-				case 'array':
-					var qs = {};
-					value.each(function(val, i){
-						qs[i] = val;
-					});
-					result = Object.toQueryString(qs, key);
-					break;
-				default: result = key + '=' + encodeURIComponent(value);
-			}
-			if (value != null) queryString.push(result);
-		});
-
-		return queryString.join('&');
-	}
-
-});
-
-})();
-
-//<1.2compat>
-
-Hash.implement({
-
-	has: Object.prototype.hasOwnProperty,
-
-	keyOf: function(value){
-		return Object.keyOf(this, value);
-	},
-
-	hasValue: function(value){
-		return Object.contains(this, value);
-	},
-
-	extend: function(properties){
-		Hash.each(properties || {}, function(value, key){
-			Hash.set(this, key, value);
-		}, this);
-		return this;
-	},
-
-	combine: function(properties){
-		Hash.each(properties || {}, function(value, key){
-			Hash.include(this, key, value);
-		}, this);
-		return this;
-	},
-
-	erase: function(key){
-		if (this.hasOwnProperty(key)) delete this[key];
-		return this;
-	},
-
-	get: function(key){
-		return (this.hasOwnProperty(key)) ? this[key] : null;
-	},
-
-	set: function(key, value){
-		if (!this[key] || this.hasOwnProperty(key)) this[key] = value;
-		return this;
-	},
-
-	empty: function(){
-		Hash.each(this, function(value, key){
-			delete this[key];
-		}, this);
-		return this;
-	},
-
-	include: function(key, value){
-		if (this[key] == null) this[key] = value;
-		return this;
-	},
-
-	map: function(fn, bind){
-		return new Hash(Object.map(this, fn, bind));
-	},
-
-	filter: function(fn, bind){
-		return new Hash(Object.filter(this, fn, bind));
-	},
-
-	every: function(fn, bind){
-		return Object.every(this, fn, bind);
-	},
-
-	some: function(fn, bind){
-		return Object.some(this, fn, bind);
-	},
-
-	getKeys: function(){
-		return Object.keys(this);
-	},
-
-	getValues: function(){
-		return Object.values(this);
-	},
-
-	toQueryString: function(base){
-		return Object.toQueryString(this, base);
-	}
-
-});
-
-Hash.extend = Object.append;
-
-Hash.alias({indexOf: 'keyOf', contains: 'hasValue'});
-
-//</1.2compat>
-
-/*
----
-
-name: Browser
-
-description: The Browser Object. Contains Browser initialization, Window and Document, and the Browser Hash.
-
-license: MIT-style license.
-
-requires: [Array, Function, Number, String]
-
-provides: [Browser, Window, Document]
-
-...
-*/
-
-(function(){
-
-var document = this.document;
-var window = document.window = this;
-
-var parse = function(ua, platform){
-	ua = ua.toLowerCase();
-	platform = (platform ? platform.toLowerCase() : '');
-
-	// chrome is included in the edge UA, so need to check for edge first,
-	// before checking if it's chrome.
-	var UA = ua.match(/(edge)[\s\/:]([\w\d\.]+)/);
-	if (!UA){
-		UA = ua.match(/(opera|ie|firefox|chrome|trident|crios|version)[\s\/:]([\w\d\.]+)?.*?(safari|(?:rv[\s\/:]|version[\s\/:])([\w\d\.]+)|$)/) || [null, 'unknown', 0];
-	}
-
-	if (UA[1] == 'trident'){
-		UA[1] = 'ie';
-		if (UA[4]) UA[2] = UA[4];
-	} else if (UA[1] == 'crios'){
-		UA[1] = 'chrome';
-	}
-
-	platform = ua.match(/ip(?:ad|od|hone)/) ? 'ios' : (ua.match(/(?:webos|android)/) || ua.match(/mac|win|linux/) || ['other'])[0];
-	if (platform == 'win') platform = 'windows';
-
-	return {
-		extend: Function.prototype.extend,
-		name: (UA[1] == 'version') ? UA[3] : UA[1],
-		version: parseFloat((UA[1] == 'opera' && UA[4]) ? UA[4] : UA[2]),
-		platform: platform
-	};
-};
-
-var Browser = this.Browser = parse(navigator.userAgent, navigator.platform);
-
-if (Browser.name == 'ie' && document.documentMode){
-	Browser.version = document.documentMode;
-}
-
-Browser.extend({
-	Features: {
-		xpath: !!(document.evaluate),
-		air: !!(window.runtime),
-		query: !!(document.querySelector),
-		json: !!(window.JSON)
-	},
-	parseUA: parse
-});
-
-//<1.4compat>
-Browser[Browser.name] = true;
-Browser[Browser.name + parseInt(Browser.version, 10)] = true;
-
-if (Browser.name == 'ie' && Browser.version >= '11'){
-	delete Browser.ie;
-}
-
-var platform = Browser.platform;
-if (platform == 'windows'){
-	platform = 'win';
-}
-Browser.Platform = {
-	name: platform
-};
-Browser.Platform[platform] = true;
-//</1.4compat>
-
-// Request
-
-Browser.Request = (function(){
-
-	var XMLHTTP = function(){
-		return new XMLHttpRequest();
-	};
-
-	var MSXML2 = function(){
-		return new ActiveXObject('MSXML2.XMLHTTP');
-	};
-
-	var MSXML = function(){
-		return new ActiveXObject('Microsoft.XMLHTTP');
-	};
-
-	return Function.attempt(function(){
-		XMLHTTP();
-		return XMLHTTP;
-	}, function(){
-		MSXML2();
-		return MSXML2;
-	}, function(){
-		MSXML();
-		return MSXML;
-	});
-
-})();
-
-Browser.Features.xhr = !!(Browser.Request);
-
-//<1.4compat>
-
-// Flash detection
-
-var version = (Function.attempt(function(){
-	return navigator.plugins['Shockwave Flash'].description;
-}, function(){
-	return new ActiveXObject('ShockwaveFlash.ShockwaveFlash').GetVariable('$version');
-}) || '0 r0').match(/\d+/g);
-
-Browser.Plugins = {
-	Flash: {
-		version: Number(version[0] || '0.' + version[1]) || 0,
-		build: Number(version[2]) || 0
-	}
-};
-
-//</1.4compat>
-
-// String scripts
-
-Browser.exec = function(text){
-	if (!text) return text;
-	if (window.execScript){
-		window.execScript(text);
-	} else {
-		var script = document.createElement('script');
-		script.setAttribute('type', 'text/javascript');
-		script.text = text;
-		document.head.appendChild(script);
-		document.head.removeChild(script);
-	}
-	return text;
-};
-
-String.implement('stripScripts', function(exec){
-	var scripts = '';
-	var text = this.replace(/<script[^>]*>([\s\S]*?)<\/script>/gi, function(all, code){
-		scripts += code + '\n';
-		return '';
-	});
-	if (exec === true) Browser.exec(scripts);
-	else if (typeOf(exec) == 'function') exec(scripts, text);
-	return text;
-});
-
-// Window, Document
-
-Browser.extend({
-	Document: this.Document,
-	Window: this.Window,
-	Element: this.Element,
-	Event: this.Event
-});
-
-this.Window = this.$constructor = new Type('Window', function(){});
-
-this.$family = Function.convert('window').hide();
-
-Window.mirror(function(name, method){
-	window[name] = method;
-});
-
-this.Document = document.$constructor = new Type('Document', function(){});
-
-document.$family = Function.convert('document').hide();
-
-Document.mirror(function(name, method){
-	document[name] = method;
-});
-
-document.html = document.documentElement;
-if (!document.head) document.head = document.getElementsByTagName('head')[0];
-
-if (document.execCommand) try {
-	document.execCommand('BackgroundImageCache', false, true);
-} catch (e){}
-
-/*<ltIE9>*/
-if (this.attachEvent && !this.addEventListener){
-	var unloadEvent = function(){
-		this.detachEvent('onunload', unloadEvent);
-		document.head = document.html = document.window = null;
-		window = this.Window = document = null;
-	};
-	this.attachEvent('onunload', unloadEvent);
-}
-
-// IE fails on collections and <select>.options (refers to <select>)
-var arrayFrom = Array.convert;
-try {
-	arrayFrom(document.html.childNodes);
-} catch (e){
-	Array.convert = function(item){
-		if (typeof item != 'string' && Type.isEnumerable(item) && typeOf(item) != 'array'){
-			var i = item.length, array = new Array(i);
-			while (i--) array[i] = item[i];
-			return array;
-		}
-		return arrayFrom(item);
-	};
-
-	var prototype = Array.prototype,
-		slice = prototype.slice;
-	['pop', 'push', 'reverse', 'shift', 'sort', 'splice', 'unshift', 'concat', 'join', 'slice'].each(function(name){
-		var method = prototype[name];
-		Array[name] = function(item){
-			return method.apply(Array.convert(item), slice.call(arguments, 1));
-		};
-	});
-}
-/*</ltIE9>*/
-
-//<1.2compat>
-
-if (Browser.Platform.ios) Browser.Platform.ipod = true;
-
-Browser.Engine = {};
-
-var setEngine = function(name, version){
-	Browser.Engine.name = name;
-	Browser.Engine[name + version] = true;
-	Browser.Engine.version = version;
-};
-
-if (Browser.ie){
-	Browser.Engine.trident = true;
-
-	switch (Browser.version){
-		case 6: setEngine('trident', 4); break;
-		case 7: setEngine('trident', 5); break;
-		case 8: setEngine('trident', 6);
-	}
-}
-
-if (Browser.firefox){
-	Browser.Engine.gecko = true;
-
-	if (Browser.version >= 3) setEngine('gecko', 19);
-	else setEngine('gecko', 18);
-}
-
-if (Browser.safari || Browser.chrome){
-	Browser.Engine.webkit = true;
-
-	switch (Browser.version){
-		case 2: setEngine('webkit', 419); break;
-		case 3: setEngine('webkit', 420); break;
-		case 4: setEngine('webkit', 525);
-	}
-}
-
-if (Browser.opera){
-	Browser.Engine.presto = true;
-
-	if (Browser.version >= 9.6) setEngine('presto', 960);
-	else if (Browser.version >= 9.5) setEngine('presto', 950);
-	else setEngine('presto', 925);
-}
-
-if (Browser.name == 'unknown'){
-	switch ((navigator.userAgent.toLowerCase().match(/(?:webkit|khtml|gecko)/) || [])[0]){
-		case 'webkit':
-		case 'khtml':
-			Browser.Engine.webkit = true;
-			break;
-		case 'gecko':
-			Browser.Engine.gecko = true;
-	}
-}
-
-this.$exec = Browser.exec;
-
-//</1.2compat>
-
-})();
-
-/*
----
-
-name: Event
-
-description: Contains the Event Type, to make the event object cross-browser.
-
-license: MIT-style license.
-
-requires: [Window, Document, Array, Function, String, Object]
-
-provides: Event
-
-...
-*/
-
-(function(){
-
-var _keys = {};
-var normalizeWheelSpeed = function(event){
-	var normalized;
-	if (event.wheelDelta){
-		normalized = event.wheelDelta % 120 == 0 ? event.wheelDelta / 120 : event.wheelDelta / 12;
-	} else {
-		var rawAmount = event.deltaY || event.detail || 0;
-		normalized = -(rawAmount % 3 == 0 ? rawAmount / 3 : rawAmount * 10);
-	}
-	return normalized;
-};
-
-var DOMEvent = this.DOMEvent = new Type('DOMEvent', function(event, win){
-	if (!win) win = window;
-	event = event || win.event;
-	if (event.$extended) return event;
-	this.event = event;
-	this.$extended = true;
-	this.shift = event.shiftKey;
-	this.control = event.ctrlKey;
-	this.alt = event.altKey;
-	this.meta = event.metaKey;
-	var type = this.type = event.type;
-	var target = event.target || event.srcElement;
-	while (target && target.nodeType == 3) target = target.parentNode;
-	this.target = document.id(target);
-
-	if (type.indexOf('key') == 0){
-		var code = this.code = (event.which || event.keyCode);
-		if (!this.shift || type != 'keypress') this.key = _keys[code]/*<1.3compat>*/ || Object.keyOf(Event.Keys, code)/*</1.3compat>*/;
-		if (type == 'keydown' || type == 'keyup'){
-			if (code > 111 && code < 124) this.key = 'f' + (code - 111);
-			else if (code > 95 && code < 106) this.key = code - 96;
-		}
-		if (this.key == null) this.key = String.fromCharCode(code).toLowerCase();
-	} else if (type == 'click' || type == 'dblclick' || type == 'contextmenu' || type == 'wheel' || type == 'DOMMouseScroll' || type.indexOf('mouse') == 0){
-		var doc = win.document;
-		doc = (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body;
-		this.page = {
-			x: (event.pageX != null) ? event.pageX : event.clientX + doc.scrollLeft,
-			y: (event.pageY != null) ? event.pageY : event.clientY + doc.scrollTop
-		};
-		this.client = {
-			x: (event.pageX != null) ? event.pageX - win.pageXOffset : event.clientX,
-			y: (event.pageY != null) ? event.pageY - win.pageYOffset : event.clientY
-		};
-		if (type == 'DOMMouseScroll' || type == 'wheel' || type == 'mousewheel') this.wheel = normalizeWheelSpeed(event);
-		this.rightClick = (event.which == 3 || event.button == 2);
-		if (type == 'mouseover' || type == 'mouseout' || type == 'mouseenter' || type == 'mouseleave'){
-			var overTarget = type == 'mouseover' || type == 'mouseenter';
-			var related = event.relatedTarget || event[(overTarget ? 'from' : 'to') + 'Element'];
-			while (related && related.nodeType == 3) related = related.parentNode;
-			this.relatedTarget = document.id(related);
-		}
-	} else if (type.indexOf('touch') == 0 || type.indexOf('gesture') == 0){
-		this.rotation = event.rotation;
-		this.scale = event.scale;
-		this.targetTouches = event.targetTouches;
-		this.changedTouches = event.changedTouches;
-		var touches = this.touches = event.touches;
-		if (touches && touches[0]){
-			var touch = touches[0];
-			this.page = {x: touch.pageX, y: touch.pageY};
-			this.client = {x: touch.clientX, y: touch.clientY};
-		}
-	}
-
-	if (!this.client) this.client = {};
-	if (!this.page) this.page = {};
-});
-
-DOMEvent.implement({
-
-	stop: function(){
-		return this.preventDefault().stopPropagation();
-	},
-
-	stopPropagation: function(){
-		if (this.event.stopPropagation) this.event.stopPropagation();
-		else this.event.cancelBubble = true;
-		return this;
-	},
-
-	preventDefault: function(){
-		if (this.event.preventDefault) this.event.preventDefault();
-		else this.event.returnValue = false;
-		return this;
-	}
-
-});
-
-DOMEvent.defineKey = function(code, key){
-	_keys[code] = key;
-	return this;
-};
-
-DOMEvent.defineKeys = DOMEvent.defineKey.overloadSetter(true);
-
-DOMEvent.defineKeys({
-	'38': 'up', '40': 'down', '37': 'left', '39': 'right',
-	'27': 'esc', '32': 'space', '8': 'backspace', '9': 'tab',
-	'46': 'delete', '13': 'enter'
-});
-
-})();
-
-/*<1.3compat>*/
-var Event = this.Event = DOMEvent;
-Event.Keys = {};
-/*</1.3compat>*/
-
-/*<1.2compat>*/
-
-Event.Keys = new Hash(Event.Keys);
-
-/*</1.2compat>*/
-
-/*
----
-
-name: Class
-
-description: Contains the Class Function for easily creating, extending, and implementing reusable Classes.
-
-license: MIT-style license.
-
-requires: [Array, String, Function, Number]
-
-provides: Class
-
-...
-*/
-
-(function(){
-
-var Class = this.Class = new Type('Class', function(params){
-	if (instanceOf(params, Function)) params = {initialize: params};
-
-	var newClass = function(){
-		reset(this);
-		if (newClass.$prototyping) return this;
-		this.$caller = null;
-		this.$family = null;
-		var value = (this.initialize) ? this.initialize.apply(this, arguments) : this;
-		this.$caller = this.caller = null;
-		return value;
-	}.extend(this).implement(params);
-
-	newClass.$constructor = Class;
-	newClass.prototype.$constructor = newClass;
-	newClass.prototype.parent = parent;
-
-	return newClass;
-});
-
-var parent = function(){
-	if (!this.$caller) throw new Error('The method "parent" cannot be called.');
-	var name = this.$caller.$name,
-		parent = this.$caller.$owner.parent,
-		previous = (parent) ? parent.prototype[name] : null;
-	if (!previous) throw new Error('The method "' + name + '" has no parent.');
-	return previous.apply(this, arguments);
-};
-
-var reset = function(object){
-	for (var key in object){
-		var value = object[key];
-		switch (typeOf(value)){
-			case 'object':
-				var F = function(){};
-				F.prototype = value;
-				object[key] = reset(new F);
-				break;
-			case 'array': object[key] = value.clone(); break;
-		}
-	}
-	return object;
-};
-
-var wrap = function(self, key, method){
-	if (method.$origin) method = method.$origin;
-	var wrapper = function(){
-		if (method.$protected && this.$caller == null) throw new Error('The method "' + key + '" cannot be called.');
-		var caller = this.caller, current = this.$caller;
-		this.caller = current; this.$caller = wrapper;
-		var result = method.apply(this, arguments);
-		this.$caller = current; this.caller = caller;
-		return result;
-	}.extend({$owner: self, $origin: method, $name: key});
-	return wrapper;
-};
-
-var implement = function(key, value, retain){
-	if (Class.Mutators.hasOwnProperty(key)){
-		value = Class.Mutators[key].call(this, value);
-		if (value == null) return this;
-	}
-
-	if (typeOf(value) == 'function'){
-		if (value.$hidden) return this;
-		this.prototype[key] = (retain) ? value : wrap(this, key, value);
-	} else {
-		Object.merge(this.prototype, key, value);
-	}
-
-	return this;
-};
-
-var getInstance = function(klass){
-	klass.$prototyping = true;
-	var proto = new klass;
-	delete klass.$prototyping;
-	return proto;
-};
-
-Class.implement('implement', implement.overloadSetter());
-
-Class.Mutators = {
-
-	Extends: function(parent){
-		this.parent = parent;
-		this.prototype = getInstance(parent);
-	},
-
-	Implements: function(items){
-		Array.convert(items).each(function(item){
-			var instance = new item;
-			for (var key in instance) implement.call(this, key, instance[key], true);
-		}, this);
-	}
-};
-
-})();
-
-/*
----
-
-name: Class.Extras
-
-description: Contains Utility Classes that can be implemented into your own Classes to ease the execution of many common tasks.
-
-license: MIT-style license.
-
-requires: Class
-
-provides: [Class.Extras, Chain, Events, Options]
-
-...
-*/
-
-(function(){
-
-this.Chain = new Class({
-
-	$chain: [],
-
-	chain: function(){
-		this.$chain.append(Array.flatten(arguments));
-		return this;
-	},
-
-	callChain: function(){
-		return (this.$chain.length) ? this.$chain.shift().apply(this, arguments) : false;
-	},
-
-	clearChain: function(){
-		this.$chain.empty();
-		return this;
-	}
-
-});
-
-var removeOn = function(string){
-	return string.replace(/^on([A-Z])/, function(full, first){
-		return first.toLowerCase();
-	});
-};
-
-this.Events = new Class({
-
-	$events: {},
-
-	addEvent: function(type, fn, internal){
-		type = removeOn(type);
-
-		/*<1.2compat>*/
-		if (fn == $empty) return this;
-		/*</1.2compat>*/
-
-		this.$events[type] = (this.$events[type] || []).include(fn);
-		if (internal) fn.internal = true;
-		return this;
-	},
-
-	addEvents: function(events){
-		for (var type in events) this.addEvent(type, events[type]);
-		return this;
-	},
-
-	fireEvent: function(type, args, delay){
-		type = removeOn(type);
-		var events = this.$events[type];
-		if (!events) return this;
-		args = Array.convert(args);
-		events.each(function(fn){
-			if (delay) fn.delay(delay, this, args);
-			else fn.apply(this, args);
-		}, this);
-		return this;
-	},
-
-	removeEvent: function(type, fn){
-		type = removeOn(type);
-		var events = this.$events[type];
-		if (events && !fn.internal){
-			var index = events.indexOf(fn);
-			if (index != -1) delete events[index];
-		}
-		return this;
-	},
-
-	removeEvents: function(events){
-		var type;
-		if (typeOf(events) == 'object'){
-			for (type in events) this.removeEvent(type, events[type]);
-			return this;
-		}
-		if (events) events = removeOn(events);
-		for (type in this.$events){
-			if (events && events != type) continue;
-			var fns = this.$events[type];
-			for (var i = fns.length; i--;) if (i in fns){
-				this.removeEvent(type, fns[i]);
-			}
-		}
-		return this;
-	}
-
-});
-
-this.Options = new Class({
-
-	setOptions: function(){
-		var options = this.options = Object.merge.apply(null, [{}, this.options].append(arguments));
-		if (this.addEvent) for (var option in options){
-			if (typeOf(options[option]) != 'function' || !(/^on[A-Z]/).test(option)) continue;
-			this.addEvent(option, options[option]);
-			delete options[option];
-		}
-		return this;
-	}
-
-});
-
-})();
-
-/*
----
-
-name: Class.Thenable
-
-description: Contains a Utility Class that can be implemented into your own Classes to make them "thenable".
-
-license: MIT-style license.
-
-requires: Class
-
-provides: [Class.Thenable]
-
-...
-*/
-
-(function(){
-
-var STATE_PENDING = 0,
-	STATE_FULFILLED = 1,
-	STATE_REJECTED = 2;
-
-var Thenable = Class.Thenable = new Class({
-
-	$thenableState: STATE_PENDING,
-	$thenableResult: null,
-	$thenableReactions: [],
-
-	resolve: function(value){
-		resolve(this, value);
-		return this;
-	},
-
-	reject: function(reason){
-		reject(this, reason);
-		return this;
-	},
-
-	getThenableState: function(){
-		switch (this.$thenableState){
-			case STATE_PENDING:
-				return 'pending';
-
-			case STATE_FULFILLED:
-				return 'fulfilled';
-
-			case STATE_REJECTED:
-				return 'rejected';
-		}
-	},
-
-	resetThenable: function(reason){
-		reject(this, reason);
-		reset(this);
-		return this;
-	},
-
-	then: function(onFulfilled, onRejected){
-		if (typeof onFulfilled !== 'function') onFulfilled = 'Identity';
-		if (typeof onRejected !== 'function') onRejected = 'Thrower';
-
-		var thenable = new Thenable();
-
-		this.$thenableReactions.push({
-			thenable: thenable,
-			fulfillHandler: onFulfilled,
-			rejectHandler: onRejected
-		});
-
-		if (this.$thenableState !== STATE_PENDING){
-			react(this);
-		}
-
-		return thenable;
-	},
-
-	'catch': function(onRejected){
-		return this.then(null, onRejected);
-	}
-
-});
-
-Thenable.extend({
-	resolve: function(value){
-		var thenable;
-		if (value instanceof Thenable){
-			thenable = value;
-		} else {
-			thenable = new Thenable();
-			resolve(thenable, value);
-		}
-		return thenable;
-	},
-	reject: function(reason){
-		var thenable = new Thenable();
-		reject(thenable, reason);
-		return thenable;
-	}
-});
-
-// Private functions
-
-function resolve(thenable, value){
-	if (thenable.$thenableState === STATE_PENDING){
-		if (thenable === value){
-			reject(thenable, new TypeError('Tried to resolve a thenable with itself.'));
-		} else if (value && (typeof value === 'object' || typeof value === 'function')){
-			var then;
-			try {
-				then = value.then;
-			} catch (exception){
-				reject(thenable, exception);
-			}
-			if (typeof then === 'function'){
-				var resolved = false;
-				defer(function(){
-					try {
-						then.call(
-							value,
-							function(nextValue){
-								if (!resolved){
-									resolved = true;
-									resolve(thenable, nextValue);
-								}
-							},
-							function(reason){
-								if (!resolved){
-									resolved = true;
-									reject(thenable, reason);
-								}
-							}
-						);
-					} catch (exception){
-						if (!resolved){
-							resolved = true;
-							reject(thenable, exception);
-						}
-					}
-				});
-			} else {
-				fulfill(thenable, value);
-			}
-		} else {
-			fulfill(thenable, value);
-		}
-	}
-}
-
-function fulfill(thenable, value){
-	if (thenable.$thenableState === STATE_PENDING){
-		thenable.$thenableResult = value;
-		thenable.$thenableState = STATE_FULFILLED;
-
-		react(thenable);
-	}
-}
-
-function reject(thenable, reason){
-	if (thenable.$thenableState === STATE_PENDING){
-		thenable.$thenableResult = reason;
-		thenable.$thenableState = STATE_REJECTED;
-
-		react(thenable);
-	}
-}
-
-function reset(thenable){
-	if (thenable.$thenableState !== STATE_PENDING){
-		thenable.$thenableResult = null;
-		thenable.$thenableState = STATE_PENDING;
-	}
-}
-
-function react(thenable){
-	var state = thenable.$thenableState,
-		result = thenable.$thenableResult,
-		reactions = thenable.$thenableReactions,
-		type;
-
-	if (state === STATE_FULFILLED){
-		thenable.$thenableReactions = [];
-		type = 'fulfillHandler';
-	} else if (state == STATE_REJECTED){
-		thenable.$thenableReactions = [];
-		type = 'rejectHandler';
-	}
-
-	if (type){
-		defer(handle.pass([result, reactions, type]));
-	}
-}
-
-function handle(result, reactions, type){
-	for (var i = 0, l = reactions.length; i < l; ++i){
-		var reaction = reactions[i],
-			handler = reaction[type];
-
-		if (handler === 'Identity'){
-			resolve(reaction.thenable, result);
-		} else if (handler === 'Thrower'){
-			reject(reaction.thenable, result);
-		} else {
-			try {
-				resolve(reaction.thenable, handler(result));
-			} catch (exception){
-				reject(reaction.thenable, exception);
-			}
-		}
-	}
-}
-
-var defer;
-if (typeof process !== 'undefined' && typeof process.nextTick === 'function'){
-	defer = process.nextTick;
-} else if (typeof setImmediate !== 'undefined'){
-	defer = setImmediate;
-} else {
-	defer = function(fn){
-		setTimeout(fn, 0);
-	};
-}
-
-})();
-
-/*
----
-name: Slick.Parser
-description: Standalone CSS3 Selector parser
-provides: Slick.Parser
-...
-*/
-
-;(function(){
-
-var parsed,
-	separatorIndex,
-	combinatorIndex,
-	reversed,
-	cache = {},
-	reverseCache = {},
-	reUnescape = /\\/g;
-
-var parse = function(expression, isReversed){
-	if (expression == null) return null;
-	if (expression.Slick === true) return expression;
-	expression = ('' + expression).replace(/^\s+|\s+$/g, '');
-	reversed = !!isReversed;
-	var currentCache = (reversed) ? reverseCache : cache;
-	if (currentCache[expression]) return currentCache[expression];
-	parsed = {
-		Slick: true,
-		expressions: [],
-		raw: expression,
-		reverse: function(){
-			return parse(this.raw, true);
-		}
-	};
-	separatorIndex = -1;
-	while (expression != (expression = expression.replace(regexp, parser)));
-	parsed.length = parsed.expressions.length;
-	return currentCache[parsed.raw] = (reversed) ? reverse(parsed) : parsed;
-};
-
-var reverseCombinator = function(combinator){
-	if (combinator === '!') return ' ';
-	else if (combinator === ' ') return '!';
-	else if ((/^!/).test(combinator)) return combinator.replace(/^!/, '');
-	else return '!' + combinator;
-};
-
-var reverse = function(expression){
-	var expressions = expression.expressions;
-	for (var i = 0; i < expressions.length; i++){
-		var exp = expressions[i];
-		var last = {parts: [], tag: '*', combinator: reverseCombinator(exp[0].combinator)};
-
-		for (var j = 0; j < exp.length; j++){
-			var cexp = exp[j];
-			if (!cexp.reverseCombinator) cexp.reverseCombinator = ' ';
-			cexp.combinator = cexp.reverseCombinator;
-			delete cexp.reverseCombinator;
-		}
-
-		exp.reverse().push(last);
-	}
-	return expression;
-};
-
-var escapeRegExp = function(string){// Credit: XRegExp 0.6.1 (c) 2007-2008 Steven Levithan <http://stevenlevithan.com/regex/xregexp/> MIT License
-	return string.replace(/[-[\]{}()*+?.\\^$|,#\s]/g, function(match){
-		return '\\' + match;
-	});
-};
-
-var regexp = new RegExp(
-/*
-#!/usr/bin/env ruby
-puts "\t\t" + DATA.read.gsub(/\(\?x\)|\s+#.*$|\s+|\\$|\\n/,'')
-__END__
-	"(?x)^(?:\
-	  \\s* ( , ) \\s*               # Separator          \n\
-	| \\s* ( <combinator>+ ) \\s*   # Combinator         \n\
-	|      ( \\s+ )                 # CombinatorChildren \n\
-	|      ( <unicode>+ | \\* )     # Tag                \n\
-	| \\#  ( <unicode>+       )     # ID                 \n\
-	| \\.  ( <unicode>+       )     # ClassName          \n\
-	|                               # Attribute          \n\
-	\\[  \
-		\\s* (<unicode1>+)  (?:  \
-			\\s* ([*^$!~|]?=)  (?:  \
-				\\s* (?:\
-					([\"']?)(.*?)\\9 \
-				)\
-			)  \
-		)?  \\s*  \
-	\\](?!\\]) \n\
-	|   :+ ( <unicode>+ )(?:\
-	\\( (?:\
-		(?:([\"'])([^\\12]*)\\12)|((?:\\([^)]+\\)|[^()]*)+)\
-	) \\)\
-	)?\
-	)"
-*/
-	"^(?:\\s*(,)\\s*|\\s*(<combinator>+)\\s*|(\\s+)|(<unicode>+|\\*)|\\#(<unicode>+)|\\.(<unicode>+)|\\[\\s*(<unicode1>+)(?:\\s*([*^$!~|]?=)(?:\\s*(?:([\"']?)(.*?)\\9)))?\\s*\\](?!\\])|(:+)(<unicode>+)(?:\\((?:(?:([\"'])([^\\13]*)\\13)|((?:\\([^)]+\\)|[^()]*)+))\\))?)"
-	.replace(/<combinator>/, '[' + escapeRegExp('>+~`!@$%^&={}\\;</') + ']')
-	.replace(/<unicode>/g, '(?:[\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])')
-	.replace(/<unicode1>/g, '(?:[:\\w\\u00a1-\\uFFFF-]|\\\\[^\\s0-9a-f])')
-);
-
-function parser(
-	rawMatch,
-
-	separator,
-	combinator,
-	combinatorChildren,
-
-	tagName,
-	id,
-	className,
-
-	attributeKey,
-	attributeOperator,
-	attributeQuote,
-	attributeValue,
-
-	pseudoMarker,
-	pseudoClass,
-	pseudoQuote,
-	pseudoClassQuotedValue,
-	pseudoClassValue
-){
-	if (separator || separatorIndex === -1){
-		parsed.expressions[++separatorIndex] = [];
-		combinatorIndex = -1;
-		if (separator) return '';
-	}
-
-	if (combinator || combinatorChildren || combinatorIndex === -1){
-		combinator = combinator || ' ';
-		var currentSeparator = parsed.expressions[separatorIndex];
-		if (reversed && currentSeparator[combinatorIndex])
-			currentSeparator[combinatorIndex].reverseCombinator = reverseCombinator(combinator);
-		currentSeparator[++combinatorIndex] = {combinator: combinator, tag: '*'};
-	}
-
-	var currentParsed = parsed.expressions[separatorIndex][combinatorIndex];
-
-	if (tagName){
-		currentParsed.tag = tagName.replace(reUnescape, '');
-
-	} else if (id){
-		currentParsed.id = id.replace(reUnescape, '');
-
-	} else if (className){
-		className = className.replace(reUnescape, '');
-
-		if (!currentParsed.classList) currentParsed.classList = [];
-		if (!currentParsed.classes) currentParsed.classes = [];
-		currentParsed.classList.push(className);
-		currentParsed.classes.push({
-			value: className,
-			regexp: new RegExp('(^|\\s)' + escapeRegExp(className) + '(\\s|$)')
-		});
-
-	} else if (pseudoClass){
-		pseudoClassValue = pseudoClassValue || pseudoClassQuotedValue;
-		pseudoClassValue = pseudoClassValue ? pseudoClassValue.replace(reUnescape, '') : null;
-
-		if (!currentParsed.pseudos) currentParsed.pseudos = [];
-		currentParsed.pseudos.push({
-			key: pseudoClass.replace(reUnescape, ''),
-			value: pseudoClassValue,
-			type: pseudoMarker.length == 1 ? 'class' : 'element'
-		});
-
-	} else if (attributeKey){
-		attributeKey = attributeKey.replace(reUnescape, '');
-		attributeValue = (attributeValue || '').replace(reUnescape, '');
-
-		var test, regexp;
-
-		switch (attributeOperator){
-			case '^=' : regexp = new RegExp(       '^'+ escapeRegExp(attributeValue)            ); break;
-			case '$=' : regexp = new RegExp(            escapeRegExp(attributeValue) +'$'       ); break;
-			case '~=' : regexp = new RegExp( '(^|\\s)'+ escapeRegExp(attributeValue) +'(\\s|$)' ); break;
-			case '|=' : regexp = new RegExp(       '^'+ escapeRegExp(attributeValue) +'(-|$)'   ); break;
-			case  '=' : test = function(value){
-				return attributeValue == value;
-			}; break;
-			case '*=' : test = function(value){
-				return value && value.indexOf(attributeValue) > -1;
-			}; break;
-			case '!=' : test = function(value){
-				return attributeValue != value;
-			}; break;
-			default   : test = function(value){
-				return !!value;
-			};
-		}
-
-		if (attributeValue == '' && (/^[*$^]=$/).test(attributeOperator)) test = function(){
-			return false;
-		};
-
-		if (!test) test = function(value){
-			return value && regexp.test(value);
-		};
-
-		if (!currentParsed.attributes) currentParsed.attributes = [];
-		currentParsed.attributes.push({
-			key: attributeKey,
-			operator: attributeOperator,
-			value: attributeValue,
-			test: test
-		});
-
-	}
-
-	return '';
-};
-
-// Slick NS
-
-var Slick = (this.Slick || {});
-
-Slick.parse = function(expression){
-	return parse(expression);
-};
-
-Slick.escapeRegExp = escapeRegExp;
-
-if (!this.Slick) this.Slick = Slick;
-
-}).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this);
-
-/*
----
-name: Slick.Finder
-description: The new, superfast css selector engine.
-provides: Slick.Finder
-requires: Slick.Parser
-...
-*/
-
-;(function(){
-
-var local = {},
-	featuresCache = {},
-	toString = Object.prototype.toString;
-
-// Feature / Bug detection
-
-local.isNativeCode = function(fn){
-	return (/\{\s*\[native code\]\s*\}/).test('' + fn);
-};
-
-local.isXML = function(document){
-	return (!!document.xmlVersion) || (!!document.xml) || (toString.call(document) == '[object XMLDocument]') ||
-	(document.nodeType == 9 && document.documentElement.nodeName != 'HTML');
-};
-
-local.setDocument = function(document){
-
-	// convert elements / window arguments to document. if document cannot be extrapolated, the function returns.
-	var nodeType = document.nodeType;
-	if (nodeType == 9); // document
-	else if (nodeType) document = document.ownerDocument; // node
-	else if (document.navigator) document = document.document; // window
-	else return;
-
-	// check if it's the old document
-
-	if (this.document === document) return;
-	this.document = document;
-
-	// check if we have done feature detection on this document before
-
-	var root = document.documentElement,
-		rootUid = this.getUIDXML(root),
-		features = featuresCache[rootUid],
-		feature;
-
-	if (features){
-		for (feature in features){
-			this[feature] = features[feature];
-		}
-		return;
-	}
-
-	features = featuresCache[rootUid] = {};
-
-	features.root = root;
-	features.isXMLDocument = this.isXML(document);
-
-	features.brokenStarGEBTN
-	= features.starSelectsClosedQSA
-	= features.idGetsName
-	= features.brokenMixedCaseQSA
-	= features.brokenGEBCN
-	= features.brokenCheckedQSA
-	= features.brokenEmptyAttributeQSA
-	= features.isHTMLDocument
-	= features.nativeMatchesSelector
-	= false;
-
-	var starSelectsClosed, starSelectsComments,
-		brokenSecondClassNameGEBCN, cachedGetElementsByClassName,
-		brokenFormAttributeGetter;
-
-	var selected, id = 'slick_uniqueid';
-	var testNode = document.createElement('div');
-
-	var testRoot = document.body || document.getElementsByTagName('body')[0] || root;
-	testRoot.appendChild(testNode);
-
-	// on non-HTML documents innerHTML and getElementsById doesnt work properly
-	try {
-		testNode.innerHTML = '<a id="'+id+'"></a>';
-		features.isHTMLDocument = !!document.getElementById(id);
-	} catch (e){}
-
-	if (features.isHTMLDocument){
-
-		testNode.style.display = 'none';
-
-		// IE returns comment nodes for getElementsByTagName('*') for some documents
-		testNode.appendChild(document.createComment(''));
-		starSelectsComments = (testNode.getElementsByTagName('*').length > 1);
-
-		// IE returns closed nodes (EG:"</foo>") for getElementsByTagName('*') for some documents
-		try {
-			testNode.innerHTML = 'foo</foo>';
-			selected = testNode.getElementsByTagName('*');
-			starSelectsClosed = (selected && !!selected.length && selected[0].nodeName.charAt(0) == '/');
-		} catch (e){};
-
-		features.brokenStarGEBTN = starSelectsComments || starSelectsClosed;
-
-		// IE returns elements with the name instead of just id for getElementsById for some documents
-		try {
-			testNode.innerHTML = '<a name="'+ id +'"></a><b id="'+ id +'"></b>';
-			features.idGetsName = document.getElementById(id) === testNode.firstChild;
-		} catch (e){}
-
-		if (testNode.getElementsByClassName){
-
-			// Safari 3.2 getElementsByClassName caches results
-			try {
-				testNode.innerHTML = '<a class="f"></a><a class="b"></a>';
-				testNode.getElementsByClassName('b').length;
-				testNode.firstChild.className = 'b';
-				cachedGetElementsByClassName = (testNode.getElementsByClassName('b').length != 2);
-			} catch (e){};
-
-			// Opera 9.6 getElementsByClassName doesnt detects the class if its not the first one
-			try {
-				testNode.innerHTML = '<a class="a"></a><a class="f b a"></a>';
-				brokenSecondClassNameGEBCN = (testNode.getElementsByClassName('a').length != 2);
-			} catch (e){}
-
-			features.brokenGEBCN = cachedGetElementsByClassName || brokenSecondClassNameGEBCN;
-		}
-
-		if (testNode.querySelectorAll){
-			// IE 8 returns closed nodes (EG:"</foo>") for querySelectorAll('*') for some documents
-			try {
-				testNode.innerHTML = 'foo</foo>';
-				selected = testNode.querySelectorAll('*');
-				features.starSelectsClosedQSA = (selected && !!selected.length && selected[0].nodeName.charAt(0) == '/');
-			} catch (e){}
-
-			// Safari 3.2 querySelectorAll doesnt work with mixedcase on quirksmode
-			try {
-				testNode.innerHTML = '<a class="MiX"></a>';
-				features.brokenMixedCaseQSA = !testNode.querySelectorAll('.MiX').length;
-			} catch (e){}
-
-			// Webkit and Opera dont return selected options on querySelectorAll
-			try {
-				testNode.innerHTML = '<select><option selected="selected">a</option></select>';
-				features.brokenCheckedQSA = (testNode.querySelectorAll(':checked').length == 0);
-			} catch (e){};
-
-			// IE returns incorrect results for attr[*^$]="" selectors on querySelectorAll
-			try {
-				testNode.innerHTML = '<a class=""></a>';
-				features.brokenEmptyAttributeQSA = (testNode.querySelectorAll('[class*=""]').length != 0);
-			} catch (e){}
-
-		}
-
-		// IE6-7, if a form has an input of id x, form.getAttribute(x) returns a reference to the input
-		try {
-			testNode.innerHTML = '<form action="s"><input id="action"/></form>';
-			brokenFormAttributeGetter = (testNode.firstChild.getAttribute('action') != 's');
-		} catch (e){}
-
-		// native matchesSelector function
-
-		features.nativeMatchesSelector = root.matches || /*root.msMatchesSelector ||*/ root.mozMatchesSelector || root.webkitMatchesSelector;
-		if (features.nativeMatchesSelector) try {
-			// if matchesSelector trows errors on incorrect sintaxes we can use it
-			features.nativeMatchesSelector.call(root, ':slick');
-			features.nativeMatchesSelector = null;
-		} catch (e){}
-
-	}
-
-	try {
-		root.slick_expando = 1;
-		delete root.slick_expando;
-		features.getUID = this.getUIDHTML;
-	} catch (e){
-		features.getUID = this.getUIDXML;
-	}
-
-	testRoot.removeChild(testNode);
-	testNode = selected = testRoot = null;
-
-	// getAttribute
-
-	features.getAttribute = (features.isHTMLDocument && brokenFormAttributeGetter) ? function(node, name){
-		var method = this.attributeGetters[name];
-		if (method) return method.call(node);
-		var attributeNode = node.getAttributeNode(name);
-		return (attributeNode) ? attributeNode.nodeValue : null;
-	} : function(node, name){
-		var method = this.attributeGetters[name];
-		return (method) ? method.call(node) : node.getAttribute(name);
-	};
-
-	// hasAttribute
-
-	features.hasAttribute = (root && this.isNativeCode(root.hasAttribute)) ? function(node, attribute){
-		return node.hasAttribute(attribute);
-	} : function(node, attribute){
-		node = node.getAttributeNode(attribute);
-		return !!(node && (node.specified || node.nodeValue));
-	};
-
-	// contains
-	// FIXME: Add specs: local.contains should be different for xml and html documents?
-	var nativeRootContains = root && this.isNativeCode(root.contains),
-		nativeDocumentContains = document && this.isNativeCode(document.contains);
-
-	features.contains = (nativeRootContains && nativeDocumentContains) ? function(context, node){
-		return context.contains(node);
-	} : (nativeRootContains && !nativeDocumentContains) ? function(context, node){
-		// IE8 does not have .contains on document.
-		return context === node || ((context === document) ? document.documentElement : context).contains(node);
-	} : (root && root.compareDocumentPosition) ? function(context, node){
-		return context === node || !!(context.compareDocumentPosition(node) & 16);
-	} : function(context, node){
-		if (node) do {
-			if (node === context) return true;
-		} while ((node = node.parentNode));
-		return false;
-	};
-
-	// document order sorting
-	// credits to Sizzle (http://sizzlejs.com/)
-
-	features.documentSorter = (root.compareDocumentPosition) ? function(a, b){
-		if (!a.compareDocumentPosition || !b.compareDocumentPosition) return 0;
-		return a.compareDocumentPosition(b) & 4 ? -1 : a === b ? 0 : 1;
-	} : ('sourceIndex' in root) ? function(a, b){
-		if (!a.sourceIndex || !b.sourceIndex) return 0;
-		return a.sourceIndex - b.sourceIndex;
-	} : (document.createRange) ? function(a, b){
-		if (!a.ownerDocument || !b.ownerDocument) return 0;
-		var aRange = a.ownerDocument.createRange(), bRange = b.ownerDocument.createRange();
-		aRange.setStart(a, 0);
-		aRange.setEnd(a, 0);
-		bRange.setStart(b, 0);
-		bRange.setEnd(b, 0);
-		return aRange.compareBoundaryPoints(Range.START_TO_END, bRange);
-	} : null;
-
-	root = null;
-
-	for (feature in features){
-		this[feature] = features[feature];
-	}
-};
-
-// Main Method
-
-var reSimpleSelector = /^([#.]?)((?:[\w-]+|\*))$/,
-	reEmptyAttribute = /\[.+[*$^]=(?:""|'')?\]/,
-	qsaFailExpCache = {};
-
-local.search = function(context, expression, append, first){
-
-	var found = this.found = (first) ? null : (append || []);
-
-	if (!context) return found;
-	else if (context.navigator) context = context.document; // Convert the node from a window to a document
-	else if (!context.nodeType) return found;
-
-	// setup
-
-	var parsed, i, node, nodes,
-		uniques = this.uniques = {},
-		hasOthers = !!(append && append.length),
-		contextIsDocument = (context.nodeType == 9);
-
-	if (this.document !== (contextIsDocument ? context : context.ownerDocument)) this.setDocument(context);
-
-	// avoid duplicating items already in the append array
-	if (hasOthers) for (i = found.length; i--;) uniques[this.getUID(found[i])] = true;
-
-	// expression checks
-
-	if (typeof expression == 'string'){ // expression is a string
-
-		/*<simple-selectors-override>*/
-		var simpleSelector = expression.match(reSimpleSelector);
-		simpleSelectors: if (simpleSelector){
-
-			var symbol = simpleSelector[1],
-				name = simpleSelector[2];
-
-			if (!symbol){
-
-				if (name == '*' && this.brokenStarGEBTN) break simpleSelectors;
-				nodes = context.getElementsByTagName(name);
-				if (first) return nodes[0] || null;
-				for (i = 0; node = nodes[i++];){
-					if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
-				}
-
-			} else if (symbol == '#'){
-
-				if (!this.isHTMLDocument || !contextIsDocument) break simpleSelectors;
-				node = context.getElementById(name);
-				if (!node) return found;
-				if (this.idGetsName && node.getAttributeNode('id').nodeValue != name) break simpleSelectors;
-				if (first) return node || null;
-				if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
-
-			} else if (symbol == '.'){
-
-				if (!this.isHTMLDocument || ((!context.getElementsByClassName || this.brokenGEBCN) && context.querySelectorAll)) break simpleSelectors;
-				if (context.getElementsByClassName && !this.brokenGEBCN){
-					nodes = context.getElementsByClassName(name);
-					if (first) return nodes[0] || null;
-					for (i = 0; node = nodes[i++];){
-						if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
-					}
-				} else {
-					var matchClass = new RegExp('(^|\\s)'+ Slick.escapeRegExp(name) +'(\\s|$)');
-					nodes = context.getElementsByTagName('*');
-					for (i = 0; node = nodes[i++];){
-						className = node.className;
-						if (!(className && matchClass.test(className))) continue;
-						if (first) return node;
-						if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
-					}
-				}
-
-			}
-
-			if (hasOthers) this.sort(found);
-			return (first) ? null : found;
-
-		}
-		/*</simple-selectors-override>*/
-
-		/*<query-selector-override>*/
-		querySelector: if (context.querySelectorAll){
-
-			if (!this.isHTMLDocument
-				|| qsaFailExpCache[expression]
-				//TODO: only skip when expression is actually mixed case
-				|| this.brokenMixedCaseQSA
-				|| (this.brokenCheckedQSA && expression.indexOf(':checked') > -1)
-				|| (this.brokenEmptyAttributeQSA && reEmptyAttribute.test(expression))
-				|| (!contextIsDocument //Abort when !contextIsDocument and...
-					//  there are multiple expressions in the selector
-					//  since we currently only fix non-document rooted QSA for single expression selectors
-					&& expression.indexOf(',') > -1
-				)
-				|| Slick.disableQSA
-			) break querySelector;
-
-			var _expression = expression, _context = context, currentId;
-			if (!contextIsDocument){
-				// non-document rooted QSA
-				// credits to Andrew Dupont
-				currentId = _context.getAttribute('id'), slickid = 'slickid__';
-				_context.setAttribute('id', slickid);
-				_expression = '#' + slickid + ' ' + _expression;
-				context = _context.parentNode;
-			}
-
-			try {
-				if (first) return context.querySelector(_expression) || null;
-				else nodes = context.querySelectorAll(_expression);
-			} catch (e){
-				qsaFailExpCache[expression] = 1;
-				break querySelector;
-			} finally {
-				if (!contextIsDocument){
-					if (currentId) _context.setAttribute('id', currentId);
-					else _context.removeAttribute('id');
-					context = _context;
-				}
-			}
-
-			if (this.starSelectsClosedQSA) for (i = 0; node = nodes[i++];){
-				if (node.nodeName > '@' && !(hasOthers && uniques[this.getUID(node)])) found.push(node);
-			} else for (i = 0; node = nodes[i++];){
-				if (!(hasOthers && uniques[this.getUID(node)])) found.push(node);
-			}
-
-			if (hasOthers) this.sort(found);
-			return found;
-
-		}
-		/*</query-selector-override>*/
-
-		parsed = this.Slick.parse(expression);
-		if (!parsed.length) return found;
-	} else if (expression == null){ // there is no expression
-		return found;
-	} else if (expression.Slick){ // expression is a parsed Slick object
-		parsed = expression;
-	} else if (this.contains(context.documentElement || context, expression)){ // expression is a node
-		(found) ? found.push(expression) : found = expression;
-		return found;
-	} else { // other junk
-		return found;
-	}
-
-	/*<pseudo-selectors>*//*<nth-pseudo-selectors>*/
-
-	// cache elements for the nth selectors
-
-	this.posNTH = {};
-	this.posNTHLast = {};
-	this.posNTHType = {};
-	this.posNTHTypeLast = {};
-
-	/*</nth-pseudo-selectors>*//*</pseudo-selectors>*/
-
-	// if append is null and there is only a single selector with one expression use pushArray, else use pushUID
-	this.push = (!hasOthers && (first || (parsed.length == 1 && parsed.expressions[0].length == 1))) ? this.pushArray : this.pushUID;
-
-	if (found == null) found = [];
-
-	// default engine
-
-	var j, m, n;
-	var combinator, tag, id, classList, classes, attributes, pseudos;
-	var currentItems, currentExpression, currentBit, lastBit, expressions = parsed.expressions;
-
-	search: for (i = 0; (currentExpression = expressions[i]); i++) for (j = 0; (currentBit = currentExpression[j]); j++){
-
-		combinator = 'combinator:' + currentBit.combinator;
-		if (!this[combinator]) continue search;
-
-		tag        = (this.isXMLDocument) ? currentBit.tag : currentBit.tag.toUpperCase();
-		id         = currentBit.id;
-		classList  = currentBit.classList;
-		classes    = currentBit.classes;
-		attributes = currentBit.attributes;
-		pseudos    = currentBit.pseudos;
-		lastBit    = (j === (currentExpression.length - 1));
-
-		this.bitUniques = {};
-
-		if (lastBit){
-			this.uniques = uniques;
-			this.found = found;
-		} else {
-			this.uniques = {};
-			this.found = [];
-		}
-
-		if (j === 0){
-			this[combinator](context, tag, id, classes, attributes, pseudos, classList);
-			if (first && lastBit && found.length) break search;
-		} else {
-			if (first && lastBit) for (m = 0, n = currentItems.length; m < n; m++){
-				this[combinator](currentItems[m], tag, id, classes, attributes, pseudos, classList);
-				if (found.length) break search;
-			} else for (m = 0, n = currentItems.length; m < n; m++) this[combinator](currentItems[m], tag, id, classes, attributes, pseudos, classList);
-		}
-
-		currentItems = this.found;
-	}
-
-	// should sort if there are nodes in append and if you pass multiple expressions.
-	if (hasOthers || (parsed.expressions.length > 1)) this.sort(found);
-
-	return (first) ? (found[0] || null) : found;
-};
-
-// Utils
-
-local.uidx = 1;
-local.uidk = 'slick-uniqueid';
-
-local.getUIDXML = function(node){
-	var uid = node.getAttribute(this.uidk);
-	if (!uid){
-		uid = this.uidx++;
-		node.setAttribute(this.uidk, uid);
-	}
-	return uid;
-};
-
-local.getUIDHTML = function(node){
-	return node.uniqueNumber || (node.uniqueNumber = this.uidx++);
-};
-
-// sort based on the setDocument documentSorter method.
-
-local.sort = function(results){
-	if (!this.documentSorter) return results;
-	results.sort(this.documentSorter);
-	return results;
-};
-
-/*<pseudo-selectors>*//*<nth-pseudo-selectors>*/
-
-local.cacheNTH = {};
-
-local.matchNTH = /^([+-]?\d*)?([a-z]+)?([+-]\d+)?$/;
-
-local.parseNTHArgument = function(argument){
-	var parsed = argument.match(this.matchNTH);
-	if (!parsed) return false;
-	var special = parsed[2] || false;
-	var a = parsed[1] || 1;
-	if (a == '-') a = -1;
-	var b = +parsed[3] || 0;
-	parsed =
-		(special == 'n')	? {a: a, b: b} :
-		(special == 'odd')	? {a: 2, b: 1} :
-		(special == 'even')	? {a: 2, b: 0} : {a: 0, b: a};
-
-	return (this.cacheNTH[argument] = parsed);
-};
-
-local.createNTHPseudo = function(child, sibling, positions, ofType){
-	return function(node, argument){
-		var uid = this.getUID(node);
-		if (!this[positions][uid]){
-			var parent = node.parentNode;
-			if (!parent) return false;
-			var el = parent[child], count = 1;
-			if (ofType){
-				var nodeName = node.nodeName;
-				do {
-					if (el.nodeName != nodeName) continue;
-					this[positions][this.getUID(el)] = count++;
-				} while ((el = el[sibling]));
-			} else {
-				do {
-					if (el.nodeType != 1) continue;
-					this[positions][this.getUID(el)] = count++;
-				} while ((el = el[sibling]));
-			}
-		}
-		argument = argument || 'n';
-		var parsed = this.cacheNTH[argument] || this.parseNTHArgument(argument);
-		if (!parsed) return false;
-		var a = parsed.a, b = parsed.b, pos = this[positions][uid];
-		if (a == 0) return b == pos;
-		if (a > 0){
-			if (pos < b) return false;
-		} else {
-			if (b < pos) return false;
-		}
-		return ((pos - b) % a) == 0;
-	};
-};
-
-/*</nth-pseudo-selectors>*//*</pseudo-selectors>*/
-
-local.pushArray = function(node, tag, id, classes, attributes, pseudos){
-	if (this.matchSelector(node, tag, id, classes, attributes, pseudos)) this.found.push(node);
-};
-
-local.pushUID = function(node, tag, id, classes, attributes, pseudos){
-	var uid = this.getUID(node);
-	if (!this.uniques[uid] && this.matchSelector(node, tag, id, classes, attributes, pseudos)){
-		this.uniques[uid] = true;
-		this.found.push(node);
-	}
-};
-
-local.matchNode = function(node, selector){
-	if (this.isHTMLDocument && this.nativeMatchesSelector){
-		try {
-			return this.nativeMatchesSelector.call(node, selector.replace(/\[([^=]+)=\s*([^'"\]]+?)\s*\]/g, '[$1="$2"]'));
-		} catch (matchError){}
-	}
-
-	var parsed = this.Slick.parse(selector);
-	if (!parsed) return true;
-
-	// simple (single) selectors
-	var expressions = parsed.expressions, simpleExpCounter = 0, i, currentExpression;
-	for (i = 0; (currentExpression = expressions[i]); i++){
-		if (currentExpression.length == 1){
-			var exp = currentExpression[0];
-			if (this.matchSelector(node, (this.isXMLDocument) ? exp.tag : exp.tag.toUpperCase(), exp.id, exp.classes, exp.attributes, exp.pseudos)) return true;
-			simpleExpCounter++;
-		}
-	}
-
-	if (simpleExpCounter == parsed.length) return false;
-
-	var nodes = this.search(this.document, parsed), item;
-	for (i = 0; item = nodes[i++];){
-		if (item === node) return true;
-	}
-	return false;
-};
-
-local.matchPseudo = function(node, name, argument){
-	var pseudoName = 'pseudo:' + name;
-	if (this[pseudoName]) return this[pseudoName](node, argument);
-	var attribute = this.getAttribute(node, name);
-	return (argument) ? argument == attribute : !!attribute;
-};
-
-local.matchSelector = function(node, tag, id, classes, attributes, pseudos){
-	if (tag){
-		var nodeName = (this.isXMLDocument) ? node.nodeName : node.nodeName.toUpperCase();
-		if (tag == '*'){
-			if (nodeName < '@') return false; // Fix for comment nodes and closed nodes
-		} else {
-			if (nodeName != tag) return false;
-		}
-	}
-
-	if (id && node.getAttribute('id') != id) return false;
-
-	var i, part, cls;
-	if (classes) for (i = classes.length; i--;){
-		cls = this.getAttribute(node, 'class');
-		if (!(cls && classes[i].regexp.test(cls))) return false;
-	}
-	if (attributes) for (i = attributes.length; i--;){
-		part = attributes[i];
-		if (part.operator ? !part.test(this.getAttribute(node, part.key)) : !this.hasAttribute(node, part.key)) return false;
-	}
-	if (pseudos) for (i = pseudos.length; i--;){
-		part = pseudos[i];
-		if (!this.matchPseudo(node, part.key, part.value)) return false;
-	}
-	return true;
-};
-
-var combinators = {
-
-	' ': function(node, tag, id, classes, attributes, pseudos, classList){ // all child nodes, any level
-
-		var i, item, children;
-
-		if (this.isHTMLDocument){
-			getById: if (id){
-				item = this.document.getElementById(id);
-				if ((!item && node.all) || (this.idGetsName && item && item.getAttributeNode('id').nodeValue != id)){
-					// all[id] returns all the elements with that name or id inside node
-					// if theres just one it will return the element, else it will be a collection
-					children = node.all[id];
-					if (!children) return;
-					if (!children[0]) children = [children];
-					for (i = 0; item = children[i++];){
-						var idNode = item.getAttributeNode('id');
-						if (idNode && idNode.nodeValue == id){
-							this.push(item, tag, null, classes, attributes, pseudos);
-							break;
-						}
-					}
-					return;
-				}
-				if (!item){
-					// if the context is in the dom we return, else we will try GEBTN, breaking the getById label
-					if (this.contains(this.root, node)) return;
-					else break getById;
-				} else if (this.document !== node && !this.contains(node, item)) return;
-				this.push(item, tag, null, classes, attributes, pseudos);
-				return;
-			}
-			getByClass: if (classes && node.getElementsByClassName && !this.brokenGEBCN){
-				children = node.getElementsByClassName(classList.join(' '));
-				if (!(children && children.length)) break getByClass;
-				for (i = 0; item = children[i++];) this.push(item, tag, id, null, attributes, pseudos);
-				return;
-			}
-		}
-		getByTag: {
-			children = node.getElementsByTagName(tag);
-			if (!(children && children.length)) break getByTag;
-			if (!this.brokenStarGEBTN) tag = null;
-			for (i = 0; item = children[i++];) this.push(item, tag, id, classes, attributes, pseudos);
-		}
-	},
-
-	'>': function(node, tag, id, classes, attributes, pseudos){ // direct children
-		if ((node = node.firstChild)) do {
-			if (node.nodeType == 1) this.push(node, tag, id, classes, attributes, pseudos);
-		} while ((node = node.nextSibling));
-	},
-
-	'+': function(node, tag, id, classes, attributes, pseudos){ // next sibling
-		while ((node = node.nextSibling)) if (node.nodeType == 1){
-			this.push(node, tag, id, classes, attributes, pseudos);
-			break;
-		}
-	},
-
-	'^': function(node, tag, id, classes, attributes, pseudos){ // first child
-		node = node.firstChild;
-		if (node){
-			if (node.nodeType == 1) this.push(node, tag, id, classes, attributes, pseudos);
-			else this['combinator:+'](node, tag, id, classes, attributes, pseudos);
-		}
-	},
-
-	'~': function(node, tag, id, classes, attributes, pseudos){ // next siblings
-		while ((node = node.nextSibling)){
-			if (node.nodeType != 1) continue;
-			var uid = this.getUID(node);
-			if (this.bitUniques[uid]) break;
-			this.bitUniques[uid] = true;
-			this.push(node, tag, id, classes, attributes, pseudos);
-		}
-	},
-
-	'++': function(node, tag, id, classes, attributes, pseudos){ // next sibling and previous sibling
-		this['combinator:+'](node, tag, id, classes, attributes, pseudos);
-		this['combinator:!+'](node, tag, id, classes, attributes, pseudos);
-	},
-
-	'~~': function(node, tag, id, classes, attributes, pseudos){ // next siblings and previous siblings
-		this['combinator:~'](node, tag, id, classes, attributes, pseudos);
-		this['combinator:!~'](node, tag, id, classes, attributes, pseudos);
-	},
-
-	'!': function(node, tag, id, classes, attributes, pseudos){ // all parent nodes up to document
-		while ((node = node.parentNode)) if (node !== this.document) this.push(node, tag, id, classes, attributes, pseudos);
-	},
-
-	'!>': function(node, tag, id, classes, attributes, pseudos){ // direct parent (one level)
-		node = node.parentNode;
-		if (node !== this.document) this.push(node, tag, id, classes, attributes, pseudos);
-	},
-
-	'!+': function(node, tag, id, classes, attributes, pseudos){ // previous sibling
-		while ((node = node.previousSibling)) if (node.nodeType == 1){
-			this.push(node, tag, id, classes, attributes, pseudos);
-			break;
-		}
-	},
-
-	'!^': function(node, tag, id, classes, attributes, pseudos){ // last child
-		node = node.lastChild;
-		if (node){
-			if (node.nodeType == 1) this.push(node, tag, id, classes, attributes, pseudos);
-			else this['combinator:!+'](node, tag, id, classes, attributes, pseudos);
-		}
-	},
-
-	'!~': function(node, tag, id, classes, attributes, pseudos){ // previous siblings
-		while ((node = node.previousSibling)){
-			if (node.nodeType != 1) continue;
-			var uid = this.getUID(node);
-			if (this.bitUniques[uid]) break;
-			this.bitUniques[uid] = true;
-			this.push(node, tag, id, classes, attributes, pseudos);
-		}
-	}
-
-};
-
-for (var c in combinators) local['combinator:' + c] = combinators[c];
-
-var pseudos = {
-
-	/*<pseudo-selectors>*/
-
-	'empty': function(node){
-		var child = node.firstChild;
-		return !(child && child.nodeType == 1) && !(node.innerText || node.textContent || '').length;
-	},
-
-	'not': function(node, expression){
-		return !this.matchNode(node, expression);
-	},
-
-	'contains': function(node, text){
-		return (node.innerText || node.textContent || '').indexOf(text) > -1;
-	},
-
-	'first-child': function(node){
-		while ((node = node.previousSibling)) if (node.nodeType == 1) return false;
-		return true;
-	},
-
-	'last-child': function(node){
-		while ((node = node.nextSibling)) if (node.nodeType == 1) return false;
-		return true;
-	},
-
-	'only-child': function(node){
-		var prev = node;
-		while ((prev = prev.previousSibling)) if (prev.nodeType == 1) return false;
-		var next = node;
-		while ((next = next.nextSibling)) if (next.nodeType == 1) return false;
-		return true;
-	},
-
-	/*<nth-pseudo-selectors>*/
-
-	'nth-child': local.createNTHPseudo('firstChild', 'nextSibling', 'posNTH'),
-
-	'nth-last-child': local.createNTHPseudo('lastChild', 'previousSibling', 'posNTHLast'),
-
-	'nth-of-type': local.createNTHPseudo('firstChild', 'nextSibling', 'posNTHType', true),
-
-	'nth-last-of-type': local.createNTHPseudo('lastChild', 'previousSibling', 'posNTHTypeLast', true),
-
-	'index': function(node, index){
-		return this['pseudo:nth-child'](node, '' + (index + 1));
-	},
-
-	'even': function(node){
-		return this['pseudo:nth-child'](node, '2n');
-	},
-
-	'odd': function(node){
-		return this['pseudo:nth-child'](node, '2n+1');
-	},
-
-	/*</nth-pseudo-selectors>*/
-
-	/*<of-type-pseudo-selectors>*/
-
-	'first-of-type': function(node){
-		var nodeName = node.nodeName;
-		while ((node = node.previousSibling)) if (node.nodeName == nodeName) return false;
-		return true;
-	},
-
-	'last-of-type': function(node){
-		var nodeName = node.nodeName;
-		while ((node = node.nextSibling)) if (node.nodeName == nodeName) return false;
-		return true;
-	},
-
-	'only-of-type': function(node){
-		var prev = node, nodeName = node.nodeName;
-		while ((prev = prev.previousSibling)) if (prev.nodeName == nodeName) return false;
-		var next = node;
-		while ((next = next.nextSibling)) if (next.nodeName == nodeName) return false;
-		return true;
-	},
-
-	/*</of-type-pseudo-selectors>*/
-
-	// custom pseudos
-
-	'enabled': function(node){
-		return !node.disabled;
-	},
-
-	'disabled': function(node){
-		return node.disabled;
-	},
-
-	'checked': function(node){
-		return node.checked || node.selected;
-	},
-
-	'focus': function(node){
-		return this.isHTMLDocument && this.document.activeElement === node && (node.href || node.type || this.hasAttribute(node, 'tabindex'));
-	},
-
-	'root': function(node){
-		return (node === this.root);
-	},
-
-	'selected': function(node){
-		return node.selected;
-	}
-
-	/*</pseudo-selectors>*/
-};
-
-for (var p in pseudos) local['pseudo:' + p] = pseudos[p];
-
-// attributes methods
-
-var attributeGetters = local.attributeGetters = {
-
-	'for': function(){
-		return ('htmlFor' in this) ? this.htmlFor : this.getAttribute('for');
-	},
-
-	'href': function(){
-		return ('href' in this) ? this.getAttribute('href', 2) : this.getAttribute('href');
-	},
-
-	'style': function(){
-		return (this.style) ? this.style.cssText : this.getAttribute('style');
-	},
-
-	'tabindex': function(){
-		var attributeNode = this.getAttributeNode('tabindex');
-		return (attributeNode && attributeNode.specified) ? attributeNode.nodeValue : null;
-	},
-
-	'type': function(){
-		return this.getAttribute('type');
-	},
-
-	'maxlength': function(){
-		var attributeNode = this.getAttributeNode('maxLength');
-		return (attributeNode && attributeNode.specified) ? attributeNode.nodeValue : null;
-	}
-
-};
-
-attributeGetters.MAXLENGTH = attributeGetters.maxLength = attributeGetters.maxlength;
-
-// Slick
-
-var Slick = local.Slick = (this.Slick || {});
-
-Slick.version = '1.1.7';
-
-// Slick finder
-
-Slick.search = function(context, expression, append){
-	return local.search(context, expression, append);
-};
-
-Slick.find = function(context, expression){
-	return local.search(context, expression, null, true);
-};
-
-// Slick containment checker
-
-Slick.contains = function(container, node){
-	local.setDocument(container);
-	return local.contains(container, node);
-};
-
-// Slick attribute getter
-
-Slick.getAttribute = function(node, name){
-	local.setDocument(node);
-	return local.getAttribute(node, name);
-};
-
-Slick.hasAttribute = function(node, name){
-	local.setDocument(node);
-	return local.hasAttribute(node, name);
-};
-
-// Slick matcher
-
-Slick.match = function(node, selector){
-	if (!(node && selector)) return false;
-	if (!selector || selector === node) return true;
-	local.setDocument(node);
-	return local.matchNode(node, selector);
-};
-
-// Slick attribute accessor
-
-Slick.defineAttributeGetter = function(name, fn){
-	local.attributeGetters[name] = fn;
-	return this;
-};
-
-Slick.lookupAttributeGetter = function(name){
-	return local.attributeGetters[name];
-};
-
-// Slick pseudo accessor
-
-Slick.definePseudo = function(name, fn){
-	local['pseudo:' + name] = function(node, argument){
-		return fn.call(node, argument);
-	};
-	return this;
-};
-
-Slick.lookupPseudo = function(name){
-	var pseudo = local['pseudo:' + name];
-	if (pseudo) return function(argument){
-		return pseudo.call(this, argument);
-	};
-	return null;
-};
-
-// Slick overrides accessor
-
-Slick.override = function(regexp, fn){
-	local.override(regexp, fn);
-	return this;
-};
-
-Slick.isXML = local.isXML;
-
-Slick.uidOf = function(node){
-	return local.getUIDHTML(node);
-};
-
-if (!this.Slick) this.Slick = Slick;
-
-}).apply(/*<CommonJS>*/(typeof exports != 'undefined') ? exports : /*</CommonJS>*/this);
-
-/*
----
-
-name: Element
-
-description: One of the most important items in MooTools. Contains the dollar function, the dollars function, and an handful of cross-browser, time-saver methods to let you easily work with HTML Elements.
-
-license: MIT-style license.
-
-requires: [Window, Document, Array, String, Function, Object, Number, Slick.Parser, Slick.Finder]
-
-provides: [Element, Elements, $, $$, IFrame, Selectors]
-
-...
-*/
-
-var Element = this.Element = function(tag, props){
-	var konstructor = Element.Constructors[tag];
-	if (konstructor) return konstructor(props);
-	if (typeof tag != 'string') return document.id(tag).set(props);
-
-	if (!props) props = {};
-
-	if (!(/^[\w-]+$/).test(tag)){
-		var parsed = Slick.parse(tag).expressions[0][0];
-		tag = (parsed.tag == '*') ? 'div' : parsed.tag;
-		if (parsed.id && props.id == null) props.id = parsed.id;
-
-		var attributes = parsed.attributes;
-		if (attributes) for (var attr, i = 0, l = attributes.length; i < l; i++){
-			attr = attributes[i];
-			if (props[attr.key] != null) continue;
-
-			if (attr.value != null && attr.operator == '=') props[attr.key] = attr.value;
-			else if (!attr.value && !attr.operator) props[attr.key] = true;
-		}
-
-		if (parsed.classList && props['class'] == null) props['class'] = parsed.classList.join(' ');
-	}
-
-	return document.newElement(tag, props);
-};
-
-
-if (Browser.Element){
-	Element.prototype = Browser.Element.prototype;
-	// IE8 and IE9 require the wrapping.
-	Element.prototype._fireEvent = (function(fireEvent){
-		return function(type, event){
-			return fireEvent.call(this, type, event);
-		};
-	})(Element.prototype.fireEvent);
-}
-
-new Type('Element', Element).mirror(function(name){
-	if (Array.prototype[name]) return;
-
-	var obj = {};
-	obj[name] = function(){
-		var results = [], args = arguments, elements = true;
-		for (var i = 0, l = this.length; i < l; i++){
-			var element = this[i], result = results[i] = element[name].apply(element, args);
-			elements = (elements && typeOf(result) == 'element');
-		}
-		return (elements) ? new Elements(results) : results;
-	};
-
-	Elements.implement(obj);
-});
-
-if (!Browser.Element){
-	Element.parent = Object;
-
-	Element.Prototype = {
-		'$constructor': Element,
-		'$family': Function.convert('element').hide()
-	};
-
-	Element.mirror(function(name, method){
-		Element.Prototype[name] = method;
-	});
-}
-
-Element.Constructors = {};
-
-//<1.2compat>
-
-Element.Constructors = new Hash;
-
-//</1.2compat>
-
-var IFrame = new Type('IFrame', function(){
-	var params = Array.link(arguments, {
-		properties: Type.isObject,
-		iframe: function(obj){
-			return (obj != null);
-		}
-	});
-
-	var props = params.properties || {}, iframe;
-	if (params.iframe) iframe = document.id(params.iframe);
-	var onload = props.onload || function(){};
-	delete props.onload;
-	props.id = props.name = [props.id, props.name, iframe ? (iframe.id || iframe.name) : 'IFrame_' + String.uniqueID()].pick();
-	iframe = new Element(iframe || 'iframe', props);
-
-	var onLoad = function(){
-		onload.call(iframe.contentWindow);
-	};
-
-	if (window.frames[props.id]) onLoad();
-	else iframe.addListener('load', onLoad);
-	return iframe;
-});
-
-var Elements = this.Elements = function(nodes){
-	if (nodes && nodes.length){
-		var uniques = {}, node;
-		for (var i = 0; node = nodes[i++];){
-			var uid = Slick.uidOf(node);
-			if (!uniques[uid]){
-				uniques[uid] = true;
-				this.push(node);
-			}
-		}
-	}
-};
-
-Elements.prototype = {length: 0};
-Elements.parent = Array;
-
-new Type('Elements', Elements).implement({
-
-	filter: function(filter, bind){
-		if (!filter) return this;
-		return new Elements(Array.filter(this, (typeOf(filter) == 'string') ? function(item){
-			return item.match(filter);
-		} : filter, bind));
-	}.protect(),
-
-	push: function(){
-		var length = this.length;
-		for (var i = 0, l = arguments.length; i < l; i++){
-			var item = document.id(arguments[i]);
-			if (item) this[length++] = item;
-		}
-		return (this.length = length);
-	}.protect(),
-
-	unshift: function(){
-		var items = [];
-		for (var i = 0, l = arguments.length; i < l; i++){
-			var item = document.id(arguments[i]);
-			if (item) items.push(item);
-		}
-		return Array.prototype.unshift.apply(this, items);
-	}.protect(),
-
-	concat: function(){
-		var newElements = new Elements(this);
-		for (var i = 0, l = arguments.length; i < l; i++){
-			var item = arguments[i];
-			if (Type.isEnumerable(item)) newElements.append(item);
-			else newElements.push(item);
-		}
-		return newElements;
-	}.protect(),
-
-	append: function(collection){
-		for (var i = 0, l = collection.length; i < l; i++) this.push(collection[i]);
-		return this;
-	}.protect(),
-
-	empty: function(){
-		while (this.length) delete this[--this.length];
-		return this;
-	}.protect()
-
-});
-
-//<1.2compat>
-
-Elements.alias('extend', 'append');
-
-//</1.2compat>
-
-(function(){
-
-// FF, IE
-var splice = Array.prototype.splice, object = {'0': 0, '1': 1, length: 2};
-
-splice.call(object, 1, 1);
-if (object[1] == 1) Elements.implement('splice', function(){
-	var length = this.length;
-	var result = splice.apply(this, arguments);
-	while (length >= this.length) delete this[length--];
-	return result;
-}.protect());
-
-Array.forEachMethod(function(method, name){
-	Elements.implement(name, method);
-});
-
-Array.mirror(Elements);
-
-/*<ltIE8>*/
-var createElementAcceptsHTML;
-try {
-	createElementAcceptsHTML = (document.createElement('<input name=x>').name == 'x');
-} catch (e){}
-
-var escapeQuotes = function(html){
-	return ('' + html).replace(/&/g, '&amp;').replace(/"/g, '&quot;');
-};
-/*</ltIE8>*/
-
-/*<ltIE9>*/
-// #2479 - IE8 Cannot set HTML of style element
-var canChangeStyleHTML = (function(){
-	var div = document.createElement('style'),
-		flag = false;
-	try {
-		div.innerHTML = '#justTesing{margin: 0px;}';
-		flag = !!div.innerHTML;
-	} catch (e){}
-	return flag;
-})();
-/*</ltIE9>*/
-
-Document.implement({
-
-	newElement: function(tag, props){
-		if (props){
-			if (props.checked != null) props.defaultChecked = props.checked;
-			if ((props.type == 'checkbox' || props.type == 'radio') && props.value == null) props.value = 'on';
-			/*<ltIE9>*/ // IE needs the type to be set before changing content of style element
-			if (!canChangeStyleHTML && tag == 'style'){
-				var styleElement = document.createElement('style');
-				styleElement.setAttribute('type', 'text/css');
-				if (props.type) delete props.type;
-				return this.id(styleElement).set(props);
-			}
-			/*</ltIE9>*/
-			/*<ltIE8>*/// Fix for readonly name and type properties in IE < 8
-			if (createElementAcceptsHTML){
-				tag = '<' + tag;
-				if (props.name) tag += ' name="' + escapeQuotes(props.name) + '"';
-				if (props.type) tag += ' type="' + escapeQuotes(props.type) + '"';
-				tag += '>';
-				delete props.name;
-				delete props.type;
-			}
-			/*</ltIE8>*/
-		}
-		return this.id(this.createElement(tag)).set(props);
-	}
-
-});
-
-})();
-
-(function(){
-
-Slick.uidOf(window);
-Slick.uidOf(document);
-
-Document.implement({
-
-	newTextNode: function(text){
-		return this.createTextNode(text);
-	},
-
-	getDocument: function(){
-		return this;
-	},
-
-	getWindow: function(){
-		return this.window;
-	},
-
-	id: (function(){
-
-		var types = {
-
-			string: function(id, nocash, doc){
-				id = Slick.find(doc, '#' + id.replace(/(\W)/g, '\\$1'));
-				return (id) ? types.element(id, nocash) : null;
-			},
-
-			element: function(el, nocash){
-				Slick.uidOf(el);
-				if (!nocash && !el.$family && !(/^(?:object|embed)$/i).test(el.tagName)){
-					var fireEvent = el.fireEvent;
-					// wrapping needed in IE7, or else crash
-					el._fireEvent = function(type, event){
-						return fireEvent(type, event);
-					};
-					Object.append(el, Element.Prototype);
-				}
-				return el;
-			},
-
-			object: function(obj, nocash, doc){
-				if (obj.toElement) return types.element(obj.toElement(doc), nocash);
-				return null;
-			}
-
-		};
-
-		types.textnode = types.whitespace = types.window = types.document = function(zero){
-			return zero;
-		};
-
-		return function(el, nocash, doc){
-			if (el && el.$family && el.uniqueNumber) return el;
-			var type = typeOf(el);
-			return (types[type]) ? types[type](el, nocash, doc || document) : null;
-		};
-
-	})()
-
-});
-
-if (window.$ == null) Window.implement('$', function(el, nc){
-	return document.id(el, nc, this.document);
-});
-
-Window.implement({
-
-	getDocument: function(){
-		return this.document;
-	},
-
-	getWindow: function(){
-		return this;
-	}
-
-});
-
-[Document, Element].invoke('implement', {
-
-	getElements: function(expression){
-		return Slick.search(this, expression, new Elements);
-	},
-
-	getElement: function(expression){
-		return document.id(Slick.find(this, expression));
-	}
-
-});
-
-var contains = {contains: function(element){
-	return Slick.contains(this, element);
-}};
-
-if (!document.contains) Document.implement(contains);
-if (!document.createElement('div').contains) Element.implement(contains);
-
-//<1.2compat>
-
-Element.implement('hasChild', function(element){
-	return this !== element && this.contains(element);
-});
-
-(function(search, find, match){
-
-	this.Selectors = {};
-	var pseudos = this.Selectors.Pseudo = new Hash();
-
-	var addSlickPseudos = function(){
-		for (var name in pseudos) if (pseudos.hasOwnProperty(name)){
-			Slick.definePseudo(name, pseudos[name]);
-			delete pseudos[name];
-		}
-	};
-
-	Slick.search = function(context, expression, append){
-		addSlickPseudos();
-		return search.call(this, context, expression, append);
-	};
-
-	Slick.find = function(context, expression){
-		addSlickPseudos();
-		return find.call(this, context, expression);
-	};
-
-	Slick.match = function(node, selector){
-		addSlickPseudos();
-		return match.call(this, node, selector);
-	};
-
-})(Slick.search, Slick.find, Slick.match);
-
-//</1.2compat>
-
-// tree walking
-
-var injectCombinator = function(expression, combinator){
-	if (!expression) return combinator;
-
-	expression = Object.clone(Slick.parse(expression));
-
-	var expressions = expression.expressions;
-	for (var i = expressions.length; i--;)
-		expressions[i][0].combinator = combinator;
-
-	return expression;
-};
-
-Object.forEach({
-	getNext: '~',
-	getPrevious: '!~',
-	getParent: '!'
-}, function(combinator, method){
-	Element.implement(method, function(expression){
-		return this.getElement(injectCombinator(expression, combinator));
-	});
-});
-
-Object.forEach({
-	getAllNext: '~',
-	getAllPrevious: '!~',
-	getSiblings: '~~',
-	getChildren: '>',
-	getParents: '!'
-}, function(combinator, method){
-	Element.implement(method, function(expression){
-		return this.getElements(injectCombinator(expression, combinator));
-	});
-});
-
-Element.implement({
-
-	getFirst: function(expression){
-		return document.id(Slick.search(this, injectCombinator(expression, '>'))[0]);
-	},
-
-	getLast: function(expression){
-		return document.id(Slick.search(this, injectCombinator(expression, '>')).getLast());
-	},
-
-	getWindow: function(){
-		return this.ownerDocument.window;
-	},
-
-	getDocument: function(){
-		return this.ownerDocument;
-	},
-
-	getElementById: function(id){
-		return document.id(Slick.find(this, '#' + ('' + id).replace(/(\W)/g, '\\$1')));
-	},
-
-	match: function(expression){
-		return !expression || Slick.match(this, expression);
-	}
-
-});
-
-//<1.2compat>
-
-if (window.$$ == null) Window.implement('$$', function(selector){
-	var elements = new Elements;
-	if (arguments.length == 1 && typeof selector == 'string') return Slick.search(this.document, selector, elements);
-	var args = Array.flatten(arguments);
-	for (var i = 0, l = args.length; i < l; i++){
-		var item = args[i];
-		switch (typeOf(item)){
-			case 'element': elements.push(item); break;
-			case 'string': Slick.search(this.document, item, elements);
-		}
-	}
-	return elements;
-});
-
-//</1.2compat>
-
-if (window.$$ == null) Window.implement('$$', function(selector){
-	if (arguments.length == 1){
-		if (typeof selector == 'string') return Slick.search(this.document, selector, new Elements);
-		else if (Type.isEnumerable(selector)) return new Elements(selector);
-	}
-	return new Elements(arguments);
-});
-
-// Inserters
-
-var inserters = {
-
-	before: function(context, element){
-		var parent = element.parentNode;
-		if (parent) parent.insertBefore(context, element);
-	},
-
-	after: function(context, element){
-		var parent = element.parentNode;
-		if (parent) parent.insertBefore(context, element.nextSibling);
-	},
-
-	bottom: function(context, element){
-		element.appendChild(context);
-	},
-
-	top: function(context, element){
-		element.insertBefore(context, element.firstChild);
-	}
-
-};
-
-inserters.inside = inserters.bottom;
-
-//<1.2compat>
-
-Object.each(inserters, function(inserter, where){
-
-	where = where.capitalize();
-
-	var methods = {};
-
-	methods['inject' + where] = function(el){
-		inserter(this, document.id(el, true));
-		return this;
-	};
-
-	methods['grab' + where] = function(el){
-		inserter(document.id(el, true), this);
-		return this;
-	};
-
-	Element.implement(methods);
-
-});
-
-//</1.2compat>
-
-// getProperty / setProperty
-
-var propertyGetters = {}, propertySetters = {};
-
-// properties
-
-var properties = {};
-Array.forEach([
-	'type', 'value', 'defaultValue', 'accessKey', 'cellPadding', 'cellSpacing', 'colSpan',
-	'frameBorder', 'rowSpan', 'tabIndex', 'useMap'
-], function(property){
-	properties[property.toLowerCase()] = property;
-});
-
-properties.html = 'innerHTML';
-properties.text = (document.createElement('div').textContent == null) ? 'innerText': 'textContent';
-
-Object.forEach(properties, function(real, key){
-	propertySetters[key] = function(node, value){
-		node[real] = value;
-	};
-	propertyGetters[key] = function(node){
-		return node[real];
-	};
-});
-
-/*<ltIE9>*/
-propertySetters.text = (function(){
-	return function(node, value){
-		if (node.get('tag') == 'style') node.set('html', value);
-		else node[properties.text] = value;
-	};
-})(propertySetters.text);
-
-propertyGetters.text = (function(getter){
-	return function(node){
-		return (node.get('tag') == 'style') ? node.innerHTML : getter(node);
-	};
-})(propertyGetters.text);
-/*</ltIE9>*/
-
-// Booleans
-
-var bools = [
-	'compact', 'nowrap', 'ismap', 'declare', 'noshade', 'checked',
-	'disabled', 'readOnly', 'multiple', 'selected', 'noresize',
-	'defer', 'defaultChecked', 'autofocus', 'controls', 'autoplay',
-	'loop'
-];
-
-var booleans = {};
-Array.forEach(bools, function(bool){
-	var lower = bool.toLowerCase();
-	booleans[lower] = bool;
-	propertySetters[lower] = function(node, value){
-		node[bool] = !!value;
-	};
-	propertyGetters[lower] = function(node){
-		return !!node[bool];
-	};
-});
-
-// Special cases
-
-Object.append(propertySetters, {
-
-	'class': function(node, value){
-		('className' in node) ? node.className = (value || '') : node.setAttribute('class', value);
-	},
-
-	'for': function(node, value){
-		('htmlFor' in node) ? node.htmlFor = value : node.setAttribute('for', value);
-	},
-
-	'style': function(node, value){
-		(node.style) ? node.style.cssText = value : node.setAttribute('style', value);
-	},
-
-	'value': function(node, value){
-		node.value = (value != null) ? value : '';
-	}
-
-});
-
-propertyGetters['class'] = function(node){
-	return ('className' in node) ? node.className || null : node.getAttribute('class');
-};
-
-/* <webkit> */
-var el = document.createElement('button');
-// IE sets type as readonly and throws
-try { el.type = 'button'; } catch (e){}
-if (el.type != 'button') propertySetters.type = function(node, value){
-	node.setAttribute('type', value);
-};
-el = null;
-/* </webkit> */
-
-/*<IE>*/
-
-/*<ltIE9>*/
-// #2479 - IE8 Cannot set HTML of style element
-var canChangeStyleHTML = (function(){
-	var div = document.createElement('style'),
-		flag = false;
-	try {
-		div.innerHTML = '#justTesing{margin: 0px;}';
-		flag = !!div.innerHTML;
-	} catch (e){}
-	return flag;
-})();
-/*</ltIE9>*/
-
-var input = document.createElement('input'), volatileInputValue, html5InputSupport;
-
-// #2178
-input.value = 't';
-input.type = 'submit';
-volatileInputValue = input.value != 't';
-
-// #2443 - IE throws "Invalid Argument" when trying to use html5 input types
-try {
-	input.value = '';
-	input.type = 'email';
-	html5InputSupport = input.type == 'email';
-} catch (e){}
-
-input = null;
-
-if (volatileInputValue || !html5InputSupport) propertySetters.type = function(node, type){
-	try {
-		var value = node.value;
-		node.type = type;
-		node.value = value;
-	} catch (e){}
-};
-/*</IE>*/
-
-/* getProperty, setProperty */
-
-/* <ltIE9> */
-var pollutesGetAttribute = (function(div){
-	div.random = 'attribute';
-	return (div.getAttribute('random') == 'attribute');
-})(document.createElement('div'));
-
-var hasCloneBug = (function(test){
-	test.innerHTML = '<object><param name="should_fix" value="the unknown" /></object>';
-	return test.cloneNode(true).firstChild.childNodes.length != 1;
-})(document.createElement('div'));
-/* </ltIE9> */
-
-var hasClassList = !!document.createElement('div').classList;
-
-var classes = function(className){
-	var classNames = (className || '').clean().split(' '), uniques = {};
-	return classNames.filter(function(className){
-		if (className !== '' && !uniques[className]) return uniques[className] = className;
-	});
-};
-
-var addToClassList = function(name){
-	this.classList.add(name);
-};
-
-var removeFromClassList = function(name){
-	this.classList.remove(name);
-};
-
-Element.implement({
-
-	setProperty: function(name, value){
-		var setter = propertySetters[name.toLowerCase()];
-		if (setter){
-			setter(this, value);
-		} else {
-			/* <ltIE9> */
-			var attributeWhiteList;
-			if (pollutesGetAttribute) attributeWhiteList = this.retrieve('$attributeWhiteList', {});
-			/* </ltIE9> */
-
-			if (value == null){
-				this.removeAttribute(name);
-				/* <ltIE9> */
-				if (pollutesGetAttribute) delete attributeWhiteList[name];
-				/* </ltIE9> */
-			} else {
-				this.setAttribute(name, '' + value);
-				/* <ltIE9> */
-				if (pollutesGetAttribute) attributeWhiteList[name] = true;
-				/* </ltIE9> */
-			}
-		}
-		return this;
-	},
-
-	setProperties: function(attributes){
-		for (var attribute in attributes) this.setProperty(attribute, attributes[attribute]);
-		return this;
-	},
-
-	getProperty: function(name){
-		var getter = propertyGetters[name.toLowerCase()];
-		if (getter) return getter(this);
-		/* <ltIE9> */
-		if (pollutesGetAttribute){
-			var attr = this.getAttributeNode(name), attributeWhiteList = this.retrieve('$attributeWhiteList', {});
-			if (!attr) return null;
-			if (attr.expando && !attributeWhiteList[name]){
-				var outer = this.outerHTML;
-				// segment by the opening tag and find mention of attribute name
-				if (outer.substr(0, outer.search(/\/?['"]?>(?![^<]*<['"])/)).indexOf(name) < 0) return null;
-				attributeWhiteList[name] = true;
-			}
-		}
-		/* </ltIE9> */
-		var result = Slick.getAttribute(this, name);
-		return (!result && !Slick.hasAttribute(this, name)) ? null : result;
-	},
-
-	getProperties: function(){
-		var args = Array.convert(arguments);
-		return args.map(this.getProperty, this).associate(args);
-	},
-
-	removeProperty: function(name){
-		return this.setProperty(name, null);
-	},
-
-	removeProperties: function(){
-		Array.each(arguments, this.removeProperty, this);
-		return this;
-	},
-
-	set: function(prop, value){
-		var property = Element.Properties[prop];
-		(property && property.set) ? property.set.call(this, value) : this.setProperty(prop, value);
-	}.overloadSetter(),
-
-	get: function(prop){
-		var property = Element.Properties[prop];
-		return (property && property.get) ? property.get.apply(this) : this.getProperty(prop);
-	}.overloadGetter(),
-
-	erase: function(prop){
-		var property = Element.Properties[prop];
-		(property && property.erase) ? property.erase.apply(this) : this.removeProperty(prop);
-		return this;
-	},
-
-	hasClass: hasClassList ? function(className){
-		return this.classList.contains(className);
-	} : function(className){
-		return classes(this.className).contains(className);
-	},
-
-	addClass: hasClassList ? function(className){
-		classes(className).forEach(addToClassList, this);
-		return this;
-	} : function(className){
-		this.className = classes(className + ' ' + this.className).join(' ');
-		return this;
-	},
-
-	removeClass: hasClassList ? function(className){
-		classes(className).forEach(removeFromClassList, this);
-		return this;
-	} : function(className){
-		var classNames = classes(this.className);
-		classes(className).forEach(classNames.erase, classNames);
-		this.className = classNames.join(' ');
-		return this;
-	},
-
-	toggleClass: function(className, force){
-		if (force == null) force = !this.hasClass(className);
-		return (force) ? this.addClass(className) : this.removeClass(className);
-	},
-
-	adopt: function(){
-		var parent = this, fragment, elements = Array.flatten(arguments), length = elements.length;
-		if (length > 1) parent = fragment = document.createDocumentFragment();
-
-		for (var i = 0; i < length; i++){
-			var element = document.id(elements[i], true);
-			if (element) parent.appendChild(element);
-		}
-
-		if (fragment) this.appendChild(fragment);
-
-		return this;
-	},
-
-	appendText: function(text, where){
-		return this.grab(this.getDocument().newTextNode(text), where);
-	},
-
-	grab: function(el, where){
-		inserters[where || 'bottom'](document.id(el, true), this);
-		return this;
-	},
-
-	inject: function(el, where){
-		inserters[where || 'bottom'](this, document.id(el, true));
-		return this;
-	},
-
-	replaces: function(el){
-		el = document.id(el, true);
-		el.parentNode.replaceChild(this, el);
-		return this;
-	},
-
-	wraps: function(el, where){
-		el = document.id(el, true);
-		return this.replaces(el).grab(el, where);
-	},
-
-	getSelected: function(){
-		this.selectedIndex; // Safari 3.2.1
-		return new Elements(Array.convert(this.options).filter(function(option){
-			return option.selected;
-		}));
-	},
-
-	toQueryString: function(){
-		var queryString = [];
-		this.getElements('input, select, textarea').each(function(el){
-			var type = el.type;
-			if (!el.name || el.disabled || type == 'submit' || type == 'reset' || type == 'file' || type == 'image') return;
-
-			var value = (el.get('tag') == 'select') ? el.getSelected().map(function(opt){
-				// IE
-				return document.id(opt).get('value');
-			}) : ((type == 'radio' || type == 'checkbox') && !el.checked) ? null : el.get('value');
-
-			Array.convert(value).each(function(val){
-				if (typeof val != 'undefined') queryString.push(encodeURIComponent(el.name) + '=' + encodeURIComponent(val));
-			});
-		});
-		return queryString.join('&');
-	}
-
-});
-
-
-// appendHTML
-
-var appendInserters = {
-	before: 'beforeBegin',
-	after: 'afterEnd',
-	bottom: 'beforeEnd',
-	top: 'afterBegin',
-	inside: 'beforeEnd'
-};
-
-Element.implement('appendHTML', ('insertAdjacentHTML' in document.createElement('div')) ? function(html, where){
-	this.insertAdjacentHTML(appendInserters[where || 'bottom'], html);
-	return this;
-} : function(html, where){
-	var temp = new Element('div', {html: html}),
-		children = temp.childNodes,
-		fragment = temp.firstChild;
-
-	if (!fragment) return this;
-	if (children.length > 1){
-		fragment = document.createDocumentFragment();
-		for (var i = 0, l = children.length; i < l; i++){
-			fragment.appendChild(children[i]);
-		}
-	}
-
-	inserters[where || 'bottom'](fragment, this);
-	return this;
-});
-
-var collected = {}, storage = {};
-
-var get = function(uid){
-	return (storage[uid] || (storage[uid] = {}));
-};
-
-var clean = function(item){
-	var uid = item.uniqueNumber;
-	if (item.removeEvents) item.removeEvents();
-	if (item.clearAttributes) item.clearAttributes();
-	if (uid != null){
-		delete collected[uid];
-		delete storage[uid];
-	}
-	return item;
-};
-
-var formProps = {input: 'checked', option: 'selected', textarea: 'value'};
-
-Element.implement({
-
-	destroy: function(){
-		var children = clean(this).getElementsByTagName('*');
-		Array.each(children, clean);
-		Element.dispose(this);
-		return null;
-	},
-
-	empty: function(){
-		Array.convert(this.childNodes).each(Element.dispose);
-		return this;
-	},
-
-	dispose: function(){
-		return (this.parentNode) ? this.parentNode.removeChild(this) : this;
-	},
-
-	clone: function(contents, keepid){
-		contents = contents !== false;
-		var clone = this.cloneNode(contents), ce = [clone], te = [this], i;
-
-		if (contents){
-			ce.append(Array.convert(clone.getElementsByTagName('*')));
-			te.append(Array.convert(this.getElementsByTagName('*')));
-		}
-
-		for (i = ce.length; i--;){
-			var node = ce[i], element = te[i];
-			if (!keepid) node.removeAttribute('id');
-			/*<ltIE9>*/
-			if (node.clearAttributes){
-				node.clearAttributes();
-				node.mergeAttributes(element);
-				node.removeAttribute('uniqueNumber');
-				if (node.options){
-					var no = node.options, eo = element.options;
-					for (var j = no.length; j--;) no[j].selected = eo[j].selected;
-				}
-			}
-			/*</ltIE9>*/
-			var prop = formProps[element.tagName.toLowerCase()];
-			if (prop && element[prop]) node[prop] = element[prop];
-		}
-
-		/*<ltIE9>*/
-		if (hasCloneBug){
-			var co = clone.getElementsByTagName('object'), to = this.getElementsByTagName('object');
-			for (i = co.length; i--;) co[i].outerHTML = to[i].outerHTML;
-		}
-		/*</ltIE9>*/
-		return document.id(clone);
-	}
-
-});
-
-[Element, Window, Document].invoke('implement', {
-
-	addListener: function(type, fn){
-		if (window.attachEvent && !window.addEventListener){
-			collected[Slick.uidOf(this)] = this;
-		}
-		if (this.addEventListener) this.addEventListener(type, fn, !!arguments[2]);
-		else this.attachEvent('on' + type, fn);
-		return this;
-	},
-
-	removeListener: function(type, fn){
-		if (this.removeEventListener) this.removeEventListener(type, fn, !!arguments[2]);
-		else this.detachEvent('on' + type, fn);
-		return this;
-	},
-
-	retrieve: function(property, dflt){
-		var storage = get(Slick.uidOf(this)), prop = storage[property];
-		if (dflt != null && prop == null) prop = storage[property] = dflt;
-		return prop != null ? prop : null;
-	},
-
-	store: function(property, value){
-		var storage = get(Slick.uidOf(this));
-		storage[property] = value;
-		return this;
-	},
-
-	eliminate: function(property){
-		var storage = get(Slick.uidOf(this));
-		delete storage[property];
-		return this;
-	}
-
-});
-
-/*<ltIE9>*/
-if (window.attachEvent && !window.addEventListener){
-	var gc = function(){
-		Object.each(collected, clean);
-		if (window.CollectGarbage) CollectGarbage();
-		window.removeListener('unload', gc);
-	};
-	window.addListener('unload', gc);
-}
-/*</ltIE9>*/
-
-Element.Properties = {};
-
-//<1.2compat>
-
-Element.Properties = new Hash;
-
-//</1.2compat>
-
-Element.Properties.style = {
-
-	set: function(style){
-		this.style.cssText = style;
-	},
-
-	get: function(){
-		return this.style.cssText;
-	},
-
-	erase: function(){
-		this.style.cssText = '';
-	}
-
-};
-
-Element.Properties.tag = {
-
-	get: function(){
-		return this.tagName.toLowerCase();
-	}
-
-};
-
-Element.Properties.html = {
-
-	set: function(html){
-		if (html == null) html = '';
-		else if (typeOf(html) == 'array') html = html.join('');
-
-		/*<ltIE9>*/
-		if (this.styleSheet && !canChangeStyleHTML) this.styleSheet.cssText = html;
-		else /*</ltIE9>*/this.innerHTML = html;
-	},
-	erase: function(){
-		this.set('html', '');
-	}
-
-};
-
-var supportsHTML5Elements = true, supportsTableInnerHTML = true, supportsTRInnerHTML = true;
-
-/*<ltIE9>*/
-// technique by jdbarlett - http://jdbartlett.com/innershiv/
-var div = document.createElement('div');
-var fragment;
-div.innerHTML = '<nav></nav>';
-supportsHTML5Elements = (div.childNodes.length == 1);
-if (!supportsHTML5Elements){
-	var tags = 'abbr article aside audio canvas datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video'.split(' ');
-	fragment = document.createDocumentFragment(), l = tags.length;
-	while (l--) fragment.createElement(tags[l]);
-}
-div = null;
-/*</ltIE9>*/
-
-/*<IE>*/
-supportsTableInnerHTML = Function.attempt(function(){
-	var table = document.createElement('table');
-	table.innerHTML = '<tr><td></td></tr>';
-	return true;
-});
-
-/*<ltFF4>*/
-var tr = document.createElement('tr'), html = '<td></td>';
-tr.innerHTML = html;
-supportsTRInnerHTML = (tr.innerHTML == html);
-tr = null;
-/*</ltFF4>*/
-
-if (!supportsTableInnerHTML || !supportsTRInnerHTML || !supportsHTML5Elements){
-
-	Element.Properties.html.set = (function(set){
-
-		var translations = {
-			table: [1, '<table>', '</table>'],
-			select: [1, '<select>', '</select>'],
-			tbody: [2, '<table><tbody>', '</tbody></table>'],
-			tr: [3, '<table><tbody><tr>', '</tr></tbody></table>']
-		};
-
-		translations.thead = translations.tfoot = translations.tbody;
-
-		return function(html){
-
-			/*<ltIE9>*/
-			if (this.styleSheet) return set.call(this, html);
-			/*</ltIE9>*/
-			var wrap = translations[this.get('tag')];
-			if (!wrap && !supportsHTML5Elements) wrap = [0, '', ''];
-			if (!wrap) return set.call(this, html);
-
-			var level = wrap[0], wrapper = document.createElement('div'), target = wrapper;
-			if (!supportsHTML5Elements) fragment.appendChild(wrapper);
-			wrapper.innerHTML = [wrap[1], html, wrap[2]].flatten().join('');
-			while (level--) target = target.firstChild;
-			this.empty().adopt(target.childNodes);
-			if (!supportsHTML5Elements) fragment.removeChild(wrapper);
-			wrapper = null;
-		};
-
-	})(Element.Properties.html.set);
-}
-/*</IE>*/
-
-/*<ltIE9>*/
-var testForm = document.createElement('form');
-testForm.innerHTML = '<select><option>s</option></select>';
-
-if (testForm.firstChild.value != 's') Element.Properties.value = {
-
-	set: function(value){
-		var tag = this.get('tag');
-		if (tag != 'select') return this.setProperty('value', value);
-		var options = this.getElements('option');
-		value = String(value);
-		for (var i = 0; i < options.length; i++){
-			var option = options[i],
-				attr = option.getAttributeNode('value'),
-				optionValue = (attr && attr.specified) ? option.value : option.get('text');
-			if (optionValue === value) return option.selected = true;
-		}
-	},
-
-	get: function(){
-		var option = this, tag = option.get('tag');
-
-		if (tag != 'select' && tag != 'option') return this.getProperty('value');
-
-		if (tag == 'select' && !(option = option.getSelected()[0])) return '';
-
-		var attr = option.getAttributeNode('value');
-		return (attr && attr.specified) ? option.value : option.get('text');
-	}
-
-};
-testForm = null;
-/*</ltIE9>*/
-
-/*<IE>*/
-if (document.createElement('div').getAttributeNode('id')) Element.Properties.id = {
-	set: function(id){
-		this.id = this.getAttributeNode('id').value = id;
-	},
-	get: function(){
-		return this.id || null;
-	},
-	erase: function(){
-		this.id = this.getAttributeNode('id').value = '';
-	}
-};
-/*</IE>*/
-
-})();
-
-/*
----
-
-name: Element.Style
-
-description: Contains methods for interacting with the styles of Elements in a fashionable way.
-
-license: MIT-style license.
-
-requires: Element
-
-provides: Element.Style
-
-...
-*/
-
-(function(){
-
-var html = document.html, el;
-
-//<ltIE9>
-// Check for oldIE, which does not remove styles when they're set to null
-el = document.createElement('div');
-el.style.color = 'red';
-el.style.color = null;
-var doesNotRemoveStyles = el.style.color == 'red';
-
-// check for oldIE, which returns border* shorthand styles in the wrong order (color-width-style instead of width-style-color)
-var border = '1px solid #123abc';
-el.style.border = border;
-var returnsBordersInWrongOrder = el.style.border != border;
-el = null;
-//</ltIE9>
-
-var hasGetComputedStyle = !!window.getComputedStyle,
-	supportBorderRadius = document.createElement('div').style.borderRadius != null;
-
-Element.Properties.styles = {set: function(styles){
-	this.setStyles(styles);
-}};
-
-var hasOpacity = (html.style.opacity != null),
-	hasFilter = (html.style.filter != null),
-	reAlpha = /alpha\(opacity=([\d.]+)\)/i;
-
-var setVisibility = function(element, opacity){
-	element.store('$opacity', opacity);
-	element.style.visibility = opacity > 0 || opacity == null ? 'visible' : 'hidden';
-};
-
-//<ltIE9>
-var setFilter = function(element, regexp, value){
-	var style = element.style,
-		filter = style.filter || element.getComputedStyle('filter') || '';
-	style.filter = (regexp.test(filter) ? filter.replace(regexp, value) : filter + ' ' + value).trim();
-	if (!style.filter) style.removeAttribute('filter');
-};
-//</ltIE9>
-
-var setOpacity = (hasOpacity ? function(element, opacity){
-	element.style.opacity = opacity;
-} : (hasFilter ? function(element, opacity){
-	if (!element.currentStyle || !element.currentStyle.hasLayout) element.style.zoom = 1;
-	if (opacity == null || opacity == 1){
-		setFilter(element, reAlpha, '');
-		if (opacity == 1 && getOpacity(element) != 1) setFilter(element, reAlpha, 'alpha(opacity=100)');
-	} else {
-		setFilter(element, reAlpha, 'alpha(opacity=' + (opacity * 100).limit(0, 100).round() + ')');
-	}
-} : setVisibility));
-
-var getOpacity = (hasOpacity ? function(element){
-	var opacity = element.style.opacity || element.getComputedStyle('opacity');
-	return (opacity == '') ? 1 : opacity.toFloat();
-} : (hasFilter ? function(element){
-	var filter = (element.style.filter || element.getComputedStyle('filter')),
-		opacity;
-	if (filter) opacity = filter.match(reAlpha);
-	return (opacity == null || filter == null) ? 1 : (opacity[1] / 100);
-} : function(element){
-	var opacity = element.retrieve('$opacity');
-	if (opacity == null) opacity = (element.style.visibility == 'hidden' ? 0 : 1);
-	return opacity;
-}));
-
-var floatName = (html.style.cssFloat == null) ? 'styleFloat' : 'cssFloat',
-	namedPositions = {left: '0%', top: '0%', center: '50%', right: '100%', bottom: '100%'},
-	hasBackgroundPositionXY = (html.style.backgroundPositionX != null),
-	prefixPattern = /^-(ms)-/;
-
-var camelCase = function(property){
-	return property.replace(prefixPattern, '$1-').camelCase();
-};
-
-//<ltIE9>
-var removeStyle = function(style, property){
-	if (property == 'backgroundPosition'){
-		style.removeAttribute(property + 'X');
-		property += 'Y';
-	}
-	style.removeAttribute(property);
-};
-//</ltIE9>
-
-Element.implement({
-
-	getComputedStyle: function(property){
-		if (!hasGetComputedStyle && this.currentStyle) return this.currentStyle[camelCase(property)];
-		var defaultView = Element.getDocument(this).defaultView,
-			computed = defaultView ? defaultView.getComputedStyle(this, null) : null;
-		return (computed) ? computed.getPropertyValue((property == floatName) ? 'float' : property.hyphenate()) : '';
-	},
-
-	setStyle: function(property, value){
-		if (property == 'opacity'){
-			if (value != null) value = parseFloat(value);
-			setOpacity(this, value);
-			return this;
-		}
-		property = camelCase(property == 'float' ? floatName : property);
-		if (typeOf(value) != 'string'){
-			var map = (Element.Styles[property] || '@').split(' ');
-			value = Array.convert(value).map(function(val, i){
-				if (!map[i]) return '';
-				return (typeOf(val) == 'number') ? map[i].replace('@', Math.round(val)) : val;
-			}).join(' ');
-		} else if (value == String(Number(value))){
-			value = Math.round(value);
-		}
-		this.style[property] = value;
-		//<ltIE9>
-		if ((value == '' || value == null) && doesNotRemoveStyles && this.style.removeAttribute){
-			removeStyle(this.style, property);
-		}
-		//</ltIE9>
-		return this;
-	},
-
-	getStyle: function(property){
-		if (property == 'opacity') return getOpacity(this);
-		property = camelCase(property == 'float' ? floatName : property);
-		if (supportBorderRadius && property.indexOf('borderRadius') != -1){
-			return ['borderTopLeftRadius', 'borderTopRightRadius', 'borderBottomRightRadius', 'borderBottomLeftRadius'].map(function(corner){
-				return this.style[corner] || '0px';
-			}, this).join(' ');
-		}
-		var result = this.style[property];
-		if (!result || property == 'zIndex'){
-			if (Element.ShortStyles.hasOwnProperty(property)){
-				result = [];
-				for (var s in Element.ShortStyles[property]) result.push(this.getStyle(s));
-				return result.join(' ');
-			}
-			result = this.getComputedStyle(property);
-		}
-		if (hasBackgroundPositionXY && /^backgroundPosition[XY]?$/.test(property)){
-			return result.replace(/(top|right|bottom|left)/g, function(position){
-				return namedPositions[position];
-			}) || '0px';
-		}
-		if (!result && property == 'backgroundPosition') return '0px 0px';
-		if (result){
-			result = String(result);
-			var color = result.match(/rgba?\([\d\s,]+\)/);
-			if (color) result = result.replace(color[0], color[0].rgbToHex());
-		}
-		if (!hasGetComputedStyle && !this.style[property]){
-			if ((/^(height|width)$/).test(property) && !(/px$/.test(result))){
-				var values = (property == 'width') ? ['left', 'right'] : ['top', 'bottom'], size = 0;
-				values.each(function(value){
-					size += this.getStyle('border-' + value + '-width').toInt() + this.getStyle('padding-' + value).toInt();
-				}, this);
-				return this['offset' + property.capitalize()] - size + 'px';
-			}
-			if ((/^border(.+)Width|margin|padding/).test(property) && isNaN(parseFloat(result))){
-				return '0px';
-			}
-		}
-		//<ltIE9>
-		if (returnsBordersInWrongOrder && /^border(Top|Right|Bottom|Left)?$/.test(property) && /^#/.test(result)){
-			return result.replace(/^(.+)\s(.+)\s(.+)$/, '$2 $3 $1');
-		}
-		//</ltIE9>
-
-		return result;
-	},
-
-	setStyles: function(styles){
-		for (var style in styles) this.setStyle(style, styles[style]);
-		return this;
-	},
-
-	getStyles: function(){
-		var result = {};
-		Array.flatten(arguments).each(function(key){
-			result[key] = this.getStyle(key);
-		}, this);
-		return result;
-	}
-
-});
-
-Element.Styles = {
-	left: '@px', top: '@px', bottom: '@px', right: '@px',
-	width: '@px', height: '@px', maxWidth: '@px', maxHeight: '@px', minWidth: '@px', minHeight: '@px',
-	backgroundColor: 'rgb(@, @, @)', backgroundSize: '@px', backgroundPosition: '@px @px', color: 'rgb(@, @, @)',
-	fontSize: '@px', letterSpacing: '@px', lineHeight: '@px', clip: 'rect(@px @px @px @px)',
-	margin: '@px @px @px @px', padding: '@px @px @px @px', border: '@px @ rgb(@, @, @) @px @ rgb(@, @, @) @px @ rgb(@, @, @)',
-	borderWidth: '@px @px @px @px', borderStyle: '@ @ @ @', borderColor: 'rgb(@, @, @) rgb(@, @, @) rgb(@, @, @) rgb(@, @, @)',
-	zIndex: '@', 'zoom': '@', fontWeight: '@', textIndent: '@px', opacity: '@', borderRadius: '@px @px @px @px'
-};
-
-//<1.3compat>
-
-Element.implement({
-
-	setOpacity: function(value){
-		setOpacity(this, value);
-		return this;
-	},
-
-	getOpacity: function(){
-		return getOpacity(this);
-	}
-
-});
-
-Element.Properties.opacity = {
-
-	set: function(opacity){
-		setOpacity(this, opacity);
-		setVisibility(this, opacity);
-	},
-
-	get: function(){
-		return getOpacity(this);
-	}
-
-};
-
-//</1.3compat>
-
-//<1.2compat>
-
-Element.Styles = new Hash(Element.Styles);
-
-//</1.2compat>
-
-Element.ShortStyles = {margin: {}, padding: {}, border: {}, borderWidth: {}, borderStyle: {}, borderColor: {}};
-
-['Top', 'Right', 'Bottom', 'Left'].each(function(direction){
-	var Short = Element.ShortStyles;
-	var All = Element.Styles;
-	['margin', 'padding'].each(function(style){
-		var sd = style + direction;
-		Short[style][sd] = All[sd] = '@px';
-	});
-	var bd = 'border' + direction;
-	Short.border[bd] = All[bd] = '@px @ rgb(@, @, @)';
-	var bdw = bd + 'Width', bds = bd + 'Style', bdc = bd + 'Color';
-	Short[bd] = {};
-	Short.borderWidth[bdw] = Short[bd][bdw] = All[bdw] = '@px';
-	Short.borderStyle[bds] = Short[bd][bds] = All[bds] = '@';
-	Short.borderColor[bdc] = Short[bd][bdc] = All[bdc] = 'rgb(@, @, @)';
-});
-
-if (hasBackgroundPositionXY) Element.ShortStyles.backgroundPosition = {backgroundPositionX: '@', backgroundPositionY: '@'};
-})();
-
-/*
----
-
-name: Element.Event
-
-description: Contains Element methods for dealing with events. This file also includes mouseenter and mouseleave custom Element Events, if necessary.
-
-license: MIT-style license.
-
-requires: [Element, Event]
-
-provides: Element.Event
-
-...
-*/
-
-(function(){
-
-Element.Properties.events = {set: function(events){
-	this.addEvents(events);
-}};
-
-[Element, Window, Document].invoke('implement', {
-
-	addEvent: function(type, fn){
-		var events = this.retrieve('events', {});
-		if (!events[type]) events[type] = {keys: [], values: []};
-		if (events[type].keys.contains(fn)) return this;
-		events[type].keys.push(fn);
-		var realType = type,
-			custom = Element.Events[type],
-			condition = fn,
-			self = this;
-		if (custom){
-			if (custom.onAdd) custom.onAdd.call(this, fn, type);
-			if (custom.condition){
-				condition = function(event){
-					if (custom.condition.call(this, event, type)) return fn.call(this, event);
-					return true;
-				};
-			}
-			if (custom.base) realType = Function.convert(custom.base).call(this, type);
-		}
-		var defn = function(){
-			return fn.call(self);
-		};
-		var nativeEvent = Element.NativeEvents[realType];
-		if (nativeEvent){
-			if (nativeEvent == 2){
-				defn = function(event){
-					event = new DOMEvent(event, self.getWindow());
-					if (condition.call(self, event) === false) event.stop();
-				};
-			}
-			this.addListener(realType, defn, arguments[2]);
-		}
-		events[type].values.push(defn);
-		return this;
-	},
-
-	removeEvent: function(type, fn){
-		var events = this.retrieve('events');
-		if (!events || !events[type]) return this;
-		var list = events[type];
-		var index = list.keys.indexOf(fn);
-		if (index == -1) return this;
-		var value = list.values[index];
-		delete list.keys[index];
-		delete list.values[index];
-		var custom = Element.Events[type];
-		if (custom){
-			if (custom.onRemove) custom.onRemove.call(this, fn, type);
-			if (custom.base) type = Function.convert(custom.base).call(this, type);
-		}
-		return (Element.NativeEvents[type]) ? this.removeListener(type, value, arguments[2]) : this;
-	},
-
-	addEvents: function(events){
-		for (var event in events) this.addEvent(event, events[event]);
-		return this;
-	},
-
-	removeEvents: function(events){
-		var type;
-		if (typeOf(events) == 'object'){
-			for (type in events) this.removeEvent(type, events[type]);
-			return this;
-		}
-		var attached = this.retrieve('events');
-		if (!attached) return this;
-		if (!events){
-			for (type in attached) this.removeEvents(type);
-			this.eliminate('events');
-		} else if (attached[events]){
-			attached[events].keys.each(function(fn){
-				this.removeEvent(events, fn);
-			}, this);
-			delete attached[events];
-		}
-		return this;
-	},
-
-	fireEvent: function(type, args, delay){
-		var events = this.retrieve('events');
-		if (!events || !events[type]) return this;
-		args = Array.convert(args);
-
-		events[type].keys.each(function(fn){
-			if (delay) fn.delay(delay, this, args);
-			else fn.apply(this, args);
-		}, this);
-		return this;
-	},
-
-	cloneEvents: function(from, type){
-		from = document.id(from);
-		var events = from.retrieve('events');
-		if (!events) return this;
-		if (!type){
-			for (var eventType in events) this.cloneEvents(from, eventType);
-		} else if (events[type]){
-			events[type].keys.each(function(fn){
-				this.addEvent(type, fn);
-			}, this);
-		}
-		return this;
-	}
-
-});
-
-Element.NativeEvents = {
-	click: 2, dblclick: 2, mouseup: 2, mousedown: 2, contextmenu: 2, //mouse buttons
-	wheel: 2, mousewheel: 2, DOMMouseScroll: 2, //mouse wheel
-	mouseover: 2, mouseout: 2, mousemove: 2, selectstart: 2, selectend: 2, //mouse movement
-	keydown: 2, keypress: 2, keyup: 2, //keyboard
-	orientationchange: 2, // mobile
-	touchstart: 2, touchmove: 2, touchend: 2, touchcancel: 2, // touch
-	gesturestart: 2, gesturechange: 2, gestureend: 2, // gesture
-	focus: 2, blur: 2, change: 2, reset: 2, select: 2, submit: 2, paste: 2, input: 2, //form elements
-	load: 2, unload: 1, beforeunload: 2, resize: 1, move: 1, DOMContentLoaded: 1, readystatechange: 1, //window
-	hashchange: 1, popstate: 2, pageshow: 2, pagehide: 2, // history
-	error: 1, abort: 1, scroll: 1, message: 2 //misc
-};
-
-Element.Events = {
-	mousewheel: {
-		base: 'onwheel' in document ? 'wheel' : 'onmousewheel' in document ? 'mousewheel' : 'DOMMouseScroll'
-	}
-};
-
-var check = function(event){
-	var related = event.relatedTarget;
-	if (related == null) return true;
-	if (!related) return false;
-	return (related != this && related.prefix != 'xul' && typeOf(this) != 'document' && !this.contains(related));
-};
-
-if ('onmouseenter' in document.documentElement){
-	Element.NativeEvents.mouseenter = Element.NativeEvents.mouseleave = 2;
-	Element.MouseenterCheck = check;
-} else {
-	Element.Events.mouseenter = {
-		base: 'mouseover',
-		condition: check
-	};
-
-	Element.Events.mouseleave = {
-		base: 'mouseout',
-		condition: check
-	};
-}
-
-/*<ltIE9>*/
-if (!window.addEventListener){
-	Element.NativeEvents.propertychange = 2;
-	Element.Events.change = {
-		base: function(){
-			var type = this.type;
-			return (this.get('tag') == 'input' && (type == 'radio' || type == 'checkbox')) ? 'propertychange' : 'change';
-		},
-		condition: function(event){
-			return event.type != 'propertychange' || event.event.propertyName == 'checked';
-		}
-	};
-}
-/*</ltIE9>*/
-
-//<1.2compat>
-
-Element.Events = new Hash(Element.Events);
-
-//</1.2compat>
-
-})();
-
-/*
----
-
-name: Element.Delegation
-
-description: Extends the Element native object to include the delegate method for more efficient event management.
-
-license: MIT-style license.
-
-requires: [Element.Event]
-
-provides: [Element.Delegation]
-
-...
-*/
-
-(function(){
-
-var eventListenerSupport = !!window.addEventListener;
-
-Element.NativeEvents.focusin = Element.NativeEvents.focusout = 2;
-
-var bubbleUp = function(self, match, fn, event, target){
-	while (target && target != self){
-		if (match(target, event)) return fn.call(target, event, target);
-		target = document.id(target.parentNode);
-	}
-};
-
-var map = {
-	mouseenter: {
-		base: 'mouseover',
-		condition: Element.MouseenterCheck
-	},
-	mouseleave: {
-		base: 'mouseout',
-		condition: Element.MouseenterCheck
-	},
-	focus: {
-		base: 'focus' + (eventListenerSupport ? '' : 'in'),
-		capture: true
-	},
-	blur: {
-		base: eventListenerSupport ? 'blur' : 'focusout',
-		capture: true
-	}
-};
-
-/*<ltIE9>*/
-var _key = '$delegation:';
-var formObserver = function(type){
-
-	return {
-
-		base: 'focusin',
-
-		remove: function(self, uid){
-			var list = self.retrieve(_key + type + 'listeners', {})[uid];
-			if (list && list.forms) for (var i = list.forms.length; i--;){
-				// the form may have been destroyed, so it won't have the
-				// removeEvent method anymore. In that case the event was
-				// removed as well.
-				if (list.forms[i].removeEvent) list.forms[i].removeEvent(type, list.fns[i]);
-			}
-		},
-
-		listen: function(self, match, fn, event, target, uid){
-			var form = (target.get('tag') == 'form') ? target : event.target.getParent('form');
-			if (!form) return;
-
-			var listeners = self.retrieve(_key + type + 'listeners', {}),
-				listener = listeners[uid] || {forms: [], fns: []},
-				forms = listener.forms, fns = listener.fns;
-
-			if (forms.indexOf(form) != -1) return;
-			forms.push(form);
-
-			var _fn = function(event){
-				bubbleUp(self, match, fn, event, target);
-			};
-			form.addEvent(type, _fn);
-			fns.push(_fn);
-
-			listeners[uid] = listener;
-			self.store(_key + type + 'listeners', listeners);
-		}
-	};
-};
-
-var inputObserver = function(type){
-	return {
-		base: 'focusin',
-		listen: function(self, match, fn, event, target){
-			var events = {blur: function(){
-				this.removeEvents(events);
-			}};
-			events[type] = function(event){
-				bubbleUp(self, match, fn, event, target);
-			};
-			event.target.addEvents(events);
-		}
-	};
-};
-
-if (!eventListenerSupport) Object.append(map, {
-	submit: formObserver('submit'),
-	reset: formObserver('reset'),
-	change: inputObserver('change'),
-	select: inputObserver('select')
-});
-/*</ltIE9>*/
-
-var proto = Element.prototype,
-	addEvent = proto.addEvent,
-	removeEvent = proto.removeEvent;
-
-var relay = function(old, method){
-	return function(type, fn, useCapture){
-		if (type.indexOf(':relay') == -1) return old.call(this, type, fn, useCapture);
-		var parsed = Slick.parse(type).expressions[0][0];
-		if (parsed.pseudos[0].key != 'relay') return old.call(this, type, fn, useCapture);
-		var newType = parsed.tag;
-		parsed.pseudos.slice(1).each(function(pseudo){
-			newType += ':' + pseudo.key + (pseudo.value ? '(' + pseudo.value + ')' : '');
-		});
-		old.call(this, type, fn);
-		return method.call(this, newType, parsed.pseudos[0].value, fn);
-	};
-};
-
-var delegation = {
-
-	addEvent: function(type, match, fn){
-		var storage = this.retrieve('$delegates', {}), stored = storage[type];
-		if (stored) for (var _uid in stored){
-			if (stored[_uid].fn == fn && stored[_uid].match == match) return this;
-		}
-
-		var _type = type, _match = match, _fn = fn, _map = map[type] || {};
-		type = _map.base || _type;
-
-		match = function(target){
-			return Slick.match(target, _match);
-		};
-
-		var elementEvent = Element.Events[_type];
-		if (_map.condition || elementEvent && elementEvent.condition){
-			var __match = match, condition = _map.condition || elementEvent.condition;
-			match = function(target, event){
-				return __match(target, event) && condition.call(target, event, type);
-			};
-		}
-
-		var self = this, uid = String.uniqueID();
-		var delegator = _map.listen ? function(event, target){
-			if (!target && event && event.target) target = event.target;
-			if (target) _map.listen(self, match, fn, event, target, uid);
-		} : function(event, target){
-			if (!target && event && event.target) target = event.target;
-			if (target) bubbleUp(self, match, fn, event, target);
-		};
-
-		if (!stored) stored = {};
-		stored[uid] = {
-			match: _match,
-			fn: _fn,
-			delegator: delegator
-		};
-		storage[_type] = stored;
-		return addEvent.call(this, type, delegator, _map.capture);
-	},
-
-	removeEvent: function(type, match, fn, _uid){
-		var storage = this.retrieve('$delegates', {}), stored = storage[type];
-		if (!stored) return this;
-
-		if (_uid){
-			var _type = type, delegator = stored[_uid].delegator, _map = map[type] || {};
-			type = _map.base || _type;
-			if (_map.remove) _map.remove(this, _uid);
-			delete stored[_uid];
-			storage[_type] = stored;
-			return removeEvent.call(this, type, delegator, _map.capture);
-		}
-
-		var __uid, s;
-		if (fn) for (__uid in stored){
-			s = stored[__uid];
-			if (s.match == match && s.fn == fn) return delegation.removeEvent.call(this, type, match, fn, __uid);
-		} else for (__uid in stored){
-			s = stored[__uid];
-			if (s.match == match) delegation.removeEvent.call(this, type, match, s.fn, __uid);
-		}
-		return this;
-	}
-
-};
-
-[Element, Window, Document].invoke('implement', {
-	addEvent: relay(addEvent, delegation.addEvent),
-	removeEvent: relay(removeEvent, delegation.removeEvent)
-});
-
-})();
-
-/*
----
-
-name: Element.Dimensions
-
-description: Contains methods to work with size, scroll, or positioning of Elements and the window object.
-
-license: MIT-style license.
-
-credits:
-  - Element positioning based on the [qooxdoo](http://qooxdoo.org/) code and smart browser fixes, [LGPL License](http://www.gnu.org/licenses/lgpl.html).
-  - Viewport dimensions based on [YUI](http://developer.yahoo.com/yui/) code, [BSD License](http://developer.yahoo.com/yui/license.html).
-
-requires: [Element, Element.Style]
-
-provides: [Element.Dimensions]
-
-...
-*/
-
-(function(){
-
-var element = document.createElement('div'),
-	child = document.createElement('div');
-element.style.height = '0';
-element.appendChild(child);
-var brokenOffsetParent = (child.offsetParent === element);
-element = child = null;
-
-var heightComponents = ['height', 'paddingTop', 'paddingBottom', 'borderTopWidth', 'borderBottomWidth'],
-	widthComponents = ['width', 'paddingLeft', 'paddingRight', 'borderLeftWidth', 'borderRightWidth'];
-
-var svgCalculateSize = function(el){
-
-	var gCS = window.getComputedStyle(el),
-		bounds = {x: 0, y: 0};
-
-	heightComponents.each(function(css){
-		bounds.y += parseFloat(gCS[css]);
-	});
-	widthComponents.each(function(css){
-		bounds.x += parseFloat(gCS[css]);
-	});
-	return bounds;
-};
-
-var isOffset = function(el){
-	return styleString(el, 'position') != 'static' || isBody(el);
-};
-
-var isOffsetStatic = function(el){
-	return isOffset(el) || (/^(?:table|td|th)$/i).test(el.tagName);
-};
-
-Element.implement({
-
-	scrollTo: function(x, y){
-		if (isBody(this)){
-			this.getWindow().scrollTo(x, y);
-		} else {
-			this.scrollLeft = x;
-			this.scrollTop = y;
-		}
-		return this;
-	},
-
-	getSize: function(){
-		if (isBody(this)) return this.getWindow().getSize();
-
-		//<ltIE9>
-		// This if clause is because IE8- cannot calculate getBoundingClientRect of elements with visibility hidden.
-		if (!window.getComputedStyle) return {x: this.offsetWidth, y: this.offsetHeight};
-		//</ltIE9>
-
-		// This svg section under, calling `svgCalculateSize()`, can be removed when FF fixed the svg size bug.
-		// Bug info: https://bugzilla.mozilla.org/show_bug.cgi?id=530985
-		if (this.get('tag') == 'svg') return svgCalculateSize(this);
-
-		try {
-			var bounds = this.getBoundingClientRect();
-			return {x: bounds.width, y: bounds.height};
-		} catch (e){
-			return {x: 0, y: 0};
-		}
-	},
-
-	getScrollSize: function(){
-		if (isBody(this)) return this.getWindow().getScrollSize();
-		return {x: this.scrollWidth, y: this.scrollHeight};
-	},
-
-	getScroll: function(){
-		if (isBody(this)) return this.getWindow().getScroll();
-		return {x: this.scrollLeft, y: this.scrollTop};
-	},
-
-	getScrolls: function(){
-		var element = this.parentNode, position = {x: 0, y: 0};
-		while (element && !isBody(element)){
-			position.x += element.scrollLeft;
-			position.y += element.scrollTop;
-			element = element.parentNode;
-		}
-		return position;
-	},
-
-	getOffsetParent: brokenOffsetParent ? function(){
-		var element = this;
-		if (isBody(element) || styleString(element, 'position') == 'fixed') return null;
-
-		var isOffsetCheck = (styleString(element, 'position') == 'static') ? isOffsetStatic : isOffset;
-		while ((element = element.parentNode)){
-			if (isOffsetCheck(element)) return element;
-		}
-		return null;
-	} : function(){
-		var element = this;
-		if (isBody(element) || styleString(element, 'position') == 'fixed') return null;
-
-		try {
-			return element.offsetParent;
-		} catch (e){}
-		return null;
-	},
-
-	getOffsets: function(){
-		var hasGetBoundingClientRect = this.getBoundingClientRect;
-//<1.4compat>
-		hasGetBoundingClientRect = hasGetBoundingClientRect && !Browser.Platform.ios;
-//</1.4compat>
-		if (hasGetBoundingClientRect){
-			var bound = this.getBoundingClientRect(),
-				html = document.id(this.getDocument().documentElement),
-				htmlScroll = html.getScroll(),
-				elemScrolls = this.getScrolls(),
-				isFixed = (styleString(this, 'position') == 'fixed');
-
-			return {
-				x: bound.left.toFloat() + elemScrolls.x + ((isFixed) ? 0 : htmlScroll.x) - html.clientLeft,
-				y: bound.top.toFloat() + elemScrolls.y + ((isFixed) ? 0 : htmlScroll.y) - html.clientTop
-			};
-		}
-
-		var element = this, position = {x: 0, y: 0};
-		if (isBody(this)) return position;
-
-		while (element && !isBody(element)){
-			position.x += element.offsetLeft;
-			position.y += element.offsetTop;
-//<1.4compat>
-			if (Browser.firefox){
-				if (!borderBox(element)){
-					position.x += leftBorder(element);
-					position.y += topBorder(element);
-				}
-				var parent = element.parentNode;
-				if (parent && styleString(parent, 'overflow') != 'visible'){
-					position.x += leftBorder(parent);
-					position.y += topBorder(parent);
-				}
-			} else if (element != this && Browser.safari){
-				position.x += leftBorder(element);
-				position.y += topBorder(element);
-			}
-//</1.4compat>
-			element = element.offsetParent;
-		}
-//<1.4compat>
-		if (Browser.firefox && !borderBox(this)){
-			position.x -= leftBorder(this);
-			position.y -= topBorder(this);
-		}
-//</1.4compat>
-		return position;
-	},
-
-	getPosition: function(relative){
-		var offset = this.getOffsets(),
-			scroll = this.getScrolls();
-		var position = {
-			x: offset.x - scroll.x,
-			y: offset.y - scroll.y
-		};
-
-		if (relative && (relative = document.id(relative))){
-			var relativePosition = relative.getPosition();
-			return {x: position.x - relativePosition.x - leftBorder(relative), y: position.y - relativePosition.y - topBorder(relative)};
-		}
-		return position;
-	},
-
-	getCoordinates: function(element){
-		if (isBody(this)) return this.getWindow().getCoordinates();
-		var position = this.getPosition(element),
-			size = this.getSize();
-		var obj = {
-			left: position.x,
-			top: position.y,
-			width: size.x,
-			height: size.y
-		};
-		obj.right = obj.left + obj.width;
-		obj.bottom = obj.top + obj.height;
-		return obj;
-	},
-
-	computePosition: function(obj){
-		return {
-			left: obj.x - styleNumber(this, 'margin-left'),
-			top: obj.y - styleNumber(this, 'margin-top')
-		};
-	},
-
-	setPosition: function(obj){
-		return this.setStyles(this.computePosition(obj));
-	}
-
-});
-
-
-[Document, Window].invoke('implement', {
-
-	getSize: function(){
-		var doc = getCompatElement(this);
-		return {x: doc.clientWidth, y: doc.clientHeight};
-	},
-
-	getScroll: function(){
-		var win = this.getWindow(), doc = getCompatElement(this);
-		return {x: win.pageXOffset || doc.scrollLeft, y: win.pageYOffset || doc.scrollTop};
-	},
-
-	getScrollSize: function(){
-		var doc = getCompatElement(this),
-			min = this.getSize(),
-			body = this.getDocument().body;
-
-		return {x: Math.max(doc.scrollWidth, body.scrollWidth, min.x), y: Math.max(doc.scrollHeight, body.scrollHeight, min.y)};
-	},
-
-	getPosition: function(){
-		return {x: 0, y: 0};
-	},
-
-	getCoordinates: function(){
-		var size = this.getSize();
-		return {top: 0, left: 0, bottom: size.y, right: size.x, height: size.y, width: size.x};
-	}
-
-});
-
-// private methods
-
-var styleString = Element.getComputedStyle;
-
-function styleNumber(element, style){
-	return styleString(element, style).toInt() || 0;
-}
-
-//<1.4compat>
-function borderBox(element){
-	return styleString(element, '-moz-box-sizing') == 'border-box';
-}
-//</1.4compat>
-
-function topBorder(element){
-	return styleNumber(element, 'border-top-width');
-}
-
-function leftBorder(element){
-	return styleNumber(element, 'border-left-width');
-}
-
-function isBody(element){
-	return (/^(?:body|html)$/i).test(element.tagName);
-}
-
-function getCompatElement(element){
-	var doc = element.getDocument();
-	return (!doc.compatMode || doc.compatMode == 'CSS1Compat') ? doc.html : doc.body;
-}
-
-})();
-
-//aliases
-Element.alias({position: 'setPosition'}); //compatability
-
-[Window, Document, Element].invoke('implement', {
-
-	getHeight: function(){
-		return this.getSize().y;
-	},
-
-	getWidth: function(){
-		return this.getSize().x;
-	},
-
-	getScrollTop: function(){
-		return this.getScroll().y;
-	},
-
-	getScrollLeft: function(){
-		return this.getScroll().x;
-	},
-
-	getScrollHeight: function(){
-		return this.getScrollSize().y;
-	},
-
-	getScrollWidth: function(){
-		return this.getScrollSize().x;
-	},
-
-	getTop: function(){
-		return this.getPosition().y;
-	},
-
-	getLeft: function(){
-		return this.getPosition().x;
-	}
-
-});
-
-/*
----
-
-name: Fx
-
-description: Contains the basic animation logic to be extended by all other Fx Classes.
-
-license: MIT-style license.
-
-requires: [Chain, Events, Options, Class.Thenable]
-
-provides: Fx
-
-...
-*/
-
-(function(){
-
-var Fx = this.Fx = new Class({
-
-	Implements: [Chain, Events, Options, Class.Thenable],
-
-	options: {
-		/*
-		onStart: nil,
-		onCancel: nil,
-		onComplete: nil,
-		*/
-		fps: 60,
-		unit: false,
-		duration: 500,
-		frames: null,
-		frameSkip: true,
-		link: 'ignore'
-	},
-
-	initialize: function(options){
-		this.subject = this.subject || this;
-		this.setOptions(options);
-	},
-
-	getTransition: function(){
-		return function(p){
-			return -(Math.cos(Math.PI * p) - 1) / 2;
-		};
-	},
-
-	step: function(now){
-		if (this.options.frameSkip){
-			var diff = (this.time != null) ? (now - this.time) : 0, frames = diff / this.frameInterval;
-			this.time = now;
-			this.frame += frames;
-		} else {
-			this.frame++;
-		}
-
-		if (this.frame < this.frames){
-			var delta = this.transition(this.frame / this.frames);
-			this.set(this.compute(this.from, this.to, delta));
-		} else {
-			this.frame = this.frames;
-			this.set(this.compute(this.from, this.to, 1));
-			this.stop();
-		}
-	},
-
-	set: function(now){
-		return now;
-	},
-
-	compute: function(from, to, delta){
-		return Fx.compute(from, to, delta);
-	},
-
-	check: function(){
-		if (!this.isRunning()) return true;
-		switch (this.options.link){
-			case 'cancel': this.cancel(); return true;
-			case 'chain': this.chain(this.caller.pass(arguments, this)); return false;
-		}
-		return false;
-	},
-
-	start: function(from, to){
-		if (!this.check(from, to)) return this;
-		this.from = from;
-		this.to = to;
-		this.frame = (this.options.frameSkip) ? 0 : -1;
-		this.time = null;
-		this.transition = this.getTransition();
-		var frames = this.options.frames, fps = this.options.fps, duration = this.options.duration;
-		this.duration = Fx.Durations[duration] || duration.toInt();
-		this.frameInterval = 1000 / fps;
-		this.frames = frames || Math.round(this.duration / this.frameInterval);
-		if (this.getThenableState() !== 'pending'){
-			this.resetThenable(this.subject);
-		}
-		this.fireEvent('start', this.subject);
-		pushInstance.call(this, fps);
-		return this;
-	},
-
-	stop: function(){
-		if (this.isRunning()){
-			this.time = null;
-			pullInstance.call(this, this.options.fps);
-			if (this.frames == this.frame){
-				this.fireEvent('complete', this.subject);
-				if (!this.callChain()) this.fireEvent('chainComplete', this.subject);
-			} else {
-				this.fireEvent('stop', this.subject);
-			}
-			this.resolve(this.subject === this ? null : this.subject);
-		}
-		return this;
-	},
-
-	cancel: function(){
-		if (this.isRunning()){
-			this.time = null;
-			pullInstance.call(this, this.options.fps);
-			this.frame = this.frames;
-			this.fireEvent('cancel', this.subject).clearChain();
-			this.reject(this.subject);
-		}
-		return this;
-	},
-
-	pause: function(){
-		if (this.isRunning()){
-			this.time = null;
-			pullInstance.call(this, this.options.fps);
-		}
-		return this;
-	},
-
-	resume: function(){
-		if (this.isPaused()) pushInstance.call(this, this.options.fps);
-		return this;
-	},
-
-	isRunning: function(){
-		var list = instances[this.options.fps];
-		return list && list.contains(this);
-	},
-
-	isPaused: function(){
-		return (this.frame < this.frames) && !this.isRunning();
-	}
-
-});
-
-Fx.compute = function(from, to, delta){
-	return (to - from) * delta + from;
-};
-
-Fx.Durations = {'short': 250, 'normal': 500, 'long': 1000};
-
-// global timers
-
-var instances = {}, timers = {};
-
-var loop = function(){
-	var now = Date.now();
-	for (var i = this.length; i--;){
-		var instance = this[i];
-		if (instance) instance.step(now);
-	}
-};
-
-var pushInstance = function(fps){
-	var list = instances[fps] || (instances[fps] = []);
-	list.push(this);
-	if (!timers[fps]) timers[fps] = loop.periodical(Math.round(1000 / fps), list);
-};
-
-var pullInstance = function(fps){
-	var list = instances[fps];
-	if (list){
-		list.erase(this);
-		if (!list.length && timers[fps]){
-			delete instances[fps];
-			timers[fps] = clearInterval(timers[fps]);
-		}
-	}
-};
-
-})();
-
-/*
----
-
-name: Fx.CSS
-
-description: Contains the CSS animation logic. Used by Fx.Tween, Fx.Morph, Fx.Elements.
-
-license: MIT-style license.
-
-requires: [Fx, Element.Style]
-
-provides: Fx.CSS
-
-...
-*/
-
-Fx.CSS = new Class({
-
-	Extends: Fx,
-
-	//prepares the base from/to object
-
-	prepare: function(element, property, values){
-		values = Array.convert(values);
-		var from = values[0], to = values[1];
-		if (to == null){
-			to = from;
-			from = element.getStyle(property);
-			var unit = this.options.unit;
-			// adapted from: https://github.com/ryanmorr/fx/blob/master/fx.js#L299
-			if (unit && from && typeof from == 'string' && from.slice(-unit.length) != unit && parseFloat(from) != 0){
-				element.setStyle(property, to + unit);
-				var value = element.getComputedStyle(property);
-				// IE and Opera support pixelLeft or pixelWidth
-				if (!(/px$/.test(value))){
-					value = element.style[('pixel-' + property).camelCase()];
-					if (value == null){
-						// adapted from Dean Edwards' http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291
-						var left = element.style.left;
-						element.style.left = to + unit;
-						value = element.style.pixelLeft;
-						element.style.left = left;
-					}
-				}
-				from = (to || 1) / (parseFloat(value) || 1) * (parseFloat(from) || 0);
-				element.setStyle(property, from + unit);
-			}
-		}
-		return {from: this.parse(from), to: this.parse(to)};
-	},
-
-	//parses a value into an array
-
-	parse: function(value){
-		value = Function.convert(value)();
-		value = (typeof value == 'string') ? value.split(' ') : Array.convert(value);
-		return value.map(function(val){
-			val = String(val);
-			var found = false;
-			Object.each(Fx.CSS.Parsers, function(parser){
-				if (found) return;
-				var parsed = parser.parse(val);
-				if (parsed || parsed === 0) found = {value: parsed, parser: parser};
-			});
-			found = found || {value: val, parser: Fx.CSS.Parsers.String};
-			return found;
-		});
-	},
-
-	//computes by a from and to prepared objects, using their parsers.
-
-	compute: function(from, to, delta){
-		var computed = [];
-		(Math.min(from.length, to.length)).times(function(i){
-			computed.push({value: from[i].parser.compute(from[i].value, to[i].value, delta), parser: from[i].parser});
-		});
-		computed.$family = Function.convert('fx:css:value');
-		return computed;
-	},
-
-	//serves the value as settable
-
-	serve: function(value, unit){
-		if (typeOf(value) != 'fx:css:value') value = this.parse(value);
-		var returned = [];
-		value.each(function(bit){
-			returned = returned.concat(bit.parser.serve(bit.value, unit));
-		});
-		return returned;
-	},
-
-	//renders the change to an element
-
-	render: function(element, property, value, unit){
-		element.setStyle(property, this.serve(value, unit));
-	},
-
-	//searches inside the page css to find the values for a selector
-
-	search: function(selector){
-		if (Fx.CSS.Cache[selector]) return Fx.CSS.Cache[selector];
-		var to = {}, selectorTest = new RegExp('^' + selector.escapeRegExp() + '$');
-
-		var searchStyles = function(rules){
-			Array.each(rules, function(rule){
-				if (rule.media){
-					searchStyles(rule.rules || rule.cssRules);
-					return;
-				}
-				if (!rule.style) return;
-				var selectorText = (rule.selectorText) ? rule.selectorText.replace(/^\w+/, function(m){
-					return m.toLowerCase();
-				}) : null;
-				if (!selectorText || !selectorTest.test(selectorText)) return;
-				Object.each(Element.Styles, function(value, style){
-					if (!rule.style[style] || Element.ShortStyles[style]) return;
-					value = String(rule.style[style]);
-					to[style] = ((/^rgb/).test(value)) ? value.rgbToHex() : value;
-				});
-			});
-		};
-
-		Array.each(document.styleSheets, function(sheet){
-			var href = sheet.href;
-			if (href && href.indexOf('://') > -1 && href.indexOf(document.domain) == -1) return;
-			var rules = sheet.rules || sheet.cssRules;
-			searchStyles(rules);
-		});
-		return Fx.CSS.Cache[selector] = to;
-	}
-
-});
-
-Fx.CSS.Cache = {};
-
-Fx.CSS.Parsers = {
-
-	Color: {
-		parse: function(value){
-			if (value.match(/^#[0-9a-f]{3,6}$/i)) return value.hexToRgb(true);
-			return ((value = value.match(/(\d+),\s*(\d+),\s*(\d+)/))) ? [value[1], value[2], value[3]] : false;
-		},
-		compute: function(from, to, delta){
-			return from.map(function(value, i){
-				return Math.round(Fx.compute(from[i], to[i], delta));
-			});
-		},
-		serve: function(value){
-			return value.map(Number);
-		}
-	},
-
-	Number: {
-		parse: parseFloat,
-		compute: Fx.compute,
-		serve: function(value, unit){
-			return (unit) ? value + unit : value;
-		}
-	},
-
-	String: {
-		parse: Function.convert(false),
-		compute: function(zero, one){
-			return one;
-		},
-		serve: function(zero){
-			return zero;
-		}
-	}
-
-};
-
-//<1.2compat>
-
-Fx.CSS.Parsers = new Hash(Fx.CSS.Parsers);
-
-//</1.2compat>
-
-/*
----
-
-name: Fx.Tween
-
-description: Formerly Fx.Style, effect to transition any CSS property for an element.
-
-license: MIT-style license.
-
-requires: Fx.CSS
-
-provides: [Fx.Tween, Element.fade, Element.highlight]
-
-...
-*/
-
-Fx.Tween = new Class({
-
-	Extends: Fx.CSS,
-
-	initialize: function(element, options){
-		this.element = this.subject = document.id(element);
-		this.parent(options);
-	},
-
-	set: function(property, now){
-		if (arguments.length == 1){
-			now = property;
-			property = this.property || this.options.property;
-		}
-		this.render(this.element, property, now, this.options.unit);
-		return this;
-	},
-
-	start: function(property, from, to){
-		if (!this.check(property, from, to)) return this;
-		var args = Array.flatten(arguments);
-		this.property = this.options.property || args.shift();
-		var parsed = this.prepare(this.element, this.property, args);
-		return this.parent(parsed.from, parsed.to);
-	}
-
-});
-
-Element.Properties.tween = {
-
-	set: function(options){
-		this.get('tween').cancel().setOptions(options);
-		return this;
-	},
-
-	get: function(){
-		var tween = this.retrieve('tween');
-		if (!tween){
-			tween = new Fx.Tween(this, {link: 'cancel'});
-			this.store('tween', tween);
-		}
-		return tween;
-	}
-
-};
-
-Element.implement({
-
-	tween: function(property, from, to){
-		this.get('tween').start(property, from, to);
-		return this;
-	},
-
-	fade: function(){
-		var fade = this.get('tween'), method, args = ['opacity'].append(arguments), toggle;
-		if (args[1] == null) args[1] = 'toggle';
-		switch (args[1]){
-			case 'in': method = 'start'; args[1] = 1; break;
-			case 'out': method = 'start'; args[1] = 0; break;
-			case 'show': method = 'set'; args[1] = 1; break;
-			case 'hide': method = 'set'; args[1] = 0; break;
-			case 'toggle':
-				var flag = this.retrieve('fade:flag', this.getStyle('opacity') == 1);
-				method = 'start';
-				args[1] = flag ? 0 : 1;
-				this.store('fade:flag', !flag);
-				toggle = true;
-				break;
-			default: method = 'start';
-		}
-		if (!toggle) this.eliminate('fade:flag');
-		fade[method].apply(fade, args);
-		var to = args[args.length - 1];
-
-		if (method == 'set'){
-			this.setStyle('visibility', to == 0 ? 'hidden' : 'visible');
-		} else if (to != 0){
-			if (fade.$chain.length){
-				fade.chain(function(){
-					this.element.setStyle('visibility', 'visible');
-					this.callChain();
-				});
-			} else {
-				this.setStyle('visibility', 'visible');
-			}
-		} else {
-			fade.chain(function(){
-				if (this.element.getStyle('opacity')) return;
-				this.element.setStyle('visibility', 'hidden');
-				this.callChain();
-			});
-		}
-
-		return this;
-	},
-
-	highlight: function(start, end){
-		if (!end){
-			end = this.retrieve('highlight:original', this.getStyle('background-color'));
-			end = (end == 'transparent') ? '#fff' : end;
-		}
-		var tween = this.get('tween');
-		tween.start('background-color', start || '#ffff88', end).chain(function(){
-			this.setStyle('background-color', this.retrieve('highlight:original'));
-			tween.callChain();
-		}.bind(this));
-		return this;
-	}
-
-});
-
-/*
----
-
-name: Fx.Morph
-
-description: Formerly Fx.Styles, effect to transition any number of CSS properties for an element using an object of rules, or CSS based selector rules.
-
-license: MIT-style license.
-
-requires: Fx.CSS
-
-provides: Fx.Morph
-
-...
-*/
-
-Fx.Morph = new Class({
-
-	Extends: Fx.CSS,
-
-	initialize: function(element, options){
-		this.element = this.subject = document.id(element);
-		this.parent(options);
-	},
-
-	set: function(now){
-		if (typeof now == 'string') now = this.search(now);
-		for (var p in now) this.render(this.element, p, now[p], this.options.unit);
-		return this;
-	},
-
-	compute: function(from, to, delta){
-		var now = {};
-		for (var p in from) now[p] = this.parent(from[p], to[p], delta);
-		return now;
-	},
-
-	start: function(properties){
-		if (!this.check(properties)) return this;
-		if (typeof properties == 'string') properties = this.search(properties);
-		var from = {}, to = {};
-		for (var p in properties){
-			var parsed = this.prepare(this.element, p, properties[p]);
-			from[p] = parsed.from;
-			to[p] = parsed.to;
-		}
-		return this.parent(from, to);
-	}
-
-});
-
-Element.Properties.morph = {
-
-	set: function(options){
-		this.get('morph').cancel().setOptions(options);
-		return this;
-	},
-
-	get: function(){
-		var morph = this.retrieve('morph');
-		if (!morph){
-			morph = new Fx.Morph(this, {link: 'cancel'});
-			this.store('morph', morph);
-		}
-		return morph;
-	}
-
-};
-
-Element.implement({
-
-	morph: function(props){
-		this.get('morph').start(props);
-		return this;
-	}
-
-});
-
-/*
----
-
-name: Fx.Transitions
-
-description: Contains a set of advanced transitions to be used with any of the Fx Classes.
-
-license: MIT-style license.
-
-credits:
-  - Easing Equations by Robert Penner, <http://www.robertpenner.com/easing/>, modified and optimized to be used with MooTools.
-
-requires: Fx
-
-provides: Fx.Transitions
-
-...
-*/
-
-Fx.implement({
-
-	getTransition: function(){
-		var trans = this.options.transition || Fx.Transitions.Sine.easeInOut;
-		if (typeof trans == 'string'){
-			var data = trans.split(':');
-			trans = Fx.Transitions;
-			trans = trans[data[0]] || trans[data[0].capitalize()];
-			if (data[1]) trans = trans['ease' + data[1].capitalize() + (data[2] ? data[2].capitalize() : '')];
-		}
-		return trans;
-	}
-
-});
-
-Fx.Transition = function(transition, params){
-	params = Array.convert(params);
-	var easeIn = function(pos){
-		return transition(pos, params);
-	};
-	return Object.append(easeIn, {
-		easeIn: easeIn,
-		easeOut: function(pos){
-			return 1 - transition(1 - pos, params);
-		},
-		easeInOut: function(pos){
-			return (pos <= 0.5 ? transition(2 * pos, params) : (2 - transition(2 * (1 - pos), params))) / 2;
-		}
-	});
-};
-
-Fx.Transitions = {
-
-	linear: function(zero){
-		return zero;
-	}
-
-};
-
-//<1.2compat>
-
-Fx.Transitions = new Hash(Fx.Transitions);
-
-//</1.2compat>
-
-Fx.Transitions.extend = function(transitions){
-	for (var transition in transitions) Fx.Transitions[transition] = new Fx.Transition(transitions[transition]);
-};
-
-Fx.Transitions.extend({
-
-	Pow: function(p, x){
-		return Math.pow(p, x && x[0] || 6);
-	},
-
-	Expo: function(p){
-		return Math.pow(2, 8 * (p - 1));
-	},
-
-	Circ: function(p){
-		return 1 - Math.sin(Math.acos(p));
-	},
-
-	Sine: function(p){
-		return 1 - Math.cos(p * Math.PI / 2);
-	},
-
-	Back: function(p, x){
-		x = x && x[0] || 1.618;
-		return Math.pow(p, 2) * ((x + 1) * p - x);
-	},
-
-	Bounce: function(p){
-		var value;
-		for (var a = 0, b = 1; 1; a += b, b /= 2){
-			if (p >= (7 - 4 * a) / 11){
-				value = b * b - Math.pow((11 - 6 * a - 11 * p) / 4, 2);
-				break;
-			}
-		}
-		return value;
-	},
-
-	Elastic: function(p, x){
-		return Math.pow(2, 10 * --p) * Math.cos(20 * p * Math.PI * (x && x[0] || 1) / 3);
-	}
-
-});
-
-['Quad', 'Cubic', 'Quart', 'Quint'].each(function(transition, i){
-	Fx.Transitions[transition] = new Fx.Transition(function(p){
-		return Math.pow(p, i + 2);
-	});
-});
-
-/*
----
-
-name: Request
-
-description: Powerful all purpose Request Class. Uses XMLHTTPRequest.
-
-license: MIT-style license.
-
-requires: [Object, Element, Chain, Events, Options, Class.Thenable, Browser]
-
-provides: Request
-
-...
-*/
-
-(function(){
-
-var empty = function(){},
-	progressSupport = ('onprogress' in new Browser.Request);
-
-var Request = this.Request = new Class({
-
-	Implements: [Chain, Events, Options, Class.Thenable],
-
-	options: {/*
-		onRequest: function(){},
-		onLoadstart: function(event, xhr){},
-		onProgress: function(event, xhr){},
-		onComplete: function(){},
-		onCancel: function(){},
-		onSuccess: function(responseText, responseXML){},
-		onFailure: function(xhr){},
-		onException: function(headerName, value){},
-		onTimeout: function(){},
-		user: '',
-		password: '',
-		withCredentials: false,*/
-		url: '',
-		data: '',
-		headers: {
-			'X-Requested-With': 'XMLHttpRequest',
-			'Accept': 'text/javascript, text/html, application/xml, text/xml, */*'
-		},
-		async: true,
-		format: false,
-		method: 'post',
-		link: 'ignore',
-		isSuccess: null,
-		emulation: true,
-		urlEncoded: true,
-		encoding: 'utf-8',
-		evalScripts: false,
-		evalResponse: false,
-		timeout: 0,
-		noCache: false
-	},
-
-	initialize: function(options){
-		this.xhr = new Browser.Request();
-		this.setOptions(options);
-		this.headers = this.options.headers;
-	},
-
-	onStateChange: function(){
-		var xhr = this.xhr;
-		if (xhr.readyState != 4 || !this.running) return;
-		this.running = false;
-		this.status = 0;
-		Function.attempt(function(){
-			var status = xhr.status;
-			this.status = (status == 1223) ? 204 : status;
-		}.bind(this));
-		xhr.onreadystatechange = empty;
-		if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
-		if (this.timer){
-			clearTimeout(this.timer);
-			delete this.timer;
-		}
-
-		this.response = {text: this.xhr.responseText || '', xml: this.xhr.responseXML};
-		if (this.options.isSuccess.call(this, this.status))
-			this.success(this.response.text, this.response.xml);
-		else
-			this.failure();
-	},
-
-	isSuccess: function(){
-		var status = this.status;
-		return (status >= 200 && status < 300);
-	},
-
-	isRunning: function(){
-		return !!this.running;
-	},
-
-	processScripts: function(text){
-		if (this.options.evalResponse || (/(ecma|java)script/).test(this.getHeader('Content-type'))) return Browser.exec(text);
-		return text.stripScripts(this.options.evalScripts);
-	},
-
-	success: function(text, xml){
-		this.onSuccess(this.processScripts(text), xml);
-		this.resolve({text: text, xml: xml});
-	},
-
-	onSuccess: function(){
-		this.fireEvent('complete', arguments).fireEvent('success', arguments).callChain();
-	},
-
-	failure: function(){
-		this.onFailure();
-		this.reject({reason: 'failure', xhr: this.xhr});
-	},
-
-	onFailure: function(){
-		this.fireEvent('complete').fireEvent('failure', this.xhr);
-	},
-
-	loadstart: function(event){
-		this.fireEvent('loadstart', [event, this.xhr]);
-	},
-
-	progress: function(event){
-		this.fireEvent('progress', [event, this.xhr]);
-	},
-
-	timeout: function(){
-		this.fireEvent('timeout', this.xhr);
-		this.reject({reason: 'timeout', xhr: this.xhr});
-	},
-
-	setHeader: function(name, value){
-		this.headers[name] = value;
-		return this;
-	},
-
-	getHeader: function(name){
-		return Function.attempt(function(){
-			return this.xhr.getResponseHeader(name);
-		}.bind(this));
-	},
-
-	check: function(){
-		if (!this.running) return true;
-		switch (this.options.link){
-			case 'cancel': this.cancel(); return true;
-			case 'chain': this.chain(this.caller.pass(arguments, this)); return false;
-		}
-		return false;
-	},
-
-	send: function(options){
-		if (!this.check(options)) return this;
-
-		this.options.isSuccess = this.options.isSuccess || this.isSuccess;
-		this.running = true;
-
-		var type = typeOf(options);
-		if (type == 'string' || type == 'element') options = {data: options};
-
-		var old = this.options;
-		options = Object.append({data: old.data, url: old.url, method: old.method}, options);
-		var data = options.data, url = String(options.url), method = options.method.toLowerCase();
-
-		switch (typeOf(data)){
-			case 'element': data = document.id(data).toQueryString(); break;
-			case 'object': case 'hash': data = Object.toQueryString(data);
-		}
-
-		if (this.options.format){
-			var format = 'format=' + this.options.format;
-			data = (data) ? format + '&' + data : format;
-		}
-
-		if (this.options.emulation && !['get', 'post'].contains(method)){
-			var _method = '_method=' + method;
-			data = (data) ? _method + '&' + data : _method;
-			method = 'post';
-		}
-
-		if (this.options.urlEncoded && ['post', 'put'].contains(method)){
-			var encoding = (this.options.encoding) ? '; charset=' + this.options.encoding : '';
-			this.headers['Content-type'] = 'application/x-www-form-urlencoded' + encoding;
-		}
-
-		if (!url) url = document.location.pathname;
-
-		var trimPosition = url.lastIndexOf('/');
-		if (trimPosition > -1 && (trimPosition = url.indexOf('#')) > -1) url = url.substr(0, trimPosition);
-
-		if (this.options.noCache)
-			url += (url.indexOf('?') > -1 ? '&' : '?') + String.uniqueID();
-
-		if (data && (method == 'get' || method == 'delete')){
-			url += (url.indexOf('?') > -1 ? '&' : '?') + data;
-			data = null;
-		}
-
-		var xhr = this.xhr;
-		if (progressSupport){
-			xhr.onloadstart = this.loadstart.bind(this);
-			xhr.onprogress = this.progress.bind(this);
-		}
-
-		xhr.open(method.toUpperCase(), url, this.options.async, this.options.user, this.options.password);
-		if ((/*<1.4compat>*/this.options.user || /*</1.4compat>*/this.options.withCredentials) && 'withCredentials' in xhr) xhr.withCredentials = true;
-
-		xhr.onreadystatechange = this.onStateChange.bind(this);
-
-		Object.each(this.headers, function(value, key){
-			try {
-				xhr.setRequestHeader(key, value);
-			} catch (e){
-				this.fireEvent('exception', [key, value]);
-				this.reject({reason: 'exception', xhr: xhr, exception: e});
-			}
-		}, this);
-
-		if (this.getThenableState() !== 'pending'){
-			this.resetThenable({reason: 'send'});
-		}
-		this.fireEvent('request');
-		xhr.send(data);
-		if (!this.options.async) this.onStateChange();
-		else if (this.options.timeout) this.timer = this.timeout.delay(this.options.timeout, this);
-		return this;
-	},
-
-	cancel: function(){
-		if (!this.running) return this;
-		this.running = false;
-		var xhr = this.xhr;
-		xhr.abort();
-		if (this.timer){
-			clearTimeout(this.timer);
-			delete this.timer;
-		}
-		xhr.onreadystatechange = empty;
-		if (progressSupport) xhr.onprogress = xhr.onloadstart = empty;
-		this.xhr = new Browser.Request();
-		this.fireEvent('cancel');
-		this.reject({reason: 'cancel', xhr: xhr});
-		return this;
-	}
-
-});
-
-var methods = {};
-['get', 'post', 'put', 'delete', 'patch', 'head', 'GET', 'POST', 'PUT', 'DELETE', 'PATCH', 'HEAD'].each(function(method){
-	methods[method] = function(data){
-		var object = {
-			method: method
-		};
-		if (data != null) object.data = data;
-		return this.send(object);
-	};
-});
-
-Request.implement(methods);
-
-Element.Properties.send = {
-
-	set: function(options){
-		var send = this.get('send').cancel();
-		send.setOptions(options);
-		return this;
-	},
-
-	get: function(){
-		var send = this.retrieve('send');
-		if (!send){
-			send = new Request({
-				data: this, link: 'cancel', method: this.get('method') || 'post', url: this.get('action')
-			});
-			this.store('send', send);
-		}
-		return send;
-	}
-
-};
-
-Element.implement({
-
-	send: function(url){
-		var sender = this.get('send');
-		sender.send({data: this, url: url || sender.options.url});
-		return this;
-	}
-
-});
-
-})();
-
-/*
----
-
-name: Request.HTML
-
-description: Extends the basic Request Class with additional methods for interacting with HTML responses.
-
-license: MIT-style license.
-
-requires: [Element, Request]
-
-provides: Request.HTML
-
-...
-*/
-
-Request.HTML = new Class({
-
-	Extends: Request,
-
-	options: {
-		update: false,
-		append: false,
-		evalScripts: true,
-		filter: false,
-		headers: {
-			Accept: 'text/html, application/xml, text/xml, */*'
-		}
-	},
-
-	success: function(text){
-		var options = this.options, response = this.response;
-
-		response.html = text.stripScripts(function(script){
-			response.javascript = script;
-		});
-
-		var match = response.html.match(/<body[^>]*>([\s\S]*?)<\/body>/i);
-		if (match) response.html = match[1];
-		var temp = new Element('div').set('html', response.html);
-
-		response.tree = temp.childNodes;
-		response.elements = temp.getElements(options.filter || '*');
-
-		if (options.filter) response.tree = response.elements;
-		if (options.update){
-			var update = document.id(options.update).empty();
-			if (options.filter) update.adopt(response.elements);
-			else update.set('html', response.html);
-		} else if (options.append){
-			var append = document.id(options.append);
-			if (options.filter) response.elements.reverse().inject(append);
-			else append.adopt(temp.getChildren());
-		}
-		if (options.evalScripts) Browser.exec(response.javascript);
-
-		this.onSuccess(response.tree, response.elements, response.html, response.javascript);
-		this.resolve({tree: response.tree, elements: response.elements, html: response.html, javascript: response.javascript});
-	}
-
-});
-
-Element.Properties.load = {
-
-	set: function(options){
-		var load = this.get('load').cancel();
-		load.setOptions(options);
-		return this;
-	},
-
-	get: function(){
-		var load = this.retrieve('load');
-		if (!load){
-			load = new Request.HTML({data: this, link: 'cancel', update: this, method: 'get'});
-			this.store('load', load);
-		}
-		return load;
-	}
-
-};
-
-Element.implement({
-
-	load: function(){
-		this.get('load').send(Array.link(arguments, {data: Type.isObject, url: Type.isString}));
-		return this;
-	}
-
-});
-
-/*
----
-
-name: JSON
-
-description: JSON encoder and decoder.
-
-license: MIT-style license.
-
-SeeAlso: <http://www.json.org/>
-
-requires: [Array, String, Number, Function]
-
-provides: JSON
-
-...
-*/
-
-if (typeof JSON == 'undefined') this.JSON = {};
-
-//<1.2compat>
-
-JSON = new Hash({
-	stringify: JSON.stringify,
-	parse: JSON.parse
-});
-
-//</1.2compat>
-
-(function(){
-
-var special = {'\b': '\\b', '\t': '\\t', '\n': '\\n', '\f': '\\f', '\r': '\\r', '"' : '\\"', '\\': '\\\\'};
-
-var escape = function(chr){
-	return special[chr] || '\\u' + ('0000' + chr.charCodeAt(0).toString(16)).slice(-4);
-};
-
-JSON.validate = function(string){
-	string = string.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g, '@').
-					replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g, ']').
-					replace(/(?:^|:|,)(?:\s*\[)+/g, '');
-
-	return (/^[\],:{}\s]*$/).test(string);
-};
-
-JSON.encode = JSON.stringify ? function(obj){
-	return JSON.stringify(obj);
-} : function(obj){
-	if (obj && obj.toJSON) obj = obj.toJSON();
-
-	switch (typeOf(obj)){
-		case 'string':
-			return '"' + obj.replace(/[\x00-\x1f\\"]/g, escape) + '"';
-		case 'array':
-			return '[' + obj.map(JSON.encode).clean() + ']';
-		case 'object': case 'hash':
-			var string = [];
-			Object.each(obj, function(value, key){
-				var json = JSON.encode(value);
-				if (json) string.push(JSON.encode(key) + ':' + json);
-			});
-			return '{' + string + '}';
-		case 'number': case 'boolean': return '' + obj;
-		case 'null': return 'null';
-	}
-
-	return null;
-};
-
-JSON.secure = true;
-//<1.4compat>
-JSON.secure = false;
-//</1.4compat>
-
-JSON.decode = function(string, secure){
-	if (!string || typeOf(string) != 'string') return null;
-
-	if (secure == null) secure = JSON.secure;
-	if (secure){
-		if (JSON.parse) return JSON.parse(string);
-		if (!JSON.validate(string)) throw new Error('JSON could not decode the input; security is enabled and the value is not secure.');
-	}
-
-	return eval('(' + string + ')');
-};
-
-})();
-
-/*
----
-
-name: Request.JSON
-
-description: Extends the basic Request Class with additional methods for sending and receiving JSON data.
-
-license: MIT-style license.
-
-requires: [Request, JSON]
-
-provides: Request.JSON
-
-...
-*/
-
-Request.JSON = new Class({
-
-	Extends: Request,
-
-	options: {
-		/*onError: function(text, error){},*/
-		secure: true
-	},
-
-	initialize: function(options){
-		this.parent(options);
-		Object.append(this.headers, {
-			'Accept': 'application/json',
-			'X-Request': 'JSON'
-		});
-	},
-
-	success: function(text){
-		var json;
-		try {
-			json = this.response.json = JSON.decode(text, this.options.secure);
-		} catch (error){
-			this.fireEvent('error', [text, error]);
-			return;
-		}
-		if (json == null){
-			this.failure();
-		} else {
-			this.onSuccess(json, text);
-			this.resolve({json: json, text: text});
-		}
-	}
-
-});
-
-/*
----
-
-name: Cookie
-
-description: Class for creating, reading, and deleting browser Cookies.
-
-license: MIT-style license.
-
-credits:
-  - Based on the functions by Peter-Paul Koch (http://quirksmode.org).
-
-requires: [Options, Browser]
-
-provides: Cookie
-
-...
-*/
-
-var Cookie = new Class({
-
-	Implements: Options,
-
-	options: {
-		path: '/',
-		domain: false,
-		duration: false,
-		secure: false,
-		document: document,
-		encode: true,
-		httpOnly: false
-	},
-
-	initialize: function(key, options){
-		this.key = key;
-		this.setOptions(options);
-	},
-
-	write: function(value){
-		if (this.options.encode) value = encodeURIComponent(value);
-		if (this.options.domain) value += '; domain=' + this.options.domain;
-		if (this.options.path) value += '; path=' + this.options.path;
-		if (this.options.duration){
-			var date = new Date();
-			date.setTime(date.getTime() + this.options.duration * 24 * 60 * 60 * 1000);
-			value += '; expires=' + date.toGMTString();
-		}
-		if (this.options.secure) value += '; secure';
-		if (this.options.httpOnly) value += '; HttpOnly';
-		this.options.document.cookie = this.key + '=' + value;
-		return this;
-	},
-
-	read: function(){
-		var value = this.options.document.cookie.match('(?:^|;)\\s*' + this.key.escapeRegExp() + '=([^;]*)');
-		return (value) ? decodeURIComponent(value[1]) : null;
-	},
-
-	dispose: function(){
-		new Cookie(this.key, Object.merge({}, this.options, {duration: -1})).write('');
-		return this;
-	}
-
-});
-
-Cookie.write = function(key, value, options){
-	return new Cookie(key, options).write(value);
-};
-
-Cookie.read = function(key){
-	return new Cookie(key).read();
-};
-
-Cookie.dispose = function(key, options){
-	return new Cookie(key, options).dispose();
-};
-
-/*
----
-
-name: DOMReady
-
-description: Contains the custom event domready.
-
-license: MIT-style license.
-
-requires: [Browser, Element, Element.Event]
-
-provides: [DOMReady, DomReady]
-
-...
-*/
-
-(function(window, document){
-
-var ready,
-	loaded,
-	checks = [],
-	shouldPoll,
-	timer,
-	testElement = document.createElement('div');
-
-var domready = function(){
-	clearTimeout(timer);
-	if (!ready){
-		Browser.loaded = ready = true;
-		document.removeListener('DOMContentLoaded', domready).removeListener('readystatechange', check);
-		document.fireEvent('domready');
-		window.fireEvent('domready');
-	}
-	// cleanup scope vars
-	document = window = testElement = null;
-};
-
-var check = function(){
-	for (var i = checks.length; i--;) if (checks[i]()){
-		domready();
-		return true;
-	}
-	return false;
-};
-
-var poll = function(){
-	clearTimeout(timer);
-	if (!check()) timer = setTimeout(poll, 10);
-};
-
-document.addListener('DOMContentLoaded', domready);
-
-/*<ltIE8>*/
-// doScroll technique by Diego Perini http://javascript.nwbox.com/IEContentLoaded/
-// testElement.doScroll() throws when the DOM is not ready, only in the top window
-var doScrollWorks = function(){
-	try {
-		testElement.doScroll();
-		return true;
-	} catch (e){}
-	return false;
-};
-// If doScroll works already, it can't be used to determine domready
-//   e.g. in an iframe
-if (testElement.doScroll && !doScrollWorks()){
-	checks.push(doScrollWorks);
-	shouldPoll = true;
-}
-/*</ltIE8>*/
-
-if (document.readyState) checks.push(function(){
-	var state = document.readyState;
-	return (state == 'loaded' || state == 'complete');
-});
-
-if ('onreadystatechange' in document) document.addListener('readystatechange', check);
-else shouldPoll = true;
-
-if (shouldPoll) poll();
-
-Element.Events.domready = {
-	onAdd: function(fn){
-		if (ready) fn.call(this);
-	}
-};
-
-// Make sure that domready fires before load
-Element.Events.load = {
-	base: 'load',
-	onAdd: function(fn){
-		if (loaded && this == window) fn.call(this);
-	},
-	condition: function(){
-		if (this == window){
-			domready();
-			delete Element.Events.load;
-		}
-		return true;
-	}
-};
-
-// This is based on the custom load event
-window.addEvent('load', function(){
-	loaded = true;
-});
-
-})(window, document);
diff --git a/web/tools/mootools/mootools-core-compat.js.URL b/web/tools/mootools/mootools-core-compat.js.URL
deleted file mode 100644
index eff7d93df..000000000
--- a/web/tools/mootools/mootools-core-compat.js.URL
+++ /dev/null
@@ -1 +0,0 @@
-https://github.com/mootools/mootools-core/raw/1.6.0/dist/mootools-core-compat.js
diff --git a/web/tools/mootools/mootools-more-1.6.0.js b/web/tools/mootools/mootools-more-1.6.0.js
deleted file mode 100644
index 80a2f8125..000000000
--- a/web/tools/mootools/mootools-more-1.6.0.js
+++ /dev/null
@@ -1,14658 +0,0 @@
-/* MooTools: the javascript framework. license: MIT-style license. copyright: Copyright (c) 2006-2017 [Valerio Proietti](https://mootools.net/).*/ 
-/*!
-Web Build: https://mootools.net/more/builder/a3048f4bfdf603b22a69c141dbd0fca9
-*/
-/*
----
-
-script: More.js
-
-name: More
-
-description: MooTools More
-
-license: MIT-style license
-
-authors:
-  - Guillermo Rauch
-  - Thomas Aylott
-  - Scott Kyle
-  - Arian Stolwijk
-  - Tim Wienk
-  - Christoph Pojer
-  - Aaron Newton
-  - Jacob Thornton
-
-requires:
-  - Core/MooTools
-
-provides: [MooTools.More]
-
-...
-*/
-
-MooTools.More = {
-	version: '1.6.0',
-	build: '45b71db70f879781a7e0b0d3fb3bb1307c2521eb'
-};
-
-/*
----
-
-script: Chain.Wait.js
-
-name: Chain.Wait
-
-description: value, Adds a method to inject pauses between chained events.
-
-license: MIT-style license.
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Chain
-  - Core/Element
-  - Core/Fx
-  - MooTools.More
-
-provides: [Chain.Wait]
-
-...
-*/
-
-(function(){
-
-var wait = {
-	wait: function(duration){
-		return this.chain(function(){
-			this.callChain.delay(duration == null ? 500 : duration, this);
-			return this;
-		}.bind(this));
-	}
-};
-
-Chain.implement(wait);
-
-if (this.Fx) Fx.implement(wait);
-
-if (this.Element && Element.implement && this.Fx){
-	Element.implement({
-
-		chains: function(effects){
-			Array.convert(effects || ['tween', 'morph', 'reveal']).each(function(effect){
-				effect = this.get(effect);
-				if (!effect) return;
-				effect.setOptions({
-					link:'chain'
-				});
-			}, this);
-			return this;
-		},
-
-		pauseFx: function(duration, effect){
-			this.chains(effect).get(effect || 'tween').wait(duration);
-			return this;
-		}
-
-	});
-}
-
-})();
-
-/*
----
-
-script: Class.Binds.js
-
-name: Class.Binds
-
-description: Automagically binds specified methods in a class to the instance of the class.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Class
-  - MooTools.More
-
-provides: [Class.Binds]
-
-...
-*/
-
-Class.Mutators.Binds = function(binds){
-	if (!this.prototype.initialize) this.implement('initialize', function(){});
-	return Array.convert(binds).concat(this.prototype.Binds || []);
-};
-
-Class.Mutators.initialize = function(initialize){
-	return function(){
-		Array.convert(this.Binds).each(function(name){
-			var original = this[name];
-			if (original) this[name] = original.bind(this);
-		}, this);
-		return initialize.apply(this, arguments);
-	};
-};
-
-/*
----
-
-script: Class.Occlude.js
-
-name: Class.Occlude
-
-description: Prevents a class from being applied to a DOM element twice.
-
-license: MIT-style license.
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Class
-  - Core/Element
-  - MooTools.More
-
-provides: [Class.Occlude]
-
-...
-*/
-
-Class.Occlude = new Class({
-
-	occlude: function(property, element){
-		element = document.id(element || this.element);
-		var instance = element.retrieve(property || this.property);
-		if (instance && !this.occluded)
-			return (this.occluded = instance);
-
-		this.occluded = false;
-		element.store(property || this.property, this);
-		return this.occluded;
-	}
-
-});
-
-/*
----
-
-script: Class.Refactor.js
-
-name: Class.Refactor
-
-description: Extends a class onto itself with new property, preserving any items attached to the class's namespace.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Class
-  - MooTools.More
-
-# Some modules declare themselves dependent on Class.Refactor
-provides: [Class.refactor, Class.Refactor]
-
-...
-*/
-
-Class.refactor = function(original, refactors){
-
-	Object.each(refactors, function(item, name){
-		var origin = original.prototype[name];
-		origin = (origin && origin.$origin) || origin || function(){};
-		original.implement(name, (typeof item == 'function') ? function(){
-			var old = this.previous;
-			this.previous = origin;
-			var value = item.apply(this, arguments);
-			this.previous = old;
-			return value;
-		} : item);
-	});
-
-	return original;
-
-};
-
-/*
----
-
-script: Class.Singleton.js
-
-name: Class.Singleton
-
-description: Always provides a single instance of a class
-
-license: MIT-style license.
-
-authors:
-  - Hristo Chakarov
-
-requires:
-  - Core/Class
-
-provides: [Class.Singleton]
-
-...
-*/
-
-Class.Singleton = new Class({
-
-	initialize : function(descriptor){
-		// here we keep reference of the single instance
-		var singleton;
-		// create a regular Class
-		var constructor = new Class(descriptor);
-		// We return another constructor, because we need to make sure that we
-		// always return the same one and only instance.
-		return function(){
-			if (singleton){
-				return singleton;
-			}
-			// Obviously we instantiate that class for the first time.
-			// Create brand new object & extend it with the prototype of the
-			// original `constructor`.
-			singleton = Object.append({}, constructor.prototype);
-			singleton.constructor = constructor;
-			// We also need to call the constructor as a function, passing the
-			// arguments object.
-			var returnValue = constructor.apply(singleton, arguments);
-			// In case the `constructor` returns something other than `this` -
-			// return that value; otherwise return the `singleton`.
-			singleton = typeof returnValue == 'object' ? returnValue : singleton;
-			return singleton;
-		};
-	}
-
-});
-
-/*
----
-
-name: Events.Pseudos
-
-description: Adds the functionality to add pseudo events
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-
-requires: [Core/Class.Extras, Core/Slick.Parser, MooTools.More]
-
-provides: [Events.Pseudos]
-
-...
-*/
-
-(function(){
-
-Events.Pseudos = function(pseudos, addEvent, removeEvent){
-
-	var storeKey = '_monitorEvents:';
-
-	var storageOf = function(object){
-		return {
-			store: object.store ? function(key, value){
-				object.store(storeKey + key, value);
-			} : function(key, value){
-				(object._monitorEvents || (object._monitorEvents = {}))[key] = value;
-			},
-			retrieve: object.retrieve ? function(key, dflt){
-				return object.retrieve(storeKey + key, dflt);
-			} : function(key, dflt){
-				if (!object._monitorEvents) return dflt;
-				return object._monitorEvents[key] || dflt;
-			}
-		};
-	};
-
-	var splitType = function(type){
-		if (type.indexOf(':') == -1 || !pseudos) return null;
-
-		var parsed = Slick.parse(type).expressions[0][0],
-			parsedPseudos = parsed.pseudos,
-			l = parsedPseudos.length,
-			splits = [];
-
-		while (l--){
-			var pseudo = parsedPseudos[l].key,
-				listener = pseudos[pseudo];
-			if (listener != null) splits.push({
-				event: parsed.tag,
-				value: parsedPseudos[l].value,
-				pseudo: pseudo,
-				original: type,
-				listener: listener
-			});
-		}
-		return splits.length ? splits : null;
-	};
-
-	return {
-
-		addEvent: function(type, fn, internal){
-			var split = splitType(type);
-			if (!split) return addEvent.call(this, type, fn, internal);
-
-			var storage = storageOf(this),
-				events = storage.retrieve(type, []),
-				eventType = split[0].event,
-				args = Array.slice(arguments, 2),
-				stack = fn,
-				self = this;
-
-			split.each(function(item){
-				var listener = item.listener,
-					stackFn = stack;
-				if (listener == false) eventType += ':' + item.pseudo + '(' + item.value + ')';
-				else stack = function(){
-					listener.call(self, item, stackFn, arguments, stack);
-				};
-			});
-
-			events.include({type: eventType, event: fn, monitor: stack});
-			storage.store(type, events);
-
-			if (type != eventType) addEvent.apply(this, [type, fn].concat(args));
-			return addEvent.apply(this, [eventType, stack].concat(args));
-		},
-
-		removeEvent: function(type, fn){
-			var split = splitType(type);
-			if (!split) return removeEvent.call(this, type, fn);
-
-			var storage = storageOf(this),
-				events = storage.retrieve(type);
-			if (!events) return this;
-
-			var args = Array.slice(arguments, 2);
-
-			removeEvent.apply(this, [type, fn].concat(args));
-			events.each(function(monitor, i){
-				if (!fn || monitor.event == fn) removeEvent.apply(this, [monitor.type, monitor.monitor].concat(args));
-				delete events[i];
-			}, this);
-
-			storage.store(type, events);
-			return this;
-		}
-
-	};
-
-};
-
-var pseudos = {
-
-	once: function(split, fn, args, monitor){
-		fn.apply(this, args);
-		this.removeEvent(split.event, monitor)
-			.removeEvent(split.original, fn);
-	},
-
-	throttle: function(split, fn, args){
-		if (!fn._throttled){
-			fn.apply(this, args);
-			fn._throttled = setTimeout(function(){
-				fn._throttled = false;
-			}, split.value || 250);
-		}
-	},
-
-	pause: function(split, fn, args){
-		clearTimeout(fn._pause);
-		fn._pause = fn.delay(split.value || 250, this, args);
-	}
-
-};
-
-Events.definePseudo = function(key, listener){
-	pseudos[key] = listener;
-	return this;
-};
-
-Events.lookupPseudo = function(key){
-	return pseudos[key];
-};
-
-var proto = Events.prototype;
-Events.implement(Events.Pseudos(pseudos, proto.addEvent, proto.removeEvent));
-
-['Request', 'Fx'].each(function(klass){
-	if (this[klass]) this[klass].implement(Events.prototype);
-});
-
-})();
-
-/*
----
-
-script: Drag.js
-
-name: Drag
-
-description: The base Drag Class. Can be used to drag and resize Elements using mouse events.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-  - Tom Occhinno
-  - Jan Kassens
-
-requires:
-  - Core/Events
-  - Core/Options
-  - Core/Element.Event
-  - Core/Element.Style
-  - Core/Element.Dimensions
-  - MooTools.More
-
-provides: [Drag]
-...
-
-*/
-(function(){
-
-var Drag = this.Drag = new Class({
-
-	Implements: [Events, Options],
-
-	options: {/*
-		onBeforeStart: function(thisElement){},
-		onStart: function(thisElement, event){},
-		onSnap: function(thisElement){},
-		onDrag: function(thisElement, event){},
-		onCancel: function(thisElement){},
-		onComplete: function(thisElement, event){},*/
-		snap: 6,
-		unit: 'px',
-		grid: false,
-		style: true,
-		limit: false,
-		handle: false,
-		invert: false,
-		unDraggableTags: ['button', 'input', 'a', 'textarea', 'select', 'option'],
-		preventDefault: false,
-		stopPropagation: false,
-		compensateScroll: false,
-		modifiers: {x: 'left', y: 'top'}
-	},
-
-	initialize: function(){
-		var params = Array.link(arguments, {
-			'options': Type.isObject,
-			'element': function(obj){
-				return obj != null;
-			}
-		});
-
-		this.element = document.id(params.element);
-		this.document = this.element.getDocument();
-		this.setOptions(params.options || {});
-		var htype = typeOf(this.options.handle);
-		this.handles = ((htype == 'array' || htype == 'collection') ? $$(this.options.handle) : document.id(this.options.handle)) || this.element;
-		this.mouse = {'now': {}, 'pos': {}};
-		this.value = {'start': {}, 'now': {}};
-		this.offsetParent = (function(el){
-			var offsetParent = el.getOffsetParent();
-			var isBody = !offsetParent || (/^(?:body|html)$/i).test(offsetParent.tagName);
-			return isBody ? window : document.id(offsetParent);
-		})(this.element);
-		this.selection = 'selectstart' in document ? 'selectstart' : 'mousedown';
-
-		this.compensateScroll = {start: {}, diff: {}, last: {}};
-
-		if ('ondragstart' in document && !('FileReader' in window) && !Drag.ondragstartFixed){
-			document.ondragstart = Function.convert(false);
-			Drag.ondragstartFixed = true;
-		}
-
-		this.bound = {
-			start: this.start.bind(this),
-			check: this.check.bind(this),
-			drag: this.drag.bind(this),
-			stop: this.stop.bind(this),
-			cancel: this.cancel.bind(this),
-			eventStop: Function.convert(false),
-			scrollListener: this.scrollListener.bind(this)
-		};
-		this.attach();
-	},
-
-	attach: function(){
-		this.handles.addEvent('mousedown', this.bound.start);
-		this.handles.addEvent('touchstart', this.bound.start);
-		if (this.options.compensateScroll) this.offsetParent.addEvent('scroll', this.bound.scrollListener);
-		return this;
-	},
-
-	detach: function(){
-		this.handles.removeEvent('mousedown', this.bound.start);
-		this.handles.removeEvent('touchstart', this.bound.start);
-		if (this.options.compensateScroll) this.offsetParent.removeEvent('scroll', this.bound.scrollListener);
-		return this;
-	},
-
-	scrollListener: function(){
-
-		if (!this.mouse.start) return;
-		var newScrollValue = this.offsetParent.getScroll();
-
-		if (this.element.getStyle('position') == 'absolute'){
-			var scrollDiff = this.sumValues(newScrollValue, this.compensateScroll.last, -1);
-			this.mouse.now = this.sumValues(this.mouse.now, scrollDiff, 1);
-		} else {
-			this.compensateScroll.diff = this.sumValues(newScrollValue, this.compensateScroll.start, -1);
-		}
-		if (this.offsetParent != window) this.compensateScroll.diff = this.sumValues(this.compensateScroll.start, newScrollValue, -1);
-		this.compensateScroll.last = newScrollValue;
-		this.render(this.options);
-	},
-
-	sumValues: function(alpha, beta, op){
-		var sum = {}, options = this.options;
-		for (var z in options.modifiers){
-			if (!options.modifiers[z]) continue;
-			sum[z] = alpha[z] + beta[z] * op;
-		}
-		return sum;
-	},
-
-	start: function(event){
-		if (this.options.unDraggableTags.contains(event.target.get('tag'))) return;
-
-		var options = this.options;
-
-		if (event.rightClick) return;
-
-		if (options.preventDefault) event.preventDefault();
-		if (options.stopPropagation) event.stopPropagation();
-		this.compensateScroll.start = this.compensateScroll.last = this.offsetParent.getScroll();
-		this.compensateScroll.diff = {x: 0, y: 0};
-		this.mouse.start = event.page;
-		this.fireEvent('beforeStart', this.element);
-
-		var limit = options.limit;
-		this.limit = {x: [], y: []};
-
-		var z, coordinates, offsetParent = this.offsetParent == window ? null : this.offsetParent;
-		for (z in options.modifiers){
-			if (!options.modifiers[z]) continue;
-
-			var style = this.element.getStyle(options.modifiers[z]);
-
-			// Some browsers (IE and Opera) don't always return pixels.
-			if (style && !style.match(/px$/)){
-				if (!coordinates) coordinates = this.element.getCoordinates(offsetParent);
-				style = coordinates[options.modifiers[z]];
-			}
-
-			if (options.style) this.value.now[z] = (style || 0).toInt();
-			else this.value.now[z] = this.element[options.modifiers[z]];
-
-			if (options.invert) this.value.now[z] *= -1;
-
-			this.mouse.pos[z] = event.page[z] - this.value.now[z];
-
-			if (limit && limit[z]){
-				var i = 2;
-				while (i--){
-					var limitZI = limit[z][i];
-					if (limitZI || limitZI === 0) this.limit[z][i] = (typeof limitZI == 'function') ? limitZI() : limitZI;
-				}
-			}
-		}
-
-		if (typeOf(this.options.grid) == 'number') this.options.grid = {
-			x: this.options.grid,
-			y: this.options.grid
-		};
-
-		var events = {
-			mousemove: this.bound.check,
-			mouseup: this.bound.cancel,
-			touchmove: this.bound.check,
-			touchend: this.bound.cancel
-		};
-		events[this.selection] = this.bound.eventStop;
-		this.document.addEvents(events);
-	},
-
-	check: function(event){
-		if (this.options.preventDefault) event.preventDefault();
-		var distance = Math.round(Math.sqrt(Math.pow(event.page.x - this.mouse.start.x, 2) + Math.pow(event.page.y - this.mouse.start.y, 2)));
-		if (distance > this.options.snap){
-			this.cancel();
-			this.document.addEvents({
-				mousemove: this.bound.drag,
-				mouseup: this.bound.stop,
-				touchmove: this.bound.drag,
-				touchend: this.bound.stop
-			});
-			this.fireEvent('start', [this.element, event]).fireEvent('snap', this.element);
-		}
-	},
-
-	drag: function(event){
-		var options = this.options;
-		if (options.preventDefault) event.preventDefault();
-		this.mouse.now = this.sumValues(event.page, this.compensateScroll.diff, -1);
-
-		this.render(options);
-		this.fireEvent('drag', [this.element, event]);
-	},
-
-	render: function(options){
-		for (var z in options.modifiers){
-			if (!options.modifiers[z]) continue;
-			this.value.now[z] = this.mouse.now[z] - this.mouse.pos[z];
-
-			if (options.invert) this.value.now[z] *= -1;
-			if (options.limit && this.limit[z]){
-				if ((this.limit[z][1] || this.limit[z][1] === 0) && (this.value.now[z] > this.limit[z][1])){
-					this.value.now[z] = this.limit[z][1];
-				} else if ((this.limit[z][0] || this.limit[z][0] === 0) && (this.value.now[z] < this.limit[z][0])){
-					this.value.now[z] = this.limit[z][0];
-				}
-			}
-			if (options.grid[z]) this.value.now[z] -= ((this.value.now[z] - (this.limit[z][0]||0)) % options.grid[z]);
-			if (options.style) this.element.setStyle(options.modifiers[z], this.value.now[z] + options.unit);
-			else this.element[options.modifiers[z]] = this.value.now[z];
-		}
-	},
-
-	cancel: function(event){
-		this.document.removeEvents({
-			mousemove: this.bound.check,
-			mouseup: this.bound.cancel,
-			touchmove: this.bound.check,
-			touchend: this.bound.cancel
-		});
-		if (event){
-			this.document.removeEvent(this.selection, this.bound.eventStop);
-			this.fireEvent('cancel', this.element);
-		}
-	},
-
-	stop: function(event){
-		var events = {
-			mousemove: this.bound.drag,
-			mouseup: this.bound.stop,
-			touchmove: this.bound.drag,
-			touchend: this.bound.stop
-		};
-		events[this.selection] = this.bound.eventStop;
-		this.document.removeEvents(events);
-		this.mouse.start = null;
-		if (event) this.fireEvent('complete', [this.element, event]);
-	}
-
-});
-
-})();
-
-
-Element.implement({
-
-	makeResizable: function(options){
-		var drag = new Drag(this, Object.merge({
-			modifiers: {
-				x: 'width',
-				y: 'height'
-			}
-		}, options));
-
-		this.store('resizer', drag);
-		return drag.addEvent('drag', function(){
-			this.fireEvent('resize', drag);
-		}.bind(this));
-	}
-
-});
-
-/*
----
-
-script: Drag.Move.js
-
-name: Drag.Move
-
-description: A Drag extension that provides support for the constraining of draggables to containers and droppables.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-  - Tom Occhinno
-  - Jan Kassens
-  - Aaron Newton
-  - Scott Kyle
-
-requires:
-  - Core/Element.Dimensions
-  - Drag
-
-provides: [Drag.Move]
-
-...
-*/
-
-Drag.Move = new Class({
-
-	Extends: Drag,
-
-	options: {/*
-		onEnter: function(thisElement, overed){},
-		onLeave: function(thisElement, overed){},
-		onDrop: function(thisElement, overed, event){},*/
-		droppables: [],
-		container: false,
-		precalculate: false,
-		includeMargins: true,
-		checkDroppables: true
-	},
-
-	initialize: function(element, options){
-		this.parent(element, options);
-		element = this.element;
-
-		this.droppables = $$(this.options.droppables);
-		this.setContainer(this.options.container);
-
-		if (this.options.style){
-			if (this.options.modifiers.x == 'left' && this.options.modifiers.y == 'top'){
-				var parent = element.getOffsetParent(),
-					styles = element.getStyles('left', 'top');
-				if (parent && (styles.left == 'auto' || styles.top == 'auto')){
-					element.setPosition(element.getPosition(parent));
-				}
-			}
-
-			if (element.getStyle('position') == 'static') element.setStyle('position', 'absolute');
-		}
-
-		this.addEvent('start', this.checkDroppables, true);
-		this.overed = null;
-	},
-
-	setContainer: function(container){
-		this.container = document.id(container);
-		if (this.container && typeOf(this.container) != 'element'){
-			this.container = document.id(this.container.getDocument().body);
-		}
-	},
-
-	start: function(event){
-		if (this.container) this.options.limit = this.calculateLimit();
-
-		if (this.options.precalculate){
-			this.positions = this.droppables.map(function(el){
-				return el.getCoordinates();
-			});
-		}
-
-		this.parent(event);
-	},
-
-	calculateLimit: function(){
-		var element = this.element,
-			container = this.container,
-
-			offsetParent = document.id(element.getOffsetParent()) || document.body,
-			containerCoordinates = container.getCoordinates(offsetParent),
-			elementMargin = {},
-			elementBorder = {},
-			containerMargin = {},
-			containerBorder = {},
-			offsetParentPadding = {},
-			offsetScroll = offsetParent.getScroll();
-
-		['top', 'right', 'bottom', 'left'].each(function(pad){
-			elementMargin[pad] = element.getStyle('margin-' + pad).toInt();
-			elementBorder[pad] = element.getStyle('border-' + pad).toInt();
-			containerMargin[pad] = container.getStyle('margin-' + pad).toInt();
-			containerBorder[pad] = container.getStyle('border-' + pad).toInt();
-			offsetParentPadding[pad] = offsetParent.getStyle('padding-' + pad).toInt();
-		}, this);
-
-		var width = element.offsetWidth + elementMargin.left + elementMargin.right,
-			height = element.offsetHeight + elementMargin.top + elementMargin.bottom,
-			left = 0 + offsetScroll.x,
-			top = 0 + offsetScroll.y,
-			right = containerCoordinates.right - containerBorder.right - width + offsetScroll.x,
-			bottom = containerCoordinates.bottom - containerBorder.bottom - height + offsetScroll.y;
-
-		if (this.options.includeMargins){
-			left += elementMargin.left;
-			top += elementMargin.top;
-		} else {
-			right += elementMargin.right;
-			bottom += elementMargin.bottom;
-		}
-
-		if (element.getStyle('position') == 'relative'){
-			var coords = element.getCoordinates(offsetParent);
-			coords.left -= element.getStyle('left').toInt();
-			coords.top -= element.getStyle('top').toInt();
-
-			left -= coords.left;
-			top -= coords.top;
-			if (container.getStyle('position') != 'relative'){
-				left += containerBorder.left;
-				top += containerBorder.top;
-			}
-			right += elementMargin.left - coords.left;
-			bottom += elementMargin.top - coords.top;
-
-			if (container != offsetParent){
-				left += containerMargin.left + offsetParentPadding.left;
-				if (!offsetParentPadding.left && left < 0) left = 0;
-				top += offsetParent == document.body ? 0 : containerMargin.top + offsetParentPadding.top;
-				if (!offsetParentPadding.top && top < 0) top = 0;
-			}
-		} else {
-			left -= elementMargin.left;
-			top -= elementMargin.top;
-			if (container != offsetParent){
-				left += containerCoordinates.left + containerBorder.left;
-				top += containerCoordinates.top + containerBorder.top;
-			}
-		}
-
-		return {
-			x: [left, right],
-			y: [top, bottom]
-		};
-	},
-
-	getDroppableCoordinates: function(element){
-		var position = element.getCoordinates();
-		if (element.getStyle('position') == 'fixed'){
-			var scroll = window.getScroll();
-			position.left += scroll.x;
-			position.right += scroll.x;
-			position.top += scroll.y;
-			position.bottom += scroll.y;
-		}
-		return position;
-	},
-
-	checkDroppables: function(){
-		var overed = this.droppables.filter(function(el, i){
-			el = this.positions ? this.positions[i] : this.getDroppableCoordinates(el);
-			var now = this.mouse.now;
-			return (now.x > el.left && now.x < el.right && now.y < el.bottom && now.y > el.top);
-		}, this).getLast();
-
-		if (this.overed != overed){
-			if (this.overed) this.fireEvent('leave', [this.element, this.overed]);
-			if (overed) this.fireEvent('enter', [this.element, overed]);
-			this.overed = overed;
-		}
-	},
-
-	drag: function(event){
-		this.parent(event);
-		if (this.options.checkDroppables && this.droppables.length) this.checkDroppables();
-	},
-
-	stop: function(event){
-		this.checkDroppables();
-		this.fireEvent('drop', [this.element, this.overed, event]);
-		this.overed = null;
-		return this.parent(event);
-	}
-
-});
-
-Element.implement({
-
-	makeDraggable: function(options){
-		var drag = new Drag.Move(this, options);
-		this.store('dragger', drag);
-		return drag;
-	}
-
-});
-
-/*
----
-
-script: Element.Measure.js
-
-name: Element.Measure
-
-description: Extends the Element native object to include methods useful in measuring dimensions.
-
-credits: "Element.measure / .expose methods by Daniel Steigerwald License: MIT-style license. Copyright: Copyright (c) 2008 Daniel Steigerwald, daniel.steigerwald.cz"
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element.Style
-  - Core/Element.Dimensions
-  - MooTools.More
-
-provides: [Element.Measure]
-
-...
-*/
-
-(function(){
-
-var getStylesList = function(styles, planes){
-	var list = [];
-	Object.each(planes, function(directions){
-		Object.each(directions, function(edge){
-			styles.each(function(style){
-				list.push(style + '-' + edge + (style == 'border' ? '-width' : ''));
-			});
-		});
-	});
-	return list;
-};
-
-var calculateEdgeSize = function(edge, styles){
-	var total = 0;
-	Object.each(styles, function(value, style){
-		if (style.test(edge)) total = total + value.toInt();
-	});
-	return total;
-};
-
-var isVisible = function(el){
-	return !!(!el || el.offsetHeight || el.offsetWidth);
-};
-
-
-Element.implement({
-
-	measure: function(fn){
-		if (isVisible(this)) return fn.call(this);
-		var parent = this.getParent(),
-			toMeasure = [];
-		while (!isVisible(parent) && parent != document.body){
-			toMeasure.push(parent.expose());
-			parent = parent.getParent();
-		}
-		var restore = this.expose(),
-			result = fn.call(this);
-		restore();
-		toMeasure.each(function(restore){
-			restore();
-		});
-		return result;
-	},
-
-	expose: function(){
-		if (this.getStyle('display') != 'none') return function(){};
-		var before = this.style.cssText;
-		this.setStyles({
-			display: 'block',
-			position: 'absolute',
-			visibility: 'hidden'
-		});
-		return function(){
-			this.style.cssText = before;
-		}.bind(this);
-	},
-
-	getDimensions: function(options){
-		options = Object.merge({computeSize: false}, options);
-		var dim = {x: 0, y: 0};
-
-		var getSize = function(el, options){
-			return (options.computeSize) ? el.getComputedSize(options) : el.getSize();
-		};
-
-		var parent = this.getParent('body');
-
-		if (parent && this.getStyle('display') == 'none'){
-			dim = this.measure(function(){
-				return getSize(this, options);
-			});
-		} else if (parent){
-			try { //safari sometimes crashes here, so catch it
-				dim = getSize(this, options);
-			} catch (e){}
-		}
-
-		return Object.append(dim, (dim.x || dim.x === 0) ? {
-			width: dim.x,
-			height: dim.y
-		} : {
-			x: dim.width,
-			y: dim.height
-		});
-	},
-
-	getComputedSize: function(options){
-		
-
-		options = Object.merge({
-			styles: ['padding','border'],
-			planes: {
-				height: ['top','bottom'],
-				width: ['left','right']
-			},
-			mode: 'both'
-		}, options);
-
-		var styles = {},
-			size = {width: 0, height: 0},
-			dimensions;
-
-		if (options.mode == 'vertical'){
-			delete size.width;
-			delete options.planes.width;
-		} else if (options.mode == 'horizontal'){
-			delete size.height;
-			delete options.planes.height;
-		}
-
-		getStylesList(options.styles, options.planes).each(function(style){
-			styles[style] = this.getStyle(style).toInt();
-		}, this);
-
-		Object.each(options.planes, function(edges, plane){
-
-			var capitalized = plane.capitalize(),
-				style = this.getStyle(plane);
-
-			if (style == 'auto' && !dimensions) dimensions = this.getDimensions();
-
-			style = styles[plane] = (style == 'auto') ? dimensions[plane] : style.toInt();
-			size['total' + capitalized] = style;
-
-			edges.each(function(edge){
-				var edgesize = calculateEdgeSize(edge, styles);
-				size['computed' + edge.capitalize()] = edgesize;
-				size['total' + capitalized] += edgesize;
-			});
-
-		}, this);
-
-		return Object.append(size, styles);
-	}
-
-});
-
-})();
-
-/*
----
-
-script: Slider.js
-
-name: Slider
-
-description: Class for creating horizontal and vertical slider controls.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Element.Dimensions
-  - Core/Number
-  - Class.Binds
-  - Drag
-  - Element.Measure
-
-provides: [Slider]
-
-...
-*/
-(function(){
-
-var Slider = this.Slider = new Class({
-
-	Implements: [Events, Options],
-
-	Binds: ['clickedElement', 'draggedKnob', 'scrolledElement'],
-
-	options: {/*
-		onTick: function(intPosition){},
-		onMove: function(){},
-		onChange: function(intStep){},
-		onComplete: function(strStep){},*/
-		onTick: function(position){
-			this.setKnobPosition(position);
-		},
-		initialStep: 0,
-		snap: false,
-		offset: 0,
-		range: false,
-		wheel: false,
-		steps: 100,
-		mode: 'horizontal'
-	},
-
-	initialize: function(element, knob, options){
-		this.setOptions(options);
-		options = this.options;
-		this.element = document.id(element);
-		knob = this.knob = document.id(knob);
-		this.previousChange = this.previousEnd = this.step = options.initialStep ? options.initialStep : options.range ? options.range[0] : 0;
-
-		var limit = {},
-			modifiers = {x: false, y: false};
-
-		switch (options.mode){
-			case 'vertical':
-				this.axis = 'y';
-				this.property = 'top';
-				this.offset = 'offsetHeight';
-				break;
-			case 'horizontal':
-				this.axis = 'x';
-				this.property = 'left';
-				this.offset = 'offsetWidth';
-		}
-
-		this.setSliderDimensions();
-		this.setRange(options.range, null, true);
-
-		if (knob.getStyle('position') == 'static') knob.setStyle('position', 'relative');
-		knob.setStyle(this.property, -options.offset);
-		modifiers[this.axis] = this.property;
-		limit[this.axis] = [-options.offset, this.full - options.offset];
-
-		var dragOptions = {
-			snap: 0,
-			limit: limit,
-			modifiers: modifiers,
-			onDrag: this.draggedKnob,
-			onStart: this.draggedKnob,
-			onBeforeStart: (function(){
-				this.isDragging = true;
-			}).bind(this),
-			onCancel: function(){
-				this.isDragging = false;
-			}.bind(this),
-			onComplete: function(){
-				this.isDragging = false;
-				this.draggedKnob();
-				this.end();
-			}.bind(this)
-		};
-		if (options.snap) this.setSnap(dragOptions);
-
-		this.drag = new Drag(knob, dragOptions);
-		if (options.initialStep != null) this.set(options.initialStep, true);
-		this.attach();
-	},
-
-	attach: function(){
-		this.element.addEvent('mousedown', this.clickedElement);
-		if (this.options.wheel) this.element.addEvent('mousewheel', this.scrolledElement);
-		this.drag.attach();
-		return this;
-	},
-
-	detach: function(){
-		this.element.removeEvent('mousedown', this.clickedElement)
-			.removeEvent('mousewheel', this.scrolledElement);
-		this.drag.detach();
-		return this;
-	},
-
-	autosize: function(){
-		this.setSliderDimensions()
-			.setKnobPosition(this.toPosition(this.step));
-		this.drag.options.limit[this.axis] = [-this.options.offset, this.full - this.options.offset];
-		if (this.options.snap) this.setSnap();
-		return this;
-	},
-
-	setSnap: function(options){
-		if (!options) options = this.drag.options;
-		options.grid = Math.ceil(this.stepWidth);
-		options.limit[this.axis][1] = this.element[this.offset];
-		return this;
-	},
-
-	setKnobPosition: function(position){
-		if (this.options.snap) position = this.toPosition(this.step);
-		this.knob.setStyle(this.property, position);
-		return this;
-	},
-
-	setSliderDimensions: function(){
-		this.full = this.element.measure(function(){
-			this.half = this.knob[this.offset] / 2;
-			return this.element[this.offset] - this.knob[this.offset] + (this.options.offset * 2);
-		}.bind(this));
-		return this;
-	},
-
-	set: function(step, silently){
-		if (!((this.range > 0) ^ (step < this.min))) step = this.min;
-		if (!((this.range > 0) ^ (step > this.max))) step = this.max;
-
-		this.step = (step).round(this.modulus.decimalLength);
-		if (silently) this.checkStep().setKnobPosition(this.toPosition(this.step));
-		else this.checkStep().fireEvent('tick', this.toPosition(this.step)).fireEvent('move').end();
-		return this;
-	},
-
-	setRange: function(range, pos, silently){
-		this.min = Array.pick([range[0], 0]);
-		this.max = Array.pick([range[1], this.options.steps]);
-		this.range = this.max - this.min;
-		this.steps = this.options.steps || this.full;
-		var stepSize = this.stepSize = Math.abs(this.range) / this.steps;
-		this.stepWidth = this.stepSize * this.full / Math.abs(this.range);
-		this.setModulus();
-
-		if (range) this.set(Array.pick([pos, this.step]).limit(this.min,this.max), silently);
-		return this;
-	},
-
-	setModulus: function(){
-		var decimals = ((this.stepSize + '').split('.')[1] || []).length,
-			modulus = 1 + '';
-		while (decimals--) modulus += '0';
-		this.modulus = {multiplier: (modulus).toInt(10), decimalLength: modulus.length - 1};
-	},
-
-	clickedElement: function(event){
-		if (this.isDragging || event.target == this.knob) return;
-
-		var dir = this.range < 0 ? -1 : 1,
-			position = event.page[this.axis] - this.element.getPosition()[this.axis] - this.half;
-
-		position = position.limit(-this.options.offset, this.full - this.options.offset);
-
-		this.step = (this.min + dir * this.toStep(position)).round(this.modulus.decimalLength);
-
-		this.checkStep()
-			.fireEvent('tick', position)
-			.fireEvent('move')
-			.end();
-	},
-
-	scrolledElement: function(event){
-		var mode = (this.options.mode == 'horizontal') ? (event.wheel < 0) : (event.wheel > 0);
-		this.set(this.step + (mode ? -1 : 1) * this.stepSize);
-		event.stop();
-	},
-
-	draggedKnob: function(){
-		var dir = this.range < 0 ? -1 : 1,
-			position = this.drag.value.now[this.axis];
-
-		position = position.limit(-this.options.offset, this.full -this.options.offset);
-
-		this.step = (this.min + dir * this.toStep(position)).round(this.modulus.decimalLength);
-		this.checkStep();
-		this.fireEvent('move');
-	},
-
-	checkStep: function(){
-		var step = this.step;
-		if (this.previousChange != step){
-			this.previousChange = step;
-			this.fireEvent('change', step);
-		}
-		return this;
-	},
-
-	end: function(){
-		var step = this.step;
-		if (this.previousEnd !== step){
-			this.previousEnd = step;
-			this.fireEvent('complete', step + '');
-		}
-		return this;
-	},
-
-	toStep: function(position){
-		var step = (position + this.options.offset) * this.stepSize / this.full * this.steps;
-		return this.options.steps ? (step - (step * this.modulus.multiplier) % (this.stepSize * this.modulus.multiplier) / this.modulus.multiplier).round(this.modulus.decimalLength) : step;
-	},
-
-	toPosition: function(step){
-		return (this.full * Math.abs(this.min - step)) / (this.steps * this.stepSize) - this.options.offset || 0;
-	}
-
-});
-
-})();
-
-
-/*
----
-
-script: Sortables.js
-
-name: Sortables
-
-description: Class for creating a drag and drop sorting interface for lists of items.
-
-license: MIT-style license
-
-authors:
-  - Tom Occhino
-
-requires:
-  - Core/Fx.Morph
-  - Drag.Move
-
-provides: [Sortables]
-
-...
-*/
-(function(){
-
-var Sortables = this.Sortables = new Class({
-
-	Implements: [Events, Options],
-
-	options: {/*
-		onSort: function(element, clone){},
-		onStart: function(element, clone){},
-		onComplete: function(element){},*/
-		opacity: 1,
-		clone: false,
-		revert: false,
-		handle: false,
-		dragOptions: {},
-		unDraggableTags: ['button', 'input', 'a', 'textarea', 'select', 'option']
-	},
-
-	initialize: function(lists, options){
-		this.setOptions(options);
-
-		this.elements = [];
-		this.lists = [];
-		this.idle = true;
-
-		this.addLists($$(document.id(lists) || lists));
-
-		if (!this.options.clone) this.options.revert = false;
-		if (this.options.revert) this.effect = new Fx.Morph(null, Object.merge({
-			duration: 250,
-			link: 'cancel'
-		}, this.options.revert));
-	},
-
-	attach: function(){
-		this.addLists(this.lists);
-		return this;
-	},
-
-	detach: function(){
-		this.lists = this.removeLists(this.lists);
-		return this;
-	},
-
-	addItems: function(){
-		Array.flatten(arguments).each(function(element){
-			this.elements.push(element);
-			var start = element.retrieve('sortables:start', function(event){
-				this.start.call(this, event, element);
-			}.bind(this));
-			(this.options.handle ? element.getElement(this.options.handle) || element : element).addEvent('mousedown', start);
-		}, this);
-		return this;
-	},
-
-	addLists: function(){
-		Array.flatten(arguments).each(function(list){
-			this.lists.include(list);
-			this.addItems(list.getChildren());
-		}, this);
-		return this;
-	},
-
-	removeItems: function(){
-		return $$(Array.flatten(arguments).map(function(element){
-			this.elements.erase(element);
-			var start = element.retrieve('sortables:start');
-			(this.options.handle ? element.getElement(this.options.handle) || element : element).removeEvent('mousedown', start);
-
-			return element;
-		}, this));
-	},
-
-	removeLists: function(){
-		return $$(Array.flatten(arguments).map(function(list){
-			this.lists.erase(list);
-			this.removeItems(list.getChildren());
-
-			return list;
-		}, this));
-	},
-
-	getDroppableCoordinates: function(element){
-		var offsetParent = element.getOffsetParent();
-		var position = element.getPosition(offsetParent);
-		var scroll = {
-			w: window.getScroll(),
-			offsetParent: offsetParent.getScroll()
-		};
-		position.x += scroll.offsetParent.x;
-		position.y += scroll.offsetParent.y;
-
-		if (offsetParent.getStyle('position') == 'fixed'){
-			position.x -= scroll.w.x;
-			position.y -= scroll.w.y;
-		}
-
-		return position;
-	},
-
-	getClone: function(event, element){
-		if (!this.options.clone) return new Element(element.tagName).inject(document.body);
-		if (typeOf(this.options.clone) == 'function') return this.options.clone.call(this, event, element, this.list);
-		var clone = element.clone(true).setStyles({
-			margin: 0,
-			position: 'absolute',
-			visibility: 'hidden',
-			width: element.getStyle('width')
-		}).addEvent('mousedown', function(event){
-			element.fireEvent('mousedown', event);
-		});
-		//prevent the duplicated radio inputs from unchecking the real one
-		if (clone.get('html').test('radio')){
-			clone.getElements('input[type=radio]').each(function(input, i){
-				input.set('name', 'clone_' + i);
-				if (input.get('checked')) element.getElements('input[type=radio]')[i].set('checked', true);
-			});
-		}
-
-		return clone.inject(this.list).setPosition(this.getDroppableCoordinates(this.element));
-	},
-
-	getDroppables: function(){
-		var droppables = this.list.getChildren().erase(this.clone).erase(this.element);
-		if (!this.options.constrain) droppables.append(this.lists).erase(this.list);
-		return droppables;
-	},
-
-	insert: function(dragging, element){
-		var where = 'inside';
-		if (this.lists.contains(element)){
-			this.list = element;
-			this.drag.droppables = this.getDroppables();
-		} else {
-			where = this.element.getAllPrevious().contains(element) ? 'before' : 'after';
-		}
-		this.element.inject(element, where);
-		this.fireEvent('sort', [this.element, this.clone]);
-	},
-
-	start: function(event, element){
-		if (
-			!this.idle ||
-			event.rightClick ||
-			(!this.options.handle && this.options.unDraggableTags.contains(event.target.get('tag')))
-		) return;
-
-		this.idle = false;
-		this.element = element;
-		this.opacity = element.getStyle('opacity');
-		this.list = element.getParent();
-		this.clone = this.getClone(event, element);
-
-		this.drag = new Drag.Move(this.clone, Object.merge({
-			
-			droppables: this.getDroppables()
-		}, this.options.dragOptions)).addEvents({
-			onSnap: function(){
-				event.stop();
-				this.clone.setStyle('visibility', 'visible');
-				this.element.setStyle('opacity', this.options.opacity || 0);
-				this.fireEvent('start', [this.element, this.clone]);
-			}.bind(this),
-			onEnter: this.insert.bind(this),
-			onCancel: this.end.bind(this),
-			onComplete: this.end.bind(this)
-		});
-
-		this.clone.inject(this.element, 'before');
-		this.drag.start(event);
-	},
-
-	end: function(){
-		this.drag.detach();
-		this.element.setStyle('opacity', this.opacity);
-		var self = this;
-		if (this.effect){
-			var dim = this.element.getStyles('width', 'height'),
-				clone = this.clone,
-				pos = clone.computePosition(this.getDroppableCoordinates(clone));
-
-			var destroy = function(){
-				this.removeEvent('cancel', destroy);
-				clone.destroy();
-				self.reset();
-			};
-
-			this.effect.element = clone;
-			this.effect.start({
-				top: pos.top,
-				left: pos.left,
-				width: dim.width,
-				height: dim.height,
-				opacity: 0.25
-			}).addEvent('cancel', destroy).chain(destroy);
-		} else {
-			this.clone.destroy();
-			self.reset();
-		}
-
-	},
-
-	reset: function(){
-		this.idle = true;
-		this.fireEvent('complete', this.element);
-	},
-
-	serialize: function(){
-		var params = Array.link(arguments, {
-			modifier: Type.isFunction,
-			index: function(obj){
-				return obj != null;
-			}
-		});
-		var serial = this.lists.map(function(list){
-			return list.getChildren().map(params.modifier || function(element){
-				return element.get('id');
-			}, this);
-		}, this);
-
-		var index = params.index;
-		if (this.lists.length == 1) index = 0;
-		return (index || index === 0) && index >= 0 && index < this.lists.length ? serial[index] : serial;
-	}
-
-});
-
-})();
-
-/*
----
-
-name: Element.Event.Pseudos
-
-description: Adds the functionality to add pseudo events for Elements
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-
-requires: [Core/Element.Event, Core/Element.Delegation, Events.Pseudos]
-
-provides: [Element.Event.Pseudos, Element.Delegation.Pseudo]
-
-...
-*/
-
-(function(){
-
-var pseudos = {relay: false},
-	copyFromEvents = ['once', 'throttle', 'pause'],
-	count = copyFromEvents.length;
-
-while (count--) pseudos[copyFromEvents[count]] = Events.lookupPseudo(copyFromEvents[count]);
-
-DOMEvent.definePseudo = function(key, listener){
-	pseudos[key] = listener;
-	return this;
-};
-
-var proto = Element.prototype;
-[Element, Window, Document].invoke('implement', Events.Pseudos(pseudos, proto.addEvent, proto.removeEvent));
-
-})();
-
-/*
----
-
-name: Element.Event.Pseudos.Keys
-
-description: Adds functionality fire events if certain keycombinations are pressed
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-
-requires: [Element.Event.Pseudos]
-
-provides: [Element.Event.Pseudos.Keys]
-
-...
-*/
-
-(function(){
-
-var keysStoreKey = '$moo:keys-pressed',
-	keysKeyupStoreKey = '$moo:keys-keyup';
-
-
-DOMEvent.definePseudo('keys', function(split, fn, args){
-
-	var event = args[0],
-		keys = [],
-		pressed = this.retrieve(keysStoreKey, []),
-		value = split.value;
-
-	if (value != '+') keys.append(value.replace('++', function(){
-		keys.push('+'); // shift++ and shift+++a
-		return '';
-	}).split('+'));
-	else keys = ['+'];
-
-	pressed.include(event.key);
-
-	if (keys.every(function(key){
-		return pressed.contains(key);
-	})) fn.apply(this, args);
-
-	this.store(keysStoreKey, pressed);
-
-	if (!this.retrieve(keysKeyupStoreKey)){
-		var keyup = function(event){
-			(function(){
-				pressed = this.retrieve(keysStoreKey, []).erase(event.key);
-				this.store(keysStoreKey, pressed);
-			}).delay(0, this); // Fix for IE
-		};
-		this.store(keysKeyupStoreKey, keyup).addEvent('keyup', keyup);
-	}
-
-});
-
-DOMEvent.defineKeys({
-	'16': 'shift',
-	'17': 'control',
-	'18': 'alt',
-	'20': 'capslock',
-	'33': 'pageup',
-	'34': 'pagedown',
-	'35': 'end',
-	'36': 'home',
-	'144': 'numlock',
-	'145': 'scrolllock',
-	'186': ';',
-	'187': '=',
-	'188': ',',
-	'190': '.',
-	'191': '/',
-	'192': '`',
-	'219': '[',
-	'220': '\\',
-	'221': ']',
-	'222': "'",
-	'107': '+',
-	'109': '-', // subtract
-	'189': '-'  // dash
-});
-
-})();
-
-/*
----
-
-script: String.Extras.js
-
-name: String.Extras
-
-description: Extends the String native object to include methods useful in managing various kinds of strings (query strings, urls, html, etc).
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Guillermo Rauch
-  - Christopher Pitt
-
-requires:
-  - Core/String
-  - Core/Array
-  - MooTools.More
-
-provides: [String.Extras]
-
-...
-*/
-
-(function(){
-
-var special = {
-		'a': /[àáâãäåăą]/g,
-		'A': /[ÀÁÂÃÄÅĂĄ]/g,
-		'c': /[ćčç]/g,
-		'C': /[ĆČÇ]/g,
-		'd': /[ďđ]/g,
-		'D': /[ĎÐ]/g,
-		'e': /[èéêëěę]/g,
-		'E': /[ÈÉÊËĚĘ]/g,
-		'g': /[ğ]/g,
-		'G': /[Ğ]/g,
-		'i': /[ìíîï]/g,
-		'I': /[ÌÍÎÏ]/g,
-		'l': /[ĺľł]/g,
-		'L': /[ĹĽŁ]/g,
-		'n': /[ñňń]/g,
-		'N': /[ÑŇŃ]/g,
-		'o': /[òóôõöøő]/g,
-		'O': /[ÒÓÔÕÖØ]/g,
-		'r': /[řŕ]/g,
-		'R': /[ŘŔ]/g,
-		's': /[ššş]/g,
-		'S': /[ŠŞŚ]/g,
-		't': /[ťţ]/g,
-		'T': /[ŤŢ]/g,
-		'u': /[ùúûůüµ]/g,
-		'U': /[ÙÚÛŮÜ]/g,
-		'y': /[ÿý]/g,
-		'Y': /[ŸÝ]/g,
-		'z': /[žźż]/g,
-		'Z': /[ŽŹŻ]/g,
-		'th': /[þ]/g,
-		'TH': /[Þ]/g,
-		'dh': /[ð]/g,
-		'DH': /[Ð]/g,
-		'ss': /[ß]/g,
-		'oe': /[œ]/g,
-		'OE': /[Œ]/g,
-		'ae': /[æ]/g,
-		'AE': /[Æ]/g
-	},
-
-	tidy = {
-		' ': /[\xa0\u2002\u2003\u2009]/g,
-		'*': /[\xb7]/g,
-		'\'': /[\u2018\u2019]/g,
-		'"': /[\u201c\u201d]/g,
-		'...': /[\u2026]/g,
-		'-': /[\u2013]/g,
-	//	'--': /[\u2014]/g,
-		'&raquo;': /[\uFFFD]/g
-	},
-
-	conversions = {
-		ms: 1,
-		s: 1000,
-		m: 6e4,
-		h: 36e5
-	},
-
-	findUnits = /(\d*.?\d+)([msh]+)/;
-
-var walk = function(string, replacements){
-	var result = string, key;
-	for (key in replacements) result = result.replace(replacements[key], key);
-	return result;
-};
-
-var getRegexForTag = function(tag, contents){
-	tag = tag || (contents ? '' : '\\w+');
-	var regstr = contents ? '<' + tag + '(?!\\w)[^>]*>([\\s\\S]*?)<\/' + tag + '(?!\\w)>' : '<\/?' + tag + '\/?>|<' + tag + '[\\s|\/][^>]*>';
-	return new RegExp(regstr, 'gi');
-};
-
-String.implement({
-
-	standardize: function(){
-		return walk(this, special);
-	},
-
-	repeat: function(times){
-		return new Array(times + 1).join(this);
-	},
-
-	pad: function(length, str, direction){
-		if (this.length >= length) return this;
-
-		var pad = (str == null ? ' ' : '' + str)
-			.repeat(length - this.length)
-			.substr(0, length - this.length);
-
-		if (!direction || direction == 'right') return this + pad;
-		if (direction == 'left') return pad + this;
-
-		return pad.substr(0, (pad.length / 2).floor()) + this + pad.substr(0, (pad.length / 2).ceil());
-	},
-
-	getTags: function(tag, contents){
-		return this.match(getRegexForTag(tag, contents)) || [];
-	},
-
-	stripTags: function(tag, contents){
-		return this.replace(getRegexForTag(tag, contents), '');
-	},
-
-	tidy: function(){
-		return walk(this, tidy);
-	},
-
-	truncate: function(max, trail, atChar){
-		var string = this;
-		if (trail == null && arguments.length == 1) trail = '…';
-		if (string.length > max){
-			string = string.substring(0, max);
-			if (atChar){
-				var index = string.lastIndexOf(atChar);
-				if (index != -1) string = string.substr(0, index);
-			}
-			if (trail) string += trail;
-		}
-		return string;
-	},
-
-	ms: function(){
-		// "Borrowed" from https://gist.github.com/1503944
-		var units = findUnits.exec(this);
-		if (units == null) return Number(this);
-		return Number(units[1]) * conversions[units[2]];
-	}
-
-});
-
-})();
-
-/*
----
-
-script: Element.Forms.js
-
-name: Element.Forms
-
-description: Extends the Element native object to include methods useful in managing inputs.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element
-  - String.Extras
-  - MooTools.More
-
-provides: [Element.Forms]
-
-...
-*/
-
-Element.implement({
-
-	tidy: function(){
-		this.set('value', this.get('value').tidy());
-	},
-
-	getTextInRange: function(start, end){
-		return this.get('value').substring(start, end);
-	},
-
-	getSelectedText: function(){
-		if (this.setSelectionRange) return this.getTextInRange(this.getSelectionStart(), this.getSelectionEnd());
-		return document.selection.createRange().text;
-	},
-
-	getSelectedRange: function(){
-		if (this.selectionStart != null){
-			return {
-				start: this.selectionStart,
-				end: this.selectionEnd
-			};
-		}
-
-		var pos = {
-			start: 0,
-			end: 0
-		};
-		var range = this.getDocument().selection.createRange();
-		if (!range || range.parentElement() != this) return pos;
-		var duplicate = range.duplicate();
-
-		if (this.type == 'text'){
-			pos.start = 0 - duplicate.moveStart('character', -100000);
-			pos.end = pos.start + range.text.length;
-		} else {
-			var value = this.get('value');
-			var offset = value.length;
-			duplicate.moveToElementText(this);
-			duplicate.setEndPoint('StartToEnd', range);
-			if (duplicate.text.length) offset -= value.match(/[\n\r]*$/)[0].length;
-			pos.end = offset - duplicate.text.length;
-			duplicate.setEndPoint('StartToStart', range);
-			pos.start = offset - duplicate.text.length;
-		}
-		return pos;
-	},
-
-	getSelectionStart: function(){
-		return this.getSelectedRange().start;
-	},
-
-	getSelectionEnd: function(){
-		return this.getSelectedRange().end;
-	},
-
-	setCaretPosition: function(pos){
-		if (pos == 'end') pos = this.get('value').length;
-		this.selectRange(pos, pos);
-		return this;
-	},
-
-	getCaretPosition: function(){
-		return this.getSelectedRange().start;
-	},
-
-	selectRange: function(start, end){
-		if (this.setSelectionRange){
-			this.focus();
-			this.setSelectionRange(start, end);
-		} else {
-			var value = this.get('value');
-			var diff = value.substr(start, end - start).replace(/\r/g, '').length;
-			start = value.substr(0, start).replace(/\r/g, '').length;
-			var range = this.createTextRange();
-			range.collapse(true);
-			range.moveEnd('character', start + diff);
-			range.moveStart('character', start);
-			range.select();
-		}
-		return this;
-	},
-
-	insertAtCursor: function(value, select){
-		var pos = this.getSelectedRange();
-		var text = this.get('value');
-		this.set('value', text.substring(0, pos.start) + value + text.substring(pos.end, text.length));
-		if (select !== false) this.selectRange(pos.start, pos.start + value.length);
-		else this.setCaretPosition(pos.start + value.length);
-		return this;
-	},
-
-	insertAroundCursor: function(options, select){
-		options = Object.append({
-			before: '',
-			defaultMiddle: '',
-			after: ''
-		}, options);
-
-		var value = this.getSelectedText() || options.defaultMiddle;
-		var pos = this.getSelectedRange();
-		var text = this.get('value');
-
-		if (pos.start == pos.end){
-			this.set('value', text.substring(0, pos.start) + options.before + value + options.after + text.substring(pos.end, text.length));
-			this.selectRange(pos.start + options.before.length, pos.end + options.before.length + value.length);
-		} else {
-			var current = text.substring(pos.start, pos.end);
-			this.set('value', text.substring(0, pos.start) + options.before + current + options.after + text.substring(pos.end, text.length));
-			var selStart = pos.start + options.before.length;
-			if (select !== false) this.selectRange(selStart, selStart + current.length);
-			else this.setCaretPosition(selStart + text.length);
-		}
-		return this;
-	}
-
-});
-
-/*
----
-
-script: Element.Pin.js
-
-name: Element.Pin
-
-description: Extends the Element native object to include the pin method useful for fixed positioning for elements.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element.Event
-  - Core/Element.Dimensions
-  - Core/Element.Style
-  - MooTools.More
-
-provides: [Element.Pin]
-
-...
-*/
-
-(function(){
-var supportsPositionFixed = false,
-	supportTested = false;
-
-var testPositionFixed = function(){
-	var test = new Element('div').setStyles({
-		position: 'fixed',
-		top: 0,
-		right: 0
-	}).inject(document.body);
-	supportsPositionFixed = (test.offsetTop === 0);
-	test.dispose();
-	supportTested = true;
-};
-
-Element.implement({
-
-	pin: function(enable, forceScroll){
-		if (!supportTested) testPositionFixed();
-		if (this.getStyle('display') == 'none') return this;
-
-		var pinnedPosition,
-			scroll = window.getScroll(),
-			parent,
-			scrollFixer;
-
-		if (enable !== false){
-			pinnedPosition = this.getPosition();
-			if (!this.retrieve('pin:_pinned')){
-				var currentPosition = {
-					top: pinnedPosition.y - scroll.y,
-					left: pinnedPosition.x - scroll.x,
-					margin: '0px',
-					padding: '0px'
-				};
-
-				if (supportsPositionFixed && !forceScroll){
-					this.setStyle('position', 'fixed').setStyles(currentPosition);
-				} else {
-
-					parent = this.getOffsetParent();
-					var position = this.getPosition(parent),
-						styles = this.getStyles('left', 'top');
-
-					if (parent && styles.left == 'auto' || styles.top == 'auto') this.setPosition(position);
-					if (this.getStyle('position') == 'static') this.setStyle('position', 'absolute');
-
-					position = {
-						x: styles.left.toInt() - scroll.x,
-						y: styles.top.toInt() - scroll.y
-					};
-
-					scrollFixer = function(){
-						if (!this.retrieve('pin:_pinned')) return;
-						var scroll = window.getScroll();
-						this.setStyles({
-							left: position.x + scroll.x,
-							top: position.y + scroll.y
-						});
-					}.bind(this);
-
-					this.store('pin:_scrollFixer', scrollFixer);
-					window.addEvent('scroll', scrollFixer);
-				}
-				this.store('pin:_pinned', true);
-			}
-
-		} else {
-			if (!this.retrieve('pin:_pinned')) return this;
-
-			parent = this.getParent();
-			var offsetParent = (parent.getComputedStyle('position') != 'static' ? parent : parent.getOffsetParent());
-
-			pinnedPosition = this.getPosition();
-
-			this.store('pin:_pinned', false);
-			scrollFixer = this.retrieve('pin:_scrollFixer');
-			if (!scrollFixer){
-				this.setStyles({
-					position: 'absolute',
-					top: pinnedPosition.y + scroll.y,
-					left: pinnedPosition.x + scroll.x
-				});
-			} else {
-				this.store('pin:_scrollFixer', null);
-				window.removeEvent('scroll', scrollFixer);
-			}
-			this.removeClass('isPinned');
-		}
-		return this;
-	},
-
-	unpin: function(){
-		return this.pin(false);
-	},
-
-	togglePin: function(){
-		return this.pin(!this.retrieve('pin:_pinned'));
-	}
-
-});
-
-
-
-})();
-
-/*
----
-
-script: Element.Position.js
-
-name: Element.Position
-
-description: Extends the Element native object to include methods useful positioning elements relative to others.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Jacob Thornton
-
-requires:
-  - Core/Options
-  - Core/Element.Dimensions
-  - Element.Measure
-
-provides: [Element.Position]
-
-...
-*/
-
-(function(original){
-
-var local = Element.Position = {
-
-	options: {/*
-		edge: false,
-		returnPos: false,
-		minimum: {x: 0, y: 0},
-		maximum: {x: 0, y: 0},
-		relFixedPosition: false,
-		ignoreMargins: false,
-		ignoreScroll: false,
-		allowNegative: false,*/
-		relativeTo: document.body,
-		position: {
-			x: 'center', //left, center, right
-			y: 'center' //top, center, bottom
-		},
-		offset: {x: 0, y: 0}
-	},
-
-	getOptions: function(element, options){
-		options = Object.merge({}, local.options, options);
-		local.setPositionOption(options);
-		local.setEdgeOption(options);
-		local.setOffsetOption(element, options);
-		local.setDimensionsOption(element, options);
-		return options;
-	},
-
-	setPositionOption: function(options){
-		options.position = local.getCoordinateFromValue(options.position);
-	},
-
-	setEdgeOption: function(options){
-		var edgeOption = local.getCoordinateFromValue(options.edge);
-		options.edge = edgeOption ? edgeOption :
-			(options.position.x == 'center' && options.position.y == 'center') ? {x: 'center', y: 'center'} :
-			{x: 'left', y: 'top'};
-	},
-
-	setOffsetOption: function(element, options){
-		var parentOffset = {x: 0, y: 0};
-		var parentScroll = {x: 0, y: 0};
-		var offsetParent = element.measure(function(){
-			return document.id(this.getOffsetParent());
-		});
-
-		if (!offsetParent || offsetParent == element.getDocument().body) return;
-
-		parentScroll = offsetParent.getScroll();
-		parentOffset = offsetParent.measure(function(){
-			var position = this.getPosition();
-			if (this.getStyle('position') == 'fixed'){
-				var scroll = window.getScroll();
-				position.x += scroll.x;
-				position.y += scroll.y;
-			}
-			return position;
-		});
-
-		options.offset = {
-			parentPositioned: offsetParent != document.id(options.relativeTo),
-			x: options.offset.x - parentOffset.x + parentScroll.x,
-			y: options.offset.y - parentOffset.y + parentScroll.y
-		};
-	},
-
-	setDimensionsOption: function(element, options){
-		options.dimensions = element.getDimensions({
-			computeSize: true,
-			styles: ['padding', 'border', 'margin']
-		});
-	},
-
-	getPosition: function(element, options){
-		var position = {};
-		options = local.getOptions(element, options);
-		var relativeTo = document.id(options.relativeTo) || document.body;
-
-		local.setPositionCoordinates(options, position, relativeTo);
-		if (options.edge) local.toEdge(position, options);
-
-		var offset = options.offset;
-		position.left = ((position.x >= 0 || offset.parentPositioned || options.allowNegative) ? position.x : 0).toInt();
-		position.top = ((position.y >= 0 || offset.parentPositioned || options.allowNegative) ? position.y : 0).toInt();
-
-		local.toMinMax(position, options);
-
-		if (options.relFixedPosition || relativeTo.getStyle('position') == 'fixed') local.toRelFixedPosition(relativeTo, position);
-		if (options.ignoreScroll) local.toIgnoreScroll(relativeTo, position);
-		if (options.ignoreMargins) local.toIgnoreMargins(position, options);
-
-		position.left = Math.ceil(position.left);
-		position.top = Math.ceil(position.top);
-		delete position.x;
-		delete position.y;
-
-		return position;
-	},
-
-	setPositionCoordinates: function(options, position, relativeTo){
-		var offsetY = options.offset.y,
-			offsetX = options.offset.x,
-			calc = (relativeTo == document.body) ? window.getScroll() : relativeTo.getPosition(),
-			top = calc.y,
-			left = calc.x,
-			winSize = window.getSize();
-
-		switch (options.position.x){
-			case 'left': position.x = left + offsetX; break;
-			case 'right': position.x = left + offsetX + relativeTo.offsetWidth; break;
-			default: position.x = left + ((relativeTo == document.body ? winSize.x : relativeTo.offsetWidth) / 2) + offsetX; break;
-		}
-
-		switch (options.position.y){
-			case 'top': position.y = top + offsetY; break;
-			case 'bottom': position.y = top + offsetY + relativeTo.offsetHeight; break;
-			default: position.y = top + ((relativeTo == document.body ? winSize.y : relativeTo.offsetHeight) / 2) + offsetY; break;
-		}
-	},
-
-	toMinMax: function(position, options){
-		var xy = {left: 'x', top: 'y'}, value;
-		['minimum', 'maximum'].each(function(minmax){
-			['left', 'top'].each(function(lr){
-				value = options[minmax] ? options[minmax][xy[lr]] : null;
-				if (value != null && ((minmax == 'minimum') ? position[lr] < value : position[lr] > value)) position[lr] = value;
-			});
-		});
-	},
-
-	toRelFixedPosition: function(relativeTo, position){
-		var winScroll = window.getScroll();
-		position.top += winScroll.y;
-		position.left += winScroll.x;
-	},
-
-	toIgnoreScroll: function(relativeTo, position){
-		var relScroll = relativeTo.getScroll();
-		position.top -= relScroll.y;
-		position.left -= relScroll.x;
-	},
-
-	toIgnoreMargins: function(position, options){
-		position.left += options.edge.x == 'right'
-			? options.dimensions['margin-right']
-			: (options.edge.x != 'center'
-				? -options.dimensions['margin-left']
-				: -options.dimensions['margin-left'] + ((options.dimensions['margin-right'] + options.dimensions['margin-left']) / 2));
-
-		position.top += options.edge.y == 'bottom'
-			? options.dimensions['margin-bottom']
-			: (options.edge.y != 'center'
-				? -options.dimensions['margin-top']
-				: -options.dimensions['margin-top'] + ((options.dimensions['margin-bottom'] + options.dimensions['margin-top']) / 2));
-	},
-
-	toEdge: function(position, options){
-		var edgeOffset = {},
-			dimensions = options.dimensions,
-			edge = options.edge;
-
-		switch (edge.x){
-			case 'left': edgeOffset.x = 0; break;
-			case 'right': edgeOffset.x = -dimensions.x - dimensions.computedRight - dimensions.computedLeft; break;
-			// center
-			default: edgeOffset.x = -(Math.round(dimensions.totalWidth / 2)); break;
-		}
-
-		switch (edge.y){
-			case 'top': edgeOffset.y = 0; break;
-			case 'bottom': edgeOffset.y = -dimensions.y - dimensions.computedTop - dimensions.computedBottom; break;
-			// center
-			default: edgeOffset.y = -(Math.round(dimensions.totalHeight / 2)); break;
-		}
-
-		position.x += edgeOffset.x;
-		position.y += edgeOffset.y;
-	},
-
-	getCoordinateFromValue: function(option){
-		if (typeOf(option) != 'string') return option;
-		option = option.toLowerCase();
-
-		return {
-			x: option.test('left') ? 'left'
-				: (option.test('right') ? 'right' : 'center'),
-			y: option.test(/upper|top/) ? 'top'
-				: (option.test('bottom') ? 'bottom' : 'center')
-		};
-	}
-
-};
-
-Element.implement({
-
-	position: function(options){
-		if (options && (options.x != null || options.y != null)){
-			return (original ? original.apply(this, arguments) : this);
-		}
-		var position = this.setStyle('position', 'absolute').calculatePosition(options);
-		return (options && options.returnPos) ? position : this.setStyles(position);
-	},
-
-	calculatePosition: function(options){
-		return local.getPosition(this, options);
-	}
-
-});
-
-})(Element.prototype.position);
-
-/*
----
-
-script: Element.Shortcuts.js
-
-name: Element.Shortcuts
-
-description: Extends the Element native object to include some shortcut methods.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element.Style
-  - MooTools.More
-
-provides: [Element.Shortcuts]
-
-...
-*/
-
-Element.implement({
-
-	isDisplayed: function(){
-		return this.getStyle('display') != 'none';
-	},
-
-	isVisible: function(){
-		var w = this.offsetWidth,
-			h = this.offsetHeight;
-		return (w == 0 && h == 0) ? false : (w > 0 && h > 0) ? true : this.style.display != 'none';
-	},
-
-	toggle: function(){
-		return this[this.isDisplayed() ? 'hide' : 'show']();
-	},
-
-	hide: function(){
-		var d;
-		try {
-			//IE fails here if the element is not in the dom
-			d = this.getStyle('display');
-		} catch (e){}
-		if (d == 'none') return this;
-		return this.store('element:_originalDisplay', d || '').setStyle('display', 'none');
-	},
-
-	show: function(display){
-		if (!display && this.isDisplayed()) return this;
-		display = display || this.retrieve('element:_originalDisplay') || 'block';
-		return this.setStyle('display', (display == 'none') ? 'block' : display);
-	},
-
-	swapClass: function(remove, add){
-		return this.removeClass(remove).addClass(add);
-	}
-
-});
-
-Document.implement({
-
-	clearSelection: function(){
-		if (window.getSelection){
-			var selection = window.getSelection();
-			if (selection && selection.removeAllRanges) selection.removeAllRanges();
-		} else if (document.selection && document.selection.empty){
-			try {
-				//IE fails here if selected element is not in dom
-				document.selection.empty();
-			} catch (e){}
-		}
-	}
-
-});
-
-/*
----
-
-script: Elements.From.js
-
-name: Elements.From
-
-description: Returns a collection of elements from a string of html.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/String
-  - Core/Element
-  - MooTools.More
-
-provides: [Elements.from, Elements.From]
-
-...
-*/
-
-Elements.from = function(text, excludeScripts){
-	if (excludeScripts || excludeScripts == null) text = text.stripScripts();
-
-	var container, match = text.match(/^\s*(?:<!--.*?-->\s*)*<(t[dhr]|tbody|tfoot|thead)/i);
-
-	if (match){
-		container = new Element('table');
-		var tag = match[1].toLowerCase();
-		if (['td', 'th', 'tr'].contains(tag)){
-			container = new Element('tbody').inject(container);
-			if (tag != 'tr') container = new Element('tr').inject(container);
-		}
-	}
-
-	return (container || new Element('div')).set('html', text).getChildren();
-};
-
-/*
----
-
-script: IframeShim.js
-
-name: IframeShim
-
-description: Defines IframeShim, a class for obscuring select lists and flash objects in IE.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element.Event
-  - Core/Element.Style
-  - Core/Options
-  - Core/Events
-  - Element.Position
-  - Class.Occlude
-
-provides: [IframeShim]
-
-...
-*/
-
-(function(){
-
-var browsers = false;
-
-
-var IframeShim = this.IframeShim = new Class({
-
-	Implements: [Options, Events, Class.Occlude],
-
-	options: {
-		className: 'iframeShim',
-		src: 'javascript:false;document.write("");',
-		display: false,
-		zIndex: null,
-		margin: 0,
-		offset: {x: 0, y: 0},
-		browsers: browsers
-	},
-
-	property: 'IframeShim',
-
-	initialize: function(element, options){
-		this.element = document.id(element);
-		if (this.occlude()) return this.occluded;
-		this.setOptions(options);
-		this.makeShim();
-		return this;
-	},
-
-	makeShim: function(){
-		if (this.options.browsers){
-			var zIndex = this.element.getStyle('zIndex').toInt();
-
-			if (!zIndex){
-				zIndex = 1;
-				var pos = this.element.getStyle('position');
-				if (pos == 'static' || !pos) this.element.setStyle('position', 'relative');
-				this.element.setStyle('zIndex', zIndex);
-			}
-			zIndex = ((this.options.zIndex != null || this.options.zIndex === 0) && zIndex > this.options.zIndex) ? this.options.zIndex : zIndex - 1;
-			if (zIndex < 0) zIndex = 1;
-			this.shim = new Element('iframe', {
-				src: this.options.src,
-				scrolling: 'no',
-				frameborder: 0,
-				styles: {
-					zIndex: zIndex,
-					position: 'absolute',
-					border: 'none',
-					filter: 'progid:DXImageTransform.Microsoft.Alpha(style=0,opacity=0)'
-				},
-				'class': this.options.className
-			}).store('IframeShim', this);
-			var inject = (function(){
-				this.shim.inject(this.element, 'after');
-				this[this.options.display ? 'show' : 'hide']();
-				this.fireEvent('inject');
-			}).bind(this);
-			if (!IframeShim.ready) window.addEvent('load', inject);
-			else inject();
-		} else {
-			this.position = this.hide = this.show = this.dispose = Function.convert(this);
-		}
-	},
-
-	position: function(){
-		if (!IframeShim.ready || !this.shim) return this;
-		var size = this.element.measure(function(){
-			return this.getSize();
-		});
-		if (this.options.margin != undefined){
-			size.x = size.x - (this.options.margin * 2);
-			size.y = size.y - (this.options.margin * 2);
-			this.options.offset.x += this.options.margin;
-			this.options.offset.y += this.options.margin;
-		}
-		this.shim.set({width: size.x, height: size.y}).position({
-			relativeTo: this.element,
-			offset: this.options.offset
-		});
-		return this;
-	},
-
-	hide: function(){
-		if (this.shim) this.shim.setStyle('display', 'none');
-		return this;
-	},
-
-	show: function(){
-		if (this.shim) this.shim.setStyle('display', 'block');
-		return this.position();
-	},
-
-	dispose: function(){
-		if (this.shim) this.shim.dispose();
-		return this;
-	},
-
-	destroy: function(){
-		if (this.shim) this.shim.destroy();
-		return this;
-	}
-
-});
-
-})();
-
-window.addEvent('load', function(){
-	IframeShim.ready = true;
-});
-
-/*
----
-
-script: Mask.js
-
-name: Mask
-
-description: Creates a mask element to cover another.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Options
-  - Core/Events
-  - Core/Element.Event
-  - Class.Binds
-  - Element.Position
-  - IframeShim
-
-provides: [Mask]
-
-...
-*/
-(function(){
-
-var Mask = this.Mask = new Class({
-
-	Implements: [Options, Events],
-
-	Binds: ['position'],
-
-	options: {/*
-		onShow: function(){},
-		onHide: function(){},
-		onDestroy: function(){},
-		onClick: function(event){},
-		inject: {
-			where: 'after',
-			target: null,
-		},
-		hideOnClick: false,
-		id: null,
-		destroyOnHide: false,*/
-		style: {},
-		'class': 'mask',
-		maskMargins: false,
-		useIframeShim: true,
-		iframeShimOptions: {}
-	},
-
-	initialize: function(target, options){
-		this.target = document.id(target) || document.id(document.body);
-		this.target.store('mask', this);
-		this.setOptions(options);
-		this.render();
-		this.inject();
-	},
-
-	render: function(){
-		this.element = new Element('div', {
-			'class': this.options['class'],
-			id: this.options.id || 'mask-' + String.uniqueID(),
-			styles: Object.merge({}, this.options.style, {
-				display: 'none'
-			}),
-			events: {
-				click: function(event){
-					this.fireEvent('click', event);
-					if (this.options.hideOnClick) this.hide();
-				}.bind(this)
-			}
-		});
-
-		this.hidden = true;
-	},
-
-	toElement: function(){
-		return this.element;
-	},
-
-	inject: function(target, where){
-		where = where || (this.options.inject ? this.options.inject.where : '') || (this.target == document.body ? 'inside' : 'after');
-		target = target || (this.options.inject && this.options.inject.target) || this.target;
-
-		this.element.inject(target, where);
-
-		if (this.options.useIframeShim){
-			this.shim = new IframeShim(this.element, this.options.iframeShimOptions);
-
-			this.addEvents({
-				show: this.shim.show.bind(this.shim),
-				hide: this.shim.hide.bind(this.shim),
-				destroy: this.shim.destroy.bind(this.shim)
-			});
-		}
-	},
-
-	position: function(){
-		this.resize(this.options.width, this.options.height);
-
-		this.element.position({
-			relativeTo: this.target,
-			position: 'topLeft',
-			ignoreMargins: !this.options.maskMargins,
-			ignoreScroll: this.target == document.body
-		});
-
-		return this;
-	},
-
-	resize: function(x, y){
-		var opt = {
-			styles: ['padding', 'border']
-		};
-		if (this.options.maskMargins) opt.styles.push('margin');
-
-		var dim = this.target.getComputedSize(opt);
-		if (this.target == document.body){
-			this.element.setStyles({width: 0, height: 0});
-			var win = window.getScrollSize();
-			if (dim.totalHeight < win.y) dim.totalHeight = win.y;
-			if (dim.totalWidth < win.x) dim.totalWidth = win.x;
-		}
-		this.element.setStyles({
-			width: Array.pick([x, dim.totalWidth, dim.x]),
-			height: Array.pick([y, dim.totalHeight, dim.y])
-		});
-
-		return this;
-	},
-
-	show: function(){
-		if (!this.hidden) return this;
-
-		window.addEvent('resize', this.position);
-		this.position();
-		this.showMask.apply(this, arguments);
-
-		return this;
-	},
-
-	showMask: function(){
-		this.element.setStyle('display', 'block');
-		this.hidden = false;
-		this.fireEvent('show');
-	},
-
-	hide: function(){
-		if (this.hidden) return this;
-
-		window.removeEvent('resize', this.position);
-		this.hideMask.apply(this, arguments);
-		if (this.options.destroyOnHide) return this.destroy();
-
-		return this;
-	},
-
-	hideMask: function(){
-		this.element.setStyle('display', 'none');
-		this.hidden = true;
-		this.fireEvent('hide');
-	},
-
-	toggle: function(){
-		this[this.hidden ? 'show' : 'hide']();
-	},
-
-	destroy: function(){
-		this.hide();
-		this.element.destroy();
-		this.fireEvent('destroy');
-		this.target.eliminate('mask');
-	}
-
-});
-
-})();
-
-
-Element.Properties.mask = {
-
-	set: function(options){
-		var mask = this.retrieve('mask');
-		if (mask) mask.destroy();
-		return this.eliminate('mask').store('mask:options', options);
-	},
-
-	get: function(){
-		var mask = this.retrieve('mask');
-		if (!mask){
-			mask = new Mask(this, this.retrieve('mask:options'));
-			this.store('mask', mask);
-		}
-		return mask;
-	}
-
-};
-
-Element.implement({
-
-	mask: function(options){
-		if (options) this.set('mask', options);
-		this.get('mask').show();
-		return this;
-	},
-
-	unmask: function(){
-		this.get('mask').hide();
-		return this;
-	}
-
-});
-
-/*
----
-
-script: Spinner.js
-
-name: Spinner
-
-description: Adds a semi-transparent overlay over a dom element with a spinnin ajax icon.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Fx.Tween
-  - Core/Request
-  - Class.refactor
-  - Mask
-
-provides: [Spinner]
-
-...
-*/
-(function(){
-
-var Spinner = this.Spinner = new Class({
-
-	Extends: this.Mask,
-
-	Implements: Chain,
-
-	options: {/*
-		message: false,*/
-		'class': 'spinner',
-		containerPosition: {},
-		content: {
-			'class': 'spinner-content'
-		},
-		messageContainer: {
-			'class': 'spinner-msg'
-		},
-		img: {
-			'class': 'spinner-img'
-		},
-		fxOptions: {
-			link: 'chain'
-		}
-	},
-
-	initialize: function(target, options){
-		this.target = document.id(target) || document.id(document.body);
-		this.target.store('spinner', this);
-		this.setOptions(options);
-		this.render();
-		this.inject();
-
-		// Add this to events for when noFx is true; parent methods handle hide/show.
-		var deactivate = function(){ this.active = false; }.bind(this);
-		this.addEvents({
-			hide: deactivate,
-			show: deactivate
-		});
-	},
-
-	render: function(){
-		this.parent();
-
-		this.element.set('id', this.options.id || 'spinner-' + String.uniqueID());
-
-		this.content = document.id(this.options.content) || new Element('div', this.options.content);
-		this.content.inject(this.element);
-
-		if (this.options.message){
-			this.msg = document.id(this.options.message) || new Element('p', this.options.messageContainer).appendText(this.options.message);
-			this.msg.inject(this.content);
-		}
-
-		if (this.options.img){
-			this.img = document.id(this.options.img) || new Element('div', this.options.img);
-			this.img.inject(this.content);
-		}
-
-		this.element.set('tween', this.options.fxOptions);
-	},
-
-	show: function(noFx){
-		if (this.active) return this.chain(this.show.bind(this));
-		if (!this.hidden){
-			this.callChain.delay(20, this);
-			return this;
-		}
-
-		this.target.set('aria-busy', 'true');
-		this.active = true;
-
-		return this.parent(noFx);
-	},
-
-	showMask: function(noFx){
-		var pos = function(){
-			this.content.position(Object.merge({
-				relativeTo: this.element
-			}, this.options.containerPosition));
-		}.bind(this);
-
-		if (noFx){
-			this.parent();
-			pos();
-		} else {
-			if (!this.options.style.opacity) this.options.style.opacity = this.element.getStyle('opacity').toFloat();
-			this.element.setStyles({
-				display: 'block',
-				opacity: 0
-			}).tween('opacity', this.options.style.opacity);
-			pos();
-			this.hidden = false;
-			this.fireEvent('show');
-			this.callChain();
-		}
-	},
-
-	hide: function(noFx){
-		if (this.active) return this.chain(this.hide.bind(this));
-		if (this.hidden){
-			this.callChain.delay(20, this);
-			return this;
-		}
-
-		this.target.set('aria-busy', 'false');
-		this.active = true;
-
-		return this.parent(noFx);
-	},
-
-	hideMask: function(noFx){
-		if (noFx) return this.parent();
-		this.element.tween('opacity', 0).get('tween').chain(function(){
-			this.element.setStyle('display', 'none');
-			this.hidden = true;
-			this.fireEvent('hide');
-			this.callChain();
-		}.bind(this));
-	},
-
-	destroy: function(){
-		this.content.destroy();
-		this.parent();
-		this.target.eliminate('spinner');
-	}
-
-});
-
-})();
-
-Request = Class.refactor(Request, {
-
-	options: {
-		useSpinner: false,
-		spinnerOptions: {},
-		spinnerTarget: false
-	},
-
-	initialize: function(options){
-		this._send = this.send;
-		this.send = function(options){
-			var spinner = this.getSpinner();
-			if (spinner) spinner.chain(this._send.pass(options, this)).show();
-			else this._send(options);
-			return this;
-		};
-		this.previous(options);
-	},
-
-	getSpinner: function(){
-		if (!this.spinner){
-			var update = document.id(this.options.spinnerTarget) || document.id(this.options.update);
-			if (this.options.useSpinner && update){
-				update.set('spinner', this.options.spinnerOptions);
-				var spinner = this.spinner = update.get('spinner');
-				['complete', 'exception', 'cancel'].each(function(event){
-					this.addEvent(event, spinner.hide.bind(spinner));
-				}, this);
-			}
-		}
-		return this.spinner;
-	}
-
-});
-
-Element.Properties.spinner = {
-
-	set: function(options){
-		var spinner = this.retrieve('spinner');
-		if (spinner) spinner.destroy();
-		return this.eliminate('spinner').store('spinner:options', options);
-	},
-
-	get: function(){
-		var spinner = this.retrieve('spinner');
-		if (!spinner){
-			spinner = new Spinner(this, this.retrieve('spinner:options'));
-			this.store('spinner', spinner);
-		}
-		return spinner;
-	}
-
-};
-
-Element.implement({
-
-	spin: function(options){
-		if (options) this.set('spinner', options);
-		this.get('spinner').show();
-		return this;
-	},
-
-	unspin: function(){
-		this.get('spinner').hide();
-		return this;
-	}
-
-});
-
-/*
----
-
-script: String.QueryString.js
-
-name: String.QueryString
-
-description: Methods for dealing with URI query strings.
-
-license: MIT-style license
-
-authors:
-  - Sebastian Markbåge
-  - Aaron Newton
-  - Lennart Pilon
-  - Valerio Proietti
-
-requires:
-  - Core/Array
-  - Core/String
-  - MooTools.More
-
-provides: [String.QueryString]
-
-...
-*/
-
-(function(){
-
-/**
- * decodeURIComponent doesn't do the correct thing with query parameter keys or
- * values. Specifically, it leaves '+' as '+' when it should be converting them
- * to spaces as that's the specification. When browsers submit HTML forms via
- * GET, the values are encoded using 'application/x-www-form-urlencoded'
- * which converts spaces to '+'.
- *
- * See: http://unixpapa.com/js/querystring.html for a description of the
- * problem.
- */
-var decodeComponent = function(str){
-	return decodeURIComponent(str.replace(/\+/g, ' '));
-};
-
-String.implement({
-
-	parseQueryString: function(decodeKeys, decodeValues){
-		if (decodeKeys == null) decodeKeys = true;
-		if (decodeValues == null) decodeValues = true;
-
-		var vars = this.split(/[&;]/),
-			object = {};
-		if (!vars.length) return object;
-
-		vars.each(function(val){
-			var index = val.indexOf('=') + 1,
-				value = index ? val.substr(index) : '',
-				keys = index ? val.substr(0, index - 1).match(/([^\]\[]+|(\B)(?=\]))/g) : [val],
-				obj = object;
-			if (!keys) return;
-			if (decodeValues) value = decodeComponent(value);
-			keys.each(function(key, i){
-				if (decodeKeys) key = decodeComponent(key);
-				var current = obj[key];
-
-				if (i < keys.length - 1) obj = obj[key] = current || {};
-				else if (typeOf(current) == 'array') current.push(value);
-				else obj[key] = current != null ? [current, value] : value;
-			});
-		});
-
-		return object;
-	},
-
-	cleanQueryString: function(method){
-		return this.split('&').filter(function(val){
-			var index = val.indexOf('='),
-				key = index < 0 ? '' : val.substr(0, index),
-				value = val.substr(index + 1);
-
-			return method ? method.call(null, key, value) : (value || value === 0);
-		}).join('&');
-	}
-
-});
-
-})();
-
-/*
----
-
-script: Form.Request.js
-
-name: Form.Request
-
-description: Handles the basic functionality of submitting a form and updating a dom element with the result.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Request.HTML
-  - Class.Binds
-  - Class.Occlude
-  - Spinner
-  - String.QueryString
-  - Element.Delegation.Pseudo
-
-provides: [Form.Request]
-
-...
-*/
-
-if (!window.Form) window.Form = {};
-
-(function(){
-
-Form.Request = new Class({
-
-	Binds: ['onSubmit', 'onFormValidate'],
-
-	Implements: [Options, Events, Class.Occlude],
-
-	options: {/*
-		onFailure: function(){},
-		onSuccess: function(){}, // aliased to onComplete,
-		onSend: function(){}*/
-		requestOptions: {
-			evalScripts: true,
-			useSpinner: true,
-			emulation: false,
-			link: 'ignore'
-		},
-		sendButtonClicked: true,
-		extraData: {},
-		resetForm: true
-	},
-
-	property: 'form.request',
-
-	initialize: function(form, target, options){
-		this.element = document.id(form);
-		if (this.occlude()) return this.occluded;
-		this.setOptions(options)
-			.setTarget(target)
-			.attach();
-	},
-
-	setTarget: function(target){
-		this.target = document.id(target);
-		if (!this.request){
-			this.makeRequest();
-		} else {
-			this.request.setOptions({
-				update: this.target
-			});
-		}
-		return this;
-	},
-
-	toElement: function(){
-		return this.element;
-	},
-
-	makeRequest: function(){
-		var self = this;
-		this.request = new Request.HTML(Object.merge({
-			update: this.target,
-			emulation: false,
-			spinnerTarget: this.element,
-			method: this.element.get('method') || 'post'
-		}, this.options.requestOptions)).addEvents({
-			success: function(tree, elements, html, javascript){
-				['complete', 'success'].each(function(evt){
-					self.fireEvent(evt, [self.target, tree, elements, html, javascript]);
-				});
-			},
-			failure: function(){
-				self.fireEvent('complete', arguments).fireEvent('failure', arguments);
-			},
-			exception: function(){
-				self.fireEvent('failure', arguments);
-			}
-		});
-		return this.attachReset();
-	},
-
-	attachReset: function(){
-		if (!this.options.resetForm) return this;
-		this.request.addEvent('success', function(){
-			Function.attempt(function(){
-				this.element.reset();
-			}.bind(this));
-			if (window.OverText) OverText.update();
-		}.bind(this));
-		return this;
-	},
-
-	attach: function(attach){
-		var method = (attach != false) ? 'addEvent' : 'removeEvent';
-		this.element[method]('click:relay(button, input[type=submit])', this.saveClickedButton.bind(this));
-
-		var fv = this.element.retrieve('validator');
-		if (fv) fv[method]('onFormValidate', this.onFormValidate);
-		else this.element[method]('submit', this.onSubmit);
-
-		return this;
-	},
-
-	detach: function(){
-		return this.attach(false);
-	},
-
-	//public method
-	enable: function(){
-		return this.attach();
-	},
-
-	//public method
-	disable: function(){
-		return this.detach();
-	},
-
-	onFormValidate: function(valid, form, event){
-		//if there's no event, then this wasn't a submit event
-		if (!event) return;
-		var fv = this.element.retrieve('validator');
-		if (valid || (fv && !fv.options.stopOnFailure)){
-			event.stop();
-			this.send();
-		}
-	},
-
-	onSubmit: function(event){
-		var fv = this.element.retrieve('validator');
-		if (fv){
-			//form validator was created after Form.Request
-			this.element.removeEvent('submit', this.onSubmit);
-			fv.addEvent('onFormValidate', this.onFormValidate);
-			fv.validate(event);
-			return;
-		}
-		if (event) event.stop();
-		this.send();
-	},
-
-	saveClickedButton: function(event, target){
-		var targetName = target.get('name');
-		if (!targetName || !this.options.sendButtonClicked) return;
-		this.options.extraData[targetName] = target.get('value') || true;
-		this.clickedCleaner = function(){
-			delete this.options.extraData[targetName];
-			this.clickedCleaner = function(){};
-		}.bind(this);
-	},
-
-	clickedCleaner: function(){},
-
-	send: function(){
-		var str = this.element.toQueryString().trim(),
-			data = Object.toQueryString(this.options.extraData);
-
-		if (str) str += '&' + data;
-		else str = data;
-
-		this.fireEvent('send', [this.element, str.parseQueryString()]);
-		this.request.send({
-			data: str,
-			url: this.options.requestOptions.url || this.element.get('action')
-		});
-		this.clickedCleaner();
-		return this;
-	}
-
-});
-
-Element.implement('formUpdate', function(update, options){
-	var fq = this.retrieve('form.request');
-	if (!fq){
-		fq = new Form.Request(this, update, options);
-	} else {
-		if (update) fq.setTarget(update);
-		if (options) fq.setOptions(options).makeRequest();
-	}
-	fq.send();
-	return this;
-});
-
-})();
-
-/*
----
-
-script: Fx.Reveal.js
-
-name: Fx.Reveal
-
-description: Defines Fx.Reveal, a class that shows and hides elements with a transition.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Fx.Morph
-  - Element.Shortcuts
-  - Element.Measure
-
-provides: [Fx.Reveal]
-
-...
-*/
-
-(function(){
-
-
-var hideTheseOf = function(object){
-	var hideThese = object.options.hideInputs;
-	if (window.OverText){
-		var otClasses = [null];
-		OverText.each(function(ot){
-			otClasses.include('.' + ot.options.labelClass);
-		});
-		if (otClasses) hideThese += otClasses.join(', ');
-	}
-	return (hideThese) ? object.element.getElements(hideThese) : null;
-};
-
-
-Fx.Reveal = new Class({
-
-	Extends: Fx.Morph,
-
-	options: {/*
-		onShow: function(thisElement){},
-		onHide: function(thisElement){},
-		onComplete: function(thisElement){},
-		heightOverride: null,
-		widthOverride: null,*/
-		link: 'cancel',
-		styles: ['padding', 'border', 'margin'],
-		transitionOpacity: 'opacity' in document.documentElement,
-		mode: 'vertical',
-		display: function(){
-			return this.element.get('tag') != 'tr' ? 'block' : 'table-row';
-		},
-		opacity: 1,
-		hideInputs: !('opacity' in document.documentElement) ? 'select, input, textarea, object, embed' : null
-	},
-
-	dissolve: function(){
-		if (!this.hiding && !this.showing){
-			if (this.element.getStyle('display') != 'none'){
-				this.hiding = true;
-				this.showing = false;
-				this.hidden = true;
-				this.cssText = this.element.style.cssText;
-
-				var startStyles = this.element.getComputedSize({
-					styles: this.options.styles,
-					mode: this.options.mode
-				});
-				if (this.options.transitionOpacity) startStyles.opacity = this.options.opacity;
-
-				var zero = {};
-				Object.each(startStyles, function(style, name){
-					zero[name] = [style, 0];
-				});
-
-				this.element.setStyles({
-					display: Function.convert(this.options.display).call(this),
-					overflow: 'hidden'
-				});
-
-				var hideThese = hideTheseOf(this);
-				if (hideThese) hideThese.setStyle('visibility', 'hidden');
-
-				this.$chain.unshift(function(){
-					if (this.hidden){
-						this.hiding = false;
-						this.element.style.cssText = this.cssText;
-						this.element.setStyle('display', 'none');
-						if (hideThese) hideThese.setStyle('visibility', 'visible');
-					}
-					this.fireEvent('hide', this.element);
-					this.callChain();
-				}.bind(this));
-
-				this.start(zero);
-			} else {
-				this.callChain.delay(10, this);
-				this.fireEvent('complete', this.element);
-				this.fireEvent('hide', this.element);
-			}
-		} else if (this.options.link == 'chain'){
-			this.chain(this.dissolve.bind(this));
-		} else if (this.options.link == 'cancel' && !this.hiding){
-			this.cancel();
-			this.dissolve();
-		}
-		return this;
-	},
-
-	reveal: function(){
-		if (!this.showing && !this.hiding){
-			if (this.element.getStyle('display') == 'none'){
-				this.hiding = false;
-				this.showing = true;
-				this.hidden = false;
-				this.cssText = this.element.style.cssText;
-
-				var startStyles;
-				this.element.measure(function(){
-					startStyles = this.element.getComputedSize({
-						styles: this.options.styles,
-						mode: this.options.mode
-					});
-				}.bind(this));
-				if (this.options.heightOverride != null) startStyles.height = this.options.heightOverride.toInt();
-				if (this.options.widthOverride != null) startStyles.width = this.options.widthOverride.toInt();
-				if (this.options.transitionOpacity){
-					this.element.setStyle('opacity', 0);
-					startStyles.opacity = this.options.opacity;
-				}
-
-				var zero = {
-					height: 0,
-					display: Function.convert(this.options.display).call(this)
-				};
-				Object.each(startStyles, function(style, name){
-					zero[name] = 0;
-				});
-				zero.overflow = 'hidden';
-
-				this.element.setStyles(zero);
-
-				var hideThese = hideTheseOf(this);
-				if (hideThese) hideThese.setStyle('visibility', 'hidden');
-
-				this.$chain.unshift(function(){
-					this.element.style.cssText = this.cssText;
-					this.element.setStyle('display', Function.convert(this.options.display).call(this));
-					if (!this.hidden) this.showing = false;
-					if (hideThese) hideThese.setStyle('visibility', 'visible');
-					this.callChain();
-					this.fireEvent('show', this.element);
-				}.bind(this));
-
-				this.start(startStyles);
-			} else {
-				this.callChain();
-				this.fireEvent('complete', this.element);
-				this.fireEvent('show', this.element);
-			}
-		} else if (this.options.link == 'chain'){
-			this.chain(this.reveal.bind(this));
-		} else if (this.options.link == 'cancel' && !this.showing){
-			this.cancel();
-			this.reveal();
-		}
-		return this;
-	},
-
-	toggle: function(){
-		if (this.element.getStyle('display') == 'none'){
-			this.reveal();
-		} else {
-			this.dissolve();
-		}
-		return this;
-	},
-
-	cancel: function(){
-		this.parent.apply(this, arguments);
-		if (this.cssText != null) this.element.style.cssText = this.cssText;
-		this.hiding = false;
-		this.showing = false;
-		return this;
-	}
-
-});
-
-Element.Properties.reveal = {
-
-	set: function(options){
-		this.get('reveal').cancel().setOptions(options);
-		return this;
-	},
-
-	get: function(){
-		var reveal = this.retrieve('reveal');
-		if (!reveal){
-			reveal = new Fx.Reveal(this);
-			this.store('reveal', reveal);
-		}
-		return reveal;
-	}
-
-};
-
-Element.Properties.dissolve = Element.Properties.reveal;
-
-Element.implement({
-
-	reveal: function(options){
-		this.get('reveal').setOptions(options).reveal();
-		return this;
-	},
-
-	dissolve: function(options){
-		this.get('reveal').setOptions(options).dissolve();
-		return this;
-	},
-
-	nix: function(options){
-		var params = Array.link(arguments, {destroy: Type.isBoolean, options: Type.isObject});
-		this.get('reveal').setOptions(options).dissolve().chain(function(){
-			this[params.destroy ? 'destroy' : 'dispose']();
-		}.bind(this));
-		return this;
-	},
-
-	wink: function(){
-		var params = Array.link(arguments, {duration: Type.isNumber, options: Type.isObject});
-		var reveal = this.get('reveal').setOptions(params.options);
-		reveal.reveal().chain(function(){
-			(function(){
-				reveal.dissolve();
-			}).delay(params.duration || 2000);
-		});
-	}
-
-});
-
-})();
-
-/*
----
-
-script: Form.Request.Append.js
-
-name: Form.Request.Append
-
-description: Handles the basic functionality of submitting a form and updating a dom element with the result. The result is appended to the DOM element instead of replacing its contents.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Form.Request
-  - Fx.Reveal
-  - Elements.from
-
-provides: [Form.Request.Append]
-
-...
-*/
-
-Form.Request.Append = new Class({
-
-	Extends: Form.Request,
-
-	options: {
-		//onBeforeEffect: function(){},
-		useReveal: true,
-		revealOptions: {},
-		inject: 'bottom'
-	},
-
-	makeRequest: function(){
-		this.request = new Request.HTML(Object.merge({
-			url: this.element.get('action'),
-			method: this.element.get('method') || 'post',
-			spinnerTarget: this.element
-		}, this.options.requestOptions, {
-			evalScripts: false
-		})).addEvents({
-			success: function(tree, elements, html, javascript){
-				var container;
-				var kids = Elements.from(html);
-				if (kids.length == 1){
-					container = kids[0];
-				} else {
-					container = new Element('div', {
-						styles: {
-							display: 'none'
-						}
-					}).adopt(kids);
-				}
-				container.inject(this.target, this.options.inject);
-				if (this.options.requestOptions.evalScripts) Browser.exec(javascript);
-				this.fireEvent('beforeEffect', container);
-				var finish = function(){
-					this.fireEvent('success', [container, this.target, tree, elements, html, javascript]);
-				}.bind(this);
-				if (this.options.useReveal){
-					container.set('reveal', this.options.revealOptions).get('reveal').chain(finish);
-					container.reveal();
-				} else {
-					finish();
-				}
-			}.bind(this),
-			failure: function(xhr){
-				this.fireEvent('failure', xhr);
-			}.bind(this)
-		});
-		this.attachReset();
-	}
-
-});
-
-/*
----
-
-script: Object.Extras.js
-
-name: Object.Extras
-
-description: Extra Object generics, like getFromPath which allows a path notation to child elements.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Object
-  - MooTools.More
-
-provides: [Object.Extras]
-
-...
-*/
-
-(function(){
-
-var defined = function(value){
-	return value != null;
-};
-
-var hasOwnProperty = Object.prototype.hasOwnProperty;
-
-Object.extend({
-
-	getFromPath: function(source, parts){
-		if (typeof parts == 'string') parts = parts.split('.');
-		for (var i = 0, l = parts.length; i < l; i++){
-			if (hasOwnProperty.call(source, parts[i])) source = source[parts[i]];
-			else return null;
-		}
-		return source;
-	},
-
-	cleanValues: function(object, method){
-		method = method || defined;
-		for (var key in object) if (!method(object[key])){
-			delete object[key];
-		}
-		return object;
-	},
-
-	erase: function(object, key){
-		if (hasOwnProperty.call(object, key)) delete object[key];
-		return object;
-	},
-
-	run: function(object){
-		var args = Array.slice(arguments, 1);
-		for (var key in object) if (object[key].apply){
-			object[key].apply(object, args);
-		}
-		return object;
-	}
-
-});
-
-})();
-
-/*
----
-
-script: Locale.js
-
-name: Locale
-
-description: Provides methods for localization.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Arian Stolwijk
-
-requires:
-  - Core/Events
-  - Object.Extras
-  - MooTools.More
-
-provides: [Locale, Lang]
-
-...
-*/
-
-(function(){
-
-var current = null,
-	locales = {},
-	inherits = {};
-
-var getSet = function(set){
-	if (instanceOf(set, Locale.Set)) return set;
-	else return locales[set];
-};
-
-var Locale = this.Locale = {
-
-	define: function(locale, set, key, value){
-		var name;
-		if (instanceOf(locale, Locale.Set)){
-			name = locale.name;
-			if (name) locales[name] = locale;
-		} else {
-			name = locale;
-			if (!locales[name]) locales[name] = new Locale.Set(name);
-			locale = locales[name];
-		}
-
-		if (set) locale.define(set, key, value);
-
-		
-
-		if (!current) current = locale;
-
-		return locale;
-	},
-
-	use: function(locale){
-		locale = getSet(locale);
-
-		if (locale){
-			current = locale;
-
-			this.fireEvent('change', locale);
-
-			
-		}
-
-		return this;
-	},
-
-	getCurrent: function(){
-		return current;
-	},
-
-	get: function(key, args){
-		return (current) ? current.get(key, args) : '';
-	},
-
-	inherit: function(locale, inherits, set){
-		locale = getSet(locale);
-
-		if (locale) locale.inherit(inherits, set);
-		return this;
-	},
-
-	list: function(){
-		return Object.keys(locales);
-	}
-
-};
-
-Object.append(Locale, new Events);
-
-Locale.Set = new Class({
-
-	sets: {},
-
-	inherits: {
-		locales: [],
-		sets: {}
-	},
-
-	initialize: function(name){
-		this.name = name || '';
-	},
-
-	define: function(set, key, value){
-		var defineData = this.sets[set];
-		if (!defineData) defineData = {};
-
-		if (key){
-			if (typeOf(key) == 'object') defineData = Object.merge(defineData, key);
-			else defineData[key] = value;
-		}
-		this.sets[set] = defineData;
-
-		return this;
-	},
-
-	get: function(key, args, _base){
-		var value = Object.getFromPath(this.sets, key);
-		if (value != null){
-			var type = typeOf(value);
-			if (type == 'function') value = value.apply(null, Array.convert(args));
-			else if (type == 'object') value = Object.clone(value);
-			return value;
-		}
-
-		// get value of inherited locales
-		var index = key.indexOf('.'),
-			set = index < 0 ? key : key.substr(0, index),
-			names = (this.inherits.sets[set] || []).combine(this.inherits.locales).include('en-US');
-		if (!_base) _base = [];
-
-		for (var i = 0, l = names.length; i < l; i++){
-			if (_base.contains(names[i])) continue;
-			_base.include(names[i]);
-
-			var locale = locales[names[i]];
-			if (!locale) continue;
-
-			value = locale.get(key, args, _base);
-			if (value != null) return value;
-		}
-
-		return '';
-	},
-
-	inherit: function(names, set){
-		names = Array.convert(names);
-
-		if (set && !this.inherits.sets[set]) this.inherits.sets[set] = [];
-
-		var l = names.length;
-		while (l--) (set ? this.inherits.sets[set] : this.inherits.locales).unshift(names[l]);
-
-		return this;
-	}
-
-});
-
-
-
-})();
-
-/*
----
-
-name: Locale.en-US.Date
-
-description: Date messages for US English.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Locale
-
-provides: [Locale.en-US.Date]
-
-...
-*/
-
-Locale.define('en-US', 'Date', {
-
-	months: ['January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'],
-	months_abbr: ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'],
-	days: ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'],
-	days_abbr: ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-
-	// Culture's date order: MM/DD/YYYY
-	dateOrder: ['month', 'date', 'year'],
-	shortDate: '%m/%d/%Y',
-	shortTime: '%I:%M%p',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 0,
-
-	// Date.Extras
-	ordinal: function(dayOfMonth){
-		// 1st, 2nd, 3rd, etc.
-		return (dayOfMonth > 3 && dayOfMonth < 21) ? 'th' : ['th', 'st', 'nd', 'rd', 'th'][Math.min(dayOfMonth % 10, 4)];
-	},
-
-	lessThanMinuteAgo: 'less than a minute ago',
-	minuteAgo: 'about a minute ago',
-	minutesAgo: '{delta} minutes ago',
-	hourAgo: 'about an hour ago',
-	hoursAgo: 'about {delta} hours ago',
-	dayAgo: '1 day ago',
-	daysAgo: '{delta} days ago',
-	weekAgo: '1 week ago',
-	weeksAgo: '{delta} weeks ago',
-	monthAgo: '1 month ago',
-	monthsAgo: '{delta} months ago',
-	yearAgo: '1 year ago',
-	yearsAgo: '{delta} years ago',
-
-	lessThanMinuteUntil: 'less than a minute from now',
-	minuteUntil: 'about a minute from now',
-	minutesUntil: '{delta} minutes from now',
-	hourUntil: 'about an hour from now',
-	hoursUntil: 'about {delta} hours from now',
-	dayUntil: '1 day from now',
-	daysUntil: '{delta} days from now',
-	weekUntil: '1 week from now',
-	weeksUntil: '{delta} weeks from now',
-	monthUntil: '1 month from now',
-	monthsUntil: '{delta} months from now',
-	yearUntil: '1 year from now',
-	yearsUntil: '{delta} years from now'
-
-});
-
-/*
----
-
-script: Date.js
-
-name: Date
-
-description: Extends the Date native object to include methods useful in managing dates.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Nicholas Barthelemy - https://svn.nbarthelemy.com/date-js/
-  - Harald Kirshner - mail [at] digitarald.de; http://digitarald.de
-  - Scott Kyle - scott [at] appden.com; http://appden.com
-
-requires:
-  - Core/Array
-  - Core/String
-  - Core/Number
-  - MooTools.More
-  - Locale
-  - Locale.en-US.Date
-
-provides: [Date]
-
-...
-*/
-
-(function(){
-
-var Date = this.Date;
-
-var DateMethods = Date.Methods = {
-	ms: 'Milliseconds',
-	year: 'FullYear',
-	min: 'Minutes',
-	mo: 'Month',
-	sec: 'Seconds',
-	hr: 'Hours'
-};
-
-[
-	'Date', 'Day', 'FullYear', 'Hours', 'Milliseconds', 'Minutes', 'Month', 'Seconds', 'Time', 'TimezoneOffset',
-	'Week', 'Timezone', 'GMTOffset', 'DayOfYear', 'LastMonth', 'LastDayOfMonth', 'UTCDate', 'UTCDay', 'UTCFullYear',
-	'AMPM', 'Ordinal', 'UTCHours', 'UTCMilliseconds', 'UTCMinutes', 'UTCMonth', 'UTCSeconds', 'UTCMilliseconds'
-].each(function(method){
-	Date.Methods[method.toLowerCase()] = method;
-});
-
-var pad = function(n, digits, string){
-	if (digits == 1) return n;
-	return n < Math.pow(10, digits - 1) ? (string || '0') + pad(n, digits - 1, string) : n;
-};
-
-Date.implement({
-
-	set: function(prop, value){
-		prop = prop.toLowerCase();
-		var method = DateMethods[prop] && 'set' + DateMethods[prop];
-		if (method && this[method]) this[method](value);
-		return this;
-	}.overloadSetter(),
-
-	get: function(prop){
-		prop = prop.toLowerCase();
-		var method = DateMethods[prop] && 'get' + DateMethods[prop];
-		if (method && this[method]) return this[method]();
-		return null;
-	}.overloadGetter(),
-
-	clone: function(){
-		return new Date(this.get('time'));
-	},
-
-	increment: function(interval, times){
-		interval = interval || 'day';
-		times = times != null ? times : 1;
-
-		switch (interval){
-			case 'year':
-				return this.increment('month', times * 12);
-			case 'month':
-				var d = this.get('date');
-				this.set('date', 1).set('mo', this.get('mo') + times);
-				return this.set('date', d.min(this.get('lastdayofmonth')));
-			case 'week':
-				return this.increment('day', times * 7);
-			case 'day':
-				return this.set('date', this.get('date') + times);
-		}
-
-		if (!Date.units[interval]) throw new Error(interval + ' is not a supported interval');
-
-		return this.set('time', this.get('time') + times * Date.units[interval]());
-	},
-
-	decrement: function(interval, times){
-		return this.increment(interval, -1 * (times != null ? times : 1));
-	},
-
-	isLeapYear: function(){
-		return Date.isLeapYear(this.get('year'));
-	},
-
-	clearTime: function(){
-		return this.set({hr: 0, min: 0, sec: 0, ms: 0});
-	},
-
-	diff: function(date, resolution){
-		if (typeOf(date) == 'string') date = Date.parse(date);
-
-		return ((date - this) / Date.units[resolution || 'day'](3, 3)).round(); // non-leap year, 30-day month
-	},
-
-	getLastDayOfMonth: function(){
-		return Date.daysInMonth(this.get('mo'), this.get('year'));
-	},
-
-	getDayOfYear: function(){
-		return (Date.UTC(this.get('year'), this.get('mo'), this.get('date') + 1)
-			- Date.UTC(this.get('year'), 0, 1)) / Date.units.day();
-	},
-
-	setDay: function(day, firstDayOfWeek){
-		if (firstDayOfWeek == null){
-			firstDayOfWeek = Date.getMsg('firstDayOfWeek');
-			if (firstDayOfWeek === '') firstDayOfWeek = 1;
-		}
-
-		day = (7 + Date.parseDay(day, true) - firstDayOfWeek) % 7;
-		var currentDay = (7 + this.get('day') - firstDayOfWeek) % 7;
-
-		return this.increment('day', day - currentDay);
-	},
-
-	getWeek: function(firstDayOfWeek){
-		if (firstDayOfWeek == null){
-			firstDayOfWeek = Date.getMsg('firstDayOfWeek');
-			if (firstDayOfWeek === '') firstDayOfWeek = 1;
-		}
-
-		var date = this,
-			dayOfWeek = (7 + date.get('day') - firstDayOfWeek) % 7,
-			dividend = 0,
-			firstDayOfYear;
-
-		if (firstDayOfWeek == 1){
-			// ISO-8601, week belongs to year that has the most days of the week (i.e. has the thursday of the week)
-			var month = date.get('month'),
-				startOfWeek = date.get('date') - dayOfWeek;
-
-			if (month == 11 && startOfWeek > 28) return 1; // Week 1 of next year
-
-			if (month == 0 && startOfWeek < -2){
-				// Use a date from last year to determine the week
-				date = new Date(date).decrement('day', dayOfWeek);
-				dayOfWeek = 0;
-			}
-
-			firstDayOfYear = new Date(date.get('year'), 0, 1).get('day') || 7;
-			if (firstDayOfYear > 4) dividend = -7; // First week of the year is not week 1
-		} else {
-			// In other cultures the first week of the year is always week 1 and the last week always 53 or 54.
-			// Days in the same week can have a different weeknumber if the week spreads across two years.
-			firstDayOfYear = new Date(date.get('year'), 0, 1).get('day');
-		}
-
-		dividend += date.get('dayofyear');
-		dividend += 6 - dayOfWeek; // Add days so we calculate the current date's week as a full week
-		dividend += (7 + firstDayOfYear - firstDayOfWeek) % 7; // Make up for first week of the year not being a full week
-
-		return (dividend / 7);
-	},
-
-	getOrdinal: function(day){
-		return Date.getMsg('ordinal', day || this.get('date'));
-	},
-
-	getTimezone: function(){
-		return this.toString()
-			.replace(/^.*? ([A-Z]{3}).[0-9]{4}.*$/, '$1')
-			.replace(/^.*?\(([A-Z])[a-z]+ ([A-Z])[a-z]+ ([A-Z])[a-z]+\)$/, '$1$2$3');
-	},
-
-	getGMTOffset: function(){
-		var off = this.get('timezoneOffset');
-		return ((off > 0) ? '-' : '+') + pad((off.abs() / 60).floor(), 2) + pad(off % 60, 2);
-	},
-
-	setAMPM: function(ampm){
-		ampm = ampm.toUpperCase();
-		var hr = this.get('hr');
-		if (hr > 11 && ampm == 'AM') return this.decrement('hour', 12);
-		else if (hr < 12 && ampm == 'PM') return this.increment('hour', 12);
-		return this;
-	},
-
-	getAMPM: function(){
-		return (this.get('hr') < 12) ? 'AM' : 'PM';
-	},
-
-	parse: function(str){
-		this.set('time', Date.parse(str));
-		return this;
-	},
-
-	isValid: function(date){
-		if (!date) date = this;
-		return typeOf(date) == 'date' && !isNaN(date.valueOf());
-	},
-
-	format: function(format){
-		if (!this.isValid()) return 'invalid date';
-
-		if (!format) format = '%x %X';
-		if (typeof format == 'string') format = formats[format.toLowerCase()] || format;
-		if (typeof format == 'function') return format(this);
-
-		var d = this;
-		return format.replace(/%([a-z%])/gi,
-			function($0, $1){
-				switch ($1){
-					case 'a': return Date.getMsg('days_abbr')[d.get('day')];
-					case 'A': return Date.getMsg('days')[d.get('day')];
-					case 'b': return Date.getMsg('months_abbr')[d.get('month')];
-					case 'B': return Date.getMsg('months')[d.get('month')];
-					case 'c': return d.format('%a %b %d %H:%M:%S %Y');
-					case 'd': return pad(d.get('date'), 2);
-					case 'e': return pad(d.get('date'), 2, ' ');
-					case 'H': return pad(d.get('hr'), 2);
-					case 'I': return pad((d.get('hr') % 12) || 12, 2);
-					case 'j': return pad(d.get('dayofyear'), 3);
-					case 'k': return pad(d.get('hr'), 2, ' ');
-					case 'l': return pad((d.get('hr') % 12) || 12, 2, ' ');
-					case 'L': return pad(d.get('ms'), 3);
-					case 'm': return pad((d.get('mo') + 1), 2);
-					case 'M': return pad(d.get('min'), 2);
-					case 'o': return d.get('ordinal');
-					case 'p': return Date.getMsg(d.get('ampm'));
-					case 's': return Math.round(d / 1000);
-					case 'S': return pad(d.get('seconds'), 2);
-					case 'T': return d.format('%H:%M:%S');
-					case 'U': return pad(d.get('week'), 2);
-					case 'w': return d.get('day');
-					case 'x': return d.format(Date.getMsg('shortDate'));
-					case 'X': return d.format(Date.getMsg('shortTime'));
-					case 'y': return d.get('year').toString().substr(2);
-					case 'Y': return d.get('year');
-					case 'z': return d.get('GMTOffset');
-					case 'Z': return d.get('Timezone');
-				}
-				return $1;
-			}
-		);
-	},
-
-	toISOString: function(){
-		return this.format('iso8601');
-	}
-
-}).alias({
-	toJSON: 'toISOString',
-	compare: 'diff',
-	strftime: 'format'
-});
-
-// The day and month abbreviations are standardized, so we cannot use simply %a and %b because they will get localized
-var rfcDayAbbr = ['Sun', 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat'],
-	rfcMonthAbbr = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
-
-var formats = {
-	db: '%Y-%m-%d %H:%M:%S',
-	compact: '%Y%m%dT%H%M%S',
-	'short': '%d %b %H:%M',
-	'long': '%B %d, %Y %H:%M',
-	rfc822: function(date){
-		return rfcDayAbbr[date.get('day')] + date.format(', %d ') + rfcMonthAbbr[date.get('month')] + date.format(' %Y %H:%M:%S %Z');
-	},
-	rfc2822: function(date){
-		return rfcDayAbbr[date.get('day')] + date.format(', %d ') + rfcMonthAbbr[date.get('month')] + date.format(' %Y %H:%M:%S %z');
-	},
-	iso8601: function(date){
-		return (
-			date.getUTCFullYear() + '-' +
-			pad(date.getUTCMonth() + 1, 2) + '-' +
-			pad(date.getUTCDate(), 2) + 'T' +
-			pad(date.getUTCHours(), 2) + ':' +
-			pad(date.getUTCMinutes(), 2) + ':' +
-			pad(date.getUTCSeconds(), 2) + '.' +
-			pad(date.getUTCMilliseconds(), 3) + 'Z'
-		);
-	}
-};
-
-var parsePatterns = [],
-	nativeParse = Date.parse;
-
-var parseWord = function(type, word, num){
-	var ret = -1,
-		translated = Date.getMsg(type + 's');
-	switch (typeOf(word)){
-		case 'object':
-			ret = translated[word.get(type)];
-			break;
-		case 'number':
-			ret = translated[word];
-			if (!ret) throw new Error('Invalid ' + type + ' index: ' + word);
-			break;
-		case 'string':
-			var match = translated.filter(function(name){
-				return this.test(name);
-			}, new RegExp('^' + word, 'i'));
-			if (!match.length) throw new Error('Invalid ' + type + ' string');
-			if (match.length > 1) throw new Error('Ambiguous ' + type);
-			ret = match[0];
-	}
-
-	return (num) ? translated.indexOf(ret) : ret;
-};
-
-var startCentury = 1900,
-	startYear = 70;
-
-Date.extend({
-
-	getMsg: function(key, args){
-		return Locale.get('Date.' + key, args);
-	},
-
-	units: {
-		ms: Function.convert(1),
-		second: Function.convert(1000),
-		minute: Function.convert(60000),
-		hour: Function.convert(3600000),
-		day: Function.convert(86400000),
-		week: Function.convert(608400000),
-		month: function(month, year){
-			var d = new Date;
-			return Date.daysInMonth(month != null ? month : d.get('mo'), year != null ? year : d.get('year')) * 86400000;
-		},
-		year: function(year){
-			year = year || new Date().get('year');
-			return Date.isLeapYear(year) ? 31622400000 : 31536000000;
-		}
-	},
-
-	daysInMonth: function(month, year){
-		return [31, Date.isLeapYear(year) ? 29 : 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31][month];
-	},
-
-	isLeapYear: function(year){
-		return ((year % 4 === 0) && (year % 100 !== 0)) || (year % 400 === 0);
-	},
-
-	parse: function(from){
-		var t = typeOf(from);
-		if (t == 'number') return new Date(from);
-		if (t != 'string') return from;
-		from = from.clean();
-		if (!from.length) return null;
-
-		var parsed;
-		parsePatterns.some(function(pattern){
-			var bits = pattern.re.exec(from);
-			return (bits) ? (parsed = pattern.handler(bits)) : false;
-		});
-
-		if (!(parsed && parsed.isValid())){
-			parsed = new Date(nativeParse(from));
-			if (!(parsed && parsed.isValid())) parsed = new Date(from.toInt());
-		}
-		return parsed;
-	},
-
-	parseDay: function(day, num){
-		return parseWord('day', day, num);
-	},
-
-	parseMonth: function(month, num){
-		return parseWord('month', month, num);
-	},
-
-	parseUTC: function(value){
-		var localDate = new Date(value);
-		var utcSeconds = Date.UTC(
-			localDate.get('year'),
-			localDate.get('mo'),
-			localDate.get('date'),
-			localDate.get('hr'),
-			localDate.get('min'),
-			localDate.get('sec'),
-			localDate.get('ms')
-		);
-		return new Date(utcSeconds);
-	},
-
-	orderIndex: function(unit){
-		return Date.getMsg('dateOrder').indexOf(unit) + 1;
-	},
-
-	defineFormat: function(name, format){
-		formats[name] = format;
-		return this;
-	},
-
-	
-
-	defineParser: function(pattern){
-		parsePatterns.push((pattern.re && pattern.handler) ? pattern : build(pattern));
-		return this;
-	},
-
-	defineParsers: function(){
-		Array.flatten(arguments).each(Date.defineParser);
-		return this;
-	},
-
-	define2DigitYearStart: function(year){
-		startYear = year % 100;
-		startCentury = year - startYear;
-		return this;
-	}
-
-}).extend({
-	defineFormats: Date.defineFormat.overloadSetter()
-});
-
-var regexOf = function(type){
-	return new RegExp('(?:' + Date.getMsg(type).map(function(name){
-		return name.substr(0, 3);
-	}).join('|') + ')[a-z]*');
-};
-
-var replacers = function(key){
-	switch (key){
-		case 'T':
-			return '%H:%M:%S';
-		case 'x': // iso8601 covers yyyy-mm-dd, so just check if month is first
-			return ((Date.orderIndex('month') == 1) ? '%m[-./]%d' : '%d[-./]%m') + '([-./]%y)?';
-		case 'X':
-			return '%H([.:]%M)?([.:]%S([.:]%s)?)? ?%p? ?%z?';
-	}
-	return null;
-};
-
-var keys = {
-	d: /[0-2]?[0-9]|3[01]/,
-	H: /[01]?[0-9]|2[0-3]/,
-	I: /0?[1-9]|1[0-2]/,
-	M: /[0-5]?\d/,
-	s: /\d+/,
-	o: /[a-z]*/,
-	p: /[ap]\.?m\.?/,
-	y: /\d{2}|\d{4}/,
-	Y: /\d{4}/,
-	z: /Z|[+-]\d{2}(?::?\d{2})?/
-};
-
-keys.m = keys.I;
-keys.S = keys.M;
-
-var currentLanguage;
-
-var recompile = function(language){
-	currentLanguage = language;
-
-	keys.a = keys.A = regexOf('days');
-	keys.b = keys.B = regexOf('months');
-
-	parsePatterns.each(function(pattern, i){
-		if (pattern.format) parsePatterns[i] = build(pattern.format);
-	});
-};
-
-var build = function(format){
-	if (!currentLanguage) return {format: format};
-
-	var parsed = [];
-	var re = (format.source || format) // allow format to be regex
-	.replace(/%([a-z])/gi,
-		function($0, $1){
-			return replacers($1) || $0;
-		}
-	).replace(/\((?!\?)/g, '(?:') // make all groups non-capturing
-	.replace(/ (?!\?|\*)/g, ',? ') // be forgiving with spaces and commas
-	.replace(/%([a-z%])/gi,
-		function($0, $1){
-			var p = keys[$1];
-			if (!p) return $1;
-			parsed.push($1);
-			return '(' + p.source + ')';
-		}
-	).replace(/\[a-z\]/gi, '[a-z\\u00c0-\\uffff;\&]'); // handle unicode words
-
-	return {
-		format: format,
-		re: new RegExp('^' + re + '$', 'i'),
-		handler: function(bits){
-			bits = bits.slice(1).associate(parsed);
-			var date = new Date().clearTime(),
-				year = bits.y || bits.Y;
-
-			if (year != null) handle.call(date, 'y', year); // need to start in the right year
-			if ('d' in bits) handle.call(date, 'd', 1);
-			if ('m' in bits || bits.b || bits.B) handle.call(date, 'm', 1);
-
-			for (var key in bits) handle.call(date, key, bits[key]);
-			return date;
-		}
-	};
-};
-
-var handle = function(key, value){
-	if (!value) return this;
-
-	switch (key){
-		case 'a': case 'A': return this.set('day', Date.parseDay(value, true));
-		case 'b': case 'B': return this.set('mo', Date.parseMonth(value, true));
-		case 'd': return this.set('date', value);
-		case 'H': case 'I': return this.set('hr', value);
-		case 'm': return this.set('mo', value - 1);
-		case 'M': return this.set('min', value);
-		case 'p': return this.set('ampm', value.replace(/\./g, ''));
-		case 'S': return this.set('sec', value);
-		case 's': return this.set('ms', ('0.' + value) * 1000);
-		case 'w': return this.set('day', value);
-		case 'Y': return this.set('year', value);
-		case 'y':
-			value = +value;
-			if (value < 100) value += startCentury + (value < startYear ? 100 : 0);
-			return this.set('year', value);
-		case 'z':
-			if (value == 'Z') value = '+00';
-			var offset = value.match(/([+-])(\d{2}):?(\d{2})?/);
-			offset = (offset[1] + '1') * (offset[2] * 60 + (+offset[3] || 0)) + this.getTimezoneOffset();
-			return this.set('time', this - offset * 60000);
-	}
-
-	return this;
-};
-
-Date.defineParsers(
-	'%Y([-./]%m([-./]%d((T| )%X)?)?)?', // "1999-12-31", "1999-12-31 11:59pm", "1999-12-31 23:59:59", ISO8601
-	'%Y%m%d(T%H(%M%S?)?)?', // "19991231", "19991231T1159", compact
-	'%x( %X)?', // "12/31", "12.31.99", "12-31-1999", "12/31/2008 11:59 PM"
-	'%d%o( %b( %Y)?)?( %X)?', // "31st", "31st December", "31 Dec 1999", "31 Dec 1999 11:59pm"
-	'%b( %d%o)?( %Y)?( %X)?', // Same as above with month and day switched
-	'%Y %b( %d%o( %X)?)?', // Same as above with year coming first
-	'%o %b %d %X %z %Y', // "Thu Oct 22 08:11:23 +0000 2009"
-	'%T', // %H:%M:%S
-	'%H:%M( ?%p)?' // "11:05pm", "11:05 am" and "11:05"
-);
-
-Locale.addEvent('change', function(language){
-	if (Locale.get('Date')) recompile(language);
-}).fireEvent('change', Locale.getCurrent());
-
-})();
-
-/*
----
-
-name: Locale.en-US.Form.Validator
-
-description: Form Validator messages for English.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Locale
-
-provides: [Locale.en-US.Form.Validator]
-
-...
-*/
-
-Locale.define('en-US', 'FormValidator', {
-
-	required: 'This field is required.',
-	length: 'Please enter {length} characters (you entered {elLength} characters)',
-	minLength: 'Please enter at least {minLength} characters (you entered {length} characters).',
-	maxLength: 'Please enter no more than {maxLength} characters (you entered {length} characters).',
-	integer: 'Please enter an integer in this field. Numbers with decimals (e.g. 1.25) are not permitted.',
-	numeric: 'Please enter only numeric values in this field (i.e. "1" or "1.1" or "-1" or "-1.1").',
-	digits: 'Please use numbers and punctuation only in this field (for example, a phone number with dashes or dots is permitted).',
-	alpha: 'Please use only letters (a-z) within this field. No spaces or other characters are allowed.',
-	alphanum: 'Please use only letters (a-z) or numbers (0-9) in this field. No spaces or other characters are allowed.',
-	dateSuchAs: 'Please enter a valid date such as {date}',
-	dateInFormatMDY: 'Please enter a valid date such as MM/DD/YYYY (i.e. "12/31/1999")',
-	email: 'Please enter a valid email address. For example "fred@domain.com".',
-	url: 'Please enter a valid URL such as http://www.example.com.',
-	currencyDollar: 'Please enter a valid $ amount. For example $100.00 .',
-	oneRequired: 'Please enter something for at least one of these inputs.',
-	errorPrefix: 'Error: ',
-	warningPrefix: 'Warning: ',
-
-	// Form.Validator.Extras
-	noSpace: 'There can be no spaces in this input.',
-	reqChkByNode: 'No items are selected.',
-	requiredChk: 'This field is required.',
-	reqChkByName: 'Please select a {label}.',
-	match: 'This field needs to match the {matchName} field',
-	startDate: 'the start date',
-	endDate: 'the end date',
-	currentDate: 'the current date',
-	afterDate: 'The date should be the same or after {label}.',
-	beforeDate: 'The date should be the same or before {label}.',
-	startMonth: 'Please select a start month',
-	sameMonth: 'These two dates must be in the same month - you must change one or the other.',
-	creditcard: 'The credit card number entered is invalid. Please check the number and try again. {length} digits entered.'
-
-});
-
-/*
----
-
-script: Form.Validator.js
-
-name: Form.Validator
-
-description: A css-class based form validation system.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Options
-  - Core/Events
-  - Core/Element.Delegation
-  - Core/Slick.Finder
-  - Core/Element.Event
-  - Core/Element.Style
-  - Core/JSON
-  - Locale
-  - Class.Binds
-  - Date
-  - Element.Forms
-  - Locale.en-US.Form.Validator
-  - Element.Shortcuts
-
-provides: [Form.Validator, InputValidator, FormValidator.BaseValidators]
-
-...
-*/
-if (!window.Form) window.Form = {};
-
-var InputValidator = this.InputValidator = new Class({
-
-	Implements: [Options],
-
-	options: {
-		errorMsg: 'Validation failed.',
-		test: Function.convert(true)
-	},
-
-	initialize: function(className, options){
-		this.setOptions(options);
-		this.className = className;
-	},
-
-	test: function(field, props){
-		field = document.id(field);
-		return (field) ? this.options.test(field, props || this.getProps(field)) : false;
-	},
-
-	getError: function(field, props){
-		field = document.id(field);
-		var err = this.options.errorMsg;
-		if (typeOf(err) == 'function') err = err(field, props || this.getProps(field));
-		return err;
-	},
-
-	getProps: function(field){
-		field = document.id(field);
-		return (field) ? field.get('validatorProps') : {};
-	}
-
-});
-
-Element.Properties.validators = {
-
-	get: function(){
-		return (this.get('data-validators') || this.className).clean().replace(/'(\\.|[^'])*'|"(\\.|[^"])*"/g, function(match){
-			return match.replace(' ', '\\x20');
-		}).split(' ');
-	}
-
-};
-
-Element.Properties.validatorProps = {
-
-	set: function(props){
-		return this.eliminate('$moo:validatorProps').store('$moo:validatorProps', props);
-	},
-
-	get: function(props){
-		if (props) this.set(props);
-		if (this.retrieve('$moo:validatorProps')) return this.retrieve('$moo:validatorProps');
-		if (this.getProperty('data-validator-properties') || this.getProperty('validatorProps')){
-			try {
-				this.store('$moo:validatorProps', JSON.decode(this.getProperty('validatorProps') || this.getProperty('data-validator-properties'), false));
-			} catch (e){
-				return {};
-			}
-		} else {
-			var vals = this.get('validators').filter(function(cls){
-				return cls.test(':');
-			});
-			if (!vals.length){
-				this.store('$moo:validatorProps', {});
-			} else {
-				props = {};
-				vals.each(function(cls){
-					var split = cls.split(':');
-					if (split[1]){
-						try {
-							props[split[0]] = JSON.decode(split[1], false);
-						} catch (e){}
-					}
-				});
-				this.store('$moo:validatorProps', props);
-			}
-		}
-		return this.retrieve('$moo:validatorProps');
-	}
-
-};
-
-Form.Validator = new Class({
-
-	Implements: [Options, Events],
-
-	options: {/*
-		onFormValidate: function(isValid, form, event){},
-		onElementValidate: function(isValid, field, className, warn){},
-		onElementPass: function(field){},
-		onElementFail: function(field, validatorsFailed){}, */
-		fieldSelectors: 'input, select, textarea',
-		ignoreHidden: true,
-		ignoreDisabled: true,
-		useTitles: false,
-		evaluateOnSubmit: true,
-		evaluateFieldsOnBlur: true,
-		evaluateFieldsOnChange: true,
-		serial: true,
-		stopOnFailure: true,
-		warningPrefix: function(){
-			return Form.Validator.getMsg('warningPrefix') || 'Warning: ';
-		},
-		errorPrefix: function(){
-			return Form.Validator.getMsg('errorPrefix') || 'Error: ';
-		}
-	},
-
-	initialize: function(form, options){
-		this.setOptions(options);
-		this.element = document.id(form);
-		this.warningPrefix = Function.convert(this.options.warningPrefix)();
-		this.errorPrefix = Function.convert(this.options.errorPrefix)();
-		this._bound = {
-			onSubmit: this.onSubmit.bind(this),
-			blurOrChange: function(event, field){
-				this.validationMonitor(field, true);
-			}.bind(this)
-		};
-		this.enable();
-	},
-
-	toElement: function(){
-		return this.element;
-	},
-
-	getFields: function(){
-		return (this.fields = this.element.getElements(this.options.fieldSelectors));
-	},
-
-	enable: function(){
-		this.element.store('validator', this);
-		if (this.options.evaluateOnSubmit) this.element.addEvent('submit', this._bound.onSubmit);
-		if (this.options.evaluateFieldsOnBlur){
-			this.element.addEvent('blur:relay(input,select,textarea)', this._bound.blurOrChange);
-		}
-		if (this.options.evaluateFieldsOnChange){
-			this.element.addEvent('change:relay(input,select,textarea)', this._bound.blurOrChange);
-		}
-	},
-
-	disable: function(){
-		this.element.eliminate('validator');
-		this.element.removeEvents({
-			submit: this._bound.onSubmit,
-			'blur:relay(input,select,textarea)': this._bound.blurOrChange,
-			'change:relay(input,select,textarea)': this._bound.blurOrChange
-		});
-	},
-
-	validationMonitor: function(){
-		clearTimeout(this.timer);
-		this.timer = this.validateField.delay(50, this, arguments);
-	},
-
-	onSubmit: function(event){
-		if (this.validate(event)) this.reset();
-	},
-
-	reset: function(){
-		this.getFields().each(this.resetField, this);
-		return this;
-	},
-
-	validate: function(event){
-		var result = this.getFields().map(function(field){
-			return this.validateField(field, true);
-		}, this).every(function(v){
-			return v;
-		});
-		this.fireEvent('formValidate', [result, this.element, event]);
-		if (this.options.stopOnFailure && !result && event) event.preventDefault();
-		return result;
-	},
-
-	validateField: function(field, force){
-		if (this.paused) return true;
-		field = document.id(field);
-		var passed = !field.hasClass('validation-failed');
-		var failed, warned;
-		if (this.options.serial && !force){
-			failed = this.element.getElement('.validation-failed');
-			warned = this.element.getElement('.warning');
-		}
-		if (field && (!failed || force || field.hasClass('validation-failed') || (failed && !this.options.serial))){
-			var validationTypes = field.get('validators');
-			var validators = validationTypes.some(function(cn){
-				return this.getValidator(cn);
-			}, this);
-			var validatorsFailed = [];
-			validationTypes.each(function(className){
-				if (className && !this.test(className, field)) validatorsFailed.include(className);
-			}, this);
-			passed = validatorsFailed.length === 0;
-			if (validators && !this.hasValidator(field, 'warnOnly')){
-				if (passed){
-					field.addClass('validation-passed').removeClass('validation-failed');
-					this.fireEvent('elementPass', [field]);
-				} else {
-					field.addClass('validation-failed').removeClass('validation-passed');
-					this.fireEvent('elementFail', [field, validatorsFailed]);
-				}
-			}
-			if (!warned){
-				var warnings = validationTypes.some(function(cn){
-					if (cn.test('^warn'))
-						return this.getValidator(cn.replace(/^warn-/,''));
-					else return null;
-				}, this);
-				field.removeClass('warning');
-				var warnResult = validationTypes.map(function(cn){
-					if (cn.test('^warn'))
-						return this.test(cn.replace(/^warn-/,''), field, true);
-					else return null;
-				}, this);
-			}
-		}
-		return passed;
-	},
-
-	test: function(className, field, warn){
-		field = document.id(field);
-		if ((this.options.ignoreHidden && !field.isVisible()) || (this.options.ignoreDisabled && field.get('disabled'))) return true;
-		var validator = this.getValidator(className);
-		if (warn != null) warn = false;
-		if (this.hasValidator(field, 'warnOnly')) warn = true;
-		var isValid = field.hasClass('ignoreValidation') || (validator ? validator.test(field) : true);
-		if (validator) this.fireEvent('elementValidate', [isValid, field, className, warn]);
-		if (warn) return true;
-		return isValid;
-	},
-
-	hasValidator: function(field, value){
-		return field.get('validators').contains(value);
-	},
-
-	resetField: function(field){
-		field = document.id(field);
-		if (field){
-			field.get('validators').each(function(className){
-				if (className.test('^warn-')) className = className.replace(/^warn-/, '');
-				field.removeClass('validation-failed');
-				field.removeClass('warning');
-				field.removeClass('validation-passed');
-			}, this);
-		}
-		return this;
-	},
-
-	stop: function(){
-		this.paused = true;
-		return this;
-	},
-
-	start: function(){
-		this.paused = false;
-		return this;
-	},
-
-	ignoreField: function(field, warn){
-		field = document.id(field);
-		if (field){
-			this.enforceField(field);
-			if (warn) field.addClass('warnOnly');
-			else field.addClass('ignoreValidation');
-		}
-		return this;
-	},
-
-	enforceField: function(field){
-		field = document.id(field);
-		if (field) field.removeClass('warnOnly').removeClass('ignoreValidation');
-		return this;
-	}
-
-});
-
-Form.Validator.getMsg = function(key){
-	return Locale.get('FormValidator.' + key);
-};
-
-Form.Validator.adders = {
-
-	validators:{},
-
-	add : function(className, options){
-		this.validators[className] = new InputValidator(className, options);
-		//if this is a class (this method is used by instances of Form.Validator and the Form.Validator namespace)
-		//extend these validators into it
-		//this allows validators to be global and/or per instance
-		if (!this.initialize){
-			this.implement({
-				validators: this.validators
-			});
-		}
-	},
-
-	addAllThese : function(validators){
-		Array.convert(validators).each(function(validator){
-			this.add(validator[0], validator[1]);
-		}, this);
-	},
-
-	getValidator: function(className){
-		return this.validators[className.split(':')[0]];
-	}
-
-};
-
-Object.append(Form.Validator, Form.Validator.adders);
-
-Form.Validator.implement(Form.Validator.adders);
-
-Form.Validator.add('IsEmpty', {
-
-	errorMsg: false,
-	test: function(element){
-		if (element.type == 'select-one' || element.type == 'select')
-			return !(element.selectedIndex >= 0 && element.options[element.selectedIndex].value != '');
-		else
-			return ((element.get('value') == null) || (element.get('value').length == 0));
-	}
-
-});
-
-Form.Validator.addAllThese([
-
-	['required', {
-		errorMsg: function(){
-			return Form.Validator.getMsg('required');
-		},
-		test: function(element){
-			return !Form.Validator.getValidator('IsEmpty').test(element);
-		}
-	}],
-
-	['length', {
-		errorMsg: function(element, props){
-			if (typeOf(props.length) != 'null')
-				return Form.Validator.getMsg('length').substitute({length: props.length, elLength: element.get('value').length});
-			else return '';
-		},
-		test: function(element, props){
-			if (typeOf(props.length) != 'null') return (element.get('value').length == props.length || element.get('value').length == 0);
-			else return true;
-		}
-	}],
-
-	['minLength', {
-		errorMsg: function(element, props){
-			if (typeOf(props.minLength) != 'null')
-				return Form.Validator.getMsg('minLength').substitute({minLength: props.minLength, length: element.get('value').length});
-			else return '';
-		},
-		test: function(element, props){
-			if (typeOf(props.minLength) != 'null') return (element.get('value').length >= (props.minLength || 0));
-			else return true;
-		}
-	}],
-
-	['maxLength', {
-		errorMsg: function(element, props){
-			//props is {maxLength:10}
-			if (typeOf(props.maxLength) != 'null')
-				return Form.Validator.getMsg('maxLength').substitute({maxLength: props.maxLength, length: element.get('value').length});
-			else return '';
-		},
-		test: function(element, props){
-			return element.get('value').length <= (props.maxLength || 10000);
-		}
-	}],
-
-	['validate-integer', {
-		errorMsg: Form.Validator.getMsg.pass('integer'),
-		test: function(element){
-			return Form.Validator.getValidator('IsEmpty').test(element) || (/^(-?[1-9]\d*|0)$/).test(element.get('value'));
-		}
-	}],
-
-	['validate-numeric', {
-		errorMsg: Form.Validator.getMsg.pass('numeric'),
-		test: function(element){
-			return Form.Validator.getValidator('IsEmpty').test(element) ||
-				(/^-?(?:0$0(?=\d*\.)|[1-9]|0)\d*(\.\d+)?$/).test(element.get('value'));
-		}
-	}],
-
-	['validate-digits', {
-		errorMsg: Form.Validator.getMsg.pass('digits'),
-		test: function(element){
-			return Form.Validator.getValidator('IsEmpty').test(element) || (/^[\d() .:\-\+#]+$/.test(element.get('value')));
-		}
-	}],
-
-	['validate-alpha', {
-		errorMsg: Form.Validator.getMsg.pass('alpha'),
-		test: function(element){
-			return Form.Validator.getValidator('IsEmpty').test(element) || (/^[a-zA-Z]+$/).test(element.get('value'));
-		}
-	}],
-
-	['validate-alphanum', {
-		errorMsg: Form.Validator.getMsg.pass('alphanum'),
-		test: function(element){
-			return Form.Validator.getValidator('IsEmpty').test(element) || !(/\W/).test(element.get('value'));
-		}
-	}],
-
-	['validate-date', {
-		errorMsg: function(element, props){
-			if (Date.parse){
-				var format = props.dateFormat || '%x';
-				return Form.Validator.getMsg('dateSuchAs').substitute({date: new Date().format(format)});
-			} else {
-				return Form.Validator.getMsg('dateInFormatMDY');
-			}
-		},
-		test: function(element, props){
-			if (Form.Validator.getValidator('IsEmpty').test(element)) return true;
-			var dateLocale = Locale.get('Date'),
-				dateNouns = new RegExp([dateLocale.days, dateLocale.days_abbr, dateLocale.months, dateLocale.months_abbr, dateLocale.AM, dateLocale.PM].flatten().join('|'), 'i'),
-				value = element.get('value'),
-				wordsInValue = value.match(/[a-z]+/gi);
-
-			if (wordsInValue && !wordsInValue.every(dateNouns.exec, dateNouns)) return false;
-
-			var date = Date.parse(value);
-			if (!date) return false;
-
-			var format = props.dateFormat || '%x',
-				formatted = date.format(format);
-			if (formatted != 'invalid date') element.set('value', formatted);
-			return date.isValid();
-		}
-	}],
-
-	['validate-email', {
-		errorMsg: Form.Validator.getMsg.pass('email'),
-		test: function(element){
-			/*
-			var chars = "[a-z0-9!#$%&'*+/=?^_`{|}~-]",
-				local = '(?:' + chars + '\\.?){0,63}' + chars,
-
-				label = '[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?',
-				hostname = '(?:' + label + '\\.)*' + label;
-
-				octet = '(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)',
-				ipv4 = '\\[(?:' + octet + '\\.){3}' + octet + '\\]',
-
-				domain = '(?:' + hostname + '|' + ipv4 + ')';
-
-			var regex = new RegExp('^' + local + '@' + domain + '$', 'i');
-			*/
-			return Form.Validator.getValidator('IsEmpty').test(element) || (/^(?:[a-z0-9!#$%&'*+\/=?^_`{|}~-]\.?){0,63}[a-z0-9!#$%&'*+\/=?^_`{|}~-]@(?:(?:[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.)*[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\])$/i).test(element.get('value'));
-		}
-	}],
-
-	['validate-url', {
-		errorMsg: Form.Validator.getMsg.pass('url'),
-		test: function(element){
-			return Form.Validator.getValidator('IsEmpty').test(element) || (/^(https?|ftp|rmtp|mms):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i).test(element.get('value'));
-		}
-	}],
-
-	['validate-currency-dollar', {
-		errorMsg: Form.Validator.getMsg.pass('currencyDollar'),
-		test: function(element){
-			return Form.Validator.getValidator('IsEmpty').test(element) || (/^\$?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/).test(element.get('value'));
-		}
-	}],
-
-	['validate-one-required', {
-		errorMsg: Form.Validator.getMsg.pass('oneRequired'),
-		test: function(element, props){
-			var p = document.id(props['validate-one-required']) || element.getParent(props['validate-one-required']);
-			return p.getElements('input').some(function(el){
-				if (['checkbox', 'radio'].contains(el.get('type'))) return el.get('checked');
-				return el.get('value');
-			});
-		}
-	}]
-
-]);
-
-Element.Properties.validator = {
-
-	set: function(options){
-		this.get('validator').setOptions(options);
-	},
-
-	get: function(){
-		var validator = this.retrieve('validator');
-		if (!validator){
-			validator = new Form.Validator(this);
-			this.store('validator', validator);
-		}
-		return validator;
-	}
-
-};
-
-Element.implement({
-
-	validate: function(options){
-		if (options) this.set('validator', options);
-		return this.get('validator').validate();
-	}
-
-});
-
-
-
-
-
-
-/*
----
-
-script: Form.Validator.Extras.js
-
-name: Form.Validator.Extras
-
-description: Additional validators for the Form.Validator class.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Form.Validator
-
-provides: [Form.Validator.Extras]
-
-...
-*/
-
-(function(){
-
-function getItems(props, preference, children, cssSelector){
-	if (preference && props[preference]) return props[preference];
-	var el = document.id(props[children]);
-	if (!el) return [];
-	return el.getElements(cssSelector);
-}
-
-Form.Validator.addAllThese([
-
-	['validate-enforce-oncheck', {
-		test: function(element, props){
-			var fv = element.getParent('form').retrieve('validator');
-			if (!fv) return true;
-			getItems(props, 'toEnforce', 'enforceChildrenOf', 'input, select, textarea').each(function(item){
-				if (element.checked){
-					fv.enforceField(item);
-				} else {
-					fv.ignoreField(item);
-					fv.resetField(item);
-				}
-			});
-			return true;
-		}
-	}],
-
-	['validate-ignore-oncheck', {
-		test: function(element, props){
-			var fv = element.getParent('form').retrieve('validator');
-			if (!fv) return true;
-			getItems(props, 'toIgnore', 'ignoreChildrenOf', 'input, select, textarea').each(function(item){
-				if (element.checked){
-					fv.ignoreField(item);
-					fv.resetField(item);
-				} else {
-					fv.enforceField(item);
-				}
-			});
-			return true;
-		}
-	}],
-
-	['validate-enforce-onselect-value', {
-		test: function(element, props){
-			if (!props.value) return true;
-			var fv = element.getParent('form').retrieve('validator');
-			if (!fv) return true;
-			getItems(props, 'toEnforce', 'enforceChildrenOf', 'input, select, textarea').each(function(item){
-				if (props.value == element.value){
-					fv.enforceField(item);
-				} else {
-					fv.ignoreField(item);
-					fv.resetField(item);
-				}
-			});
-			return true;
-		}
-	}],
-
-	['validate-nospace', {
-		errorMsg: function(){
-			return Form.Validator.getMsg('noSpace');
-		},
-		test: function(element, props){
-			return !element.get('value').test(/\s/);
-		}
-	}],
-
-	['validate-toggle-oncheck', {
-		test: function(element, props){
-			var fv = element.getParent('form').retrieve('validator');
-			if (!fv) return true;
-			var eleArr = getItems(props, 'toToggle', 'toToggleChildrenOf', 'input, select, textarea');
-			if (!element.checked){
-				eleArr.each(function(item){
-					fv.ignoreField(item);
-					fv.resetField(item);
-				});
-			} else {
-				eleArr.each(function(item){
-					fv.enforceField(item);
-				});
-			}
-			return true;
-		}
-	}],
-
-	['validate-reqchk-bynode', {
-		errorMsg: function(){
-			return Form.Validator.getMsg('reqChkByNode');
-		},
-		test: function(element, props){
-			return getItems(props, false, 'nodeId', props.selector || 'input[type=checkbox], input[type=radio]').some(function(item){
-				return item.checked;
-			});
-		}
-	}],
-
-	['validate-required-check', {
-		errorMsg: function(element, props){
-			return props.useTitle ? element.get('title') : Form.Validator.getMsg('requiredChk');
-		},
-		test: function(element, props){
-			return !!element.checked;
-		}
-	}],
-
-	['validate-reqchk-byname', {
-		errorMsg: function(element, props){
-			return Form.Validator.getMsg('reqChkByName').substitute({label: props.label || element.get('type')});
-		},
-		test: function(element, props){
-			var grpName = props.groupName || element.get('name');
-			var grpNameEls = $$('[name=' + grpName +']');
-			var oneCheckedItem = grpNameEls.some(function(item, index){
-				return item.checked;
-			});
-			var fv = element.getParent('form').retrieve('validator');
-			if (oneCheckedItem && fv){
-				grpNameEls.each(function(item, index){ fv.resetField(item); });
-			}
-			return oneCheckedItem;
-		}
-	}],
-
-	['validate-match', {
-		errorMsg: function(element, props){
-			return Form.Validator.getMsg('match').substitute({matchName: decodeURIComponent((props.matchName+'').replace(/\+/g, '%20')) || document.id(props.matchInput).get('name')});
-		},
-		test: function(element, props){
-			var eleVal = element.get('value');
-			var matchVal = document.id(props.matchInput) && document.id(props.matchInput).get('value');
-			return eleVal && matchVal ? eleVal == matchVal : true;
-		}
-	}],
-
-	['validate-after-date', {
-		errorMsg: function(element, props){
-			return Form.Validator.getMsg('afterDate').substitute({
-				label: props.afterLabel || (props.afterElement ? Form.Validator.getMsg('startDate') : Form.Validator.getMsg('currentDate'))
-			});
-		},
-		test: function(element, props){
-			var start = document.id(props.afterElement) ? Date.parse(document.id(props.afterElement).get('value')) : new Date();
-			var end = Date.parse(element.get('value'));
-			return end && start ? end >= start : true;
-		}
-	}],
-
-	['validate-before-date', {
-		errorMsg: function(element, props){
-			return Form.Validator.getMsg('beforeDate').substitute({
-				label: props.beforeLabel || (props.beforeElement ? Form.Validator.getMsg('endDate') : Form.Validator.getMsg('currentDate'))
-			});
-		},
-		test: function(element, props){
-			var start = Date.parse(element.get('value'));
-			var end = document.id(props.beforeElement) ? Date.parse(document.id(props.beforeElement).get('value')) : new Date();
-			return end && start ? end >= start : true;
-		}
-	}],
-
-	['validate-custom-required', {
-		errorMsg: function(){
-			return Form.Validator.getMsg('required');
-		},
-		test: function(element, props){
-			return element.get('value') != props.emptyValue;
-		}
-	}],
-
-	['validate-same-month', {
-		errorMsg: function(element, props){
-			var startMo = document.id(props.sameMonthAs) && document.id(props.sameMonthAs).get('value');
-			var eleVal = element.get('value');
-			if (eleVal != '') return Form.Validator.getMsg(startMo ? 'sameMonth' : 'startMonth');
-		},
-		test: function(element, props){
-			var d1 = Date.parse(element.get('value'));
-			var d2 = Date.parse(document.id(props.sameMonthAs) && document.id(props.sameMonthAs).get('value'));
-			return d1 && d2 ? d1.format('%B') == d2.format('%B') : true;
-		}
-	}],
-
-
-	['validate-cc-num', {
-		errorMsg: function(element){
-			var ccNum = element.get('value').replace(/[^0-9]/g, '');
-			return Form.Validator.getMsg('creditcard').substitute({length: ccNum.length});
-		},
-		test: function(element){
-			// required is a different test
-			if (Form.Validator.getValidator('IsEmpty').test(element)) return true;
-
-			// Clean number value
-			var ccNum = element.get('value');
-			ccNum = ccNum.replace(/[^0-9]/g, '');
-
-			var validType = false;
-
-			if (ccNum.test(/^4[0-9]{12}([0-9]{3})?$/)) validType = 'Visa';
-			else if (ccNum.test(/^5[1-5]([0-9]{14})$/)) validType = 'Master Card';
-			else if (ccNum.test(/^3[47][0-9]{13}$/)) validType = 'American Express';
-			else if (ccNum.test(/^6(?:011|5[0-9]{2})[0-9]{12}$/)) validType = 'Discover';
-			else if (ccNum.test(/^3(?:0[0-5]|[68][0-9])[0-9]{11}$/)) validType = 'Diners Club';
-
-			if (validType){
-				var sum = 0;
-				var cur = 0;
-
-				for (var i=ccNum.length-1; i>=0; --i){
-					cur = ccNum.charAt(i).toInt();
-					if (cur == 0) continue;
-
-					if ((ccNum.length-i) % 2 == 0) cur += cur;
-					if (cur > 9){
-						cur = cur.toString().charAt(0).toInt() + cur.toString().charAt(1).toInt();
-					}
-
-					sum += cur;
-				}
-				if ((sum % 10) == 0) return true;
-			}
-
-			var chunks = '';
-			while (ccNum != ''){
-				chunks += ' ' + ccNum.substr(0,4);
-				ccNum = ccNum.substr(4);
-			}
-
-			element.getParent('form').retrieve('validator').ignoreField(element);
-			element.set('value', chunks.clean());
-			element.getParent('form').retrieve('validator').enforceField(element);
-			return false;
-		}
-	}]
-
-]);
-
-})();
-
-/*
----
-
-script: Form.Validator.Inline.js
-
-name: Form.Validator.Inline
-
-description: Extends Form.Validator to add inline messages.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Form.Validator
-
-provides: [Form.Validator.Inline]
-
-...
-*/
-
-Form.Validator.Inline = new Class({
-
-	Extends: Form.Validator,
-
-	options: {
-		showError: function(errorElement){
-			if (errorElement.reveal) errorElement.reveal();
-			else errorElement.setStyle('display', 'block');
-		},
-		hideError: function(errorElement){
-			if (errorElement.dissolve) errorElement.dissolve();
-			else errorElement.setStyle('display', 'none');
-		},
-		scrollToErrorsOnSubmit: true,
-		scrollToErrorsOnBlur: false,
-		scrollToErrorsOnChange: false,
-		scrollFxOptions: {
-			transition: 'quad:out',
-			offset: {
-				y: -20
-			}
-		}
-	},
-
-	initialize: function(form, options){
-		this.parent(form, options);
-		this.addEvent('onElementValidate', function(isValid, field, className, warn){
-			var validator = this.getValidator(className);
-			if (!isValid && validator.getError(field)){
-				if (warn) field.addClass('warning');
-				var advice = this.makeAdvice(className, field, validator.getError(field), warn);
-				this.insertAdvice(advice, field);
-				this.showAdvice(className, field);
-			} else {
-				this.hideAdvice(className, field);
-			}
-		});
-	},
-
-	makeAdvice: function(className, field, error, warn){
-		var errorMsg = (warn) ? this.warningPrefix : this.errorPrefix;
-		errorMsg += (this.options.useTitles) ? field.title || error:error;
-		var cssClass = (warn) ? 'warning-advice' : 'validation-advice';
-		var advice = this.getAdvice(className, field);
-		if (advice){
-			advice = advice.set('html', errorMsg);
-		} else {
-			advice = new Element('div', {
-				html: errorMsg,
-				styles: { display: 'none' },
-				id: 'advice-' + className.split(':')[0] + '-' + this.getFieldId(field)
-			}).addClass(cssClass);
-		}
-		field.store('$moo:advice-' + className, advice);
-		return advice;
-	},
-
-	getFieldId : function(field){
-		return field.id ? field.id : field.id = 'input_' + field.name;
-	},
-
-	showAdvice: function(className, field){
-		var advice = this.getAdvice(className, field);
-		if (
-			advice &&
-			!field.retrieve('$moo:' + this.getPropName(className)) &&
-			(
-				advice.getStyle('display') == 'none' ||
-				advice.getStyle('visibility') == 'hidden' ||
-				advice.getStyle('opacity') == 0
-			)
-		){
-			field.store('$moo:' + this.getPropName(className), true);
-			this.options.showError(advice);
-			this.fireEvent('showAdvice', [field, advice, className]);
-		}
-	},
-
-	hideAdvice: function(className, field){
-		var advice = this.getAdvice(className, field);
-		if (advice && field.retrieve('$moo:' + this.getPropName(className))){
-			field.store('$moo:' + this.getPropName(className), false);
-			this.options.hideError(advice);
-			this.fireEvent('hideAdvice', [field, advice, className]);
-		}
-	},
-
-	getPropName: function(className){
-		return 'advice' + className;
-	},
-
-	resetField: function(field){
-		field = document.id(field);
-		if (!field) return this;
-		this.parent(field);
-		field.get('validators').each(function(className){
-			this.hideAdvice(className, field);
-		}, this);
-		return this;
-	},
-
-	getAllAdviceMessages: function(field, force){
-		var advice = [];
-		if (field.hasClass('ignoreValidation') && !force) return advice;
-		var validators = field.get('validators').some(function(cn){
-			var warner = cn.test('^warn-') || field.hasClass('warnOnly');
-			if (warner) cn = cn.replace(/^warn-/, '');
-			var validator = this.getValidator(cn);
-			if (!validator) return;
-			advice.push({
-				message: validator.getError(field),
-				warnOnly: warner,
-				passed: validator.test(),
-				validator: validator
-			});
-		}, this);
-		return advice;
-	},
-
-	getAdvice: function(className, field){
-		return field.retrieve('$moo:advice-' + className);
-	},
-
-	insertAdvice: function(advice, field){
-		//Check for error position prop
-		var props = field.get('validatorProps');
-		//Build advice
-		if (!props.msgPos || !document.id(props.msgPos)){
-			if (field.type && field.type.toLowerCase() == 'radio') field.getParent().adopt(advice);
-			else advice.inject(document.id(field), 'after');
-		} else {
-			document.id(props.msgPos).grab(advice);
-		}
-	},
-
-	validateField: function(field, force, scroll){
-		var result = this.parent(field, force);
-		if (((this.options.scrollToErrorsOnSubmit && scroll == null) || scroll) && !result){
-			var failed = document.id(this).getElement('.validation-failed');
-			var par = document.id(this).getParent();
-			while (par != document.body && par.getScrollSize().y == par.getSize().y){
-				par = par.getParent();
-			}
-			var fx = par.retrieve('$moo:fvScroller');
-			if (!fx && window.Fx && Fx.Scroll){
-				fx = new Fx.Scroll(par, this.options.scrollFxOptions);
-				par.store('$moo:fvScroller', fx);
-			}
-			if (failed){
-				if (fx) fx.toElement(failed);
-				else par.scrollTo(par.getScroll().x, failed.getPosition(par).y - 20);
-			}
-		}
-		return result;
-	},
-
-	watchFields: function(fields){
-		fields.each(function(el){
-			if (this.options.evaluateFieldsOnBlur){
-				el.addEvent('blur', this.validationMonitor.pass([el, false, this.options.scrollToErrorsOnBlur], this));
-			}
-			if (this.options.evaluateFieldsOnChange){
-				el.addEvent('change', this.validationMonitor.pass([el, true, this.options.scrollToErrorsOnChange], this));
-			}
-		}, this);
-	}
-
-});
-
-/*
----
-
-script: OverText.js
-
-name: OverText
-
-description: Shows text over an input that disappears when the user clicks into it. The text remains hidden if the user adds a value.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Options
-  - Core/Events
-  - Core/Element.Event
-  - Class.Binds
-  - Class.Occlude
-  - Element.Position
-  - Element.Shortcuts
-
-provides: [OverText]
-
-...
-*/
-(function(){
-
-var OverText = this.OverText = new Class({
-
-	Implements: [Options, Events, Class.Occlude],
-
-	Binds: ['reposition', 'assert', 'focus', 'hide'],
-
-	options: {/*
-		textOverride: null,
-		onFocus: function(){},
-		onTextHide: function(textEl, inputEl){},
-		onTextShow: function(textEl, inputEl){}, */
-		element: 'label',
-		labelClass: 'overTxtLabel',
-		positionOptions: {
-			position: 'upperLeft',
-			edge: 'upperLeft',
-			offset: {
-				x: 4,
-				y: 2
-			}
-		},
-		poll: false,
-		pollInterval: 250,
-		wrap: false
-	},
-
-	property: 'OverText',
-
-	initialize: function(element, options){
-		element = this.element = document.id(element);
-
-		if (this.occlude()) return this.occluded;
-		this.setOptions(options);
-
-		this.attach(element);
-		OverText.instances.push(this);
-
-		if (this.options.poll) this.poll();
-	},
-
-	toElement: function(){
-		return this.element;
-	},
-
-	attach: function(){
-		var element = this.element,
-			options = this.options,
-			value = options.textOverride || element.get('alt') || element.get('title');
-
-		if (!value) return this;
-
-		var text = this.text = new Element(options.element, {
-			'class': options.labelClass,
-			styles: {
-				lineHeight: 'normal',
-				position: 'absolute',
-				cursor: 'text'
-			},
-			html: value,
-			events: {
-				click: this.hide.pass(options.element == 'label', this)
-			}
-		}).inject(element, 'after');
-
-		if (options.element == 'label'){
-			if (!element.get('id')) element.set('id', 'input_' + String.uniqueID());
-			text.set('for', element.get('id'));
-		}
-
-		if (options.wrap){
-			this.textHolder = new Element('div.overTxtWrapper', {
-				styles: {
-					lineHeight: 'normal',
-					position: 'relative'
-				}
-			}).grab(text).inject(element, 'before');
-		}
-
-		return this.enable();
-	},
-
-	destroy: function(){
-		this.element.eliminate(this.property); // Class.Occlude storage
-		this.disable();
-		if (this.text) this.text.destroy();
-		if (this.textHolder) this.textHolder.destroy();
-		return this;
-	},
-
-	disable: function(){
-		this.element.removeEvents({
-			focus: this.focus,
-			blur: this.assert,
-			change: this.assert
-		});
-		window.removeEvent('resize', this.reposition);
-		this.hide(true, true);
-		return this;
-	},
-
-	enable: function(){
-		this.element.addEvents({
-			focus: this.focus,
-			blur: this.assert,
-			change: this.assert
-		});
-		window.addEvent('resize', this.reposition);
-		this.reposition();
-		return this;
-	},
-
-	wrap: function(){
-		if (this.options.element == 'label'){
-			if (!this.element.get('id')) this.element.set('id', 'input_' + String.uniqueID());
-			this.text.set('for', this.element.get('id'));
-		}
-	},
-
-	startPolling: function(){
-		this.pollingPaused = false;
-		return this.poll();
-	},
-
-	poll: function(stop){
-		//start immediately
-		//pause on focus
-		//resumeon blur
-		if (this.poller && !stop) return this;
-		if (stop){
-			clearInterval(this.poller);
-		} else {
-			this.poller = (function(){
-				if (!this.pollingPaused) this.assert(true);
-			}).periodical(this.options.pollInterval, this);
-		}
-
-		return this;
-	},
-
-	stopPolling: function(){
-		this.pollingPaused = true;
-		return this.poll(true);
-	},
-
-	focus: function(){
-		if (this.text && (!this.text.isDisplayed() || this.element.get('disabled'))) return this;
-		return this.hide();
-	},
-
-	hide: function(suppressFocus, force){
-		if (this.text && (this.text.isDisplayed() && (!this.element.get('disabled') || force))){
-			this.text.hide();
-			this.fireEvent('textHide', [this.text, this.element]);
-			this.pollingPaused = true;
-			if (!suppressFocus){
-				try {
-					this.element.fireEvent('focus');
-					this.element.focus();
-				} catch (e){} //IE barfs if you call focus on hidden elements
-			}
-		}
-		return this;
-	},
-
-	show: function(){
-		if (document.id(this.text) && !this.text.isDisplayed()){
-			this.text.show();
-			this.reposition();
-			this.fireEvent('textShow', [this.text, this.element]);
-			this.pollingPaused = false;
-		}
-		return this;
-	},
-
-	test: function(){
-		return !this.element.get('value');
-	},
-
-	assert: function(suppressFocus){
-		return this[this.test() ? 'show' : 'hide'](suppressFocus);
-	},
-
-	reposition: function(){
-		this.assert(true);
-		if (!this.element.isVisible()) return this.stopPolling().hide();
-		if (this.text && this.test()){
-			this.text.position(Object.merge(this.options.positionOptions, {
-				relativeTo: this.element
-			}));
-		}
-		return this;
-	}
-
-});
-
-})();
-
-OverText.instances = [];
-
-Object.append(OverText, {
-
-	each: function(fn){
-		return OverText.instances.each(function(ot, i){
-			if (ot.element && ot.text) fn.call(OverText, ot, i);
-		});
-	},
-
-	update: function(){
-
-		return OverText.each(function(ot){
-			return ot.reposition();
-		});
-
-	},
-
-	hideAll: function(){
-
-		return OverText.each(function(ot){
-			return ot.hide(true, true);
-		});
-
-	},
-
-	showAll: function(){
-		return OverText.each(function(ot){
-			return ot.show();
-		});
-	}
-
-});
-
-
-/*
----
-
-script: Fx.Elements.js
-
-name: Fx.Elements
-
-description: Effect to change any number of CSS properties of any number of Elements.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Fx.CSS
-  - MooTools.More
-
-provides: [Fx.Elements]
-
-...
-*/
-
-Fx.Elements = new Class({
-
-	Extends: Fx.CSS,
-
-	initialize: function(elements, options){
-		this.elements = this.subject = $$(elements);
-		this.parent(options);
-	},
-
-	compute: function(from, to, delta){
-		var now = {};
-
-		for (var i in from){
-			var iFrom = from[i], iTo = to[i], iNow = now[i] = {};
-			for (var p in iFrom) iNow[p] = this.parent(iFrom[p], iTo[p], delta);
-		}
-
-		return now;
-	},
-
-	set: function(now){
-		for (var i in now){
-			if (!this.elements[i]) continue;
-
-			var iNow = now[i];
-			for (var p in iNow) this.render(this.elements[i], p, iNow[p], this.options.unit);
-		}
-
-		return this;
-	},
-
-	start: function(obj){
-		if (!this.check(obj)) return this;
-		var from = {}, to = {};
-
-		for (var i in obj){
-			if (!this.elements[i]) continue;
-
-			var iProps = obj[i], iFrom = from[i] = {}, iTo = to[i] = {};
-
-			for (var p in iProps){
-				var parsed = this.prepare(this.elements[i], p, iProps[p]);
-				iFrom[p] = parsed.from;
-				iTo[p] = parsed.to;
-			}
-		}
-
-		return this.parent(from, to);
-	}
-
-});
-
-/*
----
-
-script: Fx.Accordion.js
-
-name: Fx.Accordion
-
-description: An Fx.Elements extension which allows you to easily create accordion type controls.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Element.Event
-  - Fx.Elements
-
-provides: [Fx.Accordion]
-
-...
-*/
-
-Fx.Accordion = new Class({
-
-	Extends: Fx.Elements,
-
-	options: {/*
-		onActive: function(toggler, section){},
-		onBackground: function(toggler, section){},*/
-		fixedHeight: false,
-		fixedWidth: false,
-		display: 0,
-		show: false,
-		height: true,
-		width: false,
-		opacity: true,
-		alwaysHide: false,
-		trigger: 'click',
-		initialDisplayFx: true,
-		resetHeight: true,
-		keepOpen: false
-	},
-
-	initialize: function(){
-		var defined = function(obj){
-			return obj != null;
-		};
-
-		var params = Array.link(arguments, {
-			'container': Type.isElement, //deprecated
-			'options': Type.isObject,
-			'togglers': defined,
-			'elements': defined
-		});
-		this.parent(params.elements, params.options);
-
-		var options = this.options,
-			togglers = this.togglers = $$(params.togglers);
-
-		this.previous = -1;
-		this.internalChain = new Chain();
-
-		if (options.alwaysHide) this.options.link = 'chain';
-
-		if (options.show || this.options.show === 0){
-			options.display = false;
-			this.previous = options.show;
-		}
-
-		if (options.start){
-			options.display = false;
-			options.show = false;
-		}
-
-		var effects = this.effects = {};
-
-		if (options.opacity) effects.opacity = 'fullOpacity';
-		if (options.width) effects.width = options.fixedWidth ? 'fullWidth' : 'offsetWidth';
-		if (options.height) effects.height = options.fixedHeight ? 'fullHeight' : 'scrollHeight';
-
-		for (var i = 0, l = togglers.length; i < l; i++) this.addSection(togglers[i], this.elements[i]);
-
-		this.elements.each(function(el, i){
-			if (options.show === i){
-				this.fireEvent('active', [togglers[i], el]);
-			} else {
-				for (var fx in effects) el.setStyle(fx, 0);
-			}
-		}, this);
-
-		if (options.display || options.display === 0 || options.initialDisplayFx === false){
-			this.display(options.display, options.initialDisplayFx);
-		}
-
-		if (options.fixedHeight !== false) options.resetHeight = false;
-		this.addEvent('complete', this.internalChain.callChain.bind(this.internalChain));
-	},
-
-	addSection: function(toggler, element){
-		toggler = document.id(toggler);
-		element = document.id(element);
-		this.togglers.include(toggler);
-		this.elements.include(element);
-
-		var togglers = this.togglers,
-			options = this.options,
-			test = togglers.contains(toggler),
-			idx = togglers.indexOf(toggler),
-			displayer = this.display.pass(idx, this);
-
-		toggler.store('accordion:display', displayer)
-			.addEvent(options.trigger, displayer);
-
-		if (options.height) element.setStyles({'padding-top': 0, 'border-top': 'none', 'padding-bottom': 0, 'border-bottom': 'none'});
-		if (options.width) element.setStyles({'padding-left': 0, 'border-left': 'none', 'padding-right': 0, 'border-right': 'none'});
-
-		element.fullOpacity = 1;
-		if (options.fixedWidth) element.fullWidth = options.fixedWidth;
-		if (options.fixedHeight) element.fullHeight = options.fixedHeight;
-		element.setStyle('overflow', 'hidden');
-
-		if (!test) for (var fx in this.effects){
-			element.setStyle(fx, 0);
-		}
-		return this;
-	},
-
-	removeSection: function(toggler, displayIndex){
-		var togglers = this.togglers,
-			idx = togglers.indexOf(toggler),
-			element = this.elements[idx];
-
-		var remover = function(){
-			togglers.erase(toggler);
-			this.elements.erase(element);
-			this.detach(toggler);
-		}.bind(this);
-
-		if (this.now == idx || displayIndex != null){
-			this.display(displayIndex != null ? displayIndex : (idx - 1 >= 0 ? idx - 1 : 0)).chain(remover);
-		} else {
-			remover();
-		}
-		return this;
-	},
-
-	detach: function(toggler){
-		var remove = function(toggler){
-			toggler.removeEvent(this.options.trigger, toggler.retrieve('accordion:display'));
-		}.bind(this);
-
-		if (!toggler) this.togglers.each(remove);
-		else remove(toggler);
-		return this;
-	},
-
-	display: function(index, useFx){
-		if (!this.check(index, useFx)) return this;
-
-		var obj = {},
-			elements = this.elements,
-			options = this.options,
-			effects = this.effects,
-			keepOpen = options.keepOpen,
-			alwaysHide = options.alwaysHide;
-
-		if (useFx == null) useFx = true;
-		if (typeOf(index) == 'element') index = elements.indexOf(index);
-		if (index == this.current && !alwaysHide && !keepOpen) return this;
-
-		if (options.resetHeight){
-			var prev = elements[this.current];
-			if (prev && !this.selfHidden){
-				for (var fx in effects) prev.setStyle(fx, prev[effects[fx]]);
-			}
-		}
-
-		if (this.timer && options.link == 'chain') return this;
-
-		if (this.current != null) this.previous = this.current;
-		this.current = index;
-		this.selfHidden = false;
-
-		elements.each(function(el, i){
-			obj[i] = {};
-			var hide, isOpen;
-			if (!keepOpen || i == index){
-				if (i == index) isOpen = (el.offsetHeight > 0 && options.height) || (el.offsetWidth > 0 && options.width);
-
-				if (i != index){
-					hide = true;
-				} else if ((alwaysHide || keepOpen) && isOpen){
-					hide = true;
-					this.selfHidden = true;
-				}
-				this.fireEvent(hide ? 'background' : 'active', [this.togglers[i], el]);
-				for (var fx in effects) obj[i][fx] = hide ? 0 : el[effects[fx]];
-				if (!useFx && !hide && options.resetHeight) obj[i].height = 'auto';
-			}
-		}, this);
-
-		this.internalChain.clearChain();
-		this.internalChain.chain(function(){
-			if (options.resetHeight && !this.selfHidden){
-				var el = elements[index];
-				if (el) el.setStyle('height', 'auto');
-			}
-		}.bind(this));
-
-		return useFx ? this.start(obj) : this.set(obj).internalChain.callChain();
-	}
-
-});
-
-
-
-/*
----
-
-script: Fx.Move.js
-
-name: Fx.Move
-
-description: Defines Fx.Move, a class that works with Element.Position.js to transition an element from one location to another.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Fx.Morph
-  - Element.Position
-
-provides: [Fx.Move]
-
-...
-*/
-
-Fx.Move = new Class({
-
-	Extends: Fx.Morph,
-
-	options: {
-		relativeTo: document.body,
-		position: 'center',
-		edge: false,
-		offset: {x: 0, y: 0}
-	},
-
-	start: function(destination){
-		var element = this.element,
-			topLeft = element.getStyles('top', 'left');
-		if (topLeft.top == 'auto' || topLeft.left == 'auto'){
-			element.setPosition(element.getPosition(element.getOffsetParent()));
-		}
-		return this.parent(element.position(Object.merge({}, this.options, destination, {returnPos: true})));
-	}
-
-});
-
-Element.Properties.move = {
-
-	set: function(options){
-		this.get('move').cancel().setOptions(options);
-		return this;
-	},
-
-	get: function(){
-		var move = this.retrieve('move');
-		if (!move){
-			move = new Fx.Move(this, {link: 'cancel'});
-			this.store('move', move);
-		}
-		return move;
-	}
-
-};
-
-Element.implement({
-
-	move: function(options){
-		this.get('move').start(options);
-		return this;
-	}
-
-});
-
-/*
----
-
-script: Fx.Scroll.js
-
-name: Fx.Scroll
-
-description: Effect to smoothly scroll any element, including the window.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Fx
-  - Core/Element.Event
-  - Core/Element.Dimensions
-  - MooTools.More
-
-provides: [Fx.Scroll]
-
-...
-*/
-
-(function(){
-
-Fx.Scroll = new Class({
-
-	Extends: Fx,
-
-	options: {
-		offset: {x: 0, y: 0},
-		wheelStops: true
-	},
-
-	initialize: function(element, options){
-		this.element = this.subject = document.id(element);
-		this.parent(options);
-
-		if (typeOf(this.element) != 'element') this.element = document.id(this.element.getDocument().body);
-
-		if (this.options.wheelStops){
-			var stopper = this.element,
-				cancel = this.cancel.pass(false, this);
-			this.addEvent('start', function(){
-				stopper.addEvent('mousewheel', cancel);
-			}, true);
-			this.addEvent('complete', function(){
-				stopper.removeEvent('mousewheel', cancel);
-			}, true);
-		}
-	},
-
-	set: function(){
-		var now = Array.flatten(arguments);
-		this.element.scrollTo(now[0], now[1]);
-		return this;
-	},
-
-	compute: function(from, to, delta){
-		return [0, 1].map(function(i){
-			return Fx.compute(from[i], to[i], delta);
-		});
-	},
-
-	start: function(x, y){
-		if (!this.check(x, y)) return this;
-		var scroll = this.element.getScroll();
-		return this.parent([scroll.x, scroll.y], [x, y]);
-	},
-
-	calculateScroll: function(x, y){
-		var element = this.element,
-			scrollSize = element.getScrollSize(),
-			scroll = element.getScroll(),
-			size = element.getSize(),
-			offset = this.options.offset,
-			values = {x: x, y: y};
-
-		for (var z in values){
-			if (!values[z] && values[z] !== 0) values[z] = scroll[z];
-			if (typeOf(values[z]) != 'number') values[z] = scrollSize[z] - size[z];
-			values[z] += offset[z];
-		}
-
-		return [values.x, values.y];
-	},
-
-	toTop: function(){
-		return this.start.apply(this, this.calculateScroll(false, 0));
-	},
-
-	toLeft: function(){
-		return this.start.apply(this, this.calculateScroll(0, false));
-	},
-
-	toRight: function(){
-		return this.start.apply(this, this.calculateScroll('right', false));
-	},
-
-	toBottom: function(){
-		return this.start.apply(this, this.calculateScroll(false, 'bottom'));
-	},
-
-	toElement: function(el, axes){
-		axes = axes ? Array.convert(axes) : ['x', 'y'];
-		var scroll = isBody(this.element) ? {x: 0, y: 0} : this.element.getScroll();
-		var position = Object.map(document.id(el).getPosition(this.element), function(value, axis){
-			return axes.contains(axis) ? value + scroll[axis] : false;
-		});
-		return this.start.apply(this, this.calculateScroll(position.x, position.y));
-	},
-
-	toElementEdge: function(el, axes, offset){
-		axes = axes ? Array.convert(axes) : ['x', 'y'];
-		el = document.id(el);
-		var to = {},
-			position = el.getPosition(this.element),
-			size = el.getSize(),
-			scroll = this.element.getScroll(),
-			containerSize = this.element.getSize(),
-			edge = {
-				x: position.x + size.x,
-				y: position.y + size.y
-			};
-
-		['x', 'y'].each(function(axis){
-			if (axes.contains(axis)){
-				if (edge[axis] > scroll[axis] + containerSize[axis]) to[axis] = edge[axis] - containerSize[axis];
-				if (position[axis] < scroll[axis]) to[axis] = position[axis];
-			}
-			if (to[axis] == null) to[axis] = scroll[axis];
-			if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
-		}, this);
-
-		if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
-		return this;
-	},
-
-	toElementCenter: function(el, axes, offset){
-		axes = axes ? Array.convert(axes) : ['x', 'y'];
-		el = document.id(el);
-		var to = {},
-			position = el.getPosition(this.element),
-			size = el.getSize(),
-			scroll = this.element.getScroll(),
-			containerSize = this.element.getSize();
-
-		['x', 'y'].each(function(axis){
-			if (axes.contains(axis)){
-				to[axis] = position[axis] - (containerSize[axis] - size[axis]) / 2;
-			}
-			if (to[axis] == null) to[axis] = scroll[axis];
-			if (offset && offset[axis]) to[axis] = to[axis] + offset[axis];
-		}, this);
-
-		if (to.x != scroll.x || to.y != scroll.y) this.start(to.x, to.y);
-		return this;
-	}
-
-});
-
-
-
-function isBody(element){
-	return (/^(?:body|html)$/i).test(element.tagName);
-}
-
-})();
-
-/*
----
-
-script: Fx.Slide.js
-
-name: Fx.Slide
-
-description: Effect to slide an element in and out of view.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Fx
-  - Core/Element.Style
-  - MooTools.More
-
-provides: [Fx.Slide]
-
-...
-*/
-
-Fx.Slide = new Class({
-
-	Extends: Fx,
-
-	options: {
-		mode: 'vertical',
-		wrapper: false,
-		hideOverflow: true,
-		resetHeight: false
-	},
-
-	initialize: function(element, options){
-		element = this.element = this.subject = document.id(element);
-		this.parent(options);
-		options = this.options;
-
-		var wrapper = element.retrieve('wrapper'),
-			styles = element.getStyles('margin', 'position', 'overflow');
-
-		if (options.hideOverflow) styles = Object.append(styles, {overflow: 'hidden'});
-		if (options.wrapper) wrapper = document.id(options.wrapper).setStyles(styles);
-
-		if (!wrapper) wrapper = new Element('div', {
-			styles: styles
-		}).wraps(element);
-
-		element.store('wrapper', wrapper).setStyle('margin', 0);
-		if (element.getStyle('overflow') == 'visible') element.setStyle('overflow', 'hidden');
-
-		this.now = [];
-		this.open = true;
-		this.wrapper = wrapper;
-
-		this.addEvent('complete', function(){
-			this.open = (wrapper['offset' + this.layout.capitalize()] != 0);
-			if (this.open && this.options.resetHeight) wrapper.setStyle('height', '');
-		}, true);
-	},
-
-	vertical: function(){
-		this.margin = 'margin-top';
-		this.layout = 'height';
-		this.offset = this.element.offsetHeight;
-	},
-
-	horizontal: function(){
-		this.margin = 'margin-left';
-		this.layout = 'width';
-		this.offset = this.element.offsetWidth;
-	},
-
-	set: function(now){
-		this.element.setStyle(this.margin, now[0]);
-		this.wrapper.setStyle(this.layout, now[1]);
-		return this;
-	},
-
-	compute: function(from, to, delta){
-		return [0, 1].map(function(i){
-			return Fx.compute(from[i], to[i], delta);
-		});
-	},
-
-	start: function(how, mode){
-		if (!this.check(how, mode)) return this;
-		this[mode || this.options.mode]();
-
-		var margin = this.element.getStyle(this.margin).toInt(),
-			layout = this.wrapper.getStyle(this.layout).toInt(),
-			caseIn = [[margin, layout], [0, this.offset]],
-			caseOut = [[margin, layout], [-this.offset, 0]],
-			start;
-
-		switch (how){
-			case 'in': start = caseIn; break;
-			case 'out': start = caseOut; break;
-			case 'toggle': start = (layout == 0) ? caseIn : caseOut;
-		}
-		return this.parent(start[0], start[1]);
-	},
-
-	slideIn: function(mode){
-		return this.start('in', mode);
-	},
-
-	slideOut: function(mode){
-		return this.start('out', mode);
-	},
-
-	hide: function(mode){
-		this[mode || this.options.mode]();
-		this.open = false;
-		return this.set([-this.offset, 0]);
-	},
-
-	show: function(mode){
-		this[mode || this.options.mode]();
-		this.open = true;
-		return this.set([0, this.offset]);
-	},
-
-	toggle: function(mode){
-		return this.start('toggle', mode);
-	}
-
-});
-
-Element.Properties.slide = {
-
-	set: function(options){
-		this.get('slide').cancel().setOptions(options);
-		return this;
-	},
-
-	get: function(){
-		var slide = this.retrieve('slide');
-		if (!slide){
-			slide = new Fx.Slide(this, {link: 'cancel'});
-			this.store('slide', slide);
-		}
-		return slide;
-	}
-
-};
-
-Element.implement({
-
-	slide: function(how, mode){
-		how = how || 'toggle';
-		var slide = this.get('slide'), toggle;
-		switch (how){
-			case 'hide': slide.hide(mode); break;
-			case 'show': slide.show(mode); break;
-			case 'toggle':
-				var flag = this.retrieve('slide:flag', slide.open);
-				slide[flag ? 'slideOut' : 'slideIn'](mode);
-				this.store('slide:flag', !flag);
-				toggle = true;
-				break;
-			default: slide.start(how, mode);
-		}
-		if (!toggle) this.eliminate('slide:flag');
-		return this;
-	}
-
-});
-
-/*
----
-
-script: Fx.SmoothScroll.js
-
-name: Fx.SmoothScroll
-
-description: Class for creating a smooth scrolling effect to all internal links on the page.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Slick.Finder
-  - Fx.Scroll
-
-provides: [Fx.SmoothScroll]
-
-...
-*/
-
-Fx.SmoothScroll = new Class({
-
-	Extends: Fx.Scroll,
-
-	options: {
-		axes: ['x', 'y']
-	},
-
-	initialize: function(options, context){
-		context = context || document;
-		this.doc = context.getDocument();
-		this.parent(this.doc, options);
-
-		var win = context.getWindow(),
-			location = win.location.href.match(/^[^#]*/)[0] + '#',
-			links = $$(this.options.links || this.doc.links);
-
-		links.each(function(link){
-			if (link.href.indexOf(location) != 0) return;
-			var anchor = link.href.substr(location.length);
-			if (anchor) this.useLink(link, anchor);
-		}, this);
-
-		this.addEvent('complete', function(){
-			win.location.hash = this.anchor;
-			this.element.scrollTo(this.to[0], this.to[1]);
-		}, true);
-	},
-
-	useLink: function(link, anchor){
-
-		link.addEvent('click', function(event){
-			var el = document.id(anchor) || this.doc.getElement('a[name=' + anchor + ']');
-			if (!el) return;
-
-			event.preventDefault();
-			this.toElement(el, this.options.axes).chain(function(){
-				this.fireEvent('scrolledTo', [link, el]);
-			}.bind(this));
-
-			this.anchor = anchor;
-
-		}.bind(this));
-
-		return this;
-	}
-});
-
-/*
----
-
-script: Fx.Sort.js
-
-name: Fx.Sort
-
-description: Defines Fx.Sort, a class that reorders lists with a transition.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element.Dimensions
-  - Fx.Elements
-  - Element.Measure
-
-provides: [Fx.Sort]
-
-...
-*/
-
-Fx.Sort = new Class({
-
-	Extends: Fx.Elements,
-
-	options: {
-		mode: 'vertical'
-	},
-
-	initialize: function(elements, options){
-		this.parent(elements, options);
-		this.elements.each(function(el){
-			if (el.getStyle('position') == 'static') el.setStyle('position', 'relative');
-		});
-		this.setDefaultOrder();
-	},
-
-	setDefaultOrder: function(){
-		this.currentOrder = this.elements.map(function(el, index){
-			return index;
-		});
-	},
-
-	sort: function(){
-		if (!this.check(arguments)) return this;
-		var newOrder = Array.flatten(arguments);
-
-		var top = 0,
-			left = 0,
-			next = {},
-			zero = {},
-			vert = this.options.mode == 'vertical';
-
-		var current = this.elements.map(function(el, index){
-			var size = el.getComputedSize({styles: ['border', 'padding', 'margin']});
-			var val;
-			if (vert){
-				val = {
-					top: top,
-					margin: size['margin-top'],
-					height: size.totalHeight
-				};
-				top += val.height - size['margin-top'];
-			} else {
-				val = {
-					left: left,
-					margin: size['margin-left'],
-					width: size.totalWidth
-				};
-				left += val.width;
-			}
-			var plane = vert ? 'top' : 'left';
-			zero[index] = {};
-			var start = el.getStyle(plane).toInt();
-			zero[index][plane] = start || 0;
-			return val;
-		}, this);
-
-		this.set(zero);
-		newOrder = newOrder.map(function(i){ return i.toInt(); });
-		if (newOrder.length != this.elements.length){
-			this.currentOrder.each(function(index){
-				if (!newOrder.contains(index)) newOrder.push(index);
-			});
-			if (newOrder.length > this.elements.length)
-				newOrder.splice(this.elements.length-1, newOrder.length - this.elements.length);
-		}
-		var margin = 0;
-		top = left = 0;
-		newOrder.each(function(item){
-			var newPos = {};
-			if (vert){
-				newPos.top = top - current[item].top - margin;
-				top += current[item].height;
-			} else {
-				newPos.left = left - current[item].left;
-				left += current[item].width;
-			}
-			margin = margin + current[item].margin;
-			next[item]=newPos;
-		}, this);
-		var mapped = {};
-		Array.clone(newOrder).sort().each(function(index){
-			mapped[index] = next[index];
-		});
-		this.start(mapped);
-		this.currentOrder = newOrder;
-
-		return this;
-	},
-
-	rearrangeDOM: function(newOrder){
-		newOrder = newOrder || this.currentOrder;
-		var parent = this.elements[0].getParent();
-		var rearranged = [];
-		this.elements.setStyle('opacity', 0);
-		//move each element and store the new default order
-		newOrder.each(function(index){
-			rearranged.push(this.elements[index].inject(parent).setStyles({
-				top: 0,
-				left: 0
-			}));
-		}, this);
-		this.elements.setStyle('opacity', 1);
-		this.elements = $$(rearranged);
-		this.setDefaultOrder();
-		return this;
-	},
-
-	getDefaultOrder: function(){
-		return this.elements.map(function(el, index){
-			return index;
-		});
-	},
-
-	getCurrentOrder: function(){
-		return this.currentOrder;
-	},
-
-	forward: function(){
-		return this.sort(this.getDefaultOrder());
-	},
-
-	backward: function(){
-		return this.sort(this.getDefaultOrder().reverse());
-	},
-
-	reverse: function(){
-		return this.sort(this.currentOrder.reverse());
-	},
-
-	sortByElements: function(elements){
-		return this.sort(elements.map(function(el){
-			return this.elements.indexOf(el);
-		}, this));
-	},
-
-	swap: function(one, two){
-		if (typeOf(one) == 'element') one = this.elements.indexOf(one);
-		if (typeOf(two) == 'element') two = this.elements.indexOf(two);
-
-		var newOrder = Array.clone(this.currentOrder);
-		newOrder[this.currentOrder.indexOf(one)] = two;
-		newOrder[this.currentOrder.indexOf(two)] = one;
-
-		return this.sort(newOrder);
-	}
-
-});
-
-/*
----
-
-script: Keyboard.js
-
-name: Keyboard
-
-description: KeyboardEvents used to intercept events on a class for keyboard and format modifiers in a specific order so as to make alt+shift+c the same as shift+alt+c.
-
-license: MIT-style license
-
-authors:
-  - Perrin Westrich
-  - Aaron Newton
-  - Scott Kyle
-
-requires:
-  - Core/Events
-  - Core/Options
-  - Core/Element.Event
-  - Element.Event.Pseudos.Keys
-
-provides: [Keyboard]
-
-...
-*/
-
-(function(){
-
-var Keyboard = this.Keyboard = new Class({
-
-	Extends: Events,
-
-	Implements: [Options],
-
-	options: {/*
-		onActivate: function(){},
-		onDeactivate: function(){},*/
-		defaultEventType: 'keydown',
-		active: false,
-		manager: null,
-		events: {},
-		nonParsedEvents: ['activate', 'deactivate', 'onactivate', 'ondeactivate', 'changed', 'onchanged']
-	},
-
-	initialize: function(options){
-		if (options && options.manager){
-			this._manager = options.manager;
-			delete options.manager;
-		}
-		this.setOptions(options);
-		this._setup();
-	},
-
-	addEvent: function(type, fn, internal){
-		return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn, internal);
-	},
-
-	removeEvent: function(type, fn){
-		return this.parent(Keyboard.parse(type, this.options.defaultEventType, this.options.nonParsedEvents), fn);
-	},
-
-	toggleActive: function(){
-		return this[this.isActive() ? 'deactivate' : 'activate']();
-	},
-
-	activate: function(instance){
-		if (instance){
-			if (instance.isActive()) return this;
-			//if we're stealing focus, store the last keyboard to have it so the relinquish command works
-			if (this._activeKB && instance != this._activeKB){
-				this.previous = this._activeKB;
-				this.previous.fireEvent('deactivate');
-			}
-			//if we're enabling a child, assign it so that events are now passed to it
-			this._activeKB = instance.fireEvent('activate');
-			Keyboard.manager.fireEvent('changed');
-		} else if (this._manager){
-			//else we're enabling ourselves, we must ask our parent to do it for us
-			this._manager.activate(this);
-		}
-		return this;
-	},
-
-	isActive: function(){
-		return this._manager ? (this._manager._activeKB == this) : (Keyboard.manager == this);
-	},
-
-	deactivate: function(instance){
-		if (instance){
-			if (instance === this._activeKB){
-				this._activeKB = null;
-				instance.fireEvent('deactivate');
-				Keyboard.manager.fireEvent('changed');
-			}
-		} else if (this._manager){
-			this._manager.deactivate(this);
-		}
-		return this;
-	},
-
-	relinquish: function(){
-		if (this.isActive() && this._manager && this._manager.previous) this._manager.activate(this._manager.previous);
-		else this.deactivate();
-		return this;
-	},
-
-	//management logic
-	manage: function(instance){
-		if (instance._manager) instance._manager.drop(instance);
-		this._instances.push(instance);
-		instance._manager = this;
-		if (!this._activeKB) this.activate(instance);
-		return this;
-	},
-
-	drop: function(instance){
-		instance.relinquish();
-		this._instances.erase(instance);
-		if (this._activeKB == instance){
-			if (this.previous && this._instances.contains(this.previous)) this.activate(this.previous);
-			else this._activeKB = this._instances[0];
-		}
-		return this;
-	},
-
-	trace: function(){
-		Keyboard.trace(this);
-	},
-
-	each: function(fn){
-		Keyboard.each(this, fn);
-	},
-
-	/*
-		PRIVATE METHODS
-	*/
-
-	_instances: [],
-
-	_disable: function(instance){
-		if (this._activeKB == instance) this._activeKB = null;
-	},
-
-	_setup: function(){
-		this.addEvents(this.options.events);
-		//if this is the root manager, nothing manages it
-		if (Keyboard.manager && !this._manager) Keyboard.manager.manage(this);
-		if (this.options.active) this.activate();
-		else this.relinquish();
-	},
-
-	_handle: function(event, type){
-		//Keyboard.stop(event) prevents key propagation
-		if (event.preventKeyboardPropagation) return;
-
-		var bubbles = !!this._manager;
-		if (bubbles && this._activeKB){
-			this._activeKB._handle(event, type);
-			if (event.preventKeyboardPropagation) return;
-		}
-		this.fireEvent(type, event);
-
-		if (!bubbles && this._activeKB) this._activeKB._handle(event, type);
-	}
-
-});
-
-var parsed = {};
-var modifiers = ['shift', 'control', 'alt', 'meta'];
-var regex = /^(?:shift|control|ctrl|alt|meta)$/;
-
-Keyboard.parse = function(type, eventType, ignore){
-	if (ignore && ignore.contains(type.toLowerCase())) return type;
-
-	type = type.toLowerCase().replace(/^(keyup|keydown):/, function($0, $1){
-		eventType = $1;
-		return '';
-	});
-
-	if (!parsed[type]){
-		if (type != '+'){
-			var key, mods = {};
-			type.split('+').each(function(part){
-				if (regex.test(part)) mods[part] = true;
-				else key = part;
-			});
-
-			mods.control = mods.control || mods.ctrl; // allow both control and ctrl
-
-			var keys = [];
-			modifiers.each(function(mod){
-				if (mods[mod]) keys.push(mod);
-			});
-
-			if (key) keys.push(key);
-			parsed[type] = keys.join('+');
-		} else {
-			parsed[type] = type;
-		}
-	}
-
-	return eventType + ':keys(' + parsed[type] + ')';
-};
-
-Keyboard.each = function(keyboard, fn){
-	var current = keyboard || Keyboard.manager;
-	while (current){
-		fn(current);
-		current = current._activeKB;
-	}
-};
-
-Keyboard.stop = function(event){
-	event.preventKeyboardPropagation = true;
-};
-
-Keyboard.manager = new Keyboard({
-	active: true
-});
-
-Keyboard.trace = function(keyboard){
-	keyboard = keyboard || Keyboard.manager;
-	var hasConsole = window.console && console.log;
-	if (hasConsole) console.log('the following items have focus: ');
-	Keyboard.each(keyboard, function(current){
-		if (hasConsole) console.log(document.id(current.widget) || current.wiget || current);
-	});
-};
-
-var handler = function(event){
-	var keys = [];
-	modifiers.each(function(mod){
-		if (event[mod]) keys.push(mod);
-	});
-
-	if (!regex.test(event.key)) keys.push(event.key);
-	Keyboard.manager._handle(event, event.type + ':keys(' + keys.join('+') + ')');
-};
-
-document.addEvents({
-	'keyup': handler,
-	'keydown': handler
-});
-
-})();
-
-/*
----
-
-script: Keyboard.Extras.js
-
-name: Keyboard.Extras
-
-description: Enhances Keyboard by adding the ability to name and describe keyboard shortcuts, and the ability to grab shortcuts by name and bind the shortcut to different keys.
-
-license: MIT-style license
-
-authors:
-  - Perrin Westrich
-
-requires:
-  - Keyboard
-  - MooTools.More
-
-provides: [Keyboard.Extras]
-
-...
-*/
-Keyboard.prototype.options.nonParsedEvents.combine(['rebound', 'onrebound']);
-
-Keyboard.implement({
-
-	/*
-		shortcut should be in the format of:
-		{
-			'keys': 'shift+s', // the default to add as an event.
-			'description': 'blah blah blah', // a brief description of the functionality.
-			'handler': function(){} // the event handler to run when keys are pressed.
-		}
-	*/
-	addShortcut: function(name, shortcut){
-		this._shortcuts = this._shortcuts || [];
-		this._shortcutIndex = this._shortcutIndex || {};
-
-		shortcut.getKeyboard = Function.convert(this);
-		shortcut.name = name;
-		this._shortcutIndex[name] = shortcut;
-		this._shortcuts.push(shortcut);
-		if (shortcut.keys) this.addEvent(shortcut.keys, shortcut.handler);
-		return this;
-	},
-
-	addShortcuts: function(obj){
-		for (var name in obj) this.addShortcut(name, obj[name]);
-		return this;
-	},
-
-	removeShortcut: function(name){
-		var shortcut = this.getShortcut(name);
-		if (shortcut && shortcut.keys){
-			this.removeEvent(shortcut.keys, shortcut.handler);
-			delete this._shortcutIndex[name];
-			this._shortcuts.erase(shortcut);
-		}
-		return this;
-	},
-
-	removeShortcuts: function(names){
-		names.each(this.removeShortcut, this);
-		return this;
-	},
-
-	getShortcuts: function(){
-		return this._shortcuts || [];
-	},
-
-	getShortcut: function(name){
-		return (this._shortcutIndex || {})[name];
-	}
-
-});
-
-Keyboard.rebind = function(newKeys, shortcuts){
-	Array.convert(shortcuts).each(function(shortcut){
-		shortcut.getKeyboard().removeEvent(shortcut.keys, shortcut.handler);
-		shortcut.getKeyboard().addEvent(newKeys, shortcut.handler);
-		shortcut.keys = newKeys;
-		shortcut.getKeyboard().fireEvent('rebound');
-	});
-};
-
-
-Keyboard.getActiveShortcuts = function(keyboard){
-	var activeKBS = [], activeSCS = [];
-	Keyboard.each(keyboard, [].push.bind(activeKBS));
-	activeKBS.each(function(kb){ activeSCS.extend(kb.getShortcuts()); });
-	return activeSCS;
-};
-
-Keyboard.getShortcut = function(name, keyboard, opts){
-	opts = opts || {};
-	var shortcuts = opts.many ? [] : null,
-		set = opts.many ? function(kb){
-			var shortcut = kb.getShortcut(name);
-			if (shortcut) shortcuts.push(shortcut);
-		} : function(kb){
-			if (!shortcuts) shortcuts = kb.getShortcut(name);
-		};
-	Keyboard.each(keyboard, set);
-	return shortcuts;
-};
-
-Keyboard.getShortcuts = function(name, keyboard){
-	return Keyboard.getShortcut(name, keyboard, { many: true });
-};
-
-/*
----
-
-script: HtmlTable.js
-
-name: HtmlTable
-
-description: Builds table elements with methods to add rows.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Options
-  - Core/Events
-  - Class.Occlude
-
-provides: [HtmlTable]
-
-...
-*/
-(function(){
-
-var HtmlTable = this.HtmlTable = new Class({
-
-	Implements: [Options, Events, Class.Occlude],
-
-	options: {
-		properties: {
-			cellpadding: 0,
-			cellspacing: 0,
-			border: 0
-		},
-		rows: [],
-		headers: [],
-		footers: []
-	},
-
-	property: 'HtmlTable',
-
-	initialize: function(){
-		var params = Array.link(arguments, {options: Type.isObject, table: Type.isElement, id: Type.isString});
-		this.setOptions(params.options);
-		if (!params.table && params.id) params.table = document.id(params.id);
-		this.element = params.table || new Element('table', this.options.properties);
-		if (this.occlude()) return this.occluded;
-		this.build();
-	},
-
-	build: function(){
-		this.element.store('HtmlTable', this);
-
-		this.body = document.id(this.element.tBodies[0]) || new Element('tbody').inject(this.element);
-		$$(this.body.rows);
-
-		if (this.options.headers.length) this.setHeaders(this.options.headers);
-		else this.thead = document.id(this.element.tHead);
-
-		if (this.thead) this.head = this.getHead();
-		if (this.options.footers.length) this.setFooters(this.options.footers);
-
-		this.tfoot = document.id(this.element.tFoot);
-		if (this.tfoot) this.foot = document.id(this.tfoot.rows[0]);
-
-		this.options.rows.each(function(row){
-			this.push(row);
-		}, this);
-	},
-
-	toElement: function(){
-		return this.element;
-	},
-
-	empty: function(){
-		this.body.empty();
-		return this;
-	},
-
-	set: function(what, items){
-		var target = (what == 'headers') ? 'tHead' : 'tFoot',
-			lower = target.toLowerCase();
-
-		this[lower] = (document.id(this.element[target]) || new Element(lower).inject(this.element, 'top')).empty();
-		var data = this.push(items, {}, this[lower], what == 'headers' ? 'th' : 'td');
-
-		if (what == 'headers') this.head = this.getHead();
-		else this.foot = this.getHead();
-
-		return data;
-	},
-
-	getHead: function(){
-		var rows = this.thead.rows;
-		return rows.length > 1 ? $$(rows) : rows.length ? document.id(rows[0]) : false;
-	},
-
-	setHeaders: function(headers){
-		this.set('headers', headers);
-		return this;
-	},
-
-	setFooters: function(footers){
-		this.set('footers', footers);
-		return this;
-	},
-
-	update: function(tr, row, tag){
-		var tds = tr.getChildren(tag || 'td'), last = tds.length - 1;
-
-		row.each(function(data, index){
-			var td = tds[index] || new Element(tag || 'td').inject(tr),
-				content = ((data && Object.prototype.hasOwnProperty.call(data, 'content')) ? data.content : '') || data,
-				type = typeOf(content);
-
-			if (data && Object.prototype.hasOwnProperty.call(data, 'properties')) td.set(data.properties);
-			if (/(element(s?)|array|collection)/.test(type)) td.empty().adopt(content);
-			else td.set('html', content);
-
-			if (index > last) tds.push(td);
-			else tds[index] = td;
-		});
-
-		return {
-			tr: tr,
-			tds: tds
-		};
-	},
-
-	push: function(row, rowProperties, target, tag, where){
-		if (typeOf(row) == 'element' && row.get('tag') == 'tr'){
-			row.inject(target || this.body, where);
-			return {
-				tr: row,
-				tds: row.getChildren('td')
-			};
-		}
-		return this.update(new Element('tr', rowProperties).inject(target || this.body, where), row, tag);
-	},
-
-	pushMany: function(rows, rowProperties, target, tag, where){
-		return rows.map(function(row){
-			return this.push(row, rowProperties, target, tag, where);
-		}, this);
-	}
-
-});
-
-})();
-
-
-['adopt', 'inject', 'wraps', 'grab', 'replaces', 'dispose'].each(function(method){
-	HtmlTable.implement(method, function(){
-		this.element[method].apply(this.element, arguments);
-		return this;
-	});
-});
-
-
-
-/*
----
-
-script: HtmlTable.Select.js
-
-name: HtmlTable.Select
-
-description: Builds a stripy, sortable table with methods to add rows. Rows can be selected with the mouse or keyboard navigation.
-
-license: MIT-style license
-
-authors:
-  - Harald Kirschner
-  - Aaron Newton
-
-requires:
-  - Keyboard
-  - Keyboard.Extras
-  - HtmlTable
-  - Class.refactor
-  - Element.Delegation.Pseudo
-  - Element.Shortcuts
-
-provides: [HtmlTable.Select]
-
-...
-*/
-
-HtmlTable = Class.refactor(HtmlTable, {
-
-	options: {
-		/*onRowFocus: function(){},
-		onRowUnfocus: function(){},*/
-		useKeyboard: true,
-		classRowSelected: 'table-tr-selected',
-		classRowHovered: 'table-tr-hovered',
-		classSelectable: 'table-selectable',
-		shiftForMultiSelect: true,
-		allowMultiSelect: true,
-		selectable: false,
-		selectHiddenRows: false
-	},
-
-	initialize: function(){
-		this.previous.apply(this, arguments);
-		if (this.occluded) return this.occluded;
-
-		this.selectedRows = new Elements();
-
-		if (!this.bound) this.bound = {};
-		this.bound.mouseleave = this.mouseleave.bind(this);
-		this.bound.clickRow = this.clickRow.bind(this);
-		this.bound.activateKeyboard = function(){
-			if (this.keyboard && this.selectEnabled) this.keyboard.activate();
-		}.bind(this);
-
-		if (this.options.selectable) this.enableSelect();
-	},
-
-	empty: function(){
-		if (this.body.rows.length) this.selectNone();
-		return this.previous();
-	},
-
-	enableSelect: function(){
-		this.selectEnabled = true;
-		this.attachSelects();
-		this.element.addClass(this.options.classSelectable);
-		return this;
-	},
-
-	disableSelect: function(){
-		this.selectEnabled = false;
-		this.attachSelects(false);
-		this.element.removeClass(this.options.classSelectable);
-		return this;
-	},
-
-	push: function(){
-		var ret = this.previous.apply(this, arguments);
-		this.updateSelects();
-		return ret;
-	},
-
-	toggleRow: function(row){
-		return this[(this.isSelected(row) ? 'de' : '') + 'selectRow'](row);
-	},
-
-	selectRow: function(row, _nocheck){
-		//private variable _nocheck: boolean whether or not to confirm the row is in the table body
-		//added here for optimization when selecting ranges
-		if (this.isSelected(row) || (!_nocheck && !this.body.getChildren().contains(row))) return;
-		if (!this.options.allowMultiSelect) this.selectNone();
-
-		if (!this.isSelected(row)){
-			this.selectedRows.push(row);
-			row.addClass(this.options.classRowSelected);
-			this.fireEvent('rowFocus', [row, this.selectedRows]);
-			this.fireEvent('stateChanged');
-		}
-
-		this.focused = row;
-		document.clearSelection();
-
-		return this;
-	},
-
-	isSelected: function(row){
-		return this.selectedRows.contains(row);
-	},
-
-	getSelected: function(){
-		return this.selectedRows;
-	},
-
-	serialize: function(){
-		var previousSerialization = this.previous.apply(this, arguments) || {};
-		if (this.options.selectable){
-			previousSerialization.selectedRows = this.selectedRows.map(function(row){
-				return Array.indexOf(this.body.rows, row);
-			}.bind(this));
-		}
-		return previousSerialization;
-	},
-
-	restore: function(tableState){
-		if (this.options.selectable && tableState.selectedRows){
-			tableState.selectedRows.each(function(index){
-				this.selectRow(this.body.rows[index]);
-			}.bind(this));
-		}
-		this.previous.apply(this, arguments);
-	},
-
-	deselectRow: function(row, _nocheck){
-		if (!this.isSelected(row) || (!_nocheck && !this.body.getChildren().contains(row))) return;
-
-		this.selectedRows = new Elements(Array.convert(this.selectedRows).erase(row));
-		row.removeClass(this.options.classRowSelected);
-		this.fireEvent('rowUnfocus', [row, this.selectedRows]);
-		this.fireEvent('stateChanged');
-		return this;
-	},
-
-	selectAll: function(selectNone){
-		if (!selectNone && !this.options.allowMultiSelect) return;
-		this.selectRange(0, this.body.rows.length, selectNone);
-		return this;
-	},
-
-	selectNone: function(){
-		return this.selectAll(true);
-	},
-
-	selectRange: function(startRow, endRow, _deselect){
-		if (!this.options.allowMultiSelect && !_deselect) return;
-		var method = _deselect ? 'deselectRow' : 'selectRow',
-			rows = Array.clone(this.body.rows);
-
-		if (typeOf(startRow) == 'element') startRow = rows.indexOf(startRow);
-		if (typeOf(endRow) == 'element') endRow = rows.indexOf(endRow);
-		endRow = endRow < rows.length - 1 ? endRow : rows.length - 1;
-
-		if (endRow < startRow){
-			var tmp = startRow;
-			startRow = endRow;
-			endRow = tmp;
-		}
-
-		for (var i = startRow; i <= endRow; i++){
-			if (this.options.selectHiddenRows || rows[i].isDisplayed()) this[method](rows[i], true);
-		}
-
-		return this;
-	},
-
-	deselectRange: function(startRow, endRow){
-		this.selectRange(startRow, endRow, true);
-	},
-
-/*
-	Private methods:
-*/
-
-	enterRow: function(row){
-		if (this.hovered) this.hovered = this.leaveRow(this.hovered);
-		this.hovered = row.addClass(this.options.classRowHovered);
-	},
-
-	leaveRow: function(row){
-		row.removeClass(this.options.classRowHovered);
-	},
-
-	updateSelects: function(){
-		Array.each(this.body.rows, function(row){
-			var binders = row.retrieve('binders');
-			if (!binders && !this.selectEnabled) return;
-			if (!binders){
-				binders = {
-					mouseenter: this.enterRow.pass([row], this),
-					mouseleave: this.leaveRow.pass([row], this)
-				};
-				row.store('binders', binders);
-			}
-			if (this.selectEnabled) row.addEvents(binders);
-			else row.removeEvents(binders);
-		}, this);
-	},
-
-	shiftFocus: function(offset, event){
-		if (!this.focused) return this.selectRow(this.body.rows[0], event);
-		var to = this.getRowByOffset(offset, this.options.selectHiddenRows);
-		if (to === null || this.focused == this.body.rows[to]) return this;
-		this.toggleRow(this.body.rows[to], event);
-	},
-
-	clickRow: function(event, row){
-		var selecting = (event.shift || event.meta || event.control) && this.options.shiftForMultiSelect;
-		if (!selecting && !(event.rightClick && this.isSelected(row) && this.options.allowMultiSelect)) this.selectNone();
-
-		if (event.rightClick) this.selectRow(row);
-		else this.toggleRow(row);
-
-		if (event.shift){
-			this.selectRange(this.rangeStart || this.body.rows[0], row, this.rangeStart ? !this.isSelected(row) : true);
-			this.focused = row;
-		}
-		this.rangeStart = row;
-	},
-
-	getRowByOffset: function(offset, includeHiddenRows){
-		if (!this.focused) return 0;
-		var index = Array.indexOf(this.body.rows, this.focused);
-		if ((index == 0 && offset < 0) || (index == this.body.rows.length -1 && offset > 0)) return null;
-		if (includeHiddenRows){
-			index += offset;
-		} else {
-			var limit = 0,
-				count = 0;
-			if (offset > 0){
-				while (count < offset && index < this.body.rows.length -1){
-					if (this.body.rows[++index].isDisplayed()) count++;
-				}
-			} else {
-				while (count > offset && index > 0){
-					if (this.body.rows[--index].isDisplayed()) count--;
-				}
-			}
-		}
-		return index;
-	},
-
-	attachSelects: function(attach){
-		attach = attach != null ? attach : true;
-
-		var method = attach ? 'addEvents' : 'removeEvents';
-		this.element[method]({
-			mouseleave: this.bound.mouseleave,
-			click: this.bound.activateKeyboard
-		});
-
-		this.body[method]({
-			'click:relay(tr)': this.bound.clickRow,
-			'contextmenu:relay(tr)': this.bound.clickRow
-		});
-
-		if (this.options.useKeyboard || this.keyboard){
-			if (!this.keyboard) this.keyboard = new Keyboard();
-			if (!this.selectKeysDefined){
-				this.selectKeysDefined = true;
-				var timer, held;
-
-				var move = function(offset){
-					var mover = function(e){
-						clearTimeout(timer);
-						e.preventDefault();
-						var to = this.body.rows[this.getRowByOffset(offset, this.options.selectHiddenRows)];
-						if (e.shift && to && this.isSelected(to)){
-							this.deselectRow(this.focused);
-							this.focused = to;
-						} else {
-							if (to && (!this.options.allowMultiSelect || !e.shift)){
-								this.selectNone();
-							}
-							this.shiftFocus(offset, e);
-						}
-
-						if (held){
-							timer = mover.delay(100, this, e);
-						} else {
-							timer = (function(){
-								held = true;
-								mover(e);
-							}).delay(400);
-						}
-					}.bind(this);
-					return mover;
-				}.bind(this);
-
-				var clear = function(){
-					clearTimeout(timer);
-					held = false;
-				};
-
-				this.keyboard.addEvents({
-					'keydown:shift+up': move(-1),
-					'keydown:shift+down': move(1),
-					'keyup:shift+up': clear,
-					'keyup:shift+down': clear,
-					'keyup:up': clear,
-					'keyup:down': clear
-				});
-
-				var shiftHint = '';
-				if (this.options.allowMultiSelect && this.options.shiftForMultiSelect && this.options.useKeyboard){
-					shiftHint = ' (Shift multi-selects).';
-				}
-
-				this.keyboard.addShortcuts({
-					'Select Previous Row': {
-						keys: 'up',
-						shortcut: 'up arrow',
-						handler: move(-1),
-						description: 'Select the previous row in the table.' + shiftHint
-					},
-					'Select Next Row': {
-						keys: 'down',
-						shortcut: 'down arrow',
-						handler: move(1),
-						description: 'Select the next row in the table.' + shiftHint
-					}
-				});
-
-			}
-			this.keyboard[attach ? 'activate' : 'deactivate']();
-		}
-		this.updateSelects();
-	},
-
-	mouseleave: function(){
-		if (this.hovered) this.leaveRow(this.hovered);
-	}
-
-});
-
-/*
----
-
-script: HtmlTable.Sort.js
-
-name: HtmlTable.Sort
-
-description: Builds a stripy, sortable table with methods to add rows.
-
-license: MIT-style license
-
-authors:
-  - Harald Kirschner
-  - Aaron Newton
-  - Jacob Thornton
-
-requires:
-  - Core/Hash
-  - HtmlTable
-  - Class.refactor
-  - Element.Delegation.Pseudo
-  - String.Extras
-  - Date
-
-provides: [HtmlTable.Sort]
-
-...
-*/
-(function(){
-
-var readOnlyNess = document.createElement('table');
-try {
-	readOnlyNess.innerHTML = '<tr><td></td></tr>';
-	readOnlyNess = readOnlyNess.childNodes.length === 0;
-} catch (e){
-	readOnlyNess = true;
-}
-
-HtmlTable = Class.refactor(HtmlTable, {
-
-	options: {/*
-		onSort: function(){}, */
-		sortIndex: 0,
-		sortReverse: false,
-		parsers: [],
-		defaultParser: 'string',
-		classSortable: 'table-sortable',
-		classHeadSort: 'table-th-sort',
-		classHeadSortRev: 'table-th-sort-rev',
-		classNoSort: 'table-th-nosort',
-		classGroupHead: 'table-tr-group-head',
-		classGroup: 'table-tr-group',
-		classCellSort: 'table-td-sort',
-		classSortSpan: 'table-th-sort-span',
-		sortable: false,
-		thSelector: 'th'
-	},
-
-	initialize: function(){
-		this.previous.apply(this, arguments);
-		if (this.occluded) return this.occluded;
-		this.sorted = {index: null, dir: 1};
-		if (!this.bound) this.bound = {};
-		this.bound.headClick = this.headClick.bind(this);
-		this.sortSpans = new Elements();
-		if (this.options.sortable){
-			this.enableSort();
-			if (this.options.sortIndex != null) this.sort(this.options.sortIndex, this.options.sortReverse);
-		}
-	},
-
-	attachSorts: function(attach){
-		this.detachSorts();
-		if (attach !== false) this.element.addEvent('click:relay(' + this.options.thSelector + ')', this.bound.headClick);
-	},
-
-	detachSorts: function(){
-		this.element.removeEvents('click:relay(' + this.options.thSelector + ')');
-	},
-
-	setHeaders: function(){
-		this.previous.apply(this, arguments);
-		if (this.sortable) this.setParsers();
-	},
-
-	setParsers: function(){
-		this.parsers = this.detectParsers();
-	},
-
-	detectParsers: function(){
-		return this.head && this.head.getElements(this.options.thSelector).flatten().map(this.detectParser, this);
-	},
-
-	detectParser: function(cell, index){
-		if (cell.hasClass(this.options.classNoSort) || cell.retrieve('htmltable-parser')) return cell.retrieve('htmltable-parser');
-		var thDiv = new Element('div');
-		thDiv.adopt(cell.childNodes).inject(cell);
-		var sortSpan = new Element('span', {'class': this.options.classSortSpan}).inject(thDiv, 'top');
-		this.sortSpans.push(sortSpan);
-		var parser = this.options.parsers[index],
-			rows = this.body.rows,
-			cancel;
-		switch (typeOf(parser)){
-			case 'function': parser = {convert: parser}; cancel = true; break;
-			case 'string': parser = parser; cancel = true; break;
-		}
-		if (!cancel){
-			HtmlTable.ParserPriority.some(function(parserName){
-				var current = HtmlTable.Parsers[parserName],
-					match = current.match;
-				if (!match) return false;
-				for (var i = 0, j = rows.length; i < j; i++){
-					var cell = document.id(rows[i].cells[index]),
-						text = cell ? cell.get('html').clean() : '';
-					if (text && match.test(text)){
-						parser = current;
-						return true;
-					}
-				}
-			});
-		}
-		if (!parser) parser = this.options.defaultParser;
-		cell.store('htmltable-parser', parser);
-		return parser;
-	},
-
-	headClick: function(event, el){
-		if (!this.head || el.hasClass(this.options.classNoSort)) return;
-		return this.sort(Array.indexOf(this.head.getElements(this.options.thSelector).flatten(), el) % this.body.rows[0].cells.length);
-	},
-
-	serialize: function(){
-		var previousSerialization = this.previous.apply(this, arguments) || {};
-		if (this.options.sortable){
-			previousSerialization.sortIndex = this.sorted.index;
-			previousSerialization.sortReverse = this.sorted.reverse;
-		}
-		return previousSerialization;
-	},
-
-	restore: function(tableState){
-		if (this.options.sortable && tableState.sortIndex){
-			this.sort(tableState.sortIndex, tableState.sortReverse);
-		}
-		this.previous.apply(this, arguments);
-	},
-
-	setSortedState: function(index, reverse){
-		if (reverse != null) this.sorted.reverse = reverse;
-		else if (this.sorted.index == index) this.sorted.reverse = !this.sorted.reverse;
-		else this.sorted.reverse = this.sorted.index == null;
-
-		if (index != null) this.sorted.index = index;
-	},
-
-	setHeadSort: function(sorted){
-		var head = $$(!this.head.length ? this.head.cells[this.sorted.index] : this.head.map(function(row){
-			return row.getElements(this.options.thSelector)[this.sorted.index];
-		}, this).clean());
-		if (!head.length) return;
-		if (sorted){
-			head.addClass(this.options.classHeadSort);
-			if (this.sorted.reverse) head.addClass(this.options.classHeadSortRev);
-			else head.removeClass(this.options.classHeadSortRev);
-		} else {
-			head.removeClass(this.options.classHeadSort).removeClass(this.options.classHeadSortRev);
-		}
-	},
-
-	setRowSort: function(data, pre){
-		var count = data.length,
-			body = this.body,
-			group,
-			rowIndex;
-
-		while (count){
-			var item = data[--count],
-				position = item.position,
-				row = body.rows[position];
-
-			if (row.disabled) continue;
-			if (!pre){
-				group = this.setGroupSort(group, row, item);
-				this.setRowStyle(row, count);
-			}
-			body.appendChild(row);
-
-			for (rowIndex = 0; rowIndex < count; rowIndex++){
-				if (data[rowIndex].position > position) data[rowIndex].position--;
-			}
-		}
-	},
-
-	setRowStyle: function(row, i){
-		this.previous(row, i);
-		row.cells[this.sorted.index].addClass(this.options.classCellSort);
-	},
-
-	setGroupSort: function(group, row, item){
-		if (group == item.value) row.removeClass(this.options.classGroupHead).addClass(this.options.classGroup);
-		else row.removeClass(this.options.classGroup).addClass(this.options.classGroupHead);
-		return item.value;
-	},
-
-	getParser: function(){
-		var parser = this.parsers[this.sorted.index];
-		return typeOf(parser) == 'string' ? HtmlTable.Parsers[parser] : parser;
-	},
-
-	sort: function(index, reverse, pre, sortFunction){
-		if (!this.head) return;
-
-		if (!pre){
-			this.clearSort();
-			this.setSortedState(index, reverse);
-			this.setHeadSort(true);
-		}
-
-		var parser = this.getParser();
-		if (!parser) return;
-
-		var rel;
-		if (!readOnlyNess){
-			rel = this.body.getParent();
-			this.body.dispose();
-		}
-
-		var data = this.parseData(parser).sort(sortFunction ? sortFunction : function(a, b){
-			if (a.value === b.value) return 0;
-			return a.value > b.value ? 1 : -1;
-		});
-
-		var reversed = this.sorted.reverse == (parser == HtmlTable.Parsers['input-checked']);
-		if (reversed) data.reverse(true);
-		this.setRowSort(data, pre);
-
-		if (rel) rel.grab(this.body);
-		this.fireEvent('stateChanged');
-		return this.fireEvent('sort', [this.body, this.sorted.index, reversed ? 'asc' : 'desc']);
-	},
-
-	parseData: function(parser){
-		return Array.map(this.body.rows, function(row, i){
-			var value = parser.convert.call(document.id(row.cells[this.sorted.index]));
-			return {
-				position: i,
-				value: value
-			};
-		}, this);
-	},
-
-	clearSort: function(){
-		this.setHeadSort(false);
-		this.body.getElements('td').removeClass(this.options.classCellSort);
-	},
-
-	reSort: function(){
-		if (this.sortable) this.sort.call(this, this.sorted.index, this.sorted.reverse);
-		return this;
-	},
-
-	enableSort: function(){
-		this.element.addClass(this.options.classSortable);
-		this.attachSorts(true);
-		this.setParsers();
-		this.sortable = true;
-		return this;
-	},
-
-	disableSort: function(){
-		this.element.removeClass(this.options.classSortable);
-		this.attachSorts(false);
-		this.sortSpans.each(function(span){
-			span.destroy();
-		});
-		this.sortSpans.empty();
-		this.sortable = false;
-		return this;
-	}
-
-});
-
-HtmlTable.ParserPriority = ['date', 'input-checked', 'input-value', 'float', 'number'];
-
-HtmlTable.Parsers = {
-
-	'date': {
-		match: /^\d{2}[-\/ ]\d{2}[-\/ ]\d{2,4}$/,
-		convert: function(){
-			var d = Date.parse(this.get('text').stripTags());
-			return (typeOf(d) == 'date') ? d.format('db') : '';
-		},
-		type: 'date'
-	},
-	'input-checked': {
-		match: / type="(radio|checkbox)"/,
-		convert: function(){
-			return this.getElement('input').checked;
-		}
-	},
-	'input-value': {
-		match: /<input/,
-		convert: function(){
-			return this.getElement('input').value;
-		}
-	},
-	'number': {
-		match: /^\d+[^\d.,]*$/,
-		convert: function(){
-			return this.get('text').stripTags().toInt();
-		},
-		number: true
-	},
-	'numberLax': {
-		match: /^[^\d]+\d+$/,
-		convert: function(){
-			return this.get('text').replace(/[^-?^0-9]/, '').stripTags().toInt();
-		},
-		number: true
-	},
-	'float': {
-		match: /^[\d]+\.[\d]+/,
-		convert: function(){
-			return this.get('text').replace(/[^-?^\d.e]/, '').stripTags().toFloat();
-		},
-		number: true
-	},
-	'floatLax': {
-		match: /^[^\d]+[\d]+\.[\d]+$/,
-		convert: function(){
-			return this.get('text').replace(/[^-?^\d.]/, '').stripTags().toFloat();
-		},
-		number: true
-	},
-	'string': {
-		match: null,
-		convert: function(){
-			return this.get('text').stripTags().toLowerCase();
-		}
-	},
-	'title': {
-		match: null,
-		convert: function(){
-			return this.title;
-		}
-	}
-
-};
-
-
-
-HtmlTable.defineParsers = function(parsers){
-	HtmlTable.Parsers = Object.append(HtmlTable.Parsers, parsers);
-	for (var parser in parsers){
-		HtmlTable.ParserPriority.unshift(parser);
-	}
-};
-
-})();
-
-
-/*
----
-
-script: HtmlTable.Zebra.js
-
-name: HtmlTable.Zebra
-
-description: Builds a stripy table with methods to add rows.
-
-license: MIT-style license
-
-authors:
-  - Harald Kirschner
-  - Aaron Newton
-
-requires:
-  - HtmlTable
-  - Element.Shortcuts
-  - Class.refactor
-
-provides: [HtmlTable.Zebra]
-
-...
-*/
-
-HtmlTable = Class.refactor(HtmlTable, {
-
-	options: {
-		classZebra: 'table-tr-odd',
-		zebra: true,
-		zebraOnlyVisibleRows: true
-	},
-
-	initialize: function(){
-		this.previous.apply(this, arguments);
-		if (this.occluded) return this.occluded;
-		if (this.options.zebra) this.updateZebras();
-	},
-
-	updateZebras: function(){
-		var index = 0;
-		Array.each(this.body.rows, function(row){
-			if (!this.options.zebraOnlyVisibleRows || row.isDisplayed()){
-				this.zebra(row, index++);
-			}
-		}, this);
-	},
-
-	setRowStyle: function(row, i){
-		if (this.previous) this.previous(row, i);
-		this.zebra(row, i);
-	},
-
-	zebra: function(row, i){
-		return row[((i % 2) ? 'remove' : 'add')+'Class'](this.options.classZebra);
-	},
-
-	push: function(){
-		var pushed = this.previous.apply(this, arguments);
-		if (this.options.zebra) this.updateZebras();
-		return pushed;
-	}
-
-});
-
-/*
----
-
-script: Scroller.js
-
-name: Scroller
-
-description: Class which scrolls the contents of any Element (including the window) when the mouse reaches the Element's boundaries.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Events
-  - Core/Options
-  - Core/Element.Event
-  - Core/Element.Dimensions
-  - MooTools.More
-
-provides: [Scroller]
-
-...
-*/
-(function(){
-
-var Scroller = this.Scroller = new Class({
-
-	Implements: [Events, Options],
-
-	options: {
-		area: 20,
-		velocity: 1,
-		onChange: function(x, y){
-			this.element.scrollTo(x, y);
-		},
-		fps: 50
-	},
-
-	initialize: function(element, options){
-		this.setOptions(options);
-		this.element = document.id(element);
-		this.docBody = document.id(this.element.getDocument().body);
-		this.listener = (typeOf(this.element) != 'element') ? this.docBody : this.element;
-		this.timer = null;
-		this.bound = {
-			attach: this.attach.bind(this),
-			detach: this.detach.bind(this),
-			getCoords: this.getCoords.bind(this)
-		};
-	},
-
-	start: function(){
-		this.listener.addEvents({
-			mouseover: this.bound.attach,
-			mouseleave: this.bound.detach
-		});
-		return this;
-	},
-
-	stop: function(){
-		this.listener.removeEvents({
-			mouseover: this.bound.attach,
-			mouseleave: this.bound.detach
-		});
-		this.detach();
-		this.timer = clearInterval(this.timer);
-		return this;
-	},
-
-	attach: function(){
-		this.listener.addEvent('mousemove', this.bound.getCoords);
-	},
-
-	detach: function(){
-		this.listener.removeEvent('mousemove', this.bound.getCoords);
-		this.timer = clearInterval(this.timer);
-	},
-
-	getCoords: function(event){
-		this.page = (this.listener.get('tag') == 'body') ? event.client : event.page;
-		if (!this.timer) this.timer = this.scroll.periodical(Math.round(1000 / this.options.fps), this);
-	},
-
-	scroll: function(){
-		var size = this.element.getSize(),
-			scroll = this.element.getScroll(),
-			pos = ((this.element != this.docBody) && (this.element != window)) ? this.element.getOffsets() : {x: 0, y: 0},
-			scrollSize = this.element.getScrollSize(),
-			change = {x: 0, y: 0},
-			top = this.options.area.top || this.options.area,
-			bottom = this.options.area.bottom || this.options.area;
-		for (var z in this.page){
-			if (this.page[z] < (top + pos[z]) && scroll[z] != 0){
-				change[z] = (this.page[z] - top - pos[z]) * this.options.velocity;
-			} else if (this.page[z] + bottom > (size[z] + pos[z]) && scroll[z] + size[z] != scrollSize[z]){
-				change[z] = (this.page[z] - size[z] + bottom - pos[z]) * this.options.velocity;
-			}
-			change[z] = change[z].round();
-		}
-		if (change.y || change.x) this.fireEvent('change', [scroll.x + change.x, scroll.y + change.y]);
-	}
-
-});
-
-})();
-
-
-/*
----
-
-script: Tips.js
-
-name: Tips
-
-description: Class for creating nice tips that follow the mouse cursor when hovering an element.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-  - Christoph Pojer
-  - Luis Merino
-
-requires:
-  - Core/Options
-  - Core/Events
-  - Core/Element.Event
-  - Core/Element.Style
-  - Core/Element.Dimensions
-  - MooTools.More
-
-provides: [Tips]
-
-...
-*/
-
-(function(){
-
-var read = function(option, element){
-	return (option) ? (typeOf(option) == 'function' ? option(element) : element.get(option)) : '';
-};
-
-var Tips = this.Tips = new Class({
-
-	Implements: [Events, Options],
-
-	options: {/*
-		id: null,
-		onAttach: function(element){},
-		onDetach: function(element){},
-		onBound: function(coords){},*/
-		onShow: function(){
-			this.tip.setStyle('display', 'block');
-		},
-		onHide: function(){
-			this.tip.setStyle('display', 'none');
-		},
-		title: 'title',
-		text: function(element){
-			return element.get('rel') || element.get('href');
-		},
-		showDelay: 100,
-		hideDelay: 100,
-		className: 'tip-wrap',
-		offset: {x: 16, y: 16},
-		windowPadding: {x:0, y:0},
-		fixed: false,
-		waiAria: true,
-		hideEmpty: false
-	},
-
-	initialize: function(){
-		var params = Array.link(arguments, {
-			options: Type.isObject,
-			elements: function(obj){
-				return obj != null;
-			}
-		});
-		this.setOptions(params.options);
-		if (params.elements) this.attach(params.elements);
-		this.container = new Element('div', {'class': 'tip'});
-
-		if (this.options.id){
-			this.container.set('id', this.options.id);
-			if (this.options.waiAria) this.attachWaiAria();
-		}
-	},
-
-	toElement: function(){
-		if (this.tip) return this.tip;
-
-		this.tip = new Element('div', {
-			'class': this.options.className,
-			styles: {
-				position: 'absolute',
-				top: 0,
-				left: 0,
-				display: 'none'
-			}
-		}).adopt(
-			new Element('div', {'class': 'tip-top'}),
-			this.container,
-			new Element('div', {'class': 'tip-bottom'})
-		);
-
-		return this.tip;
-	},
-
-	attachWaiAria: function(){
-		var id = this.options.id;
-		this.container.set('role', 'tooltip');
-
-		if (!this.waiAria){
-			this.waiAria = {
-				show: function(element){
-					if (id) element.set('aria-describedby', id);
-					this.container.set('aria-hidden', 'false');
-				},
-				hide: function(element){
-					if (id) element.erase('aria-describedby');
-					this.container.set('aria-hidden', 'true');
-				}
-			};
-		}
-		this.addEvents(this.waiAria);
-	},
-
-	detachWaiAria: function(){
-		if (this.waiAria){
-			this.container.erase('role');
-			this.container.erase('aria-hidden');
-			this.removeEvents(this.waiAria);
-		}
-	},
-
-	attach: function(elements){
-		$$(elements).each(function(element){
-			var title = read(this.options.title, element),
-				text = read(this.options.text, element);
-
-			element.set('title', '').store('tip:native', title).retrieve('tip:title', title);
-			element.retrieve('tip:text', text);
-			this.fireEvent('attach', [element]);
-
-			var events = ['enter', 'leave'];
-			if (!this.options.fixed) events.push('move');
-
-			events.each(function(value){
-				var event = element.retrieve('tip:' + value);
-				if (!event) event = function(event){
-					this['element' + value.capitalize()].apply(this, [event, element]);
-				}.bind(this);
-
-				element.store('tip:' + value, event).addEvent('mouse' + value, event);
-			}, this);
-		}, this);
-
-		return this;
-	},
-
-	detach: function(elements){
-		$$(elements).each(function(element){
-			['enter', 'leave', 'move'].each(function(value){
-				element.removeEvent('mouse' + value, element.retrieve('tip:' + value)).eliminate('tip:' + value);
-			});
-
-			this.fireEvent('detach', [element]);
-
-			if (this.options.title == 'title'){ // This is necessary to check if we can revert the title
-				var original = element.retrieve('tip:native');
-				if (original) element.set('title', original);
-			}
-		}, this);
-
-		return this;
-	},
-
-	elementEnter: function(event, element){
-		clearTimeout(this.timer);
-		this.timer = (function(){
-			this.container.empty();
-			var showTip = !this.options.hideEmpty;
-			['title', 'text'].each(function(value){
-				var content = element.retrieve('tip:' + value);
-				var div = this['_' + value + 'Element'] = new Element('div', {
-					'class': 'tip-' + value
-				}).inject(this.container);
-				if (content){
-					this.fill(div, content);
-					showTip = true;
-				}
-			}, this);
-			if (showTip){
-				this.show(element);
-			} else {
-				this.hide(element);
-			}
-			this.position((this.options.fixed) ? {page: element.getPosition()} : event);
-		}).delay(this.options.showDelay, this);
-	},
-
-	elementLeave: function(event, element){
-		clearTimeout(this.timer);
-		this.timer = this.hide.delay(this.options.hideDelay, this, element);
-		this.fireForParent(event, element);
-	},
-
-	setTitle: function(title){
-		if (this._titleElement){
-			this._titleElement.empty();
-			this.fill(this._titleElement, title);
-		}
-		return this;
-	},
-
-	setText: function(text){
-		if (this._textElement){
-			this._textElement.empty();
-			this.fill(this._textElement, text);
-		}
-		return this;
-	},
-
-	fireForParent: function(event, element){
-		element = element.getParent();
-		if (!element || element == document.body) return;
-		if (element.retrieve('tip:enter')) element.fireEvent('mouseenter', event);
-		else this.fireForParent(event, element);
-	},
-
-	elementMove: function(event, element){
-		this.position(event);
-	},
-
-	position: function(event){
-		if (!this.tip) document.id(this);
-
-		var size = window.getSize(), scroll = window.getScroll(),
-			tip = {x: this.tip.offsetWidth, y: this.tip.offsetHeight},
-			props = {x: 'left', y: 'top'},
-			bounds = {y: false, x2: false, y2: false, x: false},
-			obj = {};
-
-		for (var z in props){
-			obj[props[z]] = event.page[z] + this.options.offset[z];
-			if (obj[props[z]] < 0) bounds[z] = true;
-			if ((obj[props[z]] + tip[z] - scroll[z]) > size[z] - this.options.windowPadding[z]){
-				obj[props[z]] = event.page[z] - this.options.offset[z] - tip[z];
-				bounds[z+'2'] = true;
-			}
-		}
-
-		this.fireEvent('bound', bounds);
-		this.tip.setStyles(obj);
-	},
-
-	fill: function(element, contents){
-		if (typeof contents == 'string') element.set('html', contents);
-		else element.adopt(contents);
-	},
-
-	show: function(element){
-		if (!this.tip) document.id(this);
-		if (!this.tip.getParent()) this.tip.inject(document.body);
-		this.fireEvent('show', [this.tip, element]);
-	},
-
-	hide: function(element){
-		if (!this.tip) document.id(this);
-		this.fireEvent('hide', [this.tip, element]);
-	}
-
-});
-
-})();
-
-/*
----
-name: Locale.CH.Number
-description: Number messages for Switzerland.
-license: MIT-style license
-authors:
-  - Kim D. Jeker
-requires:
-  - Locale
-provides: [Locale.CH.Number]
-...
-*/
-
-Locale.define('CH', 'Number', {
-
-	decimal: ',',
-	group: '\'',
-
-	currency: {
-		decimal: '.',
-		suffix: ' CHF'
-	}
-
-});
-
-/*
----
-
-name: Locale.EU.Number
-
-description: Number messages for Europe.
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-
-requires:
-  - Locale
-
-provides: [Locale.EU.Number]
-
-...
-*/
-
-Locale.define('EU', 'Number', {
-
-	decimal: ',',
-	group: '.',
-
-	currency: {
-		prefix: '€ '
-	}
-
-});
-
-/*
----
-
-script: Locale.Set.From.js
-
-name: Locale.Set.From
-
-description: Provides an alternative way to create Locale.Set objects.
-
-license: MIT-style license
-
-authors:
-  - Tim Wienk
-
-requires:
-  - Core/JSON
-  - Locale
-
-provides: Locale.Set.From
-
-...
-*/
-
-(function(){
-
-var parsers = {
-	'json': JSON.decode
-};
-
-Locale.Set.defineParser = function(name, fn){
-	parsers[name] = fn;
-};
-
-Locale.Set.from = function(set, type){
-	if (instanceOf(set, Locale.Set)) return set;
-
-	if (!type && typeOf(set) == 'string') type = 'json';
-	if (parsers[type]) set = parsers[type](set);
-
-	var locale = new Locale.Set;
-
-	locale.sets = set.sets || {};
-
-	if (set.inherits){
-		locale.inherits.locales = Array.convert(set.inherits.locales);
-		locale.inherits.sets = set.inherits.sets || {};
-	}
-
-	return locale;
-};
-
-})();
-
-/*
----
-
-name: Locale.ZA.Number
-
-description: Number messages for ZA.
-
-license: MIT-style license
-
-authors:
-  - Werner Mollentze
-
-requires:
-  - Locale
-
-provides: [Locale.ZA.Number]
-
-...
-*/
-
-Locale.define('ZA', 'Number', {
-
-	decimal: '.',
-	group: ',',
-
-	currency: {
-		prefix: 'R '
-	}
-
-});
-
-
-
-/*
----
-
-name: Locale.af-ZA.Date
-
-description: Date messages for ZA Afrikaans.
-
-license: MIT-style license
-
-authors:
-  - Werner Mollentze
-
-requires:
-  - Locale
-
-provides: [Locale.af-ZA.Date]
-
-...
-*/
-
-Locale.define('af-ZA', 'Date', {
-
-	months: ['Januarie', 'Februarie', 'Maart', 'April', 'Mei', 'Junie', 'Julie', 'Augustus', 'September', 'Oktober', 'November', 'Desember'],
-	months_abbr: ['Jan', 'Feb', 'Mrt', 'Apr', 'Mei', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
-	days: ['Sondag', 'Maandag', 'Dinsdag', 'Woensdag', 'Donderdag', 'Vrydag', 'Saterdag'],
-	days_abbr: ['Son', 'Maa', 'Din', 'Woe', 'Don', 'Vry', 'Sat'],
-
-	// Culture's date order: MM/DD/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d-%m-%Y',
-	shortTime: '%H:%M',
-	AM: 'VM',
-	PM: 'NM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: function(dayOfMonth){
-		return ((dayOfMonth > 1 && dayOfMonth < 20 && dayOfMonth != 8) || (dayOfMonth > 100 && dayOfMonth.toString().substr(-2, 1) == '1')) ? 'de' : 'ste';
-	},
-
-	lessThanMinuteAgo: 'minder as \'n minuut gelede',
-	minuteAgo: 'ongeveer \'n minuut gelede',
-	minutesAgo: '{delta} minute gelede',
-	hourAgo: 'omtret \'n uur gelede',
-	hoursAgo: 'ongeveer {delta} ure gelede',
-	dayAgo: '1 dag gelede',
-	daysAgo: '{delta} dae gelede',
-	weekAgo: '1 week gelede',
-	weeksAgo: '{delta} weke gelede',
-	monthAgo: '1 maand gelede',
-	monthsAgo: '{delta} maande gelede',
-	yearAgo: '1 jaar gelede',
-	yearsAgo: '{delta} jare gelede',
-
-	lessThanMinuteUntil: 'oor minder as \'n minuut',
-	minuteUntil: 'oor ongeveer \'n minuut',
-	minutesUntil: 'oor {delta} minute',
-	hourUntil: 'oor ongeveer \'n uur',
-	hoursUntil: 'oor {delta} uur',
-	dayUntil: 'oor ongeveer \'n dag',
-	daysUntil: 'oor {delta} dae',
-	weekUntil: 'oor \'n week',
-	weeksUntil: 'oor {delta} weke',
-	monthUntil: 'oor \'n maand',
-	monthsUntil: 'oor {delta} maande',
-	yearUntil: 'oor \'n jaar',
-	yearsUntil: 'oor {delta} jaar'
-
-});
-
-/*
----
-
-name: Locale.af-ZA.Form.Validator
-
-description: Form Validator messages for Afrikaans.
-
-license: MIT-style license
-
-authors:
-  - Werner Mollentze
-
-requires:
-  - Locale
-
-provides: [Locale.af-ZA.Form.Validator]
-
-...
-*/
-
-Locale.define('af-ZA', 'FormValidator', {
-
-	required: 'Hierdie veld word vereis.',
-	length: 'Voer asseblief {length} karakters in (u het {elLength} karakters ingevoer)',
-	minLength: 'Voer asseblief ten minste {minLength} karakters in (u het {length} karakters ingevoer).',
-	maxLength: 'Moet asseblief nie meer as {maxLength} karakters invoer nie (u het {length} karakters ingevoer).',
-	integer: 'Voer asseblief \'n heelgetal in hierdie veld in. Getalle met desimale (bv. 1.25) word nie toegelaat nie.',
-	numeric: 'Voer asseblief slegs numeriese waardes in hierdie veld in (bv. "1" of "1.1" of "-1" of "-1.1").',
-	digits: 'Gebruik asseblief slegs nommers en punktuasie in hierdie veld. (by voorbeeld, \'n telefoon nommer wat koppeltekens en punte bevat is toelaatbaar).',
-	alpha: 'Gebruik asseblief slegs letters (a-z) binne-in hierdie veld. Geen spasies of ander karakters word toegelaat nie.',
-	alphanum: 'Gebruik asseblief slegs letters (a-z) en nommers (0-9) binne-in hierdie veld. Geen spasies of ander karakters word toegelaat nie.',
-	dateSuchAs: 'Voer asseblief \'n geldige datum soos {date} in',
-	dateInFormatMDY: 'Voer asseblief \'n geldige datum soos MM/DD/YYYY in (bv. "12/31/1999")',
-	email: 'Voer asseblief \'n geldige e-pos adres in. Byvoorbeeld "fred@domain.com".',
-	url: 'Voer asseblief \'n geldige bronadres (URL) soos http://www.example.com in.',
-	currencyDollar: 'Voer asseblief \'n geldige $ bedrag in. Byvoorbeeld $100.00 .',
-	oneRequired: 'Voer asseblief iets in vir ten minste een van hierdie velde.',
-	errorPrefix: 'Fout: ',
-	warningPrefix: 'Waarskuwing: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Daar mag geen spasies in hierdie toevoer wees nie.',
-	reqChkByNode: 'Geen items is gekies nie.',
-	requiredChk: 'Hierdie veld word vereis.',
-	reqChkByName: 'Kies asseblief \'n {label}.',
-	match: 'Hierdie veld moet by die {matchName} veld pas',
-	startDate: 'die begin datum',
-	endDate: 'die eind datum',
-	currentDate: 'die huidige datum',
-	afterDate: 'Die datum moet dieselfde of na {label} wees.',
-	beforeDate: 'Die datum moet dieselfde of voor {label} wees.',
-	startMonth: 'Kies asseblief \'n begin maand',
-	sameMonth: 'Hierdie twee datums moet in dieselfde maand wees - u moet een of beide verander.',
-	creditcard: 'Die ingevoerde kredietkaart nommer is ongeldig. Bevestig asseblief die nommer en probeer weer. {length} syfers is ingevoer.'
-
-});
-
-/*
----
-
-name: Locale.af-ZA.Number
-
-description: Number messages for ZA Afrikaans.
-
-license: MIT-style license
-
-authors:
-  - Werner Mollentze
-
-requires:
-  - Locale
-  - Locale.ZA.Number
-
-provides: [Locale.af-ZA.Number]
-
-...
-*/
-
-Locale.define('af-ZA').inherit('ZA', 'Number');
-
-/*
----
-
-name: Locale.ar.Date
-
-description: Date messages for Arabic.
-
-license: MIT-style license
-
-authors:
-  - Chafik Barbar
-
-requires:
-  - Locale
-
-provides: [Locale.ar.Date]
-
-...
-*/
-
-Locale.define('ar', 'Date', {
-
-	// Culture's date order: DD/MM/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%H:%M'
-
-});
-
-/*
----
-
-name: Locale.ar.Form.Validator
-
-description: Form Validator messages for Arabic.
-
-license: MIT-style license
-
-authors:
-  - Chafik Barbar
-
-requires:
-  - Locale
-
-provides: [Locale.ar.Form.Validator]
-
-...
-*/
-
-Locale.define('ar', 'FormValidator', {
-
-	required: 'هذا الحقل مطلوب.',
-	minLength: 'رجاءً إدخال {minLength} أحرف على الأقل (تم إدخال {length} أحرف).',
-	maxLength: 'الرجاء عدم إدخال أكثر من {maxLength} أحرف (تم إدخال {length} أحرف).',
-	integer: 'الرجاء إدخال عدد صحيح في هذا الحقل. أي رقم ذو كسر عشري أو مئوي (مثال 1.25 ) غير مسموح.',
-	numeric: 'الرجاء إدخال قيم رقمية في هذا الحقل (مثال "1" أو "1.1" أو "-1" أو "-1.1").',
-	digits: 'الرجاء أستخدام قيم رقمية وعلامات ترقيمية فقط في هذا الحقل (مثال, رقم هاتف مع نقطة أو شحطة)',
-	alpha: 'الرجاء أستخدام أحرف فقط (ا-ي) في هذا الحقل. أي فراغات أو علامات غير مسموحة.',
-	alphanum: 'الرجاء أستخدام أحرف فقط (ا-ي) أو أرقام (0-9) فقط في هذا الحقل. أي فراغات أو علامات غير مسموحة.',
-	dateSuchAs: 'الرجاء إدخال تاريخ صحيح كالتالي {date}',
-	dateInFormatMDY: 'الرجاء إدخال تاريخ صحيح (مثال, 31-12-1999)',
-	email: 'الرجاء إدخال بريد إلكتروني صحيح.',
-	url: 'الرجاء إدخال عنوان إلكتروني صحيح مثل http://www.example.com',
-	currencyDollar: 'الرجاء إدخال قيمة $ صحيحة. مثال, 100.00$',
-	oneRequired: 'الرجاء إدخال قيمة في أحد هذه الحقول على الأقل.',
-	errorPrefix: 'خطأ: ',
-	warningPrefix: 'تحذير: '
-
-});
-
-/*
----
-
-name: Locale.ca-CA.Date
-
-description: Date messages for Catalan.
-
-license: MIT-style license
-
-authors:
-  - Ãlfons Sanchez
-
-requires:
-  - Locale
-
-provides: [Locale.ca-CA.Date]
-
-...
-*/
-
-Locale.define('ca-CA', 'Date', {
-
-	months: ['Gener', 'Febrer', 'Març', 'Abril', 'Maig', 'Juny', 'Juli', 'Agost', 'Setembre', 'Octubre', 'Novembre', 'Desembre'],
-	months_abbr: ['gen.', 'febr.', 'març', 'abr.', 'maig', 'juny', 'jul.', 'ag.', 'set.', 'oct.', 'nov.', 'des.'],
-	days: ['Diumenge', 'Dilluns', 'Dimarts', 'Dimecres', 'Dijous', 'Divendres', 'Dissabte'],
-	days_abbr: ['dg', 'dl', 'dt', 'dc', 'dj', 'dv', 'ds'],
-
-	// Culture's date order: DD/MM/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 0,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: 'fa menys d`un minut',
-	minuteAgo: 'fa un minut',
-	minutesAgo: 'fa {delta} minuts',
-	hourAgo: 'fa un hora',
-	hoursAgo: 'fa unes {delta} hores',
-	dayAgo: 'fa un dia',
-	daysAgo: 'fa {delta} dies',
-
-	lessThanMinuteUntil: 'menys d`un minut des d`ara',
-	minuteUntil: 'un minut des d`ara',
-	minutesUntil: '{delta} minuts des d`ara',
-	hourUntil: 'un hora des d`ara',
-	hoursUntil: 'unes {delta} hores des d`ara',
-	dayUntil: '1 dia des d`ara',
-	daysUntil: '{delta} dies des d`ara'
-
-});
-
-/*
----
-
-name: Locale.ca-CA.Form.Validator
-
-description: Form Validator messages for Catalan.
-
-license: MIT-style license
-
-authors:
-  - Miquel Hudin
-  - Ãlfons Sanchez
-
-requires:
-  - Locale
-
-provides: [Locale.ca-CA.Form.Validator]
-
-...
-*/
-
-Locale.define('ca-CA', 'FormValidator', {
-
-	required: 'Aquest camp es obligatori.',
-	minLength: 'Per favor introdueix al menys {minLength} caracters (has introduit {length} caracters).',
-	maxLength: 'Per favor introdueix no mes de {maxLength} caracters (has introduit {length} caracters).',
-	integer: 'Per favor introdueix un nombre enter en aquest camp. Nombres amb decimals (p.e. 1,25) no estan permesos.',
-	numeric: 'Per favor introdueix sols valors numerics en aquest camp (p.e. "1" o "1,1" o "-1" o "-1,1").',
-	digits: 'Per favor usa sols numeros i puntuacio en aquest camp (per exemple, un nombre de telefon amb guions i punts no esta permes).',
-	alpha: 'Per favor utilitza lletres nomes (a-z) en aquest camp. No s´admiteixen espais ni altres caracters.',
-	alphanum: 'Per favor, utilitza nomes lletres (a-z) o numeros (0-9) en aquest camp. No s´admiteixen espais ni altres caracters.',
-	dateSuchAs: 'Per favor introdueix una data valida com {date}',
-	dateInFormatMDY: 'Per favor introdueix una data valida com DD/MM/YYYY (p.e. "31/12/1999")',
-	email: 'Per favor, introdueix una adreça de correu electronic valida. Per exemple, "fred@domain.com".',
-	url: 'Per favor introdueix una URL valida com http://www.example.com.',
-	currencyDollar: 'Per favor introdueix una quantitat valida de €. Per exemple €100,00 .',
-	oneRequired: 'Per favor introdueix alguna cosa per al menys una d´aquestes entrades.',
-	errorPrefix: 'Error: ',
-	warningPrefix: 'Avis: ',
-
-	// Form.Validator.Extras
-	noSpace: 'No poden haver espais en aquesta entrada.',
-	reqChkByNode: 'No hi han elements seleccionats.',
-	requiredChk: 'Aquest camp es obligatori.',
-	reqChkByName: 'Per favor selecciona una {label}.',
-	match: 'Aquest camp necessita coincidir amb el camp {matchName}',
-	startDate: 'la data de inici',
-	endDate: 'la data de fi',
-	currentDate: 'la data actual',
-	afterDate: 'La data deu ser igual o posterior a {label}.',
-	beforeDate: 'La data deu ser igual o anterior a {label}.',
-	startMonth: 'Per favor selecciona un mes d´orige',
-	sameMonth: 'Aquestes dos dates deuen estar dins del mateix mes - deus canviar una o altra.'
-
-});
-
-/*
----
-
-name: Locale.cs-CZ.Date
-
-description: Date messages for Czech.
-
-license: MIT-style license
-
-authors:
-  - Jan Černý chemiX
-  - Christopher Zukowski
-
-requires:
-  - Locale
-
-provides: [Locale.cs-CZ.Date]
-
-...
-*/
-(function(){
-
-// Czech language pluralization rules, see http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
-// one -> n is 1;            1
-// few -> n in 2..4;         2-4
-// other -> everything else  0, 5-999, 1.31, 2.31, 5.31...
-var pluralize = function(n, one, few, other){
-	if (n == 1) return one;
-	else if (n == 2 || n == 3 || n == 4) return few;
-	else return other;
-};
-
-Locale.define('cs-CZ', 'Date', {
-
-	months: ['Leden', 'Únor', 'Březen', 'Duben', 'Květen', 'Červen', 'Červenec', 'Srpen', 'Září', 'Říjen', 'Listopad', 'Prosinec'],
-	months_abbr: ['ledna', 'února', 'března', 'dubna', 'května', 'června', 'července', 'srpna', 'září', 'října', 'listopadu', 'prosince'],
-	days: ['Neděle', 'Pondělí', 'Úterý', 'Středa', 'Čtvrtek', 'Pátek', 'Sobota'],
-	days_abbr: ['ne', 'po', 'út', 'st', 'čt', 'pá', 'so'],
-
-	// Culture's date order: DD.MM.YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d.%m.%Y',
-	shortTime: '%H:%M',
-	AM: 'dop.',
-	PM: 'odp.',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '.',
-
-	lessThanMinuteAgo: 'před chvílí',
-	minuteAgo: 'přibližně před minutou',
-	minutesAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'minutou', 'minutami', 'minutami'); },
-	hourAgo: 'přibližně před hodinou',
-	hoursAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'hodinou', 'hodinami', 'hodinami'); },
-	dayAgo: 'před dnem',
-	daysAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'dnem', 'dny', 'dny'); },
-	weekAgo: 'před týdnem',
-	weeksAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'týdnem', 'týdny', 'týdny'); },
-	monthAgo: 'před měsícem',
-	monthsAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'měsícem', 'měsíci', 'měsíci'); },
-	yearAgo: 'před rokem',
-	yearsAgo: function(delta){ return 'před {delta} ' + pluralize(delta, 'rokem', 'lety', 'lety'); },
-
-	lessThanMinuteUntil: 'za chvíli',
-	minuteUntil: 'přibližně za minutu',
-	minutesUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'minutu', 'minuty', 'minut'); },
-	hourUntil: 'přibližně za hodinu',
-	hoursUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'hodinu', 'hodiny', 'hodin'); },
-	dayUntil: 'za den',
-	daysUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'den', 'dny', 'dnů'); },
-	weekUntil: 'za týden',
-	weeksUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'týden', 'týdny', 'týdnů'); },
-	monthUntil: 'za měsíc',
-	monthsUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'měsíc', 'měsíce', 'měsíců'); },
-	yearUntil: 'za rok',
-	yearsUntil: function(delta){ return 'za {delta} ' + pluralize(delta, 'rok', 'roky', 'let'); }
-});
-
-})();
-
-/*
----
-
-name: Locale.cs-CZ.Form.Validator
-
-description: Form Validator messages for Czech.
-
-license: MIT-style license
-
-authors:
-  - Jan Černý chemiX
-
-requires:
-  - Locale
-
-provides: [Locale.cs-CZ.Form.Validator]
-
-...
-*/
-
-Locale.define('cs-CZ', 'FormValidator', {
-
-	required: 'Tato položka je povinná.',
-	minLength: 'Zadejte prosím alespoň {minLength} znaků (napsáno {length} znaků).',
-	maxLength: 'Zadejte prosím méně než {maxLength} znaků (nápsáno {length} znaků).',
-	integer: 'Zadejte prosím celé číslo. Desetinná čísla (např. 1.25) nejsou povolena.',
-	numeric: 'Zadejte jen číselné hodnoty (tj. "1" nebo "1.1" nebo "-1" nebo "-1.1").',
-	digits: 'Zadejte prosím pouze čísla a interpunkční znaménka(například telefonní číslo s pomlčkami nebo tečkami je povoleno).',
-	alpha: 'Zadejte prosím pouze písmena (a-z). Mezery nebo jiné znaky nejsou povoleny.',
-	alphanum: 'Zadejte prosím pouze písmena (a-z) nebo číslice (0-9). Mezery nebo jiné znaky nejsou povoleny.',
-	dateSuchAs: 'Zadejte prosím platné datum jako {date}',
-	dateInFormatMDY: 'Zadejte prosím platné datum jako MM / DD / RRRR (tj. "12/31/1999")',
-	email: 'Zadejte prosím platnou e-mailovou adresu. Například "fred@domain.com".',
-	url: 'Zadejte prosím platnou URL adresu jako http://www.example.com.',
-	currencyDollar: 'Zadejte prosím platnou částku. Například $100.00.',
-	oneRequired: 'Zadejte prosím alespoň jednu hodnotu pro tyto položky.',
-	errorPrefix: 'Chyba: ',
-	warningPrefix: 'Upozornění: ',
-
-	// Form.Validator.Extras
-	noSpace: 'V této položce nejsou povoleny mezery',
-	reqChkByNode: 'Nejsou vybrány žádné položky.',
-	requiredChk: 'Tato položka je vyžadována.',
-	reqChkByName: 'Prosím vyberte {label}.',
-	match: 'Tato položka se musí shodovat s položkou {matchName}',
-	startDate: 'datum zahájení',
-	endDate: 'datum ukončení',
-	currentDate: 'aktuální datum',
-	afterDate: 'Datum by mělo být stejné nebo větší než {label}.',
-	beforeDate: 'Datum by mělo být stejné nebo menší než {label}.',
-	startMonth: 'Vyberte počáteční měsíc.',
-	sameMonth: 'Tyto dva datumy musí být ve stejném měsíci - změňte jeden z nich.',
-	creditcard: 'Zadané číslo kreditní karty je neplatné. Prosím opravte ho. Bylo zadáno {length} čísel.'
-
-});
-
-/*
----
-
-name: Locale.da-DK.Date
-
-description: Date messages for Danish.
-
-license: MIT-style license
-
-authors:
-  - Martin Overgaard
-  - Henrik Hansen
-
-requires:
-  - Locale
-
-provides: [Locale.da-DK.Date]
-
-...
-*/
-
-Locale.define('da-DK', 'Date', {
-
-	months: ['Januar', 'Februar', 'Marts', 'April', 'Maj', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'December'],
-	months_abbr: ['jan.', 'feb.', 'mar.', 'apr.', 'maj.', 'jun.', 'jul.', 'aug.', 'sep.', 'okt.', 'nov.', 'dec.'],
-	days: ['Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'],
-	days_abbr: ['søn', 'man', 'tir', 'ons', 'tor', 'fre', 'lør'],
-
-	// Culture's date order: DD-MM-YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d-%m-%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '.',
-
-	lessThanMinuteAgo: 'mindre end et minut siden',
-	minuteAgo: 'omkring et minut siden',
-	minutesAgo: '{delta} minutter siden',
-	hourAgo: 'omkring en time siden',
-	hoursAgo: 'omkring {delta} timer siden',
-	dayAgo: '1 dag siden',
-	daysAgo: '{delta} dage siden',
-	weekAgo: '1 uge siden',
-	weeksAgo: '{delta} uger siden',
-	monthAgo: '1 måned siden',
-	monthsAgo: '{delta} måneder siden',
-	yearAgo: '1 år siden',
-	yearsAgo: '{delta} år siden',
-
-	lessThanMinuteUntil: 'mindre end et minut fra nu',
-	minuteUntil: 'omkring et minut fra nu',
-	minutesUntil: '{delta} minutter fra nu',
-	hourUntil: 'omkring en time fra nu',
-	hoursUntil: 'omkring {delta} timer fra nu',
-	dayUntil: '1 dag fra nu',
-	daysUntil: '{delta} dage fra nu',
-	weekUntil: '1 uge fra nu',
-	weeksUntil: '{delta} uger fra nu',
-	monthUntil: '1 måned fra nu',
-	monthsUntil: '{delta} måneder fra nu',
-	yearUntil: '1 år fra nu',
-	yearsUntil: '{delta} år fra nu'
-
-});
-
-/*
----
-
-name: Locale.da-DK.Form.Validator
-
-description: Form Validator messages for Danish.
-
-license: MIT-style license
-
-authors:
-  - Martin Overgaard
-
-requires:
-  - Locale
-
-provides: [Locale.da-DK.Form.Validator]
-
-...
-*/
-
-Locale.define('da-DK', 'FormValidator', {
-
-	required: 'Feltet skal udfyldes.',
-	minLength: 'Skriv mindst {minLength} tegn (du skrev {length} tegn).',
-	maxLength: 'Skriv maksimalt {maxLength} tegn (du skrev {length} tegn).',
-	integer: 'Skriv et tal i dette felt. Decimal tal (f.eks. 1.25) er ikke tilladt.',
-	numeric: 'Skriv kun tal i dette felt (i.e. "1" eller "1.1" eller "-1" eller "-1.1").',
-	digits: 'Skriv kun tal og tegnsætning i dette felt (eksempel, et telefon nummer med bindestreg eller punktum er tilladt).',
-	alpha: 'Skriv kun bogstaver (a-z) i dette felt. Mellemrum og andre tegn er ikke tilladt.',
-	alphanum: 'Skriv kun bogstaver (a-z) eller tal (0-9) i dette felt. Mellemrum og andre tegn er ikke tilladt.',
-	dateSuchAs: 'Skriv en gyldig dato som {date}',
-	dateInFormatMDY: 'Skriv dato i formatet DD-MM-YYYY (f.eks. "31-12-1999")',
-	email: 'Skriv en gyldig e-mail adresse. F.eks "fred@domain.com".',
-	url: 'Skriv en gyldig URL adresse. F.eks "http://www.example.com".',
-	currencyDollar: 'Skriv et gldigt beløb. F.eks Kr.100.00 .',
-	oneRequired: 'Et eller flere af felterne i denne formular skal udfyldes.',
-	errorPrefix: 'Fejl: ',
-	warningPrefix: 'Advarsel: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Der må ikke benyttes mellemrum i dette felt.',
-	reqChkByNode: 'Foretag et valg.',
-	requiredChk: 'Dette felt skal udfyldes.',
-	reqChkByName: 'Vælg en {label}.',
-	match: 'Dette felt skal matche {matchName} feltet',
-	startDate: 'start dato',
-	endDate: 'slut dato',
-	currentDate: 'dags dato',
-	afterDate: 'Datoen skal være større end eller lig med {label}.',
-	beforeDate: 'Datoen skal være mindre end eller lig med {label}.',
-	startMonth: 'Vælg en start måned',
-	sameMonth: 'De valgte datoer skal være i samme måned - skift en af dem.'
-
-});
-
-/*
----
-
-name: Locale.de-DE.Date
-
-description: Date messages for German.
-
-license: MIT-style license
-
-authors:
-  - Christoph Pojer
-  - Frank Rossi
-  - Ulrich Petri
-  - Fabian Beiner
-
-requires:
-  - Locale
-
-provides: [Locale.de-DE.Date]
-
-...
-*/
-
-Locale.define('de-DE', 'Date', {
-
-	months: ['Januar', 'Februar', 'März', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Dezember'],
-	months_abbr: ['Jan', 'Feb', 'Mär', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Dez'],
-	days: ['Sonntag', 'Montag', 'Dienstag', 'Mittwoch', 'Donnerstag', 'Freitag', 'Samstag'],
-	days_abbr: ['So', 'Mo', 'Di', 'Mi', 'Do', 'Fr', 'Sa'],
-
-	// Culture's date order: DD.MM.YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d.%m.%Y',
-	shortTime: '%H:%M',
-	AM: 'vormittags',
-	PM: 'nachmittags',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '.',
-
-	lessThanMinuteAgo: 'vor weniger als einer Minute',
-	minuteAgo: 'vor einer Minute',
-	minutesAgo: 'vor {delta} Minuten',
-	hourAgo: 'vor einer Stunde',
-	hoursAgo: 'vor {delta} Stunden',
-	dayAgo: 'vor einem Tag',
-	daysAgo: 'vor {delta} Tagen',
-	weekAgo: 'vor einer Woche',
-	weeksAgo: 'vor {delta} Wochen',
-	monthAgo: 'vor einem Monat',
-	monthsAgo: 'vor {delta} Monaten',
-	yearAgo: 'vor einem Jahr',
-	yearsAgo: 'vor {delta} Jahren',
-
-	lessThanMinuteUntil: 'in weniger als einer Minute',
-	minuteUntil: 'in einer Minute',
-	minutesUntil: 'in {delta} Minuten',
-	hourUntil: 'in ca. einer Stunde',
-	hoursUntil: 'in ca. {delta} Stunden',
-	dayUntil: 'in einem Tag',
-	daysUntil: 'in {delta} Tagen',
-	weekUntil: 'in einer Woche',
-	weeksUntil: 'in {delta} Wochen',
-	monthUntil: 'in einem Monat',
-	monthsUntil: 'in {delta} Monaten',
-	yearUntil: 'in einem Jahr',
-	yearsUntil: 'in {delta} Jahren'
-
-});
-
-/*
----
-
-name: Locale.de-CH.Date
-
-description: Date messages for German (Switzerland).
-
-license: MIT-style license
-
-authors:
-  - Michael van der Weg
-
-requires:
-  - Locale
-  - Locale.de-DE.Date
-
-provides: [Locale.de-CH.Date]
-
-...
-*/
-
-Locale.define('de-CH').inherit('de-DE', 'Date');
-
-/*
----
-
-name: Locale.de-CH.Form.Validator
-
-description: Form Validator messages for German (Switzerland).
-
-license: MIT-style license
-
-authors:
-  - Michael van der Weg
-
-requires:
-  - Locale
-
-provides: [Locale.de-CH.Form.Validator]
-
-...
-*/
-
-Locale.define('de-CH', 'FormValidator', {
-
-	required: 'Dieses Feld ist obligatorisch.',
-	minLength: 'Geben Sie bitte mindestens {minLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).',
-	maxLength: 'Bitte geben Sie nicht mehr als {maxLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).',
-	integer: 'Geben Sie bitte eine ganze Zahl ein. Dezimalzahlen (z.B. 1.25) sind nicht erlaubt.',
-	numeric: 'Geben Sie bitte nur Zahlenwerte in dieses Eingabefeld ein (z.B. &quot;1&quot;, &quot;1.1&quot;, &quot;-1&quot; oder &quot;-1.1&quot;).',
-	digits: 'Benutzen Sie bitte nur Zahlen und Satzzeichen in diesem Eingabefeld (erlaubt ist z.B. eine Telefonnummer mit Bindestrichen und Punkten).',
-	alpha: 'Benutzen Sie bitte nur Buchstaben (a-z) in diesem Feld. Leerzeichen und andere Zeichen sind nicht erlaubt.',
-	alphanum: 'Benutzen Sie bitte nur Buchstaben (a-z) und Zahlen (0-9) in diesem Eingabefeld. Leerzeichen und andere Zeichen sind nicht erlaubt.',
-	dateSuchAs: 'Geben Sie bitte ein g&uuml;ltiges Datum ein. Wie zum Beispiel {date}',
-	dateInFormatMDY: 'Geben Sie bitte ein g&uuml;ltiges Datum ein. Wie zum Beispiel TT.MM.JJJJ (z.B. &quot;31.12.1999&quot;)',
-	email: 'Geben Sie bitte eine g&uuml;ltige E-Mail Adresse ein. Wie zum Beispiel &quot;maria@bernasconi.ch&quot;.',
-	url: 'Geben Sie bitte eine g&uuml;ltige URL ein. Wie zum Beispiel http://www.example.com.',
-	currencyDollar: 'Geben Sie bitte einen g&uuml;ltigen Betrag in Schweizer Franken ein. Wie zum Beispiel 100.00 CHF .',
-	oneRequired: 'Machen Sie f&uuml;r mindestens eines der Eingabefelder einen Eintrag.',
-	errorPrefix: 'Fehler: ',
-	warningPrefix: 'Warnung: ',
-
-	// Form.Validator.Extras
-	noSpace: 'In diesem Eingabefeld darf kein Leerzeichen sein.',
-	reqChkByNode: 'Es wurden keine Elemente gew&auml;hlt.',
-	requiredChk: 'Dieses Feld ist obligatorisch.',
-	reqChkByName: 'Bitte w&auml;hlen Sie ein {label}.',
-	match: 'Dieses Eingabefeld muss mit dem Feld {matchName} &uuml;bereinstimmen.',
-	startDate: 'Das Anfangsdatum',
-	endDate: 'Das Enddatum',
-	currentDate: 'Das aktuelle Datum',
-	afterDate: 'Das Datum sollte zur gleichen Zeit oder sp&auml;ter sein {label}.',
-	beforeDate: 'Das Datum sollte zur gleichen Zeit oder fr&uuml;her sein {label}.',
-	startMonth: 'W&auml;hlen Sie bitte einen Anfangsmonat',
-	sameMonth: 'Diese zwei Datumsangaben m&uuml;ssen im selben Monat sein - Sie m&uuml;ssen eine von beiden ver&auml;ndern.',
-	creditcard: 'Die eingegebene Kreditkartennummer ist ung&uuml;ltig. Bitte &uuml;berpr&uuml;fen Sie diese und versuchen Sie es erneut. {length} Zahlen eingegeben.'
-
-});
-
-/*
----
-name: Locale.de-CH.Number
-description: Number messages for Switzerland.
-license: MIT-style license
-authors:
-  - Kim D. Jeker
-requires:
-  - Locale
-  - Locale.CH.Number
-provides: [Locale.de-CH.Number]
-...
-*/
-
-Locale.define('de-CH').inherit('CH', 'Number');
-
-/*
----
-
-name: Locale.de-DE.Form.Validator
-
-description: Form Validator messages for German.
-
-license: MIT-style license
-
-authors:
-  - Frank Rossi
-  - Ulrich Petri
-  - Fabian Beiner
-
-requires:
-  - Locale
-
-provides: [Locale.de-DE.Form.Validator]
-
-...
-*/
-
-Locale.define('de-DE', 'FormValidator', {
-
-	required: 'Dieses Eingabefeld muss ausgefüllt werden.',
-	minLength: 'Geben Sie bitte mindestens {minLength} Zeichen ein (Sie haben nur {length} Zeichen eingegeben).',
-	maxLength: 'Geben Sie bitte nicht mehr als {maxLength} Zeichen ein (Sie haben {length} Zeichen eingegeben).',
-	integer: 'Geben Sie in diesem Eingabefeld bitte eine ganze Zahl ein. Dezimalzahlen (z.B. "1.25") sind nicht erlaubt.',
-	numeric: 'Geben Sie in diesem Eingabefeld bitte nur Zahlenwerte (z.B. "1", "1.1", "-1" oder "-1.1") ein.',
-	digits: 'Geben Sie in diesem Eingabefeld bitte nur Zahlen und Satzzeichen ein (z.B. eine Telefonnummer mit Bindestrichen und Punkten ist erlaubt).',
-	alpha: 'Geben Sie in diesem Eingabefeld bitte nur Buchstaben (a-z) ein. Leerzeichen und andere Zeichen sind nicht erlaubt.',
-	alphanum: 'Geben Sie in diesem Eingabefeld bitte nur Buchstaben (a-z) und Zahlen (0-9) ein. Leerzeichen oder andere Zeichen sind nicht erlaubt.',
-	dateSuchAs: 'Geben Sie bitte ein gültiges Datum ein (z.B. "{date}").',
-	dateInFormatMDY: 'Geben Sie bitte ein gültiges Datum im Format TT.MM.JJJJ ein (z.B. "31.12.1999").',
-	email: 'Geben Sie bitte eine gültige E-Mail-Adresse ein (z.B. "max@mustermann.de").',
-	url: 'Geben Sie bitte eine gültige URL ein (z.B. "http://www.example.com").',
-	currencyDollar: 'Geben Sie bitte einen gültigen Betrag in EURO ein (z.B. 100.00€).',
-	oneRequired: 'Bitte füllen Sie mindestens ein Eingabefeld aus.',
-	errorPrefix: 'Fehler: ',
-	warningPrefix: 'Warnung: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Es darf kein Leerzeichen in diesem Eingabefeld sein.',
-	reqChkByNode: 'Es wurden keine Elemente gewählt.',
-	requiredChk: 'Dieses Feld muss ausgefüllt werden.',
-	reqChkByName: 'Bitte wählen Sie ein {label}.',
-	match: 'Dieses Eingabefeld muss mit dem {matchName} Eingabefeld übereinstimmen.',
-	startDate: 'Das Anfangsdatum',
-	endDate: 'Das Enddatum',
-	currentDate: 'Das aktuelle Datum',
-	afterDate: 'Das Datum sollte zur gleichen Zeit oder später sein als {label}.',
-	beforeDate: 'Das Datum sollte zur gleichen Zeit oder früher sein als {label}.',
-	startMonth: 'Wählen Sie bitte einen Anfangsmonat',
-	sameMonth: 'Diese zwei Datumsangaben müssen im selben Monat sein - Sie müssen eines von beiden verändern.',
-	creditcard: 'Die eingegebene Kreditkartennummer ist ungültig. Bitte überprüfen Sie diese und versuchen Sie es erneut. {length} Zahlen eingegeben.'
-
-});
-
-/*
----
-
-name: Locale.de-DE.Number
-
-description: Number messages for German.
-
-license: MIT-style license
-
-authors:
-  - Christoph Pojer
-
-requires:
-  - Locale
-  - Locale.EU.Number
-
-provides: [Locale.de-DE.Number]
-
-...
-*/
-
-Locale.define('de-DE').inherit('EU', 'Number');
-
-/*
----
-
-name: Locale.el-GR.Date
-
-description: Date messages for Greek language.
-
-license: MIT-style license
-
-authors:
-  - Periklis Argiriadis
-
-requires:
-  - Locale
-
-provides: [Locale.el-GR.Date]
-
-...
-*/
-
-Locale.define('el-GR', 'Date', {
-
-	months: ['Ιανουάριος', 'Φεβρουάριος', 'Μάρτιος', 'Απρίλιος', 'Μάιος', 'Ιούνιος', 'Ιούλιος', 'Αύγουστος', 'Σεπτέμβριος', 'Οκτώβριος', 'Νοέμβριος', 'Δεκέμβριος'],
-	months_abbr: ['Ιαν', 'Φεβ', 'Μαρ', 'Απρ', 'Μάι', 'Ιουν', 'Ιουλ', 'Αυγ', 'Σεπ', 'Οκτ', 'Νοε', 'Δεκ'],
-	days: ['Κυριακή', 'Δευτέρα', 'Τρίτη', 'Τετάρτη', 'Πέμπτη', 'Παρασκευή', 'Σάββατο'],
-	days_abbr: ['Κυρ', 'Δευ', 'Τρι', 'Τετ', 'Πεμ', 'Παρ', 'Σαβ'],
-
-	// Culture's date order: DD/MM/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%I:%M%p',
-	AM: 'πμ',
-	PM: 'μμ',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: function(dayOfMonth){
-		// 1st, 2nd, 3rd, etc.
-		return (dayOfMonth > 3 && dayOfMonth < 21) ? 'ος' : ['ος'][Math.min(dayOfMonth % 10, 4)];
-	},
-
-	lessThanMinuteAgo: 'λιγότερο από ένα λεπτό πριν',
-	minuteAgo: 'περίπου ένα λεπτό πριν',
-	minutesAgo: '{delta} λεπτά πριν',
-	hourAgo: 'περίπου μια ώρα πριν',
-	hoursAgo: 'περίπου {delta} ώρες πριν',
-	dayAgo: '1 ημέρα πριν',
-	daysAgo: '{delta} ημέρες πριν',
-	weekAgo: '1 εβδομάδα πριν',
-	weeksAgo: '{delta} εβδομάδες πριν',
-	monthAgo: '1 μήνα πριν',
-	monthsAgo: '{delta} μήνες πριν',
-	yearAgo: '1 χρόνο πριν',
-	yearsAgo: '{delta} χρόνια πριν',
-
-	lessThanMinuteUntil: 'λιγότερο από λεπτό από τώρα',
-	minuteUntil: 'περίπου ένα λεπτό από τώρα',
-	minutesUntil: '{delta} λεπτά από τώρα',
-	hourUntil: 'περίπου μια ώρα από τώρα',
-	hoursUntil: 'περίπου {delta} ώρες από τώρα',
-	dayUntil: '1 ημέρα από τώρα',
-	daysUntil: '{delta} ημέρες από τώρα',
-	weekUntil: '1 εβδομάδα από τώρα',
-	weeksUntil: '{delta} εβδομάδες από τώρα',
-	monthUntil: '1 μήνας από τώρα',
-	monthsUntil: '{delta} μήνες από τώρα',
-	yearUntil: '1 χρόνος από τώρα',
-	yearsUntil: '{delta} χρόνια από τώρα'
-
-});
-
-/*
----
-
-name: Locale.el-GR.Form.Validator
-
-description: Form Validator messages for Greek language.
-
-license: MIT-style license
-
-authors:
-  - Dimitris Tsironis
-
-requires:
-  - Locale
-
-provides: [Locale.el-GR.Form.Validator]
-
-...
-*/
-
-Locale.define('el-GR', 'FormValidator', {
-
-	required: 'Αυτό το πεδίο είναι απαραίτητο.',
-	length: 'Παρακαλούμε, εισάγετε {length} χαρακτήρες (έχετε ήδη εισάγει {elLength} χαρακτήρες).',
-	minLength: 'Παρακαλούμε, εισάγετε τουλάχιστον {minLength} χαρακτήρες (έχετε ήδη εισάγε {length} χαρακτήρες).',
-	maxlength: 'Παρακαλούμε, εισάγετε εώς {maxlength} χαρακτήρες (έχετε ήδη εισάγε {length} χαρακτήρες).',
-	integer: 'Παρακαλούμε, εισάγετε έναν ακέραιο αριθμό σε αυτό το πεδίο. Οι αριθμοί με δεκαδικά ψηφία (π.χ. 1.25) δεν επιτρέπονται.',
-	numeric: 'Παρακαλούμε, εισάγετε μόνο αριθμητικές τιμές σε αυτό το πεδίο (π.χ." 1 " ή " 1.1 " ή " -1 " ή " -1.1 " ).',
-	digits: 'Παρακαλούμε, χρησιμοποιήστε μόνο αριθμούς και σημεία στίξης σε αυτόν τον τομέα (π.χ. επιτρέπεται αριθμός τηλεφώνου με παύλες ή τελείες).',
-	alpha: 'Παρακαλούμε, χρησιμοποιήστε μόνο γράμματα (a-z) σε αυτό το πεδίο. Δεν επιτρέπονται κενά ή άλλοι χαρακτήρες.',
-	alphanum: 'Παρακαλούμε, χρησιμοποιήστε μόνο γράμματα (a-z) ή αριθμούς (0-9) σε αυτόν τον τομέα. Δεν επιτρέπονται κενά ή άλλοι χαρακτήρες.',
-	dateSuchAs: 'Παρακαλούμε, εισάγετε μια έγκυρη ημερομηνία, όπως {date}',
-	dateInFormatMDY: 'Παρακαλώ εισάγετε μια έγκυρη ημερομηνία, όπως ΜΜ/ΗΗ/ΕΕΕΕ (π.χ. "12/31/1999").',
-	email: 'Παρακαλούμε, εισάγετε μια έγκυρη διεύθυνση ηλεκτρονικού ταχυδρομείου (π.χ. "fred@domain.com").',
-	url: 'Παρακαλούμε, εισάγετε μια έγκυρη URL διεύθυνση, όπως http://www.example.com',
-	currencyDollar: 'Παρακαλούμε, εισάγετε ένα έγκυρο ποσό σε δολλάρια (π.χ. $100.00).',
-	oneRequired: 'Παρακαλούμε, εισάγετε κάτι για τουλάχιστον ένα από αυτά τα πεδία.',
-	errorPrefix: 'Σφάλμα: ',
-	warningPrefix: 'Προσοχή: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Δεν επιτρέπονται τα κενά σε αυτό το πεδίο.',
-	reqChkByNode: 'Δεν έχει επιλεγεί κάποιο αντικείμενο',
-	requiredChk: 'Αυτό το πεδίο είναι απαραίτητο.',
-	reqChkByName: 'Παρακαλούμε, επιλέξτε μια ετικέτα {label}.',
-	match: 'Αυτό το πεδίο πρέπει να ταιριάζει με το πεδίο {matchName}.',
-	startDate: 'η ημερομηνία έναρξης',
-	endDate: 'η ημερομηνία λήξης',
-	currentDate: 'η τρέχουσα ημερομηνία',
-	afterDate: 'Η ημερομηνία πρέπει να είναι η ίδια ή μετά από την {label}.',
-	beforeDate: 'Η ημερομηνία πρέπει να είναι η ίδια ή πριν από την {label}.',
-	startMonth: 'Παρακαλώ επιλέξτε ένα μήνα αρχής.',
-	sameMonth: 'Αυτές οι δύο ημερομηνίες πρέπει να έχουν τον ίδιο μήνα - θα πρέπει να αλλάξετε ή το ένα ή το άλλο',
-	creditcard: 'Ο αριθμός της πιστωτικής κάρτας δεν είναι έγκυρος. Παρακαλούμε ελέγξτε τον αριθμό και δοκιμάστε ξανά. {length} μήκος ψηφίων.'
-
-});
-
-/*
----
-
-name: Locale.en-GB.Date
-
-description: Date messages for British English.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Locale
-  - Locale.en-US.Date
-
-provides: [Locale.en-GB.Date]
-
-...
-*/
-
-Locale.define('en-GB', 'Date', {
-
-	// Culture's date order: DD/MM/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%H:%M'
-
-}).inherit('en-US', 'Date');
-
-/*
----
-
-name: Locale.en-US.Number
-
-description: Number messages for US English.
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-
-requires:
-  - Locale
-
-provides: [Locale.en-US.Number]
-
-...
-*/
-
-Locale.define('en-US', 'Number', {
-
-	decimal: '.',
-	group: ',',
-
-/* 	Commented properties are the defaults for Number.format
-	decimals: 0,
-	precision: 0,
-	scientific: null,
-
-	prefix: null,
-	suffic: null,
-
-	// Negative/Currency/percentage will mixin Number
-	negative: {
-		prefix: '-'
-	},*/
-
-	currency: {
-//		decimals: 2,
-		prefix: '$ '
-	}/*,
-
-	percentage: {
-		decimals: 2,
-		suffix: '%'
-	}*/
-
-});
-
-
-
-/*
----
-
-name: Locale.es-ES.Date
-
-description: Date messages for Spanish.
-
-license: MIT-style license
-
-authors:
-  - Ãlfons Sanchez
-
-requires:
-  - Locale
-
-provides: [Locale.es-ES.Date]
-
-...
-*/
-
-Locale.define('es-ES', 'Date', {
-
-	months: ['Enero', 'Febrero', 'Marzo', 'Abril', 'Mayo', 'Junio', 'Julio', 'Agosto', 'Septiembre', 'Octubre', 'Noviembre', 'Diciembre'],
-	months_abbr: ['ene', 'feb', 'mar', 'abr', 'may', 'jun', 'jul', 'ago', 'sep', 'oct', 'nov', 'dic'],
-	days: ['Domingo', 'Lunes', 'Martes', 'Miércoles', 'Jueves', 'Viernes', 'Sábado'],
-	days_abbr: ['dom', 'lun', 'mar', 'mié', 'juv', 'vie', 'sáb'],
-
-	// Culture's date order: DD/MM/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: 'hace menos de un minuto',
-	minuteAgo: 'hace un minuto',
-	minutesAgo: 'hace {delta} minutos',
-	hourAgo: 'hace una hora',
-	hoursAgo: 'hace unas {delta} horas',
-	dayAgo: 'hace un día',
-	daysAgo: 'hace {delta} días',
-	weekAgo: 'hace una semana',
-	weeksAgo: 'hace unas {delta} semanas',
-	monthAgo: 'hace un mes',
-	monthsAgo: 'hace {delta} meses',
-	yearAgo: 'hace un año',
-	yearsAgo: 'hace {delta} años',
-
-	lessThanMinuteUntil: 'menos de un minuto desde ahora',
-	minuteUntil: 'un minuto desde ahora',
-	minutesUntil: '{delta} minutos desde ahora',
-	hourUntil: 'una hora desde ahora',
-	hoursUntil: 'unas {delta} horas desde ahora',
-	dayUntil: 'un día desde ahora',
-	daysUntil: '{delta} días desde ahora',
-	weekUntil: 'una semana desde ahora',
-	weeksUntil: 'unas {delta} semanas desde ahora',
-	monthUntil: 'un mes desde ahora',
-	monthsUntil: '{delta} meses desde ahora',
-	yearUntil: 'un año desde ahora',
-	yearsUntil: '{delta} años desde ahora'
-
-});
-
-/*
----
-
-name: Locale.es-AR.Date
-
-description: Date messages for Spanish (Argentina).
-
-license: MIT-style license
-
-authors:
-  - Ãlfons Sanchez
-  - Diego Massanti
-
-requires:
-  - Locale
-  - Locale.es-ES.Date
-
-provides: [Locale.es-AR.Date]
-
-...
-*/
-
-Locale.define('es-AR').inherit('es-ES', 'Date');
-
-/*
----
-
-name: Locale.es-AR.Form.Validator
-
-description: Form Validator messages for Spanish (Argentina).
-
-license: MIT-style license
-
-authors:
-  - Diego Massanti
-
-requires:
-  - Locale
-
-provides: [Locale.es-AR.Form.Validator]
-
-...
-*/
-
-Locale.define('es-AR', 'FormValidator', {
-
-	required: 'Este campo es obligatorio.',
-	minLength: 'Por favor ingrese al menos {minLength} caracteres (ha ingresado {length} caracteres).',
-	maxLength: 'Por favor no ingrese más de {maxLength} caracteres (ha ingresado {length} caracteres).',
-	integer: 'Por favor ingrese un número entero en este campo. Números con decimales (p.e. 1,25) no se permiten.',
-	numeric: 'Por favor ingrese solo valores numéricos en este campo (p.e. "1" o "1,1" o "-1" o "-1,1").',
-	digits: 'Por favor use sólo números y puntuación en este campo (por ejemplo, un número de teléfono con guiones y/o puntos no está permitido).',
-	alpha: 'Por favor use sólo letras (a-z) en este campo. No se permiten espacios ni otros caracteres.',
-	alphanum: 'Por favor, usa sólo letras (a-z) o números (0-9) en este campo. No se permiten espacios u otros caracteres.',
-	dateSuchAs: 'Por favor ingrese una fecha válida como {date}',
-	dateInFormatMDY: 'Por favor ingrese una fecha válida, utulizando el formato DD/MM/YYYY (p.e. "31/12/1999")',
-	email: 'Por favor, ingrese una dirección de e-mail válida. Por ejemplo, "fred@dominio.com".',
-	url: 'Por favor ingrese una URL válida como http://www.example.com.',
-	currencyDollar: 'Por favor ingrese una cantidad válida de pesos. Por ejemplo $100,00 .',
-	oneRequired: 'Por favor ingrese algo para por lo menos una de estas entradas.',
-	errorPrefix: 'Error: ',
-	warningPrefix: 'Advertencia: ',
-
-	// Form.Validator.Extras
-	noSpace: 'No se permiten espacios en este campo.',
-	reqChkByNode: 'No hay elementos seleccionados.',
-	requiredChk: 'Este campo es obligatorio.',
-	reqChkByName: 'Por favor selecciona una {label}.',
-	match: 'Este campo necesita coincidir con el campo {matchName}',
-	startDate: 'la fecha de inicio',
-	endDate: 'la fecha de fin',
-	currentDate: 'la fecha actual',
-	afterDate: 'La fecha debe ser igual o posterior a {label}.',
-	beforeDate: 'La fecha debe ser igual o anterior a {label}.',
-	startMonth: 'Por favor selecciona un mes de origen',
-	sameMonth: 'Estas dos fechas deben estar en el mismo mes - debes cambiar una u otra.'
-
-});
-
-/*
----
-
-name: Locale.es-AR.Number
-
-description: Number messages for es Argentina.
-
-license: MIT-style license
-
-authors:
-  - Oscar Kuchuk
-
-requires:
-  - Locale
-
-provides: [Locale.es-AR.Number]
-
-...
-*/
-
-Locale.define('es-AR', 'Number', {
-
-	decimal: ',',
-	group: '.',
-
-/* 	Commented properties are the defaults for Number.format
-	decimals: 0,
-	precision: 0,
-	scientific: null,
-
-	prefix: null,
-	suffic: null,
-
-	// Negative/Currency/percentage will mixin Number
-	negative: {
-		prefix: '-'
-	},*/
-
-	currency: {
-		decimals: 2,
-		prefix: '$ '
-	}/*,
-
-	percentage: {
-		decimals: 2,
-		suffix: '%'
-	}*/
-
-});
-
-
-/*
----
-
-name: Locale.es-ES.Form.Validator
-
-description: Form Validator messages for Spanish.
-
-license: MIT-style license
-
-authors:
-  - Ãlfons Sanchez
-
-requires:
-  - Locale
-
-provides: [Locale.es-ES.Form.Validator]
-
-...
-*/
-
-Locale.define('es-ES', 'FormValidator', {
-
-	required: 'Este campo es obligatorio.',
-	minLength: 'Por favor introduce al menos {minLength} caracteres (has introducido {length} caracteres).',
-	maxLength: 'Por favor introduce no m&aacute;s de {maxLength} caracteres (has introducido {length} caracteres).',
-	integer: 'Por favor introduce un n&uacute;mero entero en este campo. N&uacute;meros con decimales (p.e. 1,25) no se permiten.',
-	numeric: 'Por favor introduce solo valores num&eacute;ricos en este campo (p.e. "1" o "1,1" o "-1" o "-1,1").',
-	digits: 'Por favor usa solo n&uacute;meros y puntuaci&oacute;n en este campo (por ejemplo, un n&uacute;mero de tel&eacute;fono con guiones y puntos no esta permitido).',
-	alpha: 'Por favor usa letras solo (a-z) en este campo. No se admiten espacios ni otros caracteres.',
-	alphanum: 'Por favor, usa solo letras (a-z) o n&uacute;meros (0-9) en este campo. No se admiten espacios ni otros caracteres.',
-	dateSuchAs: 'Por favor introduce una fecha v&aacute;lida como {date}',
-	dateInFormatMDY: 'Por favor introduce una fecha v&aacute;lida como DD/MM/YYYY (p.e. "31/12/1999")',
-	email: 'Por favor, introduce una direcci&oacute;n de email v&aacute;lida. Por ejemplo, "fred@domain.com".',
-	url: 'Por favor introduce una URL v&aacute;lida como http://www.example.com.',
-	currencyDollar: 'Por favor introduce una cantidad v&aacute;lida de €. Por ejemplo €100,00 .',
-	oneRequired: 'Por favor introduce algo para por lo menos una de estas entradas.',
-	errorPrefix: 'Error: ',
-	warningPrefix: 'Aviso: ',
-
-	// Form.Validator.Extras
-	noSpace: 'No pueden haber espacios en esta entrada.',
-	reqChkByNode: 'No hay elementos seleccionados.',
-	requiredChk: 'Este campo es obligatorio.',
-	reqChkByName: 'Por favor selecciona una {label}.',
-	match: 'Este campo necesita coincidir con el campo {matchName}',
-	startDate: 'la fecha de inicio',
-	endDate: 'la fecha de fin',
-	currentDate: 'la fecha actual',
-	afterDate: 'La fecha debe ser igual o posterior a {label}.',
-	beforeDate: 'La fecha debe ser igual o anterior a {label}.',
-	startMonth: 'Por favor selecciona un mes de origen',
-	sameMonth: 'Estas dos fechas deben estar en el mismo mes - debes cambiar una u otra.'
-
-});
-
-/*
----
-
-name: Locale.es-VE.Date
-
-description: Date messages for Spanish (Venezuela).
-
-license: MIT-style license
-
-authors:
-  - Daniel Barreto
-
-requires:
-  - Locale
-  - Locale.es-ES.Date
-
-provides: [Locale.es-VE.Date]
-
-...
-*/
-
-Locale.define('es-VE').inherit('es-ES', 'Date');
-
-/*
----
-
-name: Locale.es-VE.Form.Validator
-
-description: Form Validator messages for Spanish (Venezuela).
-
-license: MIT-style license
-
-authors:
-  - Daniel Barreto
-
-requires:
-  - Locale
-  - Locale.es-ES.Form.Validator
-
-provides: [Locale.es-VE.Form.Validator]
-
-...
-*/
-
-Locale.define('es-VE', 'FormValidator', {
-
-	digits: 'Por favor usa solo n&uacute;meros y puntuaci&oacute;n en este campo. Por ejemplo, un n&uacute;mero de tel&eacute;fono con guiones y puntos no esta permitido.',
-	alpha: 'Por favor usa solo letras (a-z) en este campo. No se admiten espacios ni otros caracteres.',
-	currencyDollar: 'Por favor introduce una cantidad v&aacute;lida de Bs. Por ejemplo Bs. 100,00 .',
-	oneRequired: 'Por favor introduce un valor para por lo menos una de estas entradas.',
-
-	// Form.Validator.Extras
-	startDate: 'La fecha de inicio',
-	endDate: 'La fecha de fin',
-	currentDate: 'La fecha actual'
-
-}).inherit('es-ES', 'FormValidator');
-
-/*
----
-
-name: Locale.es-VE.Number
-
-description: Number messages for Spanish (Venezuela).
-
-license: MIT-style license
-
-authors:
-  - Daniel Barreto
-
-requires:
-  - Locale
-
-provides: [Locale.es-VE.Number]
-
-...
-*/
-
-Locale.define('es-VE', 'Number', {
-
-	decimal: ',',
-	group: '.',
-/*
-	decimals: 0,
-	precision: 0,
-*/
-	// Negative/Currency/percentage will mixin Number
-	negative: {
-		prefix: '-'
-	},
-
-	currency: {
-		decimals: 2,
-		prefix: 'Bs. '
-	},
-
-	percentage: {
-		decimals: 2,
-		suffix: '%'
-	}
-
-});
-
-/*
----
-
-name: Locale.et-EE.Date
-
-description: Date messages for Estonian.
-
-license: MIT-style license
-
-authors:
-  - Kevin Valdek
-
-requires:
-  - Locale
-
-provides: [Locale.et-EE.Date]
-
-...
-*/
-
-Locale.define('et-EE', 'Date', {
-
-	months: ['jaanuar', 'veebruar', 'märts', 'aprill', 'mai', 'juuni', 'juuli', 'august', 'september', 'oktoober', 'november', 'detsember'],
-	months_abbr: ['jaan', 'veebr', 'märts', 'apr', 'mai', 'juuni', 'juuli', 'aug', 'sept', 'okt', 'nov', 'dets'],
-	days: ['pühapäev', 'esmaspäev', 'teisipäev', 'kolmapäev', 'neljapäev', 'reede', 'laupäev'],
-	days_abbr: ['pühap', 'esmasp', 'teisip', 'kolmap', 'neljap', 'reede', 'laup'],
-
-	// Culture's date order: MM.DD.YYYY
-	dateOrder: ['month', 'date', 'year'],
-	shortDate: '%m.%d.%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: 'vähem kui minut aega tagasi',
-	minuteAgo: 'umbes minut aega tagasi',
-	minutesAgo: '{delta} minutit tagasi',
-	hourAgo: 'umbes tund aega tagasi',
-	hoursAgo: 'umbes {delta} tundi tagasi',
-	dayAgo: '1 päev tagasi',
-	daysAgo: '{delta} päeva tagasi',
-	weekAgo: '1 nädal tagasi',
-	weeksAgo: '{delta} nädalat tagasi',
-	monthAgo: '1 kuu tagasi',
-	monthsAgo: '{delta} kuud tagasi',
-	yearAgo: '1 aasta tagasi',
-	yearsAgo: '{delta} aastat tagasi',
-
-	lessThanMinuteUntil: 'vähem kui minuti aja pärast',
-	minuteUntil: 'umbes minuti aja pärast',
-	minutesUntil: '{delta} minuti pärast',
-	hourUntil: 'umbes tunni aja pärast',
-	hoursUntil: 'umbes {delta} tunni pärast',
-	dayUntil: '1 päeva pärast',
-	daysUntil: '{delta} päeva pärast',
-	weekUntil: '1 nädala pärast',
-	weeksUntil: '{delta} nädala pärast',
-	monthUntil: '1 kuu pärast',
-	monthsUntil: '{delta} kuu pärast',
-	yearUntil: '1 aasta pärast',
-	yearsUntil: '{delta} aasta pärast'
-
-});
-
-/*
----
-
-name: Locale.et-EE.Form.Validator
-
-description: Form Validator messages for Estonian.
-
-license: MIT-style license
-
-authors:
-  - Kevin Valdek
-
-requires:
-  - Locale
-
-provides: [Locale.et-EE.Form.Validator]
-
-...
-*/
-
-Locale.define('et-EE', 'FormValidator', {
-
-	required: 'Väli peab olema täidetud.',
-	minLength: 'Palun sisestage vähemalt {minLength} tähte (te sisestasite {length} tähte).',
-	maxLength: 'Palun ärge sisestage rohkem kui {maxLength} tähte (te sisestasite {length} tähte).',
-	integer: 'Palun sisestage väljale täisarv. Kümnendarvud (näiteks 1.25) ei ole lubatud.',
-	numeric: 'Palun sisestage ainult numbreid väljale (näiteks "1", "1.1", "-1" või "-1.1").',
-	digits: 'Palun kasutage ainult numbreid ja kirjavahemärke (telefoninumbri sisestamisel on lubatud kasutada kriipse ja punkte).',
-	alpha: 'Palun kasutage ainult tähti (a-z). Tühikud ja teised sümbolid on keelatud.',
-	alphanum: 'Palun kasutage ainult tähti (a-z) või numbreid (0-9). Tühikud ja teised sümbolid on keelatud.',
-	dateSuchAs: 'Palun sisestage kehtiv kuupäev kujul {date}',
-	dateInFormatMDY: 'Palun sisestage kehtiv kuupäev kujul MM.DD.YYYY (näiteks: "12.31.1999").',
-	email: 'Palun sisestage kehtiv e-maili aadress (näiteks: "fred@domain.com").',
-	url: 'Palun sisestage kehtiv URL (näiteks: http://www.example.com).',
-	currencyDollar: 'Palun sisestage kehtiv $ summa (näiteks: $100.00).',
-	oneRequired: 'Palun sisestage midagi vähemalt ühele antud väljadest.',
-	errorPrefix: 'Viga: ',
-	warningPrefix: 'Hoiatus: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Väli ei tohi sisaldada tühikuid.',
-	reqChkByNode: 'Ükski väljadest pole valitud.',
-	requiredChk: 'Välja täitmine on vajalik.',
-	reqChkByName: 'Palun valige üks {label}.',
-	match: 'Väli peab sobima {matchName} väljaga',
-	startDate: 'algkuupäev',
-	endDate: 'lõppkuupäev',
-	currentDate: 'praegune kuupäev',
-	afterDate: 'Kuupäev peab olema võrdne või pärast {label}.',
-	beforeDate: 'Kuupäev peab olema võrdne või enne {label}.',
-	startMonth: 'Palun valige algkuupäev.',
-	sameMonth: 'Antud kaks kuupäeva peavad olema samas kuus - peate muutma ühte kuupäeva.'
-
-});
-
-/*
----
-
-name: Locale.fa.Date
-
-description: Date messages for Persian.
-
-license: MIT-style license
-
-authors:
-  - Amir Hossein Hodjaty Pour
-
-requires:
-  - Locale
-
-provides: [Locale.fa.Date]
-
-...
-*/
-
-Locale.define('fa', 'Date', {
-
-	months: ['ژانویه', 'فوریه', 'مارس', 'آپریل', 'مه', 'ژوئن', 'ژوئیه', 'آگوست', 'سپتامبر', 'اکتبر', 'نوامبر', 'دسامبر'],
-	months_abbr: ['1', '2', '3', '4', '5', '6', '7', '8', '9', '10', '11', '12'],
-	days: ['یکشنبه', 'دوشنبه', 'سه شنبه', 'چهارشنبه', 'پنجشنبه', 'جمعه', 'شنبه'],
-	days_abbr: ['ي', 'د', 'س', 'چ', 'پ', 'ج', 'ش'],
-
-	// Culture's date order: MM/DD/YYYY
-	dateOrder: ['month', 'date', 'year'],
-	shortDate: '%m/%d/%Y',
-	shortTime: '%I:%M%p',
-	AM: 'ق.ظ',
-	PM: 'ب.ظ',
-
-	// Date.Extras
-	ordinal: 'ام',
-
-	lessThanMinuteAgo: 'کمتر از یک دقیقه پیش',
-	minuteAgo: 'حدود یک دقیقه پیش',
-	minutesAgo: '{delta} دقیقه پیش',
-	hourAgo: 'حدود یک ساعت پیش',
-	hoursAgo: 'حدود {delta} ساعت پیش',
-	dayAgo: '1 روز پیش',
-	daysAgo: '{delta} روز پیش',
-	weekAgo: '1 هفته پیش',
-	weeksAgo: '{delta} هفته پیش',
-	monthAgo: '1 ماه پیش',
-	monthsAgo: '{delta} ماه پیش',
-	yearAgo: '1 سال پیش',
-	yearsAgo: '{delta} سال پیش',
-
-	lessThanMinuteUntil: 'کمتر از یک دقیقه از حالا',
-	minuteUntil: 'حدود یک دقیقه از حالا',
-	minutesUntil: '{delta} دقیقه از حالا',
-	hourUntil: 'حدود یک ساعت از حالا',
-	hoursUntil: 'حدود {delta} ساعت از حالا',
-	dayUntil: '1 روز از حالا',
-	daysUntil: '{delta} روز از حالا',
-	weekUntil: '1 هفته از حالا',
-	weeksUntil: '{delta} هفته از حالا',
-	monthUntil: '1 ماه از حالا',
-	monthsUntil: '{delta} ماه از حالا',
-	yearUntil: '1 سال از حالا',
-	yearsUntil: '{delta} سال از حالا'
-
-});
-
-/*
----
-
-name: Locale.fa.Form.Validator
-
-description: Form Validator messages for Persian.
-
-license: MIT-style license
-
-authors:
-  - Amir Hossein Hodjaty Pour
-
-requires:
-  - Locale
-
-provides: [Locale.fa.Form.Validator]
-
-...
-*/
-
-Locale.define('fa', 'FormValidator', {
-
-	required: 'این فیلد الزامی است.',
-	minLength: 'شما باید حداقل {minLength} حرف وارد کنید ({length} حرف وارد کرده اید).',
-	maxLength: 'لطفا حداکثر {maxLength} حرف وارد کنید (شما {length} حرف وارد کرده اید).',
-	integer: 'لطفا از عدد صحیح استفاده کنید. اعداد اعشاری (مانند 1.25) مجاز نیستند.',
-	numeric: 'لطفا فقط داده عددی وارد کنید (مانند "1" یا "1.1" یا "1-" یا "1.1-").',
-	digits: 'لطفا فقط از اعداد و علامتها در این فیلد استفاده کنید (برای مثال شماره تلفن با خط تیره و نقطه قابل قبول است).',
-	alpha: 'لطفا فقط از حروف الفباء برای این بخش استفاده کنید. کاراکترهای دیگر و فاصله مجاز نیستند.',
-	alphanum: 'لطفا فقط از حروف الفباء و اعداد در این بخش استفاده کنید. کاراکترهای دیگر و فاصله مجاز نیستند.',
-	dateSuchAs: 'لطفا یک تاریخ معتبر مانند {date} وارد کنید.',
-	dateInFormatMDY: 'لطفا یک تاریخ معتبر به شکل MM/DD/YYYY وارد کنید (مانند "12/31/1999").',
-	email: 'لطفا یک آدرس ایمیل معتبر وارد کنید. برای مثال "fred@domain.com".',
-	url: 'لطفا یک URL معتبر مانند http://www.example.com وارد کنید.',
-	currencyDollar: 'لطفا یک محدوده معتبر برای این بخش وارد کنید مانند 100.00$ .',
-	oneRequired: 'لطفا حداقل یکی از فیلدها را پر کنید.',
-	errorPrefix: 'خطا: ',
-	warningPrefix: 'هشدار: ',
-
-	// Form.Validator.Extras
-	noSpace: 'استفاده از فاصله در این بخش مجاز نیست.',
-	reqChkByNode: 'موردی انتخاب نشده است.',
-	requiredChk: 'این فیلد الزامی است.',
-	reqChkByName: 'لطفا یک {label} را انتخاب کنید.',
-	match: 'این فیلد باید با فیلد {matchName} مطابقت داشته باشد.',
-	startDate: 'تاریخ شروع',
-	endDate: 'تاریخ پایان',
-	currentDate: 'تاریخ کنونی',
-	afterDate: 'تاریخ میبایست برابر یا بعد از {label} باشد',
-	beforeDate: 'تاریخ میبایست برابر یا قبل از {label} باشد',
-	startMonth: 'لطفا ماه شروع را انتخاب کنید',
-	sameMonth: 'این دو تاریخ باید در یک ماه باشند - شما باید یکی یا هر دو را تغییر دهید.',
-	creditcard: 'شماره کارت اعتباری که وارد کرده اید معتبر نیست. لطفا شماره را بررسی کنید و مجددا تلاش کنید. {length} رقم وارد شده است.'
-
-});
-
-/*
----
-
-name: Locale.fi-FI.Date
-
-description: Date messages for Finnish.
-
-license: MIT-style license
-
-authors:
-  - ksel
-
-requires:
-  - Locale
-
-provides: [Locale.fi-FI.Date]
-
-...
-*/
-
-Locale.define('fi-FI', 'Date', {
-
-	// NOTE: months and days are not capitalized in finnish
-	months: ['tammikuu', 'helmikuu', 'maaliskuu', 'huhtikuu', 'toukokuu', 'kesäkuu', 'heinäkuu', 'elokuu', 'syyskuu', 'lokakuu', 'marraskuu', 'joulukuu'],
-
-	// these abbreviations are really not much used in finnish because they obviously won't abbreviate very much. ;)
-	// NOTE: sometimes one can see forms such as "tammi", "helmi", etc. but that is not proper finnish.
-	months_abbr: ['tammik.', 'helmik.', 'maalisk.', 'huhtik.', 'toukok.', 'kesäk.', 'heinäk.', 'elok.', 'syysk.', 'lokak.', 'marrask.', 'jouluk.'],
-
-	days: ['sunnuntai', 'maanantai', 'tiistai', 'keskiviikko', 'torstai', 'perjantai', 'lauantai'],
-	days_abbr: ['su', 'ma', 'ti', 'ke', 'to', 'pe', 'la'],
-
-	// Culture's date order: DD/MM/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d.%m.%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '.',
-
-	lessThanMinuteAgo: 'vajaa minuutti sitten',
-	minuteAgo: 'noin minuutti sitten',
-	minutesAgo: '{delta} minuuttia sitten',
-	hourAgo: 'noin tunti sitten',
-	hoursAgo: 'noin {delta} tuntia sitten',
-	dayAgo: 'päivä sitten',
-	daysAgo: '{delta} päivää sitten',
-	weekAgo: 'viikko sitten',
-	weeksAgo: '{delta} viikkoa sitten',
-	monthAgo: 'kuukausi sitten',
-	monthsAgo: '{delta} kuukautta sitten',
-	yearAgo: 'vuosi sitten',
-	yearsAgo: '{delta} vuotta sitten',
-
-	lessThanMinuteUntil: 'vajaan minuutin kuluttua',
-	minuteUntil: 'noin minuutin kuluttua',
-	minutesUntil: '{delta} minuutin kuluttua',
-	hourUntil: 'noin tunnin kuluttua',
-	hoursUntil: 'noin {delta} tunnin kuluttua',
-	dayUntil: 'päivän kuluttua',
-	daysUntil: '{delta} päivän kuluttua',
-	weekUntil: 'viikon kuluttua',
-	weeksUntil: '{delta} viikon kuluttua',
-	monthUntil: 'kuukauden kuluttua',
-	monthsUntil: '{delta} kuukauden kuluttua',
-	yearUntil: 'vuoden kuluttua',
-	yearsUntil: '{delta} vuoden kuluttua'
-
-});
-
-/*
----
-
-name: Locale.fi-FI.Form.Validator
-
-description: Form Validator messages for Finnish.
-
-license: MIT-style license
-
-authors:
-  - ksel
-
-requires:
-  - Locale
-
-provides: [Locale.fi-FI.Form.Validator]
-
-...
-*/
-
-Locale.define('fi-FI', 'FormValidator', {
-
-	required: 'Tämä kenttä on pakollinen.',
-	minLength: 'Ole hyvä ja anna vähintään {minLength} merkkiä (annoit {length} merkkiä).',
-	maxLength: 'Älä anna enempää kuin {maxLength} merkkiä (annoit {length} merkkiä).',
-	integer: 'Ole hyvä ja anna kokonaisluku. Luvut, joissa on desimaaleja (esim. 1.25) eivät ole sallittuja.',
-	numeric: 'Anna tähän kenttään lukuarvo (kuten "1" tai "1.1" tai "-1" tai "-1.1").',
-	digits: 'Käytä pelkästään numeroita ja välimerkkejä tässä kentässä (syötteet, kuten esim. puhelinnumero, jossa on väliviivoja, pilkkuja tai pisteitä, kelpaa).',
-	alpha: 'Anna tähän kenttään vain kirjaimia (a-z). Välilyönnit tai muut merkit eivät ole sallittuja.',
-	alphanum: 'Anna tähän kenttään vain kirjaimia (a-z) tai numeroita (0-9). Välilyönnit tai muut merkit eivät ole sallittuja.',
-	dateSuchAs: 'Ole hyvä ja anna kelvollinen päivmäärä, kuten esimerkiksi {date}',
-	dateInFormatMDY: 'Ole hyvä ja anna kelvollinen päivämäärä muodossa pp/kk/vvvv (kuten "12/31/1999")',
-	email: 'Ole hyvä ja anna kelvollinen sähköpostiosoite (kuten esimerkiksi "matti@meikalainen.com").',
-	url: 'Ole hyvä ja anna kelvollinen URL, kuten esimerkiksi http://www.example.com.',
-	currencyDollar: 'Ole hyvä ja anna kelvollinen eurosumma (kuten esimerkiksi 100,00 EUR) .',
-	oneRequired: 'Ole hyvä ja syötä jotakin ainakin johonkin näistä kentistä.',
-	errorPrefix: 'Virhe: ',
-	warningPrefix: 'Varoitus: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Tässä syötteessä ei voi olla välilyöntejä',
-	reqChkByNode: 'Ei valintoja.',
-	requiredChk: 'Tämä kenttä on pakollinen.',
-	reqChkByName: 'Ole hyvä ja valitse {label}.',
-	match: 'Tämän kentän tulee vastata kenttää {matchName}',
-	startDate: 'alkupäivämäärä',
-	endDate: 'loppupäivämäärä',
-	currentDate: 'nykyinen päivämäärä',
-	afterDate: 'Päivämäärän tulisi olla sama tai myöhäisempi ajankohta kuin {label}.',
-	beforeDate: 'Päivämäärän tulisi olla sama tai aikaisempi ajankohta kuin {label}.',
-	startMonth: 'Ole hyvä ja valitse aloituskuukausi',
-	sameMonth: 'Näiden kahden päivämäärän tulee olla saman kuun sisällä -- sinun pitää muuttaa jompaa kumpaa.',
-	creditcard: 'Annettu luottokortin numero ei kelpaa. Ole hyvä ja tarkista numero sekä yritä uudelleen. {length} numeroa syötetty.'
-
-});
-
-/*
----
-
-name: Locale.fi-FI.Number
-
-description: Finnish number messages
-
-license: MIT-style license
-
-authors:
-  - ksel
-
-requires:
-  - Locale
-  - Locale.EU.Number
-
-provides: [Locale.fi-FI.Number]
-
-...
-*/
-
-Locale.define('fi-FI', 'Number', {
-
-	group: ' ' // grouped by space
-
-}).inherit('EU', 'Number');
-
-/*
----
-
-name: Locale.fr-FR.Date
-
-description: Date messages for French.
-
-license: MIT-style license
-
-authors:
-  - Nicolas Sorosac
-  - Antoine Abt
-
-requires:
-  - Locale
-
-provides: [Locale.fr-FR.Date]
-
-...
-*/
-
-Locale.define('fr-FR', 'Date', {
-
-	months: ['Janvier', 'Février', 'Mars', 'Avril', 'Mai', 'Juin', 'Juillet', 'Août', 'Septembre', 'Octobre', 'Novembre', 'Décembre'],
-	months_abbr: ['janv.', 'févr.', 'mars', 'avr.', 'mai', 'juin', 'juil.', 'août', 'sept.', 'oct.', 'nov.', 'déc.'],
-	days: ['Dimanche', 'Lundi', 'Mardi', 'Mercredi', 'Jeudi', 'Vendredi', 'Samedi'],
-	days_abbr: ['dim.', 'lun.', 'mar.', 'mer.', 'jeu.', 'ven.', 'sam.'],
-
-	// Culture's date order: DD/MM/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: function(dayOfMonth){
-		return (dayOfMonth > 1) ? '' : 'er';
-	},
-
-	lessThanMinuteAgo: "il y a moins d'une minute",
-	minuteAgo: 'il y a une minute',
-	minutesAgo: 'il y a {delta} minutes',
-	hourAgo: 'il y a une heure',
-	hoursAgo: 'il y a {delta} heures',
-	dayAgo: 'il y a un jour',
-	daysAgo: 'il y a {delta} jours',
-	weekAgo: 'il y a une semaine',
-	weeksAgo: 'il y a {delta} semaines',
-	monthAgo: 'il y a 1 mois',
-	monthsAgo: 'il y a {delta} mois',
-	yearthAgo: 'il y a 1 an',
-	yearsAgo: 'il y a {delta} ans',
-
-	lessThanMinuteUntil: "dans moins d'une minute",
-	minuteUntil: 'dans une minute',
-	minutesUntil: 'dans {delta} minutes',
-	hourUntil: 'dans une heure',
-	hoursUntil: 'dans {delta} heures',
-	dayUntil: 'dans un jour',
-	daysUntil: 'dans {delta} jours',
-	weekUntil: 'dans 1 semaine',
-	weeksUntil: 'dans {delta} semaines',
-	monthUntil: 'dans 1 mois',
-	monthsUntil: 'dans {delta} mois',
-	yearUntil: 'dans 1 an',
-	yearsUntil: 'dans {delta} ans'
-
-});
-
-/*
----
-
-name: Locale.fr-FR.Form.Validator
-
-description: Form Validator messages for French.
-
-license: MIT-style license
-
-authors:
-  - Miquel Hudin
-  - Nicolas Sorosac
-
-requires:
-  - Locale
-
-provides: [Locale.fr-FR.Form.Validator]
-
-...
-*/
-
-/*eslint mootools-whitespace:0*/
-
-Locale.define('fr-FR', 'FormValidator', {
-
-	required: 'Ce champ est obligatoire.',
-	length: 'Veuillez saisir {length} caract&egrave;re(s) (vous avez saisi {elLength} caract&egrave;re(s)',
-	minLength: 'Veuillez saisir un minimum de {minLength} caract&egrave;re(s) (vous avez saisi {length} caract&egrave;re(s)).',
-	maxLength: 'Veuillez saisir un maximum de {maxLength} caract&egrave;re(s) (vous avez saisi {length} caract&egrave;re(s)).',
-	integer: 'Veuillez saisir un nombre entier dans ce champ. Les nombres d&eacute;cimaux (ex : "1,25") ne sont pas autoris&eacute;s.',
-	numeric: 'Veuillez saisir uniquement des chiffres dans ce champ (ex : "1" ou "1,1" ou "-1" ou "-1,1").',
-	digits: "Veuillez saisir uniquement des chiffres et des signes de ponctuation dans ce champ (ex : un num&eacute;ro de t&eacute;l&eacute;phone avec des traits d'union est autoris&eacute;).",
-	alpha: 'Veuillez saisir uniquement des lettres (a-z) dans ce champ. Les espaces ou autres caract&egrave;res ne sont pas autoris&eacute;s.',
-	alphanum: 'Veuillez saisir uniquement des lettres (a-z) ou des chiffres (0-9) dans ce champ. Les espaces ou autres caract&egrave;res ne sont pas autoris&eacute;s.',
-	dateSuchAs: 'Veuillez saisir une date correcte comme {date}',
-	dateInFormatMDY: 'Veuillez saisir une date correcte, au format JJ/MM/AAAA (ex : "31/11/1999").',
-	email: 'Veuillez saisir une adresse de courrier &eacute;lectronique. Par exemple "fred@domaine.com".',
-	url: 'Veuillez saisir une URL, comme http://www.exemple.com.',
-	currencyDollar: 'Veuillez saisir une quantit&eacute; correcte. Par exemple 100,00&euro;.',
-	oneRequired: 'Veuillez s&eacute;lectionner au moins une de ces options.',
-	errorPrefix: 'Erreur : ',
-	warningPrefix: 'Attention : ',
-
-	// Form.Validator.Extras
-	noSpace: "Ce champ n'accepte pas les espaces.",
-	reqChkByNode: "Aucun &eacute;l&eacute;ment n'est s&eacute;lectionn&eacute;.",
-	requiredChk: 'Ce champ est obligatoire.',
-	reqChkByName: 'Veuillez s&eacute;lectionner un(e) {label}.',
-	match: 'Ce champ doit correspondre avec le champ {matchName}.',
-	startDate: 'date de d&eacute;but',
-	endDate: 'date de fin',
-	currentDate: 'date actuelle',
-	afterDate: 'La date doit &ecirc;tre identique ou post&eacute;rieure &agrave; {label}.',
-	beforeDate: 'La date doit &ecirc;tre identique ou ant&eacute;rieure &agrave; {label}.',
-	startMonth: 'Veuillez s&eacute;lectionner un mois de d&eacute;but.',
-	sameMonth: 'Ces deux dates doivent &ecirc;tre dans le m&ecirc;me mois - vous devez en modifier une.',
-	creditcard: 'Le num&eacute;ro de carte de cr&eacute;dit est invalide. Merci de v&eacute;rifier le num&eacute;ro et de r&eacute;essayer. Vous avez entr&eacute; {length} chiffre(s).'
-
-});
-
-/*
----
-
-name: Locale.fr-FR.Number
-
-description: Number messages for French.
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-  - sv1l
-
-requires:
-  - Locale
-  - Locale.EU.Number
-
-provides: [Locale.fr-FR.Number]
-
-...
-*/
-
-Locale.define('fr-FR', 'Number', {
-
-	group: ' ' // In fr-FR localization, group character is a blank space
-
-}).inherit('EU', 'Number');
-
-/*
----
-
-name: Locale.he-IL.Date
-
-description: Date messages for Hebrew.
-
-license: MIT-style license
-
-authors:
-  - Elad Ossadon
-
-requires:
-  - Locale
-
-provides: [Locale.he-IL.Date]
-
-...
-*/
-
-Locale.define('he-IL', 'Date', {
-
-	months: ['ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'],
-	months_abbr: ['ינואר', 'פברואר', 'מרץ', 'אפריל', 'מאי', 'יוני', 'יולי', 'אוגוסט', 'ספטמבר', 'אוקטובר', 'נובמבר', 'דצמבר'],
-	days: ['ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת'],
-	days_abbr: ['ראשון', 'שני', 'שלישי', 'רביעי', 'חמישי', 'שישי', 'שבת'],
-
-	// Culture's date order: MM/DD/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 0,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: 'לפני פחות מדקה',
-	minuteAgo: 'לפני כדקה',
-	minutesAgo: 'לפני {delta} דקות',
-	hourAgo: 'לפני כשעה',
-	hoursAgo: 'לפני {delta} שעות',
-	dayAgo: 'לפני יום',
-	daysAgo: 'לפני {delta} ימים',
-	weekAgo: 'לפני שבוע',
-	weeksAgo: 'לפני {delta} שבועות',
-	monthAgo: 'לפני חודש',
-	monthsAgo: 'לפני {delta} חודשים',
-	yearAgo: 'לפני שנה',
-	yearsAgo: 'לפני {delta} שנים',
-
-	lessThanMinuteUntil: 'בעוד פחות מדקה',
-	minuteUntil: 'בעוד כדקה',
-	minutesUntil: 'בעוד {delta} דקות',
-	hourUntil: 'בעוד כשעה',
-	hoursUntil: 'בעוד {delta} שעות',
-	dayUntil: 'בעוד יום',
-	daysUntil: 'בעוד {delta} ימים',
-	weekUntil: 'בעוד שבוע',
-	weeksUntil: 'בעוד {delta} שבועות',
-	monthUntil: 'בעוד חודש',
-	monthsUntil: 'בעוד {delta} חודשים',
-	yearUntil: 'בעוד שנה',
-	yearsUntil: 'בעוד {delta} שנים'
-
-});
-
-/*
----
-
-name: Locale.he-IL.Form.Validator
-
-description: Form Validator messages for Hebrew.
-
-license: MIT-style license
-
-authors:
-  - Elad Ossadon
-
-requires:
-  - Locale
-
-provides: [Locale.he-IL.Form.Validator]
-
-...
-*/
-
-Locale.define('he-IL', 'FormValidator', {
-
-	required: 'נא למלא שדה זה.',
-	minLength: 'נא להזין לפחות {minLength} תווים (הזנת {length} תווים).',
-	maxLength: 'נא להזין עד {maxLength} תווים (הזנת {length} תווים).',
-	integer: 'נא להזין מספר שלם לשדה זה. מספרים עשרוניים (כמו 1.25) אינם חוקיים.',
-	numeric: 'נא להזין ערך מספרי בלבד בשדה זה (כמו "1", "1.1", "-1" או "-1.1").',
-	digits: 'נא להזין רק ספרות וסימני הפרדה בשדה זה (למשל, מספר טלפון עם מקפים או נקודות הוא חוקי).',
-	alpha: 'נא להזין רק אותיות באנגלית (a-z) בשדה זה. רווחים או תווים אחרים אינם חוקיים.',
-	alphanum: 'נא להזין רק אותריות באנגלית (a-z) או ספרות (0-9) בשדה זה. אווחרים או תווים אחרים אינם חוקיים.',
-	dateSuchAs: 'נא להזין תאריך חוקי, כמו {date}',
-	dateInFormatMDY: 'נא להזין תאריך חוקי בפורמט MM/DD/YYYY (כמו "12/31/1999")',
-	email: 'נא להזין כתובת אימייל חוקית. לדוגמה: "fred@domain.com".',
-	url: 'נא להזין כתובת אתר חוקית, כמו http://www.example.com.',
-	currencyDollar: 'נא להזין סכום דולרי חוקי. לדוגמה $100.00.',
-	oneRequired: 'נא לבחור לפחות בשדה אחד.',
-	errorPrefix: 'שגיאה: ',
-	warningPrefix: 'אזהרה: ',
-
-	// Form.Validator.Extras
-	noSpace: 'אין להזין רווחים בשדה זה.',
-	reqChkByNode: 'נא לבחור אחת מהאפשרויות.',
-	requiredChk: 'שדה זה נדרש.',
-	reqChkByName: 'נא לבחור {label}.',
-	match: 'שדה זה צריך להתאים לשדה {matchName}',
-	startDate: 'תאריך ההתחלה',
-	endDate: 'תאריך הסיום',
-	currentDate: 'התאריך הנוכחי',
-	afterDate: 'התאריך צריך להיות זהה או אחרי {label}.',
-	beforeDate: 'התאריך צריך להיות זהה או לפני {label}.',
-	startMonth: 'נא לבחור חודש התחלה',
-	sameMonth: 'שני תאריכים אלה צריכים להיות באותו חודש - נא לשנות אחד התאריכים.',
-	creditcard: 'מספר כרטיס האשראי שהוזן אינו חוקי. נא לבדוק שנית. הוזנו {length} ספרות.'
-
-});
-
-/*
----
-
-name: Locale.he-IL.Number
-
-description: Number messages for Hebrew.
-
-license: MIT-style license
-
-authors:
-  - Elad Ossadon
-
-requires:
-  - Locale
-
-provides: [Locale.he-IL.Number]
-
-...
-*/
-
-Locale.define('he-IL', 'Number', {
-
-	decimal: '.',
-	group: ',',
-
-	currency: {
-		suffix: ' ₪'
-	}
-
-});
-
-/*
----
-
-name: Locale.hu-HU.Date
-
-description: Date messages for Hungarian.
-
-license: MIT-style license
-
-authors:
-  - Zsolt Szegheő
-
-requires:
-  - Locale
-
-provides: [Locale.hu-HU.Date]
-
-...
-*/
-
-Locale.define('hu-HU', 'Date', {
-
-	months: ['Január', 'Február', 'Március', 'Április', 'Május', 'Június', 'Július', 'Augusztus', 'Szeptember', 'Október', 'November', 'December'],
-	months_abbr: ['jan.', 'febr.', 'márc.', 'ápr.', 'máj.', 'jún.', 'júl.', 'aug.', 'szept.', 'okt.', 'nov.', 'dec.'],
-	days: ['Vasárnap', 'Hétfő', 'Kedd', 'Szerda', 'Csütörtök', 'Péntek', 'Szombat'],
-	days_abbr: ['V', 'H', 'K', 'Sze', 'Cs', 'P', 'Szo'],
-
-	// Culture's date order: YYYY.MM.DD.
-	dateOrder: ['year', 'month', 'date'],
-	shortDate: '%Y.%m.%d.',
-	shortTime: '%I:%M',
-	AM: 'de.',
-	PM: 'du.',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '.',
-
-	lessThanMinuteAgo: 'alig egy perce',
-	minuteAgo: 'egy perce',
-	minutesAgo: '{delta} perce',
-	hourAgo: 'egy órája',
-	hoursAgo: '{delta} órája',
-	dayAgo: '1 napja',
-	daysAgo: '{delta} napja',
-	weekAgo: '1 hete',
-	weeksAgo: '{delta} hete',
-	monthAgo: '1 hónapja',
-	monthsAgo: '{delta} hónapja',
-	yearAgo: '1 éve',
-	yearsAgo: '{delta} éve',
-
-	lessThanMinuteUntil: 'alig egy perc múlva',
-	minuteUntil: 'egy perc múlva',
-	minutesUntil: '{delta} perc múlva',
-	hourUntil: 'egy óra múlva',
-	hoursUntil: '{delta} óra múlva',
-	dayUntil: '1 nap múlva',
-	daysUntil: '{delta} nap múlva',
-	weekUntil: '1 hét múlva',
-	weeksUntil: '{delta} hét múlva',
-	monthUntil: '1 hónap múlva',
-	monthsUntil: '{delta} hónap múlva',
-	yearUntil: '1 év múlva',
-	yearsUntil: '{delta} év múlva'
-
-});
-
-/*
----
-
-name: Locale.hu-HU.Form.Validator
-
-description: Form Validator messages for Hungarian.
-
-license: MIT-style license
-
-authors:
-  - Zsolt Szegheő
-
-requires:
-  - Locale
-
-provides: [Locale.hu-HU.Form.Validator]
-
-...
-*/
-
-/*eslint mootools-whitespace:0*/
-
-Locale.define('hu-HU', 'FormValidator', {
-
-	required: 'A mező kitöltése kötelező.',
-	minLength: 'Legalább {minLength} karakter megadása szükséges (megadva {length} karakter).',
-	maxLength: 'Legfeljebb {maxLength} karakter megadása lehetséges (megadva {length} karakter).',
-	integer: 'Egész szám megadása szükséges. A tizedesjegyek (pl. 1.25) nem engedélyezettek.',
-	numeric: 'Szám megadása szükséges (pl. "1" vagy "1.1" vagy "-1" vagy "-1.1").',
-	digits: 'Csak számok és írásjelek megadása lehetséges (pl. telefonszám kötőjelek és/vagy perjelekkel).',
-	alpha: 'Csak betűk (a-z) megadása lehetséges. Szóköz és egyéb karakterek nem engedélyezettek.',
-	alphanum: 'Csak betűk (a-z) vagy számok (0-9) megadása lehetséges. Szóköz és egyéb karakterek nem engedélyezettek.',
-	dateSuchAs: 'Valós dátum megadása szükséges (pl. {date}).',
-	dateInFormatMDY: 'Valós dátum megadása szükséges ÉÉÉÉ.HH.NN. formában. (pl. "1999.12.31.")',
-	email: 'Valós e-mail cím megadása szükséges (pl. "fred@domain.hu").',
-	url: 'Valós URL megadása szükséges (pl. http://www.example.com).',
-	currencyDollar: 'Valós pénzösszeg megadása szükséges (pl. 100.00 Ft.).',
-	oneRequired: 'Az alábbi mezők legalább egyikének kitöltése kötelező.',
-	errorPrefix: 'Hiba: ',
-	warningPrefix: 'Figyelem: ',
-
-	// Form.Validator.Extras
-	noSpace: 'A mező nem tartalmazhat szóközöket.',
-	reqChkByNode: 'Nincs egyetlen kijelölt elem sem.',
-	requiredChk: 'A mező kitöltése kötelező.',
-	reqChkByName: 'Egy {label} kiválasztása szükséges.',
-	match: 'A mezőnek egyeznie kell a(z) {matchName} mezővel.',
-	startDate: 'a kezdet dátuma',
-	endDate: 'a vég dátuma',
-	currentDate: 'jelenlegi dátum',
-	afterDate: 'A dátum nem lehet kisebb, mint {label}.',
-	beforeDate: 'A dátum nem lehet nagyobb, mint {label}.',
-	startMonth: 'Kezdeti hónap megadása szükséges.',
-	sameMonth: 'A két dátumnak ugyanazon hónapban kell lennie.',
-	creditcard: 'A megadott bankkártyaszám nem valódi (megadva {length} számjegy).'
-
-});
-
-/*
----
-
-name: Locale.it-IT.Date
-
-description: Date messages for Italian.
-
-license: MIT-style license.
-
-authors:
-  - Andrea Novero
-  - Valerio Proietti
-
-requires:
-  - Locale
-
-provides: [Locale.it-IT.Date]
-
-...
-*/
-
-Locale.define('it-IT', 'Date', {
-
-	months: ['Gennaio', 'Febbraio', 'Marzo', 'Aprile', 'Maggio', 'Giugno', 'Luglio', 'Agosto', 'Settembre', 'Ottobre', 'Novembre', 'Dicembre'],
-	months_abbr: ['gen', 'feb', 'mar', 'apr', 'mag', 'giu', 'lug', 'ago', 'set', 'ott', 'nov', 'dic'],
-	days: ['Domenica', 'Lunedì', 'Martedì', 'Mercoledì', 'Giovedì', 'Venerdì', 'Sabato'],
-	days_abbr: ['dom', 'lun', 'mar', 'mer', 'gio', 'ven', 'sab'],
-
-	// Culture's date order: DD/MM/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%H.%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: 'º',
-
-	lessThanMinuteAgo: 'meno di un minuto fa',
-	minuteAgo: 'circa un minuto fa',
-	minutesAgo: 'circa {delta} minuti fa',
-	hourAgo: "circa un'ora fa",
-	hoursAgo: 'circa {delta} ore fa',
-	dayAgo: 'circa 1 giorno fa',
-	daysAgo: 'circa {delta} giorni fa',
-	weekAgo: 'una settimana fa',
-	weeksAgo: '{delta} settimane fa',
-	monthAgo: 'un mese fa',
-	monthsAgo: '{delta} mesi fa',
-	yearAgo: 'un anno fa',
-	yearsAgo: '{delta} anni fa',
-
-	lessThanMinuteUntil: 'tra meno di un minuto',
-	minuteUntil: 'tra circa un minuto',
-	minutesUntil: 'tra circa {delta} minuti',
-	hourUntil: "tra circa un'ora",
-	hoursUntil: 'tra circa {delta} ore',
-	dayUntil: 'tra circa un giorno',
-	daysUntil: 'tra circa {delta} giorni',
-	weekUntil: 'tra una settimana',
-	weeksUntil: 'tra {delta} settimane',
-	monthUntil: 'tra un mese',
-	monthsUntil: 'tra {delta} mesi',
-	yearUntil: 'tra un anno',
-	yearsUntil: 'tra {delta} anni'
-
-});
-
-/*
----
-
-name: Locale.it-IT.Form.Validator
-
-description: Form Validator messages for Italian.
-
-license: MIT-style license
-
-authors:
-  - Leonardo Laureti
-  - Andrea Novero
-
-requires:
-  - Locale
-
-provides: [Locale.it-IT.Form.Validator]
-
-...
-*/
-
-/*eslint mootools-whitespace:0*/
-
-Locale.define('it-IT', 'FormValidator', {
-
-	required: 'Il campo &egrave; obbligatorio.',
-	minLength: 'Inserire almeno {minLength} caratteri (ne sono stati inseriti {length}).',
-	maxLength: 'Inserire al massimo {maxLength} caratteri (ne sono stati inseriti {length}).',
-	integer: 'Inserire un numero intero. Non sono consentiti decimali (es.: 1.25).',
-	numeric: 'Inserire solo valori numerici (es.: "1" oppure "1.1" oppure "-1" oppure "-1.1").',
-	digits: 'Inserire solo numeri e caratteri di punteggiatura. Per esempio &egrave; consentito un numero telefonico con trattini o punti.',
-	alpha: 'Inserire solo lettere (a-z). Non sono consentiti spazi o altri caratteri.',
-	alphanum: 'Inserire solo lettere (a-z) o numeri (0-9). Non sono consentiti spazi o altri caratteri.',
-	dateSuchAs: 'Inserire una data valida del tipo {date}',
-	dateInFormatMDY: 'Inserire una data valida nel formato MM/GG/AAAA (es.: "12/31/1999")',
-	email: 'Inserire un indirizzo email valido. Per esempio "nome@dominio.com".',
-	url: 'Inserire un indirizzo valido. Per esempio "http://www.example.com".',
-	currencyDollar: 'Inserire un importo valido. Per esempio "$100.00".',
-	oneRequired: 'Completare almeno uno dei campi richiesti.',
-	errorPrefix: 'Errore: ',
-	warningPrefix: 'Attenzione: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Non sono consentiti spazi.',
-	reqChkByNode: 'Nessuna voce selezionata.',
-	requiredChk: 'Il campo &egrave; obbligatorio.',
-	reqChkByName: 'Selezionare un(a) {label}.',
-	match: 'Il valore deve corrispondere al campo {matchName}',
-	startDate: "data d'inizio",
-	endDate: 'data di fine',
-	currentDate: 'data attuale',
-	afterDate: 'La data deve corrispondere o essere successiva al {label}.',
-	beforeDate: 'La data deve corrispondere o essere precedente al {label}.',
-	startMonth: "Selezionare un mese d'inizio",
-	sameMonth: 'Le due date devono essere dello stesso mese - occorre modificarne una.'
-
-});
-
-/*
----
-
-name: Locale.ja-JP.Date
-
-description: Date messages for Japanese.
-
-license: MIT-style license
-
-authors:
-  - Noritaka Horio
-
-requires:
-  - Locale
-
-provides: [Locale.ja-JP.Date]
-
-...
-*/
-
-Locale.define('ja-JP', 'Date', {
-
-	months: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
-	months_abbr: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月'],
-	days: ['日曜日', '月曜日', '火曜日', '水曜日', '木曜日', '金曜日', '土曜日'],
-	days_abbr: ['日', '月', '火', '水', '木', '金', '土'],
-
-	// Culture's date order: YYYY/MM/DD
-	dateOrder: ['year', 'month', 'date'],
-	shortDate: '%Y/%m/%d',
-	shortTime: '%H:%M',
-	AM: '午前',
-	PM: '午後',
-	firstDayOfWeek: 0,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: '1分以内前',
-	minuteAgo: '約1分前',
-	minutesAgo: '約{delta}分前',
-	hourAgo: '約1時間前',
-	hoursAgo: '約{delta}時間前',
-	dayAgo: '1日前',
-	daysAgo: '{delta}日前',
-	weekAgo: '1週間前',
-	weeksAgo: '{delta}週間前',
-	monthAgo: '1ヶ月前',
-	monthsAgo: '{delta}ヶ月前',
-	yearAgo: '1年前',
-	yearsAgo: '{delta}年前',
-
-	lessThanMinuteUntil: '今から約1分以内',
-	minuteUntil: '今から約1分',
-	minutesUntil: '今から約{delta}分',
-	hourUntil: '今から約1時間',
-	hoursUntil: '今から約{delta}時間',
-	dayUntil: '今から1日間',
-	daysUntil: '今から{delta}日間',
-	weekUntil: '今から1週間',
-	weeksUntil: '今から{delta}週間',
-	monthUntil: '今から1ヶ月',
-	monthsUntil: '今から{delta}ヶ月',
-	yearUntil: '今から1年',
-	yearsUntil: '今から{delta}年'
-
-});
-
-/*
----
-
-name: Locale.ja-JP.Form.Validator
-
-description: Form Validator messages for Japanese.
-
-license: MIT-style license
-
-authors:
-  - Noritaka Horio
-
-requires:
-  - Locale
-
-provides: [Locale.ja-JP.Form.Validator]
-
-...
-*/
-
-Locale.define('ja-JP', 'FormValidator', {
-
-	required: '入力は必須です。',
-	minLength: '入力文字数は{minLength}以上にしてください。({length}文字)',
-	maxLength: '入力文字数は{maxLength}以下にしてください。({length}文字)',
-	integer: '整数を入力してください。',
-	numeric: '入力できるのは数値だけです。(例: "1", "1.1", "-1", "-1.1"....)',
-	digits: '入力できるのは数値と句読記号です。 (例: -や+を含む電話番号など).',
-	alpha: '入力できるのは半角英字だけです。それ以外の文字は入力できません。',
-	alphanum: '入力できるのは半角英数字だけです。それ以外の文字は入力できません。',
-	dateSuchAs: '有効な日付を入力してください。{date}',
-	dateInFormatMDY: '日付の書式に誤りがあります。YYYY/MM/DD (i.e. "1999/12/31")',
-	email: 'メールアドレスに誤りがあります。',
-	url: 'URLアドレスに誤りがあります。',
-	currencyDollar: '金額に誤りがあります。',
-	oneRequired: 'ひとつ以上入力してください。',
-	errorPrefix: 'エラー: ',
-	warningPrefix: '警告: ',
-
-	// FormValidator.Extras
-	noSpace: 'スペースは入力できません。',
-	reqChkByNode: '選択されていません。',
-	requiredChk: 'この項目は必須です。',
-	reqChkByName: '{label}を選択してください。',
-	match: '{matchName}が入力されている場合必須です。',
-	startDate: '開始日',
-	endDate: '終了日',
-	currentDate: '今日',
-	afterDate: '{label}以降の日付にしてください。',
-	beforeDate: '{label}以前の日付にしてください。',
-	startMonth: '開始月を選択してください。',
-	sameMonth: '日付が同一です。どちらかを変更してください。'
-
-});
-
-/*
----
-
-name: Locale.ja-JP.Number
-
-description: Number messages for Japanese.
-
-license: MIT-style license
-
-authors:
-  - Noritaka Horio
-
-requires:
-  - Locale
-
-provides: [Locale.ja-JP.Number]
-
-...
-*/
-
-Locale.define('ja-JP', 'Number', {
-
-	decimal: '.',
-	group: ',',
-
-	currency: {
-		decimals: 0,
-		prefix: '\\'
-	}
-
-});
-
-/*
----
-
-name: Locale.nl-NL.Date
-
-description: Date messages for Dutch.
-
-license: MIT-style license
-
-authors:
-  - Lennart Pilon
-  - Tim Wienk
-
-requires:
-  - Locale
-
-provides: [Locale.nl-NL.Date]
-
-...
-*/
-
-Locale.define('nl-NL', 'Date', {
-
-	months: ['januari', 'februari', 'maart', 'april', 'mei', 'juni', 'juli', 'augustus', 'september', 'oktober', 'november', 'december'],
-	months_abbr: ['jan', 'feb', 'mrt', 'apr', 'mei', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
-	days: ['zondag', 'maandag', 'dinsdag', 'woensdag', 'donderdag', 'vrijdag', 'zaterdag'],
-	days_abbr: ['zo', 'ma', 'di', 'wo', 'do', 'vr', 'za'],
-
-	// Culture's date order: DD-MM-YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d-%m-%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: 'e',
-
-	lessThanMinuteAgo: 'minder dan een minuut geleden',
-	minuteAgo: 'ongeveer een minuut geleden',
-	minutesAgo: '{delta} minuten geleden',
-	hourAgo: 'ongeveer een uur geleden',
-	hoursAgo: 'ongeveer {delta} uur geleden',
-	dayAgo: 'een dag geleden',
-	daysAgo: '{delta} dagen geleden',
-	weekAgo: 'een week geleden',
-	weeksAgo: '{delta} weken geleden',
-	monthAgo: 'een maand geleden',
-	monthsAgo: '{delta} maanden geleden',
-	yearAgo: 'een jaar geleden',
-	yearsAgo: '{delta} jaar geleden',
-
-	lessThanMinuteUntil: 'over minder dan een minuut',
-	minuteUntil: 'over ongeveer een minuut',
-	minutesUntil: 'over {delta} minuten',
-	hourUntil: 'over ongeveer een uur',
-	hoursUntil: 'over {delta} uur',
-	dayUntil: 'over ongeveer een dag',
-	daysUntil: 'over {delta} dagen',
-	weekUntil: 'over een week',
-	weeksUntil: 'over {delta} weken',
-	monthUntil: 'over een maand',
-	monthsUntil: 'over {delta} maanden',
-	yearUntil: 'over een jaar',
-	yearsUntil: 'over {delta} jaar'
-
-});
-
-/*
----
-
-name: Locale.nl-NL.Form.Validator
-
-description: Form Validator messages for Dutch.
-
-license: MIT-style license
-
-authors:
-  - Lennart Pilon
-  - Arian Stolwijk
-  - Tim Wienk
-
-requires:
-  - Locale
-
-provides: [Locale.nl-NL.Form.Validator]
-
-...
-*/
-
-Locale.define('nl-NL', 'FormValidator', {
-
-	required: 'Dit veld is verplicht.',
-	length: 'Vul precies {length} karakters in (je hebt {elLength} karakters ingevoerd).',
-	minLength: 'Vul minimaal {minLength} karakters in (je hebt {length} karakters ingevoerd).',
-	maxLength: 'Vul niet meer dan {maxLength} karakters in (je hebt {length} karakters ingevoerd).',
-	integer: 'Vul een getal in. Getallen met decimalen (bijvoorbeeld 1.25) zijn niet toegestaan.',
-	numeric: 'Vul alleen numerieke waarden in (bijvoorbeeld "1" of "1.1" of "-1" of "-1.1").',
-	digits: 'Vul alleen nummers en leestekens in (bijvoorbeeld een telefoonnummer met streepjes is toegestaan).',
-	alpha: 'Vul alleen letters in (a-z). Spaties en andere karakters zijn niet toegestaan.',
-	alphanum: 'Vul alleen letters (a-z) of nummers (0-9) in. Spaties en andere karakters zijn niet toegestaan.',
-	dateSuchAs: 'Vul een geldige datum in, zoals {date}',
-	dateInFormatMDY: 'Vul een geldige datum, in het formaat MM/DD/YYYY (bijvoorbeeld "12/31/1999")',
-	email: 'Vul een geldig e-mailadres in. Bijvoorbeeld "fred@domein.nl".',
-	url: 'Vul een geldige URL in, zoals http://www.example.com.',
-	currencyDollar: 'Vul een geldig $ bedrag in. Bijvoorbeeld $100.00 .',
-	oneRequired: 'Vul iets in bij in ieder geval een van deze velden.',
-	warningPrefix: 'Waarschuwing: ',
-	errorPrefix: 'Fout: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Spaties zijn niet toegestaan in dit veld.',
-	reqChkByNode: 'Er zijn geen items geselecteerd.',
-	requiredChk: 'Dit veld is verplicht.',
-	reqChkByName: 'Selecteer een {label}.',
-	match: 'Dit veld moet overeen komen met het {matchName} veld',
-	startDate: 'de begin datum',
-	endDate: 'de eind datum',
-	currentDate: 'de huidige datum',
-	afterDate: 'De datum moet hetzelfde of na {label} zijn.',
-	beforeDate: 'De datum moet hetzelfde of voor {label} zijn.',
-	startMonth: 'Selecteer een begin maand',
-	sameMonth: 'Deze twee data moeten in dezelfde maand zijn - u moet een van beide aanpassen.',
-	creditcard: 'Het ingevulde creditcardnummer is niet geldig. Controleer het nummer en probeer opnieuw. {length} getallen ingevuld.'
-
-});
-
-/*
----
-
-name: Locale.nl-NL.Number
-
-description: Number messages for Dutch.
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-
-requires:
-  - Locale
-  - Locale.EU.Number
-
-provides: [Locale.nl-NL.Number]
-
-...
-*/
-
-Locale.define('nl-NL').inherit('EU', 'Number');
-
-
-
-
-/*
----
-
-name: Locale.no-NO.Date
-
-description: Date messages for Norwegian.
-
-license: MIT-style license
-
-authors:
-  - Espen 'Rexxars' Hovlandsdal
-  - Ole Tøsse Kolvik
-requires:
-  - Locale
-
-provides: [Locale.no-NO.Date]
-
-...
-*/
-
-Locale.define('no-NO', 'Date', {
-	months: ['Januar', 'Februar', 'Mars', 'April', 'Mai', 'Juni', 'Juli', 'August', 'September', 'Oktober', 'November', 'Desember'],
-	months_abbr: ['Jan', 'Feb', 'Mar', 'Apr', 'Mai', 'Jun', 'Jul', 'Aug', 'Sep', 'Okt', 'Nov', 'Des'],
-	days: ['Søndag', 'Mandag', 'Tirsdag', 'Onsdag', 'Torsdag', 'Fredag', 'Lørdag'],
-	days_abbr: ['Søn', 'Man', 'Tir', 'Ons', 'Tor', 'Fre', 'Lør'],
-
-	// Culture's date order: DD.MM.YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d.%m.%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	lessThanMinuteAgo: 'mindre enn et minutt siden',
-	minuteAgo: 'omtrent et minutt siden',
-	minutesAgo: '{delta} minutter siden',
-	hourAgo: 'omtrent en time siden',
-	hoursAgo: 'omtrent {delta} timer siden',
-	dayAgo: '{delta} dag siden',
-	daysAgo: '{delta} dager siden',
-	weekAgo: 'en uke siden',
-	weeksAgo: '{delta} uker siden',
-	monthAgo: 'en måned siden',
-	monthsAgo: '{delta} måneder siden',
-	yearAgo: 'ett år siden',
-	yearsAgo: '{delta} år siden',
-
-	lessThanMinuteUntil: 'mindre enn et minutt til',
-	minuteUntil: 'omtrent et minutt til',
-	minutesUntil: '{delta} minutter til',
-	hourUntil: 'omtrent en time til',
-	hoursUntil: 'omtrent {delta} timer til',
-	dayUntil: 'en dag til',
-	daysUntil: '{delta} dager til',
-	weekUntil: 'en uke til',
-	weeksUntil: '{delta} uker til',
-	monthUntil: 'en måned til',
-	monthsUntil: '{delta} måneder til',
-	yearUntil: 'et år til',
-	yearsUntil: '{delta} år til'
-});
-
-/*
----
-
-name: Locale.no-NO.Form.Validator
-
-description: Form Validator messages for Norwegian.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Espen 'Rexxars' Hovlandsdal
-  - Ole Tøsse Kolvik
-
-requires:
-  - Locale
-
-provides: [Locale.no-NO.Form.Validator]
-
-...
-*/
-
-Locale.define('no-NO', 'FormValidator', {
-
-	required: 'Dette feltet er påkrevd.',
-	length: 'Skriv inn {length} tegn (du skrev {elLength} tegn)',
-	minLength: 'Skriv inn minst {minLength} tegn (du skrev {length} tegn).',
-	maxLength: 'Ikke skriv mer enn {maxLength} tegn (du skrev {length} tegn).',
-	integer: 'Skriv inn et tall i dette feltet. Tall med desimaler (f.eks. 1,25) er ikke tillat.',
-	numeric: 'Skriv kun inn numeriske verdier i dette feltet (f.eks. "1", "1.1", "-1" eller "-1.1").',
-	digits: 'Skriv kun nummer og skilletegn i dette feltet.',
-	alpha: 'Skriv kun bokstaver (a-å) i dette feltet. Ingen mellomrom eller andre tegn er tillat.',
-	alphanum: 'Skriv kun bokstaver (a-å) eller nummer (0-9) i dette feltet. Ingen mellomrom eller andre tegn er tillat.',
-	dateSuchAs: 'Skriv inn en gyldig dato, som f.eks. {date}',
-	dateInFormatMDY: 'Skriv inn en gyldig dato, f.eks. DD/MM/YYYY ("31/12/1999")',
-	email: 'Skriv inn en gyldig epost-adresse. F.eks. "ola.nordmann@example.com".',
-	url: 'Skriv inn en gyldig URL, f.eks. http://www.example.com.',
-	currencyDollar: 'Skriv inn et gyldig beløp. F.eks. 100,00.',
-	oneRequired: 'Minst ett av disse feltene må fylles ut.',
-	errorPrefix: 'Feil: ',
-	warningPrefix: 'Advarsel: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Mellomrom er ikke tillatt i dette feltet.',
-	reqChkByNode: 'Ingen objekter er valgt.',
-	requiredChk: 'Dette feltet er påkrevd.',
-	reqChkByName: 'Velg en {label}.',
-	match: 'Dette feltet må være lik {matchName}',
-	startDate: 'startdato',
-	endDate: 'sluttdato',
-	currentDate: 'dagens dato',
-	afterDate: 'Datoen må være den samme som eller etter {label}.',
-	beforeDate: 'Datoen må være den samme som eller før {label}.',
-	startMonth: 'Velg en startmåned',
-	sameMonth: 'Datoene må være i den samme måneden - velg den ene eller den andre.',
-	creditcard: 'Kortnummeret du skrev inn er ikke gyldig. Prøv igjen. Du skrev {length} siffer.'
-
-});
-
-/*
----
-
-name: Locale.no-NO.Number
-
-description: Number messages for Norwegian.
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-  - Martin Lundgren
-  - Ole T�sse Kolvik
-
-requires:
-  - Locale
-  - Locale.EU.Number
-
-provides: [Locale.no-NO.Number]
-
-...
-*/
-
-Locale.define('no-NO', 'Number', {
-
-	currency: {
-		prefix: 'NOK '
-	}
-
-}).inherit('EU', 'Number');
-
-/*
----
-
-name: Locale.pl-PL.Date
-
-description: Date messages for Polish.
-
-license: MIT-style license
-
-authors:
-  - Oskar Krawczyk
-
-requires:
-  - Locale
-
-provides: [Locale.pl-PL.Date]
-
-...
-*/
-
-Locale.define('pl-PL', 'Date', {
-
-	months: ['Styczeń', 'Luty', 'Marzec', 'Kwiecień', 'Maj', 'Czerwiec', 'Lipiec', 'Sierpień', 'Wrzesień', 'Październik', 'Listopad', 'Grudzień'],
-	months_abbr: ['sty', 'lut', 'mar', 'kwi', 'maj', 'cze', 'lip', 'sie', 'wrz', 'paź', 'lis', 'gru'],
-	days: ['Niedziela', 'Poniedziałek', 'Wtorek', 'Środa', 'Czwartek', 'Piątek', 'Sobota'],
-	days_abbr: ['niedz.', 'pon.', 'wt.', 'śr.', 'czw.', 'pt.', 'sob.'],
-
-	// Culture's date order: YYYY-MM-DD
-	dateOrder: ['year', 'month', 'date'],
-	shortDate: '%Y-%m-%d',
-	shortTime: '%H:%M',
-	AM: 'nad ranem',
-	PM: 'po południu',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: function(dayOfMonth){
-		return (dayOfMonth > 3 && dayOfMonth < 21) ? 'ty' : ['ty', 'szy', 'gi', 'ci', 'ty'][Math.min(dayOfMonth % 10, 4)];
-	},
-
-	lessThanMinuteAgo: 'mniej niż minute temu',
-	minuteAgo: 'około minutę temu',
-	minutesAgo: '{delta} minut temu',
-	hourAgo: 'około godzinę temu',
-	hoursAgo: 'około {delta} godzin temu',
-	dayAgo: 'Wczoraj',
-	daysAgo: '{delta} dni temu',
-
-	lessThanMinuteUntil: 'za niecałą minutę',
-	minuteUntil: 'za około minutę',
-	minutesUntil: 'za {delta} minut',
-	hourUntil: 'za około godzinę',
-	hoursUntil: 'za około {delta} godzin',
-	dayUntil: 'za 1 dzień',
-	daysUntil: 'za {delta} dni'
-
-});
-
-/*
----
-
-name: Locale.pl-PL.Form.Validator
-
-description: Form Validator messages for Polish.
-
-license: MIT-style license
-
-authors:
-  - Oskar Krawczyk
-
-requires:
-  - Locale
-
-provides: [Locale.pl-PL.Form.Validator]
-
-...
-*/
-
-Locale.define('pl-PL', 'FormValidator', {
-
-	required: 'To pole jest wymagane.',
-	minLength: 'Wymagane jest przynajmniej {minLength} znaków (wpisanych zostało tylko {length}).',
-	maxLength: 'Dozwolone jest nie więcej niż {maxLength} znaków (wpisanych zostało {length})',
-	integer: 'To pole wymaga liczb całych. Liczby dziesiętne (np. 1.25) są niedozwolone.',
-	numeric: 'Prosimy używać tylko numerycznych wartości w tym polu (np. "1", "1.1", "-1" lub "-1.1").',
-	digits: 'Prosimy używać liczb oraz zankow punktuacyjnych w typ polu (dla przykładu, przy numerze telefonu myślniki i kropki są dozwolone).',
-	alpha: 'Prosimy używać tylko liter (a-z) w tym polu. Spacje oraz inne znaki są niedozwolone.',
-	alphanum: 'Prosimy używać tylko liter (a-z) lub liczb (0-9) w tym polu. Spacje oraz inne znaki są niedozwolone.',
-	dateSuchAs: 'Prosimy podać prawidłową datę w formacie: {date}',
-	dateInFormatMDY: 'Prosimy podać poprawną date w formacie DD.MM.RRRR (i.e. "12.01.2009")',
-	email: 'Prosimy podać prawidłowy adres e-mail, np. "jan@domena.pl".',
-	url: 'Prosimy podać prawidłowy adres URL, np. http://www.example.com.',
-	currencyDollar: 'Prosimy podać prawidłową sumę w PLN. Dla przykładu: 100.00 PLN.',
-	oneRequired: 'Prosimy wypełnić chociaż jedno z pól.',
-	errorPrefix: 'Błąd: ',
-	warningPrefix: 'Uwaga: ',
-
-	// Form.Validator.Extras
-	noSpace: 'W tym polu nie mogą znajdować się spacje.',
-	reqChkByNode: 'Brak zaznaczonych elementów.',
-	requiredChk: 'To pole jest wymagane.',
-	reqChkByName: 'Prosimy wybrać z {label}.',
-	match: 'To pole musi być takie samo jak {matchName}',
-	startDate: 'data początkowa',
-	endDate: 'data końcowa',
-	currentDate: 'aktualna data',
-	afterDate: 'Podana data poinna być taka sama lub po {label}.',
-	beforeDate: 'Podana data poinna być taka sama lub przed {label}.',
-	startMonth: 'Prosimy wybrać początkowy miesiąc.',
-	sameMonth: 'Te dwie daty muszą być w zakresie tego samego miesiąca - wymagana jest zmiana któregoś z pól.'
-
-});
-
-/*
----
-
-name: Locale.pt-PT.Date
-
-description: Date messages for Portuguese.
-
-license: MIT-style license
-
-authors:
-  - Fabio Miranda Costa
-
-requires:
-  - Locale
-
-provides: [Locale.pt-PT.Date]
-
-...
-*/
-
-Locale.define('pt-PT', 'Date', {
-
-	months: ['Janeiro', 'Fevereiro', 'Março', 'Abril', 'Maio', 'Junho', 'Julho', 'Agosto', 'Setembro', 'Outubro', 'Novembro', 'Dezembro'],
-	months_abbr: ['Jan', 'Fev', 'Mar', 'Abr', 'Mai', 'Jun', 'Jul', 'Ago', 'Set', 'Out', 'Nov', 'Dez'],
-	days: ['Domingo', 'Segunda-feira', 'Terça-feira', 'Quarta-feira', 'Quinta-feira', 'Sexta-feira', 'Sábado'],
-	days_abbr: ['Dom', 'Seg', 'Ter', 'Qua', 'Qui', 'Sex', 'Sáb'],
-
-	// Culture's date order: DD-MM-YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d-%m-%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: 'º',
-
-	lessThanMinuteAgo: 'há menos de um minuto',
-	minuteAgo: 'há cerca de um minuto',
-	minutesAgo: 'há {delta} minutos',
-	hourAgo: 'há cerca de uma hora',
-	hoursAgo: 'há cerca de {delta} horas',
-	dayAgo: 'há um dia',
-	daysAgo: 'há {delta} dias',
-	weekAgo: 'há uma semana',
-	weeksAgo: 'há {delta} semanas',
-	monthAgo: 'há um mês',
-	monthsAgo: 'há {delta} meses',
-	yearAgo: 'há um ano',
-	yearsAgo: 'há {delta} anos',
-
-	lessThanMinuteUntil: 'em menos de um minuto',
-	minuteUntil: 'em um minuto',
-	minutesUntil: 'em {delta} minutos',
-	hourUntil: 'em uma hora',
-	hoursUntil: 'em {delta} horas',
-	dayUntil: 'em um dia',
-	daysUntil: 'em {delta} dias',
-	weekUntil: 'em uma semana',
-	weeksUntil: 'em {delta} semanas',
-	monthUntil: 'em um mês',
-	monthsUntil: 'em {delta} meses',
-	yearUntil: 'em um ano',
-	yearsUntil: 'em {delta} anos'
-
-});
-
-/*
----
-
-name: Locale.pt-BR.Date
-
-description: Date messages for Portuguese (Brazil).
-
-license: MIT-style license
-
-authors:
-  - Fabio Miranda Costa
-
-requires:
-  - Locale
-  - Locale.pt-PT.Date
-
-provides: [Locale.pt-BR.Date]
-
-...
-*/
-
-Locale.define('pt-BR', 'Date', {
-
-	// Culture's date order: DD/MM/YYYY
-	shortDate: '%d/%m/%Y'
-
-}).inherit('pt-PT', 'Date');
-
-/*
----
-
-name: Locale.pt-BR.Form.Validator
-
-description: Form Validator messages for Portuguese (Brazil).
-
-license: MIT-style license
-
-authors:
-  - Fábio Miranda Costa
-
-requires:
-  - Locale
-
-provides: [Locale.pt-BR.Form.Validator]
-
-...
-*/
-
-Locale.define('pt-BR', 'FormValidator', {
-
-	required: 'Este campo é obrigatório.',
-	minLength: 'Digite pelo menos {minLength} caracteres (tamanho atual: {length}).',
-	maxLength: 'Não digite mais de {maxLength} caracteres (tamanho atual: {length}).',
-	integer: 'Por favor digite apenas um número inteiro neste campo. Não são permitidos números decimais (por exemplo, 1,25).',
-	numeric: 'Por favor digite apenas valores numéricos neste campo (por exemplo, "1" ou "1.1" ou "-1" ou "-1,1").',
-	digits: 'Por favor use apenas números e pontuação neste campo (por exemplo, um número de telefone com traços ou pontos é permitido).',
-	alpha: 'Por favor use somente letras (a-z). Espaço e outros caracteres não são permitidos.',
-	alphanum: 'Use somente letras (a-z) ou números (0-9) neste campo. Espaço e outros caracteres não são permitidos.',
-	dateSuchAs: 'Digite uma data válida, como {date}',
-	dateInFormatMDY: 'Digite uma data válida, como DD/MM/YYYY (por exemplo, "31/12/1999")',
-	email: 'Digite um endereço de email válido. Por exemplo "nome@dominio.com".',
-	url: 'Digite uma URL válida. Exemplo: http://www.example.com.',
-	currencyDollar: 'Digite um valor em dinheiro válido. Exemplo: R$100,00 .',
-	oneRequired: 'Digite algo para pelo menos um desses campos.',
-	errorPrefix: 'Erro: ',
-	warningPrefix: 'Aviso: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Não é possível digitar espaços neste campo.',
-	reqChkByNode: 'Não foi selecionado nenhum item.',
-	requiredChk: 'Este campo é obrigatório.',
-	reqChkByName: 'Por favor digite um {label}.',
-	match: 'Este campo deve ser igual ao campo {matchName}.',
-	startDate: 'a data inicial',
-	endDate: 'a data final',
-	currentDate: 'a data atual',
-	afterDate: 'A data deve ser igual ou posterior a {label}.',
-	beforeDate: 'A data deve ser igual ou anterior a {label}.',
-	startMonth: 'Por favor selecione uma data inicial.',
-	sameMonth: 'Estas duas datas devem ter o mesmo mês - você deve modificar uma das duas.',
-	creditcard: 'O número do cartão de crédito informado é inválido. Por favor verifique o valor e tente novamente. {length} números informados.'
-
-});
-
-/*
----
-
-name: Locale.pt-BR.Number
-
-description: Number messages for PT Brazilian.
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-  - Danillo César
-
-requires:
-  - Locale
-
-provides: [Locale.pt-BR.Number]
-
-...
-*/
-
-Locale.define('pt-BR', 'Number', {
-
-	decimal: ',',
-	group: '.',
-
-	currency: {
-		prefix: 'R$ '
-	}
-
-});
-
-
-
-/*
----
-
-name: Locale.pt-PT.Form.Validator
-
-description: Form Validator messages for Portuguese.
-
-license: MIT-style license
-
-authors:
-  - Miquel Hudin
-
-requires:
-  - Locale
-
-provides: [Locale.pt-PT.Form.Validator]
-
-...
-*/
-
-Locale.define('pt-PT', 'FormValidator', {
-
-	required: 'Este campo é necessário.',
-	minLength: 'Digite pelo menos{minLength} caracteres (comprimento {length} caracteres).',
-	maxLength: 'Não insira mais de {maxLength} caracteres (comprimento {length} caracteres).',
-	integer: 'Digite um número inteiro neste domínio. Com números decimais (por exemplo, 1,25), não são permitidas.',
-	numeric: 'Digite apenas valores numéricos neste domínio (p.ex., "1" ou "1.1" ou "-1" ou "-1,1").',
-	digits: 'Por favor, use números e pontuação apenas neste campo (p.ex., um número de telefone com traços ou pontos é permitida).',
-	alpha: 'Por favor use somente letras (a-z), com nesta área. Não utilize espaços nem outros caracteres são permitidos.',
-	alphanum: 'Use somente letras (a-z) ou números (0-9) neste campo. Não utilize espaços nem outros caracteres são permitidos.',
-	dateSuchAs: 'Digite uma data válida, como {date}',
-	dateInFormatMDY: 'Digite uma data válida, como DD/MM/YYYY (p.ex. "31/12/1999")',
-	email: 'Digite um endereço de email válido. Por exemplo "fred@domain.com".',
-	url: 'Digite uma URL válida, como http://www.example.com.',
-	currencyDollar: 'Digite um valor válido $. Por exemplo $ 100,00. ',
-	oneRequired: 'Digite algo para pelo menos um desses insumos.',
-	errorPrefix: 'Erro: ',
-	warningPrefix: 'Aviso: '
-
-});
-
-/*
----
-
-name: Locale.ru-RU-unicode.Date
-
-description: Date messages for Russian (utf-8).
-
-license: MIT-style license
-
-authors:
-  - Evstigneev Pavel
-  - Kuryanovich Egor
-
-requires:
-  - Locale
-
-provides: [Locale.ru-RU.Date]
-
-...
-*/
-
-(function(){
-
-// Russian language pluralization rules, taken from CLDR project, http://unicode.org/cldr/
-// one -> n mod 10 is 1 and n mod 100 is not 11;
-// few -> n mod 10 in 2..4 and n mod 100 not in 12..14;
-// many -> n mod 10 is 0 or n mod 10 in 5..9 or n mod 100 in 11..14;
-// other -> everything else (example 3.14)
-var pluralize = function(n, one, few, many, other){
-	var modulo10 = n % 10,
-		modulo100 = n % 100;
-
-	if (modulo10 == 1 && modulo100 != 11){
-		return one;
-	} else if ((modulo10 == 2 || modulo10 == 3 || modulo10 == 4) && !(modulo100 == 12 || modulo100 == 13 || modulo100 == 14)){
-		return few;
-	} else if (modulo10 == 0 || (modulo10 == 5 || modulo10 == 6 || modulo10 == 7 || modulo10 == 8 || modulo10 == 9) || (modulo100 == 11 || modulo100 == 12 || modulo100 == 13 || modulo100 == 14)){
-		return many;
-	} else {
-		return other;
-	}
-};
-
-Locale.define('ru-RU', 'Date', {
-
-	months: ['Январь', 'Февраль', 'Март', 'Апрель', 'Май', 'Июнь', 'Июль', 'Август', 'Сентябрь', 'Октябрь', 'Ноябрь', 'Декабрь'],
-	months_abbr: ['янв', 'февр', 'март', 'апр', 'май','июнь','июль','авг','сент','окт','нояб','дек'],
-	days: ['Воскресенье', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота'],
-	days_abbr: ['Вс', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'],
-
-	// Culture's date order: DD.MM.YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d.%m.%Y',
-	shortTime: '%H:%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: 'меньше минуты назад',
-	minuteAgo: 'минуту назад',
-	minutesAgo: function(delta){ return '{delta} ' + pluralize(delta, 'минуту', 'минуты', 'минут') + ' назад'; },
-	hourAgo: 'час назад',
-	hoursAgo: function(delta){ return '{delta} ' + pluralize(delta, 'час', 'часа', 'часов') + ' назад'; },
-	dayAgo: 'вчера',
-	daysAgo: function(delta){ return '{delta} ' + pluralize(delta, 'день', 'дня', 'дней') + ' назад'; },
-	weekAgo: 'неделю назад',
-	weeksAgo: function(delta){ return '{delta} ' + pluralize(delta, 'неделя', 'недели', 'недель') + ' назад'; },
-	monthAgo: 'месяц назад',
-	monthsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'месяц', 'месяца', 'месяцев') + ' назад'; },
-	yearAgo: 'год назад',
-	yearsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'год', 'года', 'лет') + ' назад'; },
-
-	lessThanMinuteUntil: 'меньше чем через минуту',
-	minuteUntil: 'через минуту',
-	minutesUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'минуту', 'минуты', 'минут') + ''; },
-	hourUntil: 'через час',
-	hoursUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'час', 'часа', 'часов') + ''; },
-	dayUntil: 'завтра',
-	daysUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'день', 'дня', 'дней') + ''; },
-	weekUntil: 'через неделю',
-	weeksUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'неделю', 'недели', 'недель') + ''; },
-	monthUntil: 'через месяц',
-	monthsUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'месяц', 'месяца', 'месяцев') + ''; },
-	yearUntil: 'через',
-	yearsUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'год', 'года', 'лет') + ''; }
-
-});
-
-
-
-})();
-
-/*
----
-
-name: Locale.ru-RU-unicode.Form.Validator
-
-description: Form Validator messages for Russian (utf-8).
-
-license: MIT-style license
-
-authors:
-  - Chernodarov Egor
-
-requires:
-  - Locale
-
-provides: [Locale.ru-RU.Form.Validator]
-
-...
-*/
-
-Locale.define('ru-RU', 'FormValidator', {
-
-	required: 'Это поле обязательно к заполнению.',
-	minLength: 'Пожалуйста, введите хотя бы {minLength} символов (Вы ввели {length}).',
-	maxLength: 'Пожалуйста, введите не больше {maxLength} символов (Вы ввели {length}).',
-	integer: 'Пожалуйста, введите в это поле число. Дробные числа (например 1.25) тут не разрешены.',
-	numeric: 'Пожалуйста, введите в это поле число (например "1" или "1.1", или "-1", или "-1.1").',
-	digits: 'В этом поле Вы можете использовать только цифры и знаки пунктуации (например, телефонный номер со знаками дефиса или с точками).',
-	alpha: 'В этом поле можно использовать только латинские буквы (a-z). Пробелы и другие символы запрещены.',
-	alphanum: 'В этом поле можно использовать только латинские буквы (a-z) и цифры (0-9). Пробелы и другие символы запрещены.',
-	dateSuchAs: 'Пожалуйста, введите корректную дату {date}',
-	dateInFormatMDY: 'Пожалуйста, введите дату в формате ММ/ДД/ГГГГ (например "12/31/1999")',
-	email: 'Пожалуйста, введите корректный емейл-адрес. Для примера "fred@domain.com".',
-	url: 'Пожалуйста, введите правильную ссылку вида http://www.example.com.',
-	currencyDollar: 'Пожалуйста, введите сумму в долларах. Например: $100.00 .',
-	oneRequired: 'Пожалуйста, выберите хоть что-нибудь в одном из этих полей.',
-	errorPrefix: 'Ошибка: ',
-	warningPrefix: 'Внимание: '
-
-});
-
-
-
-/*
----
-
-name: Locale.sk-SK.Date
-
-description: Date messages for Slovak.
-
-license: MIT-style license
-
-authors:
-  - Ivan Masár
-
-requires:
-  - Locale
-
-provides: [Locale.sk-SK.Date]
-
-...
-*/
-(function(){
-
-// Slovak language pluralization rules, see http://unicode.org/repos/cldr-tmp/trunk/diff/supplemental/language_plural_rules.html
-// one -> n is 1;            1
-// few -> n in 2..4;         2-4
-// other -> everything else  0, 5-999, 1.31, 2.31, 5.31...
-var pluralize = function(n, one, few, other){
-	if (n == 1) return one;
-	else if (n == 2 || n == 3 || n == 4) return few;
-	else return other;
-};
-
-Locale.define('sk-SK', 'Date', {
-
-	months: ['Január', 'Február', 'Marec', 'Apríl', 'Máj', 'Jún', 'Júl', 'August', 'September', 'Október', 'November', 'December'],
-	months_abbr: ['januára', 'februára', 'marca', 'apríla', 'mája', 'júna', 'júla', 'augusta', 'septembra', 'októbra', 'novembra', 'decembra'],
-	days: ['Nedele', 'Pondelí', 'Úterý', 'Streda', 'Čtvrtek', 'Pátek', 'Sobota'],
-	days_abbr: ['ne', 'po', 'ut', 'st', 'št', 'pi', 'so'],
-
-	// Culture's date order: DD.MM.YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d.%m.%Y',
-	shortTime: '%H:%M',
-	AM: 'dop.',
-	PM: 'pop.',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '.',
-
-	lessThanMinuteAgo: 'pred chvíľou',
-	minuteAgo: 'približne pred minútou',
-	minutesAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'minútou', 'minútami', 'minútami'); },
-	hourAgo: 'približne pred hodinou',
-	hoursAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'hodinou', 'hodinami', 'hodinami'); },
-	dayAgo: 'pred dňom',
-	daysAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'dňom', 'dňami', 'dňami'); },
-	weekAgo: 'pred týždňom',
-	weeksAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'týždňom', 'týždňami', 'týždňami'); },
-	monthAgo: 'pred mesiacom',
-	monthsAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'mesiacom', 'mesiacmi', 'mesiacmi'); },
-	yearAgo: 'pred rokom',
-	yearsAgo: function(delta){ return 'pred {delta} ' + pluralize(delta, 'rokom', 'rokmi', 'rokmi'); },
-
-	lessThanMinuteUntil: 'o chvíľu',
-	minuteUntil: 'približne o minútu',
-	minutesUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'minútu', 'minúty', 'minúty'); },
-	hourUntil: 'približne o hodinu',
-	hoursUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'hodinu', 'hodiny', 'hodín'); },
-	dayUntil: 'o deň',
-	daysUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'deň', 'dni', 'dní'); },
-	weekUntil: 'o týždeň',
-	weeksUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'týždeň', 'týždne', 'týždňov'); },
-	monthUntil: 'o mesiac',
-	monthsUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'mesiac', 'mesiace', 'mesiacov'); },
-	yearUntil: 'o rok',
-	yearsUntil: function(delta){ return 'o {delta} ' + pluralize(delta, 'rok', 'roky', 'rokov'); }
-});
-
-})();
-
-/*
----
-
-name: Locale.sk-SK.Form.Validator
-
-description: Form Validator messages for Czech.
-
-license: MIT-style license
-
-authors:
-  - Ivan Masár
-
-requires:
-  - Locale
-
-provides: [Locale.sk-SK.Form.Validator]
-
-...
-*/
-
-Locale.define('sk-SK', 'FormValidator', {
-
-	required: 'Táto položka je povinná.',
-	minLength: 'Zadajte prosím aspoň {minLength} znakov (momentálne {length} znakov).',
-	maxLength: 'Zadajte prosím menej ako {maxLength} znakov (momentálne {length} znakov).',
-	integer: 'Zadajte prosím celé číslo. Desetinné čísla (napr. 1.25) nie sú povolené.',
-	numeric: 'Zadajte len číselné hodnoty (t.j. „1“ alebo „1.1“ alebo „-1“ alebo „-1.1“).',
-	digits: 'Zadajte prosím len čísla a interpunkčné znamienka (napríklad telefónne číslo s pomlčkami albo bodkami je povolené).',
-	alpha: 'Zadajte prosím len písmená (a-z). Medzery alebo iné znaky nie sú povolené.',
-	alphanum: 'Zadajte prosím len písmená (a-z) alebo číslice (0-9). Medzery alebo iné znaky nie sú povolené.',
-	dateSuchAs: 'Zadajte prosím platný dátum v tvare {date}',
-	dateInFormatMDY: 'Zadajte prosím platný datum v tvare MM / DD / RRRR (t.j. „12/31/1999“)',
-	email: 'Zadajte prosím platnú emailovú adresu. Napríklad „fred@domain.com“.',
-	url: 'Zadajte prosím platnoú adresu URL v tvare http://www.example.com.',
-	currencyDollar: 'Zadajte prosím platnú čiastku. Napríklad $100.00.',
-	oneRequired: 'Zadajte prosím aspoň jednu hodnotu z týchto položiek.',
-	errorPrefix: 'Chyba: ',
-	warningPrefix: 'Upozornenie: ',
-
-	// Form.Validator.Extras
-	noSpace: 'V tejto položle nie sú povolené medzery',
-	reqChkByNode: 'Nie sú vybrané žiadne položky.',
-	requiredChk: 'Táto položka je povinná.',
-	reqChkByName: 'Prosím vyberte {label}.',
-	match: 'Táto položka sa musí zhodovať s položkou {matchName}',
-	startDate: 'dátum začiatku',
-	endDate: 'dátum ukončenia',
-	currendDate: 'aktuálny dátum',
-	afterDate: 'Dátum by mal býť rovnaký alebo väčší ako {label}.',
-	beforeDate: 'Dátum by mal byť rovnaký alebo menší ako {label}.',
-	startMonth: 'Vyberte počiatočný mesiac.',
-	sameMonth: 'Tieto dva dátumy musia býť v rovnakom mesiaci - zmeňte jeden z nich.',
-	creditcard: 'Zadané číslo kreditnej karty je neplatné. Prosím, opravte ho. Bolo zadaných {length} číslic.'
-
-});
-
-/*
----
-
-name: Locale.si-SI.Date
-
-description: Date messages for Slovenian.
-
-license: MIT-style license
-
-authors:
-  - Radovan Lozej
-
-requires:
-  - Locale
-
-provides: [Locale.si-SI.Date]
-
-...
-*/
-
-(function(){
-
-var pluralize = function(n, one, two, three, other){
-	return (n >= 1 && n <= 3) ? arguments[n] : other;
-};
-
-Locale.define('sl-SI', 'Date', {
-
-	months: ['januar', 'februar', 'marec', 'april', 'maj', 'junij', 'julij', 'avgust', 'september', 'oktober', 'november', 'december'],
-	months_abbr: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'avg', 'sep', 'okt', 'nov', 'dec'],
-	days: ['nedelja', 'ponedeljek', 'torek', 'sreda', 'četrtek', 'petek', 'sobota'],
-	days_abbr: ['ned', 'pon', 'tor', 'sre', 'čet', 'pet', 'sob'],
-
-	// Culture's date order: DD.MM.YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d.%m.%Y',
-	shortTime: '%H.%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '.',
-
-	lessThanMinuteAgo: 'manj kot minuto nazaj',
-	minuteAgo: 'minuto nazaj',
-	minutesAgo: function(delta){ return '{delta} ' + pluralize(delta, 'minuto', 'minuti', 'minute', 'minut') + ' nazaj'; },
-	hourAgo: 'uro nazaj',
-	hoursAgo: function(delta){ return '{delta} ' + pluralize(delta, 'uro', 'uri', 'ure', 'ur') + ' nazaj'; },
-	dayAgo: 'dan nazaj',
-	daysAgo: function(delta){ return '{delta} ' + pluralize(delta, 'dan', 'dneva', 'dni', 'dni') + ' nazaj'; },
-	weekAgo: 'teden nazaj',
-	weeksAgo: function(delta){ return '{delta} ' + pluralize(delta, 'teden', 'tedna', 'tedne', 'tednov') + ' nazaj'; },
-	monthAgo: 'mesec nazaj',
-	monthsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'mesec', 'meseca', 'mesece', 'mesecov') + ' nazaj'; },
-	yearthAgo: 'leto nazaj',
-	yearsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'leto', 'leti', 'leta', 'let') + ' nazaj'; },
-
-	lessThanMinuteUntil: 'še manj kot minuto',
-	minuteUntil: 'še minuta',
-	minutesUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'minuta', 'minuti', 'minute', 'minut'); },
-	hourUntil: 'še ura',
-	hoursUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'ura', 'uri', 'ure', 'ur'); },
-	dayUntil: 'še dan',
-	daysUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'dan', 'dneva', 'dnevi', 'dni'); },
-	weekUntil: 'še tedn',
-	weeksUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'teden', 'tedna', 'tedni', 'tednov'); },
-	monthUntil: 'še mesec',
-	monthsUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'mesec', 'meseca', 'meseci', 'mesecov'); },
-	yearUntil: 'še leto',
-	yearsUntil: function(delta){ return 'še {delta} ' + pluralize(delta, 'leto', 'leti', 'leta', 'let'); }
-
-});
-
-})();
-
-/*
----
-
-name: Locale.si-SI.Form.Validator
-
-description: Form Validator messages for Slovenian.
-
-license: MIT-style license
-
-authors:
-  - Radovan Lozej
-
-requires:
-  - Locale
-
-provides: [Locale.si-SI.Form.Validator]
-
-...
-*/
-
-Locale.define('sl-SI', 'FormValidator', {
-
-	required: 'To polje je obvezno',
-	minLength: 'Prosim, vnesite vsaj {minLength} znakov (vnesli ste {length} znakov).',
-	maxLength: 'Prosim, ne vnesite več kot {maxLength} znakov (vnesli ste {length} znakov).',
-	integer: 'Prosim, vnesite celo število. Decimalna števila (kot 1,25) niso dovoljena.',
-	numeric: 'Prosim, vnesite samo numerične vrednosti (kot "1" ali "1.1" ali "-1" ali "-1.1").',
-	digits: 'Prosim, uporabite številke in ločila le na tem polju (na primer, dovoljena je telefonska številka z pomišlaji ali pikami).',
-	alpha: 'Prosim, uporabite le črke v tem plju. Presledki in drugi znaki niso dovoljeni.',
-	alphanum: 'Prosim, uporabite samo črke ali številke v tem polju. Presledki in drugi znaki niso dovoljeni.',
-	dateSuchAs: 'Prosim, vnesite pravilen datum kot {date}',
-	dateInFormatMDY: 'Prosim, vnesite pravilen datum kot MM.DD.YYYY (primer "12.31.1999")',
-	email: 'Prosim, vnesite pravilen email naslov. Na primer "fred@domain.com".',
-	url: 'Prosim, vnesite pravilen URL kot http://www.example.com.',
-	currencyDollar: 'Prosim, vnesit epravilno vrednost €. Primer 100,00€ .',
-	oneRequired: 'Prosimo, vnesite nekaj za vsaj eno izmed teh polj.',
-	errorPrefix: 'Napaka: ',
-	warningPrefix: 'Opozorilo: ',
-
-	// Form.Validator.Extras
-	noSpace: 'To vnosno polje ne dopušča presledkov.',
-	reqChkByNode: 'Nič niste izbrali.',
-	requiredChk: 'To polje je obvezno',
-	reqChkByName: 'Prosim, izberite {label}.',
-	match: 'To polje se mora ujemati z poljem {matchName}',
-	startDate: 'datum začetka',
-	endDate: 'datum konca',
-	currentDate: 'trenuten datum',
-	afterDate: 'Datum bi moral biti isti ali po {label}.',
-	beforeDate: 'Datum bi moral biti isti ali pred {label}.',
-	startMonth: 'Prosim, vnesite začetni datum',
-	sameMonth: 'Ta dva datuma morata biti v istem mesecu - premeniti morate eno ali drugo.',
-	creditcard: 'Številka kreditne kartice ni pravilna. Preverite številko ali poskusite še enkrat. Vnešenih {length} znakov.'
-
-});
-
-/*
----
-
-name: Locale.sv-SE.Date
-
-description: Date messages for Swedish.
-
-license: MIT-style license
-
-authors:
-  - Martin Lundgren
-
-requires:
-  - Locale
-
-provides: [Locale.sv-SE.Date]
-
-...
-*/
-
-Locale.define('sv-SE', 'Date', {
-
-	months: ['januari', 'februari', 'mars', 'april', 'maj', 'juni', 'juli', 'augusti', 'september', 'oktober', 'november', 'december'],
-	months_abbr: ['jan', 'feb', 'mar', 'apr', 'maj', 'jun', 'jul', 'aug', 'sep', 'okt', 'nov', 'dec'],
-	days: ['söndag', 'måndag', 'tisdag', 'onsdag', 'torsdag', 'fredag', 'lördag'],
-	days_abbr: ['sön', 'mån', 'tis', 'ons', 'tor', 'fre', 'lör'],
-
-	// Culture's date order: YYYY-MM-DD
-	dateOrder: ['year', 'month', 'date'],
-	shortDate: '%Y-%m-%d',
-	shortTime: '%H:%M',
-	AM: '',
-	PM: '',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: 'mindre än en minut sedan',
-	minuteAgo: 'ungefär en minut sedan',
-	minutesAgo: '{delta} minuter sedan',
-	hourAgo: 'ungefär en timme sedan',
-	hoursAgo: 'ungefär {delta} timmar sedan',
-	dayAgo: '1 dag sedan',
-	daysAgo: '{delta} dagar sedan',
-
-	lessThanMinuteUntil: 'mindre än en minut sedan',
-	minuteUntil: 'ungefär en minut sedan',
-	minutesUntil: '{delta} minuter sedan',
-	hourUntil: 'ungefär en timme sedan',
-	hoursUntil: 'ungefär {delta} timmar sedan',
-	dayUntil: '1 dag sedan',
-	daysUntil: '{delta} dagar sedan'
-
-});
-
-/*
----
-
-name: Locale.sv-SE.Form.Validator
-
-description: Form Validator messages for Swedish.
-
-license: MIT-style license
-
-authors:
-  - Martin Lundgren
-
-requires:
-  - Locale
-
-provides: [Locale.sv-SE.Form.Validator]
-
-...
-*/
-
-Locale.define('sv-SE', 'FormValidator', {
-
-	required: 'Fältet är obligatoriskt.',
-	minLength: 'Ange minst {minLength} tecken (du angav {length} tecken).',
-	maxLength: 'Ange högst {maxLength} tecken (du angav {length} tecken). ',
-	integer: 'Ange ett heltal i fältet. Tal med decimaler (t.ex. 1,25) är inte tillåtna.',
-	numeric: 'Ange endast numeriska värden i detta fält (t.ex. "1" eller "1.1" eller "-1" eller "-1,1").',
-	digits: 'Använd endast siffror och skiljetecken i detta fält (till exempel ett telefonnummer med bindestreck tillåtet).',
-	alpha: 'Använd endast bokstäver (a-ö) i detta fält. Inga mellanslag eller andra tecken är tillåtna.',
-	alphanum: 'Använd endast bokstäver (a-ö) och siffror (0-9) i detta fält. Inga mellanslag eller andra tecken är tillåtna.',
-	dateSuchAs: 'Ange ett giltigt datum som t.ex. {date}',
-	dateInFormatMDY: 'Ange ett giltigt datum som t.ex. YYYY-MM-DD (i.e. "1999-12-31")',
-	email: 'Ange en giltig e-postadress. Till exempel "erik@domain.com".',
-	url: 'Ange en giltig webbadress som http://www.example.com.',
-	currencyDollar: 'Ange en giltig belopp. Exempelvis 100,00.',
-	oneRequired: 'Vänligen ange minst ett av dessa alternativ.',
-	errorPrefix: 'Fel: ',
-	warningPrefix: 'Varning: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Det får inte finnas några mellanslag i detta fält.',
-	reqChkByNode: 'Inga objekt är valda.',
-	requiredChk: 'Detta är ett obligatoriskt fält.',
-	reqChkByName: 'Välj en {label}.',
-	match: 'Detta fält måste matcha {matchName}',
-	startDate: 'startdatumet',
-	endDate: 'slutdatum',
-	currentDate: 'dagens datum',
-	afterDate: 'Datumet bör vara samma eller senare än {label}.',
-	beforeDate: 'Datumet bör vara samma eller tidigare än {label}.',
-	startMonth: 'Välj en start månad',
-	sameMonth: 'Dessa två datum måste vara i samma månad - du måste ändra det ena eller det andra.'
-
-});
-
-/*
----
-
-name: Locale.sv-SE.Number
-
-description: Number messages for Swedish.
-
-license: MIT-style license
-
-authors:
-  - Arian Stolwijk
-  - Martin Lundgren
-
-requires:
-  - Locale
-  - Locale.EU.Number
-
-provides: [Locale.sv-SE.Number]
-
-...
-*/
-
-Locale.define('sv-SE', 'Number', {
-
-	currency: {
-		prefix: 'SEK '
-	}
-
-}).inherit('EU', 'Number');
-
-/*
----
-
-name: Locale.tr-TR.Date
-
-description: Date messages for Turkish.
-
-license: MIT-style license
-
-authors:
-  - Faruk Can Bilir
-
-requires:
-  - Locale
-
-provides: [Locale.tr-TR.Date]
-
-...
-*/
-
-Locale.define('tr-TR', 'Date', {
-
-	months: ['Ocak', 'Şubat', 'Mart', 'Nisan', 'Mayıs', 'Haziran', 'Temmuz', 'Ağustos', 'Eylül', 'Ekim', 'Kasım', 'Aralık'],
-	months_abbr: ['Oca', 'Şub', 'Mar', 'Nis', 'May', 'Haz', 'Tem', 'Ağu', 'Eyl', 'Eki', 'Kas', 'Ara'],
-	days: ['Pazar', 'Pazartesi', 'Salı', 'Çarşamba', 'Perşembe', 'Cuma', 'Cumartesi'],
-	days_abbr: ['Pa', 'Pzt', 'Sa', 'Ça', 'Pe', 'Cu', 'Cmt'],
-
-	// Culture's date order: MM/DD/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%H.%M',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: 'bir dakikadan önce',
-	minuteAgo: 'yaklaşık bir dakika önce',
-	minutesAgo: '{delta} dakika önce',
-	hourAgo: 'bir saat kadar önce',
-	hoursAgo: '{delta} saat kadar önce',
-	dayAgo: 'bir gün önce',
-	daysAgo: '{delta} gün önce',
-	weekAgo: 'bir hafta önce',
-	weeksAgo: '{delta} hafta önce',
-	monthAgo: 'bir ay önce',
-	monthsAgo: '{delta} ay önce',
-	yearAgo: 'bir yıl önce',
-	yearsAgo: '{delta} yıl önce',
-
-	lessThanMinuteUntil: 'bir dakikadan az sonra',
-	minuteUntil: 'bir dakika kadar sonra',
-	minutesUntil: '{delta} dakika sonra',
-	hourUntil: 'bir saat kadar sonra',
-	hoursUntil: '{delta} saat kadar sonra',
-	dayUntil: 'bir gün sonra',
-	daysUntil: '{delta} gün sonra',
-	weekUntil: 'bir hafta sonra',
-	weeksUntil: '{delta} hafta sonra',
-	monthUntil: 'bir ay sonra',
-	monthsUntil: '{delta} ay sonra',
-	yearUntil: 'bir yıl sonra',
-	yearsUntil: '{delta} yıl sonra'
-
-});
-
-/*
----
-
-name: Locale.tr-TR.Form.Validator
-
-description: Form Validator messages for Turkish.
-
-license: MIT-style license
-
-authors:
-  - Faruk Can Bilir
-
-requires:
-  - Locale
-
-provides: [Locale.tr-TR.Form.Validator]
-
-...
-*/
-
-Locale.define('tr-TR', 'FormValidator', {
-
-	required: 'Bu alan zorunlu.',
-	minLength: 'Lütfen en az {minLength} karakter girin (siz {length} karakter girdiniz).',
-	maxLength: 'Lütfen en fazla {maxLength} karakter girin (siz {length} karakter girdiniz).',
-	integer: 'Lütfen bu alana sadece tamsayı girin. Ondalıklı sayılar (ör: 1.25) kullanılamaz.',
-	numeric: 'Lütfen bu alana sadece sayısal değer girin (ör: "1", "1.1", "-1" ya da "-1.1").',
-	digits: 'Lütfen bu alana sadece sayısal değer ve noktalama işareti girin (örneğin, nokta ve tire içeren bir telefon numarası kullanılabilir).',
-	alpha: 'Lütfen bu alanda yalnızca harf kullanın. Boşluk ve diğer karakterler kullanılamaz.',
-	alphanum: 'Lütfen bu alanda sadece harf ve rakam kullanın. Boşluk ve diğer karakterler kullanılamaz.',
-	dateSuchAs: 'Lütfen geçerli bir tarih girin (Ör: {date})',
-	dateInFormatMDY: 'Lütfen geçerli bir tarih girin (GG/AA/YYYY, ör: "31/12/1999")',
-	email: 'Lütfen geçerli bir email adresi girin. Ör: "kemal@etikan.com".',
-	url: 'Lütfen geçerli bir URL girin. Ör: http://www.example.com.',
-	currencyDollar: 'Lütfen geçerli bir TL miktarı girin. Ör: 100,00 TL .',
-	oneRequired: 'Lütfen en az bir tanesini doldurun.',
-	errorPrefix: 'Hata: ',
-	warningPrefix: 'Uyarı: ',
-
-	// Form.Validator.Extras
-	noSpace: 'Bu alanda boşluk kullanılamaz.',
-	reqChkByNode: 'Hiçbir öğe seçilmemiş.',
-	requiredChk: 'Bu alan zorunlu.',
-	reqChkByName: 'Lütfen bir {label} girin.',
-	match: 'Bu alan, {matchName} alanıyla uyuşmalı',
-	startDate: 'başlangıç tarihi',
-	endDate: 'bitiş tarihi',
-	currentDate: 'bugünün tarihi',
-	afterDate: 'Tarih, {label} tarihiyle aynı gün ya da ondan sonra olmalıdır.',
-	beforeDate: 'Tarih, {label} tarihiyle aynı gün ya da ondan önce olmalıdır.',
-	startMonth: 'Lütfen bir başlangıç ayı seçin',
-	sameMonth: 'Bu iki tarih aynı ayda olmalı - bir tanesini değiştirmeniz gerekiyor.',
-	creditcard: 'Girdiğiniz kredi kartı numarası geçersiz. Lütfen kontrol edip tekrar deneyin. {length} hane girildi.'
-
-});
-
-/*
----
-
-name: Locale.tr-TR.Number
-
-description: Number messages for Turkish.
-
-license: MIT-style license
-
-authors:
-  - Faruk Can Bilir
-
-requires:
-  - Locale
-  - Locale.EU.Number
-
-provides: [Locale.tr-TR.Number]
-
-...
-*/
-
-Locale.define('tr-TR', 'Number', {
-
-	currency: {
-		decimals: 0,
-		suffix: ' TL'
-	}
-
-}).inherit('EU', 'Number');
-
-/*
----
-
-name: Locale.uk-UA.Date
-
-description: Date messages for Ukrainian (utf-8).
-
-license: MIT-style license
-
-authors:
-  - Slik
-
-requires:
-  - Locale
-
-provides: [Locale.uk-UA.Date]
-
-...
-*/
-
-(function(){
-
-var pluralize = function(n, one, few, many, other){
-	var d = (n / 10).toInt(),
-		z = n % 10,
-		s = (n / 100).toInt();
-
-	if (d == 1 && n > 10) return many;
-	if (z == 1) return one;
-	if (z > 0 && z < 5) return few;
-	return many;
-};
-
-Locale.define('uk-UA', 'Date', {
-
-	months: ['Січень', 'Лютий', 'Березень', 'Квітень', 'Травень', 'Червень', 'Липень', 'Серпень', 'Вересень', 'Жовтень', 'Листопад', 'Грудень'],
-	months_abbr: ['Січ', 'Лют', 'Бер', 'Квіт', 'Трав', 'Черв', 'Лип', 'Серп', 'Вер', 'Жовт', 'Лист', 'Груд' ],
-	days: ['Неділя', 'Понеділок', 'Вівторок', 'Середа', 'Четвер', "П'ятниця", 'Субота'],
-	days_abbr: ['Нд', 'Пн', 'Вт', 'Ср', 'Чт', 'Пт', 'Сб'],
-
-	// Culture's date order: DD/MM/YYYY
-	dateOrder: ['date', 'month', 'year'],
-	shortDate: '%d/%m/%Y',
-	shortTime: '%H:%M',
-	AM: 'до полудня',
-	PM: 'по полудню',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: 'меньше хвилини тому',
-	minuteAgo: 'хвилину тому',
-	minutesAgo: function(delta){ return '{delta} ' + pluralize(delta, 'хвилину', 'хвилини', 'хвилин') + ' тому'; },
-	hourAgo: 'годину тому',
-	hoursAgo: function(delta){ return '{delta} ' + pluralize(delta, 'годину', 'години', 'годин') + ' тому'; },
-	dayAgo: 'вчора',
-	daysAgo: function(delta){ return '{delta} ' + pluralize(delta, 'день', 'дня', 'днів') + ' тому'; },
-	weekAgo: 'тиждень тому',
-	weeksAgo: function(delta){ return '{delta} ' + pluralize(delta, 'тиждень', 'тижні', 'тижнів') + ' тому'; },
-	monthAgo: 'місяць тому',
-	monthsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'місяць', 'місяці', 'місяців') + ' тому'; },
-	yearAgo: 'рік тому',
-	yearsAgo: function(delta){ return '{delta} ' + pluralize(delta, 'рік', 'роки', 'років') + ' тому'; },
-
-	lessThanMinuteUntil: 'за мить',
-	minuteUntil: 'через хвилину',
-	minutesUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'хвилину', 'хвилини', 'хвилин'); },
-	hourUntil: 'через годину',
-	hoursUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'годину', 'години', 'годин'); },
-	dayUntil: 'завтра',
-	daysUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'день', 'дня', 'днів'); },
-	weekUntil: 'через тиждень',
-	weeksUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'тиждень', 'тижні', 'тижнів'); },
-	monthUntil: 'через місяць',
-	monthesUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'місяць', 'місяці', 'місяців'); },
-	yearUntil: 'через рік',
-	yearsUntil: function(delta){ return 'через {delta} ' + pluralize(delta, 'рік', 'роки', 'років'); }
-
-});
-
-})();
-
-/*
----
-
-name: Locale.uk-UA.Form.Validator
-
-description: Form Validator messages for Ukrainian (utf-8).
-
-license: MIT-style license
-
-authors:
-  - Slik
-
-requires:
-  - Locale
-
-provides: [Locale.uk-UA.Form.Validator]
-
-...
-*/
-
-Locale.define('uk-UA', 'FormValidator', {
-
-	required: 'Це поле повинне бути заповненим.',
-	minLength: 'Введіть хоча б {minLength} символів (Ви ввели {length}).',
-	maxLength: 'Кількість символів не може бути більше {maxLength} (Ви ввели {length}).',
-	integer: 'Введіть в це поле число. Дробові числа (наприклад 1.25) не дозволені.',
-	numeric: 'Введіть в це поле число (наприклад "1" або "1.1", або "-1", або "-1.1").',
-	digits: 'В цьому полі ви можете використовувати лише цифри і знаки пунктіації (наприклад, телефонний номер з знаками дефізу або з крапками).',
-	alpha: 'В цьому полі можна використовувати лише латинські літери (a-z). Пробіли і інші символи заборонені.',
-	alphanum: 'В цьому полі можна використовувати лише латинські літери (a-z) і цифри (0-9). Пробіли і інші символи заборонені.',
-	dateSuchAs: 'Введіть коректну дату {date}.',
-	dateInFormatMDY: 'Введіть дату в форматі ММ/ДД/РРРР (наприклад "12/31/2009").',
-	email: 'Введіть коректну адресу електронної пошти (наприклад "name@domain.com").',
-	url: 'Введіть коректне інтернет-посилання (наприклад http://www.example.com).',
-	currencyDollar: 'Введіть суму в доларах (наприклад "$100.00").',
-	oneRequired: 'Заповніть одне з полів.',
-	errorPrefix: 'Помилка: ',
-	warningPrefix: 'Увага: ',
-
-	noSpace: 'Пробіли заборонені.',
-	reqChkByNode: 'Не відмічено жодного варіанту.',
-	requiredChk: 'Це поле повинне бути віміченим.',
-	reqChkByName: 'Будь ласка, відмітьте {label}.',
-	match: 'Це поле повинно відповідати {matchName}',
-	startDate: 'початкова дата',
-	endDate: 'кінцева дата',
-	currentDate: 'сьогоднішня дата',
-	afterDate: 'Ця дата повинна бути такою ж, або пізнішою за {label}.',
-	beforeDate: 'Ця дата повинна бути такою ж, або ранішою за {label}.',
-	startMonth: 'Будь ласка, виберіть початковий місяць',
-	sameMonth: 'Ці дати повинні відноситись одного і того ж місяця. Будь ласка, змініть одну з них.',
-	creditcard: 'Номер кредитної карти введений неправильно. Будь ласка, перевірте його. Введено {length} символів.'
-
-});
-
-/*
----
-
-name: Locale.zh-CH.Date
-
-description: Date messages for Chinese (simplified and traditional).
-
-license: MIT-style license
-
-authors:
-  - YMind Chan
-
-requires:
-  - Locale
-
-provides: [Locale.zh-CH.Date]
-
-...
-*/
-
-// Simplified Chinese
-Locale.define('zh-CHS', 'Date', {
-
-	months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
-	months_abbr: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'],
-	days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
-	days_abbr: ['日', '一', '二', '三', '四', '五', '六'],
-
-	// Culture's date order: YYYY-MM-DD
-	dateOrder: ['year', 'month', 'date'],
-	shortDate: '%Y-%m-%d',
-	shortTime: '%I:%M%p',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: '不到1分钟前',
-	minuteAgo: '大约1分钟前',
-	minutesAgo: '{delta}分钟之前',
-	hourAgo: '大约1小时前',
-	hoursAgo: '大约{delta}小时前',
-	dayAgo: '1天前',
-	daysAgo: '{delta}天前',
-	weekAgo: '1星期前',
-	weeksAgo: '{delta}星期前',
-	monthAgo: '1个月前',
-	monthsAgo: '{delta}个月前',
-	yearAgo: '1年前',
-	yearsAgo: '{delta}年前',
-
-	lessThanMinuteUntil: '从现在开始不到1分钟',
-	minuteUntil: '从现在开始約1分钟',
-	minutesUntil: '从现在开始约{delta}分钟',
-	hourUntil: '从现在开始1小时',
-	hoursUntil: '从现在开始约{delta}小时',
-	dayUntil: '从现在开始1天',
-	daysUntil: '从现在开始{delta}天',
-	weekUntil: '从现在开始1星期',
-	weeksUntil: '从现在开始{delta}星期',
-	monthUntil: '从现在开始一个月',
-	monthsUntil: '从现在开始{delta}个月',
-	yearUntil: '从现在开始1年',
-	yearsUntil: '从现在开始{delta}年'
-
-});
-
-// Traditional Chinese
-Locale.define('zh-CHT', 'Date', {
-
-	months: ['一月', '二月', '三月', '四月', '五月', '六月', '七月', '八月', '九月', '十月', '十一月', '十二月'],
-	months_abbr: ['一', '二', '三', '四', '五', '六', '七', '八', '九', '十', '十一', '十二'],
-	days: ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'],
-	days_abbr: ['日', '一', '二', '三', '四', '五', '六'],
-
-	// Culture's date order: YYYY-MM-DD
-	dateOrder: ['year', 'month', 'date'],
-	shortDate: '%Y-%m-%d',
-	shortTime: '%I:%M%p',
-	AM: 'AM',
-	PM: 'PM',
-	firstDayOfWeek: 1,
-
-	// Date.Extras
-	ordinal: '',
-
-	lessThanMinuteAgo: '不到1分鐘前',
-	minuteAgo: '大約1分鐘前',
-	minutesAgo: '{delta}分鐘之前',
-	hourAgo: '大約1小時前',
-	hoursAgo: '大約{delta}小時前',
-	dayAgo: '1天前',
-	daysAgo: '{delta}天前',
-	weekAgo: '1星期前',
-	weeksAgo: '{delta}星期前',
-	monthAgo: '1个月前',
-	monthsAgo: '{delta}个月前',
-	yearAgo: '1年前',
-	yearsAgo: '{delta}年前',
-
-	lessThanMinuteUntil: '從現在開始不到1分鐘',
-	minuteUntil: '從現在開始約1分鐘',
-	minutesUntil: '從現在開始約{delta}分鐘',
-	hourUntil: '從現在開始1小時',
-	hoursUntil: '從現在開始約{delta}小時',
-	dayUntil: '從現在開始1天',
-	daysUntil: '從現在開始{delta}天',
-	weekUntil: '從現在開始1星期',
-	weeksUntil: '從現在開始{delta}星期',
-	monthUntil: '從現在開始一個月',
-	monthsUntil: '從現在開始{delta}個月',
-	yearUntil: '從現在開始1年',
-	yearsUntil: '從現在開始{delta}年'
-
-});
-
-/*
----
-
-name: Locale.zh-CH.Form.Validator
-
-description: Form Validator messages for Chinese (simplified and traditional).
-
-license: MIT-style license
-
-authors:
-  - YMind Chan
-
-requires:
-  - Locale
-  - Form.Validator
-
-provides: [Form.zh-CH.Form.Validator, Form.Validator.CurrencyYuanValidator]
-
-...
-*/
-
-// Simplified Chinese
-Locale.define('zh-CHS', 'FormValidator', {
-
-	required: '此项必填。',
-	minLength: '请至少输入 {minLength} 个字符 (已输入 {length} 个)。',
-	maxLength: '最多只能输入 {maxLength} 个字符 (已输入 {length} 个)。',
-	integer: '请输入一个整数，不能包含小数点。例如："1", "200"。',
-	numeric: '请输入一个数字，例如："1", "1.1", "-1", "-1.1"。',
-	digits: '请输入由数字和标点符号组成的内容。例如电话号码。',
-	alpha: '请输入 A-Z 的 26 个字母，不能包含空格或任何其他字符。',
-	alphanum: '请输入 A-Z 的 26 个字母或 0-9 的 10 个数字，不能包含空格或任何其他字符。',
-	dateSuchAs: '请输入合法的日期格式，如：{date}。',
-	dateInFormatMDY: '请输入合法的日期格式，例如：YYYY-MM-DD ("2010-12-31")。',
-	email: '请输入合法的电子信箱地址，例如："fred@domain.com"。',
-	url: '请输入合法的 Url 地址，例如：http://www.example.com。',
-	currencyDollar: '请输入合法的货币符号，例如：￥100.0',
-	oneRequired: '请至少选择一项。',
-	errorPrefix: '错误：',
-	warningPrefix: '警告：',
-
-	// Form.Validator.Extras
-	noSpace: '不能包含空格。',
-	reqChkByNode: '未选择任何内容。',
-	requiredChk: '此项必填。',
-	reqChkByName: '请选择 {label}.',
-	match: '必须与{matchName}相匹配',
-	startDate: '起始日期',
-	endDate: '结束日期',
-	currentDate: '当前日期',
-	afterDate: '日期必须等于或晚于 {label}.',
-	beforeDate: '日期必须早于或等于 {label}.',
-	startMonth: '请选择起始月份',
-	sameMonth: '您必须修改两个日期中的一个，以确保它们在同一月份。',
-	creditcard: '您输入的信用卡号码不正确。当前已输入{length}个字符。'
-
-});
-
-// Traditional Chinese
-Locale.define('zh-CHT', 'FormValidator', {
-
-	required: '此項必填。 ',
-	minLength: '請至少輸入{minLength} 個字符(已輸入{length} 個)。 ',
-	maxLength: '最多只能輸入{maxLength} 個字符(已輸入{length} 個)。 ',
-	integer: '請輸入一個整數，不能包含小數點。例如："1", "200"。 ',
-	numeric: '請輸入一個數字，例如："1", "1.1", "-1", "-1.1"。 ',
-	digits: '請輸入由數字和標點符號組成的內容。例如電話號碼。 ',
-	alpha: '請輸入AZ 的26 個字母，不能包含空格或任何其他字符。 ',
-	alphanum: '請輸入AZ 的26 個字母或0-9 的10 個數字，不能包含空格或任何其他字符。 ',
-	dateSuchAs: '請輸入合法的日期格式，如：{date}。 ',
-	dateInFormatMDY: '請輸入合法的日期格式，例如：YYYY-MM-DD ("2010-12-31")。 ',
-	email: '請輸入合法的電子信箱地址，例如："fred@domain.com"。 ',
-	url: '請輸入合法的Url 地址，例如：http://www.example.com。 ',
-	currencyDollar: '請輸入合法的貨幣符號，例如：￥100.0',
-	oneRequired: '請至少選擇一項。 ',
-	errorPrefix: '錯誤：',
-	warningPrefix: '警告：',
-
-	// Form.Validator.Extras
-	noSpace: '不能包含空格。 ',
-	reqChkByNode: '未選擇任何內容。 ',
-	requiredChk: '此項必填。 ',
-	reqChkByName: '請選擇 {label}.',
-	match: '必須與{matchName}相匹配',
-	startDate: '起始日期',
-	endDate: '結束日期',
-	currentDate: '當前日期',
-	afterDate: '日期必須等於或晚於{label}.',
-	beforeDate: '日期必須早於或等於{label}.',
-	startMonth: '請選擇起始月份',
-	sameMonth: '您必須修改兩個日期中的一個，以確保它們在同一月份。 ',
-	creditcard: '您輸入的信用卡號碼不正確。當前已輸入{length}個字符。 '
-
-});
-
-Form.Validator.add('validate-currency-yuan', {
-
-	errorMsg: function(){
-		return Form.Validator.getMsg('currencyYuan');
-	},
-
-	test: function(element){
-		// [￥]1[##][,###]+[.##]
-		// [￥]1###+[.##]
-		// [￥]0.##
-		// [￥].##
-		return Form.Validator.getValidator('IsEmpty').test(element) || (/^￥?\-?([1-9]{1}[0-9]{0,2}(\,[0-9]{3})*(\.[0-9]{0,2})?|[1-9]{1}\d*(\.[0-9]{0,2})?|0(\.[0-9]{0,2})?|(\.[0-9]{1,2})?)$/).test(element.get('value'));
-	}
-
-});
-
-/*
----
-
-name: Locale.zh-CH.Number
-
-description: Number messages for for Chinese (simplified and traditional).
-
-license: MIT-style license
-
-authors:
-  - YMind Chan
-
-requires:
-  - Locale
-  - Locale.en-US.Number
-
-provides: [Locale.zh-CH.Number]
-
-...
-*/
-
-// Simplified Chinese
-Locale.define('zh-CHS', 'Number', {
-
-	currency: {
-		prefix: '￥ '
-	}
-
-}).inherit('en-US', 'Number');
-
-// Traditional Chinese
-Locale.define('zh-CHT').inherit('zh-CHS', 'Number');
-
-/*
----
-
-script: Request.JSONP.js
-
-name: Request.JSONP
-
-description: Defines Request.JSONP, a class for cross domain javascript via script injection.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Guillermo Rauch
-  - Arian Stolwijk
-
-requires:
-  - Core/Element
-  - Core/Request
-  - MooTools.More
-
-provides: [Request.JSONP]
-
-...
-*/
-
-Request.JSONP = new Class({
-
-	Implements: [Chain, Events, Options],
-
-	options: {/*
-		onRequest: function(src, scriptElement){},
-		onComplete: function(data){},
-		onSuccess: function(data){},
-		onCancel: function(){},
-		onTimeout: function(){},
-		onError: function(){}, */
-		onRequest: function(src){
-			if (this.options.log && window.console && console.log){
-				console.log('JSONP retrieving script with url:' + src);
-			}
-		},
-		onError: function(src){
-			if (this.options.log && window.console && console.warn){
-				console.warn('JSONP '+ src +' will fail in Internet Explorer, which enforces a 2083 bytes length limit on URIs');
-			}
-		},
-		url: '',
-		callbackKey: 'callback',
-		injectScript: document.head,
-		data: '',
-		link: 'ignore',
-		timeout: 0,
-		log: false
-	},
-
-	initialize: function(options){
-		this.setOptions(options);
-	},
-
-	send: function(options){
-		if (!Request.prototype.check.call(this, options)) return this;
-		this.running = true;
-
-		var type = typeOf(options);
-		if (type == 'string' || type == 'element') options = {data: options};
-		options = Object.merge(this.options, options || {});
-
-		var data = options.data;
-		switch (typeOf(data)){
-			case 'element': data = document.id(data).toQueryString(); break;
-			case 'object': case 'hash': data = Object.toQueryString(data);
-		}
-
-		var index = this.index = Request.JSONP.counter++,
-			key = 'request_' + index;
-
-		var src = options.url +
-			(options.url.test('\\?') ? '&' :'?') +
-			(options.callbackKey) +
-			'=Request.JSONP.request_map.request_'+ index +
-			(data ? '&' + data : '');
-
-		if (src.length > 2083) this.fireEvent('error', src);
-
-		Request.JSONP.request_map[key] = function(){
-			delete Request.JSONP.request_map[key];
-			this.success(arguments, index);
-		}.bind(this);
-
-		var script = this.getScript(src).inject(options.injectScript);
-		this.fireEvent('request', [src, script]);
-
-		if (options.timeout) this.timeout.delay(options.timeout, this);
-
-		return this;
-	},
-
-	getScript: function(src){
-		if (!this.script) this.script = new Element('script', {
-			type: 'text/javascript',
-			async: true,
-			src: src
-		});
-		return this.script;
-	},
-
-	success: function(args){
-		if (!this.running) return;
-		this.clear()
-			.fireEvent('complete', args).fireEvent('success', args)
-			.callChain();
-	},
-
-	cancel: function(){
-		if (this.running) this.clear().fireEvent('cancel');
-		return this;
-	},
-
-	isRunning: function(){
-		return !!this.running;
-	},
-
-	clear: function(){
-		this.running = false;
-		if (this.script){
-			this.script.destroy();
-			this.script = null;
-		}
-		return this;
-	},
-
-	timeout: function(){
-		if (this.running){
-			this.running = false;
-			this.fireEvent('timeout', [this.script.get('src'), this.script]).fireEvent('failure').cancel();
-		}
-		return this;
-	}
-
-});
-
-Request.JSONP.counter = 0;
-Request.JSONP.request_map = {};
-
-/*
----
-
-script: Request.Periodical.js
-
-name: Request.Periodical
-
-description: Requests the same URL to pull data from a server but increases the intervals if no data is returned to reduce the load
-
-license: MIT-style license
-
-authors:
-  - Christoph Pojer
-
-requires:
-  - Core/Request
-  - MooTools.More
-
-provides: [Request.Periodical]
-
-...
-*/
-
-Request.implement({
-
-	options: {
-		initialDelay: 5000,
-		delay: 5000,
-		limit: 60000
-	},
-
-	startTimer: function(data){
-		var fn = function(){
-			if (!this.running) this.send({data: data});
-		};
-		this.lastDelay = this.options.initialDelay;
-		this.timer = fn.delay(this.lastDelay, this);
-		this.completeCheck = function(response){
-			clearTimeout(this.timer);
-			this.lastDelay = (response) ? this.options.delay : (this.lastDelay + this.options.delay).min(this.options.limit);
-			this.timer = fn.delay(this.lastDelay, this);
-		};
-		return this.addEvent('complete', this.completeCheck);
-	},
-
-	stopTimer: function(){
-		clearTimeout(this.timer);
-		return this.removeEvent('complete', this.completeCheck);
-	}
-
-});
-
-/*
----
-
-script: Request.Queue.js
-
-name: Request.Queue
-
-description: Controls several instances of Request and its variants to run only one request at a time.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Core/Element
-  - Core/Request
-  - Class.Binds
-
-provides: [Request.Queue]
-
-...
-*/
-
-Request.Queue = new Class({
-
-	Implements: [Options, Events],
-
-	Binds: ['attach', 'request', 'complete', 'cancel', 'success', 'failure', 'exception'],
-
-	options: {/*
-		onRequest: function(argsPassedToOnRequest){},
-		onSuccess: function(argsPassedToOnSuccess){},
-		onComplete: function(argsPassedToOnComplete){},
-		onCancel: function(argsPassedToOnCancel){},
-		onException: function(argsPassedToOnException){},
-		onFailure: function(argsPassedToOnFailure){},
-		onEnd: function(){},
-		*/
-		stopOnFailure: true,
-		autoAdvance: true,
-		concurrent: 1,
-		requests: {}
-	},
-
-	initialize: function(options){
-		var requests;
-		if (options){
-			requests = options.requests;
-			delete options.requests;
-		}
-		this.setOptions(options);
-		this.requests = {};
-		this.queue = [];
-		this.reqBinders = {};
-
-		if (requests) this.addRequests(requests);
-	},
-
-	addRequest: function(name, request){
-		this.requests[name] = request;
-		this.attach(name, request);
-		return this;
-	},
-
-	addRequests: function(obj){
-		Object.each(obj, function(req, name){
-			this.addRequest(name, req);
-		}, this);
-		return this;
-	},
-
-	getName: function(req){
-		return Object.keyOf(this.requests, req);
-	},
-
-	attach: function(name, req){
-		if (req._groupSend) return this;
-		['request', 'complete', 'cancel', 'success', 'failure', 'exception'].each(function(evt){
-			if (!this.reqBinders[name]) this.reqBinders[name] = {};
-			this.reqBinders[name][evt] = function(){
-				this['on' + evt.capitalize()].apply(this, [name, req].append(arguments));
-			}.bind(this);
-			req.addEvent(evt, this.reqBinders[name][evt]);
-		}, this);
-		req._groupSend = req.send;
-		req.send = function(options){
-			this.send(name, options);
-			return req;
-		}.bind(this);
-		return this;
-	},
-
-	removeRequest: function(req){
-		var name = typeOf(req) == 'object' ? this.getName(req) : req;
-		if (!name && typeOf(name) != 'string') return this;
-		req = this.requests[name];
-		if (!req) return this;
-		['request', 'complete', 'cancel', 'success', 'failure', 'exception'].each(function(evt){
-			req.removeEvent(evt, this.reqBinders[name][evt]);
-		}, this);
-		req.send = req._groupSend;
-		delete req._groupSend;
-		return this;
-	},
-
-	getRunning: function(){
-		return Object.filter(this.requests, function(r){
-			return r.running;
-		});
-	},
-
-	isRunning: function(){
-		return !!(Object.keys(this.getRunning()).length);
-	},
-
-	send: function(name, options){
-		var q = function(){
-			this.requests[name]._groupSend(options);
-			this.queue.erase(q);
-		}.bind(this);
-
-		q.name = name;
-		if (Object.keys(this.getRunning()).length >= this.options.concurrent || (this.error && this.options.stopOnFailure)) this.queue.push(q);
-		else q();
-		return this;
-	},
-
-	hasNext: function(name){
-		return (!name) ? !!this.queue.length : !!this.queue.filter(function(q){ return q.name == name; }).length;
-	},
-
-	resume: function(){
-		this.error = false;
-		(this.options.concurrent - Object.keys(this.getRunning()).length).times(this.runNext, this);
-		return this;
-	},
-
-	runNext: function(name){
-		if (!this.queue.length) return this;
-		if (!name){
-			this.queue[0]();
-		} else {
-			var found;
-			this.queue.each(function(q){
-				if (!found && q.name == name){
-					found = true;
-					q();
-				}
-			});
-		}
-		return this;
-	},
-
-	runAll: function(){
-		this.queue.each(function(q){
-			q();
-		});
-		return this;
-	},
-
-	clear: function(name){
-		if (!name){
-			this.queue.empty();
-		} else {
-			this.queue = this.queue.map(function(q){
-				if (q.name != name) return q;
-				else return false;
-			}).filter(function(q){
-				return q;
-			});
-		}
-		return this;
-	},
-
-	cancel: function(name){
-		this.requests[name].cancel();
-		return this;
-	},
-
-	onRequest: function(){
-		this.fireEvent('request', arguments);
-	},
-
-	onComplete: function(){
-		this.fireEvent('complete', arguments);
-		if (!this.queue.length) this.fireEvent('end');
-	},
-
-	onCancel: function(){
-		if (this.options.autoAdvance && !this.error) this.runNext();
-		this.fireEvent('cancel', arguments);
-	},
-
-	onSuccess: function(){
-		if (this.options.autoAdvance && !this.error) this.runNext();
-		this.fireEvent('success', arguments);
-	},
-
-	onFailure: function(){
-		this.error = true;
-		if (!this.options.stopOnFailure && this.options.autoAdvance) this.runNext();
-		this.fireEvent('failure', arguments);
-	},
-
-	onException: function(){
-		this.error = true;
-		if (!this.options.stopOnFailure && this.options.autoAdvance) this.runNext();
-		this.fireEvent('exception', arguments);
-	}
-
-});
-
-/*
----
-
-script: Array.Extras.js
-
-name: Array.Extras
-
-description: Extends the Array native object to include useful methods to work with arrays.
-
-license: MIT-style license
-
-authors:
-  - Christoph Pojer
-  - Sebastian Markbåge
-
-requires:
-  - Core/Array
-  - MooTools.More
-
-provides: [Array.Extras]
-
-...
-*/
-
-(function(nil){
-
-Array.implement({
-
-	min: function(){
-		return Math.min.apply(null, this);
-	},
-
-	max: function(){
-		return Math.max.apply(null, this);
-	},
-
-	average: function(){
-		return this.length ? this.sum() / this.length : 0;
-	},
-
-	sum: function(){
-		var result = 0, l = this.length;
-		if (l){
-			while (l--){
-				if (this[l] != null) result += parseFloat(this[l]);
-			}
-		}
-		return result;
-	},
-
-	unique: function(){
-		return [].combine(this);
-	},
-
-	shuffle: function(){
-		for (var i = this.length; i && --i;){
-			var temp = this[i], r = Math.floor(Math.random() * ( i + 1 ));
-			this[i] = this[r];
-			this[r] = temp;
-		}
-		return this;
-	},
-
-	reduce: function(fn, value){
-		for (var i = 0, l = this.length; i < l; i++){
-			if (i in this) value = value === nil ? this[i] : fn.call(null, value, this[i], i, this);
-		}
-		return value;
-	},
-
-	reduceRight: function(fn, value){
-		var i = this.length;
-		while (i--){
-			if (i in this) value = value === nil ? this[i] : fn.call(null, value, this[i], i, this);
-		}
-		return value;
-	},
-
-	pluck: function(prop){
-		return this.map(function(item){
-			return item[prop];
-		});
-	}
-
-});
-
-})();
-
-/*
----
-
-script: Date.Extras.js
-
-name: Date.Extras
-
-description: Extends the Date native object to include extra methods (on top of those in Date.js).
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-  - Scott Kyle
-
-requires:
-  - Date
-
-provides: [Date.Extras]
-
-...
-*/
-
-Date.implement({
-
-	timeDiffInWords: function(to){
-		return Date.distanceOfTimeInWords(this, to || new Date);
-	},
-
-	timeDiff: function(to, separator){
-		if (to == null) to = new Date;
-		var delta = ((to - this) / 1000).floor().abs();
-
-		var vals = [],
-			durations = [60, 60, 24, 365, 0],
-			names = ['s', 'm', 'h', 'd', 'y'],
-			value, duration;
-
-		for (var item = 0; item < durations.length; item++){
-			if (item && !delta) break;
-			value = delta;
-			if ((duration = durations[item])){
-				value = (delta % duration);
-				delta = (delta / duration).floor();
-			}
-			vals.unshift(value + (names[item] || ''));
-		}
-
-		return vals.join(separator || ':');
-	}
-
-}).extend({
-
-	distanceOfTimeInWords: function(from, to){
-		return Date.getTimePhrase(((to - from) / 1000).toInt());
-	},
-
-	getTimePhrase: function(delta){
-		var suffix = (delta < 0) ? 'Until' : 'Ago';
-		if (delta < 0) delta *= -1;
-
-		var units = {
-			minute: 60,
-			hour: 60,
-			day: 24,
-			week: 7,
-			month: 52 / 12,
-			year: 12,
-			eon: Infinity
-		};
-
-		var msg = 'lessThanMinute';
-
-		for (var unit in units){
-			var interval = units[unit];
-			if (delta < 1.5 * interval){
-				if (delta > 0.75 * interval) msg = unit;
-				break;
-			}
-			delta /= interval;
-			msg = unit + 's';
-		}
-
-		delta = delta.round();
-		return Date.getMsg(msg + suffix, delta).substitute({delta: delta});
-	}
-
-}).defineParsers(
-
-	{
-		// "today", "tomorrow", "yesterday"
-		re: /^(?:tod|tom|yes)/i,
-		handler: function(bits){
-			var d = new Date().clearTime();
-			switch (bits[0]){
-				case 'tom': return d.increment();
-				case 'yes': return d.decrement();
-				default: return d;
-			}
-		}
-	},
-
-	{
-		// "next Wednesday", "last Thursday"
-		re: /^(next|last) ([a-z]+)$/i,
-		handler: function(bits){
-			var d = new Date().clearTime();
-			var day = d.getDay();
-			var newDay = Date.parseDay(bits[2], true);
-			var addDays = newDay - day;
-			if (newDay <= day) addDays += 7;
-			if (bits[1] == 'last') addDays -= 7;
-			return d.set('date', d.getDate() + addDays);
-		}
-	}
-
-).alias('timeAgoInWords', 'timeDiffInWords');
-
-/*
----
-
-name: Hash
-
-description: Contains Hash Prototypes. Provides a means for overcoming the JavaScript practical impossibility of extending native Objects.
-
-license: MIT-style license.
-
-requires:
-  - Core/Object
-  - MooTools.More
-
-provides: [Hash]
-
-...
-*/
-
-(function(){
-
-if (this.Hash) return;
-
-var Hash = this.Hash = new Type('Hash', function(object){
-	if (typeOf(object) == 'hash') object = Object.clone(object.getClean());
-	for (var key in object) this[key] = object[key];
-	return this;
-});
-
-this.$H = function(object){
-	return new Hash(object);
-};
-
-Hash.implement({
-
-	forEach: function(fn, bind){
-		Object.forEach(this, fn, bind);
-	},
-
-	getClean: function(){
-		var clean = {};
-		for (var key in this){
-			if (this.hasOwnProperty(key)) clean[key] = this[key];
-		}
-		return clean;
-	},
-
-	getLength: function(){
-		var length = 0;
-		for (var key in this){
-			if (this.hasOwnProperty(key)) length++;
-		}
-		return length;
-	}
-
-});
-
-Hash.alias('each', 'forEach');
-
-Hash.implement({
-
-	has: Object.prototype.hasOwnProperty,
-
-	keyOf: function(value){
-		return Object.keyOf(this, value);
-	},
-
-	hasValue: function(value){
-		return Object.contains(this, value);
-	},
-
-	extend: function(properties){
-		Hash.each(properties || {}, function(value, key){
-			Hash.set(this, key, value);
-		}, this);
-		return this;
-	},
-
-	combine: function(properties){
-		Hash.each(properties || {}, function(value, key){
-			Hash.include(this, key, value);
-		}, this);
-		return this;
-	},
-
-	erase: function(key){
-		if (this.hasOwnProperty(key)) delete this[key];
-		return this;
-	},
-
-	get: function(key){
-		return (this.hasOwnProperty(key)) ? this[key] : null;
-	},
-
-	set: function(key, value){
-		if (!this[key] || this.hasOwnProperty(key)) this[key] = value;
-		return this;
-	},
-
-	empty: function(){
-		Hash.each(this, function(value, key){
-			delete this[key];
-		}, this);
-		return this;
-	},
-
-	include: function(key, value){
-		if (this[key] == undefined) this[key] = value;
-		return this;
-	},
-
-	map: function(fn, bind){
-		return new Hash(Object.map(this, fn, bind));
-	},
-
-	filter: function(fn, bind){
-		return new Hash(Object.filter(this, fn, bind));
-	},
-
-	every: function(fn, bind){
-		return Object.every(this, fn, bind);
-	},
-
-	some: function(fn, bind){
-		return Object.some(this, fn, bind);
-	},
-
-	getKeys: function(){
-		return Object.keys(this);
-	},
-
-	getValues: function(){
-		return Object.values(this);
-	},
-
-	toQueryString: function(base){
-		return Object.toQueryString(this, base);
-	}
-
-});
-
-Hash.alias({indexOf: 'keyOf', contains: 'hasValue'});
-
-
-})();
-
-
-/*
----
-
-script: Hash.Extras.js
-
-name: Hash.Extras
-
-description: Extends the Hash Type to include getFromPath which allows a path notation to child elements.
-
-license: MIT-style license
-
-authors:
-  - Aaron Newton
-
-requires:
-  - Hash
-  - Object.Extras
-
-provides: [Hash.Extras]
-
-...
-*/
-
-Hash.implement({
-
-	getFromPath: function(notation){
-		return Object.getFromPath(this, notation);
-	},
-
-	cleanValues: function(method){
-		return new Hash(Object.cleanValues(this, method));
-	},
-
-	run: function(){
-		Object.run(arguments);
-	}
-
-});
-
-/*
----
-name: Number.Format
-description: Extends the Number Type object to include a number formatting method.
-license: MIT-style license
-authors: [Arian Stolwijk]
-requires: [Core/Number, Locale.en-US.Number]
-# Number.Extras is for compatibility
-provides: [Number.Format, Number.Extras]
-...
-*/
-
-
-Number.implement({
-
-	format: function(options){
-		// Thanks dojo and YUI for some inspiration
-		var value = this;
-		options = options ? Object.clone(options) : {};
-		var getOption = function(key){
-			if (options[key] != null) return options[key];
-			return Locale.get('Number.' + key);
-		};
-
-		var negative = value < 0,
-			decimal = getOption('decimal'),
-			precision = getOption('precision'),
-			group = getOption('group'),
-			decimals = getOption('decimals');
-
-		if (negative){
-			var negativeLocale = getOption('negative') || {};
-			if (negativeLocale.prefix == null && negativeLocale.suffix == null) negativeLocale.prefix = '-';
-			['prefix', 'suffix'].each(function(key){
-				if (negativeLocale[key]) options[key] = getOption(key) + negativeLocale[key];
-			});
-
-			value = -value;
-		}
-
-		var prefix = getOption('prefix'),
-			suffix = getOption('suffix');
-
-		if (decimals !== '' && decimals >= 0 && decimals <= 20) value = value.toFixed(decimals);
-		if (precision >= 1 && precision <= 21) value = (+value).toPrecision(precision);
-
-		value += '';
-		var index;
-		if (getOption('scientific') === false && value.indexOf('e') > -1){
-			var match = value.split('e'),
-				zeros = +match[1];
-			value = match[0].replace('.', '');
-
-			if (zeros < 0){
-				zeros = -zeros - 1;
-				index = match[0].indexOf('.');
-				if (index > -1) zeros -= index - 1;
-				while (zeros--) value = '0' + value;
-				value = '0.' + value;
-			} else {
-				index = match[0].lastIndexOf('.');
-				if (index > -1) zeros -= match[0].length - index - 1;
-				while (zeros--) value += '0';
-			}
-		}
-
-		if (decimal != '.') value = value.replace('.', decimal);
-
-		if (group){
-			index = value.lastIndexOf(decimal);
-			index = (index > -1) ? index : value.length;
-			var newOutput = value.substring(index),
-				i = index;
-
-			while (i--){
-				if ((index - i - 1) % 3 == 0 && i != (index - 1)) newOutput = group + newOutput;
-				newOutput = value.charAt(i) + newOutput;
-			}
-
-			value = newOutput;
-		}
-
-		if (prefix) value = prefix + value;
-		if (suffix) value += suffix;
-
-		return value;
-	},
-
-	formatCurrency: function(decimals){
-		var locale = Locale.get('Number.currency') || {};
-		if (locale.scientific == null) locale.scientific = false;
-		locale.decimals = decimals != null ? decimals
-			: (locale.decimals == null ? 2 : locale.decimals);
-
-		return this.format(locale);
-	},
-
-	formatPercentage: function(decimals){
-		var locale = Locale.get('Number.percentage') || {};
-		if (locale.suffix == null) locale.suffix = '%';
-		locale.decimals = decimals != null ? decimals
-			: (locale.decimals == null ? 2 : locale.decimals);
-
-		return this.format(locale);
-	}
-
-});
-
-/*
----
-
-script: URI.js
-
-name: URI
-
-description: Provides methods useful in managing the window location and uris.
-
-license: MIT-style license
-
-authors:
-  - Sebastian Markbåge
-  - Aaron Newton
-
-requires:
-  - Core/Object
-  - Core/Class
-  - Core/Class.Extras
-  - Core/Element
-  - String.QueryString
-
-provides: [URI]
-
-...
-*/
-
-(function(){
-
-var toString = function(){
-	return this.get('value');
-};
-
-var URI = this.URI = new Class({
-
-	Implements: Options,
-
-	options: {
-		/*base: false*/
-	},
-
-	regex: /^(?:(\w+):)?(?:\/\/(?:(?:([^:@\/]*):?([^:@\/]*))?@)?(\[[A-Fa-f0-9:]+\]|[^:\/?#]*)(?::(\d*))?)?(\.\.?$|(?:[^?#\/]*\/)*)([^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
-	parts: ['scheme', 'user', 'password', 'host', 'port', 'directory', 'file', 'query', 'fragment'],
-	schemes: {http: 80, https: 443, ftp: 21, rtsp: 554, mms: 1755, file: 0},
-
-	initialize: function(uri, options){
-		this.setOptions(options);
-		var base = this.options.base || URI.base;
-		if (!uri) uri = base;
-
-		if (uri && uri.parsed) this.parsed = Object.clone(uri.parsed);
-		else this.set('value', uri.href || uri.toString(), base ? new URI(base) : false);
-	},
-
-	parse: function(value, base){
-		var bits = value.match(this.regex);
-		if (!bits) return false;
-		bits.shift();
-		return this.merge(bits.associate(this.parts), base);
-	},
-
-	merge: function(bits, base){
-		if ((!bits || !bits.scheme) && (!base || !base.scheme)) return false;
-		if (base){
-			this.parts.every(function(part){
-				if (bits[part]) return false;
-				bits[part] = base[part] || '';
-				return true;
-			});
-		}
-		bits.port = bits.port || this.schemes[bits.scheme.toLowerCase()];
-		bits.directory = bits.directory ? this.parseDirectory(bits.directory, base ? base.directory : '') : '/';
-		return bits;
-	},
-
-	parseDirectory: function(directory, baseDirectory){
-		directory = (directory.substr(0, 1) == '/' ? '' : (baseDirectory || '/')) + directory;
-		if (!directory.test(URI.regs.directoryDot)) return directory;
-		var result = [];
-		directory.replace(URI.regs.endSlash, '').split('/').each(function(dir){
-			if (dir == '..' && result.length > 0) result.pop();
-			else if (dir != '.') result.push(dir);
-		});
-		return result.join('/') + '/';
-	},
-
-	combine: function(bits){
-		return bits.value || bits.scheme + '://' +
-			(bits.user ? bits.user + (bits.password ? ':' + bits.password : '') + '@' : '') +
-			(bits.host || '') + (bits.port && bits.port != this.schemes[bits.scheme] ? ':' + bits.port : '') +
-			(bits.directory || '/') + (bits.file || '') +
-			(bits.query ? '?' + bits.query : '') +
-			(bits.fragment ? '#' + bits.fragment : '');
-	},
-
-	set: function(part, value, base){
-		if (part == 'value'){
-			var scheme = value.match(URI.regs.scheme);
-			if (scheme) scheme = scheme[1];
-			if (scheme && this.schemes[scheme.toLowerCase()] == null) this.parsed = { scheme: scheme, value: value };
-			else this.parsed = this.parse(value, (base || this).parsed) || (scheme ? { scheme: scheme, value: value } : { value: value });
-		} else if (part == 'data'){
-			this.setData(value);
-		} else {
-			this.parsed[part] = value;
-		}
-		return this;
-	},
-
-	get: function(part, base){
-		switch (part){
-			case 'value': return this.combine(this.parsed, base ? base.parsed : false);
-			case 'data' : return this.getData();
-		}
-		return this.parsed[part] || '';
-	},
-
-	go: function(){
-		document.location.href = this.toString();
-	},
-
-	toURI: function(){
-		return this;
-	},
-
-	getData: function(key, part){
-		var qs = this.get(part || 'query');
-		if (!(qs || qs === 0)) return key ? null : {};
-		var obj = qs.parseQueryString();
-		return key ? obj[key] : obj;
-	},
-
-	setData: function(values, merge, part){
-		if (typeof values == 'string'){
-			var data = this.getData();
-			data[arguments[0]] = arguments[1];
-			values = data;
-		} else if (merge){
-			values = Object.merge(this.getData(null, part), values);
-		}
-		return this.set(part || 'query', Object.toQueryString(values));
-	},
-
-	clearData: function(part){
-		return this.set(part || 'query', '');
-	},
-
-	toString: toString,
-	valueOf: toString
-
-});
-
-URI.regs = {
-	endSlash: /\/$/,
-	scheme: /^(\w+):/,
-	directoryDot: /\.\/|\.$/
-};
-
-URI.base = new URI(Array.convert(document.getElements('base[href]', true)).getLast(), {base: document.location});
-
-String.implement({
-
-	toURI: function(options){
-		return new URI(this, options);
-	}
-
-});
-
-})();
-
-/*
----
-
-script: URI.Relative.js
-
-name: URI.Relative
-
-description: Extends the URI class to add methods for computing relative and absolute urls.
-
-license: MIT-style license
-
-authors:
-  - Sebastian Markbåge
-
-
-requires:
-  - Class.refactor
-  - URI
-
-provides: [URI.Relative]
-
-...
-*/
-
-URI = Class.refactor(URI, {
-
-	combine: function(bits, base){
-		if (!base || bits.scheme != base.scheme || bits.host != base.host || bits.port != base.port)
-			return this.previous.apply(this, arguments);
-		var end = bits.file + (bits.query ? '?' + bits.query : '') + (bits.fragment ? '#' + bits.fragment : '');
-
-		if (!base.directory) return (bits.directory || (bits.file ? '' : './')) + end;
-
-		var baseDir = base.directory.split('/'),
-			relDir = bits.directory.split('/'),
-			path = '',
-			offset;
-
-		var i = 0;
-		for (offset = 0; offset < baseDir.length && offset < relDir.length && baseDir[offset] == relDir[offset]; offset++);
-		for (i = 0; i < baseDir.length - offset - 1; i++) path += '../';
-		for (i = offset; i < relDir.length - 1; i++) path += relDir[i] + '/';
-
-		return (path || (bits.file ? '' : './')) + end;
-	},
-
-	toAbsolute: function(base){
-		base = new URI(base);
-		if (base) base.set('directory', '').set('file', '');
-		return this.toRelative(base);
-	},
-
-	toRelative: function(base){
-		return this.get('value', new URI(base));
-	}
-
-});
-
-/*
----
-
-script: Assets.js
-
-name: Assets
-
-description: Provides methods to dynamically load JavaScript, CSS, and Image files into the document.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Element.Event
-  - MooTools.More
-
-provides: [Assets, Asset.javascript, Asset.css, Asset.image, Asset.images]
-
-...
-*/
-;(function(){
-
-var Asset = this.Asset = {
-
-	javascript: function(source, properties){
-		if (!properties) properties = {};
-
-		var script = new Element('script', {src: source, type: 'text/javascript'}),
-			doc = properties.document || document,
-			load = properties.onload || properties.onLoad;
-
-		delete properties.onload;
-		delete properties.onLoad;
-		delete properties.document;
-
-		if (load){
-			if (!script.addEventListener){
-				script.addEvent('readystatechange', function(){
-					if (['loaded', 'complete'].contains(this.readyState)) load.call(this);
-				});
-			} else {
-				script.addEvent('load', load);
-			}
-		}
-
-		return script.set(properties).inject(doc.head);
-	},
-
-	css: function(source, properties){
-		if (!properties) properties = {};
-
-		var load = properties.onload || properties.onLoad,
-			doc = properties.document || document,
-			timeout = properties.timeout || 3000;
-
-		['onload', 'onLoad', 'document'].each(function(prop){
-			delete properties[prop];
-		});
-
-		var link = new Element('link', {
-			type: 'text/css',
-			rel: 'stylesheet',
-			media: 'screen',
-			href: source
-		}).setProperties(properties).inject(doc.head);
-
-		if (load){
-			// based on article at http://www.yearofmoo.com/2011/03/cross-browser-stylesheet-preloading.html
-			var loaded = false, retries = 0;
-			var check = function(){
-				var stylesheets = document.styleSheets;
-				for (var i = 0; i < stylesheets.length; i++){
-					var file = stylesheets[i];
-					var owner = file.ownerNode ? file.ownerNode : file.owningElement;
-					if (owner && owner == link){
-						loaded = true;
-						return load.call(link);
-					}
-				}
-				retries++;
-				if (!loaded && retries < timeout / 50) return setTimeout(check, 50);
-			};
-			setTimeout(check, 0);
-		}
-		return link;
-	},
-
-	image: function(source, properties){
-		if (!properties) properties = {};
-
-		var image = new Image(),
-			element = document.id(image) || new Element('img');
-
-		['load', 'abort', 'error'].each(function(name){
-			var type = 'on' + name,
-				cap = 'on' + name.capitalize(),
-				event = properties[type] || properties[cap] || function(){};
-
-			delete properties[cap];
-			delete properties[type];
-
-			image[type] = function(){
-				if (!image) return;
-				if (!element.parentNode){
-					element.width = image.width;
-					element.height = image.height;
-				}
-				image = image.onload = image.onabort = image.onerror = null;
-				event.delay(1, element, element);
-				element.fireEvent(name, element, 1);
-			};
-		});
-
-		image.src = element.src = source;
-		if (image && image.complete) image.onload.delay(1);
-		return element.set(properties);
-	},
-
-	images: function(sources, options){
-		sources = Array.convert(sources);
-
-		var fn = function(){},
-			counter = 0;
-
-		options = Object.merge({
-			onComplete: fn,
-			onProgress: fn,
-			onError: fn,
-			properties: {}
-		}, options);
-
-		return new Elements(sources.map(function(source, index){
-			return Asset.image(source, Object.append(options.properties, {
-				onload: function(){
-					counter++;
-					options.onProgress.call(this, counter, index, source);
-					if (counter == sources.length) options.onComplete();
-				},
-				onerror: function(){
-					counter++;
-					options.onError.call(this, counter, index, source);
-					if (counter == sources.length) options.onComplete();
-				}
-			}));
-		}));
-	}
-
-};
-
-})();
-
-/*
----
-
-script: Color.js
-
-name: Color
-
-description: Class for creating and manipulating colors in JavaScript. Supports HSB -> RGB Conversions and vice versa.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Array
-  - Core/String
-  - Core/Number
-  - Core/Hash
-  - Core/Function
-  - MooTools.More
-
-provides: [Color]
-
-...
-*/
-
-(function(){
-
-var Color = this.Color = new Type('Color', function(color, type){
-	if (arguments.length >= 3){
-		type = 'rgb'; color = Array.slice(arguments, 0, 3);
-	} else if (typeof color == 'string'){
-		if (color.match(/rgb/)) color = color.rgbToHex().hexToRgb(true);
-		else if (color.match(/hsb/)) color = color.hsbToRgb();
-		else color = color.hexToRgb(true);
-	}
-	type = type || 'rgb';
-	switch (type){
-		case 'hsb':
-			var old = color;
-			color = color.hsbToRgb();
-			color.hsb = old;
-			break;
-		case 'hex': color = color.hexToRgb(true); break;
-	}
-	color.rgb = color.slice(0, 3);
-	color.hsb = color.hsb || color.rgbToHsb();
-	color.hex = color.rgbToHex();
-	return Object.append(color, this);
-});
-
-Color.implement({
-
-	mix: function(){
-		var colors = Array.slice(arguments);
-		var alpha = (typeOf(colors.getLast()) == 'number') ? colors.pop() : 50;
-		var rgb = this.slice();
-		colors.each(function(color){
-			color = new Color(color);
-			for (var i = 0; i < 3; i++) rgb[i] = Math.round((rgb[i] / 100 * (100 - alpha)) + (color[i] / 100 * alpha));
-		});
-		return new Color(rgb, 'rgb');
-	},
-
-	invert: function(){
-		return new Color(this.map(function(value){
-			return 255 - value;
-		}));
-	},
-
-	setHue: function(value){
-		return new Color([value, this.hsb[1], this.hsb[2]], 'hsb');
-	},
-
-	setSaturation: function(percent){
-		return new Color([this.hsb[0], percent, this.hsb[2]], 'hsb');
-	},
-
-	setBrightness: function(percent){
-		return new Color([this.hsb[0], this.hsb[1], percent], 'hsb');
-	}
-
-});
-
-this.$RGB = function(r, g, b){
-	return new Color([r, g, b], 'rgb');
-};
-
-this.$HSB = function(h, s, b){
-	return new Color([h, s, b], 'hsb');
-};
-
-this.$HEX = function(hex){
-	return new Color(hex, 'hex');
-};
-
-Array.implement({
-
-	rgbToHsb: function(){
-		var red = this[0],
-			green = this[1],
-			blue = this[2],
-			hue = 0,
-			max = Math.max(red, green, blue),
-			min = Math.min(red, green, blue),
-			delta = max - min,
-			brightness = max / 255,
-			saturation = (max != 0) ? delta / max : 0;
-
-		if (saturation != 0){
-			var rr = (max - red) / delta;
-			var gr = (max - green) / delta;
-			var br = (max - blue) / delta;
-			if (red == max) hue = br - gr;
-			else if (green == max) hue = 2 + rr - br;
-			else hue = 4 + gr - rr;
-			hue /= 6;
-			if (hue < 0) hue++;
-		}
-		return [Math.round(hue * 360), Math.round(saturation * 100), Math.round(brightness * 100)];
-	},
-
-	hsbToRgb: function(){
-		var br = Math.round(this[2] / 100 * 255);
-		if (this[1] == 0){
-			return [br, br, br];
-		} else {
-			var hue = this[0] % 360;
-			var f = hue % 60;
-			var p = Math.round((this[2] * (100 - this[1])) / 10000 * 255);
-			var q = Math.round((this[2] * (6000 - this[1] * f)) / 600000 * 255);
-			var t = Math.round((this[2] * (6000 - this[1] * (60 - f))) / 600000 * 255);
-			switch (Math.floor(hue / 60)){
-				case 0: return [br, t, p];
-				case 1: return [q, br, p];
-				case 2: return [p, br, t];
-				case 3: return [p, q, br];
-				case 4: return [t, p, br];
-				case 5: return [br, p, q];
-			}
-		}
-		return false;
-	}
-
-});
-
-String.implement({
-
-	rgbToHsb: function(){
-		var rgb = this.match(/\d{1,3}/g);
-		return (rgb) ? rgb.rgbToHsb() : null;
-	},
-
-	hsbToRgb: function(){
-		var hsb = this.match(/\d{1,3}/g);
-		return (hsb) ? hsb.hsbToRgb() : null;
-	}
-
-});
-
-})();
-
-
-/*
----
-
-script: Group.js
-
-name: Group
-
-description: Class for monitoring collections of events
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-
-requires:
-  - Core/Events
-  - MooTools.More
-
-provides: [Group]
-
-...
-*/
-
-(function(){
-
-var Group = this.Group = new Class({
-
-	initialize: function(){
-		this.instances = Array.flatten(arguments);
-	},
-
-	addEvent: function(type, fn){
-		var instances = this.instances,
-			len = instances.length,
-			togo = len,
-			args = new Array(len),
-			self = this;
-
-		instances.each(function(instance, i){
-			instance.addEvent(type, function(){
-				if (!args[i]) togo--;
-				args[i] = arguments;
-				if (!togo){
-					fn.call(self, instances, instance, args);
-					togo = len;
-					args = new Array(len);
-				}
-			});
-		});
-	}
-
-});
-
-})();
-
-/*
----
-
-script: Hash.Cookie.js
-
-name: Hash.Cookie
-
-description: Class for creating, reading, and deleting Cookies in JSON format.
-
-license: MIT-style license
-
-authors:
-  - Valerio Proietti
-  - Aaron Newton
-
-requires:
-  - Core/Cookie
-  - Core/JSON
-  - MooTools.More
-  - Hash
-
-provides: [Hash.Cookie]
-
-...
-*/
-
-Hash.Cookie = new Class({
-
-	Extends: Cookie,
-
-	options: {
-		autoSave: true
-	},
-
-	initialize: function(name, options){
-		this.parent(name, options);
-		this.load();
-	},
-
-	save: function(){
-		var value = JSON.encode(this.hash);
-		if (!value || value.length > 4096) return false; //cookie would be truncated!
-		if (value == '{}') this.dispose();
-		else this.write(value);
-		return true;
-	},
-
-	load: function(){
-		this.hash = new Hash(JSON.decode(this.read(), true));
-		return this;
-	}
-
-});
-
-Hash.each(Hash.prototype, function(method, name){
-	if (typeof method == 'function') Hash.Cookie.implement(name, function(){
-		var value = method.apply(this.hash, arguments);
-		if (this.options.autoSave) this.save();
-		return value;
-	});
-});
-
-/*
----
-
-name: Swiff
-
-description: Wrapper for embedding SWF movies. Supports External Interface Communication.
-
-license: MIT-style license.
-
-credits:
-  - Flash detection & Internet Explorer + Flash Player 9 fix inspired by SWFObject.
-
-requires: [Core/Options, Core/Object, Core/Element]
-
-provides: Swiff
-
-...
-*/
-
-(function(){
-
-var Swiff = this.Swiff = new Class({
-
-	Implements: Options,
-
-	options: {
-		id: null,
-		height: 1,
-		width: 1,
-		container: null,
-		properties: {},
-		params: {
-			quality: 'high',
-			allowScriptAccess: 'always',
-			wMode: 'window',
-			swLiveConnect: true
-		},
-		callBacks: {},
-		vars: {}
-	},
-
-	toElement: function(){
-		return this.object;
-	},
-
-	initialize: function(path, options){
-		this.instance = 'Swiff_' + String.uniqueID();
-
-		this.setOptions(options);
-		options = this.options;
-		var id = this.id = options.id || this.instance;
-		var container = document.id(options.container);
-
-		Swiff.CallBacks[this.instance] = {};
-
-		var params = options.params, vars = options.vars, callBacks = options.callBacks;
-		var properties = Object.append({height: options.height, width: options.width}, options.properties);
-
-		var self = this;
-
-		for (var callBack in callBacks){
-			Swiff.CallBacks[this.instance][callBack] = (function(option){
-				return function(){
-					return option.apply(self.object, arguments);
-				};
-			})(callBacks[callBack]);
-			vars[callBack] = 'Swiff.CallBacks.' + this.instance + '.' + callBack;
-		}
-
-		params.flashVars = Object.toQueryString(vars);
-		if ('ActiveXObject' in window){
-			properties.classid = 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000';
-			params.movie = path;
-		} else {
-			properties.type = 'application/x-shockwave-flash';
-		}
-		properties.data = path;
-
-		var build = '<object id="' + id + '"';
-		for (var property in properties) build += ' ' + property + '="' + properties[property] + '"';
-		build += '>';
-		for (var param in params){
-			if (params[param]) build += '<param name="' + param + '" value="' + params[param] + '" />';
-		}
-		build += '</object>';
-		this.object = ((container) ? container.empty() : new Element('div')).set('html', build).firstChild;
-	},
-
-	replaces: function(element){
-		element = document.id(element, true);
-		element.parentNode.replaceChild(this.toElement(), element);
-		return this;
-	},
-
-	inject: function(element){
-		document.id(element, true).appendChild(this.toElement());
-		return this;
-	},
-
-	remote: function(){
-		return Swiff.remote.apply(Swiff, [this.toElement()].append(arguments));
-	}
-
-});
-
-Swiff.CallBacks = {};
-
-Swiff.remote = function(obj, fn){
-	var rs = obj.CallFunction('<invoke name="' + fn + '" returntype="javascript">' + __flash__argumentsToXML(arguments, 2) + '</invoke>');
-	return eval(rs);
-};
-
-})();
-
-/*
----
-name: Table
-description: LUA-Style table implementation.
-license: MIT-style license
-authors:
-  - Valerio Proietti
-requires: [Core/Array]
-provides: [Table]
-...
-*/
-
-(function(){
-
-var Table = this.Table = function(){
-
-	this.length = 0;
-	var keys = [],
-		values = [];
-
-	this.set = function(key, value){
-		var index = keys.indexOf(key);
-		if (index == -1){
-			var length = keys.length;
-			keys[length] = key;
-			values[length] = value;
-			this.length++;
-		} else {
-			values[index] = value;
-		}
-		return this;
-	};
-
-	this.get = function(key){
-		var index = keys.indexOf(key);
-		return (index == -1) ? null : values[index];
-	};
-
-	this.erase = function(key){
-		var index = keys.indexOf(key);
-		if (index != -1){
-			this.length--;
-			keys.splice(index, 1);
-			return values.splice(index, 1)[0];
-		}
-		return null;
-	};
-
-	this.each = this.forEach = function(fn, bind){
-		for (var i = 0, l = this.length; i < l; i++) fn.call(bind, keys[i], values[i], this);
-	};
-
-};
-
-if (this.Type) new Type('Table', Table);
-
-})();
diff --git a/web/views/archive.php b/web/views/archive.php
index 352849ee9..6bd11fbd3 100644
--- a/web/views/archive.php
+++ b/web/views/archive.php
@@ -55,7 +55,7 @@ if ( !$mimetype ) {
 $connkey = isset($_REQUEST['connkey'])?$_REQUEST['connkey']:'';
 $filename = "zmExport_$connkey.$file_ext";
 $filename_path = ZM_DIR_EXPORTS.'/'.$filename;
-ZM\Logger::Debug("downloading archive from $filename_path");
+ZM\Debug("downloading archive from $filename_path");
 if ( is_readable($filename_path) ) {
   while (ob_get_level()) {
     ob_end_clean();
diff --git a/web/views/image.php b/web/views/image.php
index ff26682c7..6f4f09c2e 100644
--- a/web/views/image.php
+++ b/web/views/image.php
@@ -32,7 +32,7 @@
 //     If both scale and either width or height are specified, scale is ignored
 //
 
-if ( !canView('Events') ) {
+if ( !canView('Events') and ($_REQUEST['fid'] != 'snapshot' or !canView('Snapshots'))) {
   $view = 'error';
   return;
 }
@@ -87,11 +87,11 @@ if ( empty($_REQUEST['path']) ) {
         if (file_exists($path_anim_gif)) {
           // we found the animation gif file
           $media_type = 'image/gif';
-          ZM\Logger::Debug("Animation file found at $path");
+          ZM\Debug("Animation file found at $path");
           $path = $path_anim_gif;
         } else if (file_exists($path_image)) {
             // animation not found, but image found
-            ZM\Logger::Debug("Image file found at $path");
+            ZM\Debug("Image file found at $path");
             $path = $path_image;
         } else {
             // neither animation nor image found
@@ -178,9 +178,33 @@ if ( empty($_REQUEST['path']) ) {
           # If we store Frames as jpgs, then we don't store a snapshot
           $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d', $Frame->FrameId()).'-'.$show.'.jpg';
         } else {
-          header('HTTP/1.0 404 Not Found');
-          ZM\Fatal('No alarm jpg found for event '.$_REQUEST['eid']);
-          return;
+          if ( $Event->DefaultVideo() ) {
+            $command = ZM_PATH_FFMPEG.' -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -frames:v 1 '.$path . ' 2>&1';
+            #$command ='ffmpeg -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$Frame->FrameId().'),setpts=PTS-STARTPTS" '.$path;
+            #$command ='ffmpeg -v 0 -i '.$Storage->Path().'/'.$Event->Path().'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$Frame->FrameId().'),setpts=PTS-STARTPTS" '.$path;
+            ZM\Debug("Running $command");
+            $output = array();
+            $retval = 0;
+            exec($command, $output, $retval);
+            ZM\Debug("Command: $command, retval: $retval, output: " . implode("\n", $output));
+            if ( ! file_exists($path) ) {
+              header('HTTP/1.0 404 Not Found');
+              ZM\Fatal('Can\'t create frame images from video for this event '.$Event->DefaultVideo().'
+
+                Command was: '.$command.'
+
+                Output was: '.implode(PHP_EOL,$output) );
+            }
+            # Generating an image file will use up more disk space, so update the Event record.
+            if ( $Event->EndDateTime() ) {
+              $Event->DiskSpace(null);
+              $Event->save();
+            }
+          } else {
+            header('HTTP/1.0 404 Not Found');
+            ZM\Fatal('No snapshot jpg found for event '.$_REQUEST['eid']);
+            return;
+          }
         } # end if stored jpgs
       } else {
         $Frame = new ZM\Frame();
@@ -188,9 +212,8 @@ if ( empty($_REQUEST['path']) ) {
         $Frame->FrameId('snapshot');
       } # end if found snapshot.jpg
     } else {
-
       $Frame = ZM\Frame::find_one(array('EventId'=>$_REQUEST['eid'], 'FrameId'=>$_REQUEST['fid']));
-      if ( ! $Frame ) {
+      if (!$Frame) {
         $previousBulkFrame = dbFetchOne(
           'SELECT * FROM Frames WHERE EventId=? AND FrameId < ? ORDER BY FrameID DESC LIMIT 1',
           NULL, array($_REQUEST['eid'], $_REQUEST['fid'])
@@ -199,22 +222,22 @@ if ( empty($_REQUEST['path']) ) {
           'SELECT * FROM Frames WHERE EventId=? AND FrameId > ? ORDER BY FrameID ASC LIMIT 1',
           NULL, array($_REQUEST['eid'], $_REQUEST['fid'])
         );
-        if ( $previousBulkFrame and $nextBulkFrame ) {
+        if ($previousBulkFrame and $nextBulkFrame) {
           $Frame = new ZM\Frame($previousBulkFrame);
           $Frame->FrameId($_REQUEST['fid']);
 
           $percentage = ($Frame->FrameId() - $previousBulkFrame['FrameId']) / ($nextBulkFrame['FrameId'] - $previousBulkFrame['FrameId']);
 
           $Frame->Delta($previousBulkFrame['Delta'] + floor( 100* ( $nextBulkFrame['Delta'] - $previousBulkFrame['Delta'] ) * $percentage )/100);
-          ZM\Logger::Debug("Got virtual frame from Bulk Frames previous delta: " . $previousBulkFrame['Delta'] . " + nextdelta:" . $nextBulkFrame['Delta'] . ' - ' . $previousBulkFrame['Delta'] . ' * ' . $percentage );
+          ZM\Debug('Got virtual frame from Bulk Frames previous delta: ' . $previousBulkFrame['Delta'] . ' + nextdelta:' . $nextBulkFrame['Delta'] . ' - ' . $previousBulkFrame['Delta'] . ' * ' . $percentage );
         } else {
           ZM\Fatal('No Frame found for event('.$_REQUEST['eid'].') and frame id('.$_REQUEST['fid'].')');
         }
-      }
+      }  # end if !Frame
       // Frame can be non-existent.  We have Bulk frames.  So now we should try to load the bulk frame 
       $path = $Event->Path().'/'.sprintf('%0'.ZM_EVENT_IMAGE_DIGITS.'d',$Frame->FrameId()).'-'.$show.'.jpg';
-      ZM\Logger::Debug("Path: $path");
-    }
+      ZM\Debug("Path: $path");
+    }  # if special frame (snapshot, alarm etc) or identified by id
 
   } else {
 # If we are only specifying fid, then the fid must be the primary key into the frames table. But when the event is specified, then it is the frame #
@@ -235,28 +258,34 @@ if ( empty($_REQUEST['path']) ) {
   } # end if have eid
     
   if ( !file_exists($path) ) {
-    ZM\Logger::Debug("$path does not exist");
+    ZM\Debug("$path does not exist");
     # Generate the frame JPG
     if ( ($show == 'capture') and $Event->DefaultVideo() ) {
       if ( !file_exists($Event->Path().'/'.$Event->DefaultVideo()) ) {
         header('HTTP/1.0 404 Not Found');
         ZM\Fatal("Can't create frame images from video because there is no video file for this event at (".$Event->Path().'/'.$Event->DefaultVideo() );
       }
-      $command = ZM_PATH_FFMPEG.' -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -frames:v 1 '.$path;
+      $command = ZM_PATH_FFMPEG.' -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -frames:v 1 '.$path . ' 2>&1';
       #$command ='ffmpeg -ss '. $Frame->Delta() .' -i '.$Event->Path().'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$Frame->FrameId().'),setpts=PTS-STARTPTS" '.$path;
 #$command ='ffmpeg -v 0 -i '.$Storage->Path().'/'.$Event->Path().'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$Frame->FrameId().'),setpts=PTS-STARTPTS" '.$path;
-      ZM\Logger::Debug("Running $command");
+      ZM\Debug("Running $command");
       $output = array();
       $retval = 0;
-      exec( $command, $output, $retval );
-      ZM\Logger::Debug("Command: $command, retval: $retval, output: " . implode("\n", $output));
-      if ( ! file_exists( $path ) ) {
+      exec($command, $output, $retval);
+      ZM\Debug("Command: $command, retval: $retval, output: " . implode("\n", $output));
+      if ( ! file_exists($path) ) {
         header('HTTP/1.0 404 Not Found');
-        ZM\Fatal('Can\'t create frame images from video for this event '.$Event->DefaultVideo() );
+        ZM\Fatal('Can\'t create frame images from video for this event '.$Event->DefaultVideo().'
+
+Command was: '.$command.'
+
+Output was: '.implode(PHP_EOL,$output) );
       }
       # Generating an image file will use up more disk space, so update the Event record.
-      $Event->DiskSpace(null);
-      $Event->save();
+      if ( $Event->EndDateTime() ) {
+        $Event->DiskSpace(null);
+        $Event->save();
+      }
     } else {
       header('HTTP/1.0 404 Not Found');
       ZM\Fatal("Can't create frame $show images from video because there is no video file for this event at ".
@@ -334,7 +363,7 @@ if ( $errorText ) {
       ZM\Error('No bytes read from '. $path);
     }
   } else {
-    ZM\Logger::Debug("Doing a scaled image: scale($scale) width($width) height($height)");
+    ZM\Debug("Doing a scaled image: scale($scale) width($width) height($height)");
     $i = 0;
     if ( ! ( $width && $height ) ) {
       $i = imagecreatefromjpeg($path);
@@ -347,7 +376,7 @@ if ( $errorText ) {
         $width = ($height * $oldWidth) / $oldHeight;
       } elseif ( $width != 0 && $height == 0 ) {
         $height = ($width * $oldHeight) / $oldWidth;
-ZM\Logger::Debug("Figuring out height using width: $height = ($width * $oldHeight) / $oldWidth");
+ZM\Debug("Figuring out height using width: $height = ($width * $oldHeight) / $oldWidth");
       }
       if ( $width == $oldWidth && $height == $oldHeight ) {
         ZM\Warning('No change to width despite scaling.');
@@ -361,7 +390,7 @@ ZM\Logger::Debug("Figuring out height using width: $height = ($width * $oldHeigh
       header('Content-Disposition: inline; filename="' . $filename . '"');
     }
     if ( !( file_exists($scaled_path) and readfile($scaled_path) ) ) {
-      ZM\Logger::Debug("Cached scaled image does not exist at $scaled_path or is no good.. Creating it");
+      ZM\Debug("Cached scaled image does not exist at $scaled_path or is no good.. Creating it");
       ob_start();
       if ( !$i )
         $i = imagecreatefromjpeg($path);
@@ -373,12 +402,12 @@ ZM\Logger::Debug("Figuring out height using width: $height = ($width * $oldHeigh
       file_put_contents($scaled_path, $scaled_jpeg_data);
       echo $scaled_jpeg_data;
     } else {
-      ZM\Logger::Debug("Sending $scaled_path");
+      ZM\Debug("Sending $scaled_path");
       $bytes = readfile($scaled_path);
       if ( !$bytes ) {
         ZM\Error('No bytes read from '. $scaled_path);
       } else {
-        ZM\Logger::Debug("$bytes sent");
+        ZM\Debug("$bytes sent");
       }
     }
   }
diff --git a/web/views/no_database_connection.php b/web/views/no_database_connection.php
new file mode 100644
index 000000000..c9b5d9a54
--- /dev/null
+++ b/web/views/no_database_connection.php
@@ -0,0 +1,65 @@
+<?php
+//
+// ZoneMinder web error view file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+  <div id="page">
+    <div id="header">
+      <h1>ZoneMinder Error</h1>
+    </div>
+    <div id="content">
+      <p class="error">
+<?php 
+global $error_message;
+echo $error_message;
+?>
+      </p>
+      <p>ZoneMinder will retry connection in <span id="countdown">30</span> seconds.</p>
+      <p>
+        <button id="reloadButton" type="button">Reload</button>
+      </p>
+    </div>
+  </div>
+  <script>
+    document.getElementById('reloadButton').addEventListener("click", function() {
+      location.reload();
+    });
+
+    var countdown = 30; // seconds
+    function timerCountdown() {
+      console.log('hello');
+      document.getElementById('countdown').innerHTML=countdown;
+      countdown --;
+      if ( countdown <= 0 ) {
+        location.reload();
+      } else {
+        setTimeout(timerCountdown, 1000);
+      }
+    }
+    setTimeout(timerCountdown, 1000);
+  </script>
+</body>
+</html>
diff --git a/web/views/view_video.php b/web/views/view_video.php
index 56837a5ba..4717e5f96 100644
--- a/web/views/view_video.php
+++ b/web/views/view_video.php
@@ -55,7 +55,8 @@ if ( $errorText ) {
   die();
 } 
 
-if ( ! ($fh = @fopen($path,'rb') ) ) {
+if ( ! ($fh = @fopen($path, 'rb') ) ) {
+  ZM\Error('Can\'t open video at '.$path);
   header('HTTP/1.0 404 Not Found');
   die();
 }
@@ -66,14 +67,14 @@ $end = $size-1;
 $length = $size;
 
 if ( isset($_SERVER['HTTP_RANGE']) ) {
-  ZM\Logger::Debug('Using Range '.$_SERVER['HTTP_RANGE']);
+  ZM\Debug('Using Range '.$_SERVER['HTTP_RANGE']);
   if ( preg_match('/bytes=\h*(\d+)-(\d*)[\D.*]?/i', $_SERVER['HTTP_RANGE'], $matches) ) {
     $begin = intval($matches[1]);
     if ( !empty($matches[2]) ) {
       $end = intval($matches[2]);
     }
     $length = $end - $begin + 1;
-    ZM\Logger::Debug("Using Range $begin $end size: $size, length: $length");
+    ZM\Debug("Using Range $begin $end size: $size, length: $length");
   }
 } # end if HTTP_RANGE
 
diff --git a/zmconfgen.pl.in b/zmconfgen.pl.in
index d3f165651..0674d7183 100644
--- a/zmconfgen.pl.in
+++ b/zmconfgen.pl.in
@@ -30,7 +30,7 @@ use ZoneMinder::ConfigData qw/:data/;
 
 $| = 1;
 
-my $config_header = '@CMAKE_CURRENT_BINARY_DIR@/src/zm_config_defines.h';
+my $config_header = '@CMAKE_BINARY_DIR@/zm_config_defines.h';
 my $config_sql = '@CMAKE_CURRENT_BINARY_DIR@/db/zm_create.sql';
 
 generateConfigFiles();
diff --git a/zmlinkcontent.sh.in b/zmlinkcontent.sh.in
index 409202cb1..f6e170ffa 100755
--- a/zmlinkcontent.sh.in
+++ b/zmlinkcontent.sh.in
@@ -88,16 +88,19 @@ if [[ -n "$ZM_CONFIG" && ! -f "$ZM_CONFIG" ]]; then
 fi
 
 # Load zm.conf
-if [ -n "$ZM_CONFIG" ]; then
-	echo "Using custom zm.conf $ZM_CONFIG"
-	source "$ZM_CONFIG"
-elif [ -f "zm.conf" ]; then
-	echo "Using local zm.conf"
-	source "zm.conf"
-elif [ -f "/etc/zm.conf" ]; then
-	echo "Using system zm.conf"
-	source "/etc/zm.conf"
-else
+for zmconf in "$ZM_CONFIG" ./zm.conf /etc/zm.conf /etc/zoneminder/zm.conf; do
+	if [[ -f "$zmconf" ]]; then
+		echo "Using $zmconf"
+		source "$zmconf"
+		# remove filename from path
+		zmconf2="${zmconf%/*}"
+		# source conf.d
+		for i in $(find "${zmconf2}/conf.d" -name \*.conf |sort); do . "$i"; done;
+		break
+	fi
+done
+
+if [[ -z "$zmconf2" ]]; then
 	echo -e "Failed locating zoneminder configuration file (zm.conf)\nUse the -z option to specify the full path to the zoneminder configuration file"
 	exit 45
 fi
diff --git a/zoneminder-config.cmake b/zoneminder-config.cmake
index edcb42ff6..473a6be70 100644
--- a/zoneminder-config.cmake
+++ b/zoneminder-config.cmake
@@ -68,6 +68,7 @@
 #cmakedefine HAVE_MP4V2_H 1
 #cmakedefine HAVE_MP4V2_MP4V2_H 1
 #cmakedefine HAVE_LIBJWT 1
+#cmakedefine HAVE_RTSP_SERVER 1
 
 /* Authenication checks */
 #cmakedefine HAVE_MD5_OPENSSL 1